diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 9eeeebda..7303a571 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -587,6 +587,7 @@ toolpart.CrossbowLimb=%%material Crossbow Limb toolpart.CrossbowBody=%%material Crossbow Body toolpart.BowLimb=%%material Bow Limb toolpart.Bolt=%%material Bolt +toolpart.Shaft=%%material Arrow Shaft # Now with translations of specific material and part combinations: #toolpart.ToolRod.wood=Wooden Tool Rod diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index 652908f4..053b4d5d 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -14,6 +14,7 @@ import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.library.util.TextureHelper; +import tconstruct.library.tools.CustomMaterial; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; @@ -25,20 +26,32 @@ public class DynamicToolPart extends CraftingItem implements IToolPart public String partName; public String texture; public IIcon defaultIcon; + public Class customMaterialClass; private boolean hidden = false; public DynamicToolPart(String texture, String name) { - this(texture, name, "tinker"); + this(texture, name, (Class) null); + } + + public DynamicToolPart(String texture, String name, Class customMaterialClass) + { + this(texture, name, "tinker", customMaterialClass); } public DynamicToolPart(String texture, String name, String domain) + { + this(texture, name, domain, (Class) null); + } + + public DynamicToolPart(String texture, String name, String domain, Class customMaterialClass) { super(null, null, "parts/", domain, TConstructRegistry.partTab); this.setUnlocalizedName("tconstruct." + name); this.partName = name; this.texture = texture; + this.customMaterialClass = customMaterialClass; } /** @@ -64,11 +77,38 @@ public class DynamicToolPart extends CraftingItem implements IToolPart @Override public String getItemStackDisplayName (ItemStack stack) { - tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack)); - if(toolmat == null) - return super.getItemStackDisplayName(stack); + String material = ""; + String matName = ""; + if (customMaterialClass == null) + { + tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack)); + if(toolmat == null) + return super.getItemStackDisplayName(stack); - String material = toolmat.localizationString.substring(9); // :( + material = toolmat.localizationString.substring(9); // :( + matName = toolmat.prefixName(); + } + else + { + CustomMaterial customMaterial = TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); + if (customMaterial == null) + return super.getItemStackDisplayName(stack); + + material = ""; + if (customMaterial.input != null) + { + material = customMaterial.input.getUnlocalizedName(); + int firstPeriodIndex = material.indexOf('.'); + if (firstPeriodIndex >= 0) + material = material.substring(firstPeriodIndex+1); + matName = customMaterial.input.getDisplayName(); + } + else + { + material = customMaterial.oredict; + matName = customMaterial.oredict; + } + } // custom name if (StatCollector.canTranslate("toolpart." + partName + "." + material)) @@ -79,11 +119,8 @@ public class DynamicToolPart extends CraftingItem implements IToolPart else { // specific material name for materials? - String matName; if(StatCollector.canTranslate("toolpart.material." + material)) matName = StatCollector.translateToLocal("toolpart.material." + material); - else - matName = toolmat.prefixName(); return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", matName); } @@ -95,7 +132,19 @@ public class DynamicToolPart extends CraftingItem implements IToolPart if(id == -1) return getUnlocalizedName(); - return "toolpart." + partName + "." + TConstructRegistry.getMaterial(id).materialName; + String material = "unknown"; + if (customMaterialClass == null) + { + tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack)); + material = toolmat.materialName; + } + else + { + CustomMaterial customMaterial = TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); + material = customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict; + } + + return "toolpart." + partName + "." + material; } @Override @@ -156,7 +205,12 @@ public class DynamicToolPart extends CraftingItem implements IToolPart return super.getColorFromItemStack(stack, renderpass); if(matId >= 0 && icons[matId] == null) - return TConstructRegistry.getMaterial(matId).primaryColor(); + { + if (customMaterialClass == null) + return TConstructRegistry.getMaterial(getMaterialID(stack)).primaryColor(); + else + return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color; + } return super.getColorFromItemStack(stack, renderpass); } diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index 5feb555b..d079819d 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -144,7 +144,7 @@ public class TinkerWeaponry { TinkerTools.arrowhead = arrowhead = new DynamicToolPart("_arrowhead", "ArrowHead"); TinkerTools.fletching = fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching"); partShuriken = new DynamicToolPart("_shuriken", "Shuriken"); - partArrowShaft = new DynamicToolPart("_arrow_shaft", "Shaft"); + partArrowShaft = new DynamicToolPart("_arrow_shaft", "Shaft", ArrowShaftMaterial.class); partBowLimb = new DynamicToolPart("_bow_limb", "BowLimb"); partCrossbowLimb = new DynamicToolPart("_crossbow_limb", "CrossbowLimb"); partCrossbowBody = new DynamicToolPart("_crossbow_body", "CrossbowBody");