From 4f9f63ac932eb0d351b652c555f2b6e920c9dc79 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 10 Oct 2014 18:02:55 +0200 Subject: [PATCH] Fix bolt fletchling color --- .../tconstruct/weaponry/ammo/BoltAmmo.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java index 5e3c4fb8..2827aaf3 100644 --- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java @@ -1,5 +1,9 @@ package tconstruct.weaponry.ammo; +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.tools.DualMaterialToolPart; import tconstruct.library.weaponry.AmmoItem; @@ -89,4 +93,18 @@ public class BoltAmmo extends AmmoItem { list.add(tool); } } + + @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; + } }