diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index ae4c040b4..d60d3af73 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-25T02:21:34.5694533 Item Models: superbwarfare +// 1.20.1 2024-09-25T18:10:54.9808742 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json @@ -70,6 +70,7 @@ ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_ce 5b8f7d5922e49e06bcd4d4d2a2a3dc934548570b assets/superbwarfare/models/item/reforging_table.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json +34aecddee2e3b903c075b1625e1b23c57ea23fd1 assets/superbwarfare/models/item/ru_chest_6b43.json 66a2586547a7cc44a80f950036a1795af580518a assets/superbwarfare/models/item/ru_helmet_6b47.json ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/ru_chest_6b43.json b/src/generated/resources/assets/superbwarfare/models/item/ru_chest_6b43.json new file mode 100644 index 000000000..56fb2cf48 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/ru_chest_6b43.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/ru_chest_6b43" + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/armor/RuChest6b43Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/armor/RuChest6b43Model.java new file mode 100644 index 000000000..a993c695c --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/client/model/armor/RuChest6b43Model.java @@ -0,0 +1,23 @@ +package net.mcreator.superbwarfare.client.model.armor; + +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.item.armor.RuChest6b43; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.model.GeoModel; + +public class RuChest6b43Model extends GeoModel { + @Override + public ResourceLocation getAnimationResource(RuChest6b43 object) { + return null; + } + + @Override + public ResourceLocation getModelResource(RuChest6b43 object) { + return new ResourceLocation(ModUtils.MODID, "geo/ru_chest_6b43.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(RuChest6b43 object) { + return new ResourceLocation(ModUtils.MODID, "textures/armor/ru_chest_6b43.png"); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/armor/RuHelmet6b47Model.java similarity index 80% rename from src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java rename to src/main/java/net/mcreator/superbwarfare/client/model/armor/RuHelmet6b47Model.java index a275f88c6..2cc50b5f7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/armor/RuHelmet6b47Model.java @@ -5,7 +5,7 @@ import net.mcreator.superbwarfare.item.armor.RuHelmet6b47; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class Ru6b47Model extends GeoModel { +public class RuHelmet6b47Model extends GeoModel { @Override public ResourceLocation getAnimationResource(RuHelmet6b47 object) { return null; @@ -13,7 +13,7 @@ public class Ru6b47Model extends GeoModel { @Override public ResourceLocation getModelResource(RuHelmet6b47 object) { - return new ResourceLocation(ModUtils.MODID, "geo/ru_6b47.geo.json"); + return new ResourceLocation(ModUtils.MODID, "geo/ru_helmet_6b47.geo.json"); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuChest6b43ArmorRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuChest6b43ArmorRenderer.java new file mode 100644 index 000000000..4efbf6061 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuChest6b43ArmorRenderer.java @@ -0,0 +1,23 @@ +package net.mcreator.superbwarfare.client.renderer.armor; + +import net.mcreator.superbwarfare.client.model.armor.RuChest6b43Model; +import net.mcreator.superbwarfare.item.armor.RuChest6b43; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.cache.object.GeoBone; +import software.bernie.geckolib.renderer.GeoArmorRenderer; + +public class RuChest6b43ArmorRenderer extends GeoArmorRenderer { + public RuChest6b43ArmorRenderer() { + super(new RuChest6b43Model()); + this.body = new GeoBone(null, "armorBody", false, (double) 0, false, false); + this.rightArm = new GeoBone(null, "armorRightArm", false, (double) 0, false, false); + this.leftArm = new GeoBone(null, "armorLeftArm", false, (double) 0, false, false); + } + + @Override + public RenderType getRenderType(RuChest6b43 animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuHelmet6b47ArmorRenderer.java similarity index 75% rename from src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java rename to src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuHelmet6b47ArmorRenderer.java index c4da2069b..6d0bf4cfb 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/RuHelmet6b47ArmorRenderer.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.client.renderer.armor; -import net.mcreator.superbwarfare.client.model.armor.Ru6b47Model; +import net.mcreator.superbwarfare.client.model.armor.RuHelmet6b47Model; import net.mcreator.superbwarfare.item.armor.RuHelmet6b47; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -8,9 +8,9 @@ import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoArmorRenderer; -public class Ru6b47ArmorRenderer extends GeoArmorRenderer { - public Ru6b47ArmorRenderer() { - super(new Ru6b47Model()); +public class RuHelmet6b47ArmorRenderer extends GeoArmorRenderer { + public RuHelmet6b47ArmorRenderer() { + super(new RuHelmet6b47Model()); this.head = new GeoBone(null, "", false, (double) 0, false, false); } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java index f479a8b47..b5372887d 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -88,6 +88,7 @@ public class ModItemModelProvider extends ItemModelProvider { // armor simpleItem(ModItems.RU_HELMET_6B47); + simpleItem(ModItems.RU_CHEST_6B43); // blueprints blueprintItem(ModItems.TRACHELIUM_BLUEPRINT); diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 737b8a3fc..df25f7852 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -156,7 +156,9 @@ public class ClientEventHandler { // 开火部分 if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS - && (player.getMainHandItem().is(ModTags.Items.NORMAL_GUN) || (stack.is(ModItems.MINIGUN.get()) && !player.isSprinting()))) { + && (player.getMainHandItem().is(ModTags.Items.NORMAL_GUN) + || (stack.is(ModItems.MINIGUN.get()) && !player.isSprinting() && stack.getOrCreateTag().getDouble("overheat") == 0 && !player.getCooldowns().isOnCooldown(stack.getItem()) && stack.getOrCreateTag().getDouble("minigun_rotation") >= 10 + ))) { double customRpm = 0; @@ -164,14 +166,8 @@ public class ClientEventHandler { customRpm = stack.getOrCreateTag().getInt("customRpm"); } - if (stack.getItem() == ModItems.MINIGUN.get()) { - if (player.isInWater()) { - customRpm = - 0.25 * stack.getOrCreateTag().getDouble("rpm"); - } - - if (stack.getOrCreateTag().getDouble("overheat") != 0 || player.getCooldowns().isOnCooldown(stack.getItem()) || stack.getOrCreateTag().getDouble("minigun_rotation") < 10) { - return; - } + if (stack.getItem() == ModItems.MINIGUN.get() && player.isInWater()) { + customRpm = - 0.25 * stack.getOrCreateTag().getDouble("rpm"); } double rpm = stack.getOrCreateTag().getDouble("rpm") + customRpm; diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 0f64cfc67..1466d33a4 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.init; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.*; +import net.mcreator.superbwarfare.item.armor.RuChest6b43; import net.mcreator.superbwarfare.item.armor.RuHelmet6b47; import net.mcreator.superbwarfare.item.common.BlueprintItem; import net.mcreator.superbwarfare.item.common.MaterialPack; @@ -123,6 +124,7 @@ public class ModItems { public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); public static final RegistryObject CROWBAR = ITEMS.register("crowbar", Crowbar::new); public static final RegistryObject RU_HELMET_6B47 = ITEMS.register("ru_helmet_6b47", RuHelmet6b47::new); + public static final RegistryObject RU_CHEST_6B43 = ITEMS.register("ru_chest_6b43", RuChest6b43::new); public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); public static final RegistryObject MORTAR_BARREL = ITEMS.register("mortar_barrel", () -> new Item(new Item.Properties())); public static final RegistryObject MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", () -> new Item(new Item.Properties())); diff --git a/src/main/java/net/mcreator/superbwarfare/item/armor/RuChest6b43.java b/src/main/java/net/mcreator/superbwarfare/item/armor/RuChest6b43.java new file mode 100644 index 000000000..51ec81a2a --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/item/armor/RuChest6b43.java @@ -0,0 +1,48 @@ +package net.mcreator.superbwarfare.item.armor; + +import net.mcreator.superbwarfare.client.renderer.armor.RuChest6b43ArmorRenderer; +import net.mcreator.superbwarfare.tiers.ModArmorMaterial; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import software.bernie.geckolib.animatable.GeoItem; +import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.renderer.GeoArmorRenderer; +import software.bernie.geckolib.util.GeckoLibUtil; + +import java.util.function.Consumer; + +public class RuChest6b43 extends ArmorItem implements GeoItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); + public RuChest6b43() { + super(ModArmorMaterial.CEMENTED_CARBIDE, Type.CHESTPLATE, new Properties()); + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new IClientItemExtensions() { + private GeoArmorRenderer renderer; + + @Override + public HumanoidModel getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel original) { + if (this.renderer == null) + this.renderer = new RuChest6b43ArmorRenderer(); + this.renderer.prepForRender(livingEntity, itemStack, equipmentSlot, original); + return this.renderer; + } + }); + } + + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar data) { + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return this.cache; + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/item/armor/RuHelmet6b47.java b/src/main/java/net/mcreator/superbwarfare/item/armor/RuHelmet6b47.java index 64875168c..b9d90091b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/armor/RuHelmet6b47.java +++ b/src/main/java/net/mcreator/superbwarfare/item/armor/RuHelmet6b47.java @@ -1,6 +1,6 @@ package net.mcreator.superbwarfare.item.armor; -import net.mcreator.superbwarfare.client.renderer.armor.Ru6b47ArmorRenderer; +import net.mcreator.superbwarfare.client.renderer.armor.RuHelmet6b47ArmorRenderer; import net.mcreator.superbwarfare.tiers.ModArmorMaterial; import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.entity.EquipmentSlot; @@ -30,7 +30,7 @@ public class RuHelmet6b47 extends ArmorItem implements GeoItem { @Override public HumanoidModel getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel original) { if (this.renderer == null) - this.renderer = new Ru6b47ArmorRenderer(); + this.renderer = new RuHelmet6b47ArmorRenderer(); this.renderer.prepForRender(livingEntity, itemStack, equipmentSlot, original); return this.renderer; } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java index 78af99752..13f7df964 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK47Item.java @@ -125,25 +125,8 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { - if (transformType != null && transformType.firstPerson()) { - if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { - event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); - if (event.getController().getAnimationState() == AnimationController.State.STOPPED) { - this.animationProcedure = "empty"; - event.getController().forceAnimationReset(); - } - } else if (this.animationProcedure.equals("empty")) { - return PlayState.STOP; - } - } - return PlayState.CONTINUE; - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); - data.add(procedureController); var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } diff --git a/src/main/resources/assets/superbwarfare/geo/ru_chest_6b43.geo.json b/src/main/resources/assets/superbwarfare/geo/ru_chest_6b43.geo.json new file mode 100644 index 000000000..8100fe2ca --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/ru_chest_6b43.geo.json @@ -0,0 +1,825 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.ru_chest_6b43", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 4.5, + "visible_bounds_offset": [0, 1.75, 0] + }, + "bones": [ + { + "name": "bipedHead", + "pivot": [0, 24, 0] + }, + { + "name": "armorHead", + "parent": "bipedHead", + "pivot": [0, 24, 0] + }, + { + "name": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "armorBody", + "parent": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "bone", + "parent": "armorBody", + "pivot": [0, 24, 0], + "cubes": [ + { + "origin": [-4.3, 14.95, -3.6], + "size": [0.8, 5.83047, 0.8], + "pivot": [-3.8, 17.86523, -3.4], + "rotation": [0, 22.5, 0], + "uv": { + "north": {"uv": [20, 35], "uv_size": [1, 6]}, + "east": {"uv": [17, 37], "uv_size": [1, 6]}, + "south": {"uv": [23, 37], "uv_size": [1, 6]}, + "west": {"uv": [24, 37], "uv_size": [1, 6]}, + "up": {"uv": [36, 44], "uv_size": [1, 1]}, + "down": {"uv": [39, 45], "uv_size": [1, -1]} + } + }, + { + "origin": [-4.2, 18.65, -3.7], + "size": [0.6, 2.23047, 0.7], + "pivot": [-3.8, 17.86523, -3.4], + "rotation": [0, 22.5, 0], + "uv": { + "north": {"uv": [40, 44], "uv_size": [0.5, 2]}, + "east": {"uv": [44, 40], "uv_size": [0.5, 2]}, + "south": {"uv": [41, 44], "uv_size": [0.5, 2]}, + "west": {"uv": [42, 44], "uv_size": [0.5, 2]}, + "up": {"uv": [45, 8], "uv_size": [0.5, 0.5]}, + "down": {"uv": [11, 45.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [3.6, 18.65, -3.7], + "size": [0.6, 2.23047, 0.7], + "pivot": [3.8, 17.86523, -3.4], + "rotation": [0, -22.5, 0], + "uv": { + "north": {"uv": [40.5, 44], "uv_size": [-0.5, 2]}, + "east": {"uv": [42.5, 44], "uv_size": [-0.5, 2]}, + "south": {"uv": [41.5, 44], "uv_size": [-0.5, 2]}, + "west": {"uv": [44.5, 40], "uv_size": [-0.5, 2]}, + "up": {"uv": [45.5, 8], "uv_size": [-0.5, 0.5]}, + "down": {"uv": [11.5, 45.5], "uv_size": [-0.5, -0.5]} + } + }, + { + "origin": [3.5, 14.95, -3.6], + "size": [0.8, 5.83047, 0.8], + "pivot": [3.8, 17.86523, -3.4], + "rotation": [0, -22.5, 0], + "uv": { + "north": {"uv": [21, 35], "uv_size": [-1, 6]}, + "east": {"uv": [25, 37], "uv_size": [-1, 6]}, + "south": {"uv": [24, 37], "uv_size": [-1, 6]}, + "west": {"uv": [18, 37], "uv_size": [-1, 6]}, + "up": {"uv": [37, 44], "uv_size": [-1, 1]}, + "down": {"uv": [40, 45], "uv_size": [-1, -1]} + } + }, + { + "origin": [-4.3, 12.25, -3], + "size": [8.6, 8.68047, 1], + "uv": { + "north": {"uv": [0, 10], "uv_size": [8.5, 8.5]}, + "east": {"uv": [27, 32], "uv_size": [1, 8.5]}, + "south": {"uv": [9, 10], "uv_size": [8.5, 8.5]}, + "west": {"uv": [28, 32], "uv_size": [1, 8.5]}, + "up": {"uv": [29, 33], "uv_size": [8.5, 1]}, + "down": {"uv": [29, 35], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-2.8, 22.34163, 0.9818], + "size": [5.6, 2.86484, 1], + "uv": { + "north": {"uv": [31, 0], "uv_size": [5.5, 3]}, + "east": {"uv": [17, 23], "uv_size": [1, 3]}, + "south": {"uv": [31, 3], "uv_size": [5.5, 3]}, + "west": {"uv": [8, 27], "uv_size": [1, 3]}, + "up": {"uv": [10, 34], "uv_size": [5.5, 1]}, + "down": {"uv": [38, 34], "uv_size": [5.5, -1]} + } + }, + { + "origin": [-2.8, 22.33316, -3.00641], + "size": [5.6, 2.86484, 1], + "pivot": [0, 22.64058, -2.25641], + "rotation": [2.5, 0, 0], + "uv": { + "north": {"uv": [10, 31], "uv_size": [5.5, 3]}, + "east": {"uv": [11, 41], "uv_size": [1, 3]}, + "south": {"uv": [32, 6], "uv_size": [5.5, 3]}, + "west": {"uv": [20, 41], "uv_size": [1, 3]}, + "up": {"uv": [38, 34], "uv_size": [5.5, 1]}, + "down": {"uv": [38, 36], "uv_size": [5.5, -1]} + } + }, + { + "origin": [-5.35, 22.34163, -0.0682], + "size": [3.1, 2.86484, 1], + "pivot": [-2.55, 22.64905, 0.6818], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [14, 23], "uv_size": [3, 3]}, + "east": {"uv": [39, 40], "uv_size": [1, 3]}, + "south": {"uv": [5, 27], "uv_size": [3, 3]}, + "west": {"uv": [40, 40], "uv_size": [1, 3]}, + "up": {"uv": [5, 41], "uv_size": [3, 1]}, + "down": {"uv": [8, 42], "uv_size": [3, -1]} + } + }, + { + "origin": [-0.75, 22.34163, -0.0682], + "size": [3.1, 2.86484, 1], + "pivot": [2.05, 22.64905, 0.6818], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [27, 23], "uv_size": [3, 3]}, + "east": {"uv": [27, 41], "uv_size": [1, 3]}, + "south": {"uv": [32, 20], "uv_size": [3, 3]}, + "west": {"uv": [28, 41], "uv_size": [1, 3]}, + "up": {"uv": [41, 40], "uv_size": [3, 1]}, + "down": {"uv": [41, 42], "uv_size": [3, -1]} + } + }, + { + "origin": [-1.55, 21.33316, -3.00641], + "size": [3.1, 1, 1.25], + "pivot": [0, 22.64058, -2.25641], + "rotation": [2.5, 0, 0], + "uv": { + "north": {"uv": [10, 30], "uv_size": [3, 1]}, + "east": {"uv": [44, 21], "uv_size": [1.5, 1]}, + "south": {"uv": [16, 31], "uv_size": [3, 1]}, + "west": {"uv": [22, 44], "uv_size": [1.5, 1]}, + "up": {"uv": [39, 13], "uv_size": [3, 1.5]}, + "down": {"uv": [39, 16.5], "uv_size": [3, -1.5]} + } + }, + { + "origin": [-4.3, 20.43601, -2.07688], + "size": [8.6, 3.61484, 1], + "pivot": [-0.05, 27.30085, 0.92312], + "rotation": [-8, 0, 0], + "uv": { + "north": {"uv": [18, 22], "uv_size": [8.5, 3.5]}, + "east": {"uv": [14, 40], "uv_size": [1, 3.5]}, + "south": {"uv": [0, 23], "uv_size": [8.5, 3.5]}, + "west": {"uv": [36, 40], "uv_size": [1, 3.5]}, + "up": {"uv": [37, 2], "uv_size": [8.5, 1]}, + "down": {"uv": [37, 4], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-4.3, 20.43601, 1.07688], + "size": [8.6, 3.61484, 1], + "pivot": [-0.05, 27.30085, -0.92312], + "rotation": [8, 0, 0], + "uv": { + "north": {"uv": [0, 19], "uv_size": [8.5, 3.5]}, + "east": {"uv": [12, 40], "uv_size": [1, 3.5]}, + "south": {"uv": [9, 19], "uv_size": [8.5, 3.5]}, + "west": {"uv": [13, 40], "uv_size": [1, 3.5]}, + "up": {"uv": [37, 0], "uv_size": [8.5, 1]}, + "down": {"uv": [37, 2], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-4.3, 11.65, 2], + "size": [8.6, 9.28047, 1], + "uv": { + "north": {"uv": [0, 0], "uv_size": [8.5, 9.5]}, + "east": {"uv": [21, 32], "uv_size": [1, 9.5]}, + "south": {"uv": [9, 0], "uv_size": [8.5, 9.5]}, + "west": {"uv": [22, 32], "uv_size": [1, 9.5]}, + "up": {"uv": [29, 36], "uv_size": [8.5, 1]}, + "down": {"uv": [0, 38], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-3.3, 11.25, -3.25], + "size": [6.6, 2, 0.75], + "uv": { + "north": {"uv": [32, 13], "uv_size": [6.5, 2]}, + "east": {"uv": [0, 44], "uv_size": [1, 2]}, + "south": {"uv": [32, 15], "uv_size": [6.5, 2]}, + "west": {"uv": [1, 44], "uv_size": [1, 2]}, + "up": {"uv": [38, 8], "uv_size": [6.5, 1]}, + "down": {"uv": [29, 39], "uv_size": [6.5, -1]} + } + }, + { + "origin": [-3.4, 13.25, -3.35], + "size": [6.8, 1.75, 0.35], + "uv": { + "north": {"uv": [32, 9], "uv_size": [7, 2]}, + "east": {"uv": [24, 44], "uv_size": [0.5, 2]}, + "south": {"uv": [32, 11], "uv_size": [7, 2]}, + "west": {"uv": [25, 44], "uv_size": [0.5, 2]}, + "up": {"uv": [36, 39], "uv_size": [7, 0.5]}, + "down": {"uv": [5, 40.5], "uv_size": [7, -0.5]} + } + }, + { + "origin": [-2.3, 8.7, -3.25], + "size": [4.6, 2.55, 0.75], + "uv": { + "north": {"uv": [16, 32], "uv_size": [4.5, 2.5]}, + "east": {"uv": [5, 42], "uv_size": [1, 2.5]}, + "south": {"uv": [32, 17], "uv_size": [4.5, 2.5]}, + "west": {"uv": [6, 42], "uv_size": [1, 2.5]}, + "up": {"uv": [5, 39], "uv_size": [4.5, 1]}, + "down": {"uv": [39, 10], "uv_size": [4.5, -1]} + } + }, + { + "origin": [-2.29112, 11.7599, -3.25], + "size": [2.614, 1, 0.75], + "pivot": [-3.17712, 12.2599, -3.125], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [7, 42], "uv_size": [2.5, 1]}, + "east": {"uv": [13, 30], "uv_size": [1, 1]}, + "south": {"uv": [42, 13], "uv_size": [2.5, 1]}, + "west": {"uv": [31, 6], "uv_size": [1, 1]}, + "up": {"uv": [42, 14], "uv_size": [2.5, 1]}, + "down": {"uv": [42, 16], "uv_size": [2.5, -1]} + } + }, + { + "origin": [-0.32288, 11.7599, -3.25], + "size": [2.614, 1, 0.75], + "pivot": [3.17712, 12.2599, -3.125], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [42, 16], "uv_size": [2.5, 1]}, + "east": {"uv": [19, 31], "uv_size": [1, 1]}, + "south": {"uv": [42, 38], "uv_size": [2.5, 1]}, + "west": {"uv": [29, 32], "uv_size": [1, 1]}, + "up": {"uv": [41, 42], "uv_size": [2.5, 1]}, + "down": {"uv": [7, 44], "uv_size": [2.5, -1]} + } + }, + { + "origin": [-4.3, 9, 7], + "size": [8.6, 5, 0.75], + "pivot": [-0.05, 21.5, 10], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [18, 12], "uv_size": [8.5, 5]}, + "east": {"uv": [25, 37], "uv_size": [1, 5]}, + "south": {"uv": [18, 17], "uv_size": [8.5, 5]}, + "west": {"uv": [26, 37], "uv_size": [1, 5]}, + "up": {"uv": [0, 35], "uv_size": [8.5, 1]}, + "down": {"uv": [9, 36], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-4.35, 15.65, 2.25], + "size": [8.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [35, 20], "uv_size": [8.5, 1]}, + "east": {"uv": [25, 42], "uv_size": [1, 1]}, + "south": {"uv": [35, 21], "uv_size": [8.5, 1]}, + "west": {"uv": [44, 25], "uv_size": [1, 1]}, + "up": {"uv": [35, 22], "uv_size": [8.5, 1]}, + "down": {"uv": [35, 24], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-4.35, 14.15, 2.25], + "size": [8.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [35, 24], "uv_size": [8.5, 1]}, + "east": {"uv": [44, 26], "uv_size": [1, 1]}, + "south": {"uv": [35, 25], "uv_size": [8.5, 1]}, + "west": {"uv": [27, 44], "uv_size": [1, 1]}, + "up": {"uv": [35, 26], "uv_size": [8.5, 1]}, + "down": {"uv": [35, 28], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-4.35, 12.65, 2.25], + "size": [8.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [35, 28], "uv_size": [8.5, 1]}, + "east": {"uv": [44, 27], "uv_size": [1, 1]}, + "south": {"uv": [29, 35], "uv_size": [8.5, 1]}, + "west": {"uv": [28, 44], "uv_size": [1, 1]}, + "up": {"uv": [35, 29], "uv_size": [8.5, 1]}, + "down": {"uv": [35, 31], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-3.85, 18.4, -3.03672], + "size": [7.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [37, 18], "uv_size": [7.5, 1]}, + "east": {"uv": [44, 30], "uv_size": [1, 1]}, + "south": {"uv": [37, 19], "uv_size": [7.5, 1]}, + "west": {"uv": [31, 44], "uv_size": [1, 1]}, + "up": {"uv": [29, 37], "uv_size": [7.5, 1]}, + "down": {"uv": [37, 38], "uv_size": [7.5, -1]} + } + }, + { + "origin": [-3.85, 19.9, -3.03672], + "size": [7.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [0, 38], "uv_size": [7.5, 1]}, + "east": {"uv": [44, 31], "uv_size": [1, 1]}, + "south": {"uv": [38, 6], "uv_size": [7.5, 1]}, + "west": {"uv": [32, 44], "uv_size": [1, 1]}, + "up": {"uv": [38, 7], "uv_size": [7.5, 1]}, + "down": {"uv": [8, 39], "uv_size": [7.5, -1]} + } + }, + { + "origin": [-4.25, 21.65, -2.90781], + "size": [1.3, 0.8, 0.79922], + "pivot": [0, 22.05, -2.63711], + "rotation": [-8, 0, 0], + "uv": { + "north": {"uv": [44, 9], "uv_size": [1.5, 1]}, + "east": {"uv": [44, 32], "uv_size": [1, 1]}, + "south": {"uv": [44, 10], "uv_size": [1.5, 1]}, + "west": {"uv": [33, 44], "uv_size": [1, 1]}, + "up": {"uv": [11, 44], "uv_size": [1.5, 1]}, + "down": {"uv": [44, 12], "uv_size": [1.5, -1]} + } + }, + { + "origin": [2.95, 21.65, -2.90781], + "size": [1.3, 0.8, 0.79922], + "pivot": [0, 22.05, -2.63711], + "rotation": [-8, 0, 0], + "uv": { + "north": {"uv": [44, 12], "uv_size": [1.5, 1]}, + "east": {"uv": [44, 33], "uv_size": [1, 1]}, + "south": {"uv": [13, 44], "uv_size": [1.5, 1]}, + "west": {"uv": [44, 34], "uv_size": [1, 1]}, + "up": {"uv": [20, 44], "uv_size": [1.5, 1]}, + "down": {"uv": [44, 21], "uv_size": [1.5, -1]} + } + }, + { + "origin": [-3.85, 16.9, -3.03672], + "size": [7.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [37, 4], "uv_size": [7.5, 1]}, + "east": {"uv": [44, 29], "uv_size": [1, 1]}, + "south": {"uv": [37, 5], "uv_size": [7.5, 1]}, + "west": {"uv": [30, 44], "uv_size": [1, 1]}, + "up": {"uv": [9, 37], "uv_size": [7.5, 1]}, + "down": {"uv": [37, 18], "uv_size": [7.5, -1]} + } + }, + { + "origin": [-4.35, 15.4, -3.03672], + "size": [8.7, 0.8, 0.79922], + "uv": { + "north": {"uv": [35, 31], "uv_size": [8.5, 1]}, + "east": {"uv": [44, 28], "uv_size": [1, 1]}, + "south": {"uv": [35, 32], "uv_size": [8.5, 1]}, + "west": {"uv": [29, 44], "uv_size": [1, 1]}, + "up": {"uv": [0, 36], "uv_size": [8.5, 1]}, + "down": {"uv": [9, 37], "uv_size": [8.5, -1]} + } + }, + { + "origin": [-5.78828, 11.5, -3.16172], + "size": [0.58828, 5.75, 7.4], + "pivot": [-1.45, 24, 1.98828], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [37, 40], "uv_size": [0.5, 6]}, + "east": {"uv": [18, 0], "uv_size": [7.5, 6]}, + "south": {"uv": [38, 40], "uv_size": [0.5, 6]}, + "west": {"uv": [18, 6], "uv_size": [7.5, 6]}, + "up": {"uv": [34, 39], "uv_size": [0.5, 7.5]}, + "down": {"uv": [35, 46.5], "uv_size": [0.5, -7.5]} + } + } + ] + }, + { + "name": "bone4", + "parent": "bone", + "pivot": [-2.45, 24, 0], + "cubes": [ + { + "origin": [-1.05, 15.05, -3.85], + "size": [2.1, 4.63047, 0.85], + "uv": { + "north": {"uv": [23, 32], "uv_size": [2, 4.5]}, + "east": {"uv": [15, 39], "uv_size": [1, 4.5]}, + "south": {"uv": [25, 32], "uv_size": [2, 4.5]}, + "west": {"uv": [29, 39], "uv_size": [1, 4.5]}, + "up": {"uv": [21, 42], "uv_size": [2, 1]}, + "down": {"uv": [43, 40], "uv_size": [2, -1]} + } + }, + { + "origin": [-1.1, 19.68047, -3.9], + "size": [2.2, 1.25, 0.9], + "uv": { + "north": {"uv": [0, 42], "uv_size": [2, 1.5]}, + "east": {"uv": [4, 44], "uv_size": [1, 1.5]}, + "south": {"uv": [2, 42], "uv_size": [2, 1.5]}, + "west": {"uv": [9, 44], "uv_size": [1, 1.5]}, + "up": {"uv": [2, 44], "uv_size": [2, 1]}, + "down": {"uv": [7, 45], "uv_size": [2, -1]} + } + }, + { + "origin": [-0.95, 17.38047, -3.9], + "size": [1.9, 2.3, 0.05], + "uv": { + "north": {"uv": [0, 39], "uv_size": [2, 2.5]}, + "east": {"uv": [15, 44], "uv_size": [0.5, 2.5]}, + "south": {"uv": [2, 39], "uv_size": [2, 2.5]}, + "west": {"uv": [44, 22], "uv_size": [0.5, 2.5]}, + "up": {"uv": [44, 35], "uv_size": [2, 0.5]}, + "down": {"uv": [44, 36.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-0.35, 16.88047, -3.9], + "size": [0.7, 0.5, 0.05], + "uv": { + "north": {"uv": [45, 4], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 45], "uv_size": [0.5, 0.5]}, + "south": {"uv": [45, 5], "uv_size": [0.5, 0.5]}, + "west": {"uv": [6, 45], "uv_size": [0.5, 0.5]}, + "up": {"uv": [7, 45], "uv_size": [0.5, 0.5]}, + "down": {"uv": [8, 45.5], "uv_size": [0.5, -0.5]} + } + } + ] + }, + { + "name": "bone5", + "parent": "bone", + "pivot": [-2.32215, 18.33291, -3.45203], + "rotation": [0, 7, 0], + "cubes": [ + { + "origin": [-3.37215, 15.05, -3.64578], + "size": [2.1, 4.63047, 0.85], + "uv": { + "north": {"uv": [23, 32], "uv_size": [2, 4.5]}, + "east": {"uv": [15, 39], "uv_size": [1, 4.5]}, + "south": {"uv": [25, 32], "uv_size": [2, 4.5]}, + "west": {"uv": [29, 39], "uv_size": [1, 4.5]}, + "up": {"uv": [21, 42], "uv_size": [2, 1]}, + "down": {"uv": [43, 40], "uv_size": [2, -1]} + } + }, + { + "origin": [-3.42215, 19.68047, -3.69578], + "size": [2.2, 1.25, 0.9], + "uv": { + "north": {"uv": [0, 42], "uv_size": [2, 1.5]}, + "east": {"uv": [4, 44], "uv_size": [1, 1.5]}, + "south": {"uv": [2, 42], "uv_size": [2, 1.5]}, + "west": {"uv": [9, 44], "uv_size": [1, 1.5]}, + "up": {"uv": [2, 44], "uv_size": [2, 1]}, + "down": {"uv": [7, 45], "uv_size": [2, -1]} + } + }, + { + "origin": [-3.27215, 17.38047, -3.69578], + "size": [1.9, 2.3, 0.05], + "uv": { + "north": {"uv": [0, 39], "uv_size": [2, 2.5]}, + "east": {"uv": [15, 44], "uv_size": [0.5, 2.5]}, + "south": {"uv": [2, 39], "uv_size": [2, 2.5]}, + "west": {"uv": [44, 22], "uv_size": [0.5, 2.5]}, + "up": {"uv": [44, 35], "uv_size": [2, 0.5]}, + "down": {"uv": [44, 36.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-2.67215, 16.88047, -3.69578], + "size": [0.7, 0.5, 0.05], + "uv": { + "north": {"uv": [45, 4], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 45], "uv_size": [0.5, 0.5]}, + "south": {"uv": [45, 5], "uv_size": [0.5, 0.5]}, + "west": {"uv": [6, 45], "uv_size": [0.5, 0.5]}, + "up": {"uv": [7, 45], "uv_size": [0.5, 0.5]}, + "down": {"uv": [8, 45.5], "uv_size": [0.5, -0.5]} + } + } + ] + }, + { + "name": "bone6", + "parent": "bone", + "pivot": [2.32215, 18.33291, -3.45203], + "rotation": [0, -7, 0], + "cubes": [ + { + "origin": [1.27215, 15.05, -3.64578], + "size": [2.1, 4.63047, 0.85], + "uv": { + "north": {"uv": [25, 32], "uv_size": [-2, 4.5]}, + "east": {"uv": [30, 39], "uv_size": [-1, 4.5]}, + "south": {"uv": [27, 32], "uv_size": [-2, 4.5]}, + "west": {"uv": [16, 39], "uv_size": [-1, 4.5]}, + "up": {"uv": [23, 42], "uv_size": [-2, 1]}, + "down": {"uv": [45, 40], "uv_size": [-2, -1]} + } + }, + { + "origin": [1.22215, 19.68047, -3.69578], + "size": [2.2, 1.25, 0.9], + "uv": { + "north": {"uv": [2, 42], "uv_size": [-2, 1.5]}, + "east": {"uv": [10, 44], "uv_size": [-1, 1.5]}, + "south": {"uv": [4, 42], "uv_size": [-2, 1.5]}, + "west": {"uv": [5, 44], "uv_size": [-1, 1.5]}, + "up": {"uv": [4, 44], "uv_size": [-2, 1]}, + "down": {"uv": [9, 45], "uv_size": [-2, -1]} + } + }, + { + "origin": [1.37215, 17.38047, -3.69578], + "size": [1.9, 2.3, 0.05], + "uv": { + "north": {"uv": [2, 39], "uv_size": [-2, 2.5]}, + "east": {"uv": [44.5, 22], "uv_size": [-0.5, 2.5]}, + "south": {"uv": [4, 39], "uv_size": [-2, 2.5]}, + "west": {"uv": [15.5, 44], "uv_size": [-0.5, 2.5]}, + "up": {"uv": [46, 35], "uv_size": [-2, 0.5]}, + "down": {"uv": [46, 36.5], "uv_size": [-2, -0.5]} + } + }, + { + "origin": [1.97215, 16.88047, -3.69578], + "size": [0.7, 0.5, 0.05], + "uv": { + "north": {"uv": [45.5, 4], "uv_size": [-0.5, 0.5]}, + "east": {"uv": [6.5, 45], "uv_size": [-0.5, 0.5]}, + "south": {"uv": [45.5, 5], "uv_size": [-0.5, 0.5]}, + "west": {"uv": [5.5, 45], "uv_size": [-0.5, 0.5]}, + "up": {"uv": [7.5, 45], "uv_size": [-0.5, 0.5]}, + "down": {"uv": [8.5, 45.5], "uv_size": [-0.5, -0.5]} + } + } + ] + }, + { + "name": "bone2", + "parent": "bone", + "pivot": [0, 24, 0], + "cubes": [ + { + "origin": [-4.53828, 11.5, -2.35], + "size": [0.83828, 6.5, 4.6], + "uv": { + "north": {"uv": [18, 35], "uv_size": [1, 6.5]}, + "east": {"uv": [9, 23], "uv_size": [4.5, 6.5]}, + "south": {"uv": [19, 35], "uv_size": [1, 6.5]}, + "west": {"uv": [26, 0], "uv_size": [4.5, 6.5]}, + "up": {"uv": [16, 38], "uv_size": [1, 4.5]}, + "down": {"uv": [4, 43.5], "uv_size": [1, -4.5]} + } + }, + { + "origin": [-4.59531, 12.25, -2.38437], + "size": [0.35, 0.7, 4.69922], + "uv": { + "north": {"uv": [2, 45], "uv_size": [0.5, 0.5]}, + "east": {"uv": [21, 43], "uv_size": [4.5, 0.5]}, + "south": {"uv": [3, 45], "uv_size": [0.5, 0.5]}, + "west": {"uv": [39, 43], "uv_size": [4.5, 0.5]}, + "up": {"uv": [10, 42], "uv_size": [0.5, 4.5]}, + "down": {"uv": [18, 46.5], "uv_size": [0.5, -4.5]} + } + }, + { + "origin": [-4.59531, 13.5, -2.38437], + "size": [0.35, 0.8, 4.69922], + "uv": { + "north": {"uv": [44, 42], "uv_size": [0.5, 1]}, + "east": {"uv": [10, 39], "uv_size": [4.5, 1]}, + "south": {"uv": [43, 44], "uv_size": [0.5, 1]}, + "west": {"uv": [39, 10], "uv_size": [4.5, 1]}, + "up": {"uv": [19, 42], "uv_size": [0.5, 4.5]}, + "down": {"uv": [26, 46.5], "uv_size": [0.5, -4.5]} + } + }, + { + "origin": [-4.59531, 15, -2.38437], + "size": [0.35, 0.8, 4.69922], + "uv": { + "north": {"uv": [44, 43], "uv_size": [0.5, 1]}, + "east": {"uv": [39, 11], "uv_size": [4.5, 1]}, + "south": {"uv": [44, 44], "uv_size": [0.5, 1]}, + "west": {"uv": [39, 12], "uv_size": [4.5, 1]}, + "up": {"uv": [16, 43], "uv_size": [0.5, 4.5]}, + "down": {"uv": [17, 47.5], "uv_size": [0.5, -4.5]} + } + } + ] + }, + { + "name": "bone3", + "parent": "bone", + "pivot": [0, 24, 0], + "cubes": [ + { + "origin": [3.7, 11.5, -2.35], + "size": [0.83828, 6.5, 4.6], + "uv": { + "north": {"uv": [19, 35], "uv_size": [-1, 6.5]}, + "east": {"uv": [30.5, 0], "uv_size": [-4.5, 6.5]}, + "south": {"uv": [20, 35], "uv_size": [-1, 6.5]}, + "west": {"uv": [13.5, 23], "uv_size": [-4.5, 6.5]}, + "up": {"uv": [17, 38], "uv_size": [-1, 4.5]}, + "down": {"uv": [5, 43.5], "uv_size": [-1, -4.5]} + } + }, + { + "origin": [4.24531, 12.25, -2.38437], + "size": [0.35, 0.7, 4.69922], + "uv": { + "north": {"uv": [2.5, 45], "uv_size": [-0.5, 0.5]}, + "east": {"uv": [43.5, 43], "uv_size": [-4.5, 0.5]}, + "south": {"uv": [3.5, 45], "uv_size": [-0.5, 0.5]}, + "west": {"uv": [25.5, 43], "uv_size": [-4.5, 0.5]}, + "up": {"uv": [10.5, 42], "uv_size": [-0.5, 4.5]}, + "down": {"uv": [18.5, 46.5], "uv_size": [-0.5, -4.5]} + } + }, + { + "origin": [4.24531, 13.5, -2.38437], + "size": [0.35, 0.8, 4.69922], + "uv": { + "north": {"uv": [44.5, 42], "uv_size": [-0.5, 1]}, + "east": {"uv": [43.5, 10], "uv_size": [-4.5, 1]}, + "south": {"uv": [43.5, 44], "uv_size": [-0.5, 1]}, + "west": {"uv": [14.5, 39], "uv_size": [-4.5, 1]}, + "up": {"uv": [19.5, 42], "uv_size": [-0.5, 4.5]}, + "down": {"uv": [26.5, 46.5], "uv_size": [-0.5, -4.5]} + } + }, + { + "origin": [4.24531, 15, -2.38437], + "size": [0.35, 0.8, 4.69922], + "uv": { + "north": {"uv": [44.5, 43], "uv_size": [-0.5, 1]}, + "east": {"uv": [43.5, 12], "uv_size": [-4.5, 1]}, + "south": {"uv": [44.5, 44], "uv_size": [-0.5, 1]}, + "west": {"uv": [43.5, 11], "uv_size": [-4.5, 1]}, + "up": {"uv": [16.5, 43], "uv_size": [-0.5, 4.5]}, + "down": {"uv": [17.5, 47.5], "uv_size": [-0.5, -4.5]} + } + } + ] + }, + { + "name": "bipedLeftArm", + "pivot": [4, 22, 0] + }, + { + "name": "armorLeftArm", + "parent": "bipedLeftArm", + "pivot": [5, 22, 0], + "cubes": [ + { + "origin": [4.45, 19, -2.75], + "size": [4.3, 4.75, 5.5], + "uv": { + "north": {"uv": [27, 18], "uv_size": [4.5, 5]}, + "east": {"uv": [26, 7], "uv_size": [5.5, 5]}, + "south": {"uv": [5, 30], "uv_size": [4.5, 5]}, + "west": {"uv": [14, 26], "uv_size": [5.5, 5]}, + "up": {"uv": [0, 27], "uv_size": [4.5, 5.5]}, + "down": {"uv": [27, 17.5], "uv_size": [4.5, -5.5]} + } + }, + { + "origin": [3.65, 19.75, -2.85], + "size": [5.2, 1, 5.7], + "uv": { + "north": {"uv": [0, 33], "uv_size": [5, 1]}, + "east": {"uv": [36, 38], "uv_size": [5.5, 1]}, + "south": {"uv": [0, 34], "uv_size": [5, 1]}, + "west": {"uv": [38, 36], "uv_size": [5.5, 1]}, + "up": {"uv": [20, 26], "uv_size": [5, 5.5]}, + "down": {"uv": [25, 31.5], "uv_size": [5, -5.5]} + } + }, + { + "origin": [9.5, 17.4, -2.35], + "size": [1, 4.35, 4.7], + "pivot": [5.75, 20, 0], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [30, 39], "uv_size": [1, 4.5]}, + "east": {"uv": [30, 23], "uv_size": [4.5, 4.5]}, + "south": {"uv": [31, 39], "uv_size": [1, 4.5]}, + "west": {"uv": [30, 28], "uv_size": [4.5, 4.5]}, + "up": {"uv": [32, 39], "uv_size": [1, 4.5]}, + "down": {"uv": [33, 43.5], "uv_size": [1, -4.5]} + } + } + ] + }, + { + "name": "bipedRightArm", + "pivot": [-4, 22, 0] + }, + { + "name": "armorRightArm", + "parent": "bipedRightArm", + "pivot": [-5, 22, 0], + "cubes": [ + { + "origin": [-10.5, 17.4, -2.35], + "size": [1, 4.35, 4.7], + "pivot": [-5.75, 20, 0], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [31, 39], "uv_size": [-1, 4.5]}, + "east": {"uv": [34.5, 28], "uv_size": [-4.5, 4.5]}, + "south": {"uv": [32, 39], "uv_size": [-1, 4.5]}, + "west": {"uv": [34.5, 23], "uv_size": [-4.5, 4.5]}, + "up": {"uv": [33, 39], "uv_size": [-1, 4.5]}, + "down": {"uv": [34, 43.5], "uv_size": [-1, -4.5]} + } + }, + { + "origin": [-8.75, 19, -2.75], + "size": [4.3, 4.75, 5.5], + "uv": { + "north": {"uv": [31.5, 18], "uv_size": [-4.5, 5]}, + "east": {"uv": [19.5, 26], "uv_size": [-5.5, 5]}, + "south": {"uv": [9.5, 30], "uv_size": [-4.5, 5]}, + "west": {"uv": [31.5, 7], "uv_size": [-5.5, 5]}, + "up": {"uv": [4.5, 27], "uv_size": [-4.5, 5.5]}, + "down": {"uv": [31.5, 17.5], "uv_size": [-4.5, -5.5]} + } + }, + { + "origin": [-8.85, 19.75, -2.85], + "size": [5.2, 1, 5.7], + "uv": { + "north": {"uv": [5, 33], "uv_size": [-5, 1]}, + "east": {"uv": [43.5, 36], "uv_size": [-5.5, 1]}, + "south": {"uv": [5, 34], "uv_size": [-5, 1]}, + "west": {"uv": [41.5, 38], "uv_size": [-5.5, 1]}, + "up": {"uv": [25, 26], "uv_size": [-5, 5.5]}, + "down": {"uv": [30, 31.5], "uv_size": [-5, -5.5]} + } + } + ] + }, + { + "name": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "armorLeftLeg", + "parent": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "armorLeftBoot", + "parent": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "bipedRightLeg", + "pivot": [2, 12, 0] + }, + { + "name": "armorRightLeg", + "parent": "bipedRightLeg", + "pivot": [2, 12, 0] + }, + { + "name": "armorRightBoot", + "parent": "bipedRightLeg", + "pivot": [2, 12, 0] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json b/src/main/resources/assets/superbwarfare/geo/ru_helmet_6b47.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json rename to src/main/resources/assets/superbwarfare/geo/ru_helmet_6b47.geo.json index 1994fe9ff..d6ad1671e 100644 --- a/src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ru_helmet_6b47.geo.json @@ -7,8 +7,8 @@ "texture_width": 64, "texture_height": 64, "visible_bounds_width": 3, - "visible_bounds_height": 3.5, - "visible_bounds_offset": [0, 1.25, 0] + "visible_bounds_height": 4.5, + "visible_bounds_offset": [0, 1.75, 0] }, "bones": [ { @@ -350,7 +350,7 @@ } }, { - "origin": [-5.34064, 30.86764, -2.5], + "origin": [-5.34064, 29.86764, -2.5], "size": [1.1, 1, 5], "pivot": [-4.74064, 31.66764, 0], "rotation": [0, 0, 12], @@ -364,7 +364,7 @@ } }, { - "origin": [4.24064, 30.86764, -2.5], + "origin": [4.24064, 29.86764, -2.5], "size": [1.1, 1, 5], "pivot": [4.74064, 31.66764, 0], "rotation": [0, 0, -12], diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index d2ce48783..06f732af2 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -203,6 +203,7 @@ "item.superbwarfare.raw_silver": "Raw Silver", "item.superbwarfare.ru_helmet_6b47": "Russia 6b47 Helmet", + "item.superbwarfare.ru_chest_6b43": "Russia 6b43 Chest", "item.superbwarfare.ap_bullet": "Ap Bullet", "des.superbwarfare.ap_bullet": "Increased the armor-piercing ratio of bullets", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index d2e56795d..4e8fb4159 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -203,6 +203,7 @@ "item.superbwarfare.raw_silver": "粗银", "item.superbwarfare.ru_helmet_6b47": "俄罗斯6B47头盔", + "item.superbwarfare.ru_chest_6b43": "俄罗斯6B43头防弹胸甲", "item.superbwarfare.ap_bullet": "穿甲弹", "des.superbwarfare.ap_bullet": "增加子弹的穿甲比例", diff --git a/src/main/resources/assets/superbwarfare/textures/armor/ru_chest_6b43.png b/src/main/resources/assets/superbwarfare/textures/armor/ru_chest_6b43.png new file mode 100644 index 000000000..83affe159 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/armor/ru_chest_6b43.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/armor/ru_helmet_6b47.png b/src/main/resources/assets/superbwarfare/textures/armor/ru_helmet_6b47.png index edbe250f0..5b7cf2325 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/armor/ru_helmet_6b47.png and b/src/main/resources/assets/superbwarfare/textures/armor/ru_helmet_6b47.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ru_chest_6b43.png b/src/main/resources/assets/superbwarfare/textures/item/ru_chest_6b43.png new file mode 100644 index 000000000..42a707aa2 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/ru_chest_6b43.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ru_helmet_6b47.png b/src/main/resources/assets/superbwarfare/textures/item/ru_helmet_6b47.png index 562b25565..6481eee05 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/ru_helmet_6b47.png and b/src/main/resources/assets/superbwarfare/textures/item/ru_helmet_6b47.png differ diff --git a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json new file mode 100644 index 000000000..bf5105b3e --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aaa", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:cemented_carbide_ingot" + }, + "b": { + "tag": "forge:dyes/green" + } + }, + "result": { + "item": "superbwarfare:ru_chest_6b43", + "count": 1 + } +} \ No newline at end of file