From d7d6400cd5d9a73a250b00d642676a3d65c179a7 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Fri, 20 Sep 2013 22:30:29 -0400
Subject: [PATCH] Tweaked shrub texture

---
 .../biomesoplenty/blocks/BlockBOPFoliage.java   |   1 +
 .../itemblocks/ItemBlockFoliage.java            |   3 ++-
 .../textures/blocks/item_shrub.png              | Bin 0 -> 594 bytes
 .../biomesoplenty/textures/blocks/shrub.png     | Bin 610 -> 651 bytes
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/biomesoplenty/textures/blocks/item_shrub.png

diff --git a/common/biomesoplenty/blocks/BlockBOPFoliage.java b/common/biomesoplenty/blocks/BlockBOPFoliage.java
index b6819438c..321fe1749 100644
--- a/common/biomesoplenty/blocks/BlockBOPFoliage.java
+++ b/common/biomesoplenty/blocks/BlockBOPFoliage.java
@@ -214,6 +214,7 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
 	{
 		double var1 = 0.5D;
 		double var3 = 1.0D;
+		
 		return ColorizerGrass.getGrassColor(var1, var3);
 	}
 
diff --git a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java b/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
index 95cc5b321..935b5f101 100644
--- a/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
+++ b/common/biomesoplenty/itemblocks/ItemBlockFoliage.java
@@ -41,13 +41,14 @@ public class ItemBlockFoliage extends ItemColored
 
 		textures[3] = iconRegister.registerIcon("biomesoplenty:item_highgrass");
 		textures[8] = iconRegister.registerIcon("biomesoplenty:item_berrybush");
+		textures[9] = iconRegister.registerIcon("biomesoplenty:item_shrub");
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
 	public int getColorFromItemStack(ItemStack itemStack, int par2)
 	{
-		if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8)
+		if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9)
 			return 16777215;
 		else
 			return Blocks.foliage.get().getRenderColor(itemStack.getItemDamage());
