From 1f9818dad0dc6a729eeb35a177abe3451b16dc29 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 3 Jun 2025 01:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E7=89=A9?= =?UTF-8?q?=E5=93=81=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/renderer/gun/AK12ItemRenderer.java | 4 +++- .../client/renderer/gun/AK47ItemRenderer.java | 7 ++++++- .../client/renderer/gun/Aa12ItemRenderer.java | 2 -- .../superbwarfare/client/renderer/gun/Mp5ItemRenderer.java | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK12ItemRenderer.java index 05f6d6b1a..015a74d14 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK12ItemRenderer.java @@ -42,7 +42,7 @@ public class AK12ItemRenderer extends CustomGunRenderer { ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (name.equals("hidden2"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); @@ -52,6 +52,8 @@ public class AK12ItemRenderer extends CustomGunRenderer { && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); } + } else { + ItemModelHelper.hideAllAttachments(bone, name); } int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK47ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK47ItemRenderer.java index 51a9a710b..4790ee70b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK47ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK47ItemRenderer.java @@ -40,7 +40,7 @@ public class AK47ItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { if (name.equals("humu1")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) != 0); } @@ -56,6 +56,11 @@ public class AK47ItemRenderer extends CustomGunRenderer { && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); } + } else { + ItemModelHelper.hideAllAttachments(bone, name); + if (name.equals("humu2")) { + bone.setHidden(true); + } } int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java index ab92b705b..e8b741a00 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel; import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -39,7 +38,6 @@ public class Aa12ItemRenderer extends CustomGunRenderer { if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.31465, 0.5); - ItemModelHelper.handleGunAttachments(bone, itemStack, name); } if (renderingArms) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java index d5ccd5e4a..1b5db9589 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java @@ -41,7 +41,7 @@ public class Mp5ItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { boolean flag = GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0; if (name.equals("yugu")) { bone.setHidden(flag); @@ -54,7 +54,7 @@ public class Mp5ItemRenderer extends CustomGunRenderer { } AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.05, 1, 0.35); ItemModelHelper.handleGunAttachments(bone, itemStack, name); - } else if (this.renderPerspective == ItemDisplayContext.FIXED) { + } else { ItemModelHelper.hideAllAttachments(bone, name); if (name.equals("yugu")) { bone.setHidden(true);