diff --git a/src/main/java/net/mcreator/superbwarfare/command/AmmoCommand.java b/src/main/java/net/mcreator/superbwarfare/command/AmmoCommand.java index ce8525990..de0221b45 100644 --- a/src/main/java/net/mcreator/superbwarfare/command/AmmoCommand.java +++ b/src/main/java/net/mcreator/superbwarfare/command/AmmoCommand.java @@ -26,7 +26,7 @@ public class AmmoCommand { // 权限不足时,只允许玩家查询自己的弹药数量 if (context.getSource().isPlayer() && !context.getSource().hasPermission(2)) { if (!Objects.requireNonNull(context.getSource().getPlayer()).getUUID().equals(player.getUUID())) { - context.getSource().sendFailure(Component.translatable("commands.ammo.nopermission")); + context.getSource().sendFailure(Component.translatable("commands.ammo.no_permission")); return 0; } } diff --git a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java index a02f8edb6..7cb2ce5ff 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java @@ -109,9 +109,7 @@ public class TooltipTool { private static void addEditTips(List tooltip) { tooltip.add(Component.literal(" ").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("des.superbwarfare.tips.edit_part").withStyle(ChatFormatting.LIGHT_PURPLE) - .append(Component.literal("[" + ModKeyMappings.EDIT_MODE.getKey().getDisplayName().getString() + "]").withStyle(ChatFormatting.LIGHT_PURPLE)) - .append(Component.translatable("des.superbwarfare.tips.edit_part2").withStyle(ChatFormatting.LIGHT_PURPLE))); + tooltip.add(Component.translatable("des.superbwarfare.tips.edit", "[" + ModKeyMappings.EDIT_MODE.getKey().getDisplayName().getString() + "]").withStyle(ChatFormatting.LIGHT_PURPLE)); } private static void addLevelTips(List tooltip, ItemStack stack) { diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index df75b46b6..8754157db 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -416,7 +416,6 @@ "des.superbwarfare.mortar.pitch": "Pitch:", "des.superbwarfare.target.pos": "Target Position:", "des.superbwarfare.target.warn": "迫击炮无法瞄准该位置", - "des.superbwarfare.tips.edit_part": "Press ", - "des.superbwarfare.tips.edit_part2": " key to edit this weapon.", - "commands.ammo.nopermission": "Permission denied" + "des.superbwarfare.tips.edit": "Press %1$s key to edit this weapon", + "commands.ammo.no_permission": "Permission denied" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 1ac20ee4c..722340e1c 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -416,7 +416,6 @@ "des.superbwarfare.mortar.pitch": "俯仰角度:", "des.superbwarfare.target.pos": "目标坐标:", "des.superbwarfare.target.warn": "迫击炮无法瞄准该位置", - "des.superbwarfare.tips.edit_part": "按下", - "des.superbwarfare.tips.edit_part2": "键进行改装", - "commands.ammo.nopermission": "权限不足" + "des.superbwarfare.tips.edit": "按下 %1$s 键进行改装", + "commands.ammo.no_permission": "权限不足" } \ No newline at end of file