diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-01-14 17:23:11 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-01-14 17:23:11 +1000 |
| commit | dd97ed90a0eb4ab47ef445c259e63f70d5c008d6 (patch) | |
| tree | de043844e41bef0d0bb46b42cbba93dadc1df41e /src/Java/gtPlusPlus/core/util | |
| parent | 881eece559ff4eb2646973de1717d795c16c543b (diff) | |
| download | GT5-Unofficial-dd97ed90a0eb4ab47ef445c259e63f70d5c008d6.tar.gz GT5-Unofficial-dd97ed90a0eb4ab47ef445c259e63f70d5c008d6.tar.bz2 GT5-Unofficial-dd97ed90a0eb4ab47ef445c259e63f70d5c008d6.zip | |
$ Tried fixing multi-tool names.
% Ended up making some not exist any more.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/Utils.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index cb30400fd7..c9041f8906 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -529,7 +529,7 @@ public class Utils { } public static ToolMaterial generateToolMaterialFromGT(Materials gtMaterial){ - String name = gtMaterial.name(); + String name = Utils.sanitizeString(gtMaterial.mDefaultLocalName); int harvestLevel = gtMaterial.mToolQuality; int durability = gtMaterial.mDurability; float damage = gtMaterial.mToolQuality; diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java index 409e52a579..81357e66c8 100644 --- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java @@ -304,7 +304,7 @@ public class ItemUtils { public static MultiPickaxeBase generateMultiPick(boolean GT_Durability, Materials material){ ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); - return generateMultiPick(GT_Durability, customMaterial, material.name(), material.mDurability, material.mRGBa); + return generateMultiPick(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa); } public static MultiPickaxeBase generateMultiPick(Material material){ @@ -349,7 +349,7 @@ public class ItemUtils { public static MultiSpadeBase generateMultiShovel(boolean GT_Durability, Materials material){ ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material); - return generateMultiShovel(GT_Durability, customMaterial, material.name(), material.mDurability, material.mRGBa); + return generateMultiShovel(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa); } public static MultiSpadeBase generateMultiShovel(Material material){ |