From 8e0bfdd0ed91a0acaee55b9fe129b7688aa39284 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 22 Sep 2014 15:51:55 +0200 Subject: [PATCH] Fix entities/weapons in hand not using the color modifier --- src/main/java/tconstruct/client/ToolCoreRenderer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index b9a554aefc6..acdcb77c11a 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -143,6 +143,17 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) } GL11.glPushMatrix(); + // color + int color = item.getItem().getColorFromItemStack(item, 0); + float a = (float)(color >> 24 & 0xff) / 255F; + float r = (float)(color >> 16 & 0xff) / 255F; + float g = (float)(color >> 8 & 0xff) / 255F; + float b = (float)(color & 0xff) / 255F; + // no invisible + if(a < 0.01f) + a = 1.0f; + GL11.glColor4f(r, g, b, a); + if (type == ItemRenderType.INVENTORY) { GL11.glDisable(GL11.GL_LIGHTING);