From 9e828564cfb00c789051bb708994b47e1db0de3c Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 12 Aug 2024 18:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E2=80=9C=E5=8F=88?= =?UTF-8?q?=E6=98=AF=E4=B8=80=E4=B8=AA=E5=B0=8F=E7=BB=86=E8=8A=82=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/K98ItemModel.java | 9 +- .../animations/k98.animation.json | 309 +----------------- .../data/superbwarfare/guns/k_98.json | 2 +- 3 files changed, 23 insertions(+), 297 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java index 69fa2c3c0..d0aac8fb5 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java @@ -33,14 +33,21 @@ public class K98ItemModel extends GeoModel { public void setCustomAnimations(K98Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone zhuangzhen = getAnimationProcessor().getBone("zhuangzhen"); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); + CoreGeoBone clip = getAnimationProcessor().getBone("mag"); Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; + + if (stack.getOrCreateTag().getDouble("prepare") > 13 && stack.getOrCreateTag().getInt("ammo") == 1) { + clip.setHidden(true); + } else { + clip.setHidden(false); + } + if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setHidden(false); flare.setScaleX((float) (0.6 + 0.5 * (Math.random() - 0.5))); diff --git a/src/main/resources/assets/superbwarfare/animations/k98.animation.json b/src/main/resources/assets/superbwarfare/animations/k98.animation.json index cf5a48002..49666624c 100644 --- a/src/main/resources/assets/superbwarfare/animations/k98.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/k98.animation.json @@ -410,8 +410,20 @@ } }, "ammo": { - "scale": { - "vector": [0, 0, 0] + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [0, -0.32031, 4] + }, + "0.6": { + "vector": [0, -0.32031, 4] + }, + "0.7": { + "vector": [0, 0, 0], + "easing": "easeInSine" + } } }, "shell": { @@ -453,299 +465,6 @@ } } }, - "bullet5": { - "position": { - "0.6": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, 0.32266, -4], - "easing": "easeInSine" - }, - "0.8": { - "vector": [0, 0.32266, -4], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0, 0, 0] - } - } - }, - "bolt_rot": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 90], - "easing": "easeInSine" - }, - "0.7": { - "vector": [0, 0, 90], - "easing": "easeInSine" - }, - "0.8": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "k98_shift" - } - } - }, - "animation.k98.shift2": { - "loop": "hold_on_last_frame", - "animation_length": 1.1, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.3": { - "vector": [-2, 0, -4], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-1.92, 0, 3.15], - "easing": "easeInElastic" - }, - "0.5": { - "vector": [-2.92, 0, 1.15], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-2.25, -2, 1.82] - }, - "0.8": { - "vector": [1.08, 0, -2.85], - "easing": "linear" - }, - "0.9": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.3": { - "vector": [0.00697, -0.0997, -0.00349], - "easing": "linear" - }, - "0.5": { - "vector": [-0.10501, -0.24963, 0.98726], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-0.10628, -0.24967, 1.08873] - }, - "0.7": { - "vector": [-0.10759, -0.24969, -1.10981] - }, - "0.8": { - "vector": [0.19503, -0.10014, 0.19812] - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - }, - "Righthand": { - "rotation": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-11.05124, 19.47135, -3.30226], - "easing": "linear" - }, - "0.4": { - "vector": [-2.21355, 15.26875, 0.47749], - "easing": "easeInSine" - }, - "0.5": { - "vector": [-2.21355, 15.26875, 0.47749], - "easing": "easeInSine" - }, - "0.6": { - "vector": [-2.21355, 15.26875, 0.47749], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-2.21355, 15.26875, 0.47749], - "easing": "easeInSine" - }, - "0.8": { - "vector": [-11.05124, 19.47135, -3.30226] - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [1.3, 0.8, -3.9], - "easing": "linear" - }, - "0.4": { - "vector": [0.69956, 3.29369, -3.69314], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0.69956, 3.29369, 0.30686], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0.69956, 3.29369, 0.30686], - "easing": "easeInSine" - }, - "0.7": { - "vector": [0.69956, 3.29369, -3.69314], - "easing": "easeInSine" - }, - "0.8": { - "vector": [1.3, 0.3, -3.2] - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "bolt": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 4.14453], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 4.14453] - }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [0, 0, 0], - "easing": "easeInSine" - } - } - }, - "camera": { - "rotation": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-0.5, -0.8, -0.5] - }, - "0.5": { - "vector": [0.2, 0.4, 3], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-0.1, -0.2, -2], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [0, 0, 1.5] - }, - "0.9": { - "vector": [0, 0, -0.75] - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "ammo": { - "scale": { - "vector": [0, 0, 0] - } - }, - "shell": { - "rotation": { - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-21.80427, 22.90431, 1.23855], - "easing": "easeInBack" - }, - "0.7": { - "vector": [-210.8043, 220.9043, 1.23855], - "easing": "linear" - }, - "0.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0.3, 4.14453], - "easing": "easeInSine" - }, - "0.6": { - "vector": [-4, 6.3, 10.14] - }, - "0.7": { - "vector": [-8.5, 9.3, 19.14] - }, - "0.8": { - "vector": [-13.8, 10.2, 2070.44] - }, - "0.9": { - "vector": [0, 0, 0] - } - } - }, - "bullet5": { - "position": { - "0.6": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, 0.32266, -4], - "easing": "easeInSine" - }, - "0.8": { - "vector": [0, 0.32266, -4], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0, 0, 0] - } - } - }, "bolt_rot": { "rotation": { "0.0": { diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 75643f52a..7e3d87f88 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -20,7 +20,7 @@ "burst_size": 1, "empty_reload_time": 59, "clipLoad": 1, - "prepare_time": 31, + "prepare_time": 29, "iterative_time": 11, "finish_time": 18, "BypassesArmor": 0.5