From 09b4179e47554bd453327b2316be1256ef993bad Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 6 Jan 2025 23:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=9C=AC#3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/tooltip/ClientGunImageTooltip.java | 2 +- .../item/common/ammo/AmmoBox.java | 20 +++++++------- .../assets/superbwarfare/lang/en_us.json | 25 +++++++++--------- .../assets/superbwarfare/lang/zh_cn.json | 26 +++++++++---------- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java index 3f0025a82..690b70bc1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -204,7 +204,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { * 获取武器改装信息文本组件 */ protected Component getEditComponent() { - return Component.translatable("des.superbwarfare.tips.edit", "[" + ModKeyMappings.EDIT_MODE.getKey().getDisplayName().getString() + "]") + return Component.translatable("des.superbwarfare.guns.edit", "[" + ModKeyMappings.EDIT_MODE.getKey().getDisplayName().getString() + "]") .withStyle(ChatFormatting.LIGHT_PURPLE).withStyle(ChatFormatting.ITALIC); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java index 93fc4fd0a..add5b8cc9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java @@ -107,15 +107,15 @@ public class AmmoBox extends Item { switch (type) { case 0 -> - player.displayClientMessage(Component.translatable("des.superbwarfare.tips.ammo_type.all").withStyle(ChatFormatting.WHITE), true); + player.displayClientMessage(Component.translatable("des.superbwarfare.ammo_box.type.all").withStyle(ChatFormatting.WHITE), true); case 1 -> - player.displayClientMessage(Component.translatable("des.superbwarfare.tips.ammo_type.rifle").withStyle(ChatFormatting.GREEN), true); + player.displayClientMessage(Component.translatable("des.superbwarfare.ammo_box.type.rifle").withStyle(ChatFormatting.GREEN), true); case 2 -> - player.displayClientMessage(Component.translatable("des.superbwarfare.tips.ammo_type.handgun").withStyle(ChatFormatting.AQUA), true); + player.displayClientMessage(Component.translatable("des.superbwarfare.ammo_box.type.handgun").withStyle(ChatFormatting.AQUA), true); case 3 -> - player.displayClientMessage(Component.translatable("des.superbwarfare.tips.ammo_type.shotgun").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("des.superbwarfare.ammo_box.type.shotgun").withStyle(ChatFormatting.RED), true); case 4 -> - player.displayClientMessage(Component.translatable("des.superbwarfare.tips.ammo_type.sniper").withStyle(ChatFormatting.GOLD), true); + player.displayClientMessage(Component.translatable("des.superbwarfare.ammo_box.type.sniper").withStyle(ChatFormatting.GOLD), true); } entity.playSound(ModSounds.FIRE_RATE.get(), 1f, 1f); @@ -129,20 +129,20 @@ public class AmmoBox extends Item { public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { int type = stack.getOrCreateTag().getInt("Type"); - tooltip.add(Component.translatable("des.superbwarfare.use_tip.ammo_box").withStyle(ChatFormatting.GRAY)); - tooltip.add(Component.translatable("des.superbwarfare.tips.rifle_ammo").withStyle(ChatFormatting.GREEN) + tooltip.add(Component.translatable("des.superbwarfare.ammo_box").withStyle(ChatFormatting.GRAY)); + tooltip.add(Component.translatable("des.superbwarfare.ammo_box.rifle").withStyle(ChatFormatting.GREEN) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##").format(ItemNBTTool.getInt(stack, "RifleAmmo", 0)) + ((type == 0 || type == 1) ? " ←-" : " ")).withStyle(ChatFormatting.BOLD))); - tooltip.add(Component.translatable("des.superbwarfare.tips.handgun_ammo").withStyle(ChatFormatting.AQUA) + tooltip.add(Component.translatable("des.superbwarfare.ammo_box.handgun").withStyle(ChatFormatting.AQUA) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##").format(ItemNBTTool.getInt(stack, "HandgunAmmo", 0)) + ((type == 0 || type == 2) ? " ←-" : " ")).withStyle(ChatFormatting.BOLD))); - tooltip.add(Component.translatable("des.superbwarfare.tips.shotgun_ammo").withStyle(ChatFormatting.RED) + tooltip.add(Component.translatable("des.superbwarfare.ammo_box.shotgun").withStyle(ChatFormatting.RED) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##").format(ItemNBTTool.getInt(stack, "ShotgunAmmo", 0)) + ((type == 0 || type == 3) ? " ←-" : " ")).withStyle(ChatFormatting.BOLD))); - tooltip.add(Component.translatable("des.superbwarfare.tips.sniper_ammo").withStyle(ChatFormatting.GOLD) + tooltip.add(Component.translatable("des.superbwarfare.ammo_box.sniper").withStyle(ChatFormatting.GOLD) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##").format(ItemNBTTool.getInt(stack, "SniperAmmo", 0)) + ((type == 0 || type == 4) ? " ←-" : " ")).withStyle(ChatFormatting.BOLD))); } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 9642ae61b..b4fdba173 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -53,19 +53,20 @@ "des.superbwarfare.guns.upgrade_point": "Upgrade Point: ", "des.superbwarfare.guns.rpm": "Rpm: ", "des.superbwarfare.guns.headshot": "Headshot: ", + "des.superbwarfare.guns.edit": "Press %1$s key to edit this weapon", "item.superbwarfare.ammo_box": "Ammo Box", - "des.superbwarfare.tips.rifle_ammo": "Storage Rifle Ammo: ", - "des.superbwarfare.tips.handgun_ammo": "Storage Handgun Ammo: ", - "des.superbwarfare.tips.shotgun_ammo": "Storage Shotgun Ammo: ", - "des.superbwarfare.tips.sniper_ammo": "Storage Sniper Ammo: ", + "des.superbwarfare.ammo_box.rifle": "Storage Rifle Ammo: ", + "des.superbwarfare.ammo_box.handgun": "Storage Handgun Ammo: ", + "des.superbwarfare.ammo_box.shotgun": "Storage Shotgun Ammo: ", + "des.superbwarfare.ammo_box.sniper": "Storage Sniper Ammo: ", - "des.superbwarfare.tips.ammo_type.all": "All Ammo Chosen", - "des.superbwarfare.tips.ammo_type.rifle": "Rifle Ammo Chosen", - "des.superbwarfare.tips.ammo_type.handgun": "Handgun Ammo Chosen", - "des.superbwarfare.tips.ammo_type.shotgun": "Shotgun Ammo Chosen", - "des.superbwarfare.tips.ammo_type.sniper": "Sniper Ammo Chosen", - "des.superbwarfare.use_tip.ammo_box": "When sneaking, left-click to switch ammo types, right-click to store that type of ammo. Right-click with out sneaking to take out the corresponding type of ammo ", + "des.superbwarfare.ammo_box.type.all": "All Ammo Chosen", + "des.superbwarfare.ammo_box.type.rifle": "Rifle Ammo Chosen", + "des.superbwarfare.ammo_box.type.handgun": "Handgun Ammo Chosen", + "des.superbwarfare.ammo_box.type.shotgun": "Shotgun Ammo Chosen", + "des.superbwarfare.ammo_box.type.sniper": "Sniper Ammo Chosen", + "des.superbwarfare.ammo_box": "When sneaking, left-click to switch ammo types, right-click to store that type of ammo. Right-click with out sneaking to take out the corresponding type of ammo ", "item.superbwarfare.vector_blueprint": "VECTOR Blueprint", "item.superbwarfare.m_60_blueprint": "M60 Blueprint", @@ -374,6 +375,7 @@ "entity.superbwarfare.speedboat": "Speedboat", "entity.superbwarfare.wheel_chair": "WheelChair", "entity.superbwarfare.ah_6": "AH-6 Little Bird", + "entity.minecraft.villager.superbwarfare.armory": "Armory", "key.categories.superbwarfare": "Superb Warfare", "key.superbwarfare.hold_zoom": "Zoom(Hold)", @@ -433,8 +435,6 @@ "tips.superbwarfare.mortar.target_pos": "Target Position：", "tips.superbwarfare.mortar.warn": "迫击炮无法瞄准该位置", - "entity.minecraft.villager.superbwarfare.armory": "Armory", - "container.superbwarfare.reforging_table": "Gun Reforge Table", "container.superbwarfare.charging_station": "Charging Station", @@ -473,7 +473,6 @@ "des.superbwarfare.perk_speed_plus": "Velocity +", "des.superbwarfare.perk_slug": "Slug", - "des.superbwarfare.tips.edit": "Press %1$s key to edit this weapon", "des.superbwarfare.revolver.da": "DA", "des.superbwarfare.revolver.sa": "SA", "des.superbwarfare.tips.ammo_type.ap": "AP SHELL", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index e7b403fba..fa03a73d6 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -53,19 +53,19 @@ "des.superbwarfare.guns.bypass": "护甲穿透: ", "des.superbwarfare.guns.rpm": "射速: ", "des.superbwarfare.guns.headshot": "爆头倍率: ", + "des.superbwarfare.guns.edit": "按下 %1$s 键进行改装", "item.superbwarfare.ammo_box": "弹药盒", - "des.superbwarfare.tips.rifle_ammo": "已存储的步枪弹药: ", - "des.superbwarfare.tips.handgun_ammo": "已存储的手枪弹药: ", - "des.superbwarfare.tips.shotgun_ammo": "已存储的霰弹弹药: ", - "des.superbwarfare.tips.sniper_ammo": "已存储的狙击弹药: ", - - "des.superbwarfare.tips.ammo_type.all": "已选择所有弹药种类", - "des.superbwarfare.tips.ammo_type.rifle": "已选择步枪弹药", - "des.superbwarfare.tips.ammo_type.handgun": "已选择手枪弹药", - "des.superbwarfare.tips.ammo_type.shotgun": "已选择霰弹弹药", - "des.superbwarfare.tips.ammo_type.sniper": "已选择狙击弹药", - "des.superbwarfare.use_tip.ammo_box": "潜行时，左击选择弹药类型，右击存入该类型的弹药，非潜行时右击取出对应类型的弹药", + "des.superbwarfare.ammo_box.rifle": "已存储的步枪弹药: ", + "des.superbwarfare.ammo_box.handgun": "已存储的手枪弹药: ", + "des.superbwarfare.ammo_box.shotgun": "已存储的霰弹弹药: ", + "des.superbwarfare.ammo_box.sniper": "已存储的狙击弹药: ", + "des.superbwarfare.ammo_box.type.all": "已选择所有弹药种类", + "des.superbwarfare.ammo_box.type.rifle": "已选择步枪弹药", + "des.superbwarfare.ammo_box.type.handgun": "已选择手枪弹药", + "des.superbwarfare.ammo_box.type.shotgun": "已选择霰弹弹药", + "des.superbwarfare.ammo_box.type.sniper": "已选择狙击弹药", + "des.superbwarfare.ammo_box": "潜行时，左击选择弹药类型，右击存入该类型的弹药，非潜行时右击取出对应类型的弹药", "item.superbwarfare.vector_blueprint": "短剑冲锋枪蓝图", "item.superbwarfare.m_60_blueprint": "M60通用机枪蓝图", @@ -374,6 +374,7 @@ "entity.superbwarfare.speedboat": "快艇", "entity.superbwarfare.wheel_chair": "轮椅", "entity.superbwarfare.ah_6": "AH-6 小鸟直升机", + "entity.minecraft.villager.superbwarfare.armory": "军械师", "key.categories.superbwarfare": "卓越前线", "key.superbwarfare.hold_zoom": "瞄准(按住)", @@ -433,8 +434,6 @@ "tips.superbwarfare.mortar.target_pos": "目标坐标：", "tips.superbwarfare.mortar.warn": "迫击炮无法瞄准该位置", - "entity.minecraft.villager.superbwarfare.armory": "军械师", - "container.superbwarfare.reforging_table": "枪械重铸台", "container.superbwarfare.charging_station": "充电站", @@ -473,7 +472,6 @@ "des.superbwarfare.perk_speed_plus": "子弹初速 +", "des.superbwarfare.perk_slug": "独头弹", - "des.superbwarfare.tips.edit": "按下 %1$s 键进行改装", "des.superbwarfare.revolver.da": "双动", "des.superbwarfare.revolver.sa": "单动", "des.superbwarfare.tips.ammo_type.ap": "AP SHELL",