diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java index 431175ec4..77588196a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/AmmoBarOverlay.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.screens; import com.mojang.blaze3d.vertex.PoseStack; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.config.client.DisplayConfig; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModKeyMappings; import net.mcreator.superbwarfare.init.ModTags; @@ -41,17 +42,15 @@ public class AmmoBarOverlay { @SubscribeEvent(priority = EventPriority.NORMAL) public static void eventHandler(RenderGuiEvent.Pre event) { + if (!DisplayConfig.AMMO_HUD.get()) return; + int w = event.getWindow().getGuiScaledWidth(); int h = event.getWindow().getGuiScaledHeight(); Player player = Minecraft.getInstance().player; - if (player == null) { - return; - } + if (player == null) return; - if (player.isSpectator()) { - return; - } + if (player.isSpectator()) return; ItemStack stack = player.getMainHandItem(); if (stack.getItem() instanceof GunItem gunItem) { diff --git a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java index 7ee68e7b4..ec9a49ea1 100644 --- a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java +++ b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/client/DisplayClothConfig.java @@ -27,5 +27,13 @@ public class DisplayClothConfig { .setTooltip(Component.translatable("config.superbwarfare.client.display.global_indication.des")) .build() ); + + category.addEntry(entryBuilder + .startBooleanToggle(Component.translatable("config.superbwarfare.client.display.ammo_hud"), DisplayConfig.AMMO_HUD.get()) + .setDefaultValue(true) + .setSaveConsumer(DisplayConfig.AMMO_HUD::set) + .setTooltip(Component.translatable("config.superbwarfare.client.display.ammo_hud.des")) + .build() + ); } } diff --git a/src/main/java/net/mcreator/superbwarfare/config/client/DisplayConfig.java b/src/main/java/net/mcreator/superbwarfare/config/client/DisplayConfig.java index dc69c806f..0f4e32001 100644 --- a/src/main/java/net/mcreator/superbwarfare/config/client/DisplayConfig.java +++ b/src/main/java/net/mcreator/superbwarfare/config/client/DisplayConfig.java @@ -6,6 +6,7 @@ public class DisplayConfig { public static ForgeConfigSpec.BooleanValue KILL_INDICATION; public static ForgeConfigSpec.BooleanValue GLOBAL_INDICATION; + public static ForgeConfigSpec.BooleanValue AMMO_HUD; public static void init(ForgeConfigSpec.Builder builder) { builder.push("display"); @@ -16,6 +17,9 @@ public class DisplayConfig { builder.comment("Set FALSE if you want to show kill indication ONLY while killing an entity with a gun"); GLOBAL_INDICATION = builder.define("global_indication", false); + builder.comment("Set TRUE to show ammo and gun info on HUD"); + AMMO_HUD = builder.define("ammo_hud", true); + builder.pop(); } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index b66461822..11d93d849 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -357,5 +357,7 @@ "config.superbwarfare.client.display.kill_indication": "击杀提示", "config.superbwarfare.client.display.kill_indication.des": "开启时,击杀生物时会在准星周围显示击杀提示", "config.superbwarfare.client.display.global_indication": "全局伤害提示", - "config.superbwarfare.client.display.global_indication.des": "是否在仅使用本模组的伤害类型击杀生物时,在准星周围显示击杀提示" + "config.superbwarfare.client.display.global_indication.des": "是否在仅使用本模组的伤害类型击杀生物时,在准星周围显示击杀提示", + "config.superbwarfare.client.display.ammo_hud": "枪械信息", + "config.superbwarfare.client.display.ammo_hud.des": "开启时,在屏幕右下角显示枪械和弹药信息" } \ 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 76e1b5216..8b8478ca3 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -356,5 +356,7 @@ "config.superbwarfare.client.display.kill_indication": "击杀提示", "config.superbwarfare.client.display.kill_indication.des": "开启时,击杀生物时会在准星周围显示击杀提示", "config.superbwarfare.client.display.global_indication": "全局伤害提示", - "config.superbwarfare.client.display.global_indication.des": "是否在仅使用本模组的伤害类型击杀生物时,在准星周围显示击杀提示" + "config.superbwarfare.client.display.global_indication.des": "是否在仅使用本模组的伤害类型击杀生物时,在准星周围显示击杀提示", + "config.superbwarfare.client.display.ammo_hud": "枪械信息", + "config.superbwarfare.client.display.ammo_hud.des": "开启时,在屏幕右下角显示枪械和弹药信息" } \ No newline at end of file