From 636e21a56bd828215ff8c98c6f605370743536dc Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Fri, 4 Jul 2025 14:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E7=AC=AC=E4=B8=89=E4=BA=BA=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/init/ModEnumExtensions.java | 18 +++++++++--------- .../models/displaysettings/minigun.item.json | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModEnumExtensions.java b/src/main/java/com/atsuishio/superbwarfare/init/ModEnumExtensions.java index a8f8bb8a7..384024991 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModEnumExtensions.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModEnumExtensions.java @@ -48,8 +48,8 @@ public class ModEnumExtensions { false, (IArmPoseTransformer) (model, entity, arm) -> { if (arm != HumanoidArm.LEFT) { - model.rightArm.xRot = -67.5f * Mth.DEG_TO_RAD + model.head.xRot + 0.2f * model.rightArm.xRot; - model.rightArm.yRot = 5f * Mth.DEG_TO_RAD; + model.rightArm.xRot = -67.5f * Mth.DEG_TO_RAD + model.head.xRot + 0.05f * model.rightArm.xRot; + model.rightArm.yRot = 5f * Mth.DEG_TO_RAD + model.head.yRot; } } ); @@ -63,10 +63,10 @@ public class ModEnumExtensions { false, (IArmPoseTransformer) (model, entity, arm) -> { if (arm != HumanoidArm.LEFT) { - model.rightArm.xRot = -22.5f * Mth.DEG_TO_RAD + model.head.xRot; - model.rightArm.yRot = -10f * Mth.DEG_TO_RAD; - model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot; - model.leftArm.yRot = 40f * Mth.DEG_TO_RAD; + model.rightArm.xRot = 22.5f * Mth.DEG_TO_RAD + model.head.xRot; + model.rightArm.yRot = model.head.yRot; + model.leftArm.xRot = Mth.clamp(-45f * Mth.DEG_TO_RAD + model.head.xRot, -67.5f * Mth.DEG_TO_RAD, 0f * Mth.DEG_TO_RAD); + model.leftArm.yRot = Mth.clamp(45f * Mth.DEG_TO_RAD + model.head.yRot, 45f * Mth.DEG_TO_RAD, 80f * Mth.DEG_TO_RAD); } } ); @@ -81,9 +81,9 @@ public class ModEnumExtensions { (IArmPoseTransformer) (model, entity, arm) -> { if (arm != HumanoidArm.LEFT) { model.rightArm.xRot = 45f * Mth.DEG_TO_RAD + model.head.xRot; - model.rightArm.yRot = -10f * Mth.DEG_TO_RAD; - model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot; - model.leftArm.yRot = 40f * Mth.DEG_TO_RAD; + model.rightArm.yRot = model.head.yRot; + model.leftArm.xRot = Mth.clamp(-45f * Mth.DEG_TO_RAD + model.head.xRot, -67.5f * Mth.DEG_TO_RAD, 0f * Mth.DEG_TO_RAD); + model.leftArm.yRot = Mth.clamp(45f * Mth.DEG_TO_RAD + model.head.yRot, 45f * Mth.DEG_TO_RAD, 80f * Mth.DEG_TO_RAD); } } ); diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/minigun.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/minigun.item.json index 15c268778..fc4e31551 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/minigun.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/minigun.item.json @@ -32,19 +32,19 @@ }, "thirdperson_righthand": { "rotation": [ - 67.5, - -10, + 112.5, + 0, 0 ], "translation": [ - 0.5, - 6.5, - -5 + -1.25, + 9.5, + 3 ], "scale": [ - 0.55, - 0.55, - 0.55 + 0.6, + 0.6, + 0.6 ] }, "thirdperson_lefthand": {