diff --git a/build.gradle b/build.gradle index 5d53e8290..9bd0a1228 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ def getGitCommitHash() { return stdout.toString().trim() } -version = '0.1.0-SNAPSHOT-' + getGitCommitHash() +version = '0.1.1-SNAPSHOT-' + getGitCommitHash() group = 'com.Atsushio.target' archivesBaseName = 'target' diff --git a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java index d0f42c7ac..dea91617a 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.Trachelium; 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; @@ -53,11 +54,11 @@ public class TracheliumItemModel extends GeoModel { double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); - shen.setPosX(-0.4f * (float) (fp + 2 * fr)); - shen.setPosY(0.4f * (float) (fp + 2 * fr)); + shen.setPosX(-0.4f * (float) (fp + 0.2 * fr)); + shen.setPosY(0.6f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr)); - shen.setRotX(0.125f * (float) (1.28f * fp + fr)); - shen.setRotY(0.15f * (float) fr); + shen.setRotX(0.18f * (float) (1.28f * fp + fr)); + shen.setRotY(0.12f * (float) fr); shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); @@ -118,5 +119,12 @@ public class TracheliumItemModel extends GeoModel { 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/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index cba588421..34fb20b0a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -171,7 +171,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { itemTag.putDouble("reload_time", 0); } if (itemTag.getBoolean("reloading")) { - if (itemTag.getDouble("reload_time") == 57) { + if (itemTag.getDouble("reload_time") == 62) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.TRACHELIUM_RELOAD.get(), 100, 1); diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 9f391f6a9..8eb17c80e 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -35,7 +35,7 @@ public class PlayerReloadProcedure { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 57); + tag.putDouble("reload_time", 62); } if (player.getMainHandItem().getItem() == TargetModItems.HUNTING_RIFLE.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) diff --git a/src/main/resources/assets/target/animations/trachelium.animation.json b/src/main/resources/assets/target/animations/trachelium.animation.json index ca66b9542..9387dd0ff 100644 --- a/src/main/resources/assets/target/animations/trachelium.animation.json +++ b/src/main/resources/assets/target/animations/trachelium.animation.json @@ -5,44 +5,6 @@ "loop": true, "animation_length": 2 }, - "animation.trachelium.draw": { - "animation_length": 0.6, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [27.21312, -47.42646, -2.0218] - }, - "0.1": { - "vector": [12.5, -15, 0] - }, - "0.2": { - "vector": [3.48268, 0.40464, 8.20687] - }, - "0.4": { - "vector": [0, 0, -2] - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [3, -17.3, 0] - }, - "0.2": { - "vector": [0, 0, -1.65] - }, - "0.3": { - "vector": [0, 0, 0.93] - }, - "0.5": { - "vector": [0, 0, 0] - } - } - } - } - }, "animation.trachelium.run": { "loop": true, "animation_length": 0.8, @@ -107,23 +69,32 @@ "position": { "vector": [0.3, 0, 0.2] } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.3, -0.3, 0.3] + }, + "0.2": { + "vector": [0.3, 0, -0.3] + }, + "0.4": { + "vector": [-0.3, 0.3, 0.3] + }, + "0.6": { + "vector": [0.3, 0, -0.3] + }, + "0.8": { + "vector": [-0.3, -0.3, 0.3] + } + } } } }, "animation.trachelium.fire": { - "animation_length": 0.04167, + "animation_length": 0.0417, "override_previous_animation": true, "bones": { - "jichui": { - "rotation": { - "0.0": { - "vector": [-50, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] - } - } - }, "lun": { "rotation": { "0.0": { @@ -145,7 +116,8 @@ } }, "animation.trachelium.reload": { - "animation_length": 2.79167, + "loop": "hold_on_last_frame", + "animation_length": 3, "override_previous_animation": true, "bones": { "0": { @@ -153,66 +125,60 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1667": { - "vector": [-5.51899, -1.64262, -17.05057] + "0.0833": { + "vector": [6.22824, 1.18826, 5.97426] }, - "0.375": { - "vector": [-12.5, 0, 7.5] + "0.2": { + "vector": [-14.01, 2.98, -9.37] }, - "0.4583": { - "vector": [-4.95134, 0, 7.4708] + "0.3167": { + "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { - "vector": [-1.94197, 0, 7.45666] + "0.4667": { + "vector": [14.54523, -3.65089, 10.23644], + "easing": "easeInElastic" }, - "0.625": { - "vector": [-14.77503, -1.92296, 0.17219] - }, - "0.8333": { - "vector": [-19.39115, -1.5522, 1.57445] - }, - "0.9583": { - "vector": [-14.86523, -1.19285, 2.93357] - }, - "1.375": { - "vector": [-12.77884, 0.00498, 7.46395] - }, - "1.5": { - "vector": [-12.3649, -0.98198, 14.94703] - }, - "1.7917": { - "vector": [-12.31001, -0.96657, 21.14136] - }, - "1.9167": { - "vector": [-20.63575, 3.22611, 39.33401] - }, - "2.0": { - "vector": [-20.63575, 3.22611, 39.33401] - }, - "2.125": { - "vector": [-16.41292, 1.20303, 43.06512], - "easing": "easeOutCubic" - }, - "2.2083": { - "vector": [-15.93047, 4.05264, 31.94923], - "easing": "easeOutQuad" - }, - "2.375": { - "vector": [23.20024, -0.71272, 8.85468] - }, - "2.5": { - "vector": [-15.22694, -0.64232, 7.98015] - }, - "2.5833": { - "vector": [-25.77681, -0.48502, 6.02583], + "0.6": { + "vector": [0.37441, 0.89667, -10.2701], "easing": "easeOutSine" }, - "2.6667": { - "vector": [-3.05174, -0.40637, 5.04866] + "0.7833": { + "vector": [3.26106, 0.70038, -4.05452] }, - "2.7917": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" + "1.0333": { + "vector": [8.50158, 0.81329, -1.09833], + "easing": "easeInSine" + }, + "1.2333": { + "vector": [4.40486, 3.1276, -2.71974] + }, + "2.05": { + "vector": [-17.74265, 13.09708, 36.45564], + "easing": "easeInElastic" + }, + "2.2": { + "vector": [20.69851, 7.36031, 48.82404], + "easing": "easeOutSine" + }, + "2.3333": { + "vector": [-31.40415, -6.82322, 64.93734], + "easing": "easeOutSine" + }, + "2.4167": { + "vector": [-23.32139, -10.23894, 70.46558] + }, + "2.5": { + "vector": [-35.87276, -16.36308, 51.91179], + "easing": "easeInElastic" + }, + "2.6167": { + "vector": [-19.99348, -11.12689, 35.30002] + }, + "2.8": { + "vector": [-0.80443, -0.8837, -5.3357] + }, + "2.95": { + "vector": [0, 0, 0] } }, "position": { @@ -220,60 +186,56 @@ "vector": [0, 0, 0] }, "0.1667": { - "vector": [-0.6, -0.3, 0] + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" }, - "0.375": { - "vector": [0, 0, 0] - }, - "0.4583": { - "vector": [0, -0.3, -0.1] - }, - "0.5417": { - "vector": [0, 0.2, 0] - }, - "0.7083": { - "vector": [0, -0.3, -0.3] - }, - "0.9167": { - "vector": [0, -0.9, -0.31], + "0.3167": { + "vector": [-1.1, 0, -0.8], "easing": "easeOutSine" }, - "1.0833": { - "vector": [0, -0.72, -0.11], - "easing": "easeInOutSine" + "0.4167": { + "vector": [-0.7, -1.4, -1.7], + "easing": "easeInElastic" }, - "1.25": { - "vector": [0, -0.75, 0.52] + "0.5167": { + "vector": [-0.88, -0.16, -1.29] }, - "1.5": { - "vector": [0, -0.75, 0.52] + "0.7667": { + "vector": [-0.87, -0.75, -0.67], + "easing": "easeOutSine" }, - "1.9167": { - "vector": [0, -1, 0.97] + "1.1": { + "vector": [-0.57, -0.79, 0.08] }, - "2.0": { - "vector": [0, -1, 0.97] + "1.4": { + "vector": [1.1, -1.54, 1.83] }, - "2.125": { - "vector": [-0.3, -1.6, 0.97], - "easing": "easeOutCubic" + "2.05": { + "vector": [1.04, -0.92, 2.22] }, - "2.2083": { - "vector": [0, -1.01, 0.9], - "easing": "easeOutQuad" + "2.1333": { + "vector": [-0.18598, -2.56715, 2.01348] }, - "2.375": { - "vector": [0, -3.02, -0.27] + "2.2667": { + "vector": [1.99803, -1.96558, 0.1038] }, - "2.5": { - "vector": [0, 0.32, 1.48] + "2.3833": { + "vector": [0.90879, 0.61708, 2.541] }, - "2.5833": { - "vector": [0, -1.29, -0.1] + "2.4667": { + "vector": [-4.26, 0.57, 1.35] }, - "2.7917": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" + "2.5667": { + "vector": [-0.79, 0.47, 1.12] + }, + "2.65": { + "vector": [0, 0, -0.75] + }, + "2.75": { + "vector": [0, 0, 0.93] + }, + "2.95": { + "vector": [0, 0, 0] } } }, @@ -283,41 +245,50 @@ "vector": [0, 0, 0] }, "0.1667": { - "vector": [-22.22123, -16.97601, -11.73551] + "vector": [7.87861, -24.31858, -19.90709] }, - "0.2917": { - "vector": [-37.82145, -14.63464, -39.89897] + "0.2333": { + "vector": [-9.83746, -16.72825, -17.49751] }, "0.3333": { - "vector": [-37.82145, -14.63464, -39.89897] + "vector": [-9.83746, -16.72825, -17.49751] }, "0.5": { "vector": [-5.71303, 40.72967, -4.70082], - "easing": "easeOutQuad" + "easing": "easeInElastic" }, - "0.7917": { + "0.6333": { "vector": [73.97576, -0.75089, 15.72011] }, - "1.5833": { - "vector": [39.90508, -14.78797, -2.52194] + "1.45": { + "vector": [38.29511, -2.03526, -73.55015] }, - "1.9583": { - "vector": [-9.67205, -34.81418, -72.82079] + "1.5167": { + "vector": [-2.1677, -33.75228, -72.39051] + }, + "1.9167": { + "vector": [-8.06718, -30.15725, -76.93122], + "easing": "easeInOutSine" + }, + "1.95": { + "vector": [-7.21864, -27.00018, -79.53013], + "easing": "easeInOutSine" }, "2.0833": { - "vector": [-7.62195, -28.58326, -78.24304] + "vector": [-5.27405, -12.48647, -90.38062], + "easing": "easeInSine" }, - "2.1667": { - "vector": [-7.62195, -28.58326, -78.24304] + "2.1": { + "vector": [-5.27405, -12.48647, -90.38062] }, - "2.375": { + "2.3833": { "vector": [17.64709, -13.8217, -25.46728] }, "2.5": { "vector": [12.25678, -6.17755, -20.01117], "easing": "easeInOutSine" }, - "2.6667": { + "2.7167": { "vector": [0, 0, 0] } }, @@ -325,60 +296,48 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2917": { - "vector": [4.8, 4, -12.3] + "0.2667": { + "vector": [0.7, 2.7, -7.9] }, "0.3333": { - "vector": [4.8, 4, -12.3] + "vector": [0.7, 2.7, -7.9] }, "0.5": { "vector": [4.8, 0.1, -13.2], - "easing": "easeOutQuad" + "easing": "easeInElastic" }, - "0.7917": { + "0.6333": { "vector": [3.51, -6.73, -5.65] }, - "1.5833": { - "vector": [8.2, -5.6, -0.8] + "1.45": { + "vector": [-1.02464, 14.3926, 14.13302] }, - "1.625": { - "vector": [8.65, -3.6, -2.56] + "1.5167": { + "vector": [10.84145, 22.86044, 13.64551] }, - "1.6667": { - "vector": [9.1, -1.8, -4.32] + "1.9167": { + "vector": [3.92576, 11.04238, -5.00967], + "easing": "easeInOutSine" }, - "1.7083": { - "vector": [8.95, 0.7, -6.38] - }, - "1.75": { - "vector": [8.54, 2.8, -7.71] - }, - "1.7917": { - "vector": [7.5, 6.27, -8.69] - }, - "1.8333": { - "vector": [6.18, 8.35, -8.29] - }, - "1.875": { - "vector": [4.65, 10.03, -7.09] - }, - "1.9583": { - "vector": [2.8, 10, -5.1] + "1.95": { + "vector": [3.56467, 11.49281, -5.45322], + "easing": "easeInOutSine" }, "2.0833": { - "vector": [2.8, 9.3, -5.1] + "vector": [3.64099, 12.76781, -5.69136], + "easing": "easeInSine" }, - "2.1667": { - "vector": [2.8, 9.3, -5.1] + "2.1": { + "vector": [3.72413, 12.68137, -5.5869] }, - "2.375": { + "2.3833": { "vector": [5.77, 6.2, -0.4] }, "2.5": { "vector": [4.94, 3.74, -0.28], "easing": "easeInOutSine" }, - "2.6667": { + "2.7167": { "vector": [0, 0, 0] } } @@ -393,18 +352,19 @@ }, "0.5": { "vector": [77.5, 0, 0], - "easing": "easeOutQuad" + "easing": "easeInElastic" }, - "2.125": { + "2.1333": { "vector": [77.5, 0, 0] }, - "2.375": { + "2.3833": { "vector": [77.5, 0, 0] }, "2.5": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "2.7917": { + "2.9833": { "vector": [0, 0, 0] } } @@ -414,73 +374,55 @@ "0.0": { "vector": [0, 0, 0] }, - "1.375": { + "1.3833": { "vector": [0, 0, 0] }, - "1.5417": { - "vector": [-73.38045, -9.96156, -84.92327] + "1.45": { + "vector": [0, 0, 0] }, - "1.7083": { - "vector": [-51.62408, 24.73132, -77.1675] - }, - "1.7917": { - "vector": [-33.96768, 25.38781, -52.82942] + "1.5167": { + "vector": [-20.18076, 7.51466, -2.75196] }, "1.9167": { - "vector": [-5.79044, 24.24502, -13.82089] + "vector": [-13, 0, 0], + "easing": "easeInOutSine" }, - "1.9583": { - "vector": [0, 0, 0] + "1.95": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" }, - "2.0417": { - "vector": [0, 0, 0] + "2.0833": { + "vector": [0, 0, 0], + "easing": "easeInSine" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "1.375": { + "1.3833": { "vector": [0, 0, 0] }, "1.4167": { "vector": [0, 0, -37] }, - "1.5417": { - "vector": [8.5, -11.4, -16.2] + "1.45": { + "vector": [3.2, -17.3, 5.2] }, - "1.5833": { - "vector": [9.9, -7.81, -16.4] - }, - "1.625": { - "vector": [10.7, -4.22, -14.6] - }, - "1.6667": { - "vector": [11.65, -1.53, -12.3] - }, - "1.7083": { - "vector": [11.5, 1.09, -9.27] - }, - "1.75": { - "vector": [10.55, 2.93, -6.46] - }, - "1.7917": { - "vector": [8.79766, 4.1775, -2.65406] - }, - "1.8333": { - "vector": [6.49, 4.18, 0.08] - }, - "1.875": { - "vector": [3.98, 3.18, 2.41] + "1.5167": { + "vector": [8.48251, -15.17326, 19.36493] }, "1.9167": { - "vector": [1.72, 1.48, 3.59] + "vector": [0, -0.48719, 2.78752], + "easing": "easeInOutSine" }, - "1.9583": { - "vector": [0, 0, 2.9] + "1.95": { + "vector": [0, 0, 2.9], + "easing": "easeInOutSine" }, - "2.0417": { - "vector": [0, 0, 0] + "2.0833": { + "vector": [0, 0, 0], + "easing": "easeInSine" } } }, @@ -492,7 +434,7 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [28.62702, -15.46973, -8.28342] }, "0.5": { @@ -502,14 +444,17 @@ "vector": [859.02393, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { + "vector": [0, 0, 0] + }, + "2.9833": { "vector": [0, 0, 0] } }, @@ -520,86 +465,89 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.38] }, "0.4167": { "vector": [0, -0.02688, 1.16] }, - "0.4583": { + "0.45": { "vector": [-0.4, 0.5, 2.6], "easing": "easeInQuad" }, "0.5": { "vector": [-0.5, 1.45, 3.63] }, - "0.5417": { + "0.55": { "vector": [-1, 3.37, 3.97] }, "0.5833": { "vector": [-1.4, 4.69, 4.01] }, - "0.625": { + "0.6333": { "vector": [-1.7, 5.86, 3.85] }, "0.6667": { "vector": [-2.1, 6.75, 3.64] }, - "0.7083": { + "0.7": { "vector": [-2.5, 7.64, 3.34] }, "0.75": { "vector": [-2.8, 8.52, 2.83] }, - "0.7917": { + "0.8": { "vector": [-3.2, 9.33, 1.99] }, "0.8333": { "vector": [-3.6, 10.01, 0.96] }, - "0.875": { + "0.8833": { "vector": [-4, 10.72, -0.48] }, "0.9167": { "vector": [-4.4, 11.34, -2.22] }, - "0.9583": { + "0.95": { "vector": [-4.8, 11.85, -4.25] }, "1.0": { "vector": [-5.2, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [-5.5, 12.36, -8.64] }, "1.0833": { "vector": [-5.7, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [-6, 12.03, -16.38] }, "1.1667": { "vector": [-6.2, 11.44, -20.59] }, - "1.2083": { + "1.2": { "vector": [-6.3, 10.63, -26.44] }, "1.25": { "vector": [-6.4, 8.72, -34.59] }, - "1.2917": { + "1.3": { "vector": [-6.33, 8.72, -34.59] }, "1.3333": { "vector": [-6.43, 8.72, -34.59] }, - "1.375": { + "1.3833": { "vector": [-6.43, 8.72, -34.59] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { + "vector": [0, 0, 0] + }, + "2.9833": { "vector": [0, 0, 0] } } @@ -612,7 +560,7 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [27.5, 0, 0] }, "0.5": { @@ -622,14 +570,14 @@ "vector": [859.02393, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -640,80 +588,80 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.28] }, "0.4167": { "vector": [0, -0.02688, 1.16] }, - "0.4583": { + "0.45": { "vector": [0, 0.5, 2.6], "easing": "easeInQuad" }, "0.5": { "vector": [0, 1.75, 3.63] }, - "0.5417": { + "0.55": { "vector": [0, 3.47, 3.97] }, "0.5833": { "vector": [0, 4.69, 4.01] }, - "0.625": { + "0.6333": { "vector": [0, 5.86, 3.85] }, "0.6667": { "vector": [0, 6.75, 3.64] }, - "0.7083": { + "0.7": { "vector": [0, 7.64, 3.34] }, "0.75": { "vector": [0, 8.52, 2.83] }, - "0.7917": { + "0.8": { "vector": [0, 9.33, 1.99] }, "0.8333": { "vector": [0, 10.01, 0.96] }, - "0.875": { + "0.8833": { "vector": [0, 10.72, -0.48] }, "0.9167": { "vector": [0, 11.34, -2.22] }, - "0.9583": { + "0.95": { "vector": [0, 11.85, -4.25] }, "1.0": { "vector": [0, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [0, 12.36, -8.64] }, "1.0833": { "vector": [0, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [0, 12.03, -16.38] }, "1.1667": { "vector": [0, 11.44, -20.59] }, - "1.2083": { + "1.2": { "vector": [0, 10.63, -26.44] }, "1.25": { "vector": [0, 8.72, -34.59] }, - "1.375": { + "1.3833": { "vector": [0, 8.72, -34.59] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -726,7 +674,7 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [28.9854, 17.66046, 9.54013] }, "0.5": { @@ -735,21 +683,21 @@ "0.6667": { "vector": [280.11646, -12.65079, 19.18351] }, - "0.875": { + "0.8833": { "vector": [478.4052, -28.21856, 18.63381] }, "1.25": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -760,80 +708,80 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.38] }, "0.4167": { "vector": [0, -0.02688, 1.16] }, - "0.4583": { + "0.45": { "vector": [0.4, 0.5, 2.6], "easing": "easeInQuad" }, "0.5": { "vector": [1.2, 1.45, 3.63] }, - "0.5417": { + "0.55": { "vector": [2.3, 3.37, 3.97] }, "0.5833": { "vector": [3.1, 4.69, 4.01] }, - "0.625": { + "0.6333": { "vector": [3.8, 5.86, 3.85] }, "0.6667": { "vector": [4.3, 6.75, 3.64] }, - "0.7083": { + "0.7": { "vector": [4.8, 7.64, 3.34] }, "0.75": { "vector": [5.3, 8.52, 2.83] }, - "0.7917": { + "0.8": { "vector": [5.8, 9.33, 1.99] }, "0.8333": { "vector": [6.2, 10.01, 0.96] }, - "0.875": { + "0.8833": { "vector": [6.6, 10.72, -0.48] }, "0.9167": { "vector": [7.1, 11.34, -2.22] }, - "0.9583": { + "0.95": { "vector": [7.5, 11.85, -4.25] }, "1.0": { "vector": [7.8, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [8.1, 12.36, -8.64] }, "1.0833": { "vector": [8.3, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [8.5, 12.03, -16.38] }, "1.1667": { "vector": [8.6, 11.44, -20.59] }, - "1.2083": { + "1.2": { "vector": [8.7, 10.63, -26.44] }, "1.25": { "vector": [8.7, 8.72, -34.59] }, - "1.375": { + "1.3833": { "vector": [8.7, 8.72, -34.59] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -846,36 +794,36 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [27.86082, 8.86042, 4.65468] }, "0.5": { "vector": [39.60016, 7.73694, 6.35497] }, - "0.5417": { + "0.55": { "vector": [52.63234, 9.2369, 11.87038] }, - "0.625": { + "0.6333": { "vector": [85, 0, 0] }, "0.6667": { "vector": [202.61646, -12.65079, 19.18351] }, - "0.875": { + "0.8833": { "vector": [575.9052, -28.21856, 18.63381] }, "1.25": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -886,80 +834,80 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.58] }, "0.4167": { "vector": [0, -0.02688, 1.96] }, - "0.4583": { + "0.45": { "vector": [0.4, 0.7, 3.6], "easing": "easeInQuad" }, "0.5": { "vector": [0.6, 1.45, 4.73] }, - "0.5417": { + "0.55": { "vector": [1.5, 3.37, 5.57] }, "0.5833": { "vector": [2.5, 4.69, 5.81] }, - "0.625": { + "0.6333": { "vector": [3.3, 5.86, 5.75] }, "0.6667": { "vector": [4, 6.75, 5.64] }, - "0.7083": { + "0.7": { "vector": [4.8, 7.64, 5.44] }, "0.75": { "vector": [5.3, 8.52, 4.83] }, - "0.7917": { + "0.8": { "vector": [5.8, 9.33, 3.89] }, "0.8333": { "vector": [6.2, 10.01, 2.56] }, - "0.875": { + "0.8833": { "vector": [6.6, 10.72, 0.62] }, "0.9167": { "vector": [7.1, 11.34, -1.82] }, - "0.9583": { + "0.95": { "vector": [7.5, 11.85, -4.25] }, "1.0": { "vector": [7.8, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [8.1, 12.36, -8.64] }, "1.0833": { "vector": [8.3, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [8.5, 12.03, -16.38] }, "1.1667": { "vector": [8.6, 11.44, -20.59] }, - "1.2083": { + "1.2": { "vector": [8.7, 10.63, -26.44] }, "1.25": { "vector": [8.7, 8.72, -34.59] }, - "1.375": { + "1.3833": { "vector": [8.7, 8.72, -34.59] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -972,30 +920,30 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [27.5, 0, 0] }, "0.5": { "vector": [39.17, 0, 0] }, - "0.5417": { + "0.55": { "vector": [51.90926, -4.64323, -5.89632] }, - "0.625": { + "0.6333": { "vector": [109.71975, 3.40487, -9.40804] }, "1.25": { "vector": [717.01446, 44.75552, -109.72579], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [717.01446, 44.75552, -109.72579], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -1006,80 +954,80 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, 0, 0.7] }, "0.4167": { "vector": [0, -0.02688, 2.06] }, - "0.4583": { + "0.45": { "vector": [0, 0.9, 3.7], "easing": "easeInQuad" }, "0.5": { "vector": [-0.3, 1.95, 4.83] }, - "0.5417": { + "0.55": { "vector": [-0.6, 3.67, 5.27] }, "0.5833": { "vector": [-0.8, 5.09, 5.31] }, - "0.625": { + "0.6333": { "vector": [-1, 6.26, 5.05] }, "0.6667": { "vector": [-1.2, 7.25, 4.64] }, - "0.7083": { + "0.7": { "vector": [-1.3, 8.04, 4.14] }, "0.75": { "vector": [-1.4, 8.92, 3.23] }, - "0.7917": { + "0.8": { "vector": [-1.5, 9.83, 1.99] }, "0.8333": { "vector": [-1.6, 10.51, 0.96] }, - "0.875": { + "0.8833": { "vector": [-1.7, 11.02, -0.48] }, "0.9167": { "vector": [-1.8, 11.54, -2.22] }, - "0.9583": { + "0.95": { "vector": [-1.9, 11.85, -4.25] }, "1.0": { "vector": [-1.9, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [-2, 12.36, -8.64] }, "1.0833": { "vector": [-2, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [-2.1, 12.03, -16.38] }, "1.1667": { "vector": [-2.1, 11.44, -20.59] }, - "1.2083": { + "1.2": { "vector": [-2.1, 10.63, -26.44] }, "1.25": { "vector": [-2.1, 8.72, -34.59] }, - "1.375": { + "1.3833": { "vector": [-2.1, 8.72, -34.59] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -1092,33 +1040,33 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [17.58957, 4.43385, 2.31336] }, "0.5": { "vector": [30.01986, 1.93168, 5.97691] }, - "0.5417": { + "0.55": { "vector": [48.99414, 11.18175, 17.10437] }, "0.6667": { "vector": [189.65058, -10.7148, 9.1641] }, - "0.875": { + "0.8833": { "vector": [373.4052, -28.21856, 18.63381] }, - "1.2917": { + "1.3": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -1129,83 +1077,83 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.48] }, "0.4167": { "vector": [0, -0.02688, 1.16] }, - "0.4583": { + "0.45": { "vector": [0.1, 0.4, 3.1], "easing": "easeInQuad" }, "0.5": { "vector": [0.4, 1.15, 4.93] }, - "0.5417": { + "0.55": { "vector": [1, 2.67, 6.47] }, "0.5833": { "vector": [1.4, 4.09, 7.41] }, - "0.625": { + "0.6333": { "vector": [2, 5.46, 7.85] }, "0.6667": { "vector": [2.3, 6.65, 7.74] }, - "0.7083": { + "0.7": { "vector": [2.8, 8.04, 7.34] }, "0.75": { "vector": [3.1, 9.32, 6.63] }, - "0.7917": { + "0.8": { "vector": [3.5, 10.23, 5.49] }, "0.8333": { "vector": [3.8, 10.81, 3.86] }, - "0.875": { + "0.8833": { "vector": [4.2, 11.22, 2.12] }, "0.9167": { "vector": [4.6, 11.54, -0.12] }, - "0.9583": { + "0.95": { "vector": [4.8, 11.75, -2.85] }, "1.0": { "vector": [5.1, 11.91, -5.41] }, - "1.0417": { + "1.05": { "vector": [5.3, 11.96, -8.04] }, "1.0833": { "vector": [5.7, 12, -10.86] }, - "1.125": { + "1.1333": { "vector": [6, 11.73, -14.38] }, "1.1667": { "vector": [6.1, 11.54, -18.09] }, - "1.2083": { + "1.2": { "vector": [6.3, 11.03, -23.44] }, "1.25": { "vector": [6.3, 10.72, -29.79] }, - "1.2917": { + "1.3": { "vector": [6.3, 10.14, -35.18] }, - "1.375": { + "1.3833": { "vector": [6.3, 10.14, -35.18] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -1218,21 +1166,21 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [27.5, 0, 0] }, "1.3333": { "vector": [1213.1339, 0, 0], "easing": "easeInSine" }, - "1.375": { + "1.3833": { "vector": [1213.1339, 0, 0], "easing": "easeInSine" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -1243,86 +1191,86 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, 0, 0.6] }, "0.4167": { "vector": [0, -0.02688, 1.76] }, - "0.4583": { + "0.45": { "vector": [0, 0.3, 3.7], "easing": "easeInQuad" }, "0.5": { "vector": [-0.3, 0.85, 5.53] }, - "0.5417": { + "0.55": { "vector": [-0.6, 1.87, 6.87] }, "0.5833": { "vector": [-0.8, 2.89, 8.01] }, - "0.625": { + "0.6333": { "vector": [-1, 3.96, 9.05] }, "0.6667": { "vector": [-1.2, 5.05, 9.74] }, - "0.7083": { + "0.7": { "vector": [-1.3, 6.14, 10.24] }, "0.75": { "vector": [-1.4, 7.22, 10.33] }, - "0.7917": { + "0.8": { "vector": [-1.5, 8.33, 9.99] }, "0.8333": { "vector": [-1.6, 9.31, 8.86] }, - "0.875": { + "0.8833": { "vector": [-1.7, 9.82, 7.52] }, "0.9167": { "vector": [-1.8, 10.34, 5.78] }, - "0.9583": { + "0.95": { "vector": [-1.9, 10.55, 3.35] }, "1.0": { "vector": [-1.9, 10.51, 0.89] }, - "1.0417": { + "1.05": { "vector": [-2, 10.36, -1.84] }, "1.0833": { "vector": [-2, 10.1, -4.66] }, - "1.125": { + "1.1333": { "vector": [-2.1, 9.73, -7.88] }, "1.1667": { "vector": [-2.1, 9.14, -11.79] }, - "1.2083": { + "1.2": { "vector": [-2.1, 8.23, -17.04] }, "1.25": { "vector": [-2.1, 7.52, -21.49] }, - "1.2917": { + "1.3": { "vector": [-2.1, 6.35, -27.65] }, "1.3333": { "vector": [-2.1, 5.55, -32.92] }, - "1.375": { + "1.3833": { "vector": [-2.1, 5.55, -32.92] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } @@ -1335,7 +1283,7 @@ "0.4167": { "vector": [0, 0, 0] }, - "0.4583": { + "0.45": { "vector": [28.62702, -15.46973, -8.28342] }, "0.5": { @@ -1345,14 +1293,14 @@ "vector": [659.0239, -48.20277, -48], "easing": "linear" }, - "1.375": { + "1.3833": { "vector": [859.02393, -48.20277, -48], "easing": "linear" }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } }, @@ -1363,89 +1311,183 @@ "0.3333": { "vector": [0, 0, 0] }, - "0.375": { + "0.3833": { "vector": [0, -0.01, 0.38] }, "0.4167": { "vector": [0, -0.02688, 1.16] }, - "0.4583": { + "0.45": { "vector": [-0.4, 0.5, 2.6], "easing": "easeInQuad" }, "0.5": { "vector": [-0.9, 1.45, 3.63] }, - "0.5417": { + "0.55": { "vector": [-1.7, 3.17, 4.07] }, "0.5833": { "vector": [-2.9, 4.69, 4.31] }, - "0.625": { + "0.6333": { "vector": [-3.7, 5.86, 4.15] }, "0.6667": { "vector": [-4.7, 6.75, 3.84] }, - "0.7083": { + "0.7": { "vector": [-5.5, 7.64, 3.34] }, "0.75": { "vector": [-6.4, 8.52, 2.73] }, - "0.7917": { + "0.8": { "vector": [-7.4, 9.33, 1.89] }, "0.8333": { "vector": [-8.4, 10.01, 0.96] }, - "0.875": { + "0.8833": { "vector": [-9.4, 10.72, -0.48] }, "0.9167": { "vector": [-10.6, 11.34, -2.22] }, - "0.9583": { + "0.95": { "vector": [-11.8, 11.85, -4.25] }, "1.0": { "vector": [-12.9, 12.21, -6.31] }, - "1.0417": { + "1.05": { "vector": [-14, 12.36, -8.64] }, "1.0833": { "vector": [-15.3, 12.3, -12.36] }, - "1.125": { + "1.1333": { "vector": [-16.6, 12.03, -16.38] }, "1.1667": { "vector": [-17.8, 11.44, -22.19] }, - "1.2083": { + "1.2": { "vector": [-18.3, 10.63, -28.14] }, "1.25": { "vector": [-17.7, 8.72, -34.59] }, - "1.2917": { + "1.3": { "vector": [-16.5, 6.42, -41.19] }, "1.3333": { "vector": [-15.3, 3.27, -47.59] }, - "1.375": { + "1.3833": { "vector": [-13.5, -0.38, -54.39] }, "1.4167": { "vector": [0, 0, 0] }, - "2.7917": { + "2.8": { "vector": [0, 0, 0] } } + }, + "gun": { + "rotation": { + "2.1667": { + "vector": [0, 0, 0] + }, + "2.3167": { + "vector": [13.09, 0, 0], + "easing": "easeInElastic" + }, + "2.45": { + "vector": [-35, 0, 0] + }, + "2.5833": { + "vector": [0, 0, 0] + } + }, + "position": { + "2.1667": { + "vector": [0, 0, 0] + }, + "2.3167": { + "vector": [0.3, -1.00324, -0.57444], + "easing": "easeInElastic" + }, + "2.45": { + "vector": [0, 1.11401, 1.0242] + }, + "2.5833": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.3333": { + "vector": [1, 1, 1.5], + "easing": "easeInSine" + }, + "0.4167": { + "vector": [-0.5, -0.5, -1.5] + }, + "0.6": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "0.7333": { + "vector": [0.34, 0, 0.03] + }, + "1.3333": { + "vector": [0.13, 0, 0.28], + "easing": "easeInElastic", + "easingArgs": [2] + }, + "2.0667": { + "vector": [-0.5, 0, 1.2], + "easing": "easeInElastic", + "easingArgs": [3] + }, + "2.15": { + "vector": [3, 1, -0.2], + "easing": "easeInSine" + }, + "2.25": { + "vector": [-0.2, 0, 1.2], + "easing": "easeInElastic" + }, + "2.4333": { + "vector": [1.74, -1.5, -1.5] + }, + "2.5": { + "vector": [-0.5, 1.6, 2], + "easing": "linear" + }, + "2.5833": { + "vector": [1, -1.5, -1.6], + "easing": "linear" + }, + "2.6667": { + "vector": [-0.1, 0.3, 0.5], + "easing": "linear" + }, + "2.8333": { + "vector": [0, 0, 0], + "easing": "linear" + } + } } }, "sound_effects": { @@ -1453,6 +1495,62 @@ "effect": "reload" } } + }, + "animation.trachelium.draw": { + "animation_length": 0.6, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [27.21312, -47.42646, -2.0218] + }, + "0.1": { + "vector": [12.5, -15, 0] + }, + "0.2": { + "vector": [3.48268, 0.40464, 8.20687] + }, + "0.4": { + "vector": [0, 0, -2] + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [3, -17.3, 0] + }, + "0.2": { + "vector": [0, 0, -1.65] + }, + "0.3": { + "vector": [0, 0, 0.93] + }, + "0.5": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.4": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } + } + } } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/target/geo/trachelium.geo.json b/src/main/resources/assets/target/geo/trachelium.geo.json index 9de623afc..282157d7d 100644 --- a/src/main/resources/assets/target/geo/trachelium.geo.json +++ b/src/main/resources/assets/target/geo/trachelium.geo.json @@ -11,6 +11,10 @@ "visible_bounds_offset": [0, 0, 0] }, "bones": [ + { + "name": "camera", + "pivot": [2.57141, 4.76276, 12.27702] + }, { "name": "root", "pivot": [0, 0, 0]