From 84857daf3a394c115519b26b8657a831fdd1f795 Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Wed, 9 Jul 2025 17:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java | 4 ++-- .../atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java | 4 ++-- .../network/message/send/SetFiringParametersMessage.java | 4 ++-- src/main/resources/assets/superbwarfare/lang/en_us.json | 2 ++ src/main/resources/assets/superbwarfare/lang/zh_cn.json | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java index 1ce5bdfb4..1fa7678f3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java @@ -212,7 +212,7 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity player.swing(InteractionHand.MAIN_HAND); return InteractionResult.SUCCESS; } else { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mk_42.warn").withStyle(ChatFormatting.RED), true); return InteractionResult.FAIL; } } @@ -221,7 +221,7 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity player.swing(InteractionHand.OFF_HAND); return InteractionResult.SUCCESS; } else { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mk_42.warn").withStyle(ChatFormatting.RED), true); return InteractionResult.FAIL; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java index 0be6a5199..b17749d29 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java @@ -217,7 +217,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt player.swing(InteractionHand.MAIN_HAND); return InteractionResult.SUCCESS; } else { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mle_1934.warn").withStyle(ChatFormatting.RED), true); return InteractionResult.FAIL; } } @@ -226,7 +226,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt player.swing(InteractionHand.OFF_HAND); return InteractionResult.SUCCESS; } else { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mle_1934.warn").withStyle(ChatFormatting.RED), true); return InteractionResult.FAIL; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java index 44e9fb5bd..f36c09fdb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java @@ -102,12 +102,12 @@ public enum SetFiringParametersMessage implements CustomPacketPayload { } if (entity instanceof Mk42Entity mk42Entity) { if (!mk42Entity.setTarget(mainStack, true)) { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mk_42.warn").withStyle(ChatFormatting.RED), true); } } if (entity instanceof Mle1934Entity mle1934Entity) { if (!mle1934Entity.setTarget(mainStack, true)) { - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mle_1934.warn").withStyle(ChatFormatting.RED), true); } } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 67d518b57..cc11fc096 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -576,6 +576,8 @@ "tips.superbwarfare.mortar.target_pos.depressed_trajectory": "Depressed Trajectory", "tips.superbwarfare.mortar.target_pos.lofted_trajectory": "Lofted Trajectory", "tips.superbwarfare.mortar.warn": "This mortar cannot aim at this position", + "tips.superbwarfare.mk_42.warn": "MK_42 cannot aim at this position", + "tips.superbwarfare.mle_1934.warn": "Mle_1934 cannot aim at this position", "container.superbwarfare.reforging_table": "Gun Reforge Table", "container.superbwarfare.charging_station": "Charging Station", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index a391bb557..51f60a2c9 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -575,6 +575,8 @@ "tips.superbwarfare.mortar.target_pos.depressed_trajectory": "低伸弹道", "tips.superbwarfare.mortar.target_pos.lofted_trajectory": "传统弹道", "tips.superbwarfare.mortar.warn": "迫击炮无法瞄准该位置", + "tips.superbwarfare.mk_42.warn": "MK-42无法瞄准该位置", + "tips.superbwarfare.mle_1934.warn": "MLE-1934无法瞄准该位置", "container.superbwarfare.reforging_table": "枪械重铸台", "container.superbwarfare.charging_station": "充电站",