From 3b2df4f5fe71b81fd2920ea8bed1cf9cb0b25fed Mon Sep 17 00:00:00 2001 From: Forstride Date: Sat, 30 Jan 2016 21:58:29 -0500 Subject: [PATCH] Tweaked gem block textures, removed vines from bamboo trees --- .../overworld/BiomeGenDeciduousForest.java | 2 +- .../overworld/BiomeGenEucalyptusForest.java | 2 +- .../world/feature/tree/GeneratorBulbTree.java | 2 +- .../textures/blocks/malachite_block.png | Bin 876 -> 774 bytes .../textures/blocks/peridot_block.png | Bin 823 -> 723 bytes .../textures/blocks/ruby_block.png | Bin 917 -> 872 bytes .../textures/blocks/tanzanite_block.png | Bin 927 -> 454 bytes 7 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java index 8301f6b19..5d34bd906 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java @@ -44,7 +44,7 @@ public class BiomeGenDeciduousForest extends BOPBiome this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("birch_bush", 2, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).maxHeight(2).create()); treeGenerator.add("oak_bush", 3, (new GeneratorBush.Builder()).maxHeight(2).create()); - treeGenerator.add("tall_oak", 6, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(20).vine(null).create()); + treeGenerator.add("tall_oak", 6, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(20).create()); // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index 16f332591..2511bdf52 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -52,7 +52,7 @@ public class BiomeGenEucalyptusForest extends BOPBiome GeneratorWeighted treeGenerator = new GeneratorWeighted(10); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("oak_bush", 8, (new GeneratorBush.Builder()).maxHeight(2).create()); - treeGenerator.add("tall_eucalyptus", 1, (new GeneratorBulbTree.Builder()).minHeight(15).maxHeight(30).log(BlockPlanks.EnumType.JUNGLE).leaves(BlockPlanks.EnumType.JUNGLE).vine(null).create()); + treeGenerator.add("tall_eucalyptus", 1, (new GeneratorBulbTree.Builder()).minHeight(15).maxHeight(30).log(BlockPlanks.EnumType.JUNGLE).leaves(BlockPlanks.EnumType.JUNGLE).create()); // TODO: Add Eucalyptus wood as a new wood type - the bark is quite special // grasses diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java index 411088670..55128803e 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java @@ -34,7 +34,7 @@ public class GeneratorBulbTree extends GeneratorTreeBase this.replace = BlockQueries.airOrLeaves; this.log = Blocks.log.getDefaultState(); this.leaves = Blocks.leaves.getDefaultState(); - this.vine = Blocks.vine.getDefaultState(); + this.vine = null; } @Override diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/malachite_block.png b/src/main/resources/assets/biomesoplenty/textures/blocks/malachite_block.png index 3d9c9d89ec67e57d4e1116b02a3110c141695e33..0aa38f33ad48126ac5d77d7a52ff8d30c2ad42df 100644 GIT binary patch delta 726 zcmV;{0xA9M28ITZJb%Fe01m+cxRGn^0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@RY%_jN0007nNkl7>D^3W}5>n?K!OlU5%G)iP@56`)6C+C0VjD z6jf3J%6unwx65cQ-O(FWBRWS z>#KSSm^o2qE{Zdq)z=Lbm}`miHHGQrd@pVZ+tu*3{&GLT_i}-|ZQROowO_0&qITx_ zc`eYZU=l}laja7qX(&GaLZdHr?xHB{M)9z~?1&6eFi8q#jCEz^c-7x`0v(%eN{<5U z*mf2VA*V!NS%0jX<@C=~za*GTUkuX5hDAikM`0GtN57gq1*!IJ#%~rf!<7n}4TI3v^#+&P^znIV^;Z3trJg zq55UkEuv;NQWk^NrsIH;|T`*Gss;^9y7Cqs;lS2J1&dyU^!t84k)i}Si0*y!Q z4Q3}3wtuAm0&ZmIia)XZ(f6jVMvORTrvkOSzp7$eMy}@XI?xsn#+@|uDqH;LN@>a0_aIZK~y+TB~l4b8bKJ{-_oXSn${C!cUhOBrVSo=pw!z|V@yp| zr1cJc{Y*CcU`@*YgY~%0g&?YaFH*YfUdw<`20~IZf6fepOmt;KG zbg^Rs-BiPyb11DYc26PXEXruOlnM?J{FniW>cJ^g=2H&eCx-44^2e0?F)e?}etX*c zdb`l44w}0*V3kak6^cZQop*pWA$+5fRhHkm=Nl!g3#~bZeRBMiu9&a>e9WAGx z)(bxzn1v8pjc2XG!&NLXkH(EydXb-6#FKfHrYG7|~gv>d;elyni9S4WkSJ;SoI+H3(P}*QY3S zO%{1)$~NapHfFef1s*fPjE2u>cmWj_)`8c%304rg#pePi@<-q`5{)53)EaQ4R=wH4FZYb zh_(`#Z7uLX%BT^KoB1KFkTsXbOh`lrBEYnoAJK71CC5DlmH*I7kJg*^91Y1;NqS8J zNXA~jv)q)lHKy(2-4$`%S{IoY$1Dv|OUc?egnt1K*1!vEkr2V5lz?M#GvG)_gGTZq z>{XQ5#)@oX9LIR6V**0K#|r2Lvr#?Y6o&U@6^f#QK{j@ZeyPmbgeC~-k(0>uHo2_e7n@{yV+UGm5 zW$t{Y@{2c7xjUyB4R;$B`^GnV63vP7-$gODE(>PWI9)rd>4w?#MPgp*4;Qpz>)5KE??fP0GwuJLiInw}B5tW_eCw2OPvq3KKeOae zO8==>@NwI$8h^95Zg1&1ClVObxTO@|uNoRxbMeBn<7;R3bd(oi3w7-sq){;5S83b!;gCKs8*^k|o&5NzTGrS1kY3 z8@$|ZH_ z;GEo)Q=d+FpV?MHPZ)|ruOlt?Gz2(QnaR%^mn-|2f}m@A1J~z4D6(6DrI=Fk@7i4y65iiqPRhn82HVEJE^P z+Hs(o-d8dowxhKgZ8509n*l9`Wy$ggFRT`(F$O>Y&>=0+yiz@*g002ov JPDHLkV1knTMA85N delta 776 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 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tanzanite_block.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tanzanite_block.png index 6d0796c09dc532f521a9fa0d6b0469679f39f1ef..e99b9c017bfb0fcd2d216421d79051fce337a799 100644 GIT binary patch delta 404 zcmV;F0c-xB2gU=CJb%Cd01m(bYSxJf0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@RY%_jN0003*Nkl zpx__)4Ss=8inzD7B{pvS4bO1Gkig+F^WMAn%}kO^ho$8Ga(}Y(`EvbBWJ`QJD?&Ui zAWt{bixLu2Fx+|*Wl!fn#6f3a(jK_q{s;of7|<$YZhI>t0(dwnggKQUVmEj&yy-I| zS$m#fpB=Ahjpv~o7@~mq`uqnsy%pOe?{8=#3+e8cPWFLDCe0^YoD~HuIWbNah>oIU zwIPToaFjQxQ-2Bc08%>D1vCLwAFc695Ct6Fbp%-@;20SA6gCkRfK|5H(Yi6g(+l4y zJ`Q=-frIZLpmx<=vL78TEoP?k{RDuWs7yRC=$F27oGq`Kd{{irDrMu;Ey$$~W0000! delta 880 zcmV-$1CRX11D^+wJb%Fe01m+cxRGn^0000QbVXQnQ*UN;cVTj608n9RZgehAMN}Ym zGcGkQF)>H;LN@>a0~<+1K~y+T0T2W4`~awH=af+0kwWICY2~kS?w?`dn_bGcqgDB&88Gqqo3&@2k=W!C(i)PnR zAHSV^-&`%iOBuOC7Oq$*zfvH+0FFQ7u5s;4`DthcD%$U+k1e=5P_#XbjX{0Lh?#;$}F?X*sb%tsF6(_F-;F!wiZbeF1J7Cj#9aW%dsfG0HqB!*%4a;q zX*$hE616@MtUwU40IhTEeJa*~D%)=m)omBhRs+6J0=G;Aua9!maYoN&IL1{Y!ABgh zEeMx35TPari~y8L&t$W#ElP6n}W5P#KrQ_gZn&QK+}StrFv8n`$O zq$&uIQXswnh&JJE5YlN8(0Ci&VFS!T0Hk#m+g}XJWjez^52{NZw@VteJPfTc4wp|I zyEzc40F!dnjAz(sK*N!6)0=wTl5yCMZPb2Q&aH6lpj_#TJm9Wz?W}L>u5j?IZtkC1 z>i~;p*MC3`u9bAxVKT=<5wS}iwpl5_RwTlzX7hj{>8oz)gel~35!qh|#e^y5aue79 zcTUldZqam2%w{*rKn|`}DZ(=gr%D;Iltt;BU)z*N=7%rmbr#-V2gX?j$#4|X0HlNF zW;n`YHOG8c$ZA8vOBuIE7`QqLtF3VCgDc^QF@NWoRpOLK=6D(2U1kFPLrg<9QRRY16+-K^pOquuq0000