From c2bb289b6774b0b869653c80e72aa89f05785c87 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 21 Sep 2013 05:15:43 -0400 Subject: [PATCH] Shrub things --- .../biomesoplenty/blocks/BlockBOPFoliage.java | 5 +++++ .../biomesoplenty/textures/blocks/berrybush.png | Bin 637 -> 639 bytes .../textures/blocks/berrybush_berry.png | Bin 0 -> 244 bytes .../textures/blocks/item_shrub.png | Bin 594 -> 612 bytes .../biomesoplenty/textures/blocks/shrub.png | Bin 653 -> 722 bytes 5 files changed, 5 insertions(+) create mode 100644 resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png diff --git a/common/biomesoplenty/blocks/BlockBOPFoliage.java b/common/biomesoplenty/blocks/BlockBOPFoliage.java index 3de634e1a..4a0eee1ce 100644 --- a/common/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/common/biomesoplenty/blocks/BlockBOPFoliage.java @@ -238,6 +238,11 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable @SideOnly(Side.CLIENT) public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + if (par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 9) + { + return par1IBlockAccess.getBiomeGenForCoords(par2, par4).getBiomeFoliageColor(); + } + return par1IBlockAccess.getBiomeGenForCoords(par2, par4).getBiomeGrassColor(); } diff --git a/resources/assets/biomesoplenty/textures/blocks/berrybush.png b/resources/assets/biomesoplenty/textures/blocks/berrybush.png index 1b09126a6b45aac275c6e4adc8094fbc9039bfe3..1a300e896e26e74965a14b3bb97a248c8a8fdda4 100644 GIT binary patch delta 561 zcmV-10?z&Y1pfq(JPN@801m+cxRGn^kwzhZF-P-4Hvj+u`$0HHk(mkGMUJJzn8DCFIg;q z7VMqR=f@(=W|N@da7e&-JeGRBPIABB=NZ1?XuI9YbUOVJ!Xeg1qap9_?;=K{;`8~W zTrLYDbvhmCcDr052%%c7b`gL@SjF^EC?xXws{DC*Q9hram5+}PPA`>8BovE9!H`@o z_cI-UN~J=9)oMjh?dgfVY&I*)<&sW+3^&SuqJV1Azdi;o`7IAJ)_9wBW7WBJ_HHJ#H|u zTCED~V}G@XNGg@;772F*5s$}n5kLWKv)M?*%gZmtlpTCIX#1(${#|Hwb+cPYwWwJyi&+p*Q800000NkvXXu0mjfmBS46 delta 559 zcmV+~0?_^c1pNe%JPN`901mChynk=jkplq`@ZA6RQWXckep5T?Ne2! zs%;hj*ZF*w#bP1b?N;zT9*^a8I>~;&m#?oco;|JO@puQ!=W_~7r&Bo`4zgaaWw~5` zvUj;$o{O|vErLd)5do9QL>i3-$%DawXZVJr-EJqd+3ZIMhgh4vuUMc&`#&)b`PzP?JOQsMMsu}DIpP!J5sX0t!j z0jO516xeJw1l3<&2*_kIvRbX^M6cI>(^)Q;V-Fmx3RuR9%n*ykVq&-3B_5A+5^Sf_ z=?7;nmrL^bJkKeD2%SzxLZOftjYdwg*=!OHhb56n$Z$9$5YEt#L?R?7lgX<93i&-A z&%-3RK_rN@+iea27EWoX`~_6q+t*B)fEEA%002ovPDHLkV1m+F{zm`+ diff --git a/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5e7b86b6850ba8d1b9c15f0afcc82a800cfb8d GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kve~v zE{-7<{#z&R=4~+GVV$Ys`zmLWmdKI;Vst0Mf-%xc~qF literal 0 HcmV?d00001 diff --git a/resources/assets/biomesoplenty/textures/blocks/item_shrub.png b/resources/assets/biomesoplenty/textures/blocks/item_shrub.png index d8c1a919dafde777e96561a2c8161f629e5c68e9..03b00e86e99b64edae6de02d16dba67e4407b343 100644 GIT binary patch delta 525 zcmV+o0`mRR1mpyeJPN%401mwYNBfYikwz(h;7LS5R5(wqQcF)-VGzAb9>TS&wkj%G z-U8ZMOHruEqk^ppYK#lD6@mpywMri*rcIY>8jX*nT{Zos$9v`?$yJOS&*I*1=9@V) zbG}jT1p~`gG>?LzEfwxHo56P{{_f=@A^fcquC)$0rY&s=0(Cn)@2`;ucT_z6@c_kt z*&rT9P3TIP4FSFncCp=BqPJ`_lCz?xXhV0}jM-OSTztvs!Ry8<=Z&-wGp^~<(UURb zaop5$=BENU+f5mQj%pKl8}}F!+ac6Y5vbYmad`}XzGo%jbSH_-i++T^b|Sc~wn(mb zs4M?Y8zrTWQdxWk3R_(omFnF|Gkj%#JE+G&C3>?PN6sS2O;b79PN0w+LUPp6@^M`1 zuvr)}61Y}7aJ)4sPT!`kczUc)UdCV5ZN~6lnhVKDJR6XD-i!ag3UZMfe7qN&s*VmEonmX z<6N*x5ZSNx;L}P3(=P|)%O!%=kwz(h&PhZ;R5(wqQpZk0Q4oE5LE*W!BVYvt z9`=S{Zv>+z#;90gH+GG^D=`{NqATN<9yy~DAHKwmv$^-q+%t2|%qah2WvdzZx{7I+ zD!j*5o$pV3-RTej!LCgU?4xGG1pW&Z75gd4{pTtIaTT$iG8B%QU?10mD-J#ZJUzRA ziR5EH;>^g3dC@fVG&u3R5tg89%c4v2v>p;x&R7aF$AlTS5mVCH-&}&nwHDo{_m7Qak@-%n@SR$*FsR{WyIlYet3iYVxzMgu_|Md2l2nEwh0~yZN|}v%!N$%F_@p|S zvIpKHE3Rj&f3tB;ndQ^hQ@LMhLL^v!il8qm>7!KVq!}|2k3In_-z_(a)3f(UEu`h3 z>ONB>@y$l_oa`+ZNxbW<#h;D$wE4KnK*`o znIQ>;$sDqbAvuNQkmWWeh(U1+;&O{Y2wvS4alr)-DkA7j&_7t|s^`-o`QX{r)m7E? zeO-cHuLp<20Xm%y2o{S4TrL;e|3Zr)P~HK>Vi8Ry6WeC98K%=IRw@;gWf=?x188S| z1WJ@7>9BHDGBTgfIAFbAW4T<$R4Rqkjh3vflgR`djRum<9Z{vlVu8Ee4zEu25C{Y? z91bJhtfAlUBgNJ0b?kIHTzr3|-q>ojFp)^0OLUU{<08yaApYJB7O|3lKBNo5>2&hSs%wGE7;&Z#*&d*77Baw&@TaBR(`FTpE5(fQdwtKxEQj$%7aNTaV zI2;axb0KdOI-tPc{!61?*kWQy(c{qqSJ<7EgSTIU|`B35+a0vVPeZhVI-2Z`YO!%=kwz(h2}wjjR5(waQdw_OVGx~Pz&~)`x2mz$ z+Sb}iL0h#8X=8lWXj<2}5KRb%1j3HSCFqmzLV%F4g(ZYF@WziCJ*U05MSb!lH+N>f zZ_dn_Z^UA;@cVBdIgv={j!VDYZfmt#)j!D%ei7G13BZVoPN!3sub-4}Z|#hy z)9DcjU*FgST}2|1(au7lka|2GlX30F8Ts;hfwqD0lNq@?dt%4ihDop&wOUQ<^}0U2 zHzD8OEi(4`l~wFl4oauf(MF?T7BV`2G?^eJnM_hYq-?HV;$XKn##tSmmP#e9R4N+W zoFWNf5X53J#U---#;2F_;;^0->-awUh(l^L8r8>+i;NLCz#e>jF-JR}&vW9oi32hm z4k-z73>xu=D`S-O7Zxt>m!!u*dujS8E2E=qHmlukmn1(wtjgll5k7mlT;833LBHSE zUazOn4P-JI4Q)-!x@}Ct;V@t6&b8yL4!GTJjmP84{lLm%c+duRV-KF+pOjly57S0> z(2WiN6va-sTrQPhFsP`4AP6vZ;P%WhzC`rdtl(9!rHJ9)-p@49wvmWEKoVwwwjZrs zU>q>CGx=XwnL9=88}{>T9oknS=TFPc$wNFhlD7#&egV<)1dvUT)QSKA002ovPDHLk FV1khZ6N~@=