diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring.png b/resources/assets/tinker/textures/items/longbow/_bowstring.png index cb478b82..d4e08f37 100644 Binary files a/resources/assets/tinker/textures/items/longbow/_bowstring.png and b/resources/assets/tinker/textures/items/longbow/_bowstring.png differ diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_1.png b/resources/assets/tinker/textures/items/longbow/_bowstring_1.png index 76101727..099bca21 100644 Binary files a/resources/assets/tinker/textures/items/longbow/_bowstring_1.png and b/resources/assets/tinker/textures/items/longbow/_bowstring_1.png differ diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_2.png b/resources/assets/tinker/textures/items/longbow/_bowstring_2.png index e9e02e07..d6681c65 100644 Binary files a/resources/assets/tinker/textures/items/longbow/_bowstring_2.png and b/resources/assets/tinker/textures/items/longbow/_bowstring_2.png differ diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_3.png b/resources/assets/tinker/textures/items/longbow/_bowstring_3.png index 8f76ed1e..8ea15279 100644 Binary files a/resources/assets/tinker/textures/items/longbow/_bowstring_3.png and b/resources/assets/tinker/textures/items/longbow/_bowstring_3.png differ diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png index 8ccc79df..70cb036f 100644 Binary files a/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png and b/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png differ diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring.png b/resources/assets/tinker/textures/items/shortbow/_bowstring.png index 540cb9c5..6c193029 100644 Binary files a/resources/assets/tinker/textures/items/shortbow/_bowstring.png and b/resources/assets/tinker/textures/items/shortbow/_bowstring.png differ diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png index 72cf6b3e..1bfb1105 100644 Binary files a/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png and b/resources/assets/tinker/textures/items/shortbow/_bowstring_1.png differ diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png index b8e3e5fb..2c1fa344 100644 Binary files a/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png and b/resources/assets/tinker/textures/items/shortbow/_bowstring_2.png differ diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png index 5629a787..e7793eb7 100644 Binary files a/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png and b/resources/assets/tinker/textures/items/shortbow/_bowstring_3.png differ diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png index 84f13dba..722baa87 100644 Binary files a/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png and b/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png differ diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java index 7d286b59..142dffbf 100644 --- 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 abstract class BowBaseAmmo extends ProjectileWeapon { 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); + @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); } - */ }