diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index 22ce2fbd..3d0ef5dc 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -355,7 +355,10 @@ public class ToolBuilder { return StatCollector.translateToLocal("tool." + toolName + "." + matName); } - return String.format("%s %s", headMat.prefixName(), tool.getLocalizedToolName()); + return String.format( + StatCollector.translateToLocal("tool.nameformat"), + headMat.prefixName(), + tool.getLocalizedToolName()); } // Passthrough for now diff --git a/src/main/java/tconstruct/world/entity/KingBlueSlime.java b/src/main/java/tconstruct/world/entity/KingBlueSlime.java index b8cb56f2..7ef988c4 100644 --- a/src/main/java/tconstruct/world/entity/KingBlueSlime.java +++ b/src/main/java/tconstruct/world/entity/KingBlueSlime.java @@ -138,7 +138,10 @@ public class KingBlueSlime extends SlimeBase implements IBossDisplayData { // materials String name; if (StatCollector.canTranslate(loc)) name = StatCollector.translateToLocal(loc); - else name = StatCollector.translateToLocal("tool.kingslimeprefix") + " " + tool.getLocalizedToolName(); + else name = String.format( + StatCollector.translateToLocal("tool.nameformat"), + StatCollector.translateToLocal("tool.kingslimeprefix"), + tool.getLocalizedToolName()); ItemStack toolStack = ToolBuilder.instance .buildTool(headStack, handleStack, accessoryStack, extraStack, name); diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 4758baed..14ca3ab4 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -1052,6 +1052,11 @@ tool.javelin=Javelin # Customization of default tool names based on tool and material #tool.shovel.wood=Wooden Shovel +tool.nameformat=%s %s +# Customization of the format for default tool names +# %s %s -> Iron Pickaxe +# %2$s of %1$s -> Pickaxe of Iron + tool.kingslimeprefix=King Slime # Specific localization like materials #tool.shovel.kingslime=Regret diff --git a/src/main/resources/assets/tinker/lang/zh_CN.lang b/src/main/resources/assets/tinker/lang/zh_CN.lang index df72c505..2b11b5c0 100644 --- a/src/main/resources/assets/tinker/lang/zh_CN.lang +++ b/src/main/resources/assets/tinker/lang/zh_CN.lang @@ -979,6 +979,11 @@ tool.javelin=标枪 # Customization of default tool names based on tool and material #tool.shovel.wood=Wooden Shovel +tool.nameformat=%s%s +# Customization of the format for default tool names +# %s %s -> Iron Pickaxe +# %2$s of %1$s -> Pickaxe of Iron + tool.kingslimeprefix=史莱姆王 # Specific localization like materials #tool.shovel.kingslime=Regret