From 034ff07d8a1ce791b8c49a057d0cf84cd9cbda59 Mon Sep 17 00:00:00 2001 From: brad-c Date: Wed, 4 Sep 2013 17:25:21 +0800 Subject: [PATCH] Fixed rendering of equipped painted items. --- .../machine/painter/PaintedItemRenderer.java | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java b/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java index f25e2974..681f3189 100644 --- a/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java +++ b/common/crazypants/enderio/machine/painter/PaintedItemRenderer.java @@ -11,47 +11,37 @@ public class PaintedItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + return true; } @Override public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.INVENTORY || type == ItemRenderType.ENTITY; + return true; } @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if (type == ItemRenderType.INVENTORY) { - RenderBlocks renderBlocks = (RenderBlocks) data[0]; - renderToInventory(item, renderBlocks); - } else if (type == ItemRenderType.EQUIPPED) { - renderEquipped(item, (RenderBlocks) data[0]); - } else if (type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - renderEntity(item, (RenderBlocks) data[0]); - } else { - System.out.println("CustomFenceRenderer.renderItem: Unsupported render type"); + if (data != null && data.length > 0) { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.EQUIPPED) { + renderEquipped(item, (RenderBlocks) data[0]); + } else { + renderToInventory(item, (RenderBlocks) data[0]); + } } } - public void renderEntity(ItemStack item, RenderBlocks renderBlocks) { - Block block = PainterUtil.getSourceBlock(item); - if (block != null) { - renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); - } - renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0f); - renderBlocks.clearOverrideBlockTexture(); - } - public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { Block block = PainterUtil.getSourceBlock(item); if (block != null) { renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); } + GL11.glPushMatrix(); - GL11.glTranslatef(0.75F, 0.0F, 0.0F); - renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], item.getItemDamage(), 1.0f); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + renderBlocks.renderBlockAsItem(Block.blocksList[item.itemID], + item.getItemDamage(), 1.0f); GL11.glPopMatrix(); renderBlocks.clearOverrideBlockTexture(); }