重制M79换弹动画,添加瞄准时换弹功能

This commit is contained in:
Atsuihsio 2024-08-24 05:10:11 +08:00
parent de583bc566
commit 600d708418
11 changed files with 2820 additions and 2909 deletions

View file

@ -123,5 +123,18 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY());
player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ());
CoreGeoBone main = getAnimationProcessor().getBone("0");
var data = player.getPersistentData();
float num = (float) (1 - 0.9 * data.getDouble("zoom_time"));
if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) {
main.setRotX(num * main.getRotX());
main.setRotY(num * main.getRotY());
main.setRotZ(num * main.getRotZ());
main.setPosX(num * main.getPosX());
main.setPosY(num * main.getPosY());
main.setPosZ(num * main.getPosZ());
}
}
}

View file

@ -347,10 +347,11 @@ public class PlayerEventHandler {
ItemStack stack = player.getMainHandItem();
if (stack.is(ModTags.Items.GUN)
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))
// && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))
&& !player.isSpectator()
&& !stack.getOrCreateTag().getBoolean("charging")
&& !stack.getOrCreateTag().getBoolean("reloading")) {
// && !stack.getOrCreateTag().getBoolean("charging")
// && !stack.getOrCreateTag().getBoolean("reloading")
) {
if (player.getMainHandItem().getItem() != ModItems.MINIGUN.get()) {
if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zoom) {
player.setSprinting(false);

View file

@ -48,7 +48,7 @@ public class ReloadMessage {
if (!player.isSpectator()
&& stack.is(ModTags.Items.GUN)
&& !capability.zooming
// && !capability.zooming
&& !stack.getOrCreateTag().getBoolean("charging")
&& !(player.getCooldowns().isOnCooldown(stack.getItem()))
&& stack.getOrCreateTag().getInt("gun_reloading_time") == 0

View file

@ -233,7 +233,7 @@
},
"animation.m79.reload": {
"loop": "hold_on_last_frame",
"animation_length": 3.2,
"animation_length": 3.25,
"bones": {
"0": {
"rotation": {
@ -241,136 +241,125 @@
"vector": [0, 0, 0]
},
"0.1": {
"vector": [-0.45, -0.01, 0.08]
},
"0.175": {
"vector": [-5.86371, -0.02086, 0.1524]
},
"0.25": {
"vector": [-9.60484, -0.05343, 0.36959],
"easing": "easeInOutSine"
},
"0.3": {
"vector": [-13.16, -0.77, -3.09]
"vector": [-0.78508, -0.75745, -0.80336]
},
"0.375": {
"vector": [-19.93914, -1.50547, -8.34083]
},
"0.475": {
"vector": [1.77223, -1.82395, -7.21675],
"easing": "easeInOutSine"
},
"0.55": {
"vector": [-21.21199, -1.82114, -7.20561]
},
"0.625": {
"vector": [-14.1962, -1.81833, -7.19448]
},
"0.775": {
"vector": [-17.00782, -1.80417, -7.13846]
},
"1.1": {
"vector": [-16.81, 2.42, 4.07]
},
"1.4": {
"vector": [-27.09, 10.86, 10.25]
},
"1.7": {
"vector": [-38.79559, 21.05151, 17.19463],
"easing": "easeInOutSine"
},
"1.75": {
"vector": [-38.79559, 21.05151, 17.19463],
"vector": [-2.18568, -5.43198, 10.68351],
"easing": "easeInElastic"
},
"1.825": {
"vector": [-39.23373, 18.28492, 14.12009]
"0.45": {
"vector": [-9.51901, -5.43198, 10.68351],
"easing": "linear"
},
"1.9": {
"vector": [-36.17, 15.89, 10.81]
"0.575": {
"vector": [-5.14994, -6.42211, 0.6789],
"easing": "easeInElastic"
},
"0.7": {
"vector": [2.31432, -5.43198, 10.68351]
},
"0.875": {
"vector": [-0.70635, -5.51458, 5.66128]
},
"1.075": {
"vector": [-3.99009, -5.31319, 8.66793]
},
"1.7": {
"vector": [-8.56414, -15.6855, 12.58667],
"easing": "easeInElastic"
},
"1.775": {
"vector": [-6.85, -16.49, 6.4]
},
"1.875": {
"vector": [-2.85, -16.49, 6.4]
},
"2.0": {
"vector": [-36.14461, 11.96649, 5.37452]
"vector": [4.65, -16.49, 6.4]
},
"2.425": {
"vector": [-8.6549, 5.12178, -4.1079],
"2.15": {
"vector": [3.13968, -7.14956, -0.71608]
},
"2.3": {
"vector": [6.02456, -6.43525, -3.1355]
},
"2.45": {
"vector": [-6.5, 0, 0],
"easing": "easeInElastic"
},
"2.475": {
"vector": [-28.47987, -1.24916, -2.48672]
"vector": [1.83, 0, 0]
},
"2.575": {
"vector": [-14.34067, -1.19919, -2.38725]
"vector": [0.49, 0, 0]
},
"2.75": {
"vector": [2.73845, -0.85809, -1.70821]
},
"2.95": {
"vector": [-0.42526, -0.18009, -0.35851]
},
"2.975": {
"vector": [0, 0, 0],
"easing": "easeInQuad"
"2.775": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [0, 0.1, 0.6]
"0.125": {
"vector": [0.16, 0.02, -0.05]
},
"0.175": {
"vector": [0, -0.5, 0.5],
"easing": "easeInOutSine"
},
"0.25": {
"vector": [0, 1.3, 1.63]
},
"0.325": {
"vector": [-0.27, 1.18, 0.69]
},
"0.425": {
"vector": [-0.26, -0.43, 0.37]
},
"0.525": {
"vector": [-0.26, 0.37, 2.47]
},
"0.675": {
"vector": [-0.26, -0.83, 1.56]
},
"0.925": {
"vector": [0.16, -3.29, 1.46]
},
"1.7": {
"vector": [0.57, -5.49, 0.41],
"0.375": {
"vector": [0.60081, -0.04027, -1.7843],
"easing": "easeInElastic"
},
"1.75": {
"vector": [0.57, -5.49, 0.41],
"0.475": {
"vector": [0.13331, -0.6665, -0.57977],
"easing": "easeInElastic"
},
"1.9": {
"vector": [0.44, -5.5, -1.06]
"0.625": {
"vector": [0.3, -0.3, -2.15]
},
"2.0": {
"vector": [0.56846, -5.50785, -0.18936]
"0.775": {
"vector": [0.27247, 0.20923, -0.85141]
},
"2.425": {
"vector": [0.15, -2.92, -2.26]
"0.975": {
"vector": [0.22355, 0.19078, -0.30424]
},
"1.3": {
"vector": [0.22, -0.56, 0.7]
},
"1.8": {
"vector": [0.22, 0.19, 1.7]
},
"1.85": {
"vector": [0.32946, 0.41882, 1.41954]
},
"1.925": {
"vector": [0.68626, 0.28614, 0.1679],
"easing": "easeInElastic"
},
"2.025": {
"vector": [0.29, 0.21, 0.08]
},
"2.1": {
"vector": [0.31266, 0.21515, 1.41081],
"easing": "easeInElastic"
},
"2.225": {
"vector": [0.01236, 0.21628, 1.37266]
},
"2.3": {
"vector": [0.25805, 0.20359, 1.22802]
},
"2.475": {
"vector": [0.14, -3.84, -0.63]
"vector": [0.2, -0.2, -0.3]
},
"2.725": {
"vector": [0.08175, 0.07965, -0.28201]
"2.575": {
"vector": [0.14, -0.14, 1],
"easing": "easeInSine"
},
"2.675": {
"vector": [0.04, 0.15993, 0.24478]
},
"2.8": {
"vector": [0.00643, -0.01504, 0.5]
},
"2.975": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
"easing": "easeOutSine"
}
}
},
@ -379,156 +368,143 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [8, 0, 0]
},
"0.175": {
"0.15": {
"vector": [0, 0, 0]
},
"0.275": {
"0.2": {
"vector": [7, 0, 0]
},
"0.375": {
"0.25": {
"vector": [6.2031, -8.442, -3.2225]
},
"0.45": {
"0.325": {
"vector": [0, 0, 0],
"easing": "easeInOutSine"
},
"0.375": {
"vector": [0, 0, 0],
"easing": "easeInOutSine"
},
"0.575": {
"vector": [-28.5, 0, 0],
"easing": "easeInElastic"
},
"1.025": {
"vector": [-65.24202, -10.2476, 13.96581]
},
"1.525": {
"vector": [11.07156, -9.09353, -0.96843]
},
"1.825": {
"vector": [9.91812, -17.54282, 20.52427]
},
"1.9": {
"vector": [9.15113, -3.10609, 1.32907],
"easing": "easeInSine"
},
"1.95": {
"vector": [-4.56733, 3.70995, -13.68104]
},
"2.05": {
"vector": [6.52402, 4.41897, -13.13546]
},
"2.125": {
"vector": [-5.74375, -23.0423, -16.98905]
},
"2.3": {
"vector": [-28.5, 0, 0],
"easing": "easeInElastic"
},
"2.45": {
"vector": [0, 0, 0],
"easing": "easeInSine"
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [0, 0, -0.5]
"0.15": {
"vector": [0, 0, 0]
},
"0.175": {
"vector": [-0.4, 0, 0.2]
},
"0.275": {
"0.2": {
"vector": [-0.4, -0.6, -1.8]
},
"0.45": {
"0.325": {
"vector": [0, 0, 0]
},
"0.375": {
"vector": [0, 0, 0]
},
"0.575": {
"vector": [0.8, 0, -3.9],
"easing": "easeInElastic"
},
"1.025": {
"vector": [0.8, -1.5, 5.1]
},
"1.525": {
"vector": [-0.3, -4.77, 12.73]
},
"1.8": {
"vector": [1, -0.77, -1.47],
"easing": "easeInSine"
},
"1.85": {
"vector": [0.6, -0.94891, -3.63953]
},
"1.95": {
"vector": [-0.4, 0.13, -3.77]
},
"2.05": {
"vector": [0.1, -1.67, -4.47]
},
"2.125": {
"vector": [0.73, -0.18, -0.76]
},
"2.3": {
"vector": [0.8, 0, -3.9],
"easing": "easeInElastic"
},
"2.45": {
"vector": [0, 0, 0],
"easing": "easeInSine"
}
}
},
"Lefthand": {
"rotation": {
"0.075": {
"vector": [0, 0, 0]
},
"0.175": {
"vector": [-0.5941, -0.2481, 1.64028]
},
"0.25": {
"vector": [5.8983, 0.4381, -7.78752]
},
"0.7": {
"vector": [5.8983, 0.4381, -7.78752]
},
"1.075": {
"vector": [7.1702, -7.3911, -12.40813]
},
"1.525": {
"vector": [-17.5236, -27.4098, -23.09622]
},
"1.8": {
"vector": [29.6365, -18.5572, -26.67534],
"easing": "easeInSine"
},
"1.85": {
"vector": [37.4979, 5.0376, -44.74418],
"easing": "easeOutSine"
},
"1.925": {
"vector": [37.4979, 5.0376, -44.74418],
"easing": "easeOutSine"
},
"2.05": {
"vector": [-2.0612, 10.1264, -14.23199],
"easing": "easeInSine"
},
"2.325": {
"vector": [-22.3333, 0, 7.55556]
},
"2.425": {
"vector": [0, 0, 0]
},
"2.975": {
"vector": [0, 0, 0]
}
},
"position": {
"0.075": {
"vector": [0, 0, 0]
},
"0.25": {
"vector": [0.67, -1.16, 4.29]
},
"0.7": {
"vector": [0.67, -1.16, 4.29]
},
"1.075": {
"vector": [8.29483, -6.00713, 14.83785]
},
"1.525": {
"vector": [16.37697, 16.6495, 16.81009]
},
"1.8": {
"vector": [6.05921, 6.23262, -0.16518],
"easing": "easeInSine"
},
"1.85": {
"vector": [5.88792, 5.535, -1.06208],
"easing": "easeOutSine"
},
"1.925": {
"vector": [5.88792, 5.535, -1.06208],
"easing": "easeOutSine"
},
"2.175": {
"vector": [1.80684, -1.72207, 0.78728]
},
"2.325": {
"vector": [0.49873, 0.55192, 2.15561]
},
"2.425": {
"vector": [0, 0, 0]
},
"2.975": {
"vector": [0, 0, 0]
}
}
},
"qian": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"vector": [0, 0, 0]
},
"0.425": {
"vector": [65, 0, 0],
"easing": "easeInQuart"
},
"0.5": {
"vector": [55, 0, 0],
"easing": "easeOutSine"
},
"0.575": {
"vector": [65, 0, 0],
"easing": "linear"
},
"2.3": {
"vector": [54.45, 0, 0],
"0.125": {
"vector": [15.90495, -12.40952, -49.8767],
"easing": "easeInElastic"
},
"2.425": {
"2.55": {
"vector": [15.90495, -12.40952, -49.8767],
"easing": "easeInElastic"
},
"2.7": {
"vector": [0, 0, 0],
"easing": "easeInSine"
"easing": "easeInElastic"
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.125": {
"vector": [2.2, 1.4, -2.3],
"easing": "easeInElastic"
},
"2.55": {
"vector": [2.2, 1.4, -2.3],
"easing": "easeInElastic"
},
"2.7": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
}
},
@ -537,20 +513,14 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.525": {
"vector": [0, 0, 0]
},
"1.35": {
"vector": [-23, 50, 0]
},
"1.525": {
"vector": [-23, 50, 0]
"vector": [-13, -19, 0]
},
"1.8": {
"vector": [0, 0, 0],
"easing": "easeInSine"
},
"2.95": {
"1.85": {
"vector": [0, 0, 0]
}
},
@ -558,87 +528,15 @@
"0.0": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, 0, 0]
},
"0.525": {
"vector": [0, 0, 2],
"easing": "easeInSine"
"0.4": {
"vector": [0, 0, 0.08]
},
"0.575": {
"vector": [0.5553, 5.66292, 3.26201]
},
"0.625": {
"vector": [0.92367, 10.62579, 3.20391]
},
"0.675": {
"vector": [1.05295, 13.89744, 2.49726]
},
"0.7": {
"vector": [1.04481, 16.11923, 1.30045]
},
"0.725": {
"vector": [0.9355, 18.34587, -0.81635]
},
"0.75": {
"vector": [0.83218, 20.10103, -2.66047]
},
"0.775": {
"vector": [0.60803, 21.18849, -5.25043]
},
"0.825": {
"vector": [0.30899, 22.10409, -10.6078]
},
"0.875": {
"vector": [-0.06704, 21.51668, -15.3093]
},
"0.9": {
"vector": [-0.11094, 20.64838, -18.12569]
},
"0.925": {
"vector": [-0.13506, 19.48257, -20.38455]
},
"0.95": {
"vector": [-0.12422, 18.06817, -22.75406]
},
"0.975": {
"vector": [-0.13483, 15.96007, -25.4115]
},
"1.0": {
"vector": [0.36357, 13.86601, -27.85132]
},
"1.025": {
"vector": [0.59404, 11.40735, -30.64647]
},
"1.05": {
"vector": [1.09508, 8.07792, -33.96118]
},
"1.075": {
"vector": [1.75558, 4.38487, -37.45208]
},
"1.1": {
"vector": [2.56204, 0.51974, -40.82502]
},
"1.125": {
"vector": [3.59665, -4.19158, -44.30519]
},
"1.15": {
"vector": [4.92529, -9.99504, -48.26734]
},
"1.175": {
"vector": [6.39934, -16.76542, -52.47004]
},
"1.2": {
"vector": [8.02542, -24.1479, -56.75329]
},
"1.225": {
"vector": [9.74933, -33.04885, -61.62866]
},
"1.35": {
"vector": [12.36312, -8.2, 10.04981]
"vector": [0, 0, 9.15],
"easing": "easeInSine"
},
"1.525": {
"vector": [12.36312, -8.2, 10.04981]
"vector": [-2, -3, 16.15]
},
"1.8": {
"vector": [0, 0, 2],
@ -646,9 +544,6 @@
},
"1.85": {
"vector": [0, 0, 0]
},
"2.95": {
"vector": [0, 0, 0]
}
}
},
@ -673,36 +568,48 @@
},
"switch": {
"rotation": {
"0.275": {
"0.2": {
"vector": [0, 0, 0]
},
"0.25": {
"vector": [0, -47.5, 0]
},
"2.45": {
"vector": [0, -47.5, 0]
},
"2.475": {
"vector": [0, 0, 0],
"easing": "easeInQuint"
}
}
},
"main": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"vector": [0, -47.5, 0]
},
"2.475": {
"vector": [0, -47.5, 0]
},
"2.5": {
"vector": [0, 0, 0],
"easing": "easeInQuint"
}
}
},
"button": {
"position": {
"0.1": {
"vector": [0, 0, 0]
},
"0.175": {
"vector": [0, -0.2, 0.3]
"0.575": {
"vector": [-65, 0, 0],
"easing": "easeInElastic",
"easingArgs": [1]
},
"2.475": {
"vector": [0, -0.2, 0.3]
"2.3": {
"vector": [-65, 0, 0],
"easing": "easeInElastic"
},
"2.5": {
"2.45": {
"vector": [0, 0, 0],
"easing": "easeInQuint"
"easing": "easeInSine"
},
"2.825": {
"vector": [0, 0, 0]
}
},
"position": {
"vector": [0, 0, 0]
}
},
"camera": {
@ -764,11 +671,6 @@
}
}
}
},
"sound_effects": {
"0.0": {
"effect": "m_79_reload"
}
}
}
},

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"1": "superbwarfare:item/m793d"
"1": "superbwarfare:item/m8703d"
},
"elements": [
{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B