diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java index 86bff727c..87760b454 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java @@ -91,7 +91,7 @@ public class SentinelItemModel extends GeoModel { CoreGeoBone charge = getAnimationProcessor().getBone("charge"); - charge.setRotZ(charge.getRotZ() + times * 0.05f); + charge.setRotZ(charge.getRotZ() + times * 0.5f); CoreGeoBone root = getAnimationProcessor().getBone("root"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph)); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java index 2c133f520..ea292be0d 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/ClaymoreEntity.java @@ -214,7 +214,7 @@ public class ClaymoreEntity extends Entity implements GeoEntity, AnimatedEntity, public void destroy() { if (level() instanceof ServerLevel) { - CustomExplosion explosion = new CustomExplosion(this.level(), this, + CustomExplosion explosion = new CustomExplosion(this.level(), null, ModDamageTypes.causeMineDamage(this.level().registryAccess(), this), 15.0f, this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); diff --git a/src/main/resources/assets/superbwarfare/geo/ak.geo.json b/src/main/resources/assets/superbwarfare/geo/ak.geo.json index f306bb12b..b6f123390 100644 --- a/src/main/resources/assets/superbwarfare/geo/ak.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ak.geo.json @@ -7183,6 +7183,67 @@ } ] }, + { + "name": "bone87", + "parent": "Cross3", + "pivot": [0.49609, 4.55391, -87.3082], + "cubes": [ + { + "origin": [0.60937, 4.12405, -87.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [76.625, 19.75], "uv_size": [0.125, 0.25]} + } + }, + { + "origin": [0.32177, 4.12405, -87.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [76.75, 19.75], "uv_size": [-0.125, 0.25]} + } + }, + { + "origin": [0.40246, 4.48934, -87.3082], + "size": [0.06105, 0.26061, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, 180], + "uv": { + "south": {"uv": [76.625, 20], "uv_size": [0.125, -0.25]} + } + }, + { + "origin": [0.44855, 4.50842, -87.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [76.625, 20], "uv_size": [0.125, -0.25]} + } + }, + { + "origin": [0.52868, 4.48934, -87.3082], + "size": [0.06105, 0.26061, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, -180], + "uv": { + "south": {"uv": [76.75, 20], "uv_size": [-0.125, -0.25]} + } + }, + { + "origin": [0.48259, 4.50842, -87.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.47584, -87.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [76.75, 20], "uv_size": [-0.125, -0.25]} + } + } + ] + }, { "name": "Stock0", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/geo/ak12.geo.json b/src/main/resources/assets/superbwarfare/geo/ak12.geo.json index 189b9a392..5868b858c 100644 --- a/src/main/resources/assets/superbwarfare/geo/ak12.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ak12.geo.json @@ -11625,6 +11625,67 @@ } ] }, + { + "name": "bone28", + "parent": "Cross3", + "pivot": [0.49609, 4.65547, -96.3082], + "cubes": [ + { + "origin": [0.52896, 4.30368, -96.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [26.625, 76.75], "uv_size": [2.625, 2.75]} + } + }, + { + "origin": [0.40218, 4.30368, -96.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [29.25, 76.75], "uv_size": [-2.625, 2.75]} + } + }, + { + "origin": [0.40246, 4.74938, -96.3082], + "size": [0.06105, 0.26061, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, 180], + "uv": { + "south": {"uv": [26.625, 79.5], "uv_size": [2.625, -2.75]} + } + }, + { + "origin": [0.52896, 4.68806, -96.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [26.625, 79.5], "uv_size": [2.625, -2.75]} + } + }, + { + "origin": [0.52868, 4.74938, -96.3082], + "size": [0.06105, 0.26061, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, -180], + "uv": { + "south": {"uv": [29.25, 79.5], "uv_size": [-2.625, -2.75]} + } + }, + { + "origin": [0.40218, 4.68806, -96.3082], + "size": [0.06105, 0.3192, 0], + "pivot": [0.49609, 4.65547, -96.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [29.25, 79.5], "uv_size": [-2.625, -2.75]} + } + } + ] + }, { "name": "bone173", "parent": "Cross3", @@ -11711,72 +11772,72 @@ "rotation": [0, 0, -90], "cubes": [ { - "origin": [-0.37834, 4.90479, -96.3082], + "origin": [-0.56564, 3.872, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, -90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [-0.37834, 4.06839, -96.3082], + "origin": [-0.56564, 3.0356, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, -90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [-0.37834, 3.23199, -96.3082], + "origin": [-0.56564, 2.1992, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, -90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [-0.37834, 2.39559, -96.3082], + "origin": [-0.56564, 1.3628, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, -90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [0.45152, 1.19113, -96.3082], + "origin": [-0.56564, 1.3628, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, 90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [0.45152, 3.70033, -96.3082], + "origin": [-0.56564, 3.872, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, 90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [0.45152, 2.86393, -96.3082], + "origin": [-0.56564, 3.0356, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, 90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} } }, { - "origin": [0.45152, 2.02753, -96.3082], + "origin": [-0.56564, 2.1992, -96.3082], "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.2577, -106.04101], + "pivot": [-0.52107, 4.82714, -96.3082], "rotation": [0, 0, 90], "uv": { "south": {"uv": [17, 114.5], "uv_size": [0.125, 0.125]} diff --git a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json index 6ff9a2cf7..c42370965 100644 --- a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json @@ -9279,6 +9279,67 @@ } ] }, + { + "name": "bone97", + "parent": "Cross3", + "pivot": [0, 4.70349, -96.3082], + "cubes": [ + { + "origin": [0.03797, 4.38338, -96.3082], + "size": [0.07053, 0.3688, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [236.375, 176.5], "uv_size": [0.875, 1]} + } + }, + { + "origin": [-0.10851, 4.38338, -96.3082], + "size": [0.07053, 0.3688, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [237.25, 176.5], "uv_size": [-0.875, 1]} + } + }, + { + "origin": [-0.10818, 4.89835, -96.3082], + "size": [0.07053, 0.30111, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, 180], + "uv": { + "south": {"uv": [236.375, 177.5], "uv_size": [0.875, -1]} + } + }, + { + "origin": [0.03797, 4.82749, -96.3082], + "size": [0.07053, 0.3688, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [236.375, 177.5], "uv_size": [0.875, -1]} + } + }, + { + "origin": [0.03765, 4.89835, -96.3082], + "size": [0.07053, 0.30111, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, -180], + "uv": { + "south": {"uv": [237.25, 177.5], "uv_size": [-0.875, -1]} + } + }, + { + "origin": [-0.10851, 4.82749, -96.3082], + "size": [0.07053, 0.3688, 0], + "pivot": [0, 4.78984, -96.3082], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [237.25, 177.5], "uv_size": [-0.875, -1]} + } + } + ] + }, { "name": "bone173", "parent": "Cross3", diff --git a/src/main/resources/assets/superbwarfare/geo/m4.geo.json b/src/main/resources/assets/superbwarfare/geo/m4.geo.json index 1057c8e51..1b5051aab 100644 --- a/src/main/resources/assets/superbwarfare/geo/m4.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m4.geo.json @@ -10394,7 +10394,7 @@ "cubes": [ { "origin": [-0.03649, -5.17556, -240.76641], - "size": [0.07299, 19.6308, 0], + "size": [0.07299, 9.5308, 0], "pivot": [0, 4.63984, -240.76641], "rotation": [0, 0, -90], "uv": { @@ -10406,9 +10406,41 @@ "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} } }, + { + "origin": [-5.03649, -0.17556, -240.76641], + "size": [0.07299, 9.5308, 0], + "pivot": [-5, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "east": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "south": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "west": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "up": {"uv": [80.75, 105], "uv_size": [0.25, -0.25]}, + "down": {"uv": [80.75, 105], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-0.04821, 4.35508, -240.76641], + "size": [0.09642, 0.56953, 0], + "uv": { + "south": {"uv": [107.25, 70.75], "uv_size": [-1.75, 2.25]} + } + }, + { + "origin": [-0.04821, 4.35508, -240.76641], + "size": [0.09642, 0.56953, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [107.25, 70.75], "uv_size": [-1.75, 2.25]} + } + }, { "origin": [-0.03649, -5.17556, -240.76641], - "size": [0.07299, 19.6308, 0], + "size": [0.07299, 9.5308, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -180], "uv": { "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, @@ -10418,6 +10450,20 @@ "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} } }, + { + "origin": [-0.03649, -5.17556, -240.76641], + "size": [0.07299, 9.5308, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 0], + "uv": { + "north": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "east": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "south": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "west": {"uv": [81, 104.75], "uv_size": [-0.25, 0.25]}, + "up": {"uv": [80.75, 105], "uv_size": [0.25, -0.25]}, + "down": {"uv": [80.75, 105], "uv_size": [0.25, -0.25]} + } + }, { "origin": [-0.06892, -5.17556, -240.76641], "size": [0.13783, 4, 0], @@ -10474,118 +10520,6 @@ "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} } }, - { - "origin": [-0.05329, 1.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 2.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 3.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 0.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 0.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 1.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 2.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, - { - "origin": [-0.05329, 3.49788, -240.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.63984, -240.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, - "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, - "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} - } - }, { "origin": [-0.05329, 3.49788, -240.76641], "size": [0.10658, 0.07656, 0], @@ -10700,6 +10634,245 @@ } ] }, + { + "name": "bone120", + "parent": "Cross3", + "pivot": [0, 4.63984, -240.76641], + "cubes": [ + { + "origin": [-0.05329, 3.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 3.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 2.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 1.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 0.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 0.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 1.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 2.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + } + ] + }, + { + "name": "bone121", + "parent": "Cross3", + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "cubes": [ + { + "origin": [-0.05329, 3.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 3.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 2.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 1.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 0.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 0.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 1.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + }, + { + "origin": [-0.05329, 2.49788, -240.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 4.63984, -240.76641], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [80.75, 104.75], "uv_size": [0.25, 0.25]}, + "up": {"uv": [81, 105], "uv_size": [-0.25, -0.25]}, + "down": {"uv": [81, 105], "uv_size": [-0.25, -0.25]} + } + } + ] + }, { "name": "Tuoxin", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg index c6ff03bdb..d0e358dce 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg index 1ba5eacc5..f8fba5cad 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg differ