From ea8c9d36d96f6795be90bc623d5e1924ca133989 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 22 Feb 2025 15:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96SVD=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/SvdItemModel.java | 4 +- .../client/renderer/item/SvdItemRenderer.java | 2 +- .../superbwarfare/event/GunEventHandler.java | 2 +- .../animations/svd.animation.json | 52 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java index 59c3cb781..c7ebc7bec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SvdItemModel.java @@ -135,10 +135,10 @@ public class SvdItemModel extends GeoModel { CrossHairOverlay.gunRot = shen.getRotZ(); - bolt.setPosZ(5f * (float) fp); + bolt.setPosZ(4.5f * (float) fp); if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) { - bolt.setPosZ(4f); + bolt.setPosZ(3.5f); } CoreGeoBone l = getAnimationProcessor().getBone("l"); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java index b295a6516..157950f44 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java @@ -104,7 +104,7 @@ public class SvdItemRenderer extends GeoItemRenderer { } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 - && (name.equals("Hidden") || name.equals("gun") || name.equals("bolt") || name.equals("Lefthand") || name.equals("Barrel")) && ClientEventHandler.zoom && !itemStack.getOrCreateTag().getBoolean("HoloHidden")) { + && (name.equals("Hidden") || name.equals("gun") || name.equals("bolt") || name.equals("Lefthand") || name.equals("Barrel") || name.equals("bipod")) && ClientEventHandler.zoom && !itemStack.getOrCreateTag().getBoolean("HoloHidden")) { bone.setHidden(true); renderingArms = false; } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 2923a9bde..f80c17c63 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -365,7 +365,7 @@ public class GunEventHandler { } if (stack.getItem() == ModItems.SVD.get()) { - if (data.getInt("ReloadTime") == 18) { + if (data.getInt("ReloadTime") == 17) { data.putBoolean("HoldOpen", false); } } diff --git a/src/main/resources/assets/superbwarfare/animations/svd.animation.json b/src/main/resources/assets/superbwarfare/animations/svd.animation.json index 80705b4dd..b20c09f53 100644 --- a/src/main/resources/assets/superbwarfare/animations/svd.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/svd.animation.json @@ -19,11 +19,11 @@ }, "position": { "0.0": [0, 0, 0], - "0.0583": [1.22297, 0.37811, -1.26375], - "0.1167": [0.12132, 1.14111, -1.71705], - "0.3": [4.64002, 3.03958, -4.07823], - "0.3583": [3.42378, 2.79346, -4.09756], - "0.4083": [3.95, 2.9, -4.09] + "0.0583": [-3.52703, -1.87189, -0.51375], + "0.1167": [-8.37868, -0.35889, -0.96705], + "0.3": [-4.10998, 1.53958, -3.32823], + "0.3583": [-5.32622, 1.29346, -3.34756], + "0.4083": [-4.8, 1.4, -3.34] } }, "Righthand": { @@ -51,11 +51,11 @@ "0.8": [-19.82442, -57.81517, 38.62375] }, "position": { - "0.0": [3.5, -1.75, 0], - "0.2": [2.25, -1.25, 0], - "0.4": [1, -1.75, 0], - "0.6": [2, -1.25, 0], - "0.8": [3.5, -1.75, 0] + "0.0": [2.25, -2.5, 0], + "0.2": [1, -2, 0], + "0.4": [-0.25, -2.5, 0], + "0.6": [0.75, -2, 0], + "0.8": [2.25, -2.5, 0] } }, "camera": { @@ -75,18 +75,18 @@ "bones": { "0": { "rotation": { - "0.0": [-71.5441, 21.19359, 4.89071], - "0.175": [-70.25009, 19.57377, 12.8696], - "0.35": [-71.08194, 19.41184, 6.64209], - "0.525": [-72.13904, 19.33922, 0.51567], - "0.7": [-71.72375, 21.2133, 4.79361] + "0.0": [-71.5441, 18.44359, 2.14071], + "0.175": [-63.45009, 8.27377, 10.1196], + "0.35": [-73.23194, 16.66184, 3.89209], + "0.525": [-64.33904, 7.58922, -2.23433], + "0.7": [-71.72375, 18.4633, 2.04361] }, "position": { - "0.0": [-4.86372, 2.30127, -0.0236], - "0.175": [-6.18, 4.52384, -1.07544], - "0.35": [-7.20607, 2.2688, -0.16467], - "0.525": [-6.28238, 4.47846, -1.06191], - "0.7": [-4.86372, 2.30127, -0.0236] + "0.0": [-4.86372, 0.05127, -0.0236], + "0.175": [-6.18, 2.27384, -1.07544], + "0.35": [-7.20607, 0.0188, -0.16467], + "0.525": [-6.28238, 2.22846, -1.06191], + "0.7": [-4.86372, 0.05127, -0.0236] } }, "Lefthand": { @@ -750,12 +750,12 @@ "2.1583": [-1.18, -0.7, -5.93], "2.2667": [-1.65, 1.01, -6.4], "2.35": [-1.85, 2.01, -5.53], - "2.425": [-1.85, 2.01, -5.53], - "2.475": [-1.85, 2.31, -5.73], - "2.5583": [-1.6, 2.31, -5.73], - "2.6833": [-1.57, 1.8, -1.34], - "2.7667": [-1.57, 1.8, -1.34], - "2.825": [-2.37, 2.09, -3.8], + "2.425": [-1.85, 2.01, -4.78], + "2.475": [-1.85, 2.31, -4.73], + "2.5583": [-1.6, 2.31, -4.98], + "2.6833": [-1.57, 1.8, -3.84], + "2.7667": [-1.57, 1.8, -3.84], + "2.825": [-2.37, 2.09, -4.8], "2.9833": [-2.13, 0.98, -2.71], "3.125": [0, 0, 0] }