From 7284b731651bedfb0257db5e0a2be5bb622123fa Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 19 Sep 2013 21:41:03 -0400 Subject: [PATCH] More texture tweaks. Renamed Aloe to Bromeliad. --- common/biomesoplenty/api/BlockReferences.java | 3 ++- common/biomesoplenty/blocks/BlockBOPFlower.java | 2 +- .../biomesoplenty/blocks/BlockBOPFlower2.java | 2 +- .../biomesoplenty/configuration/BOPBiomes.java | 2 +- .../integration/ThaumcraftIntegration.java | 2 +- .../itemblocks/ItemBlockFlower.java | 2 +- .../itemblocks/ItemBlockFlower2.java | 2 +- resources/assets/biomesoplenty/lang/de_DE.xml | 2 +- resources/assets/biomesoplenty/lang/en_US.xml | 3 ++- resources/assets/biomesoplenty/lang/fr_CA.xml | 2 +- resources/assets/biomesoplenty/lang/fr_FR.xml | 2 +- resources/assets/biomesoplenty/lang/it_IT.xml | 8 ++++---- resources/assets/biomesoplenty/lang/nl_NL.xml | 2 +- resources/assets/biomesoplenty/lang/pl_PL.xml | 2 +- resources/assets/biomesoplenty/lang/ru_RU.xml | 2 +- .../textures/blocks/{aloe.png => bromeliad.png} | Bin .../biomesoplenty/textures/blocks/lavender.png | Bin 0 -> 655 bytes .../textures/blocks/wildcarrot.png | Bin 491 -> 519 bytes .../textures/blocks/wildflower.png | Bin 594 -> 404 bytes .../textures/items/saladveggie.png | Bin 365 -> 351 bytes .../textures/items/wildcarrots.png | Bin 465 -> 470 bytes 21 files changed, 20 insertions(+), 18 deletions(-) rename resources/assets/biomesoplenty/textures/blocks/{aloe.png => bromeliad.png} (100%) create mode 100644 resources/assets/biomesoplenty/textures/blocks/lavender.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 32c73e59f..e41df5df0 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -178,13 +178,14 @@ public class BlockReferences { anenome (Blocks.flowers, 9), lilyflower (Blocks.flowers, 10), rainbowflower (Blocks.flowers, 11), - aloe (Blocks.flowers, 12), + bromeliad (Blocks.flowers, 12), sunflower (Blocks.flowers, 13), dandelion (Blocks.flowers, 15), hibiscus (Blocks.flowers2, 0), lilyofthevalley (Blocks.flowers2, 1), burningblossom (Blocks.flowers2, 2), + lavender (Blocks.flowers2, 2), ; public Optional block; diff --git a/common/biomesoplenty/blocks/BlockBOPFlower.java b/common/biomesoplenty/blocks/BlockBOPFlower.java index 189c79999..a8cc729ea 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower extends BlockFlower { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"}; private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java index b08cdfdb9..00e9701c8 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower2.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFlower2 extends BlockFlower { - private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; private Icon[] textures; protected BlockBOPFlower2(int blockID, Material material) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 7243567f1..f960e09e2 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -206,7 +206,7 @@ public class BOPBiomes { Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F)); Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F)); - Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F)); + Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.4F).setMinMaxHeight(0.2F, 0.4F)); Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F)); diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index c26fd82cc..a27c35e5c 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -217,7 +217,7 @@ public class ThaumcraftIntegration { ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4)); - ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4)); + ThaumcraftApi.registerObjectTag(getBID("bromeliad"), getBMeta("bromeliad"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1)); diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower.java b/common/biomesoplenty/itemblocks/ItemBlockFlower.java index 8aafd9cf6..3810b866e 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower extends ItemBlock { - private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; + private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int SUNFLOWERTOP = 14; diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java index 0f28c8e45..426466fa6 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFlower2 extends ItemBlock { - private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; + private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml index cf2f07242..b482a2b00 100644 --- a/resources/assets/biomesoplenty/lang/de_DE.xml +++ b/resources/assets/biomesoplenty/lang/de_DE.xml @@ -49,7 +49,7 @@ Weißes Windröschen Wasserlilie Chromablume - Aloe + Aloe Sonnenblume Sonnenblume Weißer Löwenzahn diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 21f8c3b09..4b3718936 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -49,7 +49,7 @@ White Anemone Waterlily Chromaflora - Aloe + Bromeliad Sunflower Sunflower White Dandelion @@ -57,6 +57,7 @@ Pink Hibiscus Lily of the Valley Burning Blossom + Lavender Algae Short Grass diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index 8c362f121..39ba24ab0 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -45,7 +45,7 @@ Violette Anémone Fleur de Nénuphar - Aloé + Aloé Tornesol Tornesol Pissenlit diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml index 0951f26de..755ae6724 100644 --- a/resources/assets/biomesoplenty/lang/fr_FR.xml +++ b/resources/assets/biomesoplenty/lang/fr_FR.xml @@ -45,7 +45,7 @@ Violette Anémone Fleur de Nénuphar - Aloé + Aloé Tornesol Tornesol Pissenlit diff --git a/resources/assets/biomesoplenty/lang/it_IT.xml b/resources/assets/biomesoplenty/lang/it_IT.xml index 60637a8be..e00e22e65 100644 --- a/resources/assets/biomesoplenty/lang/it_IT.xml +++ b/resources/assets/biomesoplenty/lang/it_IT.xml @@ -49,7 +49,7 @@ Anemone Bianca Ninfea Chromaflora - Aloe + Aloe Girasole Girasole Dente di Leone Bianco @@ -338,7 +338,7 @@ Verga Venerabile Manico della Verga Venerabile Corpo della Verga Venerabile - Sommit della Verga Venerabile + Sommit� della Verga Venerabile Verga Venerabile Esaurita Manipolatore d'Anima @@ -370,8 +370,8 @@ Acqua Primaverile - Un portale per la Terra Promessa apparto nel cielo, sopra di te. - Un portale per l'Overworld apparto nel cielo, sopra di te. + Un portale per la Terra Promessa � apparto nel cielo, sopra di te. + Un portale per l'Overworld � apparto nel cielo, sopra di te. Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml index eaea03209..30cd49d79 100644 --- a/resources/assets/biomesoplenty/lang/nl_NL.xml +++ b/resources/assets/biomesoplenty/lang/nl_NL.xml @@ -45,7 +45,7 @@ Violet Anemoon Waterlely - Aloë + Aloë Zonnebloem Zonnebloem Paardebloem diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml index 524eb0922..7d52aa26a 100644 --- a/resources/assets/biomesoplenty/lang/pl_PL.xml +++ b/resources/assets/biomesoplenty/lang/pl_PL.xml @@ -50,7 +50,7 @@ Zawilec Lilia wodna Chromaflora - Aloes + Aloes Słonecznik Słonecznik Dmuchawiec diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml index da8dd206b..4a6663876 100644 --- a/resources/assets/biomesoplenty/lang/ru_RU.xml +++ b/resources/assets/biomesoplenty/lang/ru_RU.xml @@ -49,7 +49,7 @@ Белый анемон Кувшинка Радужный цветок - Алоэ + Алоэ Подсолнечник Подсолнечник Белый одуванчик diff --git a/resources/assets/biomesoplenty/textures/blocks/aloe.png b/resources/assets/biomesoplenty/textures/blocks/bromeliad.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/aloe.png rename to resources/assets/biomesoplenty/textures/blocks/bromeliad.png diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png new file mode 100644 index 0000000000000000000000000000000000000000..b9679f644eab65889c491b51f168c94bc545ca75 GIT binary patch literal 655 zcmV;A0&x9_P)N2bPDNB8 zb~7$DE-^7j^FlWO00Ik1L_t(IPo+@rPm)m-=Ffny&C*;sz{o%pa45BYIEW2x5ypsq zVy-fWiQs*4rXyVXwobDmUadnRx5w%Hhr7b)K6-y^(xIuqM zuG)YMSDYgl@=WuM9hrl$ME3Fd=p6?eov8!d^oDzii;qn@#R(b$bvS2Dplj5|f-zJN zYuv==!((=hqtU(hJH=vx`Rrb}vxfwsIov4ZN5CIotpsjorH=^|IkB5)eik5fmqCyc1`??PkmZq3}DG{btq p_;0a_reM7w(x?47Y7jY{?iXsUGqS$`@{<4n002ovPDHLkV1lCCFM0p~ literal 0 HcmV?d00001 diff --git a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png index b26bb0e6cbada557463688e6bd1c7fd99e5d590a..8618c7428f6645198e3e0bb5278042c54d6f7bb1 100644 GIT binary patch delta 440 zcmV;p0Z0Dp1BV2VJPN-601m$aI0aKAkwzhZF-P-4Hvj+ugGod|R5(v#$hNO%xK{t4 zY|M~v-Og~o;y>9KuK}-SV;4up4FCWCrwC&eBn4v?Bn4v?Bn5+sn9UJD3RMDK3>P2F zc(nT~m`*#F2d0t5-kO%7mx z1#!zm{)f!*2P?EJu>^~O=%6`K3^vs^|9yJh{@XW#3<(5lwl1+{02|=i?G3gCWB^Dr z$aWCzG0EdU$Tkq)w#F80AV?#`C4meeaj*d(hGn4*gGP|XeeIj|iKop22H6gxnHB;y0Br-ucNf$^phmD9 z&=9aVEFm#h15JwsD)56~uq!}LgtEbkftG;ytl6xHgamfMRG&y_@ZVTp z@&DY}#s7;6y#H&fDgQS!QUUXu>SO-Ph>L*J!2kdM833>ADYx~loksuw002n`MNUMn GLSTZ*$GFM> diff --git a/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/resources/assets/biomesoplenty/textures/blocks/wildflower.png index adc0dbd997b49573f319dba8bac7a067c60641f6..15b2a83df9305fb390e2606e6215c35f29dd6a26 100644 GIT binary patch delta 316 zcmV-C0mJ^%1e61iJPN@801m+cxRGn^kwz(h5J^NqR5(v#pbOZL{pdfGNjg}U`QZN{ zuRH%IdL1R-kj;5d|A)l!|DWQ2j5I?w!YyW2ko&6tw zlO_(<*fmqK(Ac`aVT4UDGZ1ALOb{R%iZC^*c$tYe1l(UkR>Z zS>g@iHG^ynjTiVIo5MhwjUWIEhc4%R|BIVMNjCrl)@MBgYxE80_z%L1YJ2|w6yFo184?`J_unsq6RZg*mLf?45lO=TK^T+_v$I~m=kpa5aVaU2d3L?RJR^msh%&#jnr zzw=Fx6R&iWdhewCO{w_-lHm9Ixw~NRWRTo$x4K?^<3LP|oKmUOod8?~x0|07PewQ} z7!0cPfk}p8@Hc^UuU4yn4)Bovp{L1z56Z+}D7igMC~%e;r>Ug?g~MTv0X4*%i;vvIZ5zL(1i{;s;migZZDWm}B$r>$Y%i@6E z^-V7a34$b?k5G|hopywOxwAqU{{LTY|Nnm<=l{!Dy#IqOIl&mD7OD*aK!Pv~aw^D1uR|B4dyjK^Vk_YC{De378=u40AFJdQ#pVC5O40xMNdf==Pn7=u|6uul=5*%&jQ))O8H#WiATP@F z|K+Zv|39DX{QvG?)_Q-Cb7zGz{Qtk){{R0z&i|LQc>f1ma)L2PEmRuwR80KUc#;X|yV78%ahKWO! j5e6^~Bx@XMfPn!3d}N0va@^0N00000NkvXXu0mjfOoNA8 diff --git a/resources/assets/biomesoplenty/textures/items/wildcarrots.png b/resources/assets/biomesoplenty/textures/items/wildcarrots.png index 6f4437103b1998a4d40bc41a6997ecc9308a56b9..ef4227ce57b5c034549198c2d6160fb4a76de5c7 100644 GIT binary patch delta 371 zcmV-(0gV391J(nOJPM`&01l=Bhuo=ekw!FsF-P-4Hvj+uKS@MER5(v#@LV_rj&T8# zYUBSF&bIrno~MqgnURr^;n4oM42|V~ ziT^?P=B4fbkM5ocX2T2txd3DkR@?jAbHSQH8fQ-~1LG6>7W|((xe9Iw2+R1${FnBT z{;!d*fiMJQJ4g}8#=f>Zum+H35DhX2B%YlZ@IOB(0L4~GPf3IUFc%Ls`dV|~t^jEUu|cjNXaKT85Dn7| zqCsNq)u{{wT>w%DqhT5e834`(FawY=vSA?2>z8(c#nAyV`3NfjX@uY@3;>NH6MLbE R^S}TA002ovPDHLkV1i1>py~hs delta 366 zcmV-!0g?XJ1JMJJJPN1)01l`DBUR;*kw!FsFfjCTp#T5@I!Q!9R5(v#@LV_rj&T8= zYR>;qCMLkA5eAI+8Bk_`(=3Po%moYxL!yw_gaF9-CaVqqgJ_UJ+DkP4Go+DVfKHdz ze}!h*{~+3WjRn{saF`I|3g&d?|MIhBz|M!cf@coLe+FdlfB+*SBg3Kna~T@T6aRyM z@Xbrx{~z5w6U>Gg0&)S!Ags3cx95U2gEY>bTn5G`_AU57cXAcn5D;ecXZ+6)0MuLr z#4tlZwu2ObZ0u{x18V?j2GJmcK;qen0sr%p0#I%BK{5d50%Xk~+d-N^G)OZ@4ORd$ z0Oks0%^)_&1t4#M3^;deJ;R|Cs3v4tfNVftYYyBMAk82)$Q1+)KvoE%VVXfSNUXg& zm4ToOKnh_rOd}x!z}Wz105V2445WGe(k`$#Iv^$=VFe(K5Ilte04<6KAAi0rLjV8( M07*qoM6N<$f*!P$w*UYD