diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index aaa32487f..d02799552 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-14T03:00:24.7918407 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-10-20T16:11:59.726701 Tags for minecraft:item mod id superbwarfare cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json 295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json @@ -27,6 +27,7 @@ af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/le 3743c2790deca7e779d3e4b82f092de39b446988 data/forge/tags/items/storage_blocks/steel.json 144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json 4d4dfd25a2a749e000e1bb742c2f984d4e094e5d data/superbwarfare/tags/items/cannot_reload.json +5e4b48e22d53f009abdfe557e5911c728ba5f715 data/superbwarfare/tags/items/can_custom_gun.json dff9ff6d6637951191906cb55a210ae5a3ad5cd6 data/superbwarfare/tags/items/extra_one_ammo.json 52598e22974c8da0d2852defe4c9005e1d67744b data/superbwarfare/tags/items/gun.json 62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/can_custom_gun.json b/src/generated/resources/data/superbwarfare/tags/items/can_custom_gun.json new file mode 100644 index 000000000..12a720be8 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/items/can_custom_gun.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:ak_12" + ] +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java index 59ba3e2da..268160001 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java @@ -78,44 +78,59 @@ public class AK12ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } + Player player_ = Minecraft.getInstance().player; + if (player_ != null) { + ItemStack itemStack = player_.getMainHandItem(); + + if (name.equals("holo")) { - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS || itemStack.getOrCreateTag().getInt("scope_type") != 1); } - } - if (name.equals("okp")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); + if (name.equals("flare")) { + if (itemStack.getOrCreateTag().getInt("barrel_type") == 1) { + bone.setPosZ(2.25f); + } + if (itemStack.getOrCreateTag().getDouble("flash_time") == 0 || itemStack.getOrCreateTag().getInt("barrel_type") == 2) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } - if (player != null) { + + if (name.equals("okp")) { bone.setHidden(itemStack.getOrCreateTag().getInt("scope_type") != 1); } + + if (name.equals("normalmag")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 0); + } + + if (name.equals("extendmag")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 1); + } + + if (name.equals("drum")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 2); + } + + if (name.equals("oringinbarrel")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 0); + } + + if (name.equals("huomao")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 1); + } + + if (name.equals("sup")) { + bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 2); + } + } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java index baa9b0fb2..e474a58b1 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -64,36 +64,54 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get()); ModItems.GUNS.getEntries().forEach(registryObject -> this.tag(ModTags.Items.GUN).add(registryObject.get())); + this.tag(ModTags.Items.SMG).add(ModItems.VECTOR.get()); + this.tag(ModTags.Items.HANDGUN).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get()); + this.tag(ModTags.Items.RIFLE).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.SNIPER_RIFLE).add(ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.SENTINEL.get(), ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.SHOTGUN).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.MACHINE_GUN).add(ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.RPK.get(), ModItems.M_60.get()); + this.tag(ModTags.Items.NORMAL_GUN).add(ModItems.ABEKIRI.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.TRACHELIUM.get(), ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.M_870.get(), ModItems.MARLIN.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.OPEN_BOLT).add(ModItems.ABEKIRI.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.USE_HANDGUN_AMMO).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.VECTOR.get()); + this.tag(ModTags.Items.USE_RIFLE_AMMO).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get(), ModItems.RPK.get()); + this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.USE_SNIPER_AMMO).add(ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.SENTINEL.get(), ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.LAUNCHER).add(ModItems.M_79.get(), ModItems.RPG.get(), ModItems.JAVELIN.get()); + this.tag(ModTags.Items.CANNOT_RELOAD).add(ModItems.MINIGUN.get(), ModItems.BOCEK.get()); + this.tag(ModTags.Items.IS_AUTO_WEAPON).add(ModItems.AA_12.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.QBZ_95.get(), ModItems.MK_14.get(), ModItems.AA_12.get(), ModItems.GLOCK_18.get(), ModItems.VECTOR.get(), ModItems.AA_12.get(), ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.M_60.get(), ModItems.RPK.get()); + this.tag(ModTags.Items.EXTRA_ONE_AMMO).add(ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(),ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(),ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.GLOCK_17.get(),ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.CAN_CUSTOM_GUN).add(ModItems.AK_12.get()); + this.tag(ModTags.Items.MILITARY_ARMOR).add(ModItems.RU_CHEST_6B43.get(), ModItems.US_CHEST_IOTV.get()); } diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index a9f1862e5..11ed3eb87 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -192,17 +192,9 @@ public class ClientEventHandler { } // 开火部分 - double weight = stack.getOrCreateTag().getDouble("weight"); + double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("custom_weight"); - double speed = 1; - - if (weight == 0) { - speed = 1.05; - } else if (weight == 1) { - speed = 0.85; - } else if (weight == 2) { - speed = 0.6; - } + double speed = 1 - (0.04 * weight); if (player.getPersistentData().getDouble("noRun") == 0 && player.isSprinting() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS) { cantFireTime = Mth.clamp(cantFireTime + 3 * times, 0, 24); @@ -490,7 +482,10 @@ public class ClientEventHandler { if (!(entity instanceof Player player)) return; ItemStack stack = player.getMainHandItem(); float times = 5 * Minecraft.getInstance().getDeltaFrameTime(); - double speed = stack.getOrCreateTag().getDouble("zoom_speed"); + + double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("custom_weight"); + double speed = 1.5 - (0.07 * weight); + if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS && !notInGame() && drawTime < 0.01 @@ -618,8 +613,21 @@ public class ClientEventHandler { CompoundTag tag = player.getMainHandItem().getOrCreateTag(); float times = (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + int barrelType = tag.getInt("barrel_type"); + + double recoil = 1.8; + + if (barrelType == 1) { + recoil = 0.7; + } else if (barrelType == 2) { + recoil = 1; + } + + float gunRecoilX = (float) tag.getDouble("recoil_x") * 60; + + if (recoilHorizon > 0) { recoilHorizon = recoilHorizon - Math.min(Math.pow(recoilHorizon, 2), 6) * times + recoilY; } else { @@ -640,14 +648,14 @@ public class ClientEventHandler { } } - float newYaw = player.getYRot() - (float) (0.6 * recoilHorizon * pose * times * (0.5 + fireSpread)); + float newYaw = player.getYRot() - (float) (0.6 * recoilHorizon * pose * times * (0.5 + fireSpread) * recoil); player.setYRot(newYaw); player.yRotO = player.getYRot(); double sinRes = 0; if (0 < recoilTime && recoilTime < 0.5) { - float newPitch = player.getXRot() - 0.02f * gunRecoilX * times; + float newPitch = (float) (player.getXRot() - 0.02f * gunRecoilX * times * recoil); player.setXRot(newPitch); player.xRotO = player.getXRot(); } @@ -663,7 +671,7 @@ public class ClientEventHandler { } if (0 < recoilTime && recoilTime < 2.5) { - float newPitch = player.getXRot() - (float) (1.5 * pose * gunRecoilX * (sinRes + Mth.clamp(0.5 - recoilTime, 0, 0.5)) * times * (0.5 + fireSpread)); + float newPitch = player.getXRot() - (float) (1.5 * pose * gunRecoilX * (sinRes + Mth.clamp(0.5 - recoilTime, 0, 0.5)) * times * (0.5 + fireSpread) * recoil); player.setXRot(newPitch); player.xRotO = player.getXRot(); } @@ -842,16 +850,9 @@ public class ClientEventHandler { private static void handleWeaponDraw(LivingEntity entity) { float times = Minecraft.getInstance().getDeltaFrameTime(); ItemStack stack = entity.getMainHandItem(); - double weight = stack.getOrCreateTag().getDouble("weight"); - double speed = 1; + double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("custom_weight"); - if (weight == 0) { - speed = 3; - } else if (weight == 1) { - speed = 2; - } else if (weight == 2) { - speed = 1.2; - } + double speed = 3.2 - (0.13 * weight); drawTime = Math.max(drawTime - Math.max(0.2 * speed * times * drawTime, 0.0008), 0); } diff --git a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java index bfdaecfe8..b53b62c84 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java @@ -150,24 +150,27 @@ public class GunEventHandler { } } - SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + "_fire_1p")); + float soundRadius = (float) (stack.getOrCreateTag().getDouble("SoundRadius") * stack.getOrCreateTag().getDouble("CustomSoundRadius")); + + + SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + (stack.getOrCreateTag().getInt("barrel_type") == 2 ? "_fire_1p_s" : "_fire_1p"))); if (sound1p != null && player instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, sound1p, 2f, 1f); } - SoundEvent sound3p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + "_fire_3p")); + SoundEvent sound3p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + (stack.getOrCreateTag().getInt("barrel_type") == 2 ? "_fire_3p_s" : "_fire_3p"))); if (sound3p != null) { - player.level().playSound(null, player.getOnPos(), sound3p, SoundSource.PLAYERS, (float) stack.getOrCreateTag().getDouble("SoundRadius") * 0.2f, 1f); + player.level().playSound(null, player.getOnPos(), sound3p, SoundSource.PLAYERS, soundRadius * 0.2f, 1f); } - SoundEvent soundFar = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + "_far")); + SoundEvent soundFar = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + (stack.getOrCreateTag().getInt("barrel_type") == 2 ? "_far_s" : "_far"))); if (soundFar != null) { - player.level().playSound(null, player.getOnPos(), soundFar, SoundSource.PLAYERS, (float) stack.getOrCreateTag().getDouble("SoundRadius") * 0.5f, 1f); + player.level().playSound(null, player.getOnPos(), soundFar, SoundSource.PLAYERS, soundRadius * 0.5f, 1f); } - SoundEvent soundVeryFar = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + "_veryfar")); + SoundEvent soundVeryFar = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, name + (stack.getOrCreateTag().getInt("barrel_type") == 2 ? "_veryfar_s" : "_veryfar"))); if (soundVeryFar != null) { - player.level().playSound(null, player.getOnPos(), soundVeryFar, SoundSource.PLAYERS, (float) stack.getOrCreateTag().getDouble("SoundRadius"), 1f); + player.level().playSound(null, player.getOnPos(), soundVeryFar, SoundSource.PLAYERS, soundRadius, 1f); } } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java index e67458245..de115ead7 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModPerks.java @@ -53,7 +53,7 @@ public class ModPerks { public static final RegistryObject SUBSISTENCE = FUNC_PERKS.register("subsistence", () -> new Perk("subsistence", Perk.Type.FUNCTIONAL)); public static final RegistryObject FIELD_DOCTOR = FUNC_PERKS.register("field_doctor", () -> new Perk("field_doctor", Perk.Type.FUNCTIONAL)); public static final RegistryObject SUPER_RECHARGE = FUNC_PERKS.register("super_recharge", () -> new Perk("super_recharge", Perk.Type.FUNCTIONAL)); - public static final RegistryObject DIMENSION_MAGAZINE = FUNC_PERKS.register("dimension_magazine", () -> new Perk("dimension_magazine", Perk.Type.FUNCTIONAL)); +// public static final RegistryObject DIMENSION_MAGAZINE = FUNC_PERKS.register("dimension_magazine", () -> new Perk("dimension_magazine", Perk.Type.FUNCTIONAL)); /** * Damage Perks diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java index 5aed1ee90..efe438a21 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModSounds.java @@ -77,8 +77,12 @@ public class ModSounds { public static final RegistryObject AK_12_FIRE_1P = REGISTRY.register("ak_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_fire_1p"))); public static final RegistryObject AK_12_FIRE_3P = REGISTRY.register("ak_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_fire_3p"))); + public static final RegistryObject AK_12_FIRE_1P_S = REGISTRY.register("ak_12_fire_1p_s", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_fire_1p_s"))); + public static final RegistryObject AK_12_FIRE_3P_S = REGISTRY.register("ak_12_fire_3p_s", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_fire_3p_s"))); public static final RegistryObject AK_12_FAR = REGISTRY.register("ak_12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_far"))); public static final RegistryObject AK_12_VERYFAR = REGISTRY.register("ak_12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_veryfar"))); + public static final RegistryObject AK_12_FAR_S = REGISTRY.register("ak_12_far_s", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_far_s"))); + public static final RegistryObject AK_12_VERYFAR_S = REGISTRY.register("ak_12_veryfar_s", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_veryfar_s"))); public static final RegistryObject AK_12_RELOAD_NORMAL = REGISTRY.register("ak_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_reload_normal"))); public static final RegistryObject AK_12_RELOAD_EMPTY = REGISTRY.register("ak_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(ModUtils.MODID, "ak_12_reload_empty"))); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModTags.java b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java index 0ee66ee3a..f68173e33 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModTags.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java @@ -31,6 +31,7 @@ public class ModTags { public static final TagKey OPEN_BOLT = tag("open_bolt"); public static final TagKey CANNOT_RELOAD = tag("cannot_reload"); public static final TagKey IS_AUTO_WEAPON = tag("is_auto_weapon"); + public static final TagKey CAN_CUSTOM_GUN = tag("can_custom_gun"); public static final TagKey MILITARY_ARMOR = tag("military_armor"); public static final TagKey MILITARY_ARMOR_HEAVY = tag("military_armor_heavy"); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java index 24a3c6b90..bff81f112 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java @@ -1,5 +1,7 @@ package net.mcreator.superbwarfare.item.gun; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModPerks; @@ -15,7 +17,11 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -29,6 +35,7 @@ import net.minecraftforge.fml.common.Mod; import java.util.List; import java.util.Set; +import java.util.UUID; @Mod.EventBusSubscriber public abstract class GunItem extends Item { @@ -48,13 +55,6 @@ public abstract class GunItem extends Item { return; } -// if (entity instanceof Player player) { -// player.displayClientMessage(Component.literal(new java.text.DecimalFormat("##.##").format(itemstack.getOrCreateTag().getInt("scope_type")) -// + " " + new java.text.DecimalFormat("##.#").format(itemstack.getOrCreateTag().getInt("barrel_type")) -// + " " + new java.text.DecimalFormat("##.#").format(itemstack.getOrCreateTag().getInt("magazine_type")) -// + " " + new java.text.DecimalFormat("##.#").format(itemstack.getOrCreateTag().getInt("stock_type"))), true); -// } - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { GunsTool.initGun(level, itemstack, this.getDescriptionId().substring(this.getDescriptionId().lastIndexOf('.') + 1)); GunsTool.genUUID(itemstack); @@ -84,6 +84,7 @@ public abstract class GunItem extends Item { } handleGunPerks(itemstack); + handleGunAttachment(itemstack); if ((itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) && itemstack.getOrCreateTag().getInt("ammo") > itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag") + 1) || (!itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) && itemstack.getOrCreateTag().getInt("ammo") > itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag")) @@ -118,6 +119,18 @@ public abstract class GunItem extends Item { return false; } + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { + Multimap map = super.getAttributeModifiers(slot, stack); + UUID uuid = new UUID(slot.toString().hashCode(), 0); + if (slot == EquipmentSlot.MAINHAND) { + map = HashMultimap.create(map); + map.put(Attributes.MOVEMENT_SPEED, + new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.01f - 0.005f * (stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("custom_weight")), AttributeModifier.Operation.MULTIPLY_BASE)); + } + return map; + } + @Override public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { TooltipTool.addGunTips(list, stack); @@ -173,14 +186,56 @@ public abstract class GunItem extends Item { } } - int ctmMag = stack.getOrCreateTag().getInt("mag"); - if (stack.is(ModTags.Items.USE_SNIPER_AMMO)) { - stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.1 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); - } else if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) { - stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.075 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); - } else { - stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.15 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); +// int ctmMag = stack.getOrCreateTag().getInt("mag"); +// if (stack.is(ModTags.Items.USE_SNIPER_AMMO)) { +// stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.1 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); +// } else if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) { +// stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.075 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); +// } else { +// stack.getOrCreateTag().putInt("customMag", (int) (Math.ceil(0.15 * PerkHelper.getItemPerkLevel(ModPerks.DIMENSION_MAGAZINE.get(), stack) * ctmMag))); +// } + } + + private void handleGunAttachment(ItemStack stack) { + + int scopeType = stack.getOrCreateTag().getInt("scope_type"); + int barrelType = stack.getOrCreateTag().getInt("barrel_type"); + int magType = stack.getOrCreateTag().getInt("magazine_type"); + int stockType = stack.getOrCreateTag().getInt("stock_type"); + + double ScopeWeight = 0; + double BarrelWeight = 0; + double MagWeight = 0; + double StockWeight = 0; + + if (scopeType == 1) { + ScopeWeight = 0.5; + } else if (scopeType == 2) { + ScopeWeight = 1; + } else if (scopeType == 3) { + ScopeWeight = 2; } + + if (barrelType == 1) { + BarrelWeight = 1; + } else if (magType == 2) { + BarrelWeight = 2; + } + + if (magType == 1) { + MagWeight = 1.5; + } else if (magType == 2) { + MagWeight = 3; + } + + if (stockType == 1) { + StockWeight = -2; + } else if (stockType == 2) { + ScopeWeight = 2; + } + + stack.getOrCreateTag().putDouble("custom_weight", ScopeWeight + BarrelWeight + MagWeight + StockWeight); + stack.getOrCreateTag().putDouble("CustomSoundRadius", barrelType == 2 ? 0.25 : 1); } public boolean canApplyPerk(Perk perk) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock17Item.java index 4fc40d959..e65aa1f84 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock17Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.handgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Glock17ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -41,7 +35,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { @@ -129,18 +122,6 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.01f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.GLOCK_17_RELOAD_EMPTY.get(), ModSounds.GLOCK_17_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock18Item.java index 607982ea3..a0d43b36a 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Glock18Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.handgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Glock18ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { @@ -129,18 +122,6 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.01f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of( diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/M1911Item.java index 71921705f..bbee7d901 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/M1911Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.handgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M1911ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -41,7 +35,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M1911Item extends GunItem implements GeoItem, AnimatedItem { @@ -130,18 +123,6 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.02f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of( diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Trachelium.java index f1c9b54b6..47fae64e9 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/handgun/Trachelium.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.handgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.TracheliumItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -26,11 +24,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; @@ -46,7 +40,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Trachelium extends GunItem implements GeoItem, AnimatedItem { @@ -120,18 +113,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.02f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List list, TooltipFlag flag) { list.add(Component.translatable("des.superbwarfare.trachelium_1").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/JavelinItem.java index 5863d59fd..0e266c632 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/JavelinItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.launcher; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.JavelinItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -25,11 +23,7 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -47,7 +41,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class JavelinItem extends GunItem implements GeoItem, AnimatedItem { @@ -118,18 +111,6 @@ public class JavelinItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.14f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static int getAmmoCount(Player player) { int count = 0; for (var inv : player.getInventory().items) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/M79Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/M79Item.java index d320499e3..27d13ddd7 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/M79Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/M79Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.launcher; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M79ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -25,11 +23,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; @@ -45,7 +39,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M79Item extends GunItem implements GeoItem, AnimatedItem { @@ -119,18 +112,6 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { data.add(idleController); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static int getAmmoCount(Player player) { int count = 0; for (var inv : player.getInventory().items) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/RpgItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/RpgItem.java index 60d8926e3..b16a34515 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/RpgItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/launcher/RpgItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.launcher; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.RpgItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -25,11 +23,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; @@ -45,7 +39,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class RpgItem extends GunItem implements GeoItem, AnimatedItem { @@ -116,18 +109,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.11f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static int getAmmoCount(Player player) { int count = 0; for (var inv : player.getInventory().items) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java index 451a06bac..d9d3c2754 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.machinegun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.DevotionItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -43,7 +37,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { @@ -112,18 +105,6 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.DEVOTION_RELOAD_EMPTY.get(), ModSounds.DEVOTION_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java index be6d86b20..5cb64d770 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.machinegun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M60ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -43,7 +37,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M60Item extends GunItem implements GeoItem, AnimatedItem { @@ -134,18 +127,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.M_60_RELOAD_EMPTY.get(), ModSounds.M_60_RELOAD_NORMAL.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.08f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.M_60.get()); GunsTool.initCreativeGun(stack, ModItems.M_60.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/MinigunItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/MinigunItem.java index 3872982ee..dc8f3814a 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/MinigunItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/MinigunItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.machinegun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.MinigunItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -28,12 +26,8 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -49,7 +43,6 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; -import java.util.UUID; import java.util.function.Consumer; public class MinigunItem extends GunItem implements GeoItem, AnimatedItem { @@ -140,18 +133,6 @@ public class MinigunItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.2f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/RpkItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/RpkItem.java index 29b3d074b..fdaa5d6fb 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/RpkItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/RpkItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.machinegun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.RpkItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -43,7 +37,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class RpkItem extends GunItem implements GeoItem, AnimatedItem { @@ -113,18 +106,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.RPK_RELOAD_EMPTY.get(), ModSounds.RPK_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java index 2e87b7708..ce0ecda08 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.AK12ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,14 +21,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; +import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -42,7 +38,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class AK12Item extends GunItem implements GeoItem, AnimatedItem { @@ -120,18 +115,6 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.AK_12.get()); GunsTool.initCreativeGun(stack, ModItems.AK_12.getId().getPath()); @@ -142,6 +125,41 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { public void setAnimationProcedure(String procedure) { } + @Override + public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { + super.inventoryTick(stack, world, entity, slot, selected); + + int scopeType = stack.getOrCreateTag().getInt("scope_type"); + int barrelType = stack.getOrCreateTag().getInt("barrel_type"); + int magType = stack.getOrCreateTag().getInt("magazine_type"); + int stockType = stack.getOrCreateTag().getInt("stock_type"); + + int customMag = 0; + + if (magType == 1) { + customMag = 15; + } else if (magType == 2) { + customMag = 45; + } + +// if (scopeType == 1) { +// +// } else if (scopeType == 2) { +// +// } else if (scopeType == 3) { +// +// } + +// if (entity instanceof Player player) { +// player.displayClientMessage(Component.literal(new java.text.DecimalFormat("##.##").format(stack.getOrCreateTag().getInt("scope_type")) +// + " " + new java.text.DecimalFormat("##.#").format(barrelType) +// + " " + new java.text.DecimalFormat("##.#").format(magType) +// + " " + new java.text.DecimalFormat("##.#").format(stockType)), true); +// } + + stack.getOrCreateTag().putInt("customMag", customMag); + } + @Override public ResourceLocation getGunIcon() { return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/ak12_icon.png"); 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 4b44755ab..4467fcb04 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 @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.AK47ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class AK47Item extends GunItem implements GeoItem, AnimatedItem { @@ -116,18 +109,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.AK_47.get()); GunsTool.initCreativeGun(stack, ModItems.AK_47.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java index 3a37aade1..79532171b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Hk416Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Hk416ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { @@ -111,18 +104,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.035f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.HK_416_RELOAD_EMPTY.get(), ModSounds.HK_416_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java index db8a935f4..cd402b4b8 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/M4Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M4ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M4Item extends GunItem implements GeoItem, AnimatedItem { @@ -111,18 +104,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.M_4_RELOAD_EMPTY.get(), ModSounds.M_4_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java index b8f174ca2..1f5ea47e6 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -44,7 +38,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { @@ -155,18 +148,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.MARLIN_LOOP.get(), ModSounds.MARLIN_PREPARE.get(), ModSounds.MARLIN_END.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.MARLIN.get()); GunsTool.initCreativeGun(stack, ModItems.MARLIN.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java index 7cb49d566..1dc847106 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Mk14Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Mk14ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { @@ -116,18 +109,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.MK_14_RELOAD_EMPTY.get(), ModSounds.MK_14_RELOAD_NORMAL.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.MK_14.get()); GunsTool.initCreativeGun(stack, ModItems.MK_14.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java index 0bf0be794..97058abee 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Qbz95ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -41,7 +35,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { @@ -110,18 +103,6 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.035f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.QBZ_95_RELOAD_EMPTY.get(), ModSounds.QBZ_95_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java index 9e9d98455..84d14ef34 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/SksItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.rifle; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SksItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class SksItem extends GunItem implements GeoItem, AnimatedItem { @@ -116,18 +109,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.SKS.get()); GunsTool.initCreativeGun(stack, ModItems.SKS.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/Aa12Item.java index 46d3bdc0a..60c9e7864 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.shotgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Aa12ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -26,11 +24,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -49,7 +43,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { @@ -144,18 +137,6 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List list, TooltipFlag flag) { TooltipTool.addShotgunTips(list, stack); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/AbekiriItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/AbekiriItem.java index dc8a9e99e..069283a3d 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/AbekiriItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/AbekiriItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.shotgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.AbekiriItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -24,11 +22,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; @@ -44,7 +38,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem { @@ -118,18 +111,6 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.02f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List list, TooltipFlag flag) { TooltipTool.addShotgunTips(list, stack); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java index 572c3691a..04f2d58aa 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.shotgun; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M870ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -24,11 +22,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; @@ -44,7 +38,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M870Item extends GunItem implements GeoItem, AnimatedItem { @@ -140,18 +133,6 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.M_870_PREPARE_LOAD.get(), ModSounds.M_870_LOOP.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.04f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.M_870.get()); GunsTool.initCreativeGun(stack, ModItems.M_870.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/smg/VectorItem.java index 41afc55e9..0ee518de0 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/smg/VectorItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.smg; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.VectorItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class VectorItem extends GunItem implements GeoItem, AnimatedItem { @@ -123,18 +116,6 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.VECTOR_RELOAD_NORMAL.get(), ModSounds.VECTOR_RELOAD_EMPTY.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.03f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public void setAnimationProcedure(String procedure) { } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/HuntingRifleItem.java index 59150de7d..a145f57a6 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem { @@ -112,18 +105,6 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem { } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.HUNTING_RIFLE.get()); GunsTool.initCreativeGun(stack, ModItems.HUNTING_RIFLE.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java index 3a746b926..de5884cb7 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.K98ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -41,7 +35,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class K98Item extends GunItem implements GeoItem, AnimatedItem { @@ -143,18 +136,6 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of( diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/M98bItem.java index bead421c5..58caed6e1 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/M98bItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.M98bItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class M98bItem extends GunItem implements GeoItem, AnimatedItem { @@ -128,18 +121,6 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.07f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of(ModSounds.M_98B_RELOAD_EMPTY.get(), ModSounds.M_98B_RELOAD_NORMAL.get(), ModSounds.M_98B_BOLT.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java index 68e90994e..c49da8ed6 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.MosinNagantItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -41,7 +35,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { @@ -143,18 +136,6 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.05f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public Set getReloadSound() { return Set.of( diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/Ntw20Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/Ntw20Item.java index 010936cd1..a87f9736c 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/Ntw20Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/Ntw20Item.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.Ntw20Renderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem { @@ -138,18 +131,6 @@ public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.15f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.NTW_20.get()); GunsTool.initCreativeGun(stack, ModItems.NTW_20.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SentinelItem.java index d635affa6..860f04061 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SentinelItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SentinelItemRenderer; import net.mcreator.superbwarfare.energy.ItemEnergyProvider; @@ -28,11 +26,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -52,7 +46,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Supplier; @@ -219,18 +212,6 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { ); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.SENTINEL.get()); GunsTool.initCreativeGun(stack, ModItems.SENTINEL.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SvdItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SvdItem.java index c773bfb18..8acd10951 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SvdItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/SvdItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.sniper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.SvdItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -22,11 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; public class SvdItem extends GunItem implements GeoItem, AnimatedItem { @@ -116,18 +109,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.SVD_RELOAD_EMPTY.get(), ModSounds.SVD_RELOAD_NORMAL.get()); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.06f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(ModItems.SVD.get()); GunsTool.initCreativeGun(stack, ModItems.SVD.getId().getPath()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/special/BocekItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/special/BocekItem.java index 7b339c0c6..3c4e5c71f 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/special/BocekItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/special/BocekItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.special; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.BocekItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; @@ -23,11 +21,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; @@ -42,7 +36,6 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; -import java.util.UUID; import java.util.function.Consumer; public class BocekItem extends GunItem implements GeoItem, AnimatedItem { @@ -98,18 +91,6 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { data.add(idleController); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.03f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public AnimatableInstanceCache getAnimatableInstanceCache() { return this.cache; diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/special/TaserItem.java index 6812b7a9d..043b83cd2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/special/TaserItem.java @@ -1,7 +1,5 @@ package net.mcreator.superbwarfare.item.gun.special; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.TaserItemRenderer; import net.mcreator.superbwarfare.energy.ItemEnergyProvider; @@ -28,11 +26,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; @@ -50,7 +44,6 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Supplier; @@ -158,18 +151,6 @@ public class TaserItem extends GunItem implements GeoItem, AnimatedItem { data.add(idleController); } - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { - Multimap map = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID(slot.toString().hashCode(), 0); - if (slot == EquipmentSlot.MAINHAND) { - map = HashMultimap.create(map); - map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, ModUtils.ATTRIBUTE_MODIFIER, -0.01f, AttributeModifier.Operation.MULTIPLY_BASE)); - } - return map; - } - @Override public AnimatableInstanceCache getAnimatableInstanceCache() { return this.cache; diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java index 3ee9cb709..d27e728c2 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java @@ -37,7 +37,7 @@ public class EditMessage { ItemStack stack = player.getMainHandItem(); - if (stack.is(ModTags.Items.GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) { + if (stack.is(ModTags.Items.CAN_CUSTOM_GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) { switch (type) { case 0: stack.getOrCreateTag().putInt("scope_type", stack.getOrCreateTag().getInt("scope_type") + 1); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/EditModeMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/EditModeMessage.java index cab276feb..2481c07b4 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/EditModeMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/EditModeMessage.java @@ -44,7 +44,7 @@ public class EditModeMessage { ItemStack mainHandItem = player.getMainHandItem(); var cap = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null); - if (mainHandItem.is(ModTags.Items.GUN)) { + if (mainHandItem.is(ModTags.Items.CAN_CUSTOM_GUN)) { cap.ifPresent(capability -> { capability.edit = !cap.orElse(new ModVariables.PlayerVariables()).edit; capability.syncPlayerVariables(player); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java index 8a55c241f..55114a604 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireMessage.java @@ -272,7 +272,7 @@ public class FireMessage { spread = 0.01f; damage = 0.08333333 * tag.getDouble("damage") * tag.getDouble("speed") * perkDamage(heldItem); } else { - spread = perk instanceof AmmoPerk ammoPerk && ammoPerk.slug ? 1 : 2.5f; + spread = perk instanceof AmmoPerk ammoPerk && ammoPerk.slug ? 0.5f : 2.5f; damage = (perk instanceof AmmoPerk ammoPerk && ammoPerk.slug ? 0.08333333 : 0.008333333) * tag.getDouble("damage") * tag.getDouble("speed") * perkDamage(heldItem); } @@ -369,7 +369,6 @@ public class FireMessage { boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom; double spread = stack.getOrCreateTag().getDouble("spread"); - double zoomSpread = stack.getOrCreateTag().getDouble("zoomSpread"); Level level = player.level(); if (!level.isClientSide()) { @@ -377,7 +376,7 @@ public class FireMessage { taserBulletProjectile.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); taserBulletProjectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), - (float) (zoom ? zoomSpread : spread)); + (float) (zoom ? 0.1 : spread)); level.addFreshEntity(taserBulletProjectile); } @@ -404,7 +403,6 @@ public class FireMessage { if (!player.getCooldowns().isOnCooldown(stack.getItem()) && stack.getOrCreateTag().getInt("ammo") > 0) { boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom; double spread = stack.getOrCreateTag().getDouble("spread"); - double zoomSpread = stack.getOrCreateTag().getDouble("zoomSpread"); Level level = player.level(); if (!level.isClientSide()) { @@ -419,7 +417,7 @@ public class FireMessage { gunGrenadeEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); gunGrenadeEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), - (float) (zoom ? zoomSpread : spread)); + (float) (zoom ? 0.1 : spread)); level.addFreshEntity(gunGrenadeEntity); } @@ -458,7 +456,6 @@ public class FireMessage { if (!tag.getBoolean("reloading") && !player.getCooldowns().isOnCooldown(stack.getItem()) && tag.getInt("ammo") > 0) { boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom; double spread = stack.getOrCreateTag().getDouble("spread"); - double zoomSpread = stack.getOrCreateTag().getDouble("zoomSpread"); if (!level.isClientSide()) { RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, @@ -472,7 +469,7 @@ public class FireMessage { rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"), - (float) (zoom ? zoomSpread : spread)); + (float) (zoom ? 0.1 : spread)); level.addFreshEntity(rocketEntity); } diff --git a/src/main/java/net/mcreator/superbwarfare/perk/PerkHelper.java b/src/main/java/net/mcreator/superbwarfare/perk/PerkHelper.java index 23ca19abc..ab27241d3 100644 --- a/src/main/java/net/mcreator/superbwarfare/perk/PerkHelper.java +++ b/src/main/java/net/mcreator/superbwarfare/perk/PerkHelper.java @@ -284,7 +284,7 @@ public class PerkHelper { } }; - public static final Predicate MAGAZINE_PERKS = perk -> perk == ModPerks.DIMENSION_MAGAZINE.get(); + public static final Predicate MAGAZINE_PERKS = perk -> false; public static final Predicate LAUNCHER_PERKS = perk -> perk == ModPerks.MONSTER_HUNTER.get(); diff --git a/src/main/resources/assets/superbwarfare/animations/rpk.animation.json b/src/main/resources/assets/superbwarfare/animations/rpk.animation.json index 87666d1ad..91e0f40cd 100644 --- a/src/main/resources/assets/superbwarfare/animations/rpk.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/rpk.animation.json @@ -7,150 +7,16 @@ }, "animation.ak47.run": { "loop": true, - "animation_length": 0.8, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [-14.82442, -57.81517, 38.62375] - }, - "0.2": { - "vector": [-16.82442, -57.81517, 38.62375], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-14.82442, -57.81517, 38.62375], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [-12.82442, -57.81517, 38.62375], - "easing": "easeInSine" - }, - "0.8": { - "vector": [-14.82442, -57.81517, 38.62375] - } - }, - "position": { - "0.0": { - "vector": [2.5, -3, 0] - }, - "0.2": { - "vector": [0.75, -2.5, 0], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-0.5, -3, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0.75, -2.5, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [2.5, -3, 0] - } - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [-0.3, -0.3, 0.3] - }, - "0.2": { - "vector": [0.3, 0, -0.3] - }, - "0.4": { - "vector": [-0.3, 0.3, 0.3] - }, - "0.6": { - "vector": [0.3, 0, -0.3] - }, - "0.8": { - "vector": [-0.3, -0.3, 0.3] - } - } - } - } + "animation_length": 0.8 }, "animation.ak47.run_fast": { "loop": true, "animation_length": 0.7, "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [-71.5441, 21.19359, 4.89071] - }, - "0.175": { - "vector": [-70.25009, 19.57377, 12.8696], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-71.08194, 19.41184, 6.64209], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-72.13904, 19.33922, 0.51567], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-71.72375, 21.2133, 4.79361] - } - }, - "position": { - "0.0": { - "vector": [-4.86372, 2.30127, -0.0236], - "easing": "easeOutSine" - }, - "0.175": { - "vector": [-6.18, 4.52384, -1.07544], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-7.20607, 2.2688, -0.16467], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-6.28238, 4.47846, -1.06191], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-4.86372, 2.30127, -0.0236], - "easing": "easeOutSine" - } - } - }, "magazine2": { "scale": { "vector": [0, 0, 0] } - }, - "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [-0.3, -0.3, 0.3] - }, - "0.175": { - "vector": [0.3, 0, -0.3] - }, - "0.35": { - "vector": [-0.3, 0.3, 0.3] - }, - "0.525": { - "vector": [0.3, 0, -0.3] - }, - "0.7": { - "vector": [-0.3, -0.3, 0.3] - } - } } } }, @@ -161,535 +27,6 @@ "animation.ak47.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 4.75, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [2.2309, 1.32745, 5.98455] - }, - "0.3667": { - "vector": [-14.01, 2.98, -9.37], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [-12.25012, 1.71575, -15.23679] - }, - "0.5333": { - "vector": [-13.67625, 0.53753, -20.43357] - }, - "0.6167": { - "vector": [-17.27359, 1.63911, -16.2464] - }, - "0.7167": { - "vector": [-15.02119, 0.16741, -19.71243] - }, - "0.8167": { - "vector": [-12.36586, -0.75486, -21.85957] - }, - "0.9": { - "vector": [-3.42984, -0.39385, -15.87027] - }, - "1.0667": { - "vector": [-12.35117, -0.9689, -22.83651] - }, - "1.2333": { - "vector": [-16.3817, -0.19101, -19.94063] - }, - "1.4": { - "vector": [-11.33329, -1.14849, -23.82073] - }, - "1.6167": { - "vector": [-13.24, -1.53, -25.8] - }, - "2.05": { - "vector": [-10.66408, -4.02619, -38.55877], - "easing": "easeInSine" - }, - "2.1333": { - "vector": [-13.44223, -4.57576, -41.51634] - }, - "2.2167": { - "vector": [-10.27854, -4.93547, -43.49053] - }, - "2.3": { - "vector": [-18.26205, -7.61546, -53.1428] - }, - "2.45": { - "vector": [-17.01373, -1.99374, -36.83067] - }, - "2.5667": { - "vector": [-18.47706, -3.15515, -37.51576] - }, - "2.6333": { - "vector": [-22.58725, -5.90434, -44.71539] - }, - "2.7833": { - "vector": [-15.52787, -3.69401, -35.14493] - }, - "2.9333": { - "vector": [-19.28692, -1.27625, -26.04936] - }, - "3.2167": { - "vector": [-11.33509, 4.42358, -4.47176] - }, - "3.4833": { - "vector": [-8.35505, 5.94946, 0.83424] - }, - "3.6667": { - "vector": [-11.41291, 2.19732, -4.17931], - "easing": "easeInExpo" - }, - "3.8167": { - "vector": [-7.46782, 7.08352, -2.53279], - "easing": "easeInOutSine" - }, - "4.0": { - "vector": [-5.58174, 2.97982, 0.50489] - }, - "4.2": { - "vector": [-3.87833, -0.57622, -1.86809] - }, - "4.3667": { - "vector": [0, 0, -2] - }, - "4.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3167": { - "vector": [-1.1, 0.3, 0.9], - "easing": "easeInQuad" - }, - "0.45": { - "vector": [-1.1, 0, 0.2], - "easing": "easeOutSine" - }, - "0.5333": { - "vector": [-1.13656, 0.11648, 0.43653] - }, - "0.65": { - "vector": [-1.11162, 0.03023, 0.28738] - }, - "0.8167": { - "vector": [-0.96981, -0.32115, 0.20478] - }, - "0.9": { - "vector": [-0.75494, -0.64671, -0.12279] - }, - "0.9833": { - "vector": [-1.1, 0, 0.3] - }, - "1.15": { - "vector": [-0.95347, -0.36221, 0.21435] - }, - "1.3167": { - "vector": [-0.84854, -0.60732, 0.04107] - }, - "1.4833": { - "vector": [-0.88449, -0.56099, 0.25543] - }, - "1.7333": { - "vector": [-0.79, -0.44, 0.2] - }, - "2.05": { - "vector": [-0.89507, -0.06932, 0.3549] - }, - "2.1333": { - "vector": [-1.16342, 0.21638, 0.44269] - }, - "2.2167": { - "vector": [-1.03823, 0.0689, 0.38061] - }, - "2.3": { - "vector": [-1.27235, 0.41208, 0.43655], - "easing": "easeInSine" - }, - "2.4167": { - "vector": [-0.8044, 0.0239, 0.36148], - "easing": "easeOutSine" - }, - "2.5": { - "vector": [-0.55391, 0.01857, 0.28596], - "easing": "easeInSine" - }, - "2.5667": { - "vector": [-0.53, 0.02, 0.27] - }, - "2.7": { - "vector": [-0.73155, 0.42427, 0.66866] - }, - "2.85": { - "vector": [-0.07114, -0.36547, 0.29091] - }, - "3.0": { - "vector": [-0.27874, -0.05921, 0.2782] - }, - "3.1667": { - "vector": [-0.33, 0.01, -0.36] - }, - "3.25": { - "vector": [-0.58027, -0.15396, -0.38202] - }, - "3.4167": { - "vector": [-0.47658, -0.08535, -0.37266] - }, - "3.5667": { - "vector": [-0.27646, -0.46182, 1.0652], - "easing": "easeInQuart" - }, - "3.6667": { - "vector": [-0.27646, -0.46182, 1.0652], - "easing": "easeInQuart" - }, - "3.8833": { - "vector": [-0.33, 0.01, -0.36] - }, - "4.0833": { - "vector": [-0.17, 0.21, -0.06] - }, - "4.2833": { - "vector": [0, 0, -0.32] - }, - "4.4167": { - "vector": [0, 0, -0.3] - }, - "4.5": { - "vector": [0, 0, 0] - } - } - }, - "bolt": { - "position": { - "3.25": { - "vector": [0, 0, 0] - }, - "3.3167": { - "vector": [0, 0, 0] - }, - "3.5667": { - "vector": [0, 0, 2], - "easing": "easeInCirc" - }, - "3.6667": { - "vector": [0, 0, 2], - "easing": "easeInCirc" - }, - "3.85": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.8": { - "vector": [0, 0, 0] - }, - "0.8667": { - "vector": [0, 0, 0] - }, - "1.2333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.4667": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.9667": { - "vector": [-21, 0, -11] - }, - "2.0667": { - "vector": [-14, 0, -5.83], - "easing": "easeInSine" - }, - "2.2667": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.8": { - "vector": [0, 0, 0] - }, - "0.8667": { - "vector": [0, -2.85, 0] - }, - "1.2333": { - "vector": [8, -15, 0], - "easing": "easeInElastic" - }, - "1.4667": { - "vector": [0, -15, 0], - "easing": "easeInElastic" - }, - "1.9667": { - "vector": [0.21094, -0.91719, -0.23516], - "easing": "easeInSine" - }, - "2.0667": { - "vector": [-0.06, -0.19422, -0.47], - "easing": "easeInSine" - }, - "2.1833": { - "vector": [0.07, -0.42625, -0.09719], - "easing": "easeInSine" - }, - "2.2667": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.3167": { - "vector": [0, 0, 0] - }, - "0.4333": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "linear" - }, - "0.7": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "easeInElastic" - }, - "2.3833": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "easeInElastic" - }, - "2.5667": { - "vector": [15.98147, 57.29761, 1.4882], - "easing": "easeInElastic" - }, - "2.6833": { - "vector": [17.10695, 28.59421, -18.3759], - "easing": "easeInElastic" - }, - "2.7333": { - "vector": [17.10695, 28.59421, -18.3759], - "easing": "easeInElastic" - }, - "2.8": { - "vector": [21.19557, 27.6615, -18.74727], - "easing": "easeInElastic" - }, - "3.0833": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.3167": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-2.29096, -0.9323, 6.56616] - }, - "0.6167": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.3833": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.5667": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.6833": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.7333": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.95": { - "vector": [-1.18452, -0.34374, 2.77435] - }, - "3.0833": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "3.25": { - "vector": [0, 0, 0] - }, - "3.35": { - "vector": [-8.2821, -20.957, 9.9358] - }, - "3.45": { - "vector": [1.9598, -11.1758, -2.65919] - }, - "3.55": { - "vector": [1.9598, -11.1758, -2.65919] - }, - "3.65": { - "vector": [1.9598, -11.1758, -2.65919] - }, - "3.75": { - "vector": [1.9598, -11.1758, -2.65919] - }, - "4.05": { - "vector": [-19.2821, -20.957, 9.9358] - }, - "4.15": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "3.25": { - "vector": [0, 0, 0] - }, - "3.35": { - "vector": [1.6, 2.9, 0] - }, - "3.45": { - "vector": [0.5, 1.9, -5.3] - }, - "3.55": { - "vector": [0.5, 1.9, -1] - }, - "3.65": { - "vector": [0.5, 1.9, -1] - }, - "3.75": { - "vector": [0.5, 1.9, -1] - }, - "3.95": { - "vector": [0.5, 3.5, -5.1] - }, - "4.05": { - "vector": [1.6, 2.9, 0] - }, - "4.15": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2167": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "0.4333": { - "vector": [0, 0, -0.5] - }, - "0.6": { - "vector": [0, 0, 1] - }, - "1.0": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.05": { - "vector": [2, 1, -2], - "easing": "easeInSine" - }, - "1.1667": { - "vector": [-1, -0.5, 1.5] - }, - "1.3": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "1.6833": { - "vector": [-0.1, 0, -0.5] - }, - "2.0167": { - "vector": [0.5, 0, 2], - "easing": "easeInElastic" - }, - "2.1833": { - "vector": [-0.5, 0, 2.2], - "easing": "linear" - }, - "2.2667": { - "vector": [1.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.3667": { - "vector": [-0.4, 0.4, -0.2], - "easing": "easeOutSine" - }, - "2.55": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "2.6": { - "vector": [2, 1, -2], - "easing": "easeInSine" - }, - "2.7167": { - "vector": [-1, -0.5, 1.5] - }, - "2.85": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "3.4": { - "vector": [0.2, 0, 2] - }, - "3.5167": { - "vector": [1, 2, 1.8] - }, - "3.5667": { - "vector": [-1.5, -3, -1.5] - }, - "3.6833": { - "vector": [0.2, 1.5, 1.5] - }, - "3.8167": { - "vector": [0, 0, -0.5], - "easing": "easeInElastic" - }, - "3.9833": { - "vector": [0, 0, 1] - }, - "4.15": { - "vector": [0, 0, 0] - }, - "4.3167": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "4.4833": { - "vector": [0, 0, 0] - } - } - } - }, "sound_effects": { "0.0": { "effect": "rpk_reload_empty" @@ -698,386 +35,7 @@ }, "animation.ak47.reload_normal": { "loop": "hold_on_last_frame", - "animation_length": 3.5, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [2.2309, 1.32745, 5.98455] - }, - "0.3667": { - "vector": [-14.01, 2.98, -9.37], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [-12.25012, 1.71575, -15.23679] - }, - "0.5333": { - "vector": [-13.67625, 0.53753, -20.43357] - }, - "0.6167": { - "vector": [-17.27359, 1.63911, -16.2464] - }, - "0.7167": { - "vector": [-15.02119, 0.16741, -19.71243] - }, - "0.8167": { - "vector": [-12.36586, -0.75486, -21.85957] - }, - "0.9": { - "vector": [-3.42984, -0.39385, -15.87027] - }, - "1.0667": { - "vector": [-12.35117, -0.9689, -22.83651] - }, - "1.2333": { - "vector": [-16.3817, -0.19101, -19.94063] - }, - "1.4": { - "vector": [-11.33329, -1.14849, -23.82073] - }, - "1.6167": { - "vector": [-13.24, -1.53, -25.8] - }, - "2.05": { - "vector": [-10.66408, -4.02619, -38.55877], - "easing": "easeInSine" - }, - "2.1333": { - "vector": [-13.44223, -4.57576, -41.51634] - }, - "2.2167": { - "vector": [-10.27854, -4.93547, -43.49053] - }, - "2.3": { - "vector": [-18.26205, -7.61546, -53.1428] - }, - "2.45": { - "vector": [-17.01373, -1.99374, -36.83067] - }, - "2.5667": { - "vector": [-18.47706, -3.15515, -37.51576] - }, - "2.6333": { - "vector": [-22.58725, -5.90434, -44.71539] - }, - "2.7833": { - "vector": [-15.52787, -3.69401, -35.14493] - }, - "2.9833": { - "vector": [-3.8135, -0.9118, -6.85724] - }, - "3.2333": { - "vector": [0, 0, -2] - }, - "3.3667": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3167": { - "vector": [-1.1, 0.3, 0.9], - "easing": "easeInQuad" - }, - "0.45": { - "vector": [-1.1, 0, 0.2], - "easing": "easeOutSine" - }, - "0.5333": { - "vector": [-1.13656, 0.11648, 0.43653] - }, - "0.65": { - "vector": [-1.11162, 0.03023, 0.28738] - }, - "0.8167": { - "vector": [-0.96981, -0.32115, 0.20478] - }, - "0.9": { - "vector": [-0.75494, -0.64671, -0.12279] - }, - "0.9833": { - "vector": [-1.1, 0, 0.3] - }, - "1.15": { - "vector": [-0.95347, -0.36221, 0.21435] - }, - "1.3167": { - "vector": [-0.84854, -0.60732, 0.04107] - }, - "1.4833": { - "vector": [-0.88449, -0.56099, 0.25543] - }, - "1.7333": { - "vector": [-0.79, -0.44, 0.2] - }, - "2.05": { - "vector": [-0.89507, -0.06932, 0.3549] - }, - "2.1333": { - "vector": [-1.16342, 0.21638, 0.44269] - }, - "2.2167": { - "vector": [-1.03823, 0.0689, 0.38061] - }, - "2.3": { - "vector": [-1.27235, 0.41208, 0.43655], - "easing": "easeInSine" - }, - "2.4167": { - "vector": [-0.8044, 0.0239, 0.36148], - "easing": "easeOutSine" - }, - "2.5": { - "vector": [-0.55391, 0.01857, 0.28596], - "easing": "easeInSine" - }, - "2.5667": { - "vector": [-0.53, 0.02, 0.27] - }, - "2.7": { - "vector": [-0.73155, 0.42427, 0.66866] - }, - "2.85": { - "vector": [-0.07114, -0.36547, 0.29091] - }, - "3.0": { - "vector": [-0.27874, -0.05921, 0.2782] - }, - "3.15": { - "vector": [0, 0, 0.43] - }, - "3.2833": { - "vector": [0, 0, -0.3] - }, - "3.3667": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.8": { - "vector": [0, 0, 0] - }, - "0.8667": { - "vector": [0, 0, 0] - }, - "1.2333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.4667": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.9667": { - "vector": [-21, 0, -11] - }, - "2.0667": { - "vector": [-14, 0, -5.83], - "easing": "easeInSine" - }, - "2.2667": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.8": { - "vector": [0, 0, 0] - }, - "0.8667": { - "vector": [0, -2.85, 0] - }, - "1.2333": { - "vector": [8, -15, 0], - "easing": "easeInElastic" - }, - "1.4667": { - "vector": [0, -15, 0], - "easing": "easeInElastic" - }, - "1.9667": { - "vector": [0.21094, -0.91719, -0.23516], - "easing": "easeInSine" - }, - "2.0667": { - "vector": [-0.06, -0.19422, -0.47], - "easing": "easeInSine" - }, - "2.1833": { - "vector": [0.07, -0.42625, -0.09719], - "easing": "easeInSine" - }, - "2.2667": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.3167": { - "vector": [0, 0, 0] - }, - "0.4333": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "linear" - }, - "0.7": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "easeInElastic" - }, - "2.3833": { - "vector": [21.5018, 24.86704, -19.88085], - "easing": "easeInElastic" - }, - "2.5667": { - "vector": [15.98147, 57.29761, 1.4882], - "easing": "easeInElastic" - }, - "2.6833": { - "vector": [17.10695, 28.59421, -18.3759], - "easing": "easeInElastic" - }, - "2.7333": { - "vector": [17.10695, 28.59421, -18.3759], - "easing": "easeInElastic" - }, - "2.8": { - "vector": [21.19557, 27.6615, -18.74727], - "easing": "easeInElastic" - }, - "3.0833": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.3167": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-2.29096, -0.9323, 6.56616] - }, - "0.6167": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.3833": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.5667": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.6833": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.7333": { - "vector": [-2.22489, -1.18104, 6.66082], - "easing": "easeInElastic" - }, - "2.95": { - "vector": [-1.18452, -0.34374, 2.77435] - }, - "3.0833": { - "vector": [0, 0, 0] - } - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2167": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "0.4333": { - "vector": [0, 0, -0.5] - }, - "0.6": { - "vector": [0, 0, 1] - }, - "1.0": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.05": { - "vector": [2, 1, -2], - "easing": "easeInSine" - }, - "1.1667": { - "vector": [-1, -0.5, 1.5] - }, - "1.3": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "1.6833": { - "vector": [-0.1, 0, -0.5] - }, - "2.0167": { - "vector": [0.5, 0, 2], - "easing": "easeInElastic" - }, - "2.1833": { - "vector": [-0.5, 0, 2.2], - "easing": "linear" - }, - "2.2667": { - "vector": [1.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.3667": { - "vector": [-0.4, 0.4, -0.2], - "easing": "easeOutSine" - }, - "2.55": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "2.6": { - "vector": [2, 1, -2], - "easing": "easeInSine" - }, - "2.7167": { - "vector": [-1, -0.5, 1.5] - }, - "2.85": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "3.0": { - "vector": [0, 0, 0] - } - } - } - } + "animation_length": 3.5 } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/superbwarfare/geo/ak12.geo.json b/src/main/resources/assets/superbwarfare/geo/ak12.geo.json index 0fee378f3..8f469c381 100644 --- a/src/main/resources/assets/superbwarfare/geo/ak12.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ak12.geo.json @@ -7,8 +7,8 @@ "texture_width": 128, "texture_height": 128, "visible_bounds_width": 29, - "visible_bounds_height": 9, - "visible_bounds_offset": [0, 1.5, 0] + "visible_bounds_height": 6, + "visible_bounds_offset": [0, 0, 0] }, "bones": [ { @@ -34,6 +34,843 @@ "parent": "shen", "pivot": [0, 0, 0] }, + { + "name": "sup", + "parent": "0", + "pivot": [0, 0, 0] + }, + { + "name": "group", + "parent": "sup", + "pivot": [0.49609, 1.90625, -20.5625], + "cubes": [ + { + "origin": [0.26585, 1.32961, -21.39664], + "size": [0.46049, 1.10641, 6.07515], + "uv": { + "north": {"uv": [84, 63.875], "uv_size": [0.25, 0.5]}, + "up": {"uv": [82.5, 61.375], "uv_size": [0.25, 2.375]}, + "down": {"uv": [83, 63.75], "uv_size": [0.25, -2.375]} + } + }, + { + "origin": [0.26585, 1.32961, -21.39664], + "size": [0.46049, 1.10641, 6.07515], + "pivot": [0.49609, 1.88281, -18.12156], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [86, 64.375], "uv_size": [0.25, 0.5]}, + "up": {"uv": [83.5, 61.375], "uv_size": [0.25, 2.375]}, + "down": {"uv": [84, 63.75], "uv_size": [0.25, -2.375]} + } + }, + { + "origin": [-0.05711, 1.65257, -21.39664], + "size": [1.10641, 0.46049, 6.07515], + "uv": { + "north": {"uv": [84.5, 65.375], "uv_size": [0.5, 0.25]}, + "east": {"uv": [84.5, 61.375], "uv_size": [2.375, 0.25]}, + "west": {"uv": [84.5, 61.875], "uv_size": [2.375, 0.25]} + } + }, + { + "origin": [-0.05711, 1.65257, -21.39664], + "size": [1.10641, 0.46049, 6.07515], + "pivot": [0.49609, 1.88281, -18.12156], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [85, 65.375], "uv_size": [0.5, 0.25]}, + "east": {"uv": [84.5, 62.375], "uv_size": [2.375, 0.25]}, + "west": {"uv": [84.5, 62.875], "uv_size": [2.375, 0.25]} + } + } + ] + }, + { + "name": "group7", + "parent": "sup", + "pivot": [0.49609, 1.90625, -20.5625], + "cubes": [ + { + "origin": [0.23914, 1.26544, -16.90969], + "size": [0.5139, 1.23475, 1.61875], + "uv": { + "north": {"uv": [82.5, 64.875], "uv_size": [0.25, 0.625]}, + "south": {"uv": [83, 64.875], "uv_size": [0.25, 0.625]}, + "up": {"uv": [84.5, 63.375], "uv_size": [0.25, 0.75]}, + "down": {"uv": [82.5, 64.625], "uv_size": [0.25, -0.75]} + } + }, + { + "origin": [0.23914, 1.26544, -16.90969], + "size": [0.5139, 1.23475, 1.61875], + "pivot": [0.49609, 1.88281, -18.03258], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [83.5, 64.875], "uv_size": [0.25, 0.625]}, + "south": {"uv": [84, 64.875], "uv_size": [0.25, 0.625]}, + "up": {"uv": [83, 63.875], "uv_size": [0.25, 0.75]}, + "down": {"uv": [83.5, 64.625], "uv_size": [0.25, -0.75]} + } + }, + { + "origin": [-0.12128, 1.62586, -16.90969], + "size": [1.23475, 0.5139, 1.61875], + "uv": { + "north": {"uv": [84.5, 64.875], "uv_size": [0.625, 0.25]}, + "east": {"uv": [85, 63.375], "uv_size": [0.75, 0.25]}, + "south": {"uv": [86, 63.375], "uv_size": [0.625, 0.25]}, + "west": {"uv": [85, 63.875], "uv_size": [0.75, 0.25]} + } + }, + { + "origin": [-0.12128, 1.62586, -16.90969], + "size": [1.23475, 0.5139, 1.61875], + "pivot": [0.49609, 1.88281, -18.03258], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [86, 63.875], "uv_size": [0.625, 0.25]}, + "east": {"uv": [84, 64.375], "uv_size": [0.75, 0.25]}, + "south": {"uv": [85.5, 64.875], "uv_size": [0.625, 0.25]}, + "west": {"uv": [85, 64.375], "uv_size": [0.75, 0.25]} + } + } + ] + }, + { + "name": "group6", + "parent": "sup", + "pivot": [0.49609, 1.90625, -20.5625], + "cubes": [ + { + "origin": [0.34192, 1.51239, -16.06094], + "size": [0.30834, 0.74085, 0.97125], + "uv": { + "south": {"uv": [87, 61.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [85.5, 65.375], "uv_size": [0.125, 0.5]}, + "down": {"uv": [86.5, 64.875], "uv_size": [0.125, -0.5]} + } + }, + { + "origin": [0.34192, 1.51239, -16.06094], + "size": [0.30834, 0.74085, 0.97125], + "pivot": [0.49609, 1.88281, -16.73467], + "rotation": [0, 0, -45], + "uv": { + "south": {"uv": [83.5, 65.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [86, 65.375], "uv_size": [0.125, 0.5]}, + "down": {"uv": [86.5, 65.375], "uv_size": [0.125, -0.5]} + } + }, + { + "origin": [0.12567, 1.72864, -16.06094], + "size": [0.74085, 0.30834, 0.97125], + "uv": { + "east": {"uv": [86.5, 65.375], "uv_size": [0.5, 0.125]}, + "south": {"uv": [87, 62.375], "uv_size": [0.375, 0.125]}, + "west": {"uv": [82.5, 65.875], "uv_size": [0.5, 0.125]} + } + }, + { + "origin": [0.12567, 1.72864, -16.06094], + "size": [0.74085, 0.30834, 0.97125], + "pivot": [0.49609, 1.88281, -16.73467], + "rotation": [0, 0, -45], + "uv": { + "east": {"uv": [87, 61.375], "uv_size": [0.5, 0.125]}, + "south": {"uv": [84, 65.875], "uv_size": [0.375, 0.125]}, + "west": {"uv": [83, 65.875], "uv_size": [0.5, 0.125]} + } + } + ] + }, + { + "name": "oringinbarrel", + "parent": "0", + "pivot": [0.49757, 1.87524, -18.42518], + "cubes": [ + { + "origin": [0.40599, 1.41541, -16.61572], + "size": [0.18315, 0.05781, 0.30461], + "uv": { + "north": {"uv": [40, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 40], "uv_size": [0.25, 0.25]}, + "south": {"uv": [41, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 41], "uv_size": [0.25, 0.25]}, + "up": {"uv": [42, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 42.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.3638, 1.34588, -16.61572], + "size": [0.26753, 0.06953, 0.30461], + "uv": { + "north": {"uv": [37, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 37], "uv_size": [0.25, 0.25]}, + "south": {"uv": [38, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 38], "uv_size": [0.25, 0.25]}, + "up": {"uv": [39, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 39.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.3638, 1.46931, -17.62978], + "size": [0.26753, 0.15469, 1.31867], + "uv": { + "north": {"uv": [34, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 34], "uv_size": [0.25, 0.25]}, + "south": {"uv": [35, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 35], "uv_size": [0.25, 0.25]}, + "up": {"uv": [36, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 36.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.63925], + "size": [0.26752, 0.64715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -16.63925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -16.63925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.63925], + "size": [0.26752, 0.64715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -16.63925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -16.63925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -17.53925], + "size": [0.26752, 0.64715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -17.53925], + "size": [0.26752, 0.64715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -17.53925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -17.53925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -17.53925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.80167, -17.53925], + "size": [0.26752, 0.39715, 0.32814], + "pivot": [0.49757, 1.87524, -18.32518], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + } + ] + }, + { + "name": "huomao", + "parent": "0", + "pivot": [0.49757, 1.87524, -18.42518], + "cubes": [ + { + "origin": [0.40599, 1.41541, -16.61572], + "size": [0.18315, 0.05781, 0.30461], + "uv": { + "north": {"uv": [40, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 40], "uv_size": [0.25, 0.25]}, + "south": {"uv": [41, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 41], "uv_size": [0.25, 0.25]}, + "up": {"uv": [42, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 42.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.3638, 1.34588, -16.61572], + "size": [0.26753, 0.06953, 0.30461], + "uv": { + "north": {"uv": [37, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 37], "uv_size": [0.25, 0.25]}, + "south": {"uv": [38, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 38], "uv_size": [0.25, 0.25]}, + "up": {"uv": [39, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 39.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.3638, 1.524, -17.98916], + "size": [0.26753, 0.12894, 1.67805], + "uv": { + "north": {"uv": [33, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [40, 19], "uv_size": [1.75, 0.25]}, + "south": {"uv": [59, 33], "uv_size": [0.25, 0.25]}, + "west": {"uv": [27, 40], "uv_size": [1.75, 0.25]}, + "up": {"uv": [23, 40], "uv_size": [0.25, 1.75]}, + "down": {"uv": [40, 28.75], "uv_size": [0.25, -1.75]} + } + }, + { + "origin": [0.4138, 2.124, -17.28916], + "size": [0.16753, 0.17894, 0.67805], + "uv": { + "north": {"uv": [47, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [48, 19], "uv_size": [0.75, 0.25]}, + "south": {"uv": [59, 47], "uv_size": [0.25, 0.25]}, + "west": {"uv": [20, 48], "uv_size": [0.75, 0.25]}, + "up": {"uv": [48, 20], "uv_size": [0.25, 0.75]}, + "down": {"uv": [21, 48.75], "uv_size": [0.25, -0.75]} + } + }, + { + "origin": [0.3638, 1.46931, -16.62978], + "size": [0.26753, 0.05469, 0.31867], + "uv": { + "north": {"uv": [34, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 34], "uv_size": [0.25, 0.25]}, + "south": {"uv": [35, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 35], "uv_size": [0.25, 0.25]}, + "up": {"uv": [36, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 36.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36352, 1.48669, -17.98877], + "size": [0.26753, 0.05469, 0.4632], + "pivot": [0.49729, 1.51403, -17.6849], + "rotation": [-6.51837, 0.03627, -0.23077], + "uv": { + "north": {"uv": [43, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [52, 52], "uv_size": [0.5, 0.25]}, + "south": {"uv": [59, 43], "uv_size": [0.25, 0.25]}, + "west": {"uv": [0, 53], "uv_size": [0.5, 0.25]}, + "up": {"uv": [53, 0], "uv_size": [0.25, 0.5]}, + "down": {"uv": [1, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.3638, 1.46931, -17.52978], + "size": [0.26753, 0.05469, 0.31867], + "uv": { + "north": {"uv": [44, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 44], "uv_size": [0.25, 0.25]}, + "south": {"uv": [45, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 45], "uv_size": [0.25, 0.25]}, + "up": {"uv": [46, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 46.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.53925], + "size": [0.26752, 0.64715, 0.22814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.53925], + "size": [0.26752, 0.64715, 0.22814], + "pivot": [0.49757, 1.87524, -17.42518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, + "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.88925], + "size": [0.26752, 0.64715, 0.17814], + "pivot": [0.49757, 1.87524, -17.82518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 12], "uv_size": [0.25, 0.75]}, + "south": {"uv": [13, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [30, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 30.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -16.88925], + "size": [0.26752, 0.64715, 0.17814], + "pivot": [0.49757, 1.87524, -17.82518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 11], "uv_size": [0.25, 0.75]}, + "south": {"uv": [12, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [29, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 29.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -17.23925], + "size": [0.26752, 0.64715, 0.17814], + "pivot": [0.49757, 1.87524, -18.17518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 14], "uv_size": [0.25, 0.75]}, + "south": {"uv": [15, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [32, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 32.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -17.23925], + "size": [0.26752, 0.64715, 0.17814], + "pivot": [0.49757, 1.87524, -18.17518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 13], "uv_size": [0.25, 0.75]}, + "south": {"uv": [14, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [31, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 31.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36381, 1.55167, -19.88925], + "size": [0.26752, 0.64715, 2.47814], + "pivot": [0.49757, 1.87524, -18.52518], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 18], "uv_size": [0.25, 0.75]}, + "south": {"uv": [19, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [37, 13], "uv_size": [0.25, 2.5]}, + "down": {"uv": [23, 39.5], "uv_size": [0.25, -2.5]} + } + }, + { + "origin": [0.36381, 1.55167, -19.88925], + "size": [0.26752, 0.64715, 3.57814], + "pivot": [0.49757, 1.87524, -18.52518], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 17], "uv_size": [0.25, 0.75]}, + "east": {"uv": [14, 10], "uv_size": [3.5, 0.75]}, + "south": {"uv": [18, 48], "uv_size": [0.25, 0.75]}, + "west": {"uv": [14, 11], "uv_size": [3.5, 0.75]}, + "up": {"uv": [17, 32], "uv_size": [0.25, 3.5]}, + "down": {"uv": [19, 35.5], "uv_size": [0.25, -3.5]} + } + }, + { + "origin": [0.36381, 1.55167, -19.88925], + "size": [0.26752, 0.64715, 2.47814], + "pivot": [0.49757, 1.87524, -18.52518], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 16], "uv_size": [0.25, 0.75]}, + "south": {"uv": [17, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [11, 37], "uv_size": [0.25, 2.5]}, + "down": {"uv": [12, 39.5], "uv_size": [0.25, -2.5]} + } + }, + { + "origin": [0.36381, 1.55167, -19.88925], + "size": [0.26752, 0.64715, 3.57814], + "pivot": [0.49757, 1.87524, -18.52518], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [48, 15], "uv_size": [0.25, 0.75]}, + "east": {"uv": [13, 7], "uv_size": [3.5, 0.75]}, + "south": {"uv": [16, 48], "uv_size": [0.25, 0.75]}, + "west": {"uv": [13, 8], "uv_size": [3.5, 0.75]}, + "up": {"uv": [15, 32], "uv_size": [0.25, 3.5]}, + "down": {"uv": [16, 35.5], "uv_size": [0.25, -3.5]} + } + } + ] + }, + { + "name": "bone5", + "parent": "huomao", + "pivot": [0.49757, 1.87524, -18.54818], + "cubes": [ + { + "origin": [0.48568, 1.5429, -18.06359], + "size": [0.35537, 0.85967, 0.5], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 24], "uv_size": [0.25, 0.75]}, + "south": {"uv": [25, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [53, 4], "uv_size": [0.25, 0.5]}, + "down": {"uv": [5, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.48568, 1.68025, -18.06359], + "size": [0.35537, 0.85967, 0.5], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 23], "uv_size": [0.25, 0.75]}, + "south": {"uv": [24, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [53, 3], "uv_size": [0.25, 0.5]}, + "down": {"uv": [4, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.38856, 1.44578, -18.06359], + "size": [0.35537, 0.85967, 0.5], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 22], "uv_size": [0.25, 0.75]}, + "south": {"uv": [23, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [53, 2], "uv_size": [0.25, 0.5]}, + "down": {"uv": [3, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.25121, 1.44578, -18.06359], + "size": [0.35537, 0.85967, 0.5], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [48, 21], "uv_size": [0.25, 0.75]}, + "south": {"uv": [22, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [53, 1], "uv_size": [0.25, 0.5]}, + "down": {"uv": [2, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.27584, 1.48739, -19.86359], + "size": [0.31984, 0.77371, 1.8], + "pivot": [0.49757, 2.02347, -17.55284], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [48, 28], "uv_size": [0.25, 0.75]}, + "south": {"uv": [29, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [40, 33], "uv_size": [0.25, 1.75]}, + "down": {"uv": [34, 41.75], "uv_size": [0.25, -1.75]} + } + }, + { + "origin": [0.39946, 1.48739, -19.86359], + "size": [0.31984, 0.77371, 1.8], + "pivot": [0.49757, 2.02347, -17.55284], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 27], "uv_size": [0.25, 0.75]}, + "south": {"uv": [28, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [40, 31], "uv_size": [0.25, 1.75]}, + "down": {"uv": [33, 41.75], "uv_size": [0.25, -1.75]} + } + }, + { + "origin": [0.48687, 1.69842, -19.86359], + "size": [0.31984, 0.77371, 1.8], + "pivot": [0.49757, 2.02347, -17.55284], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [48, 26], "uv_size": [0.25, 0.75]}, + "south": {"uv": [27, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [30, 40], "uv_size": [0.25, 1.75]}, + "down": {"uv": [31, 41.75], "uv_size": [0.25, -1.75]} + } + }, + { + "origin": [0.48687, 1.5748, -19.86359], + "size": [0.31984, 0.77371, 1.8], + "pivot": [0.49757, 2.02347, -17.55284], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [48, 25], "uv_size": [0.25, 0.75]}, + "south": {"uv": [26, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [29, 40], "uv_size": [0.25, 1.75]}, + "down": {"uv": [40, 30.75], "uv_size": [0.25, -1.75]} + } + }, + { + "origin": [0.4698, 2.0399, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [60, 0], "uv_size": [0.25, 0.25]}, + "south": {"uv": [1, 60], "uv_size": [0.25, 0.25]}, + "up": {"uv": [60, 1], "uv_size": [0.25, 0.25]}, + "down": {"uv": [2, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.38822, 2.0399, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [58, 59], "uv_size": [0.25, 0.25]}, + "south": {"uv": [59, 58], "uv_size": [0.25, 0.25]}, + "up": {"uv": [59, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [0, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.33054, 2.09758, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [56, 59], "uv_size": [0.25, 0.25]}, + "south": {"uv": [59, 56], "uv_size": [0.25, 0.25]}, + "up": {"uv": [57, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 57.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.38822, 2.11412, -20.36359], + "size": [0.13785, 0.0729, 0.5], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [60, 11], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 7], "uv_size": [0.5, 0.25]}, + "south": {"uv": [12, 60], "uv_size": [0.25, 0.25]}, + "west": {"uv": [8, 53], "uv_size": [0.5, 0.25]}, + "up": {"uv": [53, 8], "uv_size": [0.25, 0.5]}, + "down": {"uv": [9, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.48054, 2.1718, -20.36359], + "size": [0.13785, 0.0729, 0.5], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [60, 10], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 5], "uv_size": [0.5, 0.25]}, + "south": {"uv": [11, 60], "uv_size": [0.25, 0.25]}, + "west": {"uv": [6, 53], "uv_size": [0.5, 0.25]}, + "up": {"uv": [53, 6], "uv_size": [0.25, 0.5]}, + "down": {"uv": [7, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.3886, 1.53727, -20.36359], + "size": [0.13785, 0.0729, 0.5], + "pivot": [0.57331, 1.78696, -20.41359], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [60, 13], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 11], "uv_size": [0.5, 0.25]}, + "south": {"uv": [14, 60], "uv_size": [0.25, 0.25]}, + "west": {"uv": [12, 53], "uv_size": [0.5, 0.25]}, + "up": {"uv": [53, 12], "uv_size": [0.25, 0.5]}, + "down": {"uv": [13, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.48092, 1.47958, -20.36359], + "size": [0.13785, 0.0729, 0.5], + "pivot": [0.57331, 1.78696, -20.41359], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [60, 12], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 9], "uv_size": [0.5, 0.25]}, + "south": {"uv": [13, 60], "uv_size": [0.25, 0.25]}, + "west": {"uv": [10, 53], "uv_size": [0.5, 0.25]}, + "up": {"uv": [53, 10], "uv_size": [0.25, 0.5]}, + "down": {"uv": [11, 53.5], "uv_size": [0.25, -0.5]} + } + }, + { + "origin": [0.52748, 2.09758, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.57294, 1.93732, -20.41359], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [54, 59], "uv_size": [0.25, 0.25]}, + "south": {"uv": [59, 54], "uv_size": [0.25, 0.25]}, + "up": {"uv": [55, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 55.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.28176, 1.83315, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.3849, 1.77136, -20.41359], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [60, 8], "uv_size": [0.25, 0.25]}, + "south": {"uv": [9, 60], "uv_size": [0.25, 0.25]}, + "up": {"uv": [60, 9], "uv_size": [0.25, 0.25]}, + "down": {"uv": [10, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.17134, 1.84509, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.3849, 1.77136, -20.41359], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [60, 6], "uv_size": [0.25, 0.25]}, + "south": {"uv": [7, 60], "uv_size": [0.25, 0.25]}, + "up": {"uv": [60, 7], "uv_size": [0.25, 0.25]}, + "down": {"uv": [8, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.10172, 1.93162, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.3849, 1.77136, -20.41359], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [60, 4], "uv_size": [0.25, 0.25]}, + "south": {"uv": [5, 60], "uv_size": [0.25, 0.25]}, + "up": {"uv": [60, 5], "uv_size": [0.25, 0.25]}, + "down": {"uv": [6, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.36828, 1.90278, -20.46359], + "size": [0.28785, 0.14712, 0.1], + "pivot": [0.3849, 1.77136, -20.41359], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [60, 2], "uv_size": [0.25, 0.25]}, + "south": {"uv": [3, 60], "uv_size": [0.25, 0.25]}, + "up": {"uv": [60, 3], "uv_size": [0.25, 0.25]}, + "down": {"uv": [4, 60.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.25121, 2.22276, -17.56359], + "size": [0.35537, 0.08269, 0.27], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [51, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 51], "uv_size": [0.25, 0.25]}, + "south": {"uv": [52, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 52], "uv_size": [0.25, 0.25]}, + "up": {"uv": [53, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 53.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.38856, 2.22276, -17.56359], + "size": [0.35537, 0.08269, 0.27], + "pivot": [0.49757, 2.04141, -17.49609], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [48, 59], "uv_size": [0.25, 0.25]}, + "east": {"uv": [59, 48], "uv_size": [0.25, 0.25]}, + "south": {"uv": [49, 59], "uv_size": [0.25, 0.25]}, + "west": {"uv": [59, 49], "uv_size": [0.25, 0.25]}, + "up": {"uv": [50, 59], "uv_size": [0.25, 0.25]}, + "down": {"uv": [59, 50.25], "uv_size": [0.25, -0.25]} + } + } + ] + }, { "name": "shell1", "parent": "0", @@ -4232,506 +5069,6 @@ } ] }, - { - "name": "huomao", - "parent": "bone4", - "pivot": [0.49757, 1.87524, -18.42518], - "cubes": [ - { - "origin": [0.40599, 1.41541, -16.61572], - "size": [0.18315, 0.05781, 0.30461], - "uv": { - "north": {"uv": [40, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 40], "uv_size": [0.25, 0.25]}, - "south": {"uv": [41, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 41], "uv_size": [0.25, 0.25]}, - "up": {"uv": [42, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 42.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.3638, 1.34588, -16.61572], - "size": [0.26753, 0.06953, 0.30461], - "uv": { - "north": {"uv": [37, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 37], "uv_size": [0.25, 0.25]}, - "south": {"uv": [38, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 38], "uv_size": [0.25, 0.25]}, - "up": {"uv": [39, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 39.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.3638, 1.524, -17.98916], - "size": [0.26753, 0.12894, 1.67805], - "uv": { - "north": {"uv": [33, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [40, 19], "uv_size": [1.75, 0.25]}, - "south": {"uv": [59, 33], "uv_size": [0.25, 0.25]}, - "west": {"uv": [27, 40], "uv_size": [1.75, 0.25]}, - "up": {"uv": [23, 40], "uv_size": [0.25, 1.75]}, - "down": {"uv": [40, 28.75], "uv_size": [0.25, -1.75]} - } - }, - { - "origin": [0.4138, 2.124, -17.28916], - "size": [0.16753, 0.17894, 0.67805], - "uv": { - "north": {"uv": [47, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [48, 19], "uv_size": [0.75, 0.25]}, - "south": {"uv": [59, 47], "uv_size": [0.25, 0.25]}, - "west": {"uv": [20, 48], "uv_size": [0.75, 0.25]}, - "up": {"uv": [48, 20], "uv_size": [0.25, 0.75]}, - "down": {"uv": [21, 48.75], "uv_size": [0.25, -0.75]} - } - }, - { - "origin": [0.3638, 1.46931, -16.62978], - "size": [0.26753, 0.05469, 0.31867], - "uv": { - "north": {"uv": [34, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 34], "uv_size": [0.25, 0.25]}, - "south": {"uv": [35, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 35], "uv_size": [0.25, 0.25]}, - "up": {"uv": [36, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 36.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36352, 1.48669, -17.98877], - "size": [0.26753, 0.05469, 0.4632], - "pivot": [0.49729, 1.51403, -17.6849], - "rotation": [-6.51837, 0.03627, -0.23077], - "uv": { - "north": {"uv": [43, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [52, 52], "uv_size": [0.5, 0.25]}, - "south": {"uv": [59, 43], "uv_size": [0.25, 0.25]}, - "west": {"uv": [0, 53], "uv_size": [0.5, 0.25]}, - "up": {"uv": [53, 0], "uv_size": [0.25, 0.5]}, - "down": {"uv": [1, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.3638, 1.46931, -17.52978], - "size": [0.26753, 0.05469, 0.31867], - "uv": { - "north": {"uv": [44, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 44], "uv_size": [0.25, 0.25]}, - "south": {"uv": [45, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 45], "uv_size": [0.25, 0.25]}, - "up": {"uv": [46, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 46.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -16.53925], - "size": [0.26752, 0.64715, 0.22814], - "pivot": [0.49757, 1.87524, -17.42518], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 10], "uv_size": [0.25, 0.75]}, - "south": {"uv": [11, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [28, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 28.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -16.53925], - "size": [0.26752, 0.64715, 0.22814], - "pivot": [0.49757, 1.87524, -17.42518], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 9], "uv_size": [0.25, 0.75]}, - "south": {"uv": [10, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [27, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 27.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -16.88925], - "size": [0.26752, 0.64715, 0.17814], - "pivot": [0.49757, 1.87524, -17.82518], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 12], "uv_size": [0.25, 0.75]}, - "south": {"uv": [13, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [30, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 30.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -16.88925], - "size": [0.26752, 0.64715, 0.17814], - "pivot": [0.49757, 1.87524, -17.82518], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 11], "uv_size": [0.25, 0.75]}, - "south": {"uv": [12, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [29, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 29.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -17.23925], - "size": [0.26752, 0.64715, 0.17814], - "pivot": [0.49757, 1.87524, -18.17518], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 14], "uv_size": [0.25, 0.75]}, - "south": {"uv": [15, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [32, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 32.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -17.23925], - "size": [0.26752, 0.64715, 0.17814], - "pivot": [0.49757, 1.87524, -18.17518], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 13], "uv_size": [0.25, 0.75]}, - "south": {"uv": [14, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [31, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 31.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36381, 1.55167, -19.88925], - "size": [0.26752, 0.64715, 2.47814], - "pivot": [0.49757, 1.87524, -18.52518], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 18], "uv_size": [0.25, 0.75]}, - "south": {"uv": [19, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [37, 13], "uv_size": [0.25, 2.5]}, - "down": {"uv": [23, 39.5], "uv_size": [0.25, -2.5]} - } - }, - { - "origin": [0.36381, 1.55167, -19.88925], - "size": [0.26752, 0.64715, 3.57814], - "pivot": [0.49757, 1.87524, -18.52518], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [48, 17], "uv_size": [0.25, 0.75]}, - "east": {"uv": [14, 10], "uv_size": [3.5, 0.75]}, - "south": {"uv": [18, 48], "uv_size": [0.25, 0.75]}, - "west": {"uv": [14, 11], "uv_size": [3.5, 0.75]}, - "up": {"uv": [17, 32], "uv_size": [0.25, 3.5]}, - "down": {"uv": [19, 35.5], "uv_size": [0.25, -3.5]} - } - }, - { - "origin": [0.36381, 1.55167, -19.88925], - "size": [0.26752, 0.64715, 2.47814], - "pivot": [0.49757, 1.87524, -18.52518], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 16], "uv_size": [0.25, 0.75]}, - "south": {"uv": [17, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [11, 37], "uv_size": [0.25, 2.5]}, - "down": {"uv": [12, 39.5], "uv_size": [0.25, -2.5]} - } - }, - { - "origin": [0.36381, 1.55167, -19.88925], - "size": [0.26752, 0.64715, 3.57814], - "pivot": [0.49757, 1.87524, -18.52518], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [48, 15], "uv_size": [0.25, 0.75]}, - "east": {"uv": [13, 7], "uv_size": [3.5, 0.75]}, - "south": {"uv": [16, 48], "uv_size": [0.25, 0.75]}, - "west": {"uv": [13, 8], "uv_size": [3.5, 0.75]}, - "up": {"uv": [15, 32], "uv_size": [0.25, 3.5]}, - "down": {"uv": [16, 35.5], "uv_size": [0.25, -3.5]} - } - } - ] - }, - { - "name": "bone5", - "parent": "huomao", - "pivot": [0.49757, 1.87524, -18.54818], - "cubes": [ - { - "origin": [0.48568, 1.5429, -18.06359], - "size": [0.35537, 0.85967, 0.5], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 24], "uv_size": [0.25, 0.75]}, - "south": {"uv": [25, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [53, 4], "uv_size": [0.25, 0.5]}, - "down": {"uv": [5, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.48568, 1.68025, -18.06359], - "size": [0.35537, 0.85967, 0.5], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 23], "uv_size": [0.25, 0.75]}, - "south": {"uv": [24, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [53, 3], "uv_size": [0.25, 0.5]}, - "down": {"uv": [4, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.38856, 1.44578, -18.06359], - "size": [0.35537, 0.85967, 0.5], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [48, 22], "uv_size": [0.25, 0.75]}, - "south": {"uv": [23, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [53, 2], "uv_size": [0.25, 0.5]}, - "down": {"uv": [3, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.25121, 1.44578, -18.06359], - "size": [0.35537, 0.85967, 0.5], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [48, 21], "uv_size": [0.25, 0.75]}, - "south": {"uv": [22, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [53, 1], "uv_size": [0.25, 0.5]}, - "down": {"uv": [2, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.27584, 1.48739, -19.86359], - "size": [0.31984, 0.77371, 1.8], - "pivot": [0.49757, 2.02347, -17.55284], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [48, 28], "uv_size": [0.25, 0.75]}, - "south": {"uv": [29, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [40, 33], "uv_size": [0.25, 1.75]}, - "down": {"uv": [34, 41.75], "uv_size": [0.25, -1.75]} - } - }, - { - "origin": [0.39946, 1.48739, -19.86359], - "size": [0.31984, 0.77371, 1.8], - "pivot": [0.49757, 2.02347, -17.55284], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [48, 27], "uv_size": [0.25, 0.75]}, - "south": {"uv": [28, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [40, 31], "uv_size": [0.25, 1.75]}, - "down": {"uv": [33, 41.75], "uv_size": [0.25, -1.75]} - } - }, - { - "origin": [0.48687, 1.69842, -19.86359], - "size": [0.31984, 0.77371, 1.8], - "pivot": [0.49757, 2.02347, -17.55284], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [48, 26], "uv_size": [0.25, 0.75]}, - "south": {"uv": [27, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [30, 40], "uv_size": [0.25, 1.75]}, - "down": {"uv": [31, 41.75], "uv_size": [0.25, -1.75]} - } - }, - { - "origin": [0.48687, 1.5748, -19.86359], - "size": [0.31984, 0.77371, 1.8], - "pivot": [0.49757, 2.02347, -17.55284], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [48, 25], "uv_size": [0.25, 0.75]}, - "south": {"uv": [26, 48], "uv_size": [0.25, 0.75]}, - "up": {"uv": [29, 40], "uv_size": [0.25, 1.75]}, - "down": {"uv": [40, 30.75], "uv_size": [0.25, -1.75]} - } - }, - { - "origin": [0.4698, 2.0399, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, 67.5], - "uv": { - "north": {"uv": [60, 0], "uv_size": [0.25, 0.25]}, - "south": {"uv": [1, 60], "uv_size": [0.25, 0.25]}, - "up": {"uv": [60, 1], "uv_size": [0.25, 0.25]}, - "down": {"uv": [2, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.38822, 2.0399, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [58, 59], "uv_size": [0.25, 0.25]}, - "south": {"uv": [59, 58], "uv_size": [0.25, 0.25]}, - "up": {"uv": [59, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [0, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.33054, 2.09758, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [56, 59], "uv_size": [0.25, 0.25]}, - "south": {"uv": [59, 56], "uv_size": [0.25, 0.25]}, - "up": {"uv": [57, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 57.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.38822, 2.11412, -20.36359], - "size": [0.13785, 0.0729, 0.5], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [60, 11], "uv_size": [0.25, 0.25]}, - "east": {"uv": [53, 7], "uv_size": [0.5, 0.25]}, - "south": {"uv": [12, 60], "uv_size": [0.25, 0.25]}, - "west": {"uv": [8, 53], "uv_size": [0.5, 0.25]}, - "up": {"uv": [53, 8], "uv_size": [0.25, 0.5]}, - "down": {"uv": [9, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.48054, 2.1718, -20.36359], - "size": [0.13785, 0.0729, 0.5], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [60, 10], "uv_size": [0.25, 0.25]}, - "east": {"uv": [53, 5], "uv_size": [0.5, 0.25]}, - "south": {"uv": [11, 60], "uv_size": [0.25, 0.25]}, - "west": {"uv": [6, 53], "uv_size": [0.5, 0.25]}, - "up": {"uv": [53, 6], "uv_size": [0.25, 0.5]}, - "down": {"uv": [7, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.3886, 1.53727, -20.36359], - "size": [0.13785, 0.0729, 0.5], - "pivot": [0.57331, 1.78696, -20.41359], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [60, 13], "uv_size": [0.25, 0.25]}, - "east": {"uv": [53, 11], "uv_size": [0.5, 0.25]}, - "south": {"uv": [14, 60], "uv_size": [0.25, 0.25]}, - "west": {"uv": [12, 53], "uv_size": [0.5, 0.25]}, - "up": {"uv": [53, 12], "uv_size": [0.25, 0.5]}, - "down": {"uv": [13, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.48092, 1.47958, -20.36359], - "size": [0.13785, 0.0729, 0.5], - "pivot": [0.57331, 1.78696, -20.41359], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [60, 12], "uv_size": [0.25, 0.25]}, - "east": {"uv": [53, 9], "uv_size": [0.5, 0.25]}, - "south": {"uv": [13, 60], "uv_size": [0.25, 0.25]}, - "west": {"uv": [10, 53], "uv_size": [0.5, 0.25]}, - "up": {"uv": [53, 10], "uv_size": [0.25, 0.5]}, - "down": {"uv": [11, 53.5], "uv_size": [0.25, -0.5]} - } - }, - { - "origin": [0.52748, 2.09758, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.57294, 1.93732, -20.41359], - "rotation": [0, 0, 112.5], - "uv": { - "north": {"uv": [54, 59], "uv_size": [0.25, 0.25]}, - "south": {"uv": [59, 54], "uv_size": [0.25, 0.25]}, - "up": {"uv": [55, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 55.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.28176, 1.83315, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.3849, 1.77136, -20.41359], - "rotation": [0, 0, -112.5], - "uv": { - "north": {"uv": [60, 8], "uv_size": [0.25, 0.25]}, - "south": {"uv": [9, 60], "uv_size": [0.25, 0.25]}, - "up": {"uv": [60, 9], "uv_size": [0.25, 0.25]}, - "down": {"uv": [10, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.17134, 1.84509, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.3849, 1.77136, -20.41359], - "rotation": [0, 0, -157.5], - "uv": { - "north": {"uv": [60, 6], "uv_size": [0.25, 0.25]}, - "south": {"uv": [7, 60], "uv_size": [0.25, 0.25]}, - "up": {"uv": [60, 7], "uv_size": [0.25, 0.25]}, - "down": {"uv": [8, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.10172, 1.93162, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.3849, 1.77136, -20.41359], - "rotation": [0, 0, 157.5], - "uv": { - "north": {"uv": [60, 4], "uv_size": [0.25, 0.25]}, - "south": {"uv": [5, 60], "uv_size": [0.25, 0.25]}, - "up": {"uv": [60, 5], "uv_size": [0.25, 0.25]}, - "down": {"uv": [6, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.36828, 1.90278, -20.46359], - "size": [0.28785, 0.14712, 0.1], - "pivot": [0.3849, 1.77136, -20.41359], - "rotation": [0, 0, -67.5], - "uv": { - "north": {"uv": [60, 2], "uv_size": [0.25, 0.25]}, - "south": {"uv": [3, 60], "uv_size": [0.25, 0.25]}, - "up": {"uv": [60, 3], "uv_size": [0.25, 0.25]}, - "down": {"uv": [4, 60.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.25121, 2.22276, -17.56359], - "size": [0.35537, 0.08269, 0.27], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [51, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 51], "uv_size": [0.25, 0.25]}, - "south": {"uv": [52, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 52], "uv_size": [0.25, 0.25]}, - "up": {"uv": [53, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 53.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [0.38856, 2.22276, -17.56359], - "size": [0.35537, 0.08269, 0.27], - "pivot": [0.49757, 2.04141, -17.49609], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [48, 59], "uv_size": [0.25, 0.25]}, - "east": {"uv": [59, 48], "uv_size": [0.25, 0.25]}, - "south": {"uv": [49, 59], "uv_size": [0.25, 0.25]}, - "west": {"uv": [59, 49], "uv_size": [0.25, 0.25]}, - "up": {"uv": [50, 59], "uv_size": [0.25, 0.25]}, - "down": {"uv": [59, 50.25], "uv_size": [0.25, -0.25]} - } - } - ] - }, { "name": "jixia", "parent": "gun", @@ -8126,7 +8463,1611 @@ { "name": "magazine", "parent": "0", - "pivot": [0.5, -1.3922, -2.72863], + "pivot": [0.5, -1.3922, -2.72863] + }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0.50283, 1.51538, -1.50152], + "cubes": [ + { + "origin": [0.3238, 1.33635, -2.08242], + "size": [0.35805, 0.35805, 0.9922], + "uv": { + "north": {"uv": [53, 57], "uv_size": [0.25, 0.25]}, + "east": {"uv": [44, 40], "uv_size": [1, 0.25]}, + "south": {"uv": [57, 53], "uv_size": [0.25, 0.25]}, + "west": {"uv": [41, 44], "uv_size": [1, 0.25]}, + "up": {"uv": [42, 44], "uv_size": [0.25, 1]}, + "down": {"uv": [44, 43], "uv_size": [0.25, -1]} + } + }, + { + "origin": [0.37, 1.38255, -2.48162], + "size": [0.26565, 0.26565, 1.53], + "uv": { + "north": {"uv": [54, 57], "uv_size": [0.25, 0.25]}, + "east": {"uv": [41, 27], "uv_size": [1.5, 0.25]}, + "south": {"uv": [57, 54], "uv_size": [0.25, 0.25]}, + "west": {"uv": [41, 28], "uv_size": [1.5, 0.25]}, + "up": {"uv": [28, 41], "uv_size": [0.25, 1.5]}, + "down": {"uv": [41, 30.5], "uv_size": [0.25, -1.5]} + } + }, + { + "origin": [0.3238, 1.33635, -0.99782], + "size": [0.35805, 0.35805, 0.0924], + "uv": { + "north": {"uv": [55, 57], "uv_size": [0.25, 0.25]}, + "east": {"uv": [57, 55], "uv_size": [0.25, 0.25]}, + "south": {"uv": [56, 57], "uv_size": [0.25, 0.25]}, + "west": {"uv": [57, 56], "uv_size": [0.25, 0.25]}, + "up": {"uv": [57, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [0, 58.25], "uv_size": [0.25, -0.25]} + } + } + ] + }, + { + "name": "drum", + "parent": "magazine", + "pivot": [6.05277, -4.30277, -7.80277], + "cubes": [ + { + "origin": [0.22253, 0.44979, -0.8624], + "size": [0.55493, 0.61697, 0.39754], + "pivot": [0.5, 0.88328, -0.53924], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [80.625, 63.875], "uv_size": [0.25, 0.25]}, + "east": {"uv": [80.625, 64.375], "uv_size": [0.25, 0.25]}, + "south": {"uv": [67.125, 64.875], "uv_size": [0.25, 0.25]}, + "west": {"uv": [81.125, 50.875], "uv_size": [0.25, 0.25]}, + "up": {"uv": [67.625, 64.875], "uv_size": [0.25, 0.25]}, + "down": {"uv": [81.125, 51.625], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.22253, 0.94979, -0.46486], + "size": [0.55493, 0.11697, 0.1], + "pivot": [0.5, 0.88328, -0.53924], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [74.625, 65.875], "uv_size": [0.25, 0.125]}, + "east": {"uv": [77.625, 65.875], "uv_size": [0.125, 0.125]}, + "south": {"uv": [82.125, 58.375], "uv_size": [0.25, 0.125]}, + "west": {"uv": [82.125, 61.375], "uv_size": [0.125, 0.125]}, + "up": {"uv": [75.125, 65.875], "uv_size": [0.25, 0.125]}, + "down": {"uv": [82.125, 59], "uv_size": [0.25, -0.125]} + } + } + ] + }, + { + "name": "bone10", + "parent": "drum", + "pivot": [1.04904, -2.51341, -5.66438], + "cubes": [ + { + "origin": [0.13822, 0.68092, -2.65802], + "size": [0.72356, 0.49106, 2.00987], + "pivot": [0.5, 0.92645, -1.65309], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [80.125, 56.875], "uv_size": [0.375, 0.25]}, + "east": {"uv": [67.625, 60.875], "uv_size": [1, 0.25]}, + "south": {"uv": [73.625, 63.875], "uv_size": [0.375, 0.25]}, + "west": {"uv": [77.125, 51.875], "uv_size": [1, 0.25]}, + "up": {"uv": [68.125, 50.875], "uv_size": [0.375, 1]}, + "down": {"uv": [68.125, 52.875], "uv_size": [0.375, -1]} + } + }, + { + "origin": [0.13822, 0.97121, -2.62943], + "size": [0.72356, 0.74106, 2.00987], + "uv": { + "north": {"uv": [78.125, 61.375], "uv_size": [0.375, 0.375]}, + "east": {"uv": [68.625, 50.875], "uv_size": [1, 0.375]}, + "south": {"uv": [78.125, 61.875], "uv_size": [0.375, 0.375]}, + "west": {"uv": [68.625, 51.375], "uv_size": [1, 0.375]}, + "up": {"uv": [68.625, 51.875], "uv_size": [0.375, 1]}, + "down": {"uv": [67.125, 53.875], "uv_size": [0.375, -1]} + } + } + ] + }, + { + "name": "bone33", + "parent": "drum", + "pivot": [0, -0.21484, -0.10937], + "rotation": [-9, 0, 0] + }, + { + "name": "bone9", + "parent": "bone33", + "pivot": [0.5, -1.56837, -1.17779], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.09058, -1.55006, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "uv": { + "north": {"uv": [67.625, 52.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.125, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 51.875], "uv_size": [0.125, 1]}, + "up": {"uv": [68.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 52.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.07495, 0.48994, -1.33174], + "size": [0.8501, 0.15, 0.30789], + "uv": { + "north": {"uv": [69.125, 64.875], "uv_size": [0.375, 0.125]}, + "east": {"uv": [78.125, 65.875], "uv_size": [0.125, 0.125]}, + "south": {"uv": [81.125, 52.875], "uv_size": [0.375, 0.125]}, + "west": {"uv": [82.125, 61.875], "uv_size": [0.125, 0.125]}, + "up": {"uv": [69.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 53.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.86399, 0.33299, -1.33174], + "size": [0.8501, 0.15, 0.30789], + "pivot": [1.28904, 0.40799, -1.17779], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [70.125, 64.875], "uv_size": [0.375, 0.125]}, + "east": {"uv": [78.625, 65.875], "uv_size": [0.125, 0.125]}, + "south": {"uv": [81.125, 53.875], "uv_size": [0.375, 0.125]}, + "west": {"uv": [82.125, 62.375], "uv_size": [0.125, 0.125]}, + "up": {"uv": [70.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 54.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.71409, 0.33299, -1.33174], + "size": [0.8501, 0.15, 0.30789], + "pivot": [-0.28904, 0.40799, -1.17779], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [71.125, 64.875], "uv_size": [0.375, 0.125]}, + "east": {"uv": [79.125, 65.875], "uv_size": [0.125, 0.125]}, + "south": {"uv": [81.125, 54.875], "uv_size": [0.375, 0.125]}, + "west": {"uv": [82.125, 62.875], "uv_size": [0.125, 0.125]}, + "up": {"uv": [71.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 55.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.19363, -1.9191, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [69.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.625, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [69.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [72.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 56], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.43007, -2.2206, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [69.125, 52.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.125, 52.875], "uv_size": [0.125, 1]}, + "south": {"uv": [69.625, 50.875], "uv_size": [0.375, 1]}, + "west": {"uv": [69.625, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [72.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 56.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.76389, -2.40867, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [69.625, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [69.625, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 53.875], "uv_size": [0.125, 1]}, + "up": {"uv": [73.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 57], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.14427, -2.45468, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [67.125, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 50.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [73.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 57.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.5133, -2.35163, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [67.625, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.125, 54.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.125, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.625, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [74.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 58], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.8148, -2.11519, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [70.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.625, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 55.875], "uv_size": [0.125, 1]}, + "up": {"uv": [74.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 58.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [2.00288, -1.78137, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [1.47916, -1.49384, -1.22779], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [69.125, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [75.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 59], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.86773, -1.69913, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [69.625, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.125, 56.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.625, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [75.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 59.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.76468, -2.06816, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [70.625, 50.875], "uv_size": [0.375, 1]}, + "east": {"uv": [74.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.625, 51.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 57.875], "uv_size": [0.125, 1]}, + "up": {"uv": [76.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 60], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.52824, -2.36967, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [70.625, 52.875], "uv_size": [0.375, 1]}, + "east": {"uv": [74.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.625, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [75.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [76.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 60.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.19443, -2.55774, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [67.125, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.125, 58.875], "uv_size": [0.125, 1]}, + "south": {"uv": [71.125, 50.875], "uv_size": [0.375, 1]}, + "west": {"uv": [75.625, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [77.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 61], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.81405, -2.60375, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [67.625, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [76.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.125, 54.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 59.875], "uv_size": [0.125, 1]}, + "up": {"uv": [77.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 61.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.44501, -2.50069, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [71.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [76.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.625, 54.875], "uv_size": [0.375, 1]}, + "west": {"uv": [77.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [78.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 62], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.14351, -2.26426, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [69.125, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.125, 60.875], "uv_size": [0.125, 1]}, + "south": {"uv": [71.125, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [77.625, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [78.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 62.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.04457, -1.93044, -1.33174], + "size": [0.81885, 2.04, 0.30789], + "pivot": [-0.47916, -1.64291, -1.22779], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [69.625, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [78.125, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 54.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 61.875], "uv_size": [0.125, 1]}, + "up": {"uv": [79.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 63], "uv_size": [0.375, -0.125]} + } + } + ] + }, + { + "name": "bone28", + "parent": "bone33", + "pivot": [0.5, -1.53834, -1.32878], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.10327, -1.5206, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "uv": { + "north": {"uv": [71.125, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.625, 54.875], "uv_size": [0.375, 1]}, + "south": {"uv": [71.125, 54.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.625, 50.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 50.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [67.625, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [0.20313, -1.87819, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [71.625, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [71.625, 52.875], "uv_size": [0.375, 1]}, + "south": {"uv": [71.625, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.625, 54.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 51.375], "uv_size": [0.375, 0.375]}, + "down": {"uv": [68.125, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [0.43224, -2.17035, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [67.125, 55.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.125, 50.875], "uv_size": [0.375, 1]}, + "south": {"uv": [67.625, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [68.125, 55.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 51.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 52.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [0.75571, -2.35259, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [72.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.625, 55.875], "uv_size": [0.375, 1]}, + "south": {"uv": [69.125, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [72.125, 52.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 52.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 53.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [1.12429, -2.39717, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [69.625, 55.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.125, 55.875], "uv_size": [0.375, 1]}, + "south": {"uv": [72.125, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [70.625, 55.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 53.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 54.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [1.48189, -2.29731, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [71.125, 55.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.125, 54.875], "uv_size": [0.375, 1]}, + "south": {"uv": [71.625, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [72.125, 55.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 54.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 55.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [1.77404, -2.06821, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [72.625, 50.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.625, 51.875], "uv_size": [0.375, 1]}, + "south": {"uv": [72.625, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [72.625, 53.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 55.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 56.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [1.95629, -1.74474, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [1.4488, -1.46612, -1.22805], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [72.625, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.625, 55.875], "uv_size": [0.375, 1]}, + "south": {"uv": [67.125, 56.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.125, 50.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 56.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 57.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-1.79433, -1.66504, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [67.625, 56.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.125, 56.875], "uv_size": [0.375, 1]}, + "south": {"uv": [73.125, 51.875], "uv_size": [0.375, 1]}, + "west": {"uv": [68.625, 56.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 57.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 58.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-1.69447, -2.02264, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [69.125, 56.875], "uv_size": [0.375, 1]}, + "east": {"uv": [73.125, 52.875], "uv_size": [0.375, 1]}, + "south": {"uv": [69.625, 56.875], "uv_size": [0.375, 1]}, + "west": {"uv": [70.125, 56.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 58.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 59.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-1.46537, -2.31479, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [73.125, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.625, 56.875], "uv_size": [0.375, 1]}, + "south": {"uv": [71.125, 56.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.125, 54.875], "uv_size": [0.375, 1]}, + "up": {"uv": [76.125, 62.375], "uv_size": [0.375, 0.375]}, + "down": {"uv": [76.625, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-1.1419, -2.49704, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [71.625, 56.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.125, 56.875], "uv_size": [0.375, 1]}, + "south": {"uv": [73.125, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [72.625, 56.875], "uv_size": [0.375, 1]}, + "up": {"uv": [77.125, 62.375], "uv_size": [0.375, 0.375]}, + "down": {"uv": [77.625, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-0.77331, -2.54162, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [73.125, 56.875], "uv_size": [0.375, 1]}, + "east": {"uv": [73.625, 50.875], "uv_size": [0.375, 1]}, + "south": {"uv": [73.625, 51.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.625, 52.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 61.375], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.125, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-0.41572, -2.44176, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [73.625, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [73.625, 54.875], "uv_size": [0.375, 1]}, + "south": {"uv": [73.625, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [73.625, 56.875], "uv_size": [0.375, 1]}, + "up": {"uv": [78.625, 61.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [78.625, 62.75], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [-0.12356, -2.21265, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [67.125, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [74.125, 50.875], "uv_size": [0.375, 1]}, + "south": {"uv": [67.625, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [68.125, 57.875], "uv_size": [0.375, 1]}, + "up": {"uv": [67.125, 62.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [79.125, 51.25], "uv_size": [0.375, -0.375]} + } + }, + { + "origin": [0.05868, -1.88918, -2.02878], + "size": [0.79346, 1.97676, 0.7], + "pivot": [-0.4488, -1.61056, -1.22805], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [74.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.625, 57.875], "uv_size": [0.375, 1]}, + "south": {"uv": [69.125, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [74.125, 52.875], "uv_size": [0.375, 1]}, + "up": {"uv": [67.625, 62.875], "uv_size": [0.375, 0.375]}, + "down": {"uv": [79.125, 51.75], "uv_size": [0.375, -0.375]} + } + } + ] + }, + { + "name": "bone29", + "parent": "bone33", + "pivot": [0.5, -1.53151, -1.36311], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.12311, -1.51466, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "uv": { + "north": {"uv": [69.625, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [78.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.125, 62.875], "uv_size": [0.125, 1]}, + "up": {"uv": [79.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 63.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.21797, -1.85437, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [74.125, 53.875], "uv_size": [0.375, 1]}, + "east": {"uv": [67.125, 63.375], "uv_size": [0.125, 1]}, + "south": {"uv": [70.625, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 50.875], "uv_size": [0.125, 1]}, + "up": {"uv": [80.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 64], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.43562, -2.13192, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [71.125, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [67.625, 63.375], "uv_size": [0.125, 1]}, + "south": {"uv": [74.125, 54.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 51.875], "uv_size": [0.125, 1]}, + "up": {"uv": [80.625, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [81.125, 64.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.74292, -2.30505, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [71.625, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 52.875], "uv_size": [0.125, 1]}, + "south": {"uv": [72.125, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 53.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.125, 64.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [67.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.09308, -2.3474, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [74.125, 55.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 54.875], "uv_size": [0.125, 1]}, + "south": {"uv": [72.625, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 55.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 50.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [67.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.43279, -2.25254, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [73.125, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 56.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.125, 56.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 57.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 51.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [68.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.71034, -2.03489, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [73.625, 57.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 58.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.125, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 59.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 51.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [68.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [1.88347, -1.72759, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [1.40136, -1.4629, -1.26742], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [74.625, 50.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 60.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.625, 51.875], "uv_size": [0.375, 1]}, + "west": {"uv": [79.625, 61.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 52.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [69.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.67962, -1.65188, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [74.625, 52.875], "uv_size": [0.375, 1]}, + "east": {"uv": [79.625, 62.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.625, 53.875], "uv_size": [0.375, 1]}, + "west": {"uv": [80.125, 50.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 52.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [69.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.58475, -1.99159, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [74.625, 54.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.125, 63.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.625, 55.875], "uv_size": [0.375, 1]}, + "west": {"uv": [80.125, 51.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 53.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [70.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.3671, -2.26914, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [74.625, 56.875], "uv_size": [0.375, 1]}, + "east": {"uv": [68.625, 63.875], "uv_size": [0.125, 1]}, + "south": {"uv": [74.625, 57.875], "uv_size": [0.375, 1]}, + "west": {"uv": [69.125, 63.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 53.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [70.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-1.0598, -2.44227, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [67.125, 58.875], "uv_size": [0.375, 1]}, + "east": {"uv": [80.125, 52.875], "uv_size": [0.125, 1]}, + "south": {"uv": [75.125, 50.875], "uv_size": [0.375, 1]}, + "west": {"uv": [69.625, 63.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 54.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [71.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.70964, -2.48463, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [67.625, 58.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.125, 63.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.125, 58.875], "uv_size": [0.375, 1]}, + "west": {"uv": [80.125, 53.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 54.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [71.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.36993, -2.38976, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [75.125, 51.875], "uv_size": [0.375, 1]}, + "east": {"uv": [70.625, 63.875], "uv_size": [0.125, 1]}, + "south": {"uv": [68.625, 58.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.125, 63.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 55.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [72.125, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [-0.09238, -2.17211, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [69.125, 58.875], "uv_size": [0.375, 1]}, + "east": {"uv": [80.125, 54.875], "uv_size": [0.125, 1]}, + "south": {"uv": [75.125, 52.875], "uv_size": [0.375, 1]}, + "west": {"uv": [71.625, 63.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 55.875], "uv_size": [0.375, 0.125]}, + "down": {"uv": [72.625, 65.5], "uv_size": [0.375, -0.125]} + } + }, + { + "origin": [0.08075, -1.86481, -2.32811], + "size": [0.75379, 1.87792, 0.3], + "pivot": [-0.40136, -1.60012, -1.26742], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [69.625, 58.875], "uv_size": [0.375, 1]}, + "east": {"uv": [72.125, 63.875], "uv_size": [0.125, 1]}, + "south": {"uv": [70.125, 58.875], "uv_size": [0.375, 1]}, + "west": {"uv": [80.125, 55.875], "uv_size": [0.125, 1]}, + "up": {"uv": [81.625, 56.375], "uv_size": [0.375, 0.125]}, + "down": {"uv": [73.125, 65.5], "uv_size": [0.375, -0.125]} + } + } + ] + }, + { + "name": "bone30", + "parent": "bone33", + "pivot": [0.5, -1.5221, -1.41043], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.14195, -1.50609, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "uv": { + "north": {"uv": [75.125, 53.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [68.625, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [70.625, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.125, 52.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 57.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [74.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.23208, -1.82881, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [71.125, 58.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [69.125, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.125, 54.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [69.625, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 57.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [74.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.43884, -2.09248, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [71.625, 58.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.125, 53.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [72.125, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [70.125, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 58.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [75.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.73077, -2.25696, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [75.125, 55.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [70.625, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [72.625, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.125, 54.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 58.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [75.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.06342, -2.2972, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [73.125, 58.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [71.125, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.125, 56.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [71.625, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 59.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [76.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.38615, -2.20707, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [73.625, 58.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.125, 55.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [74.125, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [72.125, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 59.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [76.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.64982, -2.0003, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [75.125, 57.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [72.625, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [74.625, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.125, 56.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 60.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [77.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.8143, -1.70837, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [1.35629, -1.45692, -1.31952], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [75.125, 58.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [73.125, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.625, 50.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [73.625, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 60.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [77.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.57064, -1.63645, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [75.625, 51.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.125, 57.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.625, 52.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [74.125, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 61.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [78.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.48051, -1.95918, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [75.625, 53.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [74.625, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.625, 54.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.125, 58.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 61.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [78.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.27374, -2.22285, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [75.625, 55.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [75.125, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.625, 56.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [75.625, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 62.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [79.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.98181, -2.38732, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [75.625, 57.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.125, 59.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [75.625, 58.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [76.125, 60.875], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 62.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [79.625, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.64916, -2.42756, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [67.125, 59.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [76.625, 60.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [76.125, 50.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.125, 60.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.125, 63.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.125, 64.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.32643, -2.33743, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [67.625, 59.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.625, 50.875], "uv_size": [0.25, 0.875]}, + "south": {"uv": [68.125, 59.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [67.625, 61.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [67.125, 64.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.625, 51.125], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.06276, -2.13067, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [76.125, 51.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [68.125, 61.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [68.625, 59.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.625, 52.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [67.625, 64.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.625, 51.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.10171, -1.83874, -2.82718], + "size": [0.7161, 1.78403, 0.5], + "pivot": [-0.35629, -1.58728, -1.31952], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [69.125, 59.875], "uv_size": [0.375, 0.875]}, + "east": {"uv": [77.625, 53.375], "uv_size": [0.25, 0.875]}, + "south": {"uv": [76.125, 52.875], "uv_size": [0.375, 0.875]}, + "west": {"uv": [77.625, 54.375], "uv_size": [0.25, 0.875]}, + "up": {"uv": [80.625, 51.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.625, 52.625], "uv_size": [0.375, -0.25]} + } + } + ] + }, + { + "name": "bone31", + "parent": "bone33", + "pivot": [0.5, -1.49722, -1.53549], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.17417, -1.48265, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "uv": { + "north": {"uv": [69.625, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [77.625, 55.375], "uv_size": [0.25, 0.75]}, + "south": {"uv": [70.125, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [77.625, 56.375], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 52.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.625, 53.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.07417, -0.28265, -3.27473], + "size": [0.85165, 0.42346, 0.45], + "uv": { + "north": {"uv": [80.625, 53.875], "uv_size": [0.375, 0.25]}, + "east": {"uv": [68.125, 64.875], "uv_size": [0.25, 0.25]}, + "south": {"uv": [80.625, 54.375], "uv_size": [0.375, 0.25]}, + "west": {"uv": [81.125, 51.875], "uv_size": [0.25, 0.25]}, + "up": {"uv": [80.625, 54.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.625, 55.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.12583, -0.1037, -3.22086], + "size": [1.25165, 0.51721, 1.26172], + "pivot": [0.5, 0.1549, -2.59], + "rotation": [16.5, 0, 0], + "uv": { + "north": {"uv": [76.125, 61.875], "uv_size": [0.625, 0.25]}, + "east": {"uv": [78.125, 59.875], "uv_size": [0.625, 0.25]}, + "south": {"uv": [78.125, 60.375], "uv_size": [0.625, 0.25]}, + "west": {"uv": [78.125, 60.875], "uv_size": [0.625, 0.25]}, + "up": {"uv": [67.125, 50.875], "uv_size": [0.625, 0.625]}, + "down": {"uv": [67.125, 52.5], "uv_size": [0.625, -0.625]} + } + }, + { + "origin": [-0.02583, 0.06482, -2.05857], + "size": [1.05165, 0.51721, 0.76172], + "uv": { + "north": {"uv": [72.625, 63.875], "uv_size": [0.5, 0.25]}, + "east": {"uv": [80.625, 55.875], "uv_size": [0.375, 0.25]}, + "south": {"uv": [73.125, 63.875], "uv_size": [0.5, 0.25]}, + "west": {"uv": [72.625, 64.375], "uv_size": [0.375, 0.25]}, + "up": {"uv": [77.625, 57.375], "uv_size": [0.5, 0.375]}, + "down": {"uv": [77.625, 58.25], "uv_size": [0.5, -0.375]} + } + }, + { + "origin": [1.02583, 0.06482, -1.55857], + "size": [0.15, 0.51721, 0.26172], + "uv": { + "north": {"uv": [75.625, 65.875], "uv_size": [0.125, 0.25]}, + "east": {"uv": [82.125, 59.375], "uv_size": [0.125, 0.25]}, + "south": {"uv": [76.125, 65.875], "uv_size": [0.125, 0.25]}, + "west": {"uv": [82.125, 59.875], "uv_size": [0.125, 0.25]}, + "up": {"uv": [79.625, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [82.125, 63.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [-0.17583, 0.06482, -1.55857], + "size": [0.15, 0.51721, 0.26172], + "uv": { + "north": {"uv": [76.625, 65.875], "uv_size": [0.125, 0.25]}, + "east": {"uv": [82.125, 60.375], "uv_size": [0.125, 0.25]}, + "south": {"uv": [77.125, 65.875], "uv_size": [0.125, 0.25]}, + "west": {"uv": [82.125, 60.875], "uv_size": [0.125, 0.25]}, + "up": {"uv": [80.125, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [82.125, 64], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.25619, -1.77633, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [76.125, 53.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [77.625, 58.375], "uv_size": [0.25, 0.75]}, + "south": {"uv": [70.625, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [77.625, 59.375], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 56.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [73.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.44435, -2.01627, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [71.125, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [77.625, 60.375], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.125, 54.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [77.125, 61.375], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 56.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [73.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.71, -2.16595, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [71.625, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [77.625, 61.375], "uv_size": [0.25, 0.75]}, + "south": {"uv": [72.125, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [67.125, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 57.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [74.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.01272, -2.20256, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [76.125, 55.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [78.125, 50.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [72.625, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [78.125, 51.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 57.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [74.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.3064, -2.12055, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [73.125, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [68.625, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.125, 56.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [69.125, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 58.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [75.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.54634, -1.93239, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [73.625, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [78.125, 52.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [74.125, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [69.625, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 58.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [75.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [1.69601, -1.66673, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [1.27923, -1.43791, -1.45276], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [76.125, 57.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [70.125, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [74.625, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [78.125, 53.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 59.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [76.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.38428, -1.60128, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [75.125, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [70.625, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.125, 58.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [71.125, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 59.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [76.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.30227, -1.89496, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [75.625, 59.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [78.125, 54.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.125, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [71.625, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 60.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [77.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-1.11411, -2.1349, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [76.625, 50.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [72.125, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.625, 51.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [78.125, 55.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 60.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [77.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.84845, -2.28458, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [76.625, 52.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [72.625, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.625, 53.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [73.125, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 61.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [78.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.54574, -2.32119, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [76.625, 54.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [78.125, 56.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.625, 55.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [73.625, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 61.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [78.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.25206, -2.23918, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [76.625, 56.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [74.125, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.625, 57.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [78.125, 57.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 62.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [79.125, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [-0.01211, -2.05102, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [76.625, 58.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [74.625, 61.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [76.625, 59.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [75.125, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 62.875], "uv_size": [0.375, 0.25]}, + "down": {"uv": [79.625, 64.625], "uv_size": [0.375, -0.25]} + } + }, + { + "origin": [0.13756, -1.78536, -3.22473], + "size": [0.65165, 1.62346, 0.4], + "pivot": [-0.27923, -1.55654, -1.45276], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [67.125, 60.875], "uv_size": [0.375, 0.75]}, + "east": {"uv": [78.125, 58.875], "uv_size": [0.25, 0.75]}, + "south": {"uv": [77.125, 50.875], "uv_size": [0.375, 0.75]}, + "west": {"uv": [75.625, 61.875], "uv_size": [0.25, 0.75]}, + "up": {"uv": [80.625, 63.375], "uv_size": [0.375, 0.25]}, + "down": {"uv": [80.125, 64.625], "uv_size": [0.375, -0.25]} + } + } + ] + }, + { + "name": "bone32", + "parent": "bone33", + "pivot": [0.5, -1.16767, -3.19227], + "rotation": [-11.25, 0, 0], + "cubes": [ + { + "origin": [0.34878, -1.16091, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "uv": { + "north": {"uv": [81.625, 56.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [73.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 57.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [74.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [80.625, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [82.125, 64.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.38685, -1.2972, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [81.625, 57.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [74.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 58.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [75.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [81.125, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [82.125, 65], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.47417, -1.40856, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [81.625, 58.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [75.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 59.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [76.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [81.625, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [82.125, 65.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.59746, -1.47802, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 67.5], + "uv": { + "north": {"uv": [81.625, 59.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [76.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 60.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [77.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.125, 65.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [67.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.73795, -1.49502, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [81.625, 60.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [77.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 61.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [78.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 50.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [67.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.87425, -1.45695, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 112.5], + "uv": { + "north": {"uv": [81.625, 61.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [78.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 62.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [79.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 51.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [68.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.98561, -1.36963, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 135], + "uv": { + "north": {"uv": [81.625, 62.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [79.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 63.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [80.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 51.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [68.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [1.05507, -1.24634, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.86164, -1.14014, -2.3699], + "rotation": [0, 0, 157.5], + "uv": { + "north": {"uv": [81.625, 63.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [80.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [81.625, 64.375], "uv_size": [0.125, 0.375]}, + "west": {"uv": [81.125, 65.375], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 52.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [69.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [-0.37449, -1.21596, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -180], + "uv": { + "north": {"uv": [81.625, 64.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [81.625, 65.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [67.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 50.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 52.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [69.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [-0.33643, -1.35226, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -157.5], + "uv": { + "north": {"uv": [67.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 51.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [68.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 51.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 53.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [70.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [-0.24911, -1.46362, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -135], + "uv": { + "north": {"uv": [68.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 52.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [69.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 52.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 53.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [70.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [-0.12582, -1.53308, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [69.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 53.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [70.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 53.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 54.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [71.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.01467, -1.55007, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [70.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 54.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [71.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 54.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 54.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [71.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.15097, -1.51201, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [71.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 55.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [72.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 55.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 55.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [72.125, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.26233, -1.42469, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [72.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 56.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [73.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 56.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 55.875], "uv_size": [0.125, 0.125]}, + "down": {"uv": [72.625, 66.5], "uv_size": [0.125, -0.125]} + } + }, + { + "origin": [0.33179, -1.30139, -3.23914], + "size": [0.30243, 0.75345, 0.04688], + "pivot": [0.13836, -1.1952, -2.3699], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [73.625, 65.875], "uv_size": [0.125, 0.375]}, + "east": {"uv": [82.125, 57.375], "uv_size": [0.125, 0.375]}, + "south": {"uv": [74.125, 65.875], "uv_size": [0.125, 0.375]}, + "west": {"uv": [82.125, 57.875], "uv_size": [0.125, 0.375]}, + "up": {"uv": [82.625, 56.375], "uv_size": [0.125, 0.125]}, + "down": {"uv": [73.125, 66.5], "uv_size": [0.125, -0.125]} + } + } + ] + }, + { + "name": "normalmag", + "parent": "magazine", + "pivot": [6.05277, -4.30277, -7.80277], "cubes": [ { "origin": [0.32123, -1.13837, -2.85057], @@ -8250,57 +10191,14 @@ } ] }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0.50283, 1.51538, -1.50152], - "cubes": [ - { - "origin": [0.3238, 1.33635, -2.08242], - "size": [0.35805, 0.35805, 0.9922], - "uv": { - "north": {"uv": [53, 57], "uv_size": [0.25, 0.25]}, - "east": {"uv": [44, 40], "uv_size": [1, 0.25]}, - "south": {"uv": [57, 53], "uv_size": [0.25, 0.25]}, - "west": {"uv": [41, 44], "uv_size": [1, 0.25]}, - "up": {"uv": [42, 44], "uv_size": [0.25, 1]}, - "down": {"uv": [44, 43], "uv_size": [0.25, -1]} - } - }, - { - "origin": [0.37, 1.38255, -2.48162], - "size": [0.26565, 0.26565, 1.53], - "uv": { - "north": {"uv": [54, 57], "uv_size": [0.25, 0.25]}, - "east": {"uv": [41, 27], "uv_size": [1.5, 0.25]}, - "south": {"uv": [57, 54], "uv_size": [0.25, 0.25]}, - "west": {"uv": [41, 28], "uv_size": [1.5, 0.25]}, - "up": {"uv": [28, 41], "uv_size": [0.25, 1.5]}, - "down": {"uv": [41, 30.5], "uv_size": [0.25, -1.5]} - } - }, - { - "origin": [0.3238, 1.33635, -0.99782], - "size": [0.35805, 0.35805, 0.0924], - "uv": { - "north": {"uv": [55, 57], "uv_size": [0.25, 0.25]}, - "east": {"uv": [57, 55], "uv_size": [0.25, 0.25]}, - "south": {"uv": [56, 57], "uv_size": [0.25, 0.25]}, - "west": {"uv": [57, 56], "uv_size": [0.25, 0.25]}, - "up": {"uv": [57, 57], "uv_size": [0.25, 0.25]}, - "down": {"uv": [0, 58.25], "uv_size": [0.25, -0.25]} - } - } - ] - }, { "name": "bone20", - "parent": "magazine", + "parent": "normalmag", "pivot": [0.25733, -5.62718, -2.14124] }, { "name": "bone19", - "parent": "magazine", + "parent": "normalmag", "pivot": [1.04904, -2.51341, -5.66438], "cubes": [ { @@ -8371,6 +10269,253 @@ } ] }, + { + "name": "extendmag", + "parent": "magazine", + "pivot": [6.05277, -4.30277, -7.80277], + "cubes": [ + { + "origin": [0.32123, -1.13837, -2.85057], + "size": [0.35753, 1.56422, 0.32139], + "pivot": [1.04904, -0.17223, -3.07823], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [22, 41], "uv_size": [0.25, 1.5]}, + "east": {"uv": [41, 22], "uv_size": [0.25, 1.5]}, + "south": {"uv": [24, 41], "uv_size": [0.25, 1.5]}, + "west": {"uv": [41, 24], "uv_size": [0.25, 1.5]}, + "up": {"uv": [49, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [57, 49.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.32123, 0.30724, -2.74444], + "size": [0.35753, 1.21656, 0.32139], + "uv": { + "north": {"uv": [43, 21], "uv_size": [0.25, 1.25]}, + "east": {"uv": [22, 43], "uv_size": [0.25, 1.25]}, + "south": {"uv": [23, 43], "uv_size": [0.25, 1.25]}, + "west": {"uv": [43, 23], "uv_size": [0.25, 1.25]}, + "up": {"uv": [50, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [57, 50.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.22123, 0.99474, -2.796], + "size": [0.55753, 0.53687, 0.32608], + "uv": { + "north": {"uv": [39, 44], "uv_size": [0.5, 0.5]}, + "east": {"uv": [3, 52], "uv_size": [0.25, 0.5]}, + "south": {"uv": [44, 39], "uv_size": [0.5, 0.5]}, + "west": {"uv": [52, 3], "uv_size": [0.25, 0.5]}, + "up": {"uv": [4, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 4.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [0.32123, -2.78551, -3.23669], + "size": [0.35753, 1.81422, 0.32139], + "pivot": [1.04904, -1.56937, -3.46435], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [3, 40], "uv_size": [0.25, 1.75]}, + "east": {"uv": [4, 40], "uv_size": [0.25, 1.75]}, + "south": {"uv": [5, 40], "uv_size": [0.25, 1.75]}, + "west": {"uv": [6, 40], "uv_size": [0.25, 1.75]}, + "up": {"uv": [51, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [57, 51.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.32123, -6.61922, -5.52139], + "size": [0.35753, 1.89625, 0.32139], + "pivot": [0.5, -5.57775, -4.43769], + "rotation": [-43.75, 0, 0], + "uv": { + "north": {"uv": [40, 7], "uv_size": [0.25, 1.75]}, + "east": {"uv": [40, 9], "uv_size": [0.25, 1.75]}, + "south": {"uv": [11, 40], "uv_size": [0.25, 1.75]}, + "west": {"uv": [40, 11], "uv_size": [0.25, 1.75]}, + "up": {"uv": [52, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [57, 52.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.24472, -6.58078, -3.70194], + "size": [0.51056, 2.05333, 0.20113], + "pivot": [0.5, -5.68066, -4.52438], + "rotation": [-43.75, 0, 0], + "uv": { + "north": {"uv": [13, 28], "uv_size": [0.5, 2.25]}, + "east": {"uv": [24, 38], "uv_size": [0.25, 2.25]}, + "south": {"uv": [28, 16], "uv_size": [0.5, 2.25]}, + "west": {"uv": [25, 38], "uv_size": [0.25, 2.25]}, + "up": {"uv": [5, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 5.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [0.24472, -3.18217, -1.66692], + "size": [0.51056, 2.2627, 0.20113], + "pivot": [0.5, -2.64546, -2.78745], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 2.25]}, + "east": {"uv": [38, 25], "uv_size": [0.25, 2.25]}, + "south": {"uv": [21, 28], "uv_size": [0.5, 2.25]}, + "west": {"uv": [26, 38], "uv_size": [0.25, 2.25]}, + "up": {"uv": [6, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 6.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [0.32123, -5.00441, -4.30725], + "size": [0.35753, 1.81422, 0.32139], + "pivot": [0.5, -4.01304, -3.2116], + "rotation": [-32.5, 0, 0], + "uv": { + "north": {"uv": [3, 40], "uv_size": [0.25, 1.75]}, + "east": {"uv": [4, 40], "uv_size": [0.25, 1.75]}, + "south": {"uv": [5, 40], "uv_size": [0.25, 1.75]}, + "west": {"uv": [6, 40], "uv_size": [0.25, 1.75]}, + "up": {"uv": [51, 57], "uv_size": [0.25, 0.25]}, + "down": {"uv": [57, 51.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [0.24472, -5.16303, -2.46389], + "size": [0.51056, 2.2627, 0.20113], + "pivot": [0.5, -4.11594, -3.29828], + "rotation": [-32.5, 0, 0], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 2.25]}, + "east": {"uv": [38, 25], "uv_size": [0.25, 2.25]}, + "south": {"uv": [21, 28], "uv_size": [0.5, 2.25]}, + "west": {"uv": [26, 38], "uv_size": [0.25, 2.25]}, + "up": {"uv": [6, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 6.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [0.24472, -1.22951, -1.25992], + "size": [0.51056, 1.6627, 0.20113], + "pivot": [0.5, -2.1693, -2.64301], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [32, 7], "uv_size": [0.5, 1.75]}, + "east": {"uv": [12, 40], "uv_size": [0.25, 1.75]}, + "south": {"uv": [32, 9], "uv_size": [0.5, 1.75]}, + "west": {"uv": [13, 40], "uv_size": [0.25, 1.75]}, + "up": {"uv": [7, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 7.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [0.24472, 0.07412, -0.78264], + "size": [0.51056, 1.44119, 0.20113], + "uv": { + "north": {"uv": [30, 32], "uv_size": [0.5, 1.5]}, + "east": {"uv": [25, 41], "uv_size": [0.25, 1.5]}, + "south": {"uv": [31, 32], "uv_size": [0.5, 1.5]}, + "west": {"uv": [26, 41], "uv_size": [0.25, 1.5]}, + "up": {"uv": [8, 52], "uv_size": [0.5, 0.25]}, + "down": {"uv": [52, 8.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "bone11", + "parent": "extendmag", + "pivot": [0.25733, -5.62718, -2.14124] + }, + { + "name": "bone12", + "parent": "extendmag", + "pivot": [1.04904, -2.51341, -5.66438], + "cubes": [ + { + "origin": [0.13822, -2.73175, -3.28437], + "size": [0.72356, 2.14106, 1.88956], + "pivot": [1.04904, -2.18877, -3.65373], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [23, 10], "uv_size": [0.75, 2.25]}, + "east": {"uv": [8, 5], "uv_size": [2, 2.25]}, + "south": {"uv": [23, 21], "uv_size": [0.75, 2.25]}, + "west": {"uv": [9, 0], "uv_size": [2, 2.25]}, + "up": {"uv": [11, 24], "uv_size": [0.75, 2]}, + "down": {"uv": [24, 14], "uv_size": [0.75, -2]} + } + }, + { + "origin": [0.13822, -4.97538, -4.14087], + "size": [0.72356, 2.14106, 1.88956], + "pivot": [0.5, -4.01243, -3.24898], + "rotation": [-32.5, 0, 0], + "uv": { + "north": {"uv": [23, 10], "uv_size": [0.75, 2.25]}, + "east": {"uv": [8, 5], "uv_size": [2, 2.25]}, + "south": {"uv": [23, 21], "uv_size": [0.75, 2.25]}, + "west": {"uv": [9, 0], "uv_size": [2, 2.25]}, + "up": {"uv": [11, 24], "uv_size": [0.75, 2]}, + "down": {"uv": [24, 14], "uv_size": [0.75, -2]} + } + }, + { + "origin": [0.13822, -6.58986, -5.39461], + "size": [0.72356, 2.24106, 1.88956], + "pivot": [0.5, -5.57715, -4.47508], + "rotation": [-43.75, 0, 0], + "uv": { + "north": {"uv": [22, 23], "uv_size": [0.75, 2.25]}, + "east": {"uv": [4, 9], "uv_size": [2, 2.25]}, + "south": {"uv": [24, 8], "uv_size": [0.75, 2.25]}, + "west": {"uv": [6, 9], "uv_size": [2, 2.25]}, + "up": {"uv": [13, 24], "uv_size": [0.75, 2]}, + "down": {"uv": [15, 26], "uv_size": [0.75, -2]} + } + }, + { + "origin": [0.13822, -1.42576, -2.66826], + "size": [0.72356, 1.64106, 1.88956], + "pivot": [0.5, -0.60523, -1.63364], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [26, 7], "uv_size": [0.75, 1.75]}, + "east": {"uv": [11, 10], "uv_size": [2, 1.75]}, + "south": {"uv": [13, 26], "uv_size": [0.75, 1.75]}, + "west": {"uv": [4, 12], "uv_size": [2, 1.75]}, + "up": {"uv": [16, 24], "uv_size": [0.75, 2]}, + "down": {"uv": [17, 26], "uv_size": [0.75, -2]} + } + }, + { + "origin": [0.1226, 0.97258, -2.22773], + "size": [0.75481, 0.55903, 1.40909], + "uv": { + "north": {"uv": [41, 26], "uv_size": [0.75, 0.5]}, + "east": {"uv": [32, 32], "uv_size": [1.5, 0.5]}, + "south": {"uv": [27, 41], "uv_size": [0.75, 0.5]}, + "west": {"uv": [33, 0], "uv_size": [1.5, 0.5]}, + "up": {"uv": [28, 19], "uv_size": [0.75, 1.5]}, + "down": {"uv": [26, 29.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [0.13822, 0.03274, -2.52461], + "size": [0.72356, 1.49106, 1.88956], + "uv": { + "north": {"uv": [28, 26], "uv_size": [0.75, 1.5]}, + "east": {"uv": [13, 3], "uv_size": [2, 1.5]}, + "south": {"uv": [27, 28], "uv_size": [0.75, 1.5]}, + "west": {"uv": [13, 5], "uv_size": [2, 1.5]}, + "up": {"uv": [24, 21], "uv_size": [0.75, 2]}, + "down": {"uv": [23, 26], "uv_size": [0.75, -2]} + } + } + ] + }, { "name": "Righthand", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/sounds.json b/src/main/resources/assets/superbwarfare/sounds.json index 079e23bc6..49e7f3982 100644 --- a/src/main/resources/assets/superbwarfare/sounds.json +++ b/src/main/resources/assets/superbwarfare/sounds.json @@ -1573,6 +1573,22 @@ } ] }, + "ak_12_fire_1p_s": { + "sounds": [ + { + "name": "superbwarfare:ak_12/ak_12_fire_1p_s", + "stream": false + } + ] + }, + "ak_12_fire_3p_s": { + "sounds": [ + { + "name": "superbwarfare:ak_12/ak_12_fire_3p_s", + "stream": false + } + ] + }, "ak_12_far": { "sounds": [ { @@ -1589,6 +1605,22 @@ } ] }, + "ak_12_far_s": { + "sounds": [ + { + "name": "superbwarfare:ak_12/ak_12_far_s", + "stream": false + } + ] + }, + "ak_12_veryfar_s": { + "sounds": [ + { + "name": "superbwarfare:ak_12/ak_12_veryfar_s", + "stream": false + } + ] + }, "ak_12_reload_normal": { "sounds": [ { diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_far_s.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_far_s.ogg new file mode 100644 index 000000000..98dc2acb9 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_far_s.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p_s.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p_s.ogg new file mode 100644 index 000000000..844fa3868 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p_s.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg index 19e963ec8..b09dca005 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p_s.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p_s.ogg new file mode 100644 index 000000000..0e6d5ec6d Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p_s.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_veryfar_s.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_veryfar_s.ogg new file mode 100644 index 000000000..86271e1e9 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_veryfar_s.ogg differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ak12.png b/src/main/resources/assets/superbwarfare/textures/item/ak12.png index b72363c69..b766b496f 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/ak12.png and b/src/main/resources/assets/superbwarfare/textures/item/ak12.png differ diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 3efb021a4..c88c98298 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 1.25, "spread": 3.5, "recoil_x": 0.006, @@ -9,7 +8,7 @@ "velocity": 13, "mag": 25, "projectile_amount": 12, - "weight": 1, + "weight": 7, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index 89db09012..a6ad5cc3c 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.4, "zoom": 1.25, "spread": 4, "recoil_x": 0.005, @@ -9,7 +8,7 @@ "velocity": 12, "mag": 2, "projectile_amount": 12, - "weight": 0, + "weight": 1, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index 66818a73c..8f2878062 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.13, "zoom": 1.25, "spread": 3.5, "recoil_x": 0.0015, @@ -9,7 +8,7 @@ "velocity": 23, "mag": 30, "projectile_amount": 1, - "weight": 1, + "weight": 4, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 0c1d59cbf..ce8663995 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.1, "zoom": 1.25, "spread": 4, "recoil_x": 0.002, @@ -9,7 +8,7 @@ "velocity": 22, "mag": 30, "projectile_amount": 1, - "weight": 1, + "weight": 5, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/bocek.json b/src/main/resources/data/superbwarfare/guns/bocek.json index 2d78c7752..5dd17e250 100644 --- a/src/main/resources/data/superbwarfare/guns/bocek.json +++ b/src/main/resources/data/superbwarfare/guns/bocek.json @@ -1,12 +1,10 @@ { - "zoom_speed": 1, "zoom": 2, "spread": 4, - "zoomSpread": 1, "recoil_x": 0.005, "recoil_y": 0.003, "headshot": 2.5, "damage": 36, - "weight": 1, + "weight": 3, "BypassesArmor": 0.25 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index c9e4829dd..fd5508b89 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 2, "spread": 5, "bipod": 1, @@ -10,7 +9,7 @@ "velocity": 25, "mag": 55, "projectile_amount": 1, - "weight": 1, + "weight": 6, "fire_mode": 2, "semi": 0, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 85c824543..2c84e93dd 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.9, "zoom": 1.25, "spread": 2.5, "recoil_x": 0.004, @@ -9,7 +8,7 @@ "velocity": 16, "mag": 17, "projectile_amount": 1, - "weight": 0, + "weight": 1, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index d2bfe8c18..8327ee29c 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.9, "zoom": 1.25, "spread": 2.5, "recoil_x": 0.004, @@ -9,7 +8,7 @@ "velocity": 16, "mag": 17, "projectile_amount": 1, - "weight": 0, + "weight": 1, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 83c7bc6c9..81c011b64 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.3, "zoom": 1.25, "spread": 3.5, "recoil_x": 0.0016, @@ -9,7 +8,7 @@ "velocity": 24, "mag": 30, "projectile_amount": 1, - "weight": 1, + "weight": 4, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index de6080d2a..0b44ee86e 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 1.25, "spread": 7, "recoil_x": 0.004, @@ -9,7 +8,7 @@ "velocity": 38, "mag": 1, "projectile_amount": 1, - "weight": 1, + "weight": 5, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json index 70af7084b..a0ddbe6ce 100644 --- a/src/main/resources/data/superbwarfare/guns/javelin.json +++ b/src/main/resources/data/superbwarfare/guns/javelin.json @@ -1,12 +1,11 @@ { - "zoom_speed": 0.62, "zoom": 2, "min_zoom": 2, "max_zoom": 6, "spread": 5, "zoomSpread": 5, "mag": 1, - "weight": 2, + "weight": 10, "empty_reload_time": 78, "damage": 300, "BypassesArmor": 1 diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index d1b6948cc..a9553e4c2 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.05, "zoom": 1.25, "spread": 5, "recoil_x": 0.002, @@ -10,7 +9,7 @@ "projectile_amount": 1, "mag": 5, "bolt_action_time": 22, - "weight": 1, + "weight": 5, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index b590fa35d..6c51c50de 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.7, "zoom": 1.25, "spread": 2.5, "recoil_x": 0.006, @@ -9,7 +8,7 @@ "velocity": 14, "mag": 7, "projectile_amount": 1, - "weight": 0, + "weight": 2, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 5c2abb36d..7d619f040 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.15, "zoom": 1.25, "spread": 4, "recoil_x": 0.0015, @@ -9,7 +8,7 @@ "velocity": 24, "mag": 30, "projectile_amount": 1, - "weight": 1, + "weight": 4, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index e03dd3ae1..28587ed40 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.68, "zoom": 1.25, "spread": 5, "bipod": 1, @@ -10,7 +9,7 @@ "velocity": 22, "mag": 100, "projectile_amount": 1, - "weight": 2, + "weight": 8, "fire_mode": 2, "semi": 0, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json index 98fc9a1d8..977ca84c4 100644 --- a/src/main/resources/data/superbwarfare/guns/m_79.json +++ b/src/main/resources/data/superbwarfare/guns/m_79.json @@ -1,18 +1,11 @@ { - "zoom_speed": 0.95, "zoom": 1.25, "spread": 1.5, - "zoomSpread": 0.1, "recoil_x": 0.004, "recoil_y": 0.023, "damage": 40, "velocity": 3.75, "mag": 1, - "weight": 1, - "fire_mode": 0, - "semi": 1, - "burst": 0, - "auto": 0, - "burst_size": 1, + "weight": 4, "empty_reload_time": 64 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 142fd7350..6f6fc7d79 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.1, "zoom": 1.25, "spread": 3, "recoil_x": 0.009, @@ -10,7 +9,7 @@ "mag": 8, "force_stop_reloading": 1, "projectile_amount": 12, - "weight": 1, + "weight": 4, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 531c74f9d..ae6259b01 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.7, "zoom": 6, "min_zoom": 4, "max_zoom": 8, @@ -12,7 +11,7 @@ "projectile_amount": 1, "mag": 5, "bolt_action_time": 18, - "weight": 1, + "weight": 7, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 391307b3d..17d482a0d 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.1, "zoom": 1.25, "spread": 2, "recoil_x": 0.004, @@ -10,7 +9,7 @@ "mag": 8, "force_stop_reloading": 1, "projectile_amount": 1, - "weight": 1, + "weight": 3, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 6ee310825..565498d94 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -6,7 +6,7 @@ "damage": 8, "headshot": 2, "velocity": 24, - "weight": 2, + "weight": 10, "fire_mode": 2, "projectile_amount": 1, "BypassesArmor": 0.3, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index dde6565ac..7e42bcaca 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 4, "min_zoom": 1.25, "max_zoom": 6, @@ -12,7 +11,7 @@ "velocity": 25, "mag": 20, "projectile_amount": 1, - "weight": 1, + "weight": 5, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index 87475fd6f..c02c92dcd 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 3.5, "spread": 4.8, "recoil_x": 0.002, @@ -10,7 +9,7 @@ "projectile_amount": 1, "mag": 5, "bolt_action_time": 22, - "weight": 1, + "weight": 5, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index e87d241d9..cc2a0a27e 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.55, "zoom": 6, "min_zoom": 1.3, "max_zoom": 6, @@ -13,7 +12,7 @@ "projectile_amount": 1, "mag": 3, "bolt_action_time": 37, - "weight": 2, + "weight": 10, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 9bb100496..a9c9af405 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.25, "zoom": 1.25, "spread": 3.7, "recoil_x": 0.0013, @@ -9,7 +8,7 @@ "velocity": 27, "mag": 30, "projectile_amount": 1, - "weight": 1, + "weight": 4, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json index b1403ab87..abf1f0004 100644 --- a/src/main/resources/data/superbwarfare/guns/rpg.json +++ b/src/main/resources/data/superbwarfare/guns/rpg.json @@ -1,19 +1,12 @@ { - "zoom_speed": 0.77, "zoom": 1.25, "spread": 5, - "zoomSpread": 0.2, "recoil_x": 0.008, "recoil_y": 0.018, "damage": 250, "velocity": 4, "mag": 1, - "weight": 1, - "fire_mode": 0, - "semi": 1, - "burst": 0, - "auto": 0, - "burst_size": 1, + "weight": 7, "empty_reload_time": 103, "BypassesArmor": 1 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index ebede6a89..f9846a91b 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.75, "zoom": 1.25, "spread": 5.5, "bipod": 1, @@ -10,7 +9,7 @@ "velocity": 24, "mag": 75, "projectile_amount": 1, - "weight": 1, + "weight": 6, "fire_mode": 2, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index 4ebd1960a..6eae0fad9 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.85, "zoom": 3, "spread": 6, "recoil_x": 0.007, @@ -10,7 +9,7 @@ "headshot": 3, "velocity": 39, "bolt_action_time": 22, - "weight": 1, + "weight": 7, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 2a24736bf..33c48454a 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1, "zoom": 1.25, "spread": 4.5, "recoil_x": 0.004, @@ -9,7 +8,7 @@ "velocity": 23, "mag": 20, "projectile_amount": 1, - "weight": 1, + "weight": 4, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index e57a57c9e..c63bf2d20 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -1,5 +1,4 @@ { - "zoom_speed": 0.9, "zoom": 4, "spread": 5.5, "recoil_x": 0.004, @@ -9,7 +8,7 @@ "velocity": 25, "mag": 10, "projectile_amount": 1, - "weight": 1, + "weight": 5, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json index 180608627..28bdc3a15 100644 --- a/src/main/resources/data/superbwarfare/guns/taser.json +++ b/src/main/resources/data/superbwarfare/guns/taser.json @@ -1,18 +1,11 @@ { "spread": 2, - "zoomSpread": 0.1, "recoil_x": 0.0001, "recoil_y": 0.002, - "zoom_speed": 2, "zoom": 1.25, "damage": 5, "velocity": 3, "mag": 1, - "weight": 0, - "fire_mode": 0, - "semi": 1, - "burst": 0, - "auto": 0, - "burst_size": 1, + "weight": 1, "empty_reload_time": 58 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index 7863f897c..0440bb393 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.7, "zoom": 1.25, "spread": 3, "recoil_x": 0.005, @@ -9,7 +8,7 @@ "velocity": 24, "mag": 6, "projectile_amount": 1, - "weight": 0, + "weight": 2, "fire_mode": 0, "semi": 1, "burst": 0, diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 48360fe49..e0567de24 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -1,5 +1,4 @@ { - "zoom_speed": 1.6, "zoom": 1.25, "spread": 2.3, "recoil_x": 0.002, @@ -9,7 +8,7 @@ "velocity": 16, "mag": 33, "projectile_amount": 1, - "weight": 0, + "weight": 3, "fire_mode": 2, "semi": 1, "burst": 1,