diff --git a/resources/assets/biomesoplenty/textures/blocks/item_shrub.png b/resources/assets/biomesoplenty/textures/blocks/item_shrub.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8c1a919dafde777e96561a2c8161f629e5c68e9
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000iY000iY0qR1rzyJUM8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^7j^FlWO00GWPL_t(IPpwkNPC`)-eS1OSxwa!<1q2@UhG1_5qbA0vSYkJJ
zjlC-|8cU)p<Ch*eqY@v!#ErAL_s-libI!~t|6*mU8Th)2X_qRz$5x&1PkY_z5CFlh
zO$+R!X2S&j3l$anDarlkDgtp8v7Ry%j+$T}*Mln#J^?&EyNTpuKjO^Dih0pA^fWl}
zyb+e5Ys;cb^0XcjR?b)oGslD(wh>d(+234($F&ySr}%s=y6YW!ppp4btni&$u`sCN
zWxHJf5350h1G&(yRQS)-WRg^dB8AhSeoC2*dcnrd4fv!wnX(7oBP*_FtADd`PMPJ?
z*HgJ)X+k7eil8qm>7!KVq!}|2k3In_-z_(a)3f(UEu`h3>ONB>@y$l_oa`+ZNxbW<
z#h;D$<A?-0YHU)OjNCgG(NF)|VISJ73&62^4}a`J;6{aZt%`2G-P;!2%+(+oDu*L6
zHd61ZvxC(cw+)+6GM_FzQMj^{KyA$ay$4Ifm1wKVmpj=}HyQ9v<4zO|CC2Yabe&b`
zWCC`b_s-fvVRXA#FH_-`(#M#gkv30$;vNvhUXb>5zdH%mX*aUo#v;)^5O#soslBhM
g7_F6g20%sm0EFM|yA0(*$p8QV07*qoM6N<$f>(D53jhEB

literal 0
HcmV?d00001

diff --git a/resources/assets/biomesoplenty/textures/blocks/shrub.png b/resources/assets/biomesoplenty/textures/blocks/shrub.png
index 5d0528bc85f180016bf127cef7b5b7869b20d2bd..c05f6d5fa4e38c0411bdb8878d938087ec59e318 100644
GIT binary patch
delta 566
zcmV-60?Ga21d9cbJPN-601m$aI0aKAkwz$g0tZP%K~y+Tol;p(lTi@uFX%sT-*5pT
zA|fCHr4>+F8i?UpBLM{oXah-8)1*!JYEV;svVCdVrb)MSNz*m$TYuEiGx59SBR(<7
zm+#KpnKS3i9fQ$ml<(Ze;%GFAf3EnAMgyf%31`7IUl-S$U&l)V!s2*54!7H_0JLO(
z{_FKRve~TMsbH;EL$}+->*YbXTrPOMUR`l6mlJUQ)9Exk9#0>Di0o*y*|7X{06#ui
zBsq~t=p=mqXckt%U{KG@@At#$bSlKPxx4swIIm_x3%r}c%jsLXm;yL$<#HL7N(Jv<
zjp66fq7<AQm|%Hy8O>%B)oN8W(ikd#Bua_JVxpf?w$~qkgWcH}mF{Gk&*xDr7UA2T
z=(EuP!r`za3F=?_x<3o6=^jj@7bKZ+N)3fV*s_l30k{WWKFmmQCX<m%^VlWydOeZE
zI0w!6o0TDv#Iw%kA6`VvX_bqm$?MXYj8dr-TCJ9V{QkU(#ffX+vlj}5{tP;QoetXV
zw&*56GMR*bXA<k?Ap`;ed8HRmZi3x;?{GK}i9{g#!IkCksEz2_9_($7W8v{tIg=fA
zlL37;<xbe`b{Kp<pLAi60Gv9Lo=@EnMxotlc@=IcW6V4KsRL<ih1>%caTcWgc5PUS
zd9P`g;{Vyo%x%%WVYv@dr}ot$**kbPenrvm0~ic{08WEPO)dGE0000007*qoM6N<$
Ef}Io+UH||9

delta 524
zcmV+n0`vWg1>yvdJPN=701m(bYSxJfkwz$g0p3YOK~y+Ttx{P}lTi@;{s@Z7>VgpV
zMFdN$AZr6LK5MX`*2Y3h_xe}~!L*Q+wkheBE@`@^ed}*K=1j2U%9r@!yv&{boVla@
z7YT>MxOs}yYBdxJ1;zJIxpJ*Z0gI#2D4b5GZi8yIigY@y#wwKx+U+(zY(9g-;egwJ
z?N$;pnT*)f$z&2Pm+Lmpj+|(*Sg`qW2$#nu3C3bErOCySQBe8)e#NhOy<XVu_O5g1
z)e}VQD@xMo=LKvm4yuKEQY;oxDwXi%-4voHt5OjDZh&dJ7xj7_<#M^(<ZpyRB@&4U
ze^NQv9S0YCxHlowi8PzdBA?GAbTD^+7fmo2l%yL|`(;~(+3*yGiJq>HR0DwkKAFeV
z2E2pwZ%g7#rBb4eQ}@y7bc7OZE}Ht|)`(EzTalH?dr18-OJHrjPbL#lB9TC&(GdT2
zU>mD*kHBxw<#M-8TCEnE&8G0C9goNH^Kc%!#u4~@KKZ5f7X#pQ#%(qmLZJ|M<UV+^
zTpqcx`=2|ozMsLH*@yBbI`Sq0+7#Y|)oO+2@pxnkoov9Z^Zj<AUl5&rU6fzpmD0zU
zt`IgglXwR#;w}h#e`mB?tZ>(pt)*e%zGr$4LMQj_<;QqE^FXIi(|!ZBxHBL2hcK`J
O0000<MNUMnLSTaWP6ayv