From 254cdf32b251e6f3ea3adc6af6ba95db378d0b2b Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 7 Jun 2025 21:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E8=87=82=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9E=8B=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/client/AnimationHelper.java | 20 +++++++++++++++++--
 .../homemade_shotgun.item.json                |  2 +-
 .../models/displaysettings/tm_62.item.json    |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java
index cefac67a6..810a3968c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java
@@ -1,6 +1,7 @@
 package com.atsuishio.superbwarfare.client;
 
 import com.atsuishio.superbwarfare.Mod;
+import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer;
 import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes;
 import com.atsuishio.superbwarfare.data.gun.GunData;
 import com.atsuishio.superbwarfare.data.gun.value.AttachmentType;
@@ -18,6 +19,7 @@ import net.minecraft.client.renderer.entity.player.PlayerRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.player.PlayerModelPart;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Matrix4f;
@@ -189,7 +191,14 @@ public class AnimationHelper {
             RenderUtil.translateAwayFromPivotPoint(stack, bone);
             ResourceLocation loc = localPlayer.getSkin().texture();
             if (name.equals("Lefthand")) {
-                stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
+                if (!model.leftArm.visible) {
+                    model.leftArm.visible = true;
+                }
+                if (!model.leftSleeve.visible && mc.options.isModelPartEnabled(PlayerModelPart.LEFT_SLEEVE)) {
+                    model.leftSleeve.visible = true;
+                }
+
+                stack.translate(-1.0f * CustomGunRenderer.SCALE_RECIPROCAL, 2.0f * CustomGunRenderer.SCALE_RECIPROCAL, 0.0f);
                 if (useOldHandRender) {
                     AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY);
                     AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY);
@@ -198,7 +207,14 @@ public class AnimationHelper {
                     AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY);
                 }
             } else {
-                stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
+                if (!model.rightArm.visible) {
+                    model.rightArm.visible = true;
+                }
+                if (!model.rightSleeve.visible && mc.options.isModelPartEnabled(PlayerModelPart.RIGHT_SLEEVE)) {
+                    model.rightSleeve.visible = true;
+                }
+
+                stack.translate(CustomGunRenderer.SCALE_RECIPROCAL, 2.0f * CustomGunRenderer.SCALE_RECIPROCAL, 0.0f);
                 if (useOldHandRender) {
                     AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY);
                     AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY);
diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json
index 4996907cb..407801954 100644
--- a/src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json
+++ b/src/main/resources/assets/superbwarfare/models/displaysettings/homemade_shotgun.item.json
@@ -70,6 +70,6 @@
     }
   },
   "textures": {
-    "particle": "item/homemade_shotgun"
+    "particle": "superbwarfare:item/homemade_shotgun"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/tm_62.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/tm_62.item.json
index d20b55bb2..101fe5a4e 100644
--- a/src/main/resources/assets/superbwarfare/models/displaysettings/tm_62.item.json
+++ b/src/main/resources/assets/superbwarfare/models/displaysettings/tm_62.item.json
@@ -109,6 +109,6 @@
     }
   },
   "textures": {
-    "particle": "item/tm_62"
+    "particle": "superbwarfare:item/tm_62"
   }
 }
\ No newline at end of file