From 9e2a57b14bb6081bee5ebf559a33f74540d80ff8 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 26 Nov 2014 13:31:10 +0800 Subject: [PATCH] #1298 Painted Blocks for biome specific Blocks render grey --- .../enderio/machine/painter/BlockPaintedFence.java | 13 +++++++++++++ .../enderio/machine/painter/BlockPaintedSlab.java | 13 +++++++++++++ .../enderio/machine/painter/BlockPaintedWall.java | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java index 1ed9d86d..d38ccf31 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java @@ -263,6 +263,19 @@ public class BlockPaintedFence extends BlockFence implements ITileEntityProvider return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; } + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + public final class PainterTemplate extends BasicPainterTemplate { public PainterTemplate() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 9a627b30..870b3e00 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -237,6 +237,19 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, return 0; // need to do custom dropping to maintain source metadata } + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + public final class PainterTemplate extends BasicPainterTemplate { public PainterTemplate() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java index 85fc4942..e9284299 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java @@ -237,6 +237,19 @@ public class BlockPaintedWall extends BlockWall implements ITileEntityProvider, return 0; // need to do custom dropping to maintain source metadata } + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + public final class PainterTemplate extends BasicPainterTemplate { public PainterTemplate() {