From c8f9087994b80fa56779b6a37fc141a688d39d2c Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 2 Aug 2024 17:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/Glock17ItemModel.java | 6 +- .../animations/glock17.animation.json | 31 +- .../animations/ntw_20.animation.json | 11 + .../animations/trachelium.animation.json | 989 ------------------ .../assets/superbwarfare/geo/glock17.geo.json | 12 +- 5 files changed, 38 insertions(+), 1011 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java index 80533fa3d..b9d514884 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java @@ -59,12 +59,12 @@ public class Glock17ItemModel extends GeoModel { if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) { shen.setPosY(0.05f * (float) (fp + 2 * fr)); - shen.setPosZ(0.3f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.05f * (float) (fp + fr)); + shen.setPosZ(-0.05f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.01f * (float) (fp + fr)); } else { shen.setPosY(0.08f * (float) (fp + 2 * fr)); shen.setPosZ(0.9f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.17f * (float) (0.18f * fp + fr)); + shen.setRotX(0.27f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); } shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); diff --git a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json index 941211515..72c23211b 100644 --- a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json @@ -160,7 +160,7 @@ }, "animation.glock.fire": { "loop": "hold_on_last_frame", - "animation_length": 0.0417, + "animation_length": 0.0833, "override_previous_animation": true, "bones": { "lun": { @@ -180,6 +180,17 @@ "vector": [0, 0, 0] } } + }, + "roll": { + "rotation": { + "0.0": { + "vector": [-5, 0, 0] + }, + "0.0833": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } } } }, @@ -522,14 +533,14 @@ "easing": "easeInOutSine" }, "0.225": { - "vector": [-4.16, -1.54, 0] + "vector": [-6.16, -1.54, 0] }, "0.325": { "vector": [-7.2, 0, 0], "easing": "easeInElastic" }, "0.4": { - "vector": [-4, 0.3, 0] + "vector": [-6, 0.3, 0] }, "0.525": { "vector": [-5.3, 1.1, 1.4], @@ -692,11 +703,6 @@ } } } - }, - "sound_effects": { - "0.0": { - "effect": "glock_reload_normal" - } } }, "animation.glock.reload_empty": { @@ -977,14 +983,14 @@ "easing": "easeInOutSine" }, "0.225": { - "vector": [-4.16, -1.54, 0] + "vector": [-6.16, -1.54, 0] }, "0.325": { "vector": [-7.2, 0, 0], "easing": "easeInElastic" }, "0.4": { - "vector": [-4, 0.3, 0] + "vector": [-6, 0.3, 0] }, "0.525": { "vector": [-5.3, 1.1, 1.4], @@ -1222,11 +1228,6 @@ } } } - }, - "sound_effects": { - "0.0": { - "effect": "glock_reload_normal" - } } } }, diff --git a/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json b/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json index 717a0ff26..1a4345705 100644 --- a/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json @@ -48,6 +48,17 @@ "loop": "hold_on_last_frame", "animation_length": 0.7917, "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [-5, 0, 0] + }, + "0.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, "action": { "position": { "0.0": { diff --git a/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json b/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json index b77f2883c..e84434d5f 100644 --- a/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json @@ -1626,995 +1626,6 @@ } } } - }, - "animation.glock.reload_normal": { - "loop": "hold_on_last_frame", - "animation_length": 1.4, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-2.13733, 4.36681, -32.14213], - "easing": "easeInOutSine" - }, - "1.05": { - "vector": [-11, 0, -7.59] - }, - "1.2": { - "vector": [0, 0, 11] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-2.09488, 5.29738, -0.68123] - }, - "0.9": { - "vector": [-2.54838, 4.40163, -0.94985] - }, - "0.95": { - "vector": [-1.1451, 3.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.025": { - "vector": [-1.21556, 3.52975, -0.6553] - }, - "1.075": { - "vector": [-0.7894, 1.92782, -0.35804] - }, - "1.15": { - "vector": [0.16272, 2.04257, 1.76535] - }, - "1.2": { - "vector": [0.12347, 0.9124, 2.31886] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" - }, - "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" - }, - "0.375": { - "vector": [0, 2, -0.8] - }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] - }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.875": { - "vector": [-0.1, 0, 2] - }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.1": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.5, 0.5, -1.17] - }, - "1.3": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.125": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 6, -9] - }, - "0.375": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.125": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [3.00321, -0.61688, -0.10106] - }, - "0.375": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [133.30702, -9.72565, -30.6365] - }, - "0.65": { - "vector": [25.46719, -22.2363, 78.12621] - }, - "0.725": { - "vector": [23.34788, -25.26118, 70.86152] - }, - "0.8": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "0.925": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "0.975": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "1.0": { - "vector": [13.04381, 11.88065, 62.82106] - }, - "1.025": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "1.05": { - "vector": [5.64016, 8.63483, 66.98444] - }, - "1.125": { - "vector": [0, 0, 8] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.1": { - "vector": [0, 0, 0] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.25": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-4.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-4, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.25": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] - }, - "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] - }, - "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] - }, - "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] - }, - "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "1.0": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "glock_reload_normal" - } - } - }, - "animation.glock.reload_empty": { - "loop": "hold_on_last_frame", - "animation_length": 1.7, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-2.13733, 4.36681, -32.14213], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [-9.0963, 11.7554, -1.9037] - }, - "1.225": { - "vector": [-14.64574, 13.27302, 4.69755], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-23.75162, 11.92866, 3.66136] - }, - "1.45": { - "vector": [-1.83441, 7.95244, 2.44091] - }, - "1.625": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-2.09488, 5.29738, -0.68123] - }, - "0.95": { - "vector": [-1.1451, 3.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.125": { - "vector": [-0.90702, 2.71908, -0.35018] - }, - "1.2": { - "vector": [-1.4, 0, 0], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-0.19, 0.3, 3.9], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-0.38, 0.59, 2.64] - }, - "1.45": { - "vector": [-0.12, 0.29, -2.04] - }, - "1.55": { - "vector": [-0.04, 0.09, 1.84] - }, - "1.625": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "Righthand": { - "rotation": { - "0.125": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 6, -9] - }, - "0.375": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.125": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [3.00321, -0.61688, -0.10106] - }, - "0.375": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [133.30702, -9.72565, -30.6365] - }, - "0.65": { - "vector": [25.46719, -22.2363, 78.12621] - }, - "0.725": { - "vector": [23.34788, -25.26118, 70.86152] - }, - "0.8": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "0.925": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "0.975": { - "vector": [15.35593, 5.20698, 63.75845] - }, - "1.0": { - "vector": [13.04381, 11.88065, 62.82106] - }, - "1.05": { - "vector": [-4.93818, -6.6412, 30.82739] - }, - "1.15": { - "vector": [-32.88924, -30.55823, -55.9374], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [-32.88924, -30.55823, -55.9374], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [-32.88924, -30.55823, -55.9374], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [-32.88924, -30.55823, -55.9374], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [3.537, -23.82754, -26.97592] - }, - "1.575": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.05": { - "vector": [-1.7943, 0.59114, 3.07913] - }, - "1.1": { - "vector": [0.88646, 1.82623, 0.12722] - }, - "1.15": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [2.76, 2.16, -1.12] - }, - "1.575": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-4.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-4, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] - }, - "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] - }, - "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] - }, - "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] - }, - "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" - }, - "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" - }, - "0.375": { - "vector": [0, 2, -0.8] - }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] - }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.875": { - "vector": [-0.1, 0, 2] - }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.075": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.2, 0, -1.5] - }, - "1.25": { - "vector": [1, 2, 1.8] - }, - "1.35": { - "vector": [-1.5, -3, -1.5] - }, - "1.45": { - "vector": [0, 2, 1], - "easing": "easeInElastic" - }, - "1.55": { - "vector": [0, 0, 0] - } - } - }, - "bullet": { - "scale": { - "0.1": { - "vector": [1, 1, 1] - }, - "0.125": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - }, - "0.625": { - "vector": [1, 1, 1] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "glock_reload_normal" - } - } } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json index 12fa48de2..2b901d894 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json @@ -2374,44 +2374,48 @@ "cubes": [ { "origin": [-0.12279, 2.26137, -4.89821], - "size": [0.24557, 0.59288, 4.07732], + "size": [0.24557, 0.59288, 5.77732], "pivot": [0, 2.55781, -2.22955], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [22, 31], "uv_size": [0.25, 0.5]}, + "south": {"uv": [0, 8], "uv_size": [1, 1]}, "up": {"uv": [10, 19], "uv_size": [0.25, 4]}, "down": {"uv": [11, 23], "uv_size": [0.25, -4]} } }, { "origin": [-0.12279, 2.26137, -4.89821], - "size": [0.24557, 0.59288, 4.07732], + "size": [0.24557, 0.59288, 5.77732], "pivot": [0, 2.55781, -2.22955], "rotation": [0, 0, 67.5], "uv": { "north": {"uv": [31, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [0, 8], "uv_size": [1, 1]}, "up": {"uv": [13, 19], "uv_size": [0.25, 4]}, "down": {"uv": [15, 23], "uv_size": [0.25, -4]} } }, { "origin": [-0.12279, 2.26137, -4.89821], - "size": [0.24557, 0.59288, 4.07732], + "size": [0.24557, 0.59288, 5.77732], "pivot": [0, 2.55781, -2.22955], "rotation": [0, 0, 112.5], "uv": { "north": {"uv": [23, 31], "uv_size": [0.25, 0.5]}, + "south": {"uv": [0, 8], "uv_size": [1, 1]}, "up": {"uv": [17, 19], "uv_size": [0.25, 4]}, "down": {"uv": [19, 21], "uv_size": [0.25, -4]} } }, { "origin": [-0.12279, 2.26137, -4.89821], - "size": [0.24557, 0.59288, 4.07732], + "size": [0.24557, 0.59288, 5.77732], "pivot": [0, 2.55781, -2.22955], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [31, 23], "uv_size": [0.25, 0.5]}, + "south": {"uv": [0, 8], "uv_size": [1, 1]}, "up": {"uv": [18, 19], "uv_size": [0.25, 4]}, "down": {"uv": [0, 24], "uv_size": [0.25, -4]} }