From e8a5c364e2b0b7e6b625ee72a628aa9cc6eae833 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 23 Jun 2015 21:26:23 -0400 Subject: [PATCH] SleepyTrousers/EnderIO#2603 Fix techne model icon handling --- .../enderio/core/client/render/TechneModelRenderer.java | 4 ++-- .../java/com/enderio/core/client/render/TechneUtil.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/enderio/core/client/render/TechneModelRenderer.java b/src/main/java/com/enderio/core/client/render/TechneModelRenderer.java index 27069e4..8f2cb4b 100644 --- a/src/main/java/com/enderio/core/client/render/TechneModelRenderer.java +++ b/src/main/java/com/enderio/core/client/render/TechneModelRenderer.java @@ -49,13 +49,13 @@ public class TechneModelRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { TechneUtil.vt = this.vt; - TechneUtil.renderInventoryBlock(getModel(block, metadata), block, metadata, renderer); + TechneUtil.renderInventoryBlock(getModel(block, metadata), getModelIcon(block, metadata), block, metadata, renderer); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { TechneUtil.vt = this.vt; - return TechneUtil.renderWorldBlock(getModel(world, x, y, z), world, x, y, z, block, renderer); + return TechneUtil.renderWorldBlock(getModel(world, x, y, z), getModelIcon(world, x, y, z, block), world, x, y, z, block, renderer); } protected IIcon getModelIcon(Block block, int metadata) { diff --git a/src/main/java/com/enderio/core/client/render/TechneUtil.java b/src/main/java/com/enderio/core/client/render/TechneUtil.java index e1e5900..532766d 100644 --- a/src/main/java/com/enderio/core/client/render/TechneUtil.java +++ b/src/main/java/com/enderio/core/client/render/TechneUtil.java @@ -404,18 +404,11 @@ public class TechneUtil { vt = null; } - // TODO private static IIcon getIconFor(Block block, IBlockAccess world, int x, int y, int z) { -// if(block instanceof AbstractMachineBlock) { -// return ((AbstractMachineBlock) block).getModelIcon(world, x, y, z); -// } return block.getIcon(world, x, y, z, 0); } private static IIcon getIconFor(Block block, int metadata) { -// if(block instanceof AbstractMachineBlock) { -// return ((AbstractMachineBlock) block).getModelIcon(); -// } return block.getIcon(0, metadata); } }