diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java index 5a5ea4dd4..60137a38f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java @@ -84,17 +84,6 @@ public class Glock17ItemModel extends GeoModel { slide.setPosZ(1.5f * (float) fp); - if (stack.getOrCreateTag().getBoolean("HoldOpen")) { - slide.setPosZ(1.5f); - bullet.setScaleX(0); - bullet.setScaleY(0); - bullet.setScaleZ(0); - } else { - bullet.setScaleX(1); - bullet.setScaleY(1); - bullet.setScaleZ(1); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph)); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY)); @@ -128,6 +117,7 @@ public class Glock17ItemModel extends GeoModel { } ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(),Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ()); + CoreGeoBone shell = getAnimationProcessor().getBone("shell"); CoreGeoBone shell1 = getAnimationProcessor().getBone("shell1"); CoreGeoBone shell2 = getAnimationProcessor().getBone("shell2"); CoreGeoBone shell3 = getAnimationProcessor().getBone("shell3"); @@ -135,5 +125,24 @@ public class Glock17ItemModel extends GeoModel { CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); ClientEventHandler.handleShells(0.7f, 1f, shell1, shell2, shell3, shell4, shell5); + + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { + slide.setPosZ(1.5f); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); + + shell.setScaleX(0); + shell.setScaleY(0); + shell.setScaleZ(0); + } else { + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); + + shell.setScaleX(1); + shell.setScaleY(1); + shell.setScaleZ(1); + } } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java index a27f97277..add5c927d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java @@ -92,17 +92,6 @@ public class Glock18ItemModel extends GeoModel { slide.setPosZ(1.5f * (float) fp); - if (stack.getOrCreateTag().getBoolean("HoldOpen")) { - slide.setPosZ(1.5f); - bullet.setScaleX(0); - bullet.setScaleY(0); - bullet.setScaleZ(0); - } else { - bullet.setScaleX(1); - bullet.setScaleY(1); - bullet.setScaleZ(1); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph)); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY)); @@ -136,6 +125,7 @@ public class Glock18ItemModel extends GeoModel { } ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(),Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ()); + CoreGeoBone shell = getAnimationProcessor().getBone("shell"); CoreGeoBone shell1 = getAnimationProcessor().getBone("shell1"); CoreGeoBone shell2 = getAnimationProcessor().getBone("shell2"); CoreGeoBone shell3 = getAnimationProcessor().getBone("shell3"); @@ -143,5 +133,24 @@ public class Glock18ItemModel extends GeoModel { CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); ClientEventHandler.handleShells(0.7f, 1f, shell1, shell2, shell3, shell4, shell5); + + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { + slide.setPosZ(1.5f); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); + + shell.setScaleX(0); + shell.setScaleY(0); + shell.setScaleZ(0); + } else { + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); + + shell.setScaleX(1); + shell.setScaleY(1); + shell.setScaleZ(1); + } } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java index 8046152cd..0c1047318 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java @@ -82,17 +82,6 @@ public class M1911ItemModel extends GeoModel { slide.setPosZ(2.75f * (float) fp); - if (stack.getOrCreateTag().getBoolean("HoldOpen")) { - slide.setPosZ(1.5f); - bullet.setScaleX(0); - bullet.setScaleY(0); - bullet.setScaleZ(0); - } else { - bullet.setScaleX(1); - bullet.setScaleY(1); - bullet.setScaleZ(1); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph)); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY)); @@ -126,6 +115,7 @@ public class M1911ItemModel extends GeoModel { } ClientEventHandler.shake(Mth.RAD_TO_DEG * camera.getRotX(),Mth.RAD_TO_DEG * camera.getRotY(), Mth.RAD_TO_DEG * camera.getRotZ()); + CoreGeoBone shell = getAnimationProcessor().getBone("shell"); CoreGeoBone shell1 = getAnimationProcessor().getBone("shell1"); CoreGeoBone shell2 = getAnimationProcessor().getBone("shell2"); CoreGeoBone shell3 = getAnimationProcessor().getBone("shell3"); @@ -133,5 +123,24 @@ public class M1911ItemModel extends GeoModel { CoreGeoBone shell5 = getAnimationProcessor().getBone("shell5"); ClientEventHandler.handleShells(0.7f, 1f, shell1, shell2, shell3, shell4, shell5); + + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { + slide.setPosZ(1.5f); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); + + shell.setScaleX(0); + shell.setScaleY(0); + shell.setScaleZ(0); + } else { + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); + + shell.setScaleX(1); + shell.setScaleY(1); + shell.setScaleZ(1); + } } } diff --git a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/common/GameplayClothConfig.java b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/common/GameplayClothConfig.java index 3d313f780..e0cbd9900 100644 --- a/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/common/GameplayClothConfig.java +++ b/src/main/java/net/mcreator/superbwarfare/compat/clothconfig/common/GameplayClothConfig.java @@ -26,5 +26,13 @@ public class GameplayClothConfig { .setTooltip(Component.translatable("config.superbwarfare.common.gameplay.global_indication.des")) .build() ); + + category.addEntry(entryBuilder + .startBooleanToggle(Component.translatable("config.superbwarfare.common.gameplay.respawn_auto_armor"), GameplayConfig.RESPAWN_AUTO_ARMOR.get()) + .setDefaultValue(true) + .setSaveConsumer(GameplayConfig.RESPAWN_AUTO_ARMOR::set) + .setTooltip(Component.translatable("config.superbwarfare.common.gameplay.respawn_auto_armor.des")) + .build() + ); } } diff --git a/src/main/java/net/mcreator/superbwarfare/config/common/GameplayConfig.java b/src/main/java/net/mcreator/superbwarfare/config/common/GameplayConfig.java index 208c06bbc..48e50504f 100644 --- a/src/main/java/net/mcreator/superbwarfare/config/common/GameplayConfig.java +++ b/src/main/java/net/mcreator/superbwarfare/config/common/GameplayConfig.java @@ -6,6 +6,7 @@ public class GameplayConfig { public static ForgeConfigSpec.BooleanValue RESPAWN_RELOAD; public static ForgeConfigSpec.BooleanValue GLOBAL_INDICATION; + public static ForgeConfigSpec.BooleanValue RESPAWN_AUTO_ARMOR; public static void init(ForgeConfigSpec.Builder builder) { builder.push("gameplay"); @@ -16,6 +17,9 @@ public class GameplayConfig { builder.comment("Set FALSE if you want to show kill indication ONLY while killing an entity with a gun"); GLOBAL_INDICATION = builder.define("global_indication", true); + builder.comment("Set TRUE if you want to refill your armor plate when respawn"); + RESPAWN_AUTO_ARMOR = builder.define("respawn_auto_armor", true); + builder.pop(); } diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index 06a299974..74cb6e0f6 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -18,6 +18,7 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -56,6 +57,7 @@ public class PlayerEventHandler { }); handleRespawnReload(player); + handleRespawnAutoArmor(player); } @SubscribeEvent @@ -333,6 +335,32 @@ public class PlayerEventHandler { } } + private static void handleRespawnAutoArmor(Player player) { + if (!GameplayConfig.RESPAWN_AUTO_ARMOR.get()) return; + + ItemStack armor = player.getItemBySlot(EquipmentSlot.CHEST); + if (armor == ItemStack.EMPTY) return; + + double armorPlate = armor.getOrCreateTag().getDouble("ArmorPlate"); + + int armorLevel = 1; + if (armor.is(ModTags.Items.MILITARY_ARMOR)) { + armorLevel = 2; + } else if (armor.is(ModTags.Items.MILITARY_ARMOR_HEAVY)) { + armorLevel = 3; + } + + if (armorPlate < armorLevel * 30) { + for (var stack : player.getInventory().items) { + if (stack.is(ModItems.ARMOR_PLATE.get())) { + for (int index0 = 0; index0 < Math.ceil(((armorLevel * 30) - armorPlate) / 30); index0++) { + stack.finishUsingItem(player.level(),player); + } + } + } + } + } + @SubscribeEvent public static void onAnvilUpdate(AnvilUpdateEvent event) { diff --git a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json index df3e4a7a2..605eccefc 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json @@ -65,221 +65,6 @@ "parent": "roll", "pivot": [0, 0.46563, 1.72795] }, - { - "name": "shell1", - "parent": "gun", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell2", - "parent": "gun", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell3", - "parent": "gun", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell4", - "parent": "gun", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell5", - "parent": "gun", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, { "name": "flare", "parent": "gun", @@ -319,6 +104,226 @@ "parent": "gun", "pivot": [0, 1.26563, 0.22795] }, + { + "name": "shell", + "parent": "body", + "pivot": [0, 1.26563, -1.27205] + }, + { + "name": "shell1", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell2", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell4", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell3", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell5", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, { "name": "qiangshen", "parent": "body", diff --git a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json index a687dbdb8..6b72afda5 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json @@ -104,6 +104,226 @@ "parent": "gun", "pivot": [0, 1.26563, 0.22795] }, + { + "name": "shell", + "parent": "body", + "pivot": [0, 1.26563, -1.27205] + }, + { + "name": "shell1", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell2", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell3", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell4", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "shell5", + "parent": "shell", + "pivot": [0, 2.74506, 0.44261], + "cubes": [ + { + "origin": [-0.26066, 2.4844, -0.37618], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 2.52073, -0.37363], + "size": [0.44867, 0.44867, 1.24011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 2.4844, 0.829], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, { "name": "qiangshen", "parent": "body", @@ -2466,221 +2686,6 @@ } } ] - }, - { - "name": "shell1", - "parent": "roll", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell2", - "parent": "roll", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell3", - "parent": "roll", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell4", - "parent": "roll", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "shell5", - "parent": "roll", - "pivot": [-0.1, 2.74506, 0.34261], - "cubes": [ - { - "origin": [-0.36066, 2.4844, -0.47618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.32434, 2.52073, -0.47363], - "size": [0.44867, 0.44867, 1.24011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.36066, 2.4844, 0.729], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] } ] } diff --git a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json index 97700e670..91750c129 100644 --- a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json @@ -44,206 +44,6 @@ "parent": "roll", "pivot": [0, 0.46563, 1.72795] }, - { - "name": "shell1", - "parent": "gun", - "pivot": [0, 2.54506, 0.25095], - "cubes": [ - { - "origin": [-0.26066, 2.2844, -0.57618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 2.32073, -0.52363], - "size": [0.44867, 0.44867, 1.19011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 2.2844, 0.629], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, - { - "name": "shell2", - "parent": "gun", - "pivot": [0, 2.54506, 0.25095], - "cubes": [ - { - "origin": [-0.26066, 2.2844, -0.57618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 2.32073, -0.52363], - "size": [0.44867, 0.44867, 1.19011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 2.2844, 0.629], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, - { - "name": "shell3", - "parent": "gun", - "pivot": [0, 2.54506, 0.25095], - "cubes": [ - { - "origin": [-0.26066, 2.2844, -0.57618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 2.32073, -0.52363], - "size": [0.44867, 0.44867, 1.19011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 2.2844, 0.629], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, - { - "name": "shell4", - "parent": "gun", - "pivot": [0, 2.54506, 0.25095], - "cubes": [ - { - "origin": [-0.26066, 2.2844, -0.57618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 2.32073, -0.52363], - "size": [0.44867, 0.44867, 1.19011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 2.2844, 0.629], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, - { - "name": "shell5", - "parent": "gun", - "pivot": [0, 2.54506, 0.25095], - "cubes": [ - { - "origin": [-0.26066, 2.2844, -0.57618], - "size": [0.52132, 0.52132, 1.12264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 2.32073, -0.52363], - "size": [0.44867, 0.44867, 1.19011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 2.2844, 0.629], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, { "name": "flare", "parent": "gun", @@ -263,6 +63,211 @@ "parent": "gun", "pivot": [0, 1.26563, 0.22795] }, + { + "name": "shell", + "parent": "body", + "pivot": [0, 1.26563, -0.77205] + }, + { + "name": "shell1", + "parent": "shell", + "pivot": [0, 2.54506, 0.95095], + "cubes": [ + { + "origin": [-0.26066, 2.2844, 0.12382], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 2.32073, 0.17637], + "size": [0.44867, 0.44867, 1.19011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 2.2844, 1.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, + { + "name": "shell2", + "parent": "shell", + "pivot": [0, 2.54506, 0.95095], + "cubes": [ + { + "origin": [-0.26066, 2.2844, 0.12382], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 2.32073, 0.17637], + "size": [0.44867, 0.44867, 1.19011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 2.2844, 1.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, + { + "name": "shell3", + "parent": "shell", + "pivot": [0, 2.54506, 0.95095], + "cubes": [ + { + "origin": [-0.26066, 2.2844, 0.12382], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 2.32073, 0.17637], + "size": [0.44867, 0.44867, 1.19011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 2.2844, 1.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, + { + "name": "shell4", + "parent": "shell", + "pivot": [0, 2.54506, 0.95095], + "cubes": [ + { + "origin": [-0.26066, 2.2844, 0.12382], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 2.32073, 0.17637], + "size": [0.44867, 0.44867, 1.19011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 2.2844, 1.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, + { + "name": "shell5", + "parent": "shell", + "pivot": [0, 2.54506, 0.95095], + "cubes": [ + { + "origin": [-0.26066, 2.2844, 0.12382], + "size": [0.52132, 0.52132, 1.12264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 2.32073, 0.17637], + "size": [0.44867, 0.44867, 1.19011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 2.2844, 1.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, { "name": "hammer", "parent": "body", diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 8c927f7ed..a27db378a 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -393,6 +393,8 @@ "config.superbwarfare.common.gameplay.respawn_reload.des": "Whether to reload all weapons in the inventory after respawning automatically", "config.superbwarfare.common.gameplay.global_indication": "Global damage indicator", "config.superbwarfare.common.gameplay.global_indication.des": "Whether to show a kill indication around the cross hair when killing a creature with only the damage type of this module", + "config.superbwarfare.common.gameplay.respawn_auto_armor": "Respawn Auto Armor Plate", + "config.superbwarfare.common.gameplay.respawn_auto_armor.des": "Whether to refill your armor plate after respawning automatically", "des.superbwarfare.perk_damage_reduce": "Damage -", "des.superbwarfare.perk_damage_plus": "Damage +", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index d49db9302..c1b7e5b02 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -393,6 +393,8 @@ "config.superbwarfare.common.gameplay.respawn_reload.des": "开启时,玩家在重生时会自动装填全部武器的弹药", "config.superbwarfare.common.gameplay.global_indication": "全局伤害提示", "config.superbwarfare.common.gameplay.global_indication.des": "是否在仅使用本模组的伤害类型击杀生物时,在准星周围显示击杀提示", + "config.superbwarfare.common.gameplay.respawn_auto_armor": "重生自动装备防弹插板", + "config.superbwarfare.common.gameplay.respawn_auto_armor.des": "开启时,玩家在重生时会自动补满防弹插板", "des.superbwarfare.perk_damage_reduce": "伤害 -", "des.superbwarfare.perk_damage_plus": "伤害 +",