Bowstring Textures fixing

SlimeKnights · Oct 5, 2014 · 86fc2dd · 86fc2dd
1 parent 0bdf319
commit 86fc2dd
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 16 deletions.
diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring.png b/resources/assets/tinker/textures/items/longbow/_bowstring.png
diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_1.png b/resources/assets/tinker/textures/items/longbow/_bowstring_1.png
diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_2.png b/resources/assets/tinker/textures/items/longbow/_bowstring_2.png
diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_3.png b/resources/assets/tinker/textures/items/longbow/_bowstring_3.png
diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png
diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring.png b/resources/assets/tinker/textures/items/shortbow/_bowstring.png
diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png
diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png
diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png
diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png
diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java
@@ -1,5 +1,7 @@
 package tconstruct.library.weaponry;
 
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.tools.BowstringMaterial;
 import tconstruct.weaponry.ammo.ArrowAmmo;
 import tconstruct.weaponry.entity.ArrowEntity;
 import net.minecraft.enchantment.Enchantment;
@@ -146,22 +148,13 @@ public void buildTool (int id, String name, List list)
             list.add(tool);
         }
     }
-/*
+
     @Override
-    public int getColorFromItemStack(ItemStack stack, int renderPass) {
-        if(renderPass != 0 || !stack.hasTagCompound())
-            return super.getColorFromItemStack(stack, renderPass);
-
-        // bowstring: custom material -> custom coloring
-        // todo: move this into the custom material itself
-        int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Handle");
-        switch(mat)
-        {
-            case 0: return 0xffffffff; // string = white
-            case 1: return 0xffccccff; // macig string = light blue
-            case 2: return 0xffffcccc; // flamestring = light red
-        }
-        return super.getColorFromItemStack(stack, renderPass);
+    protected int getDefaultColor(int renderPass, int materialID) {
+        // bowstring uses custom material
+        if(renderPass == 0)
+            return TConstructRegistry.getCustomMaterial(materialID, BowstringMaterial.class).color;
+
+        return super.getDefaultColor(renderPass, materialID);
     }
-    */
 }