diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java index 05555bab2..b62031872 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java @@ -115,6 +115,6 @@ public class AK47ItemModel extends GeoModel { CoreGeoBone shell4 = getAnimationProcessor().getBone("shell4"); CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); - ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5); + ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5, 1f, 1f); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java index a0fe00c47..c9bf2b0d9 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java @@ -99,5 +99,13 @@ public class Aa12ItemModel extends GeoModel { camera.setRotZ(numR * camera.getRotZ()); } ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(),Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ()); + + CoreGeoBone shell1 = getAnimationProcessor().getBone("shell1"); + CoreGeoBone shell2 = getAnimationProcessor().getBone("shell2"); + CoreGeoBone shell3 = getAnimationProcessor().getBone("shell3"); + CoreGeoBone shell4 = getAnimationProcessor().getBone("shell4"); + CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); + + ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5,1f, 0.6f); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java index 0a24d61e9..3e1c9a29e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java @@ -68,15 +68,7 @@ public class DevotionItemModel extends GeoModel { gun.setScaleZ(1f - (0.7f * (float) zp)); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone number = getAnimationProcessor().getBone("number"); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - if (gun.getPosX() > 1.2) { - number.setScaleX(1); - number.setScaleY(1); - } else { - number.setScaleX(0); - number.setScaleY(0); - } stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index 7c8229d6f..05565e40d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -111,6 +111,6 @@ public class M4ItemModel extends GeoModel { CoreGeoBone shell4 = getAnimationProcessor().getBone("shell4"); CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); - ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5); + ClientEventHandler.handleShell(shell1, shell2, shell3, shell4, shell5,1f, 1f); } } diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index c244d66b9..96e6ebe30 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -878,43 +878,34 @@ public class ClientEventHandler { // } } - public static void handleShell(CoreGeoBone shell1, CoreGeoBone shell2, CoreGeoBone shell3, CoreGeoBone shell4, CoreGeoBone shell5) { + public static void handleShell(CoreGeoBone shell1, CoreGeoBone shell2, CoreGeoBone shell3, CoreGeoBone shell4, CoreGeoBone shell5, float x, float y) { - shell1.setPosX((float) -shellIndexTime[0]); - shell1.setPosY((float) (randomShell[0] * Math.sin(0.15 * shellIndexTime[0]))); + shell1.setPosX((float) (-x * shellIndexTime[0])); + shell1.setPosY((float) (randomShell[0] * y * Math.sin(0.15 * shellIndexTime[0]))); shell1.setRotX((float) (randomShell[1] * shellIndexTime[0])); shell1.setRotY((float) (randomShell[2] * shellIndexTime[0])); - shell2.setPosX((float) -shellIndexTime[1]); - shell2.setPosY((float) (randomShell[0] * Math.sin(0.15 * shellIndexTime[1]))); + shell2.setPosX((float) (-x * shellIndexTime[1])); + shell2.setPosY((float) (randomShell[0] * y * Math.sin(0.15 * shellIndexTime[1]))); shell2.setRotX((float) (randomShell[1] * shellIndexTime[1])); shell2.setRotY((float) (randomShell[2] * shellIndexTime[1])); - shell3.setPosX((float) -shellIndexTime[2]); - shell3.setPosY((float) (randomShell[0]* Math.sin(0.15 * shellIndexTime[2]))); - shell2.setRotX((float) (randomShell[1]* shellIndexTime[2])); - shell3.setRotY((float) (randomShell[2]* shellIndexTime[2])); + shell3.setPosX((float) (-x * shellIndexTime[2])); + shell3.setPosY((float) (randomShell[0] * y* Math.sin(0.15 * shellIndexTime[2]))); + shell2.setRotX((float) (randomShell[1] * shellIndexTime[2])); + shell3.setRotY((float) (randomShell[2] * shellIndexTime[2])); - shell4.setPosX((float) -shellIndexTime[3]); - shell4.setPosY((float) (randomShell[0]* Math.sin(0.15 * shellIndexTime[3]))); - shell2.setRotX((float) (randomShell[1]* shellIndexTime[3])); - shell4.setRotY((float) (randomShell[2]* shellIndexTime[3])); + shell4.setPosX((float) (-x * shellIndexTime[3])); + shell4.setPosY((float) (randomShell[0] * y * Math.sin(0.15 * shellIndexTime[3]))); + shell2.setRotX((float) (randomShell[1] * shellIndexTime[3])); + shell4.setRotY((float) (randomShell[2] * shellIndexTime[3])); - shell5.setPosX((float) -shellIndexTime[4]); - shell5.setPosY((float) (randomShell[0]* Math.sin(0.15 * shellIndexTime[4]))); - shell2.setRotX((float) (randomShell[1]* shellIndexTime[4])); - shell5.setRotY((float) (randomShell[2]* shellIndexTime[4])); + shell5.setPosX((float) (-x * shellIndexTime[4])); + shell5.setPosY((float) (randomShell[0] * y * Math.sin(0.15 * shellIndexTime[4]))); + shell2.setRotX((float) (randomShell[1] * shellIndexTime[4])); + shell5.setRotY((float) (randomShell[2] * shellIndexTime[4])); } - - public static void handleMove(CoreGeoBone root) { - - root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * movePosHorizon)); - root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * velocityY)); - root.setRotX((float) (swayX - Mth.DEG_TO_RAD * 60 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRot[0] - 0.15f * velocityY)); - root.setRotY((float) (0.2f * movePosX + Mth.DEG_TO_RAD * 300 * ClientEventHandler.drawTime + Mth.DEG_TO_RAD * turnRot[1])); - root.setRotZ((float) (0.2f * movePosX + moveRotZ + Mth.DEG_TO_RAD * 90 * ClientEventHandler.drawTime + 2.7f * movePosHorizon + Mth.DEG_TO_RAD * turnRot[3])); - } } diff --git a/src/main/resources/assets/superbwarfare/animations/aa12.animation.json b/src/main/resources/assets/superbwarfare/animations/aa12.animation.json index ff382367e..22c1783bd 100644 --- a/src/main/resources/assets/superbwarfare/animations/aa12.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/aa12.animation.json @@ -1,62 +1,6 @@ { "format_version": "1.8.0", "animations": { - "animation.aa12.draw": { - "animation_length": 1, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [27.21312, -47.42646, -2.0218] - }, - "0.3": { - "vector": [12.5, -15, 0] - }, - "0.4": { - "vector": [3.48268, 0.40464, 8.20687] - }, - "0.6": { - "vector": [0, 0, -2] - }, - "0.7": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [3, -17.3, 0] - }, - "0.4": { - "vector": [0, 0, -1.65] - }, - "0.5": { - "vector": [0, 0, 0.93] - }, - "0.7": { - "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" - } - } - } - } - }, "animation.aa12.idle": { "loop": true, "animation_length": 0.25, @@ -68,88 +12,6 @@ } } }, - "animation.aa12.changefirerate": { - "animation_length": 0.5, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, 0, -4], - "easing": "easeOutSine" - }, - "0.2917": { - "vector": [-0.98905, -0.20901, 1.9964], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, 0.1, 0], - "easing": "easeOutSine" - }, - "0.2917": { - "vector": [0, -0.23, 0], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - } - } - }, - "animation.aa12.changefirerate2": { - "animation_length": 0.5, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [-0.98905, -0.20901, 1.9964], - "easing": "easeOutSine" - }, - "0.2917": { - "vector": [0, 0, -4], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, -0.23, 0], - "easing": "easeOutSine" - }, - "0.2917": { - "vector": [0, 0.1, 0], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - } - } - }, "animation.aa12.run": { "loop": true, "animation_length": 0.7917, diff --git a/src/main/resources/assets/superbwarfare/geo/aa12.geo.json b/src/main/resources/assets/superbwarfare/geo/aa12.geo.json index 5531475ef..d5ad9f3e8 100644 --- a/src/main/resources/assets/superbwarfare/geo/aa12.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/aa12.geo.json @@ -19,14 +19,9 @@ "name": "root", "pivot": [0, -1, 0] }, - { - "name": "move", - "parent": "root", - "pivot": [0, -6.7375, 3.7125] - }, { "name": "bone", - "parent": "move", + "parent": "root", "pivot": [0, -6.7375, 3.7125] }, { @@ -39,6 +34,501 @@ "parent": "shen", "pivot": [0, 0.0125, 3.7125] }, + { + "name": "shell1", + "parent": "0", + "pivot": [-0.2805, 1.7632, -0.54019], + "cubes": [ + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "shell2", + "parent": "0", + "pivot": [-0.2805, 1.7632, -0.54019], + "cubes": [ + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "shell3", + "parent": "0", + "pivot": [-0.2805, 1.7632, -0.54019], + "cubes": [ + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "shell4", + "parent": "0", + "pivot": [-0.2805, 1.7632, -0.54019], + "cubes": [ + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "shell5", + "parent": "0", + "pivot": [-0.2805, 1.7632, -0.54019], + "cubes": [ + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.4197, 1.42749, -2.05829], + "size": [0.27973, 0.67366, 1.99555], + "pivot": [-0.27983, 1.76348, -1.18054], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47.25, 159], "uv_size": [-0.25, -1]}, + "up": {"uv": [46, 158], "uv_size": [0.25, 2]}, + "down": {"uv": [46, 160], "uv_size": [0.25, -2]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, 180], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.43928, 1.38133, -0.06274], + "size": [0.3189, 0.7671, 0.08573], + "pivot": [-0.27983, 1.76348, -0.06274], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [47, 158], "uv_size": [-1, 1]}, + "south": {"uv": [47, 158], "uv_size": [-1, 1]}, + "up": {"uv": [46, 159], "uv_size": [1, -1]}, + "down": {"uv": [46, 159], "uv_size": [1, -1]} + } + } + ] + }, { "name": "flare", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/textures/item/aa12_new.png b/src/main/resources/assets/superbwarfare/textures/item/aa12_new.png index 11e03357b..4a219d75b 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/aa12_new.png and b/src/main/resources/assets/superbwarfare/textures/item/aa12_new.png differ