From f8d378f4bcee9261915bc0051d719949d2db2618 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Thu, 16 May 2013 09:48:45 -0400
Subject: [PATCH] Tweaked some stuff with the currently unused berry bushes

---
 .../biomesoplenty/configuration/BOPBlocks.java    |   1 +
 .../biomesoplenty/items/ItemBOPFoliage.java       |   3 ++-
 .../textures/blocks/item_berrybush.png            | Bin 0 -> 636 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/item_berrybush.png

diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java
index 6a478e816..43819844c 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java
@@ -273,6 +273,7 @@ public class BOPBlocks {
         LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,4), "Dying Leaves");
         LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,1), "Short Grass");
         LanguageRegistry.addName(Blocks.leavesFruit.get(), "Apple Leaves");
+		LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,8), "Berry Bush");
 		LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,7), "Poison Ivy");
         LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,5), "Sprout");
         LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,4), "Bush");
diff --git a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java b/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java
index 356b44553..bb9087af8 100644
--- a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java
+++ b/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java
@@ -38,12 +38,13 @@ public class ItemBOPFoliage extends ItemColored
             textures[i] = iconRegister.registerIcon("BiomesOPlenty:" + foliageTypes[i]);
         
         textures[3] = iconRegister.registerIcon("BiomesOPlenty:item_highgrass");
+		textures[8] = iconRegister.registerIcon("BiomesOPlenty:item_berrybush");
     }
     
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack itemStack, int par2)
     {
-        if (itemStack.getItemDamage() == 3)
+        if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8)
             return 16777215;
         else
             return Blocks.foliage.get().getRenderColor(itemStack.getItemDamage());
diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_berrybush.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_berrybush.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfd68ecf22c7b20762bfd0a065acac02561206b2
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000ib000ib0l1NC?EnA(8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^4L^m3s900H<(L_t(IPkobHPg7A4h5IJ$Ij5(EYC@Wp(nCuN9Jy2z3}8sq
zglo8{fKed?tj2hS5H;d0gm)h#0U!AZ{3m|Lu)o=~P|`3-v-h68X4YD>Pa{`j?0-sz
zekSGaeyeaE_?D2dqm+#NOUa$Rq~@B&=-~xm=!b1E_&p&b2PvuiNlN9Hy&FHi*}O^L
zM_)k$UlVoa-uH1W?*C$QoXOw&+a`m%Hm5<7weN#3J#XS7)vDy5I#M=!EQMRX+}`$e
zr6G;@X)zL!3VX2Pip<Q&X&A~$5J=D4xU!dD+k#Tn6G%!M-UT}VfHYtRfR3_R1#}x=
z<#$q*WF}&&th8y1sbP&EnH3u}E4*|iH|I!U)m0{BcdvU5%5sa2lwNt7*Ctp9Kl>6q
zb0srrnL6fT(q+!YRj)oolyTqn+|}aZ+9fOa&p&Y*m{5ZynuMP$0azN6*Fpj&{IbU@
zOvubHJIco3*mIBcqG9J-saxpZu@YhIeHT~x>}wLSbZhuV-4ZjRNvBcFy$0ZpSzE~P
z0Hz;A8!V+CMJ2yv259aZJ|u!-BxR;z`sTR>N74_YlAX4e+V8jMQ!3Ud)S_llyQBgB
zY0y62BDr}Z8<p1;*CJRpUX2>SC@Q?L(?`Ant_zA7Qs-kwR~n##S7B)UN6w)pB9SxK
W`7ggItMgR=0000<MNUMnLSTZh;259)

literal 0
HcmV?d00001