From f127dc79980387410a68abd336a8a13fb45b4948 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 23 May 2024 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=9B=B4=E6=96=B0(M79)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/M79ItemModel.java | 9 + .../target/animations/m79.animation.json | 366 +++++++----------- .../resources/assets/target/geo/m79.geo.json | 4 + 3 files changed, 161 insertions(+), 218 deletions(-) diff --git a/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java index eb0931070..17db10b73 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.M79Item; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -114,5 +115,13 @@ public class M79ItemModel extends GeoModel { move.setRotZ(3.7f * (float) yaw + 2.7f * (float) m); move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/resources/assets/target/animations/m79.animation.json b/src/main/resources/assets/target/animations/m79.animation.json index 7e363450c..29de73e27 100644 --- a/src/main/resources/assets/target/animations/m79.animation.json +++ b/src/main/resources/assets/target/animations/m79.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -90,6 +108,25 @@ "easing": "easeOutSine" } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.5, -0.5, 0.5] + }, + "0.2": { + "vector": [0.5, 0, -0.5] + }, + "0.4": { + "vector": [-0.5, 0.5, 0.5] + }, + "0.6": { + "vector": [0.5, 0, -0.5] + }, + "0.8": { + "vector": [-0.5, -0.5, 0.5] + } + } } } }, @@ -106,58 +143,6 @@ } } }, - "animation.m79.fire2": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m79.fire3": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m79.fire4": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m79.fire5": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - } - } - }, "animation.m79.reload": { "animation_length": 4.1, "bones": { @@ -178,9 +163,9 @@ "easing": "easeOutQuad" }, "0.5": { - "vector": [1.99535, -0.85991, -4.03239] + "vector": [1.99535, -0.85991, -11.03239] }, - "0.8": { + "0.7": { "vector": [-5.092, 0.85585, 5.2355] }, "1.0": { @@ -188,40 +173,46 @@ "easing": "easeOutSine" }, "1.1": { - "vector": [11.9302, 0.10919, 5.9451], + "vector": [19.9302, 0.10919, 5.9451], "easing": "easeOutQuad" }, - "1.4": { + "1.2": { "vector": [4.36381, 0.82628, 0.03385], "easing": "easeInOutSine" }, + "1.4": { + "vector": [-17.05, 0.79, 6.78] + }, "1.8": { - "vector": [0.96512, 0.86211, 6.53108], - "easing": "easeOutSine" + "vector": [-12.92, 0.78, 9.64] }, - "2.6": { - "vector": [-12.11033, -7.93046, 34.73467], - "easing": "easeInOutSine" + "2.2": { + "vector": [-12.79, 0.77, 14.16] }, - "2.9": { - "vector": [-15.11033, -7.93046, 34.73467], - "easing": "easeOutSine" + "2.7": { + "vector": [-12.62, 0.76, 35.57], + "easing": "easeInElastic" + }, + "3.0": { + "vector": [-18.22, 0.68, 40.62] }, "3.1": { - "vector": [-10.11033, -7.93046, 34.73467], - "easing": "easeOutQuad" + "vector": [-7.71, 0.66, 39.49] }, - "3.3": { - "vector": [-14.78055, -11.65991, 21.03919], - "easing": "easeInOutCubic" + "3.2": { + "vector": [-31.63, 0.65, 31.1] }, - "3.6": { - "vector": [-2.12864, -1.11901, 3.04595], - "easing": "easeInOutQuad" + "3.5": { + "vector": [-23.14, 0.58, 12.2] + }, + "3.7": { + "vector": [-16.46, 0.52, -8.16] }, "3.8": { - "vector": [-7.27719, -0.67141, 1.82757], - "easing": "easeInOutSine" + "vector": [-22.93, 0.49, -7.65] + }, + "3.9": { + "vector": [-7.38, 0.44, -6.8] }, "4.1": { "vector": [0, 0, 0], @@ -236,9 +227,12 @@ "vector": [0, 0, 0] }, "0.2": { - "vector": [0, -0.1, 0.1], + "vector": [0, -0.1, 0.7], "easing": "easeInOutSine" }, + "0.3": { + "vector": [0, -0.03, -0.57] + }, "0.5": { "vector": [0, 0, 0] }, @@ -247,39 +241,54 @@ "easing": "easeOutSine" }, "1.1": { - "vector": [0, -3.56, 0.02], + "vector": [0, -3.86, -0.08], "easing": "easeInOutSine" }, + "1.2": { + "vector": [0, -1.27, 1.29] + }, "1.4": { - "vector": [0, -2.37, 0.09] + "vector": [0, -2.27, 0.13], + "easing": "easeInSine" }, "1.6": { - "vector": [0, -0.67, 0.13], - "easing": "easeInOutSine" - }, - "2.6": { - "vector": [0, -2.48, 0.61], - "easing": "easeInOutSine" - }, - "2.9": { - "vector": [0, -2.48, 0.61], + "vector": [0, -1.83422, 0.13], "easing": "easeOutSine" }, + "2.0": { + "vector": [0, -2.01, 0.53], + "easing": "easeInSine" + }, + "2.5": { + "vector": [0, -2.24, 0.13], + "easing": "easeOutSine" + }, + "2.7": { + "vector": [0, -2.42, 0.12] + }, + "3.0": { + "vector": [0.4, -1.65, 0.11] + }, "3.1": { - "vector": [0, -3.98, 0.21], - "easing": "easeOutQuad" + "vector": [-1.2, -3.53, -0.69] }, - "3.3": { - "vector": [0, -2.38, 0.61], - "easing": "easeInOutCubic" + "3.2": { + "vector": [0.21, -1.29, 0.32] }, - "3.6": { - "vector": [0.75, -1.1, -0.7], - "easing": "easeInOutQuad" + "3.4": { + "vector": [0.04797, -1.17359, 0.3] + }, + "3.7": { + "vector": [-0.3, -1.52, 0.24] + }, + "3.8": { + "vector": [-0.22, 0.96, 0.18] + }, + "3.9": { + "vector": [-0.2, 0.52578, 0.16] }, "4.0": { - "vector": [0, -0.45, 0], - "easing": "easeOutSine" + "vector": [-0.15, -0.18422, 0.12] }, "4.1": { "vector": [0, 0, 0], @@ -329,11 +338,11 @@ }, "Lefthand": { "rotation": { - "0.6": { + "0.7": { "vector": [0, 0, 0] }, - "0.8": { - "vector": [54.36, -63.89, -154.5] + "0.9": { + "vector": [53.36, -63.89, -154.5] }, "1.0": { "vector": [62.36118, -63.89476, -154.50372], @@ -386,11 +395,11 @@ } }, "position": { - "0.6": { + "0.7": { "vector": [0, 0, 0] }, - "0.8": { - "vector": [5.4, 2.1, -3.9] + "0.9": { + "vector": [4.4, 0.6, -3.9] }, "1.0": { "vector": [2.8, 0, -3.9], @@ -653,141 +662,62 @@ "vector": [0, 0, 0] } } - } - } - }, - "animation.m79.hit": { - "animation_length": 0.6, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-109.99624, -5.6423, 87.09082] - }, - "0.2": { - "vector": [-120.64214, 12.53737, 76.51478], - "easing": "easeInOutCubic" - }, - "0.3": { - "vector": [-95.64214, 12.53737, 76.51478] - }, - "0.4": { - "vector": [-30.75893, -0.13762, 69.59462], - "easing": "easeInCirc" - }, - "0.5": { - "vector": [-15.85338, -1.67489, 10.01029], - "easing": "easeInOutCirc" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, 0, -0.6] - }, - "0.2": { - "vector": [-0.1, 2.7, -14.9], - "easing": "easeInOutCubic" - }, - "0.4": { - "vector": [0, 0, 1.4], - "easing": "easeInCirc" - }, - "0.5": { - "vector": [0, -0.3, 0.41] - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } }, - "Righthand": { + "camera": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, "0.1": { - "vector": [115.09874, -2.71949, 20.40737] - }, - "0.3": { - "vector": [117.68159, -1.57214, 10.14378] + "vector": [0, 0, 0] }, "0.4": { - "vector": [80.64562, -5.59257, -1.31049] - }, - "0.6": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [10.4, 14, -11.9] - }, - "0.3": { - "vector": [7.9, 12.6, -12] - }, - "0.4": { - "vector": [4.73, 15.07, -5.33] + "vector": [0, 0.5, -0.5] }, "0.5": { - "vector": [0.6, 8.23, 0.91] + "vector": [0.5, -0.5, 1.5] }, "0.6": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] + "vector": [0, 0.5, -0.7] }, - "0.1": { - "vector": [160.00784, 26.63928, 97.85625] + "0.8": { + "vector": [0, -0.3, 0.4] }, - "0.3": { - "vector": [119.73392, 26.4069, 30.49799] + "1.0": { + "vector": [0.75, 0.4, -2] }, - "0.4": { - "vector": [32.51143, 12.91572, -13.61421] + "1.1": { + "vector": [-2.5, 0.3, 1.5] }, - "0.5": { - "vector": [4.26641, -22.39453, -18.39143] + "1.2": { + "vector": [1.5, 0.3, -1.5] }, - "0.6": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "1.5": { + "vector": [0.5, 0.12, -0.2], + "easing": "easeInElastic" }, - "0.1": { - "vector": [6.5, 14.6, -13.1] + "2.7": { + "vector": [0.15, 0.09, 0] }, - "0.3": { - "vector": [1.3, 17.1, -9.8] + "3.0": { + "vector": [-0.25, 0.4, -0.5] }, - "0.4": { - "vector": [-1.77, 11.77, -0.53] + "3.1": { + "vector": [0.25, -0.4, 0.25] }, - "0.5": { - "vector": [-0.98, 3.54, -2.56] + "3.2": { + "vector": [-0.5, 0.25, -0.125] }, - "0.6": { + "3.4": { + "vector": [0.25, 0.125, -0.1] + }, + "3.7": { + "vector": [0.12, 0.25, -0.25] + }, + "3.8": { + "vector": [3, 0.17, 1.5] + }, + "3.9": { + "vector": [1, 0.11, -1] + }, + "4.1": { "vector": [0, 0, 0] } } diff --git a/src/main/resources/assets/target/geo/m79.geo.json b/src/main/resources/assets/target/geo/m79.geo.json index 0bc51b24e..50d60ac6e 100644 --- a/src/main/resources/assets/target/geo/m79.geo.json +++ b/src/main/resources/assets/target/geo/m79.geo.json @@ -3628,6 +3628,10 @@ } } ] + }, + { + "name": "camera", + "pivot": [2.32141, 4.96276, 14.17702] } ] }