diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/Type63InfoOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/Type63InfoOverlay.java index cd5f2684b..a4a689364 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/Type63InfoOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/Type63InfoOverlay.java @@ -133,21 +133,25 @@ public class Type63InfoOverlay implements LayeredDraw.Layer { if (launchVector != null) { angle = (float) getXRotFromVector(launchVector); + } else { + guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.out_of_range").withStyle(ChatFormatting.RED), + screenWidth / 2 + 90, screenHeight / 2 - 26, -1, false); + return; } - if (angle > -5 && angle < 60) { - guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.target.pitch") - .append(Component.literal(FormatTool.format2D(angle, "°"))), - screenWidth / 2 + 90, screenHeight / 2 - 26, -1, false); - guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.target.yaw") - .append(Component.literal(FormatTool.format2D(targetYaw, "°"))), - screenWidth / 2 + 90, screenHeight / 2 - 16, -1, false); - guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.target_pos") - .append(Component.literal(FormatTool.format0D(targetX) + " " + FormatTool.format0D(targetY) + " " + FormatTool.format0D(targetZ))), - screenWidth / 2 + 90, screenHeight / 2 - 6, -1, false); - } else { + guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.target.pitch") + .append(Component.literal(FormatTool.format2D(angle, "°"))), + screenWidth / 2 + 90, screenHeight / 2 - 26, -1, false); + guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.target.yaw") + .append(Component.literal(FormatTool.format2D(targetYaw, "°"))), + screenWidth / 2 + 90, screenHeight / 2 - 16, -1, false); + guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.target_pos") + .append(Component.literal(FormatTool.format0D(targetX) + " " + FormatTool.format0D(targetY) + " " + FormatTool.format0D(targetZ))), + screenWidth / 2 + 90, screenHeight / 2 - 6, -1, false); + + if (angle < -5 || angle > 60) { guiGraphics.drawString(Minecraft.getInstance().font, Component.translatable("tips.superbwarfare.mortar.warn", lookingEntity.getDisplayName()).withStyle(ChatFormatting.RED), - screenWidth / 2 + 90, screenHeight / 2 - 26, -1, false); + screenWidth / 2 + 90, screenHeight / 2 + 4, -1, false); } } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 4e08231ad..92a69f475 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -601,7 +601,7 @@ "tips.superbwarfare.target.yaw": "Target Yaw: ", "tips.superbwarfare.target.pitch": "Target Pitch: ", "tips.superbwarfare.barrel_empty": "EMPTY", - + "tips.superbwarfare.mortar.out_of_range": "Out of Range", "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 445204551..282344d0d 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -601,6 +601,7 @@ "tips.superbwarfare.target.yaw": "目标偏航角: ", "tips.superbwarfare.target.pitch": "目标俯仰角: ", "tips.superbwarfare.barrel_empty": "空", + "tips.superbwarfare.mortar.out_of_range": "超出射程", "container.superbwarfare.reforging_table": "枪械重铸台", "container.superbwarfare.charging_station": "充电站",