Render Bow with ToolCoreRenderer again

Unmerged 1.6.4 commit: Multiple bugfixes #927 Probably also fixes #912 again
SlimeKnights · Aug 28, 2014 · 9432fe7 · 9432fe7
1 parent 69a14fe
commit 9432fe7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java
@@ -48,13 +48,7 @@ public void renderItem (EntityLivingBase living, ItemStack stack, int renderPass
     {
         GL11.glPushMatrix();
 
-        Block block = null;
-        if (stack.getItem() instanceof ItemBlock)
-        {
-            block = BlockUtils.getBlockFromItem(stack.getItem());
-        }
-
-        IIcon icon = null; // living.getItemIcon(stack, renderPass);
+        IIcon icon = null;
         if (living instanceof EntityPlayer)
         {
             EntityPlayer player = (EntityPlayer) living;

diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java
@@ -15,16 +15,24 @@
 
 public class ToolCoreRenderer implements IItemRenderer
 {
+    private final boolean isEntity;
+
+    public ToolCoreRenderer(boolean isEntity) {
+        this.isEntity = isEntity;
+    }
+
     @Override
     public boolean handleRenderType (ItemStack item, ItemRenderType type)
     {
         switch (type)
         {
         case ENTITY:
+            GL11.glTranslatef(-0.0625F, -0.0625F, 0F);
             return true;
         case EQUIPPED:
             GL11.glTranslatef(0.03f, 0F, -0.09375F);
         case EQUIPPED_FIRST_PERSON:
+            return !isEntity;
         case INVENTORY:
             return true;
         default:
@@ -78,8 +86,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data)
         for (int i = 0; i < iconParts; ++i)
         {
             IIcon part = tempParts[i];
-            if (part == null)// || part == ToolCore.blankSprite | part ==
-                             // ToolCore.emptyIcon)
+            if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon)
                 ++count;
             else
                 parts[i - count] = part;

diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java
@@ -79,8 +79,9 @@ public void registerRenderer ()
         RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom());
         RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender());
 
-        MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer());
-        ToolCoreRenderer renderer = new ToolCoreRenderer();
+        //MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer());
+        MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new ToolCoreRenderer(false));
+        ToolCoreRenderer renderer = new ToolCoreRenderer(true);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.arrow, renderer);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer);
     }