Some rendering stuff and fixes with bolts/arrows

SlimeKnights · Oct 19, 2014 · e7454a5 · e7454a5
1 parent f31e414
commit e7454a5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/resources/assets/tinker/textures/items/arrow/reed_arrow_shaft.png b/resources/assets/tinker/textures/items/arrow/reed_arrow_shaft.png
diff --git a/.../textures/items/parts/leaf_fletching .png → ...r/textures/items/parts/leaf_fletching.png b/.../textures/items/parts/leaf_fletching .png → ...r/textures/items/parts/leaf_fletching.png
diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java
@@ -213,8 +213,6 @@ public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer pl
     public HashMap<Integer, IIcon[]> animationExtraIcons = new HashMap<Integer, IIcon[]>();
     public HashMap<Integer, IIcon[]> animationEffectIcons = new HashMap<Integer, IIcon[]>();
 
-    // todo: animated effects
-
     /**
      * return true if the current renderpass should use animations.
      * 0 == handle

diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java
@@ -69,7 +69,7 @@ private void registerMaterialRendering()
         ToolCore arrow = TinkerWeaponry.arrowAmmo;
         String pre = Reference.resource(arrow.getDefaultFolder()) + "/";
 
-        String[] shaft = {"wood", "bone", "blaze", "reed", null};
+        String[] shaft = {"wood", "bone", "reed", "blaze", null};
         String[] fletching = { "feather", "leaf", "slime", "blueslime", "slimeleaf" };
 
         // we register different textures for the different parts per index

diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
@@ -101,7 +101,7 @@ protected int getDefaultColor(int renderPass, int materialID) {
 
         CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class);
         if(mat == null)
-            TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class);
+            mat = TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class);
         if(mat == null)
             return 0xffffff;