From 1f17375448fe304bcb49f7d1901f95034d4befdc Mon Sep 17 00:00:00 2001 From: squeek Date: Fri, 19 Sep 2014 15:36:27 -0700 Subject: [PATCH] Better ToolMaterial backwards compatibility * The deprecated fields should be populated regardless of the constructor used --- src/main/java/tconstruct/library/tools/ToolMaterial.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index 0e2cc910..f176da10 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -29,24 +29,18 @@ public class ToolMaterial public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); - this.displayName = prefixName(); - this.ability = ability(); } @Deprecated public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); - this.displayName = prefixName(); - this.ability = ability(); } @Deprecated public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); - this.displayName = prefixName(); - this.ability = ability(); } public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) @@ -68,6 +62,9 @@ public class ToolMaterial this.primaryColor = primaryColor; this.localizationString = localizationString; + + this.displayName = prefixName(); + this.ability = ability(); } public String name ()