diff --git a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java index f9afb0dbb..45c395ee1 100644 --- a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.HuntingRifle; 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; @@ -40,40 +41,25 @@ public class HuntingRifleItemModel extends GeoModel { double zp = 0; zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.74f * (float) p); + gun.setPosX(1.95f * (float) p); - gun.setPosY(1.43f * (float) p - (float) (0.2f * zp)); + gun.setPosY(1.32f * (float) p - (float) (0.2f * zp)); gun.setPosZ(3f * (float) p + (float) (0.5f * zp)); gun.setRotZ((float) (0.05f * zp)); - gun.setScaleZ(1f - (0.1f * (float) p)); + gun.setScaleZ(1f - (0.5f * (float) p)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - shen.setPosY(0.4f * (float) (fp + 2 * fr)); - shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.1f * (float) (fp + fr)); - shen.setRotZ(0f); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.025f * (float) fr); - } else { - shen.setRotY(-0.025f * (float) fr); - } - } else { - shen.setPosY(0.7f * (float) (fp + 2 * fr)); - shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.1f * (float) (0.18f * fp + fr)); - shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } - } + shen.setPosX(-0.05f * (float) (fp + 0.2 * fr)); + shen.setPosY(0.3f * (float) (fp + 2 * fr)); + shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr)); + shen.setRotX(0.06f * (float) (1.28f * fp + fr)); + shen.setRotY(0.06f * (float) fr); + shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); @@ -132,5 +118,13 @@ public class HuntingRifleItemModel 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/hunting_rifle.animation.json b/src/main/resources/assets/target/animations/hunting_rifle.animation.json index 5e7768628..7736fec62 100644 --- a/src/main/resources/assets/target/animations/hunting_rifle.animation.json +++ b/src/main/resources/assets/target/animations/hunting_rifle.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" + } + } } } }, @@ -92,25 +110,33 @@ "easing": "easeOutSine" } } + }, + "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.hunting_rifle.fire": { "animation_length": 0.1 }, - "animation.hunting_rifle.fire2": { - "animation_length": 0.1 - }, - "animation.hunting_rifle.fire3": { - "animation_length": 0.1 - }, - "animation.hunting_rifle.fire4": { - "animation_length": 0.1 - }, - "animation.hunting_rifle.fire5": { - "animation_length": 0.1 - }, "animation.hunting_rifle.reload": { + "loop": "hold_on_last_frame", "animation_length": 3, "bones": { "0": { @@ -118,49 +144,69 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [1.08482, -4.88119, 4.12376], - "easing": "easeOutQuad" + "0.075": { + "vector": [0.6675, 0, 1.8325] }, "0.3": { - "vector": [0, -7.5, 25], - "easing": "easeInOutQuad" + "vector": [0.17, 0, 7.33] }, - "0.4": { - "vector": [-9.9237, -2.57529, 24.13195], - "easing": "easeInOutQuad" + "0.375": { + "vector": [-2.60784, -0.22598, 8.98663] }, - "0.9": { - "vector": [-1.42544, -2.90476, 4.05015], - "easing": "easeOutCubic" + "0.45": { + "vector": [-16.1194, -7.27246, -2.35306] }, - "1.3": { - "vector": [-6.29793, -2.76766, 1.47119] + "0.5": { + "vector": [-11.33358, -8.02545, -3.86365] }, - "1.7": { - "vector": [-6.19803, -2.98534, -0.51944] + "0.7": { + "vector": [-6.29, -3.68, 3.91], + "easing": "easeOutSine" }, - "1.8": { - "vector": [-7.79508, -3.16497, 2.03284], - "easing": "easeOutQuad" + "0.85": { + "vector": [-9.62, -3.61, 4.3], + "easing": "easeInSine" + }, + "1.35": { + "vector": [-9.16458, -5.26585, -5.54914], + "easing": "easeOutSine" + }, + "1.65": { + "vector": [-15.93137, -6.5319, -7.32186], + "easing": "easeOutSine" + }, + "1.775": { + "vector": [-16.33456, -5.41631, -3.45905] + }, + "1.875": { + "vector": [-22.66, -4.28, 0.39] + }, + "1.975": { + "vector": [-14.66, -4.28, 0.39] }, "2.2": { - "vector": [-5.29079, -2.16923, 1.9405], - "easing": "easeOutQuad" + "vector": [-14.66, -4.28, 0.39] + }, + "2.325": { + "vector": [-15.19262, 1.45671, 10.24493], + "easing": "easeInElastic" }, "2.4": { - "vector": [-6.80594, -0.98831, 16.87766], - "easing": "easeInOutQuad" + "vector": [-8.28584, -0.72151, 15.98028] }, - "2.6": { - "vector": [-5.50042, -6.00084, -5.25007], - "easing": "easeInOutQuad" + "2.475": { + "vector": [-4.22524, -1.01845, 11.99085] }, - "2.8": { - "vector": [-3.10549, -0.23902, -0.25974], - "easing": "easeOutCubic" + "2.575": { + "vector": [-3.53759, -2.52618, -9.9687] }, - "3.0": { + "2.675": { + "vector": [-2.9219, -0.874, 0.01745] + }, + "2.775": { + "vector": [0.80131, -0.874, -2.9857] + }, + "2.925": { "vector": [0, 0, 0] } }, @@ -168,40 +214,60 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [0, 0, 0] + "0.175": { + "vector": [0, -0.31, 0] + }, + "0.375": { + "vector": [0, -0.35, 0] + }, + "0.45": { + "vector": [0, 0.54, 2.4], + "easing": "easeInElastic" }, "0.6": { - "vector": [0, 0, 0.6] + "vector": [0, 0.18, 0.53] }, - "0.8": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" + "0.75": { + "vector": [0, 0.38, 0.47] }, - "1.1": { - "vector": [0, 0.2, 0.1], - "easing": "easeInOutQuad" + "1.025": { + "vector": [0, 0.53, 0.28] }, - "1.7": { - "vector": [0, 0, 0.5], - "easing": "easeInOutQuad" + "1.45": { + "vector": [0, 0.33, 0.3] }, - "1.8": { - "vector": [0, -0.6, 0.5], - "easing": "easeOutQuad" + "1.725": { + "vector": [0, 0.37, 0.29] }, - "2.4": { - "vector": [0, -0.2, 0.5], - "easing": "easeOutQuad" + "1.875": { + "vector": [0, -0.48, 0.25], + "easing": "easeInElastic" }, - "2.6": { - "vector": [0, -0.3, -1.35], - "easing": "easeOutCubic" + "2.0": { + "vector": [0, 0.29, 0.22] }, - "2.8": { - "vector": [0, -0.15, 0.27] + "2.125": { + "vector": [0, 0.33, 0.21] }, - "3.0": { + "2.25": { + "vector": [0, 0.39, 0.2] + }, + "2.325": { + "vector": [0.59, 0.36, -0.61] + }, + "2.425": { + "vector": [0.2, 0.32, -2.7] + }, + "2.5": { + "vector": [0.1, 0.16, -0.88] + }, + "2.575": { + "vector": [0, 0, -0.55] + }, + "2.775": { + "vector": [0, 0, 0.93] + }, + "2.925": { "vector": [0, 0, 0] } } @@ -218,16 +284,17 @@ "vector": [0, 0, 0] }, "0.4": { - "vector": [-3.50001, 10.2034, 17.35745] + "vector": [-8.8948, 19.8626, 36.14405], + "easing": "easeInElastic" }, "0.5": { - "vector": [-3.5, 10.2, 17.36] + "vector": [-8.8948, 19.8626, 36.14405] }, - "0.7": { - "vector": [-3.5, 10.2, 17.36] + "0.65": { + "vector": [-8.8948, 19.8626, 36.14405] }, "0.8": { - "vector": [-11.75, 10.2, 17.36] + "vector": [3.25, 10.2, 17.36] }, "1.0": { "vector": [51.5, 10.2, 17.36] @@ -242,29 +309,30 @@ "vector": [-14.94857, 17.74508, 35.60731] }, "1.7": { - "vector": [-5.93648, 15.27563, 37.31136] + "vector": [-0.24351, 0.37838, 20.00199] }, - "1.8": { - "vector": [-5.93648, 15.27563, 37.31136] + "1.925": { + "vector": [-0.24351, 0.37838, 20.00199] }, - "1.9": { - "vector": [-5.93648, 15.27563, 37.31136] - }, - "2.0": { + "2.025": { "vector": [4.03477, 13.13055, 0.42291] }, - "2.1": { - "vector": [-3.5, 10.2, 17.36] + "2.225": { + "vector": [-8.8948, 19.8626, 36.14405] }, "2.3": { - "vector": [-3.5, 10.2, 17.36] + "vector": [-8.8948, 19.8626, 36.14405] + }, + "2.475": { + "vector": [-8.8948, 19.8626, 36.14405], + "easing": "easeInElastic" }, "2.5": { - "vector": [-3.50001, 10.2034, 17.35745] + "vector": [-8.8948, 19.8626, 36.14405] }, "2.6": { "vector": [0, 0, 0], - "easing": "easeInSine" + "easing": "easeInElastic" }, "2.7": { "vector": [0, 0, 0], @@ -285,18 +353,19 @@ "vector": [-2.8, 2.4, -11.8] }, "0.4": { - "vector": [-2.1, 5, -11.8] + "vector": [-2.7, 4.9, -11.6], + "easing": "easeInElastic" }, "0.5": { - "vector": [-2.1, 4.5, -6.8], - "easing": "easeInSine" + "vector": [-2.7, 4.9, -6.6], + "easing": "easeInElastic" }, - "0.7": { - "vector": [-2.1, 4.5, -6.8], - "easing": "easeInSine" + "0.65": { + "vector": [-2.7, 4.9, -6.6], + "easing": "easeInElastic" }, "0.8": { - "vector": [-2.1, 3.05, -2.6] + "vector": [-2.9, 3.05, -1.5] }, "1.0": { "vector": [-2.1, 1.6, -3.7] @@ -313,29 +382,29 @@ "easing": "easeInSine" }, "1.7": { - "vector": [-2.6, 4.5, -9.7] + "vector": [-2.8, 4.5, -9.7] }, - "1.8": { - "vector": [-2.6, 4.5, -9.7] + "1.925": { + "vector": [-2.8, 4.5, -9.7] }, - "1.9": { - "vector": [-2.6, 4.5, -9.7] - }, - "2.1": { - "vector": [-2.1, 4.5, -6.8], - "easing": "easeInSine" + "2.225": { + "vector": [-2.7, 4.9, -6.6], + "easing": "easeInElastic" }, "2.3": { - "vector": [-2.1, 4.5, -6.8], - "easing": "easeInSine" + "vector": [-2.7, 4.9, -6.6], + "easing": "easeInElastic" + }, + "2.475": { + "vector": [-2.7, 4.9, -11.6], + "easing": "easeInElastic" }, "2.5": { - "vector": [-2.1, 5, -11.8], - "easing": "easeInSine" + "vector": [-2.7, 4.9, -11.6] }, "2.6": { "vector": [-2.8, 2.4, -11.8], - "easing": "easeInSine" + "easing": "easeInElastic" }, "2.7": { "vector": [-2.8, 2.4, -11.8], @@ -364,11 +433,15 @@ }, "0.5": { "vector": [0, 0, 5], - "easing": "easeInSine" + "easing": "easeInElastic" }, "2.3": { "vector": [0, 0, 5] }, + "2.475": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, "2.5": { "vector": [0, 0, 0], "easing": "easeInQuad" @@ -386,27 +459,28 @@ "0.4": { "vector": [0, 0, 0] }, - "0.5": { + "0.475": { + "vector": [0, 0, 0] + }, + "0.55": { "vector": [-27.18601, 4.59991, -37.91953] }, - "1.1": { - "vector": [-369.55, -11.22, -21.57], + "1.175": { + "vector": [-189.55, -11.22, -21.57], "easing": "easeOutQuart" }, "1.2": { "vector": [-15.52501, -22.52749, -9.89282] }, "1.4": { - "vector": [-5.86437, -29.49306, -9.12042] + "vector": [9.13563, -29.49306, -9.12042] }, "1.5": { - "vector": [23.85589, -18.87772, -8.14258] - }, - "1.6": { - "vector": [24.47499, -22.52749, -9.89282] + "vector": [15.1081, -7.3099, -4.85941] }, "1.7": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeInSine" }, "3.0": { "vector": [0, 0, 0] @@ -419,44 +493,55 @@ "0.4": { "vector": [0, 0, 0] }, - "0.5": { + "0.475": { + "vector": [0, 0, 0] + }, + "0.55": { "vector": [-0.7, 1.1, -1.2] }, + "0.575": { + "vector": [-1.73, 3.86, -0.42] + }, "0.6": { - "vector": [-4.6, 3.8, 1.65] + "vector": [-2.96, 6.22, 0.46] + }, + "0.65": { + "vector": [-5.93, 9.38, 2.04] }, "0.7": { - "vector": [-8.6, 4.73, 4.61] + "vector": [-8.72, 11.15, 3.65] }, - "0.8": { - "vector": [-13, 4.92, 6.67] + "0.775": { + "vector": [-13.05, 11.62, 5.38] }, - "0.9": { - "vector": [-17.25, 2.96, 9.04] + "0.85": { + "vector": [-16.83, 10.52, 6.64] + }, + "0.925": { + "vector": [-19.2103, 8.69488, 8.96385] }, "1.0": { - "vector": [-20.87, -2.35, 11.49] + "vector": [-21.3142, 4.26232, 11.43409], + "easing": "linear" }, - "1.1": { - "vector": [-24.77, -11.28, 14.79] + "1.175": { + "vector": [-15.37, -8.88, 7.69] }, "1.2": { - "vector": [-4.1, -1.6, 1.1] + "vector": [-2.8, -2.6, 1.1] }, "1.3": { - "vector": [-2.3, -0.85, 0.16] + "vector": [-1.8, 0.15, 0.16] }, "1.4": { - "vector": [-1, 0.4, -0.48] + "vector": [-1.3, 0.6, -0.98] }, "1.5": { - "vector": [-0.7, 1, -0.48] - }, - "1.6": { - "vector": [-0.7, 1, -0.48] + "vector": [-0.1, 0.6, -0.88] }, "1.7": { - "vector": [0, 0, -0.78516] + "vector": [0, 0, -0.78516], + "easing": "easeInSine" }, "2.9": { "vector": [0, 0, -0.78516] @@ -497,13 +582,15 @@ "vector": [0, 0, 0] }, "0.4": { - "vector": [0, 0, 50] + "vector": [0, 0, 50], + "easing": "easeInElastic" }, "2.5": { "vector": [0, 0, 50] }, "2.6": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeInElastic" }, "3.0": { "vector": [0, 0, 0] @@ -512,240 +599,64 @@ "position": { "vector": [0, 0, 0] } - } - } - }, - "animation.hunting_rifle.hit": { - "animation_length": 0.58333, - "bones": { - "0": { + }, + "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.0417": { - "vector": [-21.99337, -14.9759, 75.09531] - }, - "0.1667": { - "vector": [-128.092, 21.97162, 95.01507], - "easing": "easeInCubic" - }, - "0.2083": { - "vector": [-130.08824, 23.80198, 97.59531] - }, "0.25": { - "vector": [-128.092, 21.97162, 95.01507], - "easing": "easeInCubic" + "vector": [1, 0, -1], + "easing": "easeInElastic" }, - "0.4167": { - "vector": [-31.3822, -10.85573, 76.06618], - "easing": "easeInCirc" + "0.35": { + "vector": [1.5, 1.5, -1.5] }, - "0.5": { - "vector": [2.15316, -2.27468, 24.25623], - "easing": "easeInOutCirc" + "0.45": { + "vector": [-0.5, -1.5, 2] }, - "0.5833": { - "vector": [0, 0, 0], - "easing": "easeOutQuart" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "0.55": { + "vector": [0.5, 0.75, -0.5] }, - "0.0833": { - "vector": [0, -3, -6.6] - }, - "0.1667": { - "vector": [10.4, 2.7, -41.9], - "easing": "easeInCubic" - }, - "0.2083": { - "vector": [10.4, 2.93828, -39.3] - }, - "0.25": { - "vector": [10.4, 2.7, -10.6], - "easing": "easeInCubic" - }, - "0.4167": { - "vector": [0, 0, 1.4], + "0.825": { + "vector": [-0.25, -0.19, 0.03], "easing": "easeInSine" }, - "0.5": { - "vector": [0, -0.3, 0.41], - "easing": "easeInOutSine" - }, - "0.5833": { - "vector": [0, 0, 0], - "easing": "easeOutQuart" - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [160.00784, 26.63928, 97.85625] - }, - "0.2917": { - "vector": [119.73392, 26.4069, 30.49799] - }, - "0.4167": { - "vector": [32.51143, 12.91572, -13.61421] - }, - "0.5": { - "vector": [4.26641, -22.39453, -18.39143] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [3.5, 37.6, -39.1] - }, - "0.2917": { - "vector": [-9.7, 46.1, -25.8] - }, - "0.4167": { - "vector": [-1.77, 30.77, -4.53] - }, - "0.5": { - "vector": [-0.98, 3.54, -2.56] - }, - "0.5833": { - "vector": [0, 0, 0] - } - } - }, - "rightarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [115.09874, -2.71949, 20.40737] - }, - "0.2917": { - "vector": [117.68159, -1.57214, 10.14378] - }, - "0.4167": { - "vector": [80.64562, -5.59257, -1.31049] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [10.4, 33, -22.9] - }, - "0.2917": { - "vector": [5.9, 30.6, -17] - }, - "0.4167": { - "vector": [-0.27, 33.07, -9.33] - }, - "0.5": { - "vector": [0.6, 8.23, 2.91] - }, - "0.5833": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2917": { - "vector": [153, 0, 0], + "1.075": { + "vector": [0.23, 0.41, -0.31], "easing": "easeOutSine" }, - "0.4167": { - "vector": [64.43, 0, 0] + "1.925": { + "vector": [0, 0, -0.2], + "easing": "easeInSine" }, - "0.5": { - "vector": [9.22, 0, 0] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [3.55, 14.66, -5.81] - }, - "0.2917": { - "vector": [5.7, 11.8, -12.2], + "2.25": { + "vector": [0.14, -0.65, -0.21], "easing": "easeOutSine" }, - "0.4167": { - "vector": [3.25, 10.46, 0.09] + "2.325": { + "vector": [1, 0, 1], + "easing": "easeInElastic" }, - "0.5": { - "vector": [1.63, 2.03, 0.04] + "2.425": { + "vector": [1.5, -1.5, 1.5] }, - "0.5833": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, -62.5] - }, - "0.2083": { - "vector": [-139.46325, 46.18065, -235.99501] - }, - "0.4583": { - "vector": [0, 0, -62.5] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [1.7, 7.3, -4.6] - }, - "0.125": { - "vector": [-0.35, 15.25, -13.15] - }, - "0.2083": { - "vector": [-2.4, 16.4, -16.7] - }, - "0.3333": { - "vector": [-0.35, 15.25, -13.15] - }, - "0.4583": { - "vector": [1.7, 7.3, -4.6] - }, - "0.5833": { + "2.525": { + "vector": [-0.5, 0.5, -1.5] + }, + "2.625": { + "vector": [0.5, -0.75, 0.38] + }, + "2.875": { "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "hunting_rifle_reload" + } } } }, diff --git a/src/main/resources/assets/target/geo/hunting_rifle.geo.json b/src/main/resources/assets/target/geo/hunting_rifle.geo.json index f78e0fd8a..7965ca767 100644 --- a/src/main/resources/assets/target/geo/hunting_rifle.geo.json +++ b/src/main/resources/assets/target/geo/hunting_rifle.geo.json @@ -30,201 +30,6 @@ "parent": "lieqiang", "pivot": [0, 0, 0] }, - { - "name": "zoom", - "parent": "bone", - "pivot": [-0.25547, 7.01351, 418.85513], - "rotation": [0, 180, 0] - }, - { - "name": "bone11", - "parent": "zoom", - "pivot": [-0.26222, 12.23523, -126.21091], - "cubes": [ - { - "origin": [13.99061, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [38.415, 8.06437, -126.24752], - "size": [0.22892, 8.33898, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [45.59865, 5.19091, -126.24752], - "size": [0.22892, 14.08589, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [-0.37668, -48.83011, -126.24752], - "size": [0.22892, 122.12793, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [8.24369, 8.06437, -126.24752], - "size": [0.22892, 8.33898, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [16.86407, 5.19091, -126.24752], - "size": [0.22892, 14.08589, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [31.23136, 5.19091, -126.24752], - "size": [0.22892, 14.08589, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [24.04771, 8.06437, -126.24752], - "size": [0.22892, 8.33898, 0.07322], - "pivot": [-0.26222, 12.23386, -126.21091], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [-0.37668, -48.83011, -126.24752], - "size": [0.22892, 122.12793, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [-14.74398, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [-29.11127, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [-43.47856, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [42.72519, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - }, - { - "origin": [28.3579, 10.93783, -126.24752], - "size": [0.22892, 2.59206, 0.07322], - "uv": { - "north": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "east": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "south": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "west": {"uv": [71.5, 66.75], "uv_size": [1.5, 1.5]}, - "up": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]}, - "down": {"uv": [73, 68.25], "uv_size": [-1.5, -1.5]} - } - } - ] - }, { "name": "0", "parent": "bone", @@ -253,11 +58,11 @@ { "name": "Lefthand", "parent": "0", - "pivot": [4.2, -4.9, 1.8], - "rotation": [61.0146, 17.66046, -9.54013], + "pivot": [2.6, -7.3, 5.6], + "rotation": [52.80418, -8.33077, -26.99661], "cubes": [ { - "origin": [2.2, -4.9, -0.2], + "origin": [0.6, -7.3, 3.6], "size": [4, 12, 4], "uv": { "north": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, @@ -1004,6 +809,20 @@ "parent": "qiangguan", "pivot": [0, 3.18294, -34.93031], "cubes": [ + { + "origin": [-0.06439, 3.28031, -35.57671], + "size": [0.12877, 0.12877, 0.6884], + "pivot": [0, 3.34469, -35.23251], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [69, 4], "uv_size": [0.25, 0.25]}, + "east": {"uv": [5, 69], "uv_size": [0.25, 0.25]}, + "south": {"uv": [69, 5], "uv_size": [0.25, 0.25]}, + "west": {"uv": [6, 69], "uv_size": [0.25, 0.25]}, + "up": {"uv": [69, 6], "uv_size": [0.25, 0.25]}, + "down": {"uv": [7, 69.25], "uv_size": [0.25, -0.25]} + } + }, { "origin": [-0.225, 3, -35.625], "size": [0.45, 0.15, 1.125], @@ -1017,8 +836,8 @@ } }, { - "origin": [-0.075, 3.15, -35.56055], - "size": [0.15, 0.225, 0.46055], + "origin": [-0.125, 3.15, -35.56055], + "size": [0.25, 0.225, 0.46055], "uv": { "north": {"uv": [41, 68], "uv_size": [0.25, 0.25]}, "east": {"uv": [67, 8], "uv_size": [0.5, 0.25]}, @@ -1029,8 +848,8 @@ } }, { - "origin": [-0.075, 3.07044, -35.16058], - "size": [0.15, 0.225, 0.61055], + "origin": [-0.125, 3.07044, -35.16058], + "size": [0.25, 0.225, 0.61055], "pivot": [0, 3.18294, -34.93031], "rotation": [-22.5, 0, 0], "uv": { @@ -2018,6 +1837,10 @@ } } ] + }, + { + "name": "camera", + "pivot": [2.57141, 4.91276, 8.87702] } ] } diff --git a/src/main/resources/assets/target/models/displaysettings/hunting_rifle.item.json b/src/main/resources/assets/target/models/displaysettings/hunting_rifle.item.json index 2cfe0b67e..f12d4a1a6 100644 --- a/src/main/resources/assets/target/models/displaysettings/hunting_rifle.item.json +++ b/src/main/resources/assets/target/models/displaysettings/hunting_rifle.item.json @@ -5,102 +5,41 @@ 128, 128 ], - "gui_light": "front", "display": { - "thirdperson_righthand": { - "translation": [ - -0.5, - -0.75, - -3.5 - ], - "scale": [ - 0.6, - 0.6, - 0.5 - ] - }, - "thirdperson_lefthand": { - "translation": [ - -0.5, - -0.75, - -3.5 - ], - "scale": [ - 0.6, - 0.6, - 0.5 - ] - }, "firstperson_righthand": { "translation": [ - 2, - -11.5, - -39.75 - ], - "scale": [ - 4, - 4, - 4 + -7, + 3.5, + 2.75 ] }, "firstperson_lefthand": { - "translation": [ - -5.75, - -60, - 2 - ] - }, - "ground": { "translation": [ 0, - 1, + -3.75, 0 ], "scale": [ - 0.5, - 0.5, - 0.5 + 0, + 0, + 0 ] }, "gui": { "rotation": [ - 90, - 51.5, - -90 + 165.69, + -39.63, + 178.66 ], "translation": [ - 0.75, - 0, + -1, + -0.75, 0 ], "scale": [ - 0.32, - 0.32, - 0.32 - ] - }, - "head": { - "translation": [ - 0, - 6.25, - -1.25 - ] - }, - "fixed": { - "rotation": [ - 90, - -45, - 90 - ], - "translation": [ - -2.25, - -1.25, - 0 - ], - "scale": [ - 1.5, - 1.5, - 1.5 + 0.35, + 0.35, + 0.35 ] } } diff --git a/src/main/resources/assets/target/sounds/hunting_rifle/hunting_rifle_reload.ogg b/src/main/resources/assets/target/sounds/hunting_rifle/hunting_rifle_reload.ogg index 15954e2fe..b1b8a9d47 100644 Binary files a/src/main/resources/assets/target/sounds/hunting_rifle/hunting_rifle_reload.ogg and b/src/main/resources/assets/target/sounds/hunting_rifle/hunting_rifle_reload.ogg differ