Work on christmas lights

src/main/java/biomesoplenty/ClientProxy.java

@@ -14,6 +14,7 @@ import biomesoplenty.blocks.renderers.BambooRenderer;
 import biomesoplenty.blocks.renderers.ColorizedLeavesRenderer;
 import biomesoplenty.blocks.renderers.FoliageRenderer;
 import biomesoplenty.blocks.renderers.GraveRenderer;
+import biomesoplenty.blocks.renderers.LeavesRenderer;
 import biomesoplenty.blocks.renderers.PlantsRenderer;
 import biomesoplenty.blocks.renderers.PuddleRender;
 import biomesoplenty.blocks.renderers.RenderUtils;
@@ -57,6 +58,7 @@ public class ClientProxy extends CommonProxy {
 		RenderUtils.graveModel = RenderingRegistry.getNextAvailableRenderId();
 		RenderUtils.bambooModel = RenderingRegistry.getNextAvailableRenderId();
 		RenderUtils.colorizedLeavesModel = RenderingRegistry.getNextAvailableRenderId();
+		RenderUtils.leavesModel = RenderingRegistry.getNextAvailableRenderId();
 		
 		RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, new RenderSnowball(Items.mudball.get(), 0));
 		RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, new RenderDart());
@@ -103,6 +105,7 @@ public class ClientProxy extends CommonProxy {
 		RenderingRegistry.registerBlockHandler(new GraveRenderer());
 		RenderingRegistry.registerBlockHandler(new BambooRenderer());
 		RenderingRegistry.registerBlockHandler(new ColorizedLeavesRenderer());
+		RenderingRegistry.registerBlockHandler(new LeavesRenderer());
 	}
 
 	@Override

src/main/java/biomesoplenty/blocks/BlockBOPColorizedLeaves.java

@@ -42,6 +42,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"};
     private Icon[][] textures;
     public Icon christmasLights;
+    public Icon christmasLightsOff;
     private final ColourizedLeafCategory category;
     int[] adjacentTreeBlocks;
     
@@ -77,6 +78,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
             }
         
         christmasLights = iconRegister.registerIcon("biomesoplenty:christmaslights");
+        christmasLightsOff = iconRegister.registerIcon("biomesoplenty:christmaslightsoff");
     }
 
     public Icon getIconBetterLeaves(int metadata, float randomIndex)

src/main/java/biomesoplenty/blocks/BlockBOPLeaves.java

@@ -18,6 +18,7 @@ import net.minecraftforge.common.IShearable;
 import biomesoplenty.BiomesOPlenty;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Items;
+import biomesoplenty.blocks.renderers.RenderUtils;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -56,6 +57,8 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     private static final float[] fallingLeavesChance = new float[] {0.1F, 0.008F, 0.016F, 0.008F, 0.0F, 0.008F, 0.016F, 0.1F, 0.008F, 0.1F, 0.008F, 0.1F, 0.008F, 0.008F};
 
     private Icon[][] textures;
+    public Icon christmasLights;
+    public Icon christmasLightsOff;
     private final LeafCategory category;
     int[] adjacentTreeBlocks;
 
@@ -87,6 +90,9 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
                 textures[0][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fancy");
                 textures[1][i] = iconRegister.registerIcon("biomesoplenty:leaves_" + leaves[i] + "_fast");
             }
+        
+        christmasLights = iconRegister.registerIcon("biomesoplenty:christmaslights");
+        christmasLightsOff = iconRegister.registerIcon("biomesoplenty:christmaslightsoff");
     }
 
     public Icon getIconBetterLeaves(int metadata, float randomIndex)
@@ -119,6 +125,12 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     {
         return Block.leaves.isOpaqueCube();
     }
+    
+    @Override
+    public int getRenderType()
+    {
+        return RenderUtils.leavesModel;
+    }
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })

src/main/java/biomesoplenty/blocks/renderers/ColorizedLeavesRenderer.java

@@ -3,10 +3,12 @@ package biomesoplenty.blocks.renderers;
 import java.util.Calendar;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.ForgeDirection;
+import biomesoplenty.api.Blocks;
 import biomesoplenty.blocks.BlockBOPColorizedLeaves;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
@@ -25,6 +27,7 @@ public class ColorizedLeavesRenderer implements ISimpleBlockRenderingHandler
         BlockBOPColorizedLeaves colorizedLeaves = (BlockBOPColorizedLeaves)block;
         
         Icon christmasLights = colorizedLeaves.christmasLights;
+        Icon christmasLightsOff = colorizedLeaves.christmasLightsOff;
         
         renderer.renderStandardBlock(block, x, y, z);
         
