diff --git a/src/main/java/net/mcreator/target/network/message/ReloadMessage.java b/src/main/java/net/mcreator/target/network/message/ReloadMessage.java index 68d8d7154..ec31d5c5b 100644 --- a/src/main/java/net/mcreator/target/network/message/ReloadMessage.java +++ b/src/main/java/net/mcreator/target/network/message/ReloadMessage.java @@ -49,6 +49,7 @@ public class ReloadMessage { if (!player.isSpectator() && stack.is(TargetModTags.Items.GUN) && !capability.zooming + && !stack.getOrCreateTag().getBoolean("charging") && !(player.getCooldowns().isOnCooldown(stack.getItem())) && stack.getOrCreateTag().getInt("gun_reloading_time") == 0 ) { diff --git a/src/main/resources/assets/target/animations/sentinel.animation.json b/src/main/resources/assets/target/animations/sentinel.animation.json index 9fb2c83be..f8ed77010 100644 --- a/src/main/resources/assets/target/animations/sentinel.animation.json +++ b/src/main/resources/assets/target/animations/sentinel.animation.json @@ -581,11 +581,11 @@ "bones": { "0": { "rotation": { - "0.0": { + "0.05": { "vector": [0, 0, 0], "easing": "easeInOutSine" }, - "0.125": { + "0.15": { "vector": [-3.45497, -0.95836, -7.61112] }, "0.275": { @@ -661,11 +661,11 @@ } }, "position": { - "0.0": { + "0.05": { "vector": [0, 0, 0], "easing": "easeInOutSine" }, - "0.175": { + "0.2": { "vector": [0, -0.3, 0] }, "0.45": { @@ -1101,7 +1101,7 @@ "bones": { "0": { "rotation": { - "0.0": { + "0.1": { "vector": [0, 0, 0], "easing": "easeInOutSine" }, @@ -1124,16 +1124,16 @@ "1.375": { "vector": [-55.51438, -22.7486, -32.51464] }, - "1.625": { + "1.725": { "vector": [-52.12845, -31.71311, -39.87549] }, - "1.7": { + "1.8": { "vector": [-50.63166, -30.29197, -38.76909] }, - "1.775": { + "1.875": { "vector": [-53.06059, -26.45672, -38.1501] }, - "1.925": { + "2.025": { "vector": [-52.12845, -31.71311, -39.87549] }, "2.3": { @@ -1150,7 +1150,7 @@ } }, "position": { - "0.0": { + "0.1": { "vector": [0, 0, 0], "easing": "easeInOutSine" }, @@ -1170,19 +1170,19 @@ "1.05": { "vector": [-3.51028, 6.5846, -1.08775] }, - "1.6": { + "1.7": { "vector": [-3.51, 6.58, -1.09] }, - "1.7": { + "1.8": { "vector": [-3.43374, 6.54933, -1.14853] }, - "1.775": { + "1.875": { "vector": [-3.03368, 6.41847, -1.18575] }, - "1.85": { + "1.95": { "vector": [-3.69025, 6.67119, -0.86389] }, - "2.0": { + "2.1": { "vector": [-3.69025, 6.67119, -0.86389] }, "2.45": { @@ -1218,20 +1218,20 @@ "vector": [15, 0, 0], "easing": "easeOutCubic" }, - "1.55": { + "1.525": { "vector": [15, 0, 0], "easing": "easeOutCubic" }, - "1.7": { + "1.675": { "vector": [15, 0, 0] }, - "1.8": { + "1.775": { "vector": [8.5, 0, 3] }, - "2.0": { + "1.925": { "vector": [2, 0, 0] }, - "2.075": { + "2.05": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -1251,20 +1251,20 @@ "vector": [0, -16.3, 10.6], "easing": "easeOutCubic" }, - "1.55": { + "1.525": { "vector": [0, -16.3, 10.6], "easing": "easeOutCubic" }, - "1.7": { + "1.675": { "vector": [0, -4.9, 0.9] }, - "1.8": { + "1.775": { "vector": [0, -5.2, 0.3] }, - "2.0": { + "1.925": { "vector": [0, -4.6, 0.3] }, - "2.075": { + "2.05": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -1283,14 +1283,14 @@ "vector": [-3.22206, -3.30648, 2.38196], "easing": "linear" }, - "2.2": { + "2.125": { "vector": [-3.22206, -3.30648, 2.38196] }, - "2.325": { + "2.25": { "vector": [28.632, -17.75227, 3.13551], "easing": "linear" }, - "2.425": { + "2.35": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -1307,14 +1307,14 @@ "vector": [-0.9, -3.5, 18.8], "easing": "linear" }, - "2.2": { + "2.125": { "vector": [-0.9, -3.5, 18.8] }, - "2.325": { + "2.25": { "vector": [-0.26, 1.67, 7.31], "easing": "linear" }, - "2.425": { + "2.35": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -1383,7 +1383,7 @@ }, "sound_effects": { "0.0": { - "effect": "sentinel_reload" + "effect": "sentinel_reload_normal" } } }, @@ -1394,10 +1394,10 @@ "bones": { "0": { "rotation": { - "0.0": { + "0.125": { "vector": [0, 0, 0] }, - "0.075": { + "0.2": { "vector": [2.2309, 1.32745, 5.98455] }, "0.4": { @@ -1476,7 +1476,7 @@ } }, "position": { - "0.0": { + "0.125": { "vector": [0, 0, 0] }, "0.35": { diff --git a/src/main/resources/assets/target/sounds/sentinel/sentinel_reload_normal.ogg b/src/main/resources/assets/target/sounds/sentinel/sentinel_reload_normal.ogg index d67044dd7..fbf2aafec 100644 Binary files a/src/main/resources/assets/target/sounds/sentinel/sentinel_reload_normal.ogg and b/src/main/resources/assets/target/sounds/sentinel/sentinel_reload_normal.ogg differ