From 626c046aaaba0e587b3f67956715e35f3a6ad8a7 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 18 May 2024 18:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9HUD=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../target/client/screens/AmmoBarOverlay.java | 26 +++++++++----------
 .../mcreator/target/item/gun/Hk416Item.java   | 11 ++++++++
 .../target/item/gun/HuntingRifle.java         | 11 ++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
index 218ca43f5..0b7147955 100644
--- a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
+++ b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java
@@ -41,7 +41,7 @@ public class AmmoBarOverlay {
 
             // 渲染图标
             event.getGuiGraphics().blit(gunItem.getGunIcon(),
-                    w / 2 + 95,
+                    w - 135,
                     h - 40,
                     0,
                     0,
@@ -52,8 +52,8 @@ public class AmmoBarOverlay {
 
             // 渲染开火模式切换按键
             event.getGuiGraphics().blit(BUTTON,
-                    w / 2 + 118,
-                    h - 18,
+                    w - 115,
+                    h - 20,
                     0,
                     0,
                     10,
@@ -64,8 +64,8 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     TargetModKeyMappings.FIREMODE.getKey().getDisplayName().getString(),
-                    w / 2 + 121,
-                    h - 18,
+                    w - 111.5f,
+                    h - 20,
                     0x050505,
                     false
             );
@@ -74,8 +74,8 @@ public class AmmoBarOverlay {
             ResourceLocation fireMode = getFireMode(stack);
 
             event.getGuiGraphics().blit(fireMode,
-                    w / 2 + 135,
-                    h - 17,
+                    w - 100,
+                    h - 19,
                     0,
                     0,
                     8,
@@ -84,8 +84,8 @@ public class AmmoBarOverlay {
                     8);
 
             event.getGuiGraphics().blit(LINE,
-                    w / 2 + 135,
-                    h - 12,
+                    w - 100,
+                    h - 14,
                     0,
                     0,
                     8,
@@ -101,7 +101,7 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     getGunAmmoCount(player) + "",
-                    w / 3f + 112,
+                    w / 1.5f - 62 / 1.5f,
                     h / 1.5f - 31,
                     0xFFFFFF,
                     true
@@ -112,7 +112,7 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     getPlayerAmmoCount(player),
-                    w / 2 + 170,
+                    w - 60,
                     h - 35,
                     0xCCCCCC,
                     true
@@ -125,7 +125,7 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     centerString(gunItem.getGunDisplayName(), 20),
-                    w / 2 + 138,
+                    w / 0.9f - 128 / 0.9f,
                     h - 34,
                     0xFFFFFF,
                     true
@@ -135,7 +135,7 @@ public class AmmoBarOverlay {
             event.getGuiGraphics().drawString(
                     Minecraft.getInstance().font,
                     centerString(getGunAmmoType(stack), 20),
-                    w / 2 + 138,
+                    w / 0.9f - 128 / 0.9f,
                     h - 26,
                     0xC8A679,
                     true
diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java
index 0b443ee37..541b1e3a1 100644
--- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java
@@ -15,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
@@ -186,4 +187,14 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/hk416_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "HK416";
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
index 42f336993..2e52512c0 100644
--- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
+++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
@@ -18,6 +18,7 @@ import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
@@ -209,4 +210,14 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
     public void setAnimationProcedure(String procedure) {
         this.animationProcedure = procedure;
     }
+
+    @Override
+    public ResourceLocation getGunIcon() {
+        return new ResourceLocation(TargetMod.MODID, "textures/gun_icon/hunting_rifle_icon.png");
+    }
+
+    @Override
+    public String getGunDisplayName() {
+        return "Hunting Rifle";
+    }
 }
\ No newline at end of file