mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
Fix whitespaces in material localization strings, and allow custom localization strings.
This commit is contained in:
1 parent
67fe457257
commit
7c8965adbf
2 files changed
+54
-5
No files matched your search
@@ -18,6 +18,8 @@ public class ToolMaterial
|
||||
public final String tipStyle;
|
||||
public final int primaryColor;
|
||||
|
||||
private final String localizationString;
|
||||
|
||||
@Deprecated
|
||||
public String displayName;
|
||||
@Deprecated
|
||||
@@ -40,6 +42,11 @@ public class ToolMaterial
|
||||
}
|
||||
|
||||
public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor)
|
||||
{
|
||||
this(name, "material." + name.toLowerCase().replaceAll(" ", ""), level, durability, speed, damage, handle, reinforced, stonebound, style, primaryColor);
|
||||
}
|
||||
|
||||
public ToolMaterial(String name, String localizationString, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor)
|
||||
{
|
||||
this.materialName = name;
|
||||
this.harvestLevel = level;
|
||||
@@ -51,6 +58,8 @@ public class ToolMaterial
|
||||
this.stonebound = stonebound;
|
||||
this.tipStyle = style;
|
||||
this.primaryColor = primaryColor;
|
||||
|
||||
this.localizationString = localizationString;
|
||||
}
|
||||
|
||||
public String name ()
|
||||
@@ -60,14 +69,14 @@ public class ToolMaterial
|
||||
|
||||
public String localizedName ()
|
||||
{
|
||||
return StatCollector.translateToLocal("material." + materialName.toLowerCase());
|
||||
return StatCollector.translateToLocal(localizationString);
|
||||
}
|
||||
|
||||
public String prefixName ()
|
||||
{
|
||||
// check if there's a special name, otherwise use the regular one
|
||||
if (StatCollector.canTranslate(String.format("material.%s.display", materialName.toLowerCase())))
|
||||
return StatCollector.translateToLocal(String.format("material.%s.display", materialName.toLowerCase()));
|
||||
if (StatCollector.canTranslate(String.format("%s.display", localizationString)))
|
||||
return StatCollector.translateToLocal(String.format("%s.display", localizationString));
|
||||
return localizedName();
|
||||
}
|
||||
|
||||
@@ -122,8 +131,8 @@ public class ToolMaterial
|
||||
*/
|
||||
public String ability ()
|
||||
{
|
||||
if (StatCollector.canTranslate(String.format("material.%s.ability", materialName.toLowerCase())))
|
||||
return StatCollector.translateToLocal(String.format("material.%s.ability", materialName.toLowerCase()));
|
||||
if (StatCollector.canTranslate(String.format("%s.ability", localizationString)))
|
||||
return StatCollector.translateToLocal(String.format("%s.ability", localizationString));
|
||||
return "";
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user