From 8b89474214bcd60dd104c3d4e840970fd8506a37 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 7 Jun 2025 01:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=BD=E5=85=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/overlay/VehicleTeamOverlay.java | 3 +++ .../compat/clothconfig/client/DisplayClothConfig.java | 8 ++++++++ .../superbwarfare/config/client/DisplayConfig.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, 19 insertions(+) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java index dd7355677..4824c1182 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.tools.FormatTool; @@ -31,6 +32,8 @@ public class VehicleTeamOverlay implements LayeredDraw.Layer { @Override @ParametersAreNonnullByDefault public void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { + if (!DisplayConfig.VEHICLE_INFO.get()) return; + int w = guiGraphics.guiWidth(); int h = guiGraphics.guiHeight(); Minecraft mc = Minecraft.getInstance(); diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java b/src/main/java/com/atsuishio/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java index 3d49dc96c..d1ae3d0d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java @@ -53,6 +53,14 @@ public class DisplayClothConfig { .build() ); + category.addEntry(entryBuilder + .startBooleanToggle(Component.translatable("config.superbwarfare.client.display.vehicle_info"), DisplayConfig.VEHICLE_INFO.get()) + .setDefaultValue(true) + .setSaveConsumer(DisplayConfig.VEHICLE_INFO::set) + .setTooltip(Component.translatable("config.superbwarfare.client.display.vehicle_info.des")) + .build() + ); + category.addEntry(entryBuilder .startBooleanToggle(Component.translatable("config.superbwarfare.client.display.float_cross_hair"), DisplayConfig.FLOAT_CROSS_HAIR.get()) .setDefaultValue(true) diff --git a/src/main/java/com/atsuishio/superbwarfare/config/client/DisplayConfig.java b/src/main/java/com/atsuishio/superbwarfare/config/client/DisplayConfig.java index a0330cabf..aa0fc219d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/config/client/DisplayConfig.java +++ b/src/main/java/com/atsuishio/superbwarfare/config/client/DisplayConfig.java @@ -9,6 +9,7 @@ public class DisplayConfig { public static ModConfigSpec.IntValue WEAPON_HUD_Y_OFFSET; public static ModConfigSpec.BooleanValue KILL_INDICATION; public static ModConfigSpec.BooleanValue AMMO_HUD; + public static ModConfigSpec.BooleanValue VEHICLE_INFO; public static ModConfigSpec.BooleanValue FLOAT_CROSS_HAIR; public static ModConfigSpec.BooleanValue CAMERA_ROTATE; public static ModConfigSpec.BooleanValue ARMOR_PLATE_HUD; @@ -37,6 +38,9 @@ public class DisplayConfig { builder.comment("Set true to show ammo and gun info on HUD"); AMMO_HUD = builder.define("ammo_hud", true); + builder.comment("Set true to display vehicle info when aiming at a vehicle"); + VEHICLE_INFO = builder.define("vehicle_info", true); + builder.comment("Set true to enable float cross hair"); FLOAT_CROSS_HAIR = builder.define("float_cross_hair", true); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 48ae1c997..f52757976 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -615,6 +615,8 @@ "config.superbwarfare.client.display.weapon_hud_x_offset.des": "The horizontal offset of weapon HUD", "config.superbwarfare.client.display.weapon_hud_y_offset": "Weapon HUD Y Offset", "config.superbwarfare.client.display.weapon_hud_y_offset.des": "The vertical offset of weapon HUD", + "config.superbwarfare.client.display.vehicle_info": "Vehicle Info", + "config.superbwarfare.client.display.vehicle_info.des": "Whether to display vehicle info when aiming at a vehicle", "config.superbwarfare.client.vehicle": "Control Vehicle", "config.superbwarfare.client.vehicle.invert_aircraft_control": "Invert Aircraft Control", "config.superbwarfare.client.vehicle.left_click_reload.des": "Set TRUE to invert aircraft control", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index a556c2b91..9cddcb09d 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -615,6 +615,8 @@ "config.superbwarfare.client.display.weapon_hud_x_offset.des": "武器HUD位置的水平方向偏移量", "config.superbwarfare.client.display.weapon_hud_y_offset": "武器HUD竖直偏移", "config.superbwarfare.client.display.weapon_hud_y_offset.des": "武器HUD位置的竖直方向偏移量", + "config.superbwarfare.client.display.vehicle_info": "载具信息显示", + "config.superbwarfare.client.display.vehicle_info.des": "是否在看向载具的时候，显示该载具的信息", "config.superbwarfare.client.vehicle": "载具控制", "config.superbwarfare.client.vehicle.invert_aircraft_control": "飞行器鼠标反转", "config.superbwarfare.client.vehicle.left_click_reload.des": "开启飞行器鼠标反转",