diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 9ec98f7a..35e61029 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -8,7 +8,10 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.BowstringMaterial; +import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; @@ -41,6 +44,15 @@ public class Arrow extends ToolCore } } + @Override + protected int getDefaultColor(int renderPass, int materialID) { + // fletchling uses custom material + if(renderPass == 2) + return TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class).color; + + return super.getDefaultColor(renderPass, materialID); + } + @Override public String getEffectSuffix () { diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index d8f3561f..9acb9f6e 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -9,6 +9,8 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.BowstringMaterial; import tconstruct.tools.TinkerTools; public class Shortbow extends BowBase @@ -37,6 +39,17 @@ public class Shortbow extends BowBase } } + + @Override + 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); + } + + @Override public String getEffectSuffix () { diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 13a438df..25611738 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -675,7 +675,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo return super.getColorFromItemStack(stack, renderPass); } - private int getCorrectColor(ItemStack stack, int renderPass, NBTTagCompound tags, String key, Map map) + protected int getCorrectColor(ItemStack stack, int renderPass, NBTTagCompound tags, String key, Map map) { // custom coloring if(tags.hasKey(key + "Color")) @@ -687,7 +687,12 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo return super.getColorFromItemStack(stack, renderPass); // color default texture with material color - return TConstructRegistry.getMaterial(matId).primaryColor(); + return getDefaultColor(renderPass, matId); + } + + protected int getDefaultColor(int renderPass, int materialID) + { + return TConstructRegistry.getMaterial(materialID).primaryColor(); } @Override