From c9788073d9015231681984c412e9652603ad1533 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Thu, 21 Jan 2016 16:26:30 -0500
Subject: [PATCH] Fixed lily pad and duckweed rendering

---
 .../common/block/BlockBOPLilypad.java         |  43 ++++++++++++++++++
 .../textures/items/berrybush.png              | Bin 15977 -> 662 bytes
 2 files changed, 43 insertions(+)

diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
index a5e90e4b9..40febd48a 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
@@ -9,6 +9,8 @@
 package biomesoplenty.common.block;
 
 import biomesoplenty.api.block.IBOPBlock;
+import biomesoplenty.common.block.BlockBOPGrass.BOPGrassType;
+import biomesoplenty.common.enums.BOPPlants;
 import biomesoplenty.common.item.ItemBOPLilypad;
 import net.minecraft.block.BlockLilyPad;
 import net.minecraft.block.properties.IProperty;
@@ -18,6 +20,12 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.ColorizerGrass;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.biome.BiomeColorHelper;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock
 {
@@ -90,4 +98,39 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock
         return net.minecraftforge.common.EnumPlantType.Water;
     }
     
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getBlockColor()
+    {
+        return 0xFFFFFF;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(IBlockState state)
+    {
+        switch ((LilypadType) state.getValue(VARIANT))
+        {
+            case DUCKWEED:
+                return ColorizerGrass.getGrassColor(0.5D, 1.0D);
+            
+            default:
+                return 0xFFFFFF;
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+    {
+        switch ((LilypadType) worldIn.getBlockState(pos).getValue(VARIANT))
+        {
+            case DUCKWEED:
+                return BiomeColorHelper.getGrassColorAtPos(worldIn, pos);
+            
+            default:
+                return 0xFFFFFF;
+        }
+    }
+    
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png
index 3394bb773ac3e6e70eea37e12090a59a81c213ed..ff09dc4b411d27eda1a9d52a190d26791fd62e6a 100644
GIT binary patch
delta 598
zcmV-c0;&D!e3k`}B$MSkD}Mk9a7bBm000id000id0mpBsWB>pF7<5HgbW?9;ba!EL
zWdLwtX>N2bZe?^JG%heMIczh2P5=M__(?=TR5(w4lUq+yQ4oduCha+=r-f=lnwHW-
zOA8#iR1*wfNYsRDxTt_pAq1?(c!dx(;w^-CA0z=E`3d|de#fxC*?+W9(lAN0_ny6G
z)>^YqBUfYWe@cdaCgtvat8gCpmXNWdl#KjK$(_BV=9<Rn;RRsmhix$UJs~3pDXIKP
zO68Zm8$Z6;yh-0jUqJ(36Lsd^_i-)m|6+5T$>00iCWE^+r$Lgn?}INrZ{i}=s^p(K
zQZ{=mg<HPd-u88+A%BhdX)zL!3VX2Pip<Q&X&A~$5J=D4xU!dD+k#Tn6G%!M-UT}V
zfHYtRfR3_R1#}x=<#$q*WF}&&th8y1sbP&EnH3u}E4*|iH|I!U)m0{BcdvU5%5sa2
zlwNt7*Ctp9Kl>6qb0srrnL6fT(q+!YRj)oolyTqn+|}aZ+J7Z0_|HFa8kkUnC7Ohv
zECE;=lGj24Cj7F;D@@4DFFVS{;MjAI^rB(sTd7;<-?0*5?0pwk`Rr>Fv2<(rM%@xK
zqDiMw%)JKSj#*pC@BpSCL>nxnA4Mg<WCm#N8$Kk0VkBjzV*2K}1xL~kqmrGrmfG*P
z=u;}zDAb~6QA@j|0sd*wKHeg^c_SN@*A>?yST<gb8o($jys*<pz5=cbiWpMoV@FpS
kpn_LnX#7Xcp(Y}cGuQbqzbUKpRR91007*qoM6N<$f|5)W$^ZZW

literal 15977
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
VJv8!jMtd3DUAf-Xzou#XzW`R1uwDQF