From 19ba9f351578c7471798850b273a3485fb2eea86 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 23 Nov 2014 12:47:44 +0100 Subject: [PATCH] work on #2222 --- common/buildcraft/transport/render/FacadeItemRenderer.java | 4 +++- common/buildcraft/transport/render/FakeBlock.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 854f900e..e7b4254f 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; @@ -53,9 +54,10 @@ public class FacadeItemRenderer implements IItemRenderer { } Block block = activeState != null ? activeState.block : null; int decodedMeta = activeState != null ? activeState.metadata : 0; + ItemStack decodedStack = new ItemStack(block, 1, decodedMeta); try { - int color = item.getItem().getColorFromItemStack(new ItemStack(block, 1, decodedMeta), 0); + int color = decodedStack.getItem().getColorFromItemStack(decodedStack, 0); RenderUtils.setGLColorFromInt(color); } catch (Throwable error) { } diff --git a/common/buildcraft/transport/render/FakeBlock.java b/common/buildcraft/transport/render/FakeBlock.java index 2003198f..a92bd155 100644 --- a/common/buildcraft/transport/render/FakeBlock.java +++ b/common/buildcraft/transport/render/FakeBlock.java @@ -17,6 +17,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.transport.BlockGenericPipe; /* @@ -40,6 +41,10 @@ public final class FakeBlock extends Block implements ITextureStates { @Override public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { + // TODO: Move this somewhere else? + if (BlockGenericPipe.facadeRenderColor >= 0) { + return BlockGenericPipe.facadeRenderColor; + } return colorMultiplier; }