@@ -32,23 +35,33 @@ public class ColorizedLeavesRenderer implements ISimpleBlockRenderingHandler
 
         if (calendar.get(2) + 1 == 12 && calendar.get(5) >= 24 && calendar.get(5) <= 26)
         {
-            if (world.getBlockMetadata(x, y, z) == 5 || world.getBlockMetadata(x, y, z) == 9)
-            {
-                for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
-                {
-                    if (direction != ForgeDirection.UP && direction != ForgeDirection.DOWN)
-                    {
-                        RenderUtils.renderFace(renderer, block, christmasLights, world, x, y, z, 200, direction);
-                    }
-                    else
-                    {
-                        renderer.aoBrightnessXYNN = 150;
-                        renderer.aoBrightnessYZNN = 150;
-                        renderer.aoBrightnessYZNP = 150;
-                        renderer.aoBrightnessXYPN = 150;
-                    }
-                }
-            }
+        	if (world.getBlockId(x, y, z) == Blocks.leavesColorized2.get().blockID)
+        	{
+	            if (world.getBlockMetadata(x, y, z) == 1 || world.getBlockMetadata(x, y, z) == 5 || world.getBlockMetadata(x, y, z) == 9)
+	            {
+	                for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
+	                {
+	                    if (direction != ForgeDirection.UP && direction != ForgeDirection.DOWN)
+	                    {
+	                    	if (Minecraft.getMinecraft().theWorld.isDaytime())
+	                    	{
+	                    		RenderUtils.renderFace(renderer, block, christmasLightsOff, world, x, y, z, direction);
+	                        }
+	                    	else
+	                    	{
+	                    		RenderUtils.renderFace(renderer, block, christmasLights, world, x, y, z, 200, direction);
+	                    	}
+	                    }
+	                    else
+	                    {
+	                        renderer.aoBrightnessXYNN = 150;
+	                        renderer.aoBrightnessYZNN = 150;
+	                        renderer.aoBrightnessYZNP = 150;
+	                        renderer.aoBrightnessXYPN = 150;
+	                    }
+	                }
+	            }
+        	}
         }
         
 

src/main/java/biomesoplenty/blocks/renderers/LeavesRenderer.java

@@ -0,0 +1,84 @@
+package biomesoplenty.blocks.renderers;
+
+import java.util.Calendar;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.util.Icon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.ForgeDirection;
+import biomesoplenty.api.Blocks;
+import biomesoplenty.blocks.BlockBOPColorizedLeaves;
+import biomesoplenty.blocks.BlockBOPLeaves;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+
+public class LeavesRenderer implements ISimpleBlockRenderingHandler
+{
+
+    @Override
+    public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
+    {
+        RenderUtils.renderStandardInvBlock(renderer, block, metadata);
+    }
+
+    @Override
+    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
+    {
+        BlockBOPLeaves leaves = (BlockBOPLeaves)block;
+        
+        Icon christmasLights = leaves.christmasLights;
+        Icon christmasLightsOff = leaves.christmasLightsOff;
+        
+        renderer.renderStandardBlock(block, x, y, z);
+        
+        Calendar calendar = Calendar.getInstance();
+
+        if (calendar.get(2) + 1 == 12 && calendar.get(5) >= 24 && calendar.get(5) <= 26)
+        {
+        	if (world.getBlockId(x, y, z) == Blocks.leaves2.get().blockID)
+        	{
+	            if (world.getBlockMetadata(x, y, z) == 1 || world.getBlockMetadata(x, y, z) == 5 || world.getBlockMetadata(x, y, z) == 9)
+	            {
+	                for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
+	                {
+	                    if (direction != ForgeDirection.UP && direction != ForgeDirection.DOWN)
+	                    {
+	                    	if (Minecraft.getMinecraft().theWorld.isDaytime())
+	                    	{
+	                    		RenderUtils.renderFace(renderer, block, christmasLightsOff, world, x, y, z, direction);
+	                        }
+	                    	else
+	                    	{
+	                    		RenderUtils.renderFace(renderer, block, christmasLights, world, x, y, z, 200, direction);
+	                    	}
+	                    }
+	                    else
+	                    {
+	                        renderer.aoBrightnessXYNN = 150;
+	                        renderer.aoBrightnessYZNN = 150;
+	                        renderer.aoBrightnessYZNP = 150;
+	                        renderer.aoBrightnessXYPN = 150;
+	                    }
+	                }
+	            }
+        	}
+        }
+        
+
+
+        return true;
+    }
+
+    @Override
+    public boolean shouldRender3DInInventory()
+    {
+        return true;
+    }
+
+    @Override
+    public int getRenderId()
+    {
+        return RenderUtils.leavesModel;
+    }
+}

src/main/java/biomesoplenty/blocks/renderers/RenderUtils.java

@@ -20,6 +20,7 @@ public class RenderUtils
 	public static int graveModel = -1;
 	public static int bambooModel = -1;
 	public static int colorizedLeavesModel = -1;
+	public static int leavesModel = -1;
 	
 	public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta)
 	{

src/main/resources/assets/biomesoplenty/textures/blocks/christmaslights.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 12
+  }
+}