Fix colors for fletchlings on arrows

SlimeKnights · Oct 10, 2014 · 2988b75 · 2988b75
1 parent 852ceca
commit 2988b75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java
@@ -56,6 +56,7 @@ public void registerRenderer ()
 
         //MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer());
         ToolCoreRenderer renderer = new ToolCoreRenderer(false);
+        /*
         MinecraftForgeClient.registerItemRenderer(TinkerTools.pickaxe, renderer);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.shovel, renderer);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.hatchet, renderer);
@@ -73,6 +74,7 @@ public void registerRenderer ()
         MinecraftForgeClient.registerItemRenderer(TinkerTools.mattock, renderer);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.rapier, renderer);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.scythe, renderer);
+        */
         renderer = new ToolCoreRenderer(true);
         MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer); // todo proper renderer
 

diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
@@ -1,6 +1,10 @@
 package tconstruct.weaponry.ammo;
 
 import tconstruct.TConstruct;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.tools.CustomMaterial;
+import tconstruct.library.tools.FletchingMaterial;
+import tconstruct.library.tools.FletchlingLeafMaterial;
 import tconstruct.weaponry.TinkerWeaponry;
 import tconstruct.library.weaponry.AmmoItem;
 import net.minecraft.creativetab.CreativeTabs;
@@ -116,4 +120,18 @@ public void getSubItems(Item id, CreativeTabs tab, List list) {
         else
             TConstruct.logger.error("Couldn't build vanilla equivalent of Tinker Arrow");
     }
+
+    @Override
+    protected int getDefaultColor(int renderPass, int materialID) {
+        if(renderPass != 2)
+            return super.getDefaultColor(renderPass, materialID);
+
+        CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class);
+        if(mat == null)
+            TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class);
+        if(mat == null)
+            return 0xffffff;
+
+        return mat.color;
+    }
 }