From bb4ac8606ab62175dbbfdfc810efdf5d3d363969 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 16 Aug 2024 20:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=AD=A6=E5=99=A8=E7=9A=84=E6=89=8B=E8=87=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK47ItemModel.java | 18 +- .../client/model/item/Aa12ItemModel.java | 15 +- .../client/model/item/AbekiriItemModel.java | 11 - .../client/model/item/BocekItemModel.java | 12 +- .../client/model/item/DevotionItemModel.java | 27 +- .../client/model/item/Glock17ItemModel.java | 19 +- .../client/model/item/Glock18ItemModel.java | 19 +- .../client/model/item/Hk416ItemModel.java | 23 +- .../client/model/item/K98ItemModel.java | 20 +- .../client/model/item/M1911ItemModel.java | 21 +- .../client/model/item/M4ItemModel.java | 19 +- .../client/model/item/M60ItemModel.java | 24 +- .../client/model/item/M79ItemModel.java | 24 +- .../client/model/item/M870ItemModel.java | 16 +- .../client/model/item/M98bItemModel.java | 29 +- .../client/model/item/MinigunItemModel.java | 21 +- .../client/model/item/Qbz95ItemModel.java | 13 +- .../model/item/TracheliumItemModel.java | 20 +- .../renderer/item/AK47ItemRenderer.java | 127 +- .../renderer/item/Aa12ItemRenderer.java | 117 +- .../renderer/item/AbekiriItemRenderer.java | 117 +- .../renderer/item/BocekItemRenderer.java | 120 +- .../renderer/item/DevotionItemRenderer.java | 127 +- .../renderer/item/Glock17ItemRenderer.java | 115 + .../renderer/item/Glock18ItemRenderer.java | 115 + .../renderer/item/Hk416ItemRenderer.java | 127 +- .../item/HuntingRifleItemRenderer.java | 117 +- .../client/renderer/item/K98ItemRenderer.java | 115 + .../renderer/item/M1911ItemRenderer.java | 115 + .../client/renderer/item/M60ItemRenderer.java | 117 +- .../client/renderer/item/M79ItemRenderer.java | 117 +- .../renderer/item/M870ItemRenderer.java | 75 +- .../renderer/item/M98bItemRenderer.java | 135 +- .../renderer/item/MinigunItemRenderer.java | 100 +- .../renderer/item/Qbz95ItemRenderer.java | 125 + .../renderer/item/TracheliumItemRenderer.java | 117 +- .../animations/aa12.animation.json | 400 ++- .../animations/abekiri.animation.json | 114 +- .../animations/ak.animation.json | 98 +- .../animations/devotion.animation.json | 54 +- .../animations/glock17.animation.json | 659 ++--- .../animations/hk416.animation.json | 64 +- .../animations/hunting_rifle.animation.json | 30 +- .../animations/k98.animation.json | 116 +- .../animations/m60.animation.json | 100 +- .../animations/m79.animation.json | 26 +- .../animations/m870.animation.json | 697 ++--- .../animations/m98b.animation.json | 62 +- .../animations/qbz95.animation.json | 61 +- .../animations/trachelium.animation.json | 32 +- .../assets/superbwarfare/geo/aa12.geo.json | 2555 ++++++++--------- .../assets/superbwarfare/geo/abekiri.geo.json | 8 +- .../assets/superbwarfare/geo/ak.geo.json | 14 +- .../assets/superbwarfare/geo/bocek.geo.json | 62 +- .../superbwarfare/geo/devotion.geo.json | 8 +- .../assets/superbwarfare/geo/glock17.geo.json | 12 +- .../assets/superbwarfare/geo/glock18.geo.json | 14 +- .../assets/superbwarfare/geo/hk416.geo.json | 12 +- .../superbwarfare/geo/hunting_rifle.geo.json | 8 +- .../assets/superbwarfare/geo/kar98k.geo.json | 20 +- .../assets/superbwarfare/geo/m1911.geo.json | 40 +- .../assets/superbwarfare/geo/m60.geo.json | 4 +- .../assets/superbwarfare/geo/m79.geo.json | 4 +- .../assets/superbwarfare/geo/m870.geo.json | 42 +- .../assets/superbwarfare/geo/m98b.geo.json | 16 +- .../assets/superbwarfare/geo/minigun.geo.json | 22 +- .../assets/superbwarfare/geo/qbz95.geo.json | 8 +- .../superbwarfare/geo/trachelium.geo.json | 12 +- .../models/displaysettings/aa12.item.json | 4 +- .../models/displaysettings/hk416.item.json | 84 +- 70 files changed, 4821 insertions(+), 3090 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java index 53d38889a..716be7726 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK47ItemModel.java @@ -53,10 +53,8 @@ public class AK47ItemModel extends GeoModel { scope.setScaleZ(1f - (0.4f * (float) p)); - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); - holo.setHidden(!(gun.getPosX() > 1.8)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -77,20 +75,6 @@ public class AK47ItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.7 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.7 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) { - flare.setPosY(-0.75f); - } else { - flare.setPosY(0); - } - } else { - flare.setHidden(true); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java index a7d24bc74..19dd86eee 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Aa12ItemModel.java @@ -42,8 +42,8 @@ public class Aa12ItemModel extends GeoModel { double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(3.48f * (float) p); - gun.setPosY(-0.92f * (float) p - (float) (0.2f * zp)); + gun.setPosX(2.105f * (float) p); + gun.setPosY(0.17f * (float) p - (float) (0.2f * zp)); gun.setPosZ(0.1f * (float) p + (float) (0.3f * zp)); gun.setRotZ((float) (0.02f * zp)); @@ -65,17 +65,6 @@ public class Aa12ItemModel extends GeoModel { } shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java index f0789eb68..8561c8c7f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java @@ -63,17 +63,6 @@ public class AbekiriItemModel extends GeoModel { shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); shen.setRotY(-0.15f * (float) fr); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java index 12eee50e7..0200fba21 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java @@ -44,7 +44,7 @@ public class BocekItemModel extends GeoModel { CoreGeoBone deng = getAnimationProcessor().getBone("deng"); CoreGeoBone deng2 = getAnimationProcessor().getBone("deng2"); CoreGeoBone deng3 = getAnimationProcessor().getBone("deng3"); - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); + CoreGeoBone lh = getAnimationProcessor().getBone("lh"); CoreGeoBone r = getAnimationProcessor().getBone("r"); Player player = Minecraft.getInstance().player; @@ -52,9 +52,6 @@ public class BocekItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - arrow.setHidden(stack.getOrCreateTag().getInt("arrow_empty") > 0); - jian.setHidden(stack.getOrCreateTag().getInt("max_ammo") == 0); - double pp = player.getPersistentData().getDouble("pullpos"); double bp = player.getPersistentData().getDouble("bowpos"); double hp = player.getPersistentData().getDouble("handpos"); @@ -80,19 +77,20 @@ public class BocekItemModel extends GeoModel { deng2.setPosZ(0.05f * (float) bp); deng3.setRotX(-1.6f * (float) bp); deng3.setPosZ(0.05f * (float) bp); - - deng.setHidden(!(arrow.getPosZ() > 8.5)); + deng.setScaleZ(1f + (0.07f * (float) bp)); double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); + lh.setRotX(0.2f * (float) p); shen_pos.setPosX(-3.4f * (float) p); shen_pos.setPosY(6.76f * (float) p - (float) (0.2f * zp)); shen_pos.setPosZ(6.4f * (float) p + (float) (0.3f * zp)); r.setScaleZ(1f - (0.31f * (float) p)); shen.setRotZ(60 * Mth.DEG_TO_RAD * (float) p + (float) (0.05f * zp) - 0.2f); - holo.setHidden(!(shen_pos.getPosX() < -0.7 && gun.getPosZ() < -2.5)); + stack.getOrCreateTag().putBoolean("HoloHidden", !((shen_pos.getPosX() < -0.7 && gun.getPosZ() < -2.5))); + double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java index 2ebfff9c4..9b4c0ae03 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/DevotionItemModel.java @@ -42,13 +42,11 @@ public class DevotionItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double p = 0; - p = player.getPersistentData().getDouble("zoom_pos"); + double p = player.getPersistentData().getDouble("zoom_pos"); - double zp = 0; - zp = player.getPersistentData().getDouble("zoom_pos_z"); + double zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.19f * (float) p); + gun.setPosX(2.17f * (float) p); gun.setPosY(0.17f * (float) p - (float) (0.5f * zp)); @@ -67,15 +65,16 @@ public class DevotionItemModel extends GeoModel { bolt.setPosZ(-2f * (float) bp); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (gun.getPosX() > 1.2) { - holo.setHidden(false); - number.setHidden(false); + number.setScaleX(1); + number.setScaleY(1); } else { - holo.setHidden(true); - number.setHidden(true); + number.setScaleX(0); + number.setScaleY(0); } + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); + double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -92,14 +91,6 @@ public class DevotionItemModel extends GeoModel { } shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } CoreGeoBone n0 = getAnimationProcessor().getBone("00"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java index c06bb637c..6acad249c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java @@ -75,9 +75,13 @@ public class Glock17ItemModel extends GeoModel { if (stack.getOrCreateTag().getBoolean("HoldOpen")) { slide.setPosZ(1.5f); - bullet.setHidden(true); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); } else { - bullet.setHidden(false); + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); } CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -88,17 +92,6 @@ public class Glock17ItemModel extends GeoModel { double y = player.getPersistentData().getDouble("y"); double x = player.getPersistentData().getDouble("x"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - root.setPosX(PosX); root.setPosY((float) y + PosY); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java index 945f37a1c..4327d95f7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java @@ -83,9 +83,13 @@ public class Glock18ItemModel extends GeoModel { if (stack.getOrCreateTag().getBoolean("HoldOpen")) { slide.setPosZ(1.5f); - bullet.setHidden(true); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); } else { - bullet.setHidden(false); + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); } CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -96,17 +100,6 @@ public class Glock18ItemModel extends GeoModel { double y = player.getPersistentData().getDouble("y"); double x = player.getPersistentData().getDouble("x"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - root.setPosX(PosX); root.setPosY((float) y + PosY); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index da7531d89..ce89fb048 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java @@ -33,42 +33,31 @@ public class Hk416ItemModel extends GeoModel { public void setCustomAnimations(Hk416Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); CoreGeoBone scope = getAnimationProcessor().getBone("eotech"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(3.28f * (float) p); - gun.setPosY(1.04f * (float) p - (float) (0.2f * zp)); - gun.setPosZ(6f * (float) p + (float) (0.3f * zp)); + gun.setPosX(3.34f * (float) p); + gun.setPosY(0.54f * (float) p - (float) (0.2f * zp)); + gun.setPosZ(2.5f * (float) p + (float) (0.3f * zp)); gun.setRotZ((float) (0.05f * zp)); - scope.setScaleZ(1f - (0.5f * (float) p)); + scope.setScaleZ(1f - (0.7f * (float) p)); - holo.setHidden(!(gun.getPosX() > 3.1)); + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); - shen.setPosZ(0.2f * (float) (fp + 0.54f * fr)); + shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); shen.setRotZ(0f); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java index d0aac8fb5..137db4bc9 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java @@ -33,7 +33,6 @@ public class K98ItemModel extends GeoModel { public void setCustomAnimations(K98Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone clip = getAnimationProcessor().getBone("mag"); Player player = Minecraft.getInstance().player; @@ -42,19 +41,14 @@ public class K98ItemModel extends GeoModel { if (!stack.is(ModTags.Items.GUN)) return; - if (stack.getOrCreateTag().getDouble("prepare") > 13 && stack.getOrCreateTag().getInt("ammo") == 1) { - clip.setHidden(true); + if (stack.getOrCreateTag().getDouble("prepare") > 11 && stack.getOrCreateTag().getInt("ammo") == 1) { + clip.setScaleX(0); + clip.setScaleY(0); + clip.setScaleZ(0); } else { - clip.setHidden(false); - } - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); + clip.setScaleX(1); + clip.setScaleY(1); + clip.setScaleZ(1); } double p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java index 269183a63..70b53bef6 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java @@ -72,10 +72,14 @@ public class M1911ItemModel extends GeoModel { slide.setPosZ(2.75f * (float) fp); if (stack.getOrCreateTag().getBoolean("HoldOpen")) { - slide.setPosZ(2.75f); - bullet.setHidden(true); + slide.setPosZ(1.5f); + bullet.setScaleX(0); + bullet.setScaleY(0); + bullet.setScaleZ(0); } else { - bullet.setHidden(false); + bullet.setScaleX(1); + bullet.setScaleY(1); + bullet.setScaleZ(1); } CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -86,17 +90,6 @@ public class M1911ItemModel extends GeoModel { double y = player.getPersistentData().getDouble("y"); double x = player.getPersistentData().getDouble("x"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - root.setPosX(PosX); root.setPosY((float) y + PosY); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index c79a72dad..acced6091 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -57,7 +57,7 @@ public class M4ItemModel extends GeoModel { if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming) { shen.setPosY(0.02f * (float) (fp + 2 * fr)); - shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); + shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); shen.setRotZ(0f); } else { @@ -68,26 +68,13 @@ public class M4ItemModel extends GeoModel { } shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); -// CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - -// if (stack.getOrCreateTag().getDouble("flash_time") > 0) { -// flare.setHidden(false); -// flare.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); -// flare.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); -// flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); -// } else { -// flare.setHidden(true); -// } - CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java index 69410e54d..2b3984040 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java @@ -82,11 +82,9 @@ public class M60ItemModel extends GeoModel { b1.setScaleZ(0); } - double p = 0; - p = player.getPersistentData().getDouble("zoom_pos"); + double p = player.getPersistentData().getDouble("zoom_pos"); - double zp = 0; - zp = player.getPersistentData().getDouble("zoom_pos_z"); + double zp = player.getPersistentData().getDouble("zoom_pos_z"); gun.setPosX(3.74f * (float) p); @@ -114,26 +112,12 @@ public class M60ItemModel extends GeoModel { tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr)); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); - - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java index 2201cfa63..792036d5a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java @@ -39,11 +39,8 @@ public class M79ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double p = 0; - p = player.getPersistentData().getDouble("zoom_pos"); - - double zp = 0; - zp = player.getPersistentData().getDouble("zoom_pos_z"); + double p = player.getPersistentData().getDouble("zoom_pos"); + double zp = player.getPersistentData().getDouble("zoom_pos_z"); gun.setPosX(2.2f * (float) p); @@ -53,17 +50,6 @@ public class M79ItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zp)); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -85,10 +71,8 @@ public class M79ItemModel extends GeoModel { float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java index a44baffc3..003fa32e4 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java @@ -68,26 +68,14 @@ public class M870ItemModel extends GeoModel { } shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } CoreGeoBone root = getAnimationProcessor().getBone("root"); float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java index 9d7b9d272..222a4223f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java @@ -67,25 +67,18 @@ public class M98bItemModel extends GeoModel { gun.setRotZ((float) (0.02f * zp)); - CoreGeoBone holo = getAnimationProcessor().getBone("scope2"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - CoreGeoBone qiang = getAnimationProcessor().getBone("qiang"); - if (gun.getPosX() > 1.9) { - holo.setHidden(false); - qiang.setHidden(true); - } else { - holo.setHidden(true); - qiang.setHidden(false); - } +// CoreGeoBone holo = getAnimationProcessor().getBone("scope2"); +// CoreGeoBone qiang = getAnimationProcessor().getBone("qiang"); - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.9)); + +// if (gun.getPosX() > 1.9) { +// holo.setHidden(false); +// qiang.setHidden(true); +// } else { +// holo.setHidden(true); +// qiang.setHidden(false); +// } CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java index b99c9952e..8d088be0f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java @@ -65,14 +65,20 @@ public class MinigunItemModel extends GeoModel { shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); if (stack.getOrCreateTag().getInt("fire_animation") > 0) { - flare.setHidden(false); - light.setHidden(false); + flare.setScaleZ(1); + light.setScaleX(1); + light.setScaleY(1); + light.setScaleZ(1); flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setHidden(true); - light.setHidden(true); + flare.setScaleX(0); + flare.setScaleY(0); + flare.setScaleZ(0); + light.setScaleX(0); + light.setScaleY(0); + light.setScaleZ(0); } @@ -80,11 +86,8 @@ public class MinigunItemModel extends GeoModel { float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); - - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java index cb642272d..8c60be04e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java @@ -33,8 +33,6 @@ public class Qbz95ItemModel extends GeoModel { public void setCustomAnimations(Qbz95Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone bolt = getAnimationProcessor().getBone("bolt2"); Player player = Minecraft.getInstance().player; @@ -42,15 +40,6 @@ public class Qbz95ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (0.6 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - double p = player.getPersistentData().getDouble("zoom_pos"); double zp = player.getPersistentData().getDouble("zoom_pos_z"); @@ -60,7 +49,7 @@ public class Qbz95ItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zp)); gun.setScaleZ(1f - (0.7f * (float) p)); - holo.setHidden(!(gun.getPosX() > 3.1)); + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java index 1f62dd4b2..514fa3c73 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java @@ -64,16 +64,16 @@ public class TracheliumItemModel extends GeoModel { shen.setRotY(0.12f * (float) fr); shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } +// CoreGeoBone flare = getAnimationProcessor().getBone("flare"); +// +// if (stack.getOrCreateTag().getDouble("flash_time") > 0) { +// flare.setHidden(false); +// flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); +// flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); +// flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); +// } else { +// flare.setHidden(true); +// } CoreGeoBone root = getAnimationProcessor().getBone("root"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java index bb254ffee..ef6e630c5 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.AK47Item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.AK47Layer; import net.mcreator.superbwarfare.client.model.item.AK47ItemModel; +import net.mcreator.superbwarfare.item.gun.AK47Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class AK47ItemRenderer extends GeoItemRenderer { public AK47ItemRenderer() { @@ -12,6 +31,112 @@ public class AK47ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new AK47Layer(this)); } + @Override + public RenderType getRenderType(AK47Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected AK47Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, AK47Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, AK47Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (name.equals("holo")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(AK47Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java index f3594118f..f71b97821 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Aa12Item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Aa12Layer; import net.mcreator.superbwarfare.client.model.item.Aa12ItemModel; +import net.mcreator.superbwarfare.item.gun.Aa12Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class Aa12ItemRenderer extends GeoItemRenderer { public Aa12ItemRenderer() { @@ -12,6 +31,102 @@ public class Aa12ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new Aa12Layer(this)); } + @Override + public RenderType getRenderType(Aa12Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Aa12Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Aa12Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Aa12Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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) (1 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Aa12Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java index 8467dcb9d..261440dd7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Abekiri; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.AbekiriLayer; import net.mcreator.superbwarfare.client.model.item.AbekiriItemModel; +import net.mcreator.superbwarfare.item.gun.Abekiri; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class AbekiriItemRenderer extends GeoItemRenderer { public AbekiriItemRenderer() { @@ -12,6 +31,102 @@ public class AbekiriItemRenderer extends GeoItemRenderer { this.addRenderLayer(new AbekiriLayer(this)); } + @Override + public RenderType getRenderType(Abekiri animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Abekiri animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Abekiri animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Abekiri animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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) (1 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Abekiri instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java index 97baaef15..a1c6324da 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.BocekItem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.BocekLayer; import net.mcreator.superbwarfare.client.model.item.BocekItemModel; +import net.mcreator.superbwarfare.item.gun.BocekItem; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class BocekItemRenderer extends GeoItemRenderer { public BocekItemRenderer() { @@ -12,6 +31,105 @@ public class BocekItemRenderer extends GeoItemRenderer { this.addRenderLayer(new BocekLayer(this)); } + @Override + public RenderType getRenderType(BocekItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected BocekItem animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, BocekItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, BocekItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + bone.setHidden(this.hiddenBones.contains(name)); + } + + Player player_ = mc.player; + ItemStack itemStack = null; + if (player_ != null) { + itemStack = player_.getMainHandItem(); + } + + if (name.equals("holo")) { + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + if (name.equals("arrow")) { + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getInt("arrow_empty") > 0); + } + + if (name.equals("jian")) { + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getInt("max_ammo") == 0); + } + + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(BocekItem instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java index 401125c19..3adc93da0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Devotion; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.DevotionLayer; import net.mcreator.superbwarfare.client.model.item.DevotionItemModel; +import net.mcreator.superbwarfare.item.gun.Devotion; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class DevotionItemRenderer extends GeoItemRenderer { public DevotionItemRenderer() { @@ -12,6 +31,112 @@ public class DevotionItemRenderer extends GeoItemRenderer { this.addRenderLayer(new DevotionLayer(this)); } + @Override + public RenderType getRenderType(Devotion animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Devotion animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Devotion animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Devotion animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (name.equals("holo")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Devotion instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java index be5dd4c46..9b4e760af 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Glock17Layer; import net.mcreator.superbwarfare.client.model.item.Glock17ItemModel; import net.mcreator.superbwarfare.item.gun.Glock17Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class Glock17ItemRenderer extends GeoItemRenderer { public Glock17ItemRenderer() { @@ -12,6 +31,102 @@ public class Glock17ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new Glock17Layer(this)); } + @Override + public RenderType getRenderType(Glock17Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Glock17Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Glock17Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Glock17Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Glock17Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java index 57cbb5683..85b7f0ff1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Glock18Layer; import net.mcreator.superbwarfare.client.model.item.Glock18ItemModel; import net.mcreator.superbwarfare.item.gun.Glock18Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class Glock18ItemRenderer extends GeoItemRenderer { public Glock18ItemRenderer() { @@ -12,6 +31,102 @@ public class Glock18ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new Glock18Layer(this)); } + @Override + public RenderType getRenderType(Glock18Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Glock18Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Glock18Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Glock18Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Glock18Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 14910f40a..44043df12 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Hk416Item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Hk416Layer; import net.mcreator.superbwarfare.client.model.item.Hk416ItemModel; +import net.mcreator.superbwarfare.item.gun.Hk416Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class Hk416ItemRenderer extends GeoItemRenderer { public Hk416ItemRenderer() { @@ -12,6 +31,112 @@ public class Hk416ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new Hk416Layer(this)); } + @Override + public RenderType getRenderType(Hk416Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Hk416Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Hk416Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Hk416Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (name.equals("holo")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Hk416Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java index 641c5cfc1..13bdadff1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.HuntingRifle; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.HuntingRifleLayer; import net.mcreator.superbwarfare.client.model.item.HuntingRifleItemModel; +import net.mcreator.superbwarfare.item.gun.HuntingRifle; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class HuntingRifleItemRenderer extends GeoItemRenderer { public HuntingRifleItemRenderer() { @@ -12,6 +31,102 @@ public class HuntingRifleItemRenderer extends GeoItemRenderer { this.addRenderLayer(new HuntingRifleLayer(this)); } + @Override + public RenderType getRenderType(HuntingRifle animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected HuntingRifle animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, HuntingRifle animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, HuntingRifle animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(HuntingRifle instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java index 4b9b68e19..1c5103540 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.K98Layer; import net.mcreator.superbwarfare.client.model.item.K98ItemModel; import net.mcreator.superbwarfare.item.gun.K98Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class K98ItemRenderer extends GeoItemRenderer { public K98ItemRenderer() { @@ -12,6 +31,102 @@ public class K98ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new K98Layer(this)); } + @Override + public RenderType getRenderType(K98Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected K98Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, K98Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, K98Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.7 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.7 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(K98Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java index 77ed64078..3d5d7d75b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.M1911Layer; import net.mcreator.superbwarfare.client.model.item.M1911ItemModel; import net.mcreator.superbwarfare.item.gun.M1911Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class M1911ItemRenderer extends GeoItemRenderer { public M1911ItemRenderer() { @@ -12,6 +31,102 @@ public class M1911ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new M1911Layer(this)); } + @Override + public RenderType getRenderType(M1911Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected M1911Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, M1911Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, M1911Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(M1911Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java index a73fee547..82e0e7636 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.M60Item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.M60Layer; import net.mcreator.superbwarfare.client.model.item.M60ItemModel; +import net.mcreator.superbwarfare.item.gun.M60Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class M60ItemRenderer extends GeoItemRenderer { public M60ItemRenderer() { @@ -12,6 +31,102 @@ public class M60ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new M60Layer(this)); } + @Override + public RenderType getRenderType(M60Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected M60Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, M60Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, M60Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(M60Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java index d4f0eb47d..a7ff404c0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.M79Item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.M79Layer; import net.mcreator.superbwarfare.client.model.item.M79ItemModel; +import net.mcreator.superbwarfare.item.gun.M79Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class M79ItemRenderer extends GeoItemRenderer { public M79ItemRenderer() { @@ -12,6 +31,102 @@ public class M79ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new M79Layer(this)); } + @Override + public RenderType getRenderType(M79Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected M79Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, M79Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, M79Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(M79Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java index ccd4c007e..db2f35bb5 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java @@ -2,16 +2,25 @@ package net.mcreator.superbwarfare.client.renderer.item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.mcreator.superbwarfare.item.gun.M870Item; import net.mcreator.superbwarfare.client.layer.M870Layer; import net.mcreator.superbwarfare.client.model.item.M870ItemModel; +import net.mcreator.superbwarfare.item.gun.M870Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; import java.util.HashSet; import java.util.Set; @@ -34,7 +43,6 @@ public class M870ItemRenderer extends GeoItemRenderer { public ItemDisplayContext transformType; protected M870Item animatable; private final Set hiddenBones = new HashSet<>(); - private final Set suppressedBones = new HashSet<>(); @Override public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { @@ -56,6 +64,69 @@ public class M870ItemRenderer extends GeoItemRenderer { } } + @Override + public void renderRecursively(PoseStack stack, M870Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(M870Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java index e8c11e90b..5264ef1cc 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.M98bItem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.M98bLayer; import net.mcreator.superbwarfare.client.model.item.M98bItemModel; +import net.mcreator.superbwarfare.item.gun.M98bItem; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class M98bItemRenderer extends GeoItemRenderer { public M98bItemRenderer() { @@ -12,6 +31,120 @@ public class M98bItemRenderer extends GeoItemRenderer { this.addRenderLayer(new M98bLayer(this)); } + @Override + public RenderType getRenderType(M98bItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected M98bItem animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, M98bItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, M98bItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (name.equals("scope2")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + if (name.equals("qiang")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && !itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(M98bItem instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java index b1e0d5114..207b39565 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java @@ -1,10 +1,28 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Minigun; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.MinigunLayer; import net.mcreator.superbwarfare.client.model.item.MinigunItemModel; +import net.mcreator.superbwarfare.item.gun.Minigun; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class MinigunItemRenderer extends GeoItemRenderer { public MinigunItemRenderer() { @@ -12,6 +30,86 @@ public class MinigunItemRenderer extends GeoItemRenderer { this.addRenderLayer(new MinigunLayer(this)); } + @Override + public RenderType getRenderType(Minigun animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Minigun animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Minigun animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Minigun animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + bone.setHidden(this.hiddenBones.contains(name)); + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Minigun instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index f1667c0ab..c7f956c8f 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.Qbz95Layer; import net.mcreator.superbwarfare.client.model.item.Qbz95ItemModel; import net.mcreator.superbwarfare.item.gun.Qbz95Item; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class Qbz95ItemRenderer extends GeoItemRenderer { public Qbz95ItemRenderer() { @@ -12,6 +31,112 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new Qbz95Layer(this)); } + @Override + public RenderType getRenderType(Qbz95Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Qbz95Item animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Qbz95Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Qbz95Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (name.equals("holo")) { + Player player = Minecraft.getInstance().player; + ItemStack itemStack = null; + if (player != null) { + itemStack = player.getMainHandItem(); + } + bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")); + } + + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Qbz95Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java index 908c9a9c6..f65f851b0 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java @@ -1,10 +1,29 @@ package net.mcreator.superbwarfare.client.renderer.item; -import net.mcreator.superbwarfare.item.gun.Trachelium; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.mcreator.superbwarfare.client.layer.TracheliumLayer; import net.mcreator.superbwarfare.client.model.item.TracheliumItemModel; +import net.mcreator.superbwarfare.item.gun.Trachelium; +import net.mcreator.superbwarfare.tools.AnimUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.player.AbstractClientPlayer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; +import software.bernie.geckolib.util.RenderUtils; + +import java.util.HashSet; +import java.util.Set; public class TracheliumItemRenderer extends GeoItemRenderer { public TracheliumItemRenderer() { @@ -12,6 +31,102 @@ public class TracheliumItemRenderer extends GeoItemRenderer { this.addRenderLayer(new TracheliumLayer(this)); } + @Override + public RenderType getRenderType(Trachelium animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + + private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + protected Trachelium animatable; + private final Set hiddenBones = new HashSet<>(); + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + if (this.animatable != null) + this.animatable.getTransformType(transformType); + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, Trachelium animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, float red, float green, float blue, float alpha) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); + if (this.renderArms) { + this.renderArms = false; + } + } + + @Override + public void renderRecursively(PoseStack stack, Trachelium animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, + float green, float blue, float alpha) { + Minecraft mc = Minecraft.getInstance(); + String name = bone.getName(); + boolean renderingArms = false; + if (name.equals("Lefthand") || name.equals("Righthand")) { + bone.setHidden(true); + renderingArms = true; + } else { + 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.55 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } else { + bone.setHidden(true); + } + } + + if (this.transformType.firstPerson() && renderingArms) { + AbstractClientPlayer player = mc.player; + + if (player == null) { + return; + } + + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerModel model = playerRenderer.getModel(); + stack.pushPose(); + RenderUtils.translateMatrixToBone(stack, bone); + RenderUtils.translateToPivotPoint(stack, bone); + RenderUtils.rotateMatrixAroundBone(stack, bone); + RenderUtils.scaleMatrixForBone(stack, bone); + RenderUtils.translateAwayFromPivotPoint(stack, bone); + ResourceLocation loc = player.getSkinTextureLocation(); + VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); + VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + if (name.equals("Lefthand")) { + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } else { + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); + AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + } + + this.currentBuffer.getBuffer(this.renderType); + stack.popPose(); + } + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); + } + @Override public ResourceLocation getTextureLocation(Trachelium instance) { return super.getTextureLocation(instance); diff --git a/src/main/resources/assets/superbwarfare/animations/aa12.animation.json b/src/main/resources/assets/superbwarfare/animations/aa12.animation.json index e4ee18352..ff382367e 100644 --- a/src/main/resources/assets/superbwarfare/animations/aa12.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/aa12.animation.json @@ -37,30 +37,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1, 0, -22] - }, - "0.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [3.53901, 3.6754, 5.59783] - }, - "0.4": { - "vector": [0, 0, 0] - } - } - }, "camera": { "rotation": { "0.0": { @@ -181,44 +157,43 @@ "0": { "rotation": { "0.0": { - "vector": [-14.82442, -57.81517, 38.62375] + "vector": [-19.82442, -57.81517, 38.62375] }, "0.2083": { - "vector": [-16.82442, -57.81517, 38.62375], + "vector": [-21.82442, -57.81517, 38.62375], "easing": "easeInSine" }, "0.4167": { - "vector": [-14.82442, -57.81517, 38.62375], + "vector": [-19.82442, -57.81517, 38.62375], "easing": "easeOutSine" }, "0.5833": { - "vector": [-12.82442, -57.81517, 38.62375], + "vector": [-17.82442, -57.81517, 38.62375], "easing": "easeInSine" }, "0.7917": { - "vector": [-14.82442, -57.81517, 38.62375], + "vector": [-19.82442, -57.81517, 38.62375], "easing": "easeOutSine" } }, "position": { "0.0": { - "vector": [5.5, -2, 0] + "vector": [2.5, -0.75, -1] }, "0.2083": { - "vector": [2.75, -1.5, 0], + "vector": [0.25, -0.25, -1], "easing": "easeInSine" }, "0.4167": { - "vector": [0.5, -2, 0], + "vector": [-2, -0.75, -1], "easing": "easeOutSine" }, "0.5833": { - "vector": [2.75, -1.5, 0], + "vector": [0, -0.25, -1], "easing": "easeInSine" }, "0.7917": { - "vector": [5.5, -2, 0], - "easing": "easeOutSine" + "vector": [2.5, -0.75, -1] } } }, @@ -250,55 +225,47 @@ "0": { "rotation": { "0.0": { - "vector": [-44.22375, 21.2133, 4.79361] + "vector": [-66.72375, 21.2133, 4.79361] }, "0.2": { - "vector": [-40.88804, 21.40026, 11.0472], + "vector": [-63.38804, 21.40026, 11.0472], "easing": "easeInSine" }, "0.4": { - "vector": [-48.58194, 19.41184, 6.64209], + "vector": [-71.08194, 19.41184, 6.64209], "easing": "easeOutSine" }, "0.6": { - "vector": [-52.13904, 19.33922, 0.51567], + "vector": [-74.63904, 19.33922, 0.51567], "easing": "easeInSine" }, "0.8": { - "vector": [-44.22375, 21.2133, 4.79361] + "vector": [-66.72375, 21.2133, 4.79361] } }, "position": { "0.0": { - "vector": [-5.29989, -0.71669, 0.66806], + "vector": [-4.29989, 0.28331, -1.33194], "easing": "easeOutSine" }, "0.2": { - "vector": [-6.5, 2, 0], + "vector": [-5.5, 3, -2], "easing": "easeInSine" }, "0.4": { - "vector": [-7.3406, -0.71261, 0.68321], + "vector": [-6.3406, 0.28739, -1.31679], "easing": "easeOutSine" }, "0.6": { - "vector": [-6.5, 2, 0], + "vector": [-5.5, 3, -2], "easing": "easeInSine" }, "0.8": { - "vector": [-5.29989, -0.71669, 0.66806], + "vector": [-4.29989, 0.28331, -1.33194], "easing": "easeOutSine" } } }, - "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } - }, "camera": { "rotation": { "0.0": { @@ -317,6 +284,14 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Lefthand": { + "rotation": { + "vector": [-1.41476, -16.33468, -1.66483] + }, + "position": { + "vector": [6, -13, 49] + } } } }, @@ -509,11 +484,11 @@ "vector": [0, 0, 0] }, "3.0667": { - "vector": [0, 0, 7.5], - "easing": "easeInCirc" + "vector": [0, 0, 6], + "easing": "easeInElastic" }, "3.3167": { - "vector": [0, 0, 7.5], + "vector": [0, 0, 6], "easing": "easeInCirc" }, "3.45": { @@ -584,107 +559,6 @@ } } }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "0.8": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "1.3": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "1.3833": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "2.4167": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "2.75": { - "vector": [-35.93087, -12.92203, -31.2641], - "easing": "easeInElastic" - }, - "2.8167": { - "vector": [-35.93087, -12.92203, -31.2641], - "easing": "easeInElastic" - }, - "3.0667": { - "vector": [-35.93087, -12.92203, -31.2641], - "easing": "easeInCirc" - }, - "3.3167": { - "vector": [-35.93087, -12.92203, -31.2641], - "easing": "easeInCirc" - }, - "3.45": { - "vector": [-16.83441, -22.51825, -28.30654], - "easing": "easeInElastic" - }, - "3.65": { - "vector": [3.39731, 0.60726, -6.28975] - }, - "3.8167": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2833": { - "vector": [0, 0, 0] - }, - "0.4167": { - "vector": [1.89205, -2.68839, 7.46626] - }, - "0.5667": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "0.8": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "1.3": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "1.3833": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "2.4167": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "2.75": { - "vector": [6.65107, 7.98134, 2.33784], - "easing": "easeInElastic" - }, - "2.8167": { - "vector": [6.65107, 7.98134, 2.33784], - "easing": "easeInElastic" - }, - "3.0667": { - "vector": [6.65107, 7.98134, 9.33784], - "easing": "easeInCirc" - }, - "3.3167": { - "vector": [6.65107, 7.98134, 9.33784], - "easing": "easeInCirc" - }, - "3.45": { - "vector": [6.65107, 7.98134, 7.33784], - "easing": "easeInElastic" - }, - "3.9": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" - } - } - }, "camera": { "rotation": { "0.0": { @@ -764,11 +638,96 @@ "vector": [0, 0, 0] } } - } - }, - "sound_effects": { - "0.0": { - "effect": "aa_12_reload_empty" + }, + "Lefthand": { + "rotation": { + "0.1667": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.3667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.4333": { + "vector": [-6.43837, -20.70194, 55.02861], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [-6.43837, -20.70194, 55.02861], + "easing": "easeInElastic" + }, + "2.7667": { + "vector": [25.13311, 9.89724, -25.82458], + "easing": "easeInElastic" + }, + "2.8167": { + "vector": [25.13311, 9.89724, -25.82458], + "easing": "easeInElastic" + }, + "3.0667": { + "vector": [29.38311, 9.89724, -25.82458], + "easing": "easeInBounce" + }, + "3.3167": { + "vector": [25.13311, 9.89724, -25.82458], + "easing": "easeInCirc" + }, + "3.45": { + "vector": [-6.54875, 20.56526, -8.87983], + "easing": "easeInCirc" + }, + "3.7": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.1667": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [3.3, -0.1, 8.4], + "easing": "easeInElastic" + }, + "1.3667": { + "vector": [3.3, -0.1, 8.4], + "easing": "easeInElastic" + }, + "1.4333": { + "vector": [0.4, -3.3, 8.3], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [0.4, -3.3, 8.3], + "easing": "easeInElastic" + }, + "2.7667": { + "vector": [3.72314, 5.36325, 2.24919], + "easing": "easeInElastic" + }, + "2.8167": { + "vector": [3.72314, 5.36325, 2.24919], + "easing": "easeInCirc" + }, + "3.0667": { + "vector": [4.11767, 4.63278, 7.04607], + "easing": "easeInElastic" + }, + "3.3167": { + "vector": [4.22314, 5.11325, 7.84919], + "easing": "easeInCirc" + }, + "3.45": { + "vector": [1.3, 6.1, 10.1], + "easing": "easeInCirc" + }, + "3.7": { + "vector": [0, 0, 0] + } + } } } }, @@ -976,68 +935,6 @@ } } }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "0.8": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "1.3": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "1.3833": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "2.3": { - "vector": [14.12373, -11.09281, 25.14677] - }, - "2.3833": { - "vector": [10.59, -8.32, 18.86] - }, - "2.5167": { - "vector": [0, 0, 0], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2833": { - "vector": [0, 0, 0] - }, - "0.4167": { - "vector": [1.89205, -2.68839, 7.46626] - }, - "0.5667": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "0.8": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "1.3": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "1.3833": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "2.3": { - "vector": [0.6492, 0.70299, 12.13945] - }, - "2.55": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" - } - } - }, "camera": { "rotation": { "0.0": { @@ -1098,11 +995,56 @@ "vector": [0, 0, 0] } } - } - }, - "sound_effects": { - "0.0": { - "effect": "aa_12_reload_empty" + }, + "Lefthand": { + "rotation": { + "0.1667": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.3667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.4333": { + "vector": [-6.43837, -20.70194, 55.02861], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [-6.43837, -20.70194, 55.02861], + "easing": "easeInElastic" + }, + "2.55": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.1667": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [3.3, -0.1, 8.4], + "easing": "easeInElastic" + }, + "1.3667": { + "vector": [3.3, -0.1, 8.4], + "easing": "easeInElastic" + }, + "1.4333": { + "vector": [0.4, -3.3, 8.3], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [0.4, -3.3, 8.3], + "easing": "easeInElastic" + }, + "2.55": { + "vector": [0, 0, 0] + } + } } } } diff --git a/src/main/resources/assets/superbwarfare/animations/abekiri.animation.json b/src/main/resources/assets/superbwarfare/animations/abekiri.animation.json index d010b4477..54011100f 100644 --- a/src/main/resources/assets/superbwarfare/animations/abekiri.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/abekiri.animation.json @@ -9,6 +9,14 @@ "position": { "vector": [0, -14, 16] } + }, + "Lefthand": { + "rotation": { + "vector": [-27.48048, 7.74079, 60.61663] + }, + "position": { + "vector": [-1.8, -0.6, 1.5] + } } } }, @@ -52,6 +60,14 @@ "position": { "vector": [0, -14, 16] } + }, + "Lefthand": { + "rotation": { + "vector": [-27.48048, 7.74079, 60.61663] + }, + "position": { + "vector": [-1.8, -0.4, 1.5] + } } } }, @@ -127,6 +143,14 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Lefthand": { + "rotation": { + "vector": [-27.48048, 7.74079, 60.61663] + }, + "position": { + "vector": [-1.8, -0.4, 1.5] + } } } }, @@ -228,6 +252,14 @@ "position": { "vector": [0, -14, 16] } + }, + "Lefthand": { + "rotation": { + "vector": [-27.48048, 7.74079, 60.61663] + }, + "position": { + "vector": [-1.8, -0.4, 1.5] + } } } }, @@ -363,58 +395,58 @@ "Lefthand": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-27.48048, 7.74079, 60.61663] }, "0.2": { - "vector": [46.55566, -11.28983, -10.57657] + "vector": [-46.5557, 11.2898, -10.57657] }, "0.5": { - "vector": [28.88915, -28.22457, -26.44144] + "vector": [-28.8891, 28.2246, -26.44144] }, "0.7": { - "vector": [-28.15519, -39.5144, -37.01801] + "vector": [28.1552, 39.5144, -37.01801] }, "0.8": { - "vector": [-36.02531, -30.17168, -37.82607] + "vector": [36.0253, 30.1717, -37.82607] }, "0.9": { - "vector": [-32.83715, -25.49817, -32.05203] + "vector": [32.8372, 25.4982, -32.05203] }, "1.0": { - "vector": [-21.83715, -25.49817, -32.05203] + "vector": [21.8372, 25.4982, -32.05203] }, "1.1": { - "vector": [-30.83715, -25.49817, -32.05203] + "vector": [30.8372, 25.4982, -32.05203] }, "1.3": { - "vector": [-9.68, -52.68, -57.11] + "vector": [9.68, 52.68, -57.11] }, "1.5": { - "vector": [-6.35997, -28.9577, -29.98792] + "vector": [6.36, 28.9577, -29.98792] }, "1.7": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "1.9": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "2.1": { - "vector": [-6.35997, -28.9577, -29.98792] + "vector": [6.36, 28.9577, -29.98792] }, "2.3": { - "vector": [-6.77006, -25.92966, -31.79066], + "vector": [6.7701, 25.9297, -31.79066], "easing": "easeInOutSine" }, "2.5": { - "vector": [-30.83715, -25.49817, -32.05203] + "vector": [30.8372, 25.4982, -32.05203] }, "2.7": { - "vector": [0, 0, 0] + "vector": [-27.48048, 7.74079, 60.61663] } }, "position": { "0.0": { - "vector": [0, 0, 0] + "vector": [-1.8, -0.4, 1.5] }, "0.4": { "vector": [0.69, -0.46, 4.34] @@ -461,7 +493,7 @@ "vector": [-1.25, -2.8, -3.5] }, "2.7": { - "vector": [0, 0, 0] + "vector": [-1.8, -0.4, 1.5] } } }, @@ -852,73 +884,73 @@ "Lefthand": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-27.48048, 7.74079, 60.61663] }, "0.2": { - "vector": [46.55566, -11.28983, -10.57657] + "vector": [-46.5557, 11.2898, -10.57657] }, "0.5": { - "vector": [28.88915, -28.22457, -26.44144] + "vector": [-28.8891, 28.2246, -26.44144] }, "0.7": { - "vector": [-28.15519, -39.5144, -37.01801] + "vector": [28.1552, 39.5144, -37.01801] }, "0.8": { - "vector": [-36.02531, -30.17168, -37.82607] + "vector": [36.0253, 30.1717, -37.82607] }, "0.9": { - "vector": [-32.83715, -25.49817, -32.05203] + "vector": [32.8372, 25.4982, -32.05203] }, "1.0": { - "vector": [-36.02531, -30.17168, -37.82607] + "vector": [36.0253, 30.1717, -37.82607] }, "1.1": { - "vector": [-36.02531, -30.17168, -37.82607] + "vector": [36.0253, 30.1717, -37.82607] }, "1.3": { - "vector": [-21.83715, -25.49817, -32.05203] + "vector": [21.8372, 25.4982, -32.05203] }, "1.4": { - "vector": [-30.83715, -25.49817, -32.05203] + "vector": [30.8372, 25.4982, -32.05203] }, "1.6": { - "vector": [-9.68, -52.68, -57.11] + "vector": [9.68, 52.68, -57.11] }, "1.8": { - "vector": [-6.35997, -28.9577, -29.98792] + "vector": [6.36, 28.9577, -29.98792] }, "2.0": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "2.2": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "2.3": { - "vector": [-6.35997, -28.9577, -29.98792] + "vector": [6.36, 28.9577, -29.98792] }, "2.5": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "2.7": { - "vector": [-11.35997, -28.9577, -29.98792] + "vector": [11.36, 28.9577, -29.98792] }, "2.9": { - "vector": [-6.35997, -28.9577, -29.98792] + "vector": [6.36, 28.9577, -29.98792] }, "3.1": { - "vector": [-6.77006, -25.92966, -31.79066], + "vector": [6.7701, 25.9297, -31.79066], "easing": "easeInOutSine" }, "3.3": { - "vector": [-30.83715, -25.49817, -32.05203] + "vector": [30.8372, 25.4982, -32.05203] }, "3.5": { - "vector": [0, 0, 0] + "vector": [-27.48048, 7.74079, 60.61663] } }, "position": { "0.0": { - "vector": [0, 0, 0] + "vector": [-1.8, -0.4, 1.5] }, "0.4": { "vector": [0.69, -0.46, 4.34] @@ -983,7 +1015,7 @@ "vector": [-1.25, -2.8, -3.5] }, "3.5": { - "vector": [0, 0, 0] + "vector": [-1.8, -0.4, 1.5] } } }, diff --git a/src/main/resources/assets/superbwarfare/animations/ak.animation.json b/src/main/resources/assets/superbwarfare/animations/ak.animation.json index cc13e1040..2305551eb 100644 --- a/src/main/resources/assets/superbwarfare/animations/ak.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ak.animation.json @@ -6,7 +6,7 @@ "bones": { "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -70,7 +70,7 @@ }, "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -154,7 +154,7 @@ }, "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -238,7 +238,7 @@ }, "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -295,7 +295,7 @@ }, "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -418,7 +418,7 @@ "bones": { "Lefthand": { "rotation": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "position": { "vector": [-0.6, -2.7, -3.3] @@ -552,37 +552,37 @@ "Lefthand": { "rotation": { "0.1": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "0.5333": { - "vector": [-10.23301, -10.25955, 3.51854], + "vector": [10.233, 10.2596, 3.51854], "easing": "easeOutQuad" }, "0.9": { - "vector": [-10.23301, -10.25955, 3.51854], + "vector": [10.233, 10.2596, 3.51854], "easing": "easeOutSine" }, "1.1333": { - "vector": [-25.86792, -14.68451, 0.99936], + "vector": [25.8679, 14.6845, 0.99936], "easing": "easeInOutQuad" }, "1.3167": { - "vector": [-32.48047, -21.39686, -3.31204] + "vector": [32.4805, 21.3969, -3.31204] }, "1.5167": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [20.3175, 15.0828, -6.04184], "easing": "easeOutSine" }, "1.5667": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [20.3175, 15.0828, -6.04184], "easing": "easeOutSine" }, "1.7333": { - "vector": [-21.16455, -11.71775, -9.83624], + "vector": [21.1645, 11.7178, -9.83624], "easing": "easeOutSine" }, "2.0167": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] } }, "position": { @@ -1001,81 +1001,81 @@ "Lefthand": { "rotation": { "0.1": { - "vector": [-27.6003, -27.56966, -16.00843] + "vector": [27.6003, 27.5697, -16.00843] }, "0.5667": { - "vector": [-19.23301, -10.25955, 3.51854], + "vector": [19.233, 10.2596, 3.51854], "easing": "easeOutQuad" }, "0.8333": { - "vector": [-21.30345, -34.94902, -25.30751], + "vector": [21.3035, 34.949, -25.30751], "easing": "linear" }, "0.85": { - "vector": [-21.30345, -34.94902, -25.30751], + "vector": [21.3035, 34.949, -25.30751], "easing": "linear" }, "0.9667": { - "vector": [2.38, -42.06, -24.89] + "vector": [-2.38, 42.06, -24.89] }, "1.05": { - "vector": [12.31232, -51.51215, -24.79233] + "vector": [-12.3123, 51.5121, -24.79233] }, "1.15": { - "vector": [12.31232, -51.51215, -24.79233] + "vector": [-12.3123, 51.5121, -24.79233] }, "1.2333": { - "vector": [1.22466, -38.81661, -18.05842] + "vector": [-1.2247, 38.8166, -18.05842] }, "1.3": { - "vector": [-12.15546, -22.32142, -3.10505] + "vector": [12.1555, 22.3214, -3.10505] }, "1.3667": { - "vector": [-25.86792, -14.68451, 0.99936], + "vector": [25.8679, 14.6845, 0.99936], "easing": "linear" }, "1.4167": { - "vector": [-32.48047, -21.39686, -6.81204] + "vector": [32.4805, 21.3969, -6.81204] }, "1.6": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [20.3175, 15.0828, -6.04184], "easing": "easeOutSine" }, "1.7333": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [20.3175, 15.0828, -6.04184], "easing": "easeOutSine" }, "1.7833": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [20.3175, 15.0828, -6.04184], "easing": "easeOutSine" }, - "1.95": { - "vector": [-6.78199, -4.07081, 10.69071] + "1.9333": { + "vector": [6.782, 4.0708, 10.69071] }, "2.05": { - "vector": [-26.9, 5.84, 25.75] + "vector": [26.9, -5.84, 25.75] }, "2.2": { - "vector": [21.28621, 49.80684, 92.55967], + "vector": [-21.2862, -49.8068, 92.55967], "easing": "easeInCubic" }, "2.3": { - "vector": [18.15836, 54.76869, 89.37164] + "vector": [-18.1584, -54.7687, 89.37164] }, "2.35": { - "vector": [18.15836, 54.76869, 89.37164] + "vector": [-18.1584, -54.7687, 89.37164] }, "2.4167": { - "vector": [45.05645, 4.02403, 112.80291] + "vector": [-45.0564, -4.024, 112.80291] }, "2.5": { - "vector": [28.08023, -5.66109, 65.89022] + "vector": [-28.0802, 5.6611, 65.89022] }, "2.5667": { - "vector": [8.14471, -15.41168, 11.40743] + "vector": [-8.1447, 15.4117, 11.40743] }, "2.7167": { - "vector": [-27.6003, -27.56966, -16.00843], + "vector": [27.6003, 27.5697, -16.00843], "easing": "linear" } }, @@ -1426,30 +1426,30 @@ }, "Righthand": { "rotation": { - "0.3833": { + "0.1833": { "vector": [0, 0, 0] }, - "0.5333": { - "vector": [14, 0, 0] + "0.25": { + "vector": [-14, 0, 0] }, - "2.1": { - "vector": [14, 0, 0] + "2.6833": { + "vector": [-14, 0, 0] }, - "2.2833": { + "2.7833": { "vector": [0, 0, 0] } }, "position": { - "0.3833": { + "0.1833": { "vector": [0, 0, 0] }, - "0.5333": { + "0.25": { "vector": [-0.1458, 3.06247, 1.45331] }, - "2.1": { + "2.6833": { "vector": [-0.1458, 3.06247, 1.45331] }, - "2.2833": { + "2.7833": { "vector": [0, 0, 0] } } diff --git a/src/main/resources/assets/superbwarfare/animations/devotion.animation.json b/src/main/resources/assets/superbwarfare/animations/devotion.animation.json index d97706b75..ff4438441 100644 --- a/src/main/resources/assets/superbwarfare/animations/devotion.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/devotion.animation.json @@ -525,60 +525,60 @@ "vector": [0, 0, 0] }, "0.8167": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "0.9667": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "1.3": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "1.3833": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "2.3": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "2.3833": { - "vector": [26.69687, -23.84553, 18.95298] + "vector": [-26.6969, 23.8455, 18.95298] }, "2.5333": { - "vector": [39.4566, -33.52813, 36.0472] + "vector": [-39.4566, 33.5281, 36.0472] }, "2.6167": { - "vector": [21.75908, -21.54018, 13.02377], + "vector": [-21.7591, 21.5402, 13.02377], "easing": "easeInElastic" }, "2.7167": { - "vector": [21.75908, -21.54018, 13.02377] + "vector": [-21.7591, 21.5402, 13.02377] }, "2.8167": { - "vector": [25.48833, -18.43638, 18.90018] + "vector": [-25.4883, 18.4364, 18.90018] }, "3.25": { - "vector": [-14.24732, -18.35244, 9.21488], + "vector": [14.2473, 18.3524, 9.21488], "easing": "easeInOutSine" }, "3.3167": { - "vector": [-14.24732, -18.35244, 9.21488] + "vector": [14.2473, 18.3524, 9.21488] }, "3.5667": { - "vector": [-18.21952, -18.95565, 10.00632], + "vector": [18.2195, 18.9556, 10.00632], "easing": "easeInCirc" }, "3.6667": { - "vector": [-18.21952, -18.95565, 10.00632], + "vector": [18.2195, 18.9556, 10.00632], "easing": "easeInCirc" }, "3.85": { - "vector": [-14.1857, -20.99269, 12.22062] + "vector": [14.1857, 20.9927, 12.22062] }, "3.9333": { - "vector": [-4.31893, -23.2528, 13.61203], + "vector": [4.3189, 23.2528, 13.61203], "easing": "easeOutSine" }, "4.15": { - "vector": [8.3734, -16.00221, -1.42197] + "vector": [-8.3734, 16.0022, -1.42197] }, "4.2333": { "vector": [0, 0, 0] @@ -1005,35 +1005,35 @@ "vector": [0, 0, 0] }, "0.8167": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "0.9667": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "1.3": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "1.3833": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "2.3": { - "vector": [14.12373, -11.09281, 25.14677] + "vector": [-14.1237, 11.0928, 25.14677] }, "2.3833": { - "vector": [26.69687, -23.84553, 18.95298] + "vector": [-26.6969, 23.8455, 18.95298] }, "2.5333": { - "vector": [39.4566, -33.52813, 36.0472] + "vector": [-39.4566, 33.5281, 36.0472] }, "2.6167": { - "vector": [21.75908, -21.54018, 13.02377], + "vector": [-21.7591, 21.5402, 13.02377], "easing": "easeInElastic" }, "2.7167": { - "vector": [21.75908, -21.54018, 13.02377] + "vector": [-21.7591, 21.5402, 13.02377] }, "3.0333": { - "vector": [8.3734, -16.00221, -1.42197] + "vector": [-8.3734, 16.0022, -1.42197] }, "3.1167": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json index d52b7b474..686e79175 100644 --- a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json @@ -5,6 +5,63 @@ "loop": true, "animation_length": 2 }, + "animation.glock.draw": { + "loop": "hold_on_last_frame", + "animation_length": 0.6, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [27.21312, -47.42646, -2.0218] + }, + "0.1": { + "vector": [12.5, -15, 0] + }, + "0.2": { + "vector": [3.48268, 0.40464, 8.20687] + }, + "0.4": { + "vector": [0, 0, -2] + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [3, -17.3, 0] + }, + "0.2": { + "vector": [0, 0, -1.65] + }, + "0.3": { + "vector": [0, 0, 0.93] + }, + "0.5": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.4": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } + } + } + }, "animation.glock.run": { "loop": true, "animation_length": 0.8, @@ -191,76 +248,6 @@ "easing": "easeInElastic" } } - }, - "hammer": { - "rotation": { - "0.0": { - "vector": [60, 0, 0] - }, - "0.0833": { - "vector": [0, 0, 0] - } - }, - "scale": { - "vector": [1, 1, 1] - } - } - } - }, - "animation.glock.draw": { - "loop": "hold_on_last_frame", - "animation_length": 0.6, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [27.21312, -47.42646, -2.0218] - }, - "0.1": { - "vector": [12.5, -15, 0] - }, - "0.2": { - "vector": [3.48268, 0.40464, 8.20687] - }, - "0.4": { - "vector": [0, 0, -2] - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [3, -17.3, 0] - }, - "0.2": { - "vector": [0, 0, -1.65] - }, - "0.3": { - "vector": [0, 0, 0.93] - }, - "0.5": { - "vector": [0, 0, 0] - } - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0.25, -0.5, 0.5], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } } } }, @@ -394,24 +381,30 @@ }, "Righthand": { "rotation": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [0, 6, -9] + "0.325": { + "vector": [-0.74716, 1.87653, -7.1133] }, - "0.375": { + "1.0": { + "vector": [-0.74716, 1.87653, -7.1133] + }, + "1.1": { "vector": [0, 0, 0] } }, "position": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [3.00321, -0.61688, -0.10106] + "0.325": { + "vector": [-0.66084, -0.04017, 0.01492] }, - "0.375": { + "1.0": { + "vector": [-0.66084, -0.04017, 0.01492] + }, + "1.1": { "vector": [0, 0, 0] } } @@ -422,31 +415,31 @@ "vector": [0, 0, 0] }, "0.075": { - "vector": [133.30702, -9.72565, -30.6365] + "vector": [-133.307, 9.7256, -30.6365] }, "0.65": { - "vector": [25.46719, -22.2363, 78.12621] + "vector": [-25.4672, 22.2363, 78.12621] }, "0.725": { - "vector": [23.34788, -25.26118, 70.86152] + "vector": [-23.3479, 25.2612, 70.86152] }, "0.8": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.925": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.975": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "1.0": { - "vector": [13.04381, 11.88065, 62.82106] + "vector": [-13.0438, -11.8806, 62.82106] }, "1.025": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "1.05": { - "vector": [5.64016, 8.63483, 66.98444] + "vector": [-5.6402, -8.6348, 66.98444] }, "1.125": { "vector": [0, 0, 8] @@ -810,24 +803,30 @@ }, "Righthand": { "rotation": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [0, 6, -9] + "0.325": { + "vector": [-0.74716, 1.87653, -7.1133] }, - "0.375": { + "1.0": { + "vector": [-0.74716, 1.87653, -7.1133] + }, + "1.1": { "vector": [0, 0, 0] } }, "position": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [3.00321, -0.61688, -0.10106] + "0.325": { + "vector": [-0.66084, -0.04017, 0.01492] }, - "0.375": { + "1.0": { + "vector": [-0.66084, -0.04017, 0.01492] + }, + "1.1": { "vector": [0, 0, 0] } } @@ -838,47 +837,47 @@ "vector": [0, 0, 0] }, "0.075": { - "vector": [133.30702, -9.72565, -30.6365] + "vector": [-133.307, 9.7256, -30.6365] }, "0.65": { - "vector": [25.46719, -22.2363, 78.12621] + "vector": [-25.4672, 22.2363, 78.12621] }, "0.725": { - "vector": [23.34788, -25.26118, 70.86152] + "vector": [-23.3479, 25.2612, 70.86152] }, "0.8": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.925": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.975": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "1.0": { - "vector": [13.04381, 11.88065, 62.82106] + "vector": [-13.0438, -11.8806, 62.82106] }, "1.05": { - "vector": [-4.93818, -6.6412, 30.82739] + "vector": [4.9382, 6.6412, 30.82739] }, "1.15": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.2": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.225": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.4": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.5": { - "vector": [3.537, -23.82754, -26.97592] + "vector": [-3.537, 23.8275, -26.97592] }, "1.575": { "vector": [0, 0, 0] @@ -1243,6 +1242,204 @@ } } }, + "animation.glock.change_fire_rate": { + "animation_length": 0.5, + "override_previous_animation": true, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [-0.98905, -0.20901, -1.99637], + "easing": "easeInSine" + }, + "0.25": { + "vector": [0, -3, -8], + "easing": "easeOutQuad" + }, + "0.375": { + "vector": [0.05236, 1.49909, -1.99931] + }, + "0.5": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [0, 0.00828, 0], + "easing": "easeInSine" + }, + "0.25": { + "vector": [0, 0.1, 0], + "easing": "easeOutQuad" + }, + "0.3333": { + "vector": [0, -0.095, 0] + }, + "0.5": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "lun": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, -22.5] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + } + } + }, + "Righthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [0, 0, -2.5] + }, + "0.25": { + "vector": [-0.5682, 1.9262, -5.92244] + }, + "0.4167": { + "vector": [-0.9707, 0.6993, -1.25596] + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1667": { + "vector": [0.19922, 0, 0] + }, + "0.25": { + "vector": [0.2, 0.27734, 0] + }, + "0.5": { + "vector": [0, 0, 0] + } + } + } + } + }, + "animation.glock.change_fire_rate2": { + "animation_length": 0.5, + "override_previous_animation": true, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + }, + "0.125": { + "vector": [-0.39193, -2.97431, -0.48982], + "easing": "easeOutQuad" + }, + "0.25": { + "vector": [0.24763, 1.47942, 5.5032] + }, + "0.3333": { + "vector": [-1.00787, -0.07813, 5.50251], + "easing": "easeInSine" + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + }, + "0.125": { + "vector": [0, 0.1, 0], + "easing": "easeOutQuad" + }, + "0.25": { + "vector": [0, -0.095, 0] + }, + "0.375": { + "vector": [0, 0.00828, 0], + "easing": "easeInSine" + }, + "0.5": { + "vector": [0, 0, 0] + } + } + }, + "lun": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, -22.5] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [0, 0, 0] + } + } + }, + "Righthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [-0.8574, 2.299, -7.40388] + }, + "0.2083": { + "vector": [0, 0, -2.5] + }, + "0.3333": { + "vector": [-0.9707, 0.6993, -1.25596] + }, + "0.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [0.2, 0.27734, 0] + }, + "0.2083": { + "vector": [0.19922, 0, 0] + }, + "0.5": { + "vector": [0, 0, 0] + } + } + } + } + }, "animation.m1911.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 1.7, @@ -1341,24 +1538,30 @@ }, "Righthand": { "rotation": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [0, 6, -9] + "0.325": { + "vector": [-0.74716, 1.87653, -7.1133] }, - "0.375": { + "1.0": { + "vector": [-0.74716, 1.87653, -7.1133] + }, + "1.1": { "vector": [0, 0, 0] } }, "position": { - "0.125": { + "0.25": { "vector": [0, 0, 0] }, - "0.25": { - "vector": [3.00321, -0.61688, -0.10106] + "0.325": { + "vector": [-0.66084, -0.04017, 0.01492] }, - "0.375": { + "1.0": { + "vector": [-0.66084, -0.04017, 0.01492] + }, + "1.1": { "vector": [0, 0, 0] } } @@ -1369,47 +1572,47 @@ "vector": [0, 0, 0] }, "0.075": { - "vector": [133.30702, -9.72565, -30.6365] + "vector": [-133.307, 9.7256, -30.6365] }, "0.65": { - "vector": [25.46719, -22.2363, 78.12621] + "vector": [-25.4672, 22.2363, 78.12621] }, "0.725": { - "vector": [23.34788, -25.26118, 70.86152] + "vector": [-23.3479, 25.2612, 70.86152] }, "0.8": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.925": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "0.975": { - "vector": [15.35593, 5.20698, 63.75845] + "vector": [-15.3559, -5.207, 63.75845] }, "1.0": { - "vector": [13.04381, 11.88065, 62.82106] + "vector": [-13.0438, -11.8806, 62.82106] }, "1.05": { - "vector": [-4.93818, -6.6412, 30.82739] + "vector": [4.9382, 6.6412, 30.82739] }, "1.15": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.2": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.225": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.4": { - "vector": [-32.88924, -30.55823, -55.9374], + "vector": [32.8892, 30.5582, -55.9374], "easing": "easeInOutSine" }, "1.5": { - "vector": [3.537, -23.82754, -26.97592] + "vector": [-3.537, 23.8275, -26.97592] }, "1.575": { "vector": [0, 0, 0] @@ -1773,204 +1976,6 @@ } } } - }, - "animation.glock.change_fire_rate": { - "animation_length": 0.5, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [-0.98905, -0.20901, -1.99637], - "easing": "easeInSine" - }, - "0.25": { - "vector": [0, -3, -8], - "easing": "easeOutQuad" - }, - "0.375": { - "vector": [0.05236, 1.49909, -1.99931] - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0, 0.00828, 0], - "easing": "easeInSine" - }, - "0.25": { - "vector": [0, 0.1, 0], - "easing": "easeOutQuad" - }, - "0.3333": { - "vector": [0, -0.095, 0] - }, - "0.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - }, - "lun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, -22.5] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0, 0, -2.5] - }, - "0.25": { - "vector": [0.5682, -1.92615, -5.92244] - }, - "0.4167": { - "vector": [0.97066, -0.69928, -1.25596] - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0.19922, 0, 0] - }, - "0.25": { - "vector": [0.2, 0.27734, 0] - }, - "0.5": { - "vector": [0, 0, 0] - } - } - } - } - }, - "animation.glock.change_fire_rate2": { - "animation_length": 0.5, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.125": { - "vector": [-0.39193, -2.97431, -0.48982], - "easing": "easeOutQuad" - }, - "0.25": { - "vector": [0.24763, 1.47942, 5.5032] - }, - "0.3333": { - "vector": [-1.00787, -0.07813, 5.50251], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.125": { - "vector": [0, 0.1, 0], - "easing": "easeOutQuad" - }, - "0.25": { - "vector": [0, -0.095, 0] - }, - "0.375": { - "vector": [0, 0.00828, 0], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 0] - } - } - }, - "lun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, -22.5] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [0.85744, -2.29899, -7.40388] - }, - "0.2083": { - "vector": [0, 0, -2.5] - }, - "0.3333": { - "vector": [0.97066, -0.69928, -1.25596] - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [0.2, 0.27734, 0] - }, - "0.2083": { - "vector": [0.19922, 0, 0] - }, - "0.5": { - "vector": [0, 0, 0] - } - } - } - } } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/superbwarfare/animations/hk416.animation.json b/src/main/resources/assets/superbwarfare/animations/hk416.animation.json index e7318cca1..a2a3e02ec 100644 --- a/src/main/resources/assets/superbwarfare/animations/hk416.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/hk416.animation.json @@ -260,14 +260,6 @@ } } }, - "Righthand": { - "rotation": { - "vector": [-2.03554, 4.28304, 3.39493] - }, - "position": { - "vector": [0.30134, -0.35141, 1.25128] - } - }, "Lefthand": { "rotation": { "vector": [-1.41476, -16.33468, -1.66483] @@ -559,50 +551,50 @@ "vector": [0, 0, 0] }, "0.4583": { - "vector": [-3.81928, -8.59364, -9.17363] + "vector": [3.8193, 8.5936, -9.17363] }, "0.5417": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "0.625": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "0.9167": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "1.0": { - "vector": [-1.80149, -4.34261, -11.56806] + "vector": [1.8015, 4.3426, -11.56806] }, "1.9167": { - "vector": [-1.80149, -4.34261, -11.56806] + "vector": [1.8015, 4.3426, -11.56806] }, "2.0417": { - "vector": [8.98588, -28.60432, 4.50464] + "vector": [-8.9859, 28.6043, 4.50464] }, "2.1667": { - "vector": [-22.62507, -32.8034, 18.28494] + "vector": [22.6251, 32.8034, 18.28494] }, "2.2083": { - "vector": [-22.62507, -32.8034, 18.28494] + "vector": [22.6251, 32.8034, 18.28494] }, "2.2917": { - "vector": [-15.46722, -16.63005, 1.48245], + "vector": [15.4672, 16.6301, 1.48245], "easing": "easeInElastic" }, "2.375": { - "vector": [-15.46722, -16.63005, 1.48245], + "vector": [15.4672, 16.6301, 1.48245], "easing": "easeInElastic" }, "2.4583": { - "vector": [-15.14496, -21.26229, 5.31052], + "vector": [15.145, 21.2623, 5.31052], "easing": "easeOutSine" }, "2.5417": { - "vector": [3.06668, -17.33275, 4.18047], + "vector": [-3.0667, 17.3328, 4.18047], "easing": "easeInOutSine" }, "2.6667": { - "vector": [-8.03996, -14.46909, -5.02907] + "vector": [8.04, 14.4691, -5.02907] }, "2.75": { "vector": [0, 0, 0] @@ -634,29 +626,29 @@ "vector": [-0.3, -3.7, 5.6] }, "2.1667": { - "vector": [-1, -2, 7] + "vector": [-1, -2, 6] }, "2.2083": { - "vector": [-1, -2, 7] + "vector": [-1, -2, 6] }, "2.2917": { - "vector": [-0.51, -1.43, 7.2], + "vector": [-0.51, -1.43, 6.2], "easing": "easeInElastic" }, "2.375": { - "vector": [-0.51, -1.43, 7.2], + "vector": [-0.51, -1.43, 6.2], "easing": "easeInElastic" }, "2.4583": { - "vector": [-0.51, -1.43, 7.2], + "vector": [-0.51, -1.43, 6.2], "easing": "easeOutSine" }, "2.5417": { - "vector": [0.29, -0.14, 6.76], + "vector": [0.29, -0.14, 5.76], "easing": "easeInOutSine" }, "2.6667": { - "vector": [0.14, -2.57, 2.38] + "vector": [0.14, -2.57, 1.38] }, "2.75": { "vector": [0, 0, 0] @@ -954,25 +946,25 @@ "vector": [0, 0, 0] }, "0.4583": { - "vector": [-3.81928, -8.59364, -9.17363] + "vector": [3.8193, 8.5936, -9.17363] }, "0.5417": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "0.625": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "0.9167": { - "vector": [0, 1.5, 1] + "vector": [0, -1.5, 1] }, "1.0": { - "vector": [-1.80149, -4.34261, -11.56806] + "vector": [1.8015, 4.3426, -11.56806] }, "1.9167": { - "vector": [-1.80149, -4.34261, -11.56806] + "vector": [1.8015, 4.3426, -11.56806] }, "2.0417": { - "vector": [-3.81928, -8.59364, -9.17363] + "vector": [3.8193, 8.5936, -9.17363] }, "2.2917": { "vector": [0, 0, 0], diff --git a/src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json b/src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json index 1ae312f23..13f339f11 100644 --- a/src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/hunting_rifle.animation.json @@ -361,51 +361,51 @@ "vector": [0, 0, 0] }, "0.4": { - "vector": [-8.8948, 19.8626, 36.14405], + "vector": [8.8948, -19.8626, 36.14405], "easing": "easeInElastic" }, "0.5": { - "vector": [-8.8948, 19.8626, 36.14405] + "vector": [8.8948, -19.8626, 36.14405] }, "0.65": { - "vector": [-8.8948, 19.8626, 36.14405] + "vector": [8.8948, -19.8626, 36.14405] }, "0.8": { - "vector": [3.25, 10.2, 17.36] + "vector": [-3.25, -10.2, 17.36] }, "1.0": { - "vector": [51.5, 10.2, 17.36] + "vector": [-51.5, -10.2, 17.36] }, "1.3": { - "vector": [-11.19908, 17.21105, 28.33644] + "vector": [11.1991, -17.211, 28.33644] }, "1.5": { - "vector": [-17.96066, 20.21452, 33.90326] + "vector": [17.9607, -20.2145, 33.90326] }, "1.6": { - "vector": [-14.94857, 17.74508, 35.60731] + "vector": [14.9486, -17.7451, 35.60731] }, "1.7": { - "vector": [-0.24351, 0.37838, 20.00199] + "vector": [0.2435, -0.3784, 20.00199] }, "1.925": { - "vector": [-0.24351, 0.37838, 20.00199] + "vector": [0.2435, -0.3784, 20.00199] }, "2.025": { - "vector": [4.03477, 13.13055, 0.42291] + "vector": [-4.0348, -13.1306, 0.42291] }, "2.225": { - "vector": [-8.8948, 19.8626, 36.14405] + "vector": [8.8948, -19.8626, 36.14405] }, "2.3": { - "vector": [-8.8948, 19.8626, 36.14405] + "vector": [8.8948, -19.8626, 36.14405] }, "2.475": { - "vector": [-8.8948, 19.8626, 36.14405], + "vector": [8.8948, -19.8626, 36.14405], "easing": "easeInElastic" }, "2.5": { - "vector": [-8.8948, 19.8626, 36.14405] + "vector": [8.8948, -19.8626, 36.14405] }, "2.6": { "vector": [0, 0, 0], diff --git a/src/main/resources/assets/superbwarfare/animations/k98.animation.json b/src/main/resources/assets/superbwarfare/animations/k98.animation.json index 8a83c1c75..ec708bac2 100644 --- a/src/main/resources/assets/superbwarfare/animations/k98.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/k98.animation.json @@ -175,10 +175,10 @@ }, "Righthand": { "rotation": { - "vector": [0.91131, 14.09621, -8.80599] + "vector": [2.0609, 1.03935, 6.06291] }, "position": { - "vector": [2.87519, -0.6965, 0.78255] + "vector": [-1.01438, 0.65756, -1.18578] } }, "camera": { @@ -325,35 +325,35 @@ "vector": [0, 0, 0] }, "0.075": { - "vector": [-18.55124, 17.47135, 19.69774], + "vector": [18.5512, -17.4714, 19.69774], "easing": "linear" }, "0.225": { - "vector": [-21.13227, 15.58282, 11.08112], + "vector": [21.1323, -15.5828, 11.08112], "easing": "easeInSine" }, "0.275": { - "vector": [-21.13227, 15.58282, 11.08112], + "vector": [21.1323, -15.5828, 11.08112], "easing": "easeInSine" }, "0.375": { - "vector": [-15.21355, 15.26875, 0.47749], + "vector": [15.2135, -15.2688, 0.47749], "easing": "easeInSine" }, "0.525": { - "vector": [-21.13227, 15.58282, 11.08112], + "vector": [21.1323, -15.5828, 11.08112], "easing": "easeInSine" }, "0.575": { - "vector": [-21.13227, 15.58282, 11.08112], + "vector": [21.1323, -15.5828, 11.08112], "easing": "easeInSine" }, "0.625": { - "vector": [-21.13227, 15.58282, 11.08112], + "vector": [21.1323, -15.5828, 11.08112], "easing": "easeInSine" }, "0.7": { - "vector": [-18.55124, 17.47135, 19.69774], + "vector": [18.5512, -17.4714, 19.69774], "easing": "linear" }, "0.85": { @@ -720,23 +720,23 @@ "vector": [0, 0, 0] }, "0.325": { - "vector": [-11.05124, 19.47135, -3.30226], + "vector": [11.0512, -19.4714, -3.30226], "easing": "linear" }, "0.4": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.475": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.55": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.6": { - "vector": [-4.14232, 19.79507, 13.70946] + "vector": [4.1423, -19.7951, 13.70946] }, "0.65": { "vector": [0, 0, 0] @@ -745,50 +745,50 @@ "vector": [0, 0, 0] }, "0.925": { - "vector": [-8.33033, 5.65596, 13.05706] + "vector": [8.3303, -5.656, 13.05706] }, "1.0": { - "vector": [-6.18619, 8.07995, 18.65294] + "vector": [6.1862, -8.08, 18.65294] }, "1.15": { - "vector": [-4.42509, 8.92104, 20.48316] + "vector": [4.4251, -8.921, 20.48316] }, "1.25": { - "vector": [-6.86404, 9.72039, 24.55552] + "vector": [6.864, -9.7204, 24.55552] }, "1.375": { - "vector": [-7.46247, 12.29708, 32.22429] + "vector": [7.4625, -12.2971, 32.22429] }, "1.65": { - "vector": [-2.29696, 10.44245, 40.90223], + "vector": [2.297, -10.4424, 40.90223], "easing": "easeOutSine" }, "1.7": { - "vector": [-2.29696, 10.44245, 40.90223], + "vector": [2.297, -10.4424, 40.90223], "easing": "easeOutSine" }, "1.8": { - "vector": [-3.90219, 7.77454, 23.25241] + "vector": [3.9022, -7.7745, 23.25241] }, "1.975": { - "vector": [-1.14775, 6.58976, 7.07099] + "vector": [1.1478, -6.5898, 7.07099] }, "2.075": { "vector": [0, 0, 0] }, "2.175": { - "vector": [-5.26935, 23.9397, 9.47263] + "vector": [5.2694, -23.9397, 9.47263] }, "2.25": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "2.35": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "2.45": { - "vector": [-11.05124, 19.47135, -3.30226], + "vector": [11.0512, -19.4714, -3.30226], "easing": "easeInSine" }, "2.65": { @@ -1323,52 +1323,52 @@ "vector": [0, 0, 0] }, "0.225": { - "vector": [-11.05124, 19.47135, -3.30226], + "vector": [11.0512, -19.4714, -3.30226], "easing": "linear" }, "0.3": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.4": { - "vector": [-2.3634, 22.74644, -2.37175], + "vector": [2.3634, -22.7464, -2.37175], "easing": "easeInSine" }, "0.45": { - "vector": [-38.00184, 36.4054, 12.11123] + "vector": [38.0018, -36.4054, 12.11123] }, "0.5": { - "vector": [-25.14483, 27.42795, 31.71508] + "vector": [25.1448, -27.4279, 31.71508] }, "0.625": { - "vector": [-26.07019, 8.24668, 23.7982] + "vector": [26.0702, -8.2467, 23.7982] }, "0.85": { - "vector": [-20.82632, 5.64263, 37.12867], + "vector": [20.8263, -5.6426, 37.12867], "easing": "easeInQuad" }, "0.9": { - "vector": [-20.82632, 5.64263, 37.12867], + "vector": [20.8263, -5.6426, 37.12867], "easing": "easeInQuad" }, "0.95": { - "vector": [-21.52185, 6.02263, 40.77085], + "vector": [21.5219, -6.0226, 40.77085], "easing": "easeInQuad" }, "1.025": { - "vector": [-20.82632, 5.64263, 37.12867], + "vector": [20.8263, -5.6426, 37.12867], "easing": "easeInQuad" }, "1.15": { - "vector": [-16.71355, 15.26875, 0.47749], + "vector": [16.7136, -15.2688, 0.47749], "easing": "easeInSine" }, "1.275": { - "vector": [-15.87845, 7.81711, -10.21497], + "vector": [15.8785, -7.8171, -10.21497], "easing": "easeInSine" }, "1.5": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" } }, @@ -1650,24 +1650,24 @@ "Righthand": { "rotation": { "0.0": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" }, "0.15": { - "vector": [-12.81458, 23.61754, 36.26634], + "vector": [12.8146, -23.6175, 36.26634], "easing": "easeInElastic" }, "0.2": { - "vector": [-12.81, 23.62, 36.27] + "vector": [12.81, -23.62, 36.27] }, "0.275": { - "vector": [-12.49926, 24.91581, 38.43047] + "vector": [12.4993, -24.9158, 38.43047] }, "0.35": { - "vector": [-12.81, 23.62, 36.27] + "vector": [12.81, -23.62, 36.27] }, "0.5": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" } }, @@ -1886,24 +1886,24 @@ "Righthand": { "rotation": { "0.0": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" }, "0.15": { - "vector": [-12.81458, 23.61754, 36.26634], + "vector": [12.8146, -23.6175, 36.26634], "easing": "easeInElastic" }, "0.2": { - "vector": [-12.81, 23.62, 36.27] + "vector": [12.81, -23.62, 36.27] }, "0.275": { - "vector": [-12.49926, 24.91581, 38.43047] + "vector": [12.4993, -24.9158, 38.43047] }, "0.35": { - "vector": [-12.81, 23.62, 36.27] + "vector": [12.81, -23.62, 36.27] }, "0.5": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" } }, @@ -2138,22 +2138,22 @@ "Righthand": { "rotation": { "0.0": { - "vector": [-11.3392, 11.10446, 14.57372], + "vector": [11.3392, -11.1045, 14.57372], "easing": "easeInElastic" }, "0.125": { - "vector": [0.33364, 12.32415, 10.44503] + "vector": [-0.3336, -12.3241, 10.44503] }, "0.25": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.35": { - "vector": [-2.21355, 15.26875, 0.47749], + "vector": [2.2136, -15.2688, 0.47749], "easing": "easeInSine" }, "0.45": { - "vector": [-11.05124, 19.47135, -3.30226], + "vector": [11.0512, -19.4714, -3.30226], "easing": "easeInSine" }, "0.65": { diff --git a/src/main/resources/assets/superbwarfare/animations/m60.animation.json b/src/main/resources/assets/superbwarfare/animations/m60.animation.json index f6f03ab44..5ec0f532b 100644 --- a/src/main/resources/assets/superbwarfare/animations/m60.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m60.animation.json @@ -534,16 +534,16 @@ "vector": [0, 0, 0] }, "0.0833": { - "vector": [-6.6009, 8.85836, -13.85774] + "vector": [6.6009, -8.8584, -13.85774] }, "0.2083": { - "vector": [-13.90491, 17.30021, 3.93238] + "vector": [13.9049, -17.3002, 3.93238] }, "0.5417": { - "vector": [-13.9, 17.3, 3.93] + "vector": [13.9, -17.3, 3.93] }, "0.7083": { - "vector": [-6.93478, 15.31708, -0.16935] + "vector": [6.9348, -15.3171, -0.16935] }, "0.875": { "vector": [0, 0, 0] @@ -640,87 +640,87 @@ "vector": [0, 0, 0] }, "1.5417": { - "vector": [2.85955, -8.17269, -2.48558], + "vector": [-2.8596, 8.1727, -2.48558], "easing": "easeInOutSine" }, "1.625": { - "vector": [-35.91738, -33.71411, 5.51398], + "vector": [35.9174, 33.7141, 5.51398], "easing": "easeInOutSine" }, "1.7917": { - "vector": [-68.76834, -28.84985, -45.12465], + "vector": [68.7683, 28.8498, -45.12465], "easing": "easeInSine" }, "2.0": { - "vector": [-71.79717, -11.25593, -38.23584] + "vector": [71.7972, 11.2559, -38.23584] }, "2.0833": { - "vector": [-32.88366, 41.52582, -17.56942], + "vector": [32.8837, -41.5258, -17.56942], "easing": "easeInQuart" }, "2.2083": { - "vector": [-32.88366, 41.52582, -17.56942], + "vector": [32.8837, -41.5258, -17.56942], "easing": "easeInQuart" }, "2.375": { - "vector": [-9.49945, 23.72491, 29.51203], + "vector": [9.4994, -23.7249, 29.51203], "easing": "easeInSine" }, "2.5": { - "vector": [-16.70582, -8.14497, 15.72292] + "vector": [16.7058, 8.145, 15.72292] }, "2.5833": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "2.625": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "4.2083": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "4.375": { - "vector": [-24.42266, -44.66287, -23.47349] + "vector": [24.4227, 44.6629, -23.47349] }, "4.5417": { - "vector": [-12.96929, -39.3572, -46.30001] + "vector": [12.9693, 39.3572, -46.30001] }, "4.625": { - "vector": [-12.96929, -39.3572, -46.30001] + "vector": [12.9693, 39.3572, -46.30001] }, "4.7083": { - "vector": [-12.53951, -37.21222, -62.43842] + "vector": [12.5395, 37.2122, -62.43842] }, "4.7917": { - "vector": [-12.53951, -37.21222, -65.43842] + "vector": [12.5395, 37.2122, -65.43842] }, "5.0417": { - "vector": [-21.52373, 2.87885, 13.45216], + "vector": [21.5237, -2.8788, 13.45216], "easing": "easeInOutSine" }, "5.0833": { - "vector": [-21.52373, 2.87885, 13.45216], + "vector": [21.5237, -2.8788, 13.45216], "easing": "easeInOutSine" }, "5.25": { - "vector": [-68.76834, -28.84985, -24.12465], + "vector": [68.7683, 28.8498, -24.12465], "easing": "easeInOutSine" }, "5.375": { - "vector": [-68.76834, -28.84985, -24.12465], + "vector": [68.7683, 28.8498, -24.12465], "easing": "easeInOutSine" }, "5.5": { - "vector": [-64.34286, -31.28198, -19.80534] + "vector": [64.3429, 31.282, -19.80534] }, "5.625": { - "vector": [-35.91738, -33.71411, 5.51398], + "vector": [35.9174, 33.7141, 5.51398], "easing": "easeInOutSine" }, "5.75": { - "vector": [3.87136, -15.22809, 1.42118], + "vector": [-3.8714, 15.2281, 1.42118], "easing": "easeInOutSine" }, "5.9167": { @@ -1270,87 +1270,87 @@ "vector": [0, 0, 0] }, "0.7083": { - "vector": [2.85955, -8.17269, -2.48558], + "vector": [-2.8596, 8.1727, -2.48558], "easing": "easeInOutSine" }, "0.7917": { - "vector": [-35.91738, -33.71411, 5.51398], + "vector": [35.9174, 33.7141, 5.51398], "easing": "easeInOutSine" }, "0.9583": { - "vector": [-68.76834, -28.84985, -45.12465], + "vector": [68.7683, 28.8498, -45.12465], "easing": "easeInSine" }, "1.1667": { - "vector": [-71.79717, -11.25593, -38.23584] + "vector": [71.7972, 11.2559, -38.23584] }, "1.25": { - "vector": [-32.88366, 41.52582, -17.56942], + "vector": [32.8837, -41.5258, -17.56942], "easing": "easeInQuart" }, "1.375": { - "vector": [-32.88366, 41.52582, -17.56942], + "vector": [32.8837, -41.5258, -17.56942], "easing": "easeInQuart" }, "1.5417": { - "vector": [-9.49945, 23.72491, 29.51203], + "vector": [9.4994, -23.7249, 29.51203], "easing": "easeInSine" }, "1.6667": { - "vector": [-16.70582, -8.14497, 15.72292] + "vector": [16.7058, 8.145, 15.72292] }, "1.75": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "1.7917": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "3.375": { - "vector": [1.2574, -4.44598, 3.64868], + "vector": [-1.2574, 4.446, 3.64868], "easing": "easeOutSine" }, "3.5417": { - "vector": [-24.42266, -44.66287, -23.47349] + "vector": [24.4227, 44.6629, -23.47349] }, "3.7083": { - "vector": [-12.96929, -39.3572, -46.30001] + "vector": [12.9693, 39.3572, -46.30001] }, "3.7917": { - "vector": [-12.96929, -39.3572, -46.30001] + "vector": [12.9693, 39.3572, -46.30001] }, "3.875": { - "vector": [-12.53951, -37.21222, -62.43842] + "vector": [12.5395, 37.2122, -62.43842] }, "3.9583": { - "vector": [-12.53951, -37.21222, -65.43842] + "vector": [12.5395, 37.2122, -65.43842] }, "4.2083": { - "vector": [-21.52373, 2.87885, 13.45216], + "vector": [21.5237, -2.8788, 13.45216], "easing": "easeInOutSine" }, "4.25": { - "vector": [-21.52373, 2.87885, 13.45216], + "vector": [21.5237, -2.8788, 13.45216], "easing": "easeInOutSine" }, "4.4167": { - "vector": [-68.76834, -28.84985, -24.12465], + "vector": [68.7683, 28.8498, -24.12465], "easing": "easeInOutSine" }, "4.5417": { - "vector": [-68.76834, -28.84985, -24.12465], + "vector": [68.7683, 28.8498, -24.12465], "easing": "easeInOutSine" }, "4.6667": { - "vector": [-64.34286, -31.28198, -19.80534] + "vector": [64.3429, 31.282, -19.80534] }, "4.7917": { - "vector": [-35.91738, -33.71411, 5.51398], + "vector": [35.9174, 33.7141, 5.51398], "easing": "easeInOutSine" }, "4.9167": { - "vector": [3.87136, -15.22809, 1.42118], + "vector": [-3.8714, 15.2281, 1.42118], "easing": "easeInOutSine" }, "5.0833": { diff --git a/src/main/resources/assets/superbwarfare/animations/m79.animation.json b/src/main/resources/assets/superbwarfare/animations/m79.animation.json index a95e1a8f5..7251b7757 100644 --- a/src/main/resources/assets/superbwarfare/animations/m79.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m79.animation.json @@ -380,16 +380,16 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [-8, 0, 0] + "vector": [8, 0, 0] }, "0.175": { "vector": [0, 0, 0] }, "0.275": { - "vector": [-7, 0, 0] + "vector": [7, 0, 0] }, "0.375": { - "vector": [-6.2031, 8.44204, -3.2225] + "vector": [6.2031, -8.442, -3.2225] }, "0.45": { "vector": [0, 0, 0], @@ -420,38 +420,38 @@ "vector": [0, 0, 0] }, "0.175": { - "vector": [0.59411, 0.24806, 1.64028] + "vector": [-0.5941, -0.2481, 1.64028] }, "0.25": { - "vector": [-5.8983, -0.43815, -7.78752] + "vector": [5.8983, 0.4381, -7.78752] }, "0.7": { - "vector": [-5.8983, -0.43815, -7.78752] + "vector": [5.8983, 0.4381, -7.78752] }, "1.075": { - "vector": [-7.17022, 7.39113, -12.40813] + "vector": [7.1702, -7.3911, -12.40813] }, "1.525": { - "vector": [17.52364, 27.40977, -23.09622] + "vector": [-17.5236, -27.4098, -23.09622] }, "1.8": { - "vector": [-29.63645, 18.5572, -26.67534], + "vector": [29.6365, -18.5572, -26.67534], "easing": "easeInSine" }, "1.85": { - "vector": [-37.49787, -5.03762, -44.74418], + "vector": [37.4979, 5.0376, -44.74418], "easing": "easeOutSine" }, "1.925": { - "vector": [-37.49787, -5.03762, -44.74418], + "vector": [37.4979, 5.0376, -44.74418], "easing": "easeOutSine" }, "2.05": { - "vector": [2.06124, -10.12643, -14.23199], + "vector": [-2.0612, 10.1264, -14.23199], "easing": "easeInSine" }, "2.325": { - "vector": [22.33333, 0, 7.55556] + "vector": [-22.3333, 0, 7.55556] }, "2.425": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/superbwarfare/animations/m870.animation.json b/src/main/resources/assets/superbwarfare/animations/m870.animation.json index e09007116..18a04faeb 100644 --- a/src/main/resources/assets/superbwarfare/animations/m870.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m870.animation.json @@ -1,6 +1,10 @@ { "format_version": "1.8.0", "animations": { + "animation.m870.idle": { + "loop": true, + "animation_length": 0.25 + }, "animation.m870.run": { "loop": true, "animation_length": 0.8, @@ -65,14 +69,6 @@ "vector": [-0.3, -0.3, 0.3] } } - }, - "rightarm": { - "rotation": { - "vector": [-3.89081, 10.49539, 14.96336] - }, - "position": { - "vector": [1.66, 0.55, 0.97] - } } } }, @@ -124,22 +120,6 @@ } } }, - "Righthand": { - "rotation": { - "vector": [-2.03554, 4.28304, 3.39493] - }, - "position": { - "vector": [0.30134, -0.35141, 1.25128] - } - }, - "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } - }, "main": { "rotation": { "0.0": { @@ -184,14 +164,6 @@ } } }, - "leftarm": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } - }, "camera": { "rotation": { "0.0": { @@ -210,6 +182,14 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Lefthand": { + "rotation": { + "vector": [-1.41476, -16.33468, -1.66483] + }, + "position": { + "vector": [6, -13, 49] + } } } }, @@ -249,30 +229,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [1, 0, -22] - }, - "0.4167": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [3.53901, 3.6754, 5.59783] - }, - "0.4167": { - "vector": [0, 0, 0] - } - } - }, "camera": { "rotation": { "0.0": { @@ -293,10 +249,6 @@ } } }, - "animation.m870.idle": { - "loop": true, - "animation_length": 0.25 - }, "animation.m870.prepare": { "animation_length": 0.75, "bones": { @@ -320,24 +272,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [18.65272, -19.6093, 27.24873] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-9.54645, -3.8823, 19.89207] - } - } - }, "shell": { "rotation": { "0.0": { @@ -376,14 +310,6 @@ } } }, - "rightarm": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, "camera": { "rotation": { "0.0": { @@ -396,6 +322,28 @@ "vector": [0, 0, -1] } } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [-18.47095, 10.97836, 63.15915] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.25": { + "vector": [-9.32081, -6.89105, 21.0803] + }, + "0.3": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + } + } } } }, @@ -497,107 +445,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.05": { - "vector": [0, 0, 0] - }, - "0.15": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [0, 0, 0] - }, - "0.425": { - "vector": [44.19465, 4.587, -49.36335], - "easing": "linear" - }, - "0.775": { - "vector": [50.21962, 64.27417, 84.66748] - }, - "0.85": { - "vector": [80.02514, 63.03571, 124.53108] - }, - "0.9": { - "vector": [77.02514, 63.03571, 124.53108] - }, - "1.05": { - "vector": [75.22931, 63.93324, 125.81345], - "easing": "easeInElastic" - }, - "1.275": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "1.425": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "1.8": { - "vector": [18.65272, -19.6093, 27.24873] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.05": { - "vector": [0, 0, 0] - }, - "0.15": { - "vector": [0, 0, 2.5] - }, - "0.175": { - "vector": [0, 0, 2.5] - }, - "0.425": { - "vector": [10.15, 5.58, 14.35], - "easing": "linear" - }, - "0.775": { - "vector": [-3.2, -1, 6], - "easing": "easeInSine" - }, - "0.85": { - "vector": [-3.3, -0.8, 5.4] - }, - "0.9": { - "vector": [-3.3, -1.2, 5.4] - }, - "1.0": { - "vector": [-3.3, -1.3, 5.4] - }, - "1.05": { - "vector": [-3.3, -1.2, 5.4] - }, - "1.275": { - "vector": [0, 0, 2.5], - "easing": "easeInOutSine" - }, - "1.3": { - "vector": [0, 0, 2.5], - "easing": "easeInOutSine" - }, - "1.425": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "1.8": { - "vector": [-9.54645, -3.8823, 19.89207] - } - } - }, "pump": { "position": { "0.05": { @@ -760,14 +607,6 @@ } } }, - "rightarm": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, "camera": { "rotation": { "0.0": { @@ -816,11 +655,106 @@ "vector": [0, 0, -1] } } - } - }, - "sound_effects": { - "0.0": { - "effect": "m_870_preparealt" + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.275": { + "vector": [0, 0, 0] + }, + "0.475": { + "vector": [-0.98598, -46.74749, 0.78822] + }, + "0.575": { + "vector": [44.42991, -59.09751, -13.544] + }, + "0.65": { + "vector": [-11.96459, -79.10252, 44.24056] + }, + "0.7": { + "vector": [-7.56559, -86.18673, 42.21027] + }, + "0.775": { + "vector": [-17.44008, -87.41147, 66.68516] + }, + "0.825": { + "vector": [-52.63019, -88.38541, 114.98937] + }, + "0.9": { + "vector": [-50.95487, -92.05482, 120.61741] + }, + "0.975": { + "vector": [-52.20487, -92.05482, 120.61741] + }, + "1.25": { + "vector": [0, 0, 0] + }, + "1.3": { + "vector": [0, 0, 0] + }, + "1.425": { + "vector": [0, 0, 0] + }, + "1.8": { + "vector": [-18.47095, 10.97836, 63.15915] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.05": { + "vector": [0, 0, 0] + }, + "0.15": { + "vector": [0, 0, 5] + }, + "0.275": { + "vector": [0, 0, 2.5] + }, + "0.475": { + "vector": [14.93666, 0.07425, 10.02761] + }, + "0.575": { + "vector": [6.78683, -4.87488, 3.98777] + }, + "0.65": { + "vector": [3.09918, -2.83162, 6.49437] + }, + "0.7": { + "vector": [1.58764, -1.76626, 4.85379] + }, + "0.775": { + "vector": [-1.12392, -2.26928, 4.11178] + }, + "0.825": { + "vector": [-2.79831, -2.8193, 3.65658] + }, + "0.9": { + "vector": [-2.93555, -2.32489, 3.58103] + }, + "0.975": { + "vector": [-2.93555, -2.32489, 3.58103] + }, + "1.125": { + "vector": [1.96807, -0.62855, 7.27052] + }, + "1.25": { + "vector": [0, 0, 5] + }, + "1.3": { + "vector": [0, 0, 5] + }, + "1.425": { + "vector": [0, 0, -2] + }, + "1.8": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + } + } } } }, @@ -871,61 +805,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [18.65272, -19.6093, 27.24873] - }, - "0.3333": { - "vector": [4.37042, -12.55659, 45.40494] - }, - "0.4": { - "vector": [8.63442, -19.05481, 37.69582] - }, - "0.4667": { - "vector": [17.5013, -31.66259, 15.84959] - }, - "0.5": { - "vector": [17.5013, -31.66259, 15.84959] - }, - "0.6667": { - "vector": [18.65272, -19.6093, 27.24873] - } - }, - "position": { - "0.0": { - "vector": [-9.54645, -3.8823, 19.89207] - }, - "0.1333": { - "vector": [-10.08, -4.83, 19.86] - }, - "0.2": { - "vector": [-10.01, -3.57, 18.3] - }, - "0.2667": { - "vector": [-9.65, -0.61, 14.13] - }, - "0.3": { - "vector": [-9.77, 0.47, 12.35] - }, - "0.3333": { - "vector": [-9.88076, 0.75263, 11.56752] - }, - "0.4": { - "vector": [-9.63531, 1.18733, 11.34111] - }, - "0.4667": { - "vector": [-8.72034, 1.16261, 9.43975] - }, - "0.5": { - "vector": [-8.72034, 1.16261, 9.43975] - }, - "0.6667": { - "vector": [-9.54645, -3.8823, 19.89207], - "easing": "easeInExpo" - } - } - }, "shell": { "rotation": { "0.0": { @@ -1045,6 +924,53 @@ "vector": [0, 0, -1] } } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [-18.47095, 10.97836, 63.15915] + }, + "0.1333": { + "vector": [8.31709, 9.08301, 62.48638] + }, + "0.3667": { + "vector": [15.03201, -3.71368, 58.64115] + }, + "0.4667": { + "vector": [-2.27818, -4.00125, 55.78607] + }, + "0.6": { + "vector": [-39.5688, -11.20975, 53.80968] + }, + "0.6667": { + "vector": [-18.47095, 10.97836, 63.15915] + } + }, + "position": { + "0.0": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + }, + "0.1333": { + "vector": [-11.34414, -5.46371, 18.05052] + }, + "0.2": { + "vector": [-10.37992, -4.52519, 16.80127] + }, + "0.3": { + "vector": [-8.72277, -1.64075, 10.98061] + }, + "0.3667": { + "vector": [-8.38284, -1.12558, 9.55926] + }, + "0.4667": { + "vector": [-7.17838, 0.61257, 9.98836] + }, + "0.6667": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + } + } } } }, @@ -1095,61 +1021,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [18.65272, -19.6093, 27.24873] - }, - "0.3333": { - "vector": [4.37042, -12.55659, 45.40494] - }, - "0.4": { - "vector": [8.63442, -19.05481, 37.69582] - }, - "0.4667": { - "vector": [17.5013, -31.66259, 15.84959] - }, - "0.5": { - "vector": [17.5013, -31.66259, 15.84959] - }, - "0.6667": { - "vector": [18.65272, -19.6093, 27.24873] - } - }, - "position": { - "0.0": { - "vector": [-9.54645, -3.8823, 19.89207] - }, - "0.1333": { - "vector": [-10.08, -4.83, 19.86] - }, - "0.2": { - "vector": [-10.01, -3.57, 18.3] - }, - "0.2667": { - "vector": [-9.65, -0.61, 14.13] - }, - "0.3": { - "vector": [-9.77, 0.47, 12.35] - }, - "0.3333": { - "vector": [-9.88076, 0.75263, 11.56752] - }, - "0.4": { - "vector": [-9.63531, 1.18733, 11.34111] - }, - "0.4667": { - "vector": [-8.72034, 1.16261, 9.43975] - }, - "0.5": { - "vector": [-8.72034, 1.16261, 9.43975] - }, - "0.6667": { - "vector": [-9.54645, -3.8823, 19.89207], - "easing": "easeInExpo" - } - } - }, "shell": { "rotation": { "0.0": { @@ -1269,6 +1140,53 @@ "vector": [0, 0, -1] } } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [-18.47095, 10.97836, 63.15915] + }, + "0.1333": { + "vector": [8.31709, 9.08301, 62.48638] + }, + "0.3667": { + "vector": [15.03201, -3.71368, 58.64115] + }, + "0.4667": { + "vector": [-2.27818, -4.00125, 55.78607] + }, + "0.6": { + "vector": [-39.5688, -11.20975, 53.80968] + }, + "0.6667": { + "vector": [-18.47095, 10.97836, 63.15915] + } + }, + "position": { + "0.0": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + }, + "0.1333": { + "vector": [-11.34414, -5.46371, 18.05052] + }, + "0.2": { + "vector": [-10.37992, -4.52519, 16.80127] + }, + "0.3": { + "vector": [-8.72277, -1.64075, 10.98061] + }, + "0.3667": { + "vector": [-8.38284, -1.12558, 9.55926] + }, + "0.4667": { + "vector": [-7.17838, 0.61257, 9.98836] + }, + "0.6667": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + } + } } } }, @@ -1474,42 +1392,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [0, 0, 0] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.525": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [0, 0, 2.5] - }, - "0.45": { - "vector": [0, 0, 2.5] - }, - "0.525": { - "vector": [0, 0, 0] - } - } - }, "camera": { "rotation": { "0.0": { @@ -1543,6 +1425,22 @@ "vector": [0, 0, 0] } } + }, + "Lefthand": { + "position": { + "0.2": { + "vector": [0, 0, 0] + }, + "0.275": { + "vector": [0, 0, 2.5] + }, + "0.45": { + "vector": [0, 0, 2.5] + }, + "0.525": { + "vector": [0, 0, 0] + } + } } } }, @@ -1581,48 +1479,6 @@ } } }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [18.65272, -19.6093, 27.24873] - }, - "0.3": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [-9.54645, -3.8823, 19.89207] - }, - "0.3": { - "vector": [0, 0, 0] - } - } - }, - "rightarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [5.31757, -2.5454, -13.67018] - }, - "0.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0.154, -0.5295, -0.23646] - }, - "0.4": { - "vector": [0, 0, 0] - } - } - }, "camera": { "rotation": { "0.0": { @@ -1641,6 +1497,71 @@ "vector": [0, 0, 0] } } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [-18.47095, 10.97836, 63.15915] + }, + "0.05": { + "vector": [-18.47095, 10.97836, 63.15915] + }, + "0.2": { + "vector": [-28.75, 4.65, -16.62] + }, + "0.3": { + "vector": [0, 0, 0], + "easing": "easeInSine" + } + }, + "position": { + "0.0": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + }, + "0.05": { + "vector": [-11.72874, -3.65576, 21.26238], + "easing": "easeInSine" + }, + "0.2": { + "vector": [0, 0, 6], + "easing": "easeInSine" + }, + "0.3": { + "vector": [0, 0, 0], + "easing": "easeInSine" + } + } + }, + "Righthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [-5.37185, 5.48187, -20.5349] + }, + "0.35": { + "vector": [-5.37185, 5.48187, -20.5349] + }, + "0.6": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0.76953, -0.5, 0] + }, + "0.35": { + "vector": [0.76953, -0.5, 0] + }, + "0.6": { + "vector": [0, 0, 0] + } + } } } } diff --git a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json index 2e4a27106..a94fac03c 100644 --- a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json @@ -214,7 +214,7 @@ }, "Righthand": { "rotation": { - "vector": [0.91131, 14.09621, -8.80599] + "vector": [-0.9113, -14.0962, -8.80599] }, "position": { "vector": [2.87519, -0.6965, 0.78255] @@ -307,26 +307,26 @@ "vector": [0, 0, 0] }, "0.05": { - "vector": [-10.13452, 14.19053, -4.87335] + "vector": [10.1345, -14.1905, -4.87335] }, "0.2": { - "vector": [-17.36801, 15.96601, -3.18052], + "vector": [17.368, -15.966, -3.18052], "easing": "easeInSine" }, "0.35": { - "vector": [-17.36801, 15.96601, -3.18052], + "vector": [17.368, -15.966, -3.18052], "easing": "easeInElastic" }, "0.4": { - "vector": [-17.8046, 34.99625, 18.716], + "vector": [17.8046, -34.9963, 18.716], "easing": "linear" }, "0.55": { - "vector": [-17.8046, 34.99625, 18.716], + "vector": [17.8046, -34.9963, 18.716], "easing": "linear" }, "0.6": { - "vector": [-10.13452, 14.19053, -4.87335], + "vector": [10.1345, -14.1905, -4.87335], "easing": "easeInElastic" }, "0.75": { @@ -754,30 +754,30 @@ "2.775": { "vector": [0, 0, 0] }, - "2.875": { - "vector": [-10.13452, 14.19053, -4.87335] + "2.825": { + "vector": [10.1345, -14.1905, -4.87335] }, "2.975": { - "vector": [-17.36801, 15.96601, -3.18052], + "vector": [17.368, -15.966, -3.18052], "easing": "easeInSine" }, - "3.075": { - "vector": [-17.36801, 15.96601, -3.18052], + "3.125": { + "vector": [17.368, -15.966, -3.18052], "easing": "easeInElastic" }, "3.175": { - "vector": [-17.8046, 34.99625, 18.716], + "vector": [17.8046, -34.9963, 18.716], "easing": "linear" }, - "3.275": { - "vector": [-17.8046, 34.99625, 18.716], + "3.325": { + "vector": [17.8046, -34.9963, 18.716], "easing": "linear" }, "3.375": { - "vector": [-10.13452, 14.19053, -4.87335], + "vector": [10.1345, -14.1905, -4.87335], "easing": "easeInElastic" }, - "3.575": { + "3.525": { "vector": [0, 0, 0] } }, @@ -819,25 +819,25 @@ "vector": [0, 0, 0] }, "0.525": { - "vector": [6.83397, 0.47886, -0.57224] + "vector": [-6.834, -0.4789, -0.57224] }, "0.65": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "0.9": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "1.0": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "1.575": { - "vector": [11, 0, 0] + "vector": [-11, 0, 0] }, "2.3": { - "vector": [11, 0, 0] + "vector": [-11, 0, 0] }, "2.525": { - "vector": [7.51509, -4.83534, 3.16822] + "vector": [-7.5151, 4.8353, 3.16822] }, "2.675": { "vector": [0, 0, 0] @@ -1263,25 +1263,25 @@ "vector": [0, 0, 0] }, "0.525": { - "vector": [6.83397, 0.47886, -0.57224] + "vector": [-6.834, -0.4789, -0.57224] }, "0.65": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "0.9": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "1.0": { - "vector": [14.03892, 15.21213, 3.24877] + "vector": [-14.0389, -15.2121, 3.24877] }, "1.575": { - "vector": [11, 0, 0] + "vector": [-11, 0, 0] }, "2.3": { - "vector": [11, 0, 0] + "vector": [-11, 0, 0] }, "2.525": { - "vector": [7.51509, -4.83534, 3.16822] + "vector": [-7.5151, 4.8353, 3.16822] }, "2.675": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/superbwarfare/animations/qbz95.animation.json b/src/main/resources/assets/superbwarfare/animations/qbz95.animation.json index 9ac29d787..d9228425a 100644 --- a/src/main/resources/assets/superbwarfare/animations/qbz95.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/qbz95.animation.json @@ -451,60 +451,60 @@ "vector": [0, 0, 0] }, "0.25": { - "vector": [13.52, 4.12, 4.56] + "vector": [-13.52, -4.12, 4.56] }, "0.55": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "0.65": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "0.725": { - "vector": [6.49, 1.31, -3.17] + "vector": [-6.49, -1.31, -3.17] }, "0.85": { - "vector": [14.3971, -13.18645, 21.98034] + "vector": [-14.3971, 13.1865, 21.98034] }, "0.975": { - "vector": [31.98994, -12.01303, 38.17526] + "vector": [-31.9899, 12.013, 38.17526] }, "1.1": { - "vector": [25.3971, -13.18645, 21.98034] + "vector": [-25.3971, 13.1865, 21.98034] }, "1.65": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "1.75": { - "vector": [18.49455, 1.31194, -3.17008] + "vector": [-18.4946, -1.3119, -3.17008] }, "1.875": { - "vector": [18.14075, 1.31194, -3.17008] + "vector": [-18.1407, -1.3119, -3.17008] }, "2.05": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "2.35": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "2.475": { - "vector": [-0.57057, -33.22774, -15.09332] + "vector": [0.5706, 33.2277, -15.09332] }, "2.575": { - "vector": [-11.30566, -43.49647, -41.3946] + "vector": [11.3057, 43.4965, -41.3946] }, "2.725": { - "vector": [-11.30566, -43.49647, -41.3946] + "vector": [11.3057, 43.4965, -41.3946] }, "2.9": { - "vector": [-11.30566, -43.49647, -41.3946] + "vector": [11.3057, 43.4965, -41.3946] }, "3.05": { - "vector": [-4.25481, -14.32135, 14.29472] + "vector": [4.2548, 14.3214, 14.29472] }, "3.2": { "vector": [0, 0, 0], @@ -953,45 +953,44 @@ "vector": [0, 0, 0] }, "0.25": { - "vector": [13.52, 4.12, 4.56] + "vector": [-13.52, -4.12, 4.56] }, "0.55": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "0.65": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "0.725": { - "vector": [6.49, 1.31, -3.17] + "vector": [-6.49, -1.31, -3.17] }, "0.85": { - "vector": [14.3971, -13.18645, 21.98034] + "vector": [-14.3971, 13.1865, 21.98034] }, "0.975": { - "vector": [31.98994, -12.01303, 38.17526] + "vector": [-31.9899, 12.013, 38.17526] }, "1.1": { - "vector": [25.3971, -13.18645, 21.98034] + "vector": [-25.3971, 13.1865, 21.98034] }, "1.65": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, "1.75": { - "vector": [18.49455, 1.31194, -3.17008] + "vector": [-18.4946, -1.3119, -3.17008] }, "1.875": { - "vector": [18.14075, 1.31194, -3.17008] + "vector": [-18.1407, -1.3119, -3.17008] }, "2.05": { - "vector": [13.49455, 1.31194, -3.17008], + "vector": [-13.4946, -1.3119, -3.17008], "easing": "easeInElastic" }, - "2.175": { - "vector": [13.49455, 1.31194, -3.17008], - "easing": "easeInElastic" + "2.275": { + "vector": [-12.31119, 14.74341, 8.8138] }, "2.45": { "vector": [0, 0, 0], diff --git a/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json b/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json index e84434d5f..2f914bc83 100644 --- a/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/trachelium.animation.json @@ -320,47 +320,47 @@ "vector": [0, 0, 0] }, "0.1667": { - "vector": [7.87861, -24.31858, -19.90709] + "vector": [-7.8786, 24.3186, -19.90709] }, "0.2333": { - "vector": [-9.83746, -16.72825, -17.49751] + "vector": [9.8375, 16.7282, -17.49751] }, "0.3333": { - "vector": [-9.83746, -16.72825, -17.49751] + "vector": [9.8375, 16.7282, -17.49751] }, - "0.5": { - "vector": [-5.71303, 40.72967, -4.70082], + "0.4833": { + "vector": [5.713, -40.7297, -4.70082], "easing": "easeInElastic" }, "0.6333": { - "vector": [73.97576, -0.75089, 15.72011] + "vector": [-73.9758, 0.7509, 15.72011] }, "1.45": { - "vector": [38.29511, -2.03526, -73.55015] + "vector": [-38.2951, 2.0353, -73.55015] }, "1.5167": { - "vector": [-2.1677, -33.75228, -72.39051] + "vector": [2.1677, 33.7523, -72.39051] }, "1.9167": { - "vector": [-8.06718, -30.15725, -76.93122], + "vector": [8.0672, 30.1573, -76.93122], "easing": "easeInOutSine" }, "1.95": { - "vector": [-7.21864, -27.00018, -79.53013], + "vector": [7.2186, 27.0002, -79.53013], "easing": "easeInOutSine" }, "2.0833": { - "vector": [-5.27405, -12.48647, -90.38062], + "vector": [5.274, 12.4865, -90.38062], "easing": "easeInSine" }, "2.1": { - "vector": [-5.27405, -12.48647, -90.38062] + "vector": [5.274, 12.4865, -90.38062] }, - "2.3833": { - "vector": [17.64709, -13.8217, -25.46728] + "2.3667": { + "vector": [-17.6471, 13.8217, -25.46728] }, "2.5": { - "vector": [12.25678, -6.17755, -20.01117], + "vector": [-12.2568, 6.1776, -20.01117], "easing": "easeInOutSine" }, "2.7167": { @@ -405,7 +405,7 @@ "2.1": { "vector": [3.72413, 12.68137, -5.5869] }, - "2.3833": { + "2.3667": { "vector": [5.77, 6.2, -0.4] }, "2.5": { diff --git a/src/main/resources/assets/superbwarfare/geo/aa12.geo.json b/src/main/resources/assets/superbwarfare/geo/aa12.geo.json index 36686f032..5531475ef 100644 --- a/src/main/resources/assets/superbwarfare/geo/aa12.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/aa12.geo.json @@ -22,31 +22,31 @@ { "name": "move", "parent": "root", - "pivot": [0, -8.65, 4.95] + "pivot": [0, -6.7375, 3.7125] }, { "name": "bone", "parent": "move", - "pivot": [0, -8.65, 4.95] + "pivot": [0, -6.7375, 3.7125] }, { "name": "shen", "parent": "bone", - "pivot": [0, -8.65, 4.95] + "pivot": [0, -6.7375, 3.7125] }, { "name": "0", "parent": "shen", - "pivot": [0, 0.35, 4.95] + "pivot": [0, 0.0125, 3.7125] }, { "name": "flare", "parent": "0", - "pivot": [0.0225, 2.0375, -30.7125], + "pivot": [0.01688, 1.27813, -23.03438], "cubes": [ { - "origin": [-8.415, -6.85, -28.6875], - "size": [17.1, 17.1, 0], + "origin": [-6.31125, -5.3875, -21.51562], + "size": [12.825, 12.825, 0], "uv": { "north": {"uv": [0, 235.30469], "uv_size": [8, 8]}, "east": {"uv": [0, 235.30469], "uv_size": [8, 8]}, @@ -61,11 +61,11 @@ { "name": "bolt", "parent": "0", - "pivot": [-0.00316, -0.85905, -2.55938], + "pivot": [-0.00237, -0.89429, -1.91953], "cubes": [ { - "origin": [-0.3815, 4.35066, -6.00347], - "size": [0.75668, 0.35598, 1.58043], + "origin": [-0.28613, 3.01299, -4.5026], + "size": [0.56751, 0.26698, 1.18532], "uv": { "north": {"uv": [149, 144], "uv_size": [2, 1]}, "east": {"uv": [145, 53], "uv_size": [4, 1]}, @@ -76,8 +76,8 @@ } }, { - "origin": [-0.2465, 4.70664, -5.62097], - "size": [0.48667, 0.315, 0.79293], + "origin": [-0.18488, 3.27998, -4.21572], + "size": [0.36501, 0.23625, 0.5947], "uv": { "north": {"uv": [133, 152], "uv_size": [1, 1]}, "east": {"uv": [10, 150], "uv_size": [2, 1]}, @@ -88,9 +88,9 @@ } }, { - "origin": [-0.2465, 4.54925, -5.65958], - "size": [0.48667, 0.27, 0.25293], - "pivot": [-0.00316, 4.66175, -5.75812], + "origin": [-0.18488, 3.16193, -4.24469], + "size": [0.36501, 0.2025, 0.1897], + "pivot": [-0.00237, 3.24631, -4.31859], "rotation": [45, 0, 0], "uv": { "north": {"uv": [140, 152], "uv_size": [1, 1]}, @@ -102,9 +102,9 @@ } }, { - "origin": [-0.2465, 4.99326, -5.59081], - "size": [0.48667, 0.18, 0.1125], - "pivot": [-0.00316, 5.08326, -5.53456], + "origin": [-0.18488, 3.49495, -4.1931], + "size": [0.36501, 0.135, 0.08438], + "pivot": [-0.00237, 3.56245, -4.15092], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [143, 152], "uv_size": [1, 1]}, @@ -116,9 +116,9 @@ } }, { - "origin": [-0.2465, 5.15221, -5.54673], - "size": [0.48667, 0.2025, 0.1125], - "pivot": [-0.00316, 5.24221, -5.49048], + "origin": [-0.18488, 3.61416, -4.16004], + "size": [0.36501, 0.15188, 0.08438], + "pivot": [-0.00237, 3.68166, -4.11786], "rotation": [-8.5, 0, 0], "uv": { "north": {"uv": [146, 152], "uv_size": [1, 1]}, @@ -130,9 +130,9 @@ } }, { - "origin": [-0.2465, 5.33586, -5.5434], - "size": [0.48667, 0.3375, 0.1125], - "pivot": [-0.00316, 5.42586, -5.48715], + "origin": [-0.18488, 3.75189, -4.15755], + "size": [0.36501, 0.25312, 0.08438], + "pivot": [-0.00237, 3.81939, -4.11536], "rotation": [8.5, 0, 0], "uv": { "north": {"uv": [149, 152], "uv_size": [1, 1]}, @@ -144,9 +144,9 @@ } }, { - "origin": [-0.2465, 5.64906, -5.61182], - "size": [0.48667, 0.1575, 0.13184], - "pivot": [-0.00316, 5.73906, -5.55557], + "origin": [-0.18488, 3.98679, -4.20887], + "size": [0.36501, 0.11812, 0.09888], + "pivot": [-0.00237, 4.05429, -4.16668], "rotation": [23.5, 0, 0], "uv": { "north": {"uv": [153, 18], "uv_size": [1, 1]}, @@ -158,9 +158,9 @@ } }, { - "origin": [-0.2465, 4.97621, -4.78964], - "size": [0.48667, 0.3375, 0.1125], - "pivot": [-0.00316, 5.06621, -4.73339], + "origin": [-0.18488, 3.48216, -3.59223], + "size": [0.36501, 0.25312, 0.08438], + "pivot": [-0.00237, 3.54966, -3.55005], "rotation": [31, 0, 0], "uv": { "north": {"uv": [152, 152], "uv_size": [1, 1]}, @@ -172,9 +172,9 @@ } }, { - "origin": [-0.2465, 5.2421, -4.9721], - "size": [0.48667, 0.3375, 0.1125], - "pivot": [-0.00316, 5.3321, -4.91585], + "origin": [-0.18488, 3.68157, -3.72908], + "size": [0.36501, 0.25312, 0.08437], + "pivot": [-0.00237, 3.74907, -3.68689], "rotation": [44.5, 0, 0], "uv": { "north": {"uv": [5, 153], "uv_size": [1, 1]}, @@ -186,9 +186,9 @@ } }, { - "origin": [-0.2465, 5.46452, -5.21139], - "size": [0.48667, 0.3375, 0.1125], - "pivot": [-0.00316, 5.55452, -5.15514], + "origin": [-0.18488, 3.84839, -3.90854], + "size": [0.36501, 0.25312, 0.08438], + "pivot": [-0.00237, 3.91589, -3.86636], "rotation": [54.5, 0, 0], "uv": { "north": {"uv": [153, 8], "uv_size": [1, 1]}, @@ -200,9 +200,9 @@ } }, { - "origin": [-0.2465, 5.64201, -5.48567], - "size": [0.48667, 0.3825, 0.1125], - "pivot": [-0.00316, 5.73201, -5.42942], + "origin": [-0.18488, 3.98151, -4.11425], + "size": [0.36501, 0.28688, 0.08438], + "pivot": [-0.00237, 4.04901, -4.07207], "rotation": [64.5, 0, 0], "uv": { "north": {"uv": [153, 14], "uv_size": [1, 1]}, @@ -214,8 +214,8 @@ } }, { - "origin": [-0.2465, 4.93164, -4.82804], - "size": [0.48667, 0.09, 0.45], + "origin": [-0.18488, 3.44873, -3.62103], + "size": [0.36501, 0.0675, 0.3375], "uv": { "north": {"uv": [134, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 134], "uv_size": [1, 1]}, @@ -226,9 +226,9 @@ } }, { - "origin": [-0.2465, 4.92821, -4.89026], - "size": [0.48667, 0.09352, 0.27], - "pivot": [-0.00316, 4.97321, -4.62026], + "origin": [-0.18488, 3.44616, -3.66769], + "size": [0.36501, 0.07014, 0.2025], + "pivot": [-0.00237, 3.47991, -3.46519], "rotation": [22.5, 0, 0], "uv": { "north": {"uv": [137, 152], "uv_size": [1, 1]}, @@ -240,9 +240,9 @@ } }, { - "origin": [0.2485, 4.47434, -6.00116], - "size": [0.12667, 0.405, 0.54543], - "pivot": [0.33434, 4.78934, -5.72845], + "origin": [0.18637, 3.10575, -4.50087], + "size": [0.09501, 0.30375, 0.40907], + "pivot": [0.25075, 3.342, -4.29634], "rotation": [35, 0, 0], "uv": { "north": {"uv": [119, 152], "uv_size": [1, 1]}, @@ -254,8 +254,8 @@ } }, { - "origin": [0.2485, 4.70448, -5.55668], - "size": [0.12667, 0.315, 0.32043], + "origin": [0.18637, 3.27836, -4.16751], + "size": [0.09501, 0.23625, 0.24032], "uv": { "north": {"uv": [122, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 122], "uv_size": [1, 1]}, @@ -266,9 +266,9 @@ } }, { - "origin": [0.2035, 4.83808, -5.42168], - "size": [0.21667, 0.1125, 0.1125], - "pivot": [0.31184, 4.89433, -5.36543], + "origin": [0.15262, 3.37856, -4.06626], + "size": [0.16251, 0.08438, 0.08437], + "pivot": [0.23388, 3.42074, -4.02407], "rotation": [-45, 0, 0], "uv": { "north": {"uv": [153, 21], "uv_size": [1, 1]}, @@ -280,9 +280,9 @@ } }, { - "origin": [0.2485, 4.60697, -5.29145], - "size": [0.12667, 0.315, 0.81543], - "pivot": [0.33434, 4.83197, -5.01874], + "origin": [0.18637, 3.20523, -3.96859], + "size": [0.09501, 0.23625, 0.61157], + "pivot": [0.25075, 3.37398, -3.76405], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [125, 152], "uv_size": [1, 1]}, @@ -294,9 +294,9 @@ } }, { - "origin": [-0.3815, 4.47434, -6.00116], - "size": [0.12667, 0.405, 0.54543], - "pivot": [-0.34066, 4.78934, -5.72845], + "origin": [-0.28613, 3.10575, -4.50087], + "size": [0.09501, 0.30375, 0.40907], + "pivot": [-0.2555, 3.342, -4.29634], "rotation": [35, 0, 0], "uv": { "north": {"uv": [130, 152], "uv_size": [1, 1]}, @@ -308,8 +308,8 @@ } }, { - "origin": [-0.3815, 4.70448, -5.55668], - "size": [0.12667, 0.315, 0.32043], + "origin": [-0.28613, 3.27836, -4.16751], + "size": [0.09501, 0.23625, 0.24032], "uv": { "north": {"uv": [127, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 127], "uv_size": [1, 1]}, @@ -320,9 +320,9 @@ } }, { - "origin": [-0.3815, 4.60697, -5.29145], - "size": [0.12667, 0.315, 0.81543], - "pivot": [-0.34066, 4.83197, -5.01874], + "origin": [-0.28613, 3.20523, -3.96859], + "size": [0.09501, 0.23625, 0.61157], + "pivot": [-0.2555, 3.37398, -3.76405], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [126, 152], "uv_size": [1, 1]}, @@ -338,21 +338,21 @@ { "name": "gun", "parent": "0", - "pivot": [-0.00316, -0.85905, -2.10938] + "pivot": [-0.00237, -0.89429, -1.58203] }, { "name": "body", "parent": "gun", - "pivot": [-0.06622, -3.94913, 0.95222] + "pivot": [-0.04967, -3.21185, 0.71417] }, { "name": "bone6", "parent": "body", - "pivot": [-0.00318, -0.2642, 3.43227], + "pivot": [-0.00238, -0.44815, 2.5742], "cubes": [ { - "origin": [-1.01151, -0.22197, 1.04828], - "size": [2.01669, 1.26321, 3.55298], + "origin": [-0.75863, -0.41647, 0.78621], + "size": [1.51252, 0.94741, 2.66474], "uv": { "north": {"uv": [96, 130], "uv_size": [4, 3]}, "east": {"uv": [90, 68], "uv_size": [8, 3]}, @@ -363,8 +363,8 @@ } }, { - "origin": [-0.62901, -2.15697, 4.91828], - "size": [1.25169, 1.935, 1.64048], + "origin": [-0.47176, -1.86772, 3.68871], + "size": [0.93877, 1.45125, 1.23036], "uv": { "north": {"uv": [131, 19], "uv_size": [3, 4]}, "east": {"uv": [92, 127], "uv_size": [4, 4]}, @@ -375,9 +375,9 @@ } }, { - "origin": [-0.51651, -7.5519, 0.95773], - "size": [1.02669, 8.64, 0.29048], - "pivot": [-0.00316, -3.2319, 1.10297], + "origin": [-0.38738, -5.91393, 0.7183], + "size": [0.77002, 6.48, 0.21786], + "pivot": [-0.00237, -2.67393, 0.82723], "rotation": [-2, 0, 0], "uv": { "north": {"uv": [65, 105], "uv_size": [2, 19]}, @@ -389,8 +389,8 @@ } }, { - "origin": [-0.47151, -2.80947, 1.15876], - "size": [0.93669, 0.135, 2.655], + "origin": [-0.35363, -2.3571, 0.86907], + "size": [0.70252, 0.10125, 1.99125], "uv": { "north": {"uv": [149, 80], "uv_size": [2, 1]}, "east": {"uv": [142, 113], "uv_size": [6, 1]}, @@ -401,8 +401,8 @@ } }, { - "origin": [-0.51651, -2.85447, 1.15876], - "size": [0.045, 0.225, 2.205], + "origin": [-0.38738, -2.39085, 0.86907], + "size": [0.03375, 0.16875, 1.65375], "uv": { "north": {"uv": [62, 152], "uv_size": [1, 1]}, "east": {"uv": [143, 85], "uv_size": [5, 1]}, @@ -413,8 +413,8 @@ } }, { - "origin": [-0.51651, -3.19197, 2.41876], - "size": [0.135, 0.3825, 0.45], + "origin": [-0.38738, -2.64397, 1.81407], + "size": [0.10125, 0.28688, 0.3375], "uv": { "north": {"uv": [63, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 63], "uv_size": [1, 1]}, @@ -425,9 +425,9 @@ } }, { - "origin": [-0.47151, -2.70267, 3.76566], - "size": [0.93669, 0.135, 0.585], - "pivot": [-0.00316, -2.63517, 4.05816], + "origin": [-0.35363, -2.277, 2.82424], + "size": [0.70252, 0.10125, 0.43875], + "pivot": [-0.00237, -2.22638, 3.04362], "rotation": [22.5, 0, 0], "uv": { "north": {"uv": [149, 81], "uv_size": [2, 1]}, @@ -439,9 +439,9 @@ } }, { - "origin": [-0.47151, -2.43003, 4.26261], - "size": [0.93669, 0.135, 0.495], - "pivot": [-0.00316, -2.36253, 4.55511], + "origin": [-0.35363, -2.07252, 3.19696], + "size": [0.70252, 0.10125, 0.37125], + "pivot": [-0.00237, -2.0219, 3.41633], "rotation": [35, 0, 0], "uv": { "north": {"uv": [149, 88], "uv_size": [2, 1]}, @@ -453,9 +453,9 @@ } }, { - "origin": [-0.62901, -5.7481, 5.92565], - "size": [1.25169, 3.8598, 1.64048], - "pivot": [-0.00316, -4.98519, 6.4093], + "origin": [-0.47176, -4.56108, 4.44424], + "size": [0.93877, 2.89485, 1.23036], + "pivot": [-0.00237, -3.9889, 4.80698], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [111, 14], "uv_size": [3, 9]}, @@ -467,9 +467,9 @@ } }, { - "origin": [-0.51651, -6.50463, 0.92194], - "size": [1.02669, 0.20004, 6.99548], - "pivot": [-0.00316, -6.45963, 4.41968], + "origin": [-0.38738, -5.12848, 0.69145], + "size": [0.77002, 0.15003, 5.24661], + "pivot": [-0.00237, -5.09473, 3.31476], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [79, 149], "uv_size": [2, 1]}, @@ -481,9 +481,9 @@ } }, { - "origin": [-0.15651, -6.04213, 5.12265], - "size": [0.35169, 0.2025, 0.36], - "pivot": [0.01934, -5.94088, 5.30265], + "origin": [-0.11738, -4.7816, 3.84198], + "size": [0.26377, 0.15188, 0.27], + "pivot": [0.0145, -4.70566, 3.97698], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [53, 152], "uv_size": [1, 1]}, @@ -495,9 +495,9 @@ } }, { - "origin": [-0.51651, -6.6598, 2.80924], - "size": [0.08169, 0.26473, 3.71118], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [-0.38738, -5.24485, 2.10693], + "size": [0.06127, 0.19854, 2.78339], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [47, 152], "uv_size": [1, 1]}, @@ -509,9 +509,9 @@ } }, { - "origin": [-0.51651, -6.8843, 0.94967], - "size": [0.08169, 0.27, 4.25048], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [-0.38738, -5.41323, 0.71225], + "size": [0.06127, 0.2025, 3.18786], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [11.25, 0, 0], "uv": { "north": {"uv": [152, 44], "uv_size": [1, 1]}, @@ -523,9 +523,9 @@ } }, { - "origin": [-0.51651, -6.9873, 5.08321], - "size": [0.08169, 0.27, 2.84142], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [-0.38738, -5.49047, 3.81241], + "size": [0.06127, 0.2025, 2.13106], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [28.25, 0, 0], "uv": { "north": {"uv": [46, 152], "uv_size": [1, 1]}, @@ -537,9 +537,9 @@ } }, { - "origin": [0.42849, -6.8843, 0.94967], - "size": [0.08169, 0.27, 4.25048], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [0.32137, -5.41323, 0.71225], + "size": [0.06127, 0.2025, 3.18786], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [11.25, 0, 0], "uv": { "north": {"uv": [52, 152], "uv_size": [1, 1]}, @@ -551,9 +551,9 @@ } }, { - "origin": [0.42849, -6.9873, 5.08321], - "size": [0.08169, 0.27, 2.84142], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [0.32137, -5.49047, 3.81241], + "size": [0.06127, 0.2025, 2.13106], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [28.25, 0, 0], "uv": { "north": {"uv": [50, 152], "uv_size": [1, 1]}, @@ -565,9 +565,9 @@ } }, { - "origin": [0.42849, -6.6598, 2.80924], - "size": [0.08169, 0.26473, 3.71118], - "pivot": [-0.00316, -6.54456, 4.79711], + "origin": [0.32137, -5.24485, 2.10693], + "size": [0.06127, 0.19854, 2.78339], + "pivot": [-0.00237, -5.15842, 3.59783], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [48, 152], "uv_size": [1, 1]}, @@ -579,9 +579,9 @@ } }, { - "origin": [-0.62901, -5.88813, 6.00947], - "size": [1.25169, 0.63, 0.42548], - "pivot": [-0.00316, -4.98519, 6.4093], + "origin": [-0.47176, -4.6661, 4.5071], + "size": [0.93877, 0.4725, 0.31911], + "pivot": [-0.00237, -3.9889, 4.80698], "rotation": [-16.5, 0, 0], "uv": { "north": {"uv": [148, 66], "uv_size": [3, 1]}, @@ -593,9 +593,9 @@ } }, { - "origin": [-0.62901, -4.74974, 7.65846], - "size": [1.25169, 1.11234, 0.31544], - "pivot": [-0.00316, -4.98519, 6.4093], + "origin": [-0.47176, -3.8123, 5.74385], + "size": [0.93877, 0.83426, 0.23658], + "pivot": [-0.00237, -3.9889, 4.80698], "rotation": [32.75, 0, 0], "uv": { "north": {"uv": [142, 78], "uv_size": [3, 2]}, @@ -607,9 +607,9 @@ } }, { - "origin": [-0.62901, -5.5809, 7.46455], - "size": [1.25169, 1.11234, 0.44025], - "pivot": [-0.00316, -4.98519, 6.4093], + "origin": [-0.47176, -4.43567, 5.59841], + "size": [0.93877, 0.83426, 0.33018], + "pivot": [-0.00237, -3.9889, 4.80698], "rotation": [22.25, 0, 0], "uv": { "north": {"uv": [142, 87], "uv_size": [3, 2]}, @@ -621,9 +621,9 @@ } }, { - "origin": [-0.62901, -5.744, 7.56323], - "size": [1.25169, 0.28898, 0.38575], - "pivot": [-0.00316, -4.98519, 6.4093], + "origin": [-0.47176, -4.558, 5.67242], + "size": [0.93877, 0.21674, 0.28932], + "pivot": [-0.00237, -3.9889, 4.80698], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [58, 148], "uv_size": [3, 1]}, @@ -635,9 +635,9 @@ } }, { - "origin": [-0.62901, -2.33697, 6.56956], - "size": [1.25169, 1.215, 0.11048], - "pivot": [-0.00316, -1.97697, 5.8598], + "origin": [-0.47176, -2.00272, 4.92717], + "size": [0.93877, 0.91125, 0.08286], + "pivot": [-0.00237, -1.73272, 4.39485], "rotation": [9.75, 0, 0], "uv": { "north": {"uv": [97, 133], "uv_size": [3, 3]}, @@ -649,9 +649,9 @@ } }, { - "origin": [-0.62901, -0.62697, 4.82828], - "size": [1.25169, 0.765, 0.40298], - "pivot": [-0.00316, -0.76197, 5.59227], + "origin": [-0.47176, -0.72022, 3.62121], + "size": [0.93877, 0.57375, 0.30224], + "pivot": [-0.00237, -0.82147, 4.1942], "rotation": [45, 0, 0], "uv": { "north": {"uv": [70, 142], "uv_size": [3, 2]}, @@ -663,9 +663,9 @@ } }, { - "origin": [-0.62901, -2.27559, 4.58158], - "size": [1.25169, 0.27, 0.62798], - "pivot": [-0.00316, -2.14059, 4.89557], + "origin": [-0.47176, -1.95669, 3.43618], + "size": [0.93877, 0.2025, 0.47099], + "pivot": [-0.00237, -1.85544, 3.67167], "rotation": [45, 0, 0], "uv": { "north": {"uv": [148, 9], "uv_size": [3, 1]}, @@ -677,9 +677,9 @@ } }, { - "origin": [-0.62901, -2.51755, 4.78834], - "size": [1.25169, 0.36, 0.62798], - "pivot": [-0.00316, -2.38255, 5.10234], + "origin": [-0.47176, -2.13816, 3.59126], + "size": [0.93877, 0.27, 0.47099], + "pivot": [-0.00237, -2.03691, 3.82675], "rotation": [-10.5, 0, 0], "uv": { "north": {"uv": [148, 33], "uv_size": [3, 1]}, @@ -691,8 +691,8 @@ } }, { - "origin": [-1.01151, -0.22197, 4.60126], - "size": [1.97169, 1.26321, 2.1375], + "origin": [-0.75863, -0.41647, 3.45094], + "size": [1.47877, 0.94741, 1.60313], "uv": { "north": {"uv": [128, 130], "uv_size": [4, 3]}, "east": {"uv": [128, 113], "uv_size": [5, 3]}, @@ -703,8 +703,8 @@ } }, { - "origin": [0.96018, -0.12875, 5.27626], - "size": [0.1125, 0.45, 0.45], + "origin": [0.72014, -0.34656, 3.95719], + "size": [0.08438, 0.3375, 0.3375], "uv": { "north": {"uv": [19, 152], "uv_size": [1, 1]}, "east": {"uv": [20, 152], "uv_size": [1, 1]}, @@ -715,9 +715,9 @@ } }, { - "origin": [1.02768, -0.44375, 5.41126], - "size": [0.135, 0.54, 0.18], - "pivot": [1.03893, 0.09625, 5.50126], + "origin": [0.77076, -0.58281, 4.05844], + "size": [0.10125, 0.405, 0.135], + "pivot": [0.7792, -0.17781, 4.12594], "rotation": [45, 0, 0], "uv": { "north": {"uv": [24, 152], "uv_size": [1, 1]}, @@ -729,8 +729,8 @@ } }, { - "origin": [0.96018, 0.36303, 4.60126], - "size": [0.045, 0.67821, 2.1375], + "origin": [0.72014, 0.02228, 3.45094], + "size": [0.03375, 0.50866, 1.60313], "uv": { "north": {"uv": [66, 149], "uv_size": [1, 2]}, "east": {"uv": [131, 111], "uv_size": [5, 2]}, @@ -741,8 +741,8 @@ } }, { - "origin": [0.96018, -0.22197, 5.90626], - "size": [0.045, 0.585, 0.8325], + "origin": [0.72014, -0.41647, 4.42969], + "size": [0.03375, 0.43875, 0.62437], "uv": { "north": {"uv": [152, 28], "uv_size": [1, 1]}, "east": {"uv": [149, 67], "uv_size": [2, 1]}, @@ -753,9 +753,9 @@ } }, { - "origin": [-0.50079, -0.14012, 1.04828], - "size": [0.57669, 0.38888, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [-0.37559, -0.35509, 0.78621], + "size": [0.43252, 0.29166, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, -71], "uv": { "north": {"uv": [151, 144], "uv_size": [1, 1]}, @@ -767,9 +767,9 @@ } }, { - "origin": [-0.87998, -0.1202, 1.04828], - "size": [0.57669, 0.27321, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [-0.65999, -0.34015, 0.78621], + "size": [0.43252, 0.20491, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [143, 151], "uv_size": [1, 1]}, @@ -781,9 +781,9 @@ } }, { - "origin": [-0.71952, -0.03151, 1.04828], - "size": [0.57669, 0.22821, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [-0.53964, -0.27363, 0.78621], + "size": [0.43252, 0.17116, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, -45], "uv": { "north": {"uv": [142, 151], "uv_size": [1, 1]}, @@ -795,9 +795,9 @@ } }, { - "origin": [-0.08223, -0.14012, 1.04828], - "size": [0.57669, 0.38888, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [-0.06167, -0.35509, 0.78621], + "size": [0.43252, 0.29166, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, 71], "uv": { "north": {"uv": [141, 151], "uv_size": [1, 1]}, @@ -809,9 +809,9 @@ } }, { - "origin": [0.1365, -0.03151, 1.04828], - "size": [0.57669, 0.22821, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [0.10238, -0.27363, 0.78621], + "size": [0.43252, 0.17116, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, 45], "uv": { "north": {"uv": [139, 151], "uv_size": [1, 1]}, @@ -823,9 +823,9 @@ } }, { - "origin": [0.29696, -0.1202, 1.04828], - "size": [0.57669, 0.27321, 5.69048], - "pivot": [-0.00316, -0.36509, 2.41977], + "origin": [0.22272, -0.34015, 0.78621], + "size": [0.43252, 0.20491, 4.26786], + "pivot": [-0.00237, -0.52382, 1.81482], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [151, 137], "uv_size": [1, 1]}, @@ -837,8 +837,8 @@ } }, { - "origin": [-0.37809, -0.76236, 1.04828], - "size": [0.74966, 0.54, 5.69048], + "origin": [-0.28357, -0.82177, 0.78621], + "size": [0.56224, 0.405, 4.26786], "uv": { "north": {"uv": [149, 61], "uv_size": [2, 1]}, "east": {"uv": [128, 123], "uv_size": [13, 1]}, @@ -849,9 +849,9 @@ } }, { - "origin": [-0.15309, -1.43736, 3.45367], - "size": [0.29966, 0.81, 0.40509], - "pivot": [-0.00326, -1.03236, 3.55602], + "origin": [-0.11482, -1.32802, 2.59025], + "size": [0.22474, 0.6075, 0.30382], + "pivot": [-0.00245, -1.02427, 2.66701], "rotation": [13, 0, 0], "uv": { "north": {"uv": [85, 149], "uv_size": [1, 2]}, @@ -863,9 +863,9 @@ } }, { - "origin": [-0.15309, -1.92367, 3.49166], - "size": [0.29966, 0.63, 0.37872], - "pivot": [-0.00326, -1.69867, 3.56765], + "origin": [-0.11482, -1.69275, 2.61875], + "size": [0.22474, 0.4725, 0.28404], + "pivot": [-0.00245, -1.524, 2.67573], "rotation": [-11, 0, 0], "uv": { "north": {"uv": [67, 152], "uv_size": [1, 1]}, @@ -877,9 +877,9 @@ } }, { - "origin": [-0.15309, -2.37293, 3.30156], - "size": [0.29966, 0.63, 0.34708], - "pivot": [-0.00326, -2.14793, 3.34591], + "origin": [-0.11482, -2.0297, 2.47617], + "size": [0.22474, 0.4725, 0.26031], + "pivot": [-0.00245, -1.86095, 2.50943], "rotation": [-33.5, 0, 0], "uv": { "north": {"uv": [70, 152], "uv_size": [1, 1]}, @@ -891,8 +891,8 @@ } }, { - "origin": [-0.37809, 0.49764, 7.19078], - "size": [0.74966, 0.54, 2.33798], + "origin": [-0.28357, 0.12323, 5.39308], + "size": [0.56224, 0.405, 1.75349], "uv": { "north": {"uv": [64, 149], "uv_size": [2, 1]}, "east": {"uv": [143, 83], "uv_size": [5, 1]}, @@ -903,9 +903,9 @@ } }, { - "origin": [0.29696, 1.1398, 7.07828], - "size": [0.57669, 0.27321, 2.33798], - "pivot": [-0.00316, 0.89491, 5.79477], + "origin": [0.22272, 0.60485, 5.30871], + "size": [0.43252, 0.20491, 1.75349], + "pivot": [-0.00237, 0.42118, 4.34607], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [18, 152], "uv_size": [1, 1]}, @@ -917,9 +917,9 @@ } }, { - "origin": [0.1365, 1.22849, 7.19078], - "size": [0.57669, 0.22821, 2.33798], - "pivot": [-0.00316, 0.89491, 5.90727], + "origin": [0.10238, 0.67137, 5.39308], + "size": [0.43252, 0.17116, 1.75349], + "pivot": [-0.00237, 0.42118, 4.43045], "rotation": [0, 0, 45], "uv": { "north": {"uv": [17, 152], "uv_size": [1, 1]}, @@ -931,9 +931,9 @@ } }, { - "origin": [-0.08223, 1.11988, 7.19078], - "size": [0.57669, 0.38888, 2.33798], - "pivot": [-0.00316, 0.89491, 5.90727], + "origin": [-0.06167, 0.58991, 5.39308], + "size": [0.43252, 0.29166, 1.75349], + "pivot": [-0.00237, 0.42118, 4.43045], "rotation": [0, 0, 71], "uv": { "north": {"uv": [12, 152], "uv_size": [1, 1]}, @@ -945,9 +945,9 @@ } }, { - "origin": [-0.71952, 1.22849, 7.19078], - "size": [0.57669, 0.22821, 2.33798], - "pivot": [-0.00316, 0.89491, 5.90727], + "origin": [-0.53964, 0.67137, 5.39308], + "size": [0.43252, 0.17116, 1.75349], + "pivot": [-0.00237, 0.42118, 4.43045], "rotation": [0, 0, -45], "uv": { "north": {"uv": [10, 152], "uv_size": [1, 1]}, @@ -959,9 +959,9 @@ } }, { - "origin": [-0.87998, 1.1398, 7.07828], - "size": [0.57669, 0.27321, 2.33798], - "pivot": [-0.00316, 0.89491, 5.79477], + "origin": [-0.65999, 0.60485, 5.30871], + "size": [0.43252, 0.20491, 1.75349], + "pivot": [-0.00237, 0.42118, 4.34607], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [8, 152], "uv_size": [1, 1]}, @@ -973,9 +973,9 @@ } }, { - "origin": [-0.50079, 1.11988, 7.19078], - "size": [0.57669, 0.38888, 2.33798], - "pivot": [-0.00316, 0.89491, 5.90727], + "origin": [-0.37559, 0.58991, 5.39308], + "size": [0.43252, 0.29166, 1.75349], + "pivot": [-0.00237, 0.42118, 4.43045], "rotation": [0, 0, -71], "uv": { "north": {"uv": [6, 152], "uv_size": [1, 1]}, @@ -991,12 +991,12 @@ { "name": "bone7", "parent": "body", - "pivot": [-7.02318, 1.05289, 6.612], + "pivot": [-5.26738, 0.53967, 4.959], "rotation": [35, 0, 0], "cubes": [ { - "origin": [-1.00975, 0.03361, 5.67465], - "size": [2.01317, 1.26321, 2.38298], + "origin": [-0.75731, -0.22479, 4.25598], + "size": [1.50988, 0.94741, 1.78724], "uv": { "north": {"uv": [103, 130], "uv_size": [4, 3]}, "east": {"uv": [128, 70], "uv_size": [5, 3]}, @@ -1007,9 +1007,9 @@ } }, { - "origin": [-0.86686, 0.37658, 5.67465], - "size": [0.57669, 0.38888, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [-0.65014, 0.03243, 4.25598], + "size": [0.43252, 0.29166, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, -71], "uv": { "north": {"uv": [147, 151], "uv_size": [1, 1]}, @@ -1021,9 +1021,9 @@ } }, { - "origin": [-1.02814, 0.16485, 5.67465], - "size": [0.57669, 0.27321, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [-0.77111, -0.12636, 4.25598], + "size": [0.43252, 0.20491, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [151, 148], "uv_size": [1, 1]}, @@ -1035,9 +1035,9 @@ } }, { - "origin": [-0.99329, 0.33747, 5.67465], - "size": [0.57669, 0.22821, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [-0.74496, 0.0031, 4.25598], + "size": [0.43252, 0.17116, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, -45], "uv": { "north": {"uv": [150, 151], "uv_size": [1, 1]}, @@ -1049,9 +1049,9 @@ } }, { - "origin": [0.28384, 0.37658, 5.67465], - "size": [0.57669, 0.38888, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [0.21288, 0.03243, 4.25598], + "size": [0.43252, 0.29166, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, 71], "uv": { "north": {"uv": [0, 152], "uv_size": [1, 1]}, @@ -1063,9 +1063,9 @@ } }, { - "origin": [0.41027, 0.33747, 5.67465], - "size": [0.57669, 0.22821, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [0.3077, 0.0031, 4.25598], + "size": [0.43252, 0.17116, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, 45], "uv": { "north": {"uv": [2, 152], "uv_size": [1, 1]}, @@ -1077,9 +1077,9 @@ } }, { - "origin": [0.44512, 0.16485, 5.67465], - "size": [0.57669, 0.27321, 2.78798], - "pivot": [-0.00316, 0.27765, 5.50321], + "origin": [0.33384, -0.12636, 4.25598], + "size": [0.43252, 0.20491, 2.09099], + "pivot": [-0.00237, -0.04176, 4.12741], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [4, 152], "uv_size": [1, 1]}, @@ -1091,8 +1091,8 @@ } }, { - "origin": [-0.37809, -0.50678, 5.67465], - "size": [0.74966, 0.54, 2.78798], + "origin": [-0.28357, -0.63008, 4.25598], + "size": [0.56224, 0.405, 2.09099], "uv": { "north": {"uv": [149, 62], "uv_size": [2, 1]}, "east": {"uv": [142, 70], "uv_size": [6, 1]}, @@ -1107,12 +1107,12 @@ { "name": "bone4", "parent": "body", - "pivot": [-0.00318, -1.13642, 12.88174], + "pivot": [-0.00238, -1.10232, 9.66131], "rotation": [-13, 0, 0], "cubes": [ { - "origin": [-1.00975, 0.20458, 8.97287], - "size": [2.01317, 2.47821, 11.115], + "origin": [-0.75731, -0.09657, 6.72965], + "size": [1.50988, 1.85866, 8.33625], "uv": { "north": {"uv": [113, 70], "uv_size": [4, 6]}, "east": {"uv": [50, 21], "uv_size": [25, 6]}, @@ -1123,9 +1123,9 @@ } }, { - "origin": [-0.54864, 0.32056, 7.12787], - "size": [0.57669, 0.38888, 12.96], - "pivot": [-0.00316, 0.11207, 20.68859], + "origin": [-0.41148, -0.00958, 5.3459], + "size": [0.43252, 0.29166, 9.72], + "pivot": [-0.00237, -0.16595, 15.51644], "rotation": [0, 0, -71], "uv": { "north": {"uv": [151, 136], "uv_size": [1, 1]}, @@ -1137,9 +1137,9 @@ } }, { - "origin": [-0.87998, 0.30635, 7.12787], - "size": [0.57669, 0.27321, 12.96], - "pivot": [-0.00316, 0.06145, 20.46936], + "origin": [-0.65999, -0.02024, 5.3459], + "size": [0.43252, 0.20491, 9.72], + "pivot": [-0.00237, -0.20391, 15.35202], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [135, 151], "uv_size": [1, 1]}, @@ -1151,9 +1151,9 @@ } }, { - "origin": [-0.71952, 0.39504, 7.12787], - "size": [0.57669, 0.22821, 12.96], - "pivot": [-0.00316, 0.06145, 20.46936], + "origin": [-0.53964, 0.04628, 5.3459], + "size": [0.43252, 0.17116, 9.72], + "pivot": [-0.00237, -0.20391, 15.35202], "rotation": [0, 0, -45], "uv": { "north": {"uv": [133, 151], "uv_size": [1, 1]}, @@ -1165,9 +1165,9 @@ } }, { - "origin": [-0.03438, 0.32056, 7.12787], - "size": [0.57669, 0.38888, 12.96], - "pivot": [-0.00316, 0.11207, 20.68859], + "origin": [-0.02578, -0.00958, 5.3459], + "size": [0.43252, 0.29166, 9.72], + "pivot": [-0.00237, -0.16595, 15.51644], "rotation": [0, 0, 71], "uv": { "north": {"uv": [132, 151], "uv_size": [1, 1]}, @@ -1179,9 +1179,9 @@ } }, { - "origin": [0.1365, 0.39504, 7.12787], - "size": [0.57669, 0.22821, 12.96], - "pivot": [-0.00316, 0.06145, 20.46936], + "origin": [0.10238, 0.04628, 5.3459], + "size": [0.43252, 0.17116, 9.72], + "pivot": [-0.00237, -0.20391, 15.35202], "rotation": [0, 0, 45], "uv": { "north": {"uv": [131, 151], "uv_size": [1, 1]}, @@ -1193,9 +1193,9 @@ } }, { - "origin": [0.29696, 0.30635, 7.12787], - "size": [0.57669, 0.27321, 12.96], - "pivot": [-0.00316, 0.06145, 20.46936], + "origin": [0.22272, -0.02024, 5.3459], + "size": [0.43252, 0.20491, 9.72], + "pivot": [-0.00237, -0.20391, 15.35202], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [130, 151], "uv_size": [1, 1]}, @@ -1207,8 +1207,8 @@ } }, { - "origin": [-0.37809, -0.33581, 7.12787], - "size": [0.74966, 0.54, 12.96], + "origin": [-0.28357, -0.50186, 5.3459], + "size": [0.56224, 0.405, 9.72], "uv": { "north": {"uv": [60, 149], "uv_size": [2, 1]}, "east": {"uv": [106, 52], "uv_size": [29, 1]}, @@ -1223,11 +1223,11 @@ { "name": "bone2", "parent": "body", - "pivot": [-0.00316, 4.24438, 20.46477], + "pivot": [-0.00237, 2.93328, 15.34857], "cubes": [ { - "origin": [-1.01151, 1.03803, 2.39828], - "size": [1.35, 3.06321, 17.685], + "origin": [-0.75863, 0.52853, 1.79871], + "size": [1.0125, 2.29741, 13.26375], "uv": { "north": {"uv": [120, 122], "uv_size": [3, 7]}, "east": {"uv": [30, 45], "uv_size": [39, 7]}, @@ -1238,8 +1238,8 @@ } }, { - "origin": [-1.01151, 1.03803, -6.15172], - "size": [1.35, 3.06321, 3.735], + "origin": [-0.75863, 0.52853, -4.61379], + "size": [1.0125, 2.29741, 2.80125], "uv": { "north": {"uv": [123, 92], "uv_size": [3, 7]}, "east": {"uv": [98, 43], "uv_size": [8, 7]}, @@ -1250,8 +1250,8 @@ } }, { - "origin": [-1.01151, 3.62553, -2.41672], - "size": [1.35, 0.47571, 4.815], + "origin": [-0.75863, 2.46915, -1.81254], + "size": [1.0125, 0.35679, 3.61125], "uv": { "north": {"uv": [80, 148], "uv_size": [3, 1]}, "east": {"uv": [131, 23], "uv_size": [11, 1]}, @@ -1262,8 +1262,8 @@ } }, { - "origin": [-1.01151, 1.03803, -2.41672], - "size": [1.35, 0.97071, 4.815], + "origin": [-0.75863, 0.52853, -1.81254], + "size": [1.0125, 0.72804, 3.61125], "uv": { "north": {"uv": [123, 142], "uv_size": [3, 2]}, "east": {"uv": [50, 43], "uv_size": [11, 2]}, @@ -1274,8 +1274,8 @@ } }, { - "origin": [-0.49401, 2.00875, 1.40828], - "size": [1.04919, 1.395, 1.08], + "origin": [-0.37051, 1.25656, 1.05621], + "size": [0.78689, 1.04625, 0.81], "uv": { "north": {"uv": [143, 6], "uv_size": [2, 3]}, "east": {"uv": [19, 143], "uv_size": [2, 3]}, @@ -1286,8 +1286,8 @@ } }, { - "origin": [-0.62901, 2.00875, 1.00328], - "size": [1.18419, 0.63, 1.485], + "origin": [-0.47176, 1.25656, 0.75246], + "size": [0.88814, 0.4725, 1.11375], "uv": { "north": {"uv": [148, 83], "uv_size": [3, 1]}, "east": {"uv": [148, 84], "uv_size": [3, 1]}, @@ -1298,8 +1298,8 @@ } }, { - "origin": [0.10518, 1.03803, -6.15172], - "size": [0.9, 3.06321, 26.235], + "origin": [0.07889, 0.52853, -4.61379], + "size": [0.675, 2.29741, 19.67625], "uv": { "north": {"uv": [30, 129], "uv_size": [2, 7]}, "east": {"uv": [0, 0], "uv_size": [58, 7]}, @@ -1310,8 +1310,8 @@ } }, { - "origin": [-1.05651, 2.16303, -5.65672], - "size": [2.10669, 0.72321, 1.89], + "origin": [-0.79238, 1.37228, -4.24254], + "size": [1.58002, 0.54241, 1.4175], "uv": { "north": {"uv": [132, 127], "uv_size": [5, 2]}, "east": {"uv": [135, 16], "uv_size": [4, 2]}, @@ -1322,9 +1322,9 @@ } }, { - "origin": [-1.10151, 2.39125, -5.34172], - "size": [2.19669, 0.225, 0.225], - "pivot": [-0.00316, 2.50375, -5.22922], + "origin": [-0.82613, 1.54344, -4.00629], + "size": [1.64752, 0.16875, 0.16875], + "pivot": [-0.00237, 1.62781, -3.92192], "rotation": [45, 0, 0], "uv": { "north": {"uv": [143, 97], "uv_size": [5, 1]}, @@ -1336,9 +1336,9 @@ } }, { - "origin": [-1.10151, 2.39125, -4.35172], - "size": [2.19669, 0.225, 0.225], - "pivot": [-0.00316, 2.50375, -4.23922], + "origin": [-0.82613, 1.54344, -3.26379], + "size": [1.64752, 0.16875, 0.16875], + "pivot": [-0.00237, 1.62781, -3.17942], "rotation": [45, 0, 0], "uv": { "north": {"uv": [143, 101], "uv_size": [5, 1]}, @@ -1350,8 +1350,8 @@ } }, { - "origin": [-1.01151, 3.24303, -19.65172], - "size": [2.01669, 0.85821, 1.1025], + "origin": [-0.75863, 2.18228, -14.73879], + "size": [1.51252, 0.64366, 0.82688], "uv": { "north": {"uv": [134, 87], "uv_size": [4, 2]}, "east": {"uv": [9, 145], "uv_size": [2, 2]}, @@ -1362,8 +1362,8 @@ } }, { - "origin": [-0.92151, 2.18553, -19.65172], - "size": [1.83669, 1.0575, 1.1025], + "origin": [-0.69113, 1.38915, -14.73879], + "size": [1.37752, 0.79313, 0.82688], "uv": { "north": {"uv": [3, 142], "uv_size": [4, 2]}, "east": {"uv": [23, 148], "uv_size": [2, 2]}, @@ -1374,9 +1374,9 @@ } }, { - "origin": [-1.07901, 2.43303, -19.40422], - "size": [2.15169, 0.5625, 0.5625], - "pivot": [-0.00316, 2.71428, -19.12297], + "origin": [-0.80926, 1.57478, -14.55317], + "size": [1.61377, 0.42188, 0.42188], + "pivot": [-0.00237, 1.78571, -14.34223], "rotation": [-45, 0, 0], "uv": { "north": {"uv": [144, 93], "uv_size": [5, 1]}, @@ -1388,8 +1388,8 @@ } }, { - "origin": [-1.01151, 1.60053, -19.65172], - "size": [2.01669, 0.58821, 1.1025], + "origin": [-0.75863, 0.9504, -14.73879], + "size": [1.51252, 0.44116, 0.82688], "uv": { "north": {"uv": [146, 82], "uv_size": [4, 1]}, "east": {"uv": [143, 150], "uv_size": [2, 1]}, @@ -1400,8 +1400,8 @@ } }, { - "origin": [-1.01151, 1.60053, -18.54922], - "size": [2.01669, 2.50071, 1.1475], + "origin": [-0.75863, 0.9504, -13.91192], + "size": [1.51252, 1.87554, 0.86062], "uv": { "north": {"uv": [117, 113], "uv_size": [4, 6]}, "east": {"uv": [117, 126], "uv_size": [3, 6]}, @@ -1412,8 +1412,8 @@ } }, { - "origin": [-0.89901, 1.19232, -17.40172], - "size": [1.79169, 2.32071, 11.2725], + "origin": [-0.67426, 0.64424, -13.05129], + "size": [1.34377, 1.74054, 8.45437], "uv": { "north": {"uv": [123, 106], "uv_size": [4, 5]}, "east": {"uv": [50, 33], "uv_size": [25, 5]}, @@ -1424,8 +1424,8 @@ } }, { - "origin": [-1.01151, 3.51303, -17.40172], - "size": [2.01669, 0.58821, 11.25], + "origin": [-0.75863, 2.38478, -13.05129], + "size": [1.51252, 0.44116, 8.4375], "uv": { "north": {"uv": [145, 8], "uv_size": [4, 1]}, "east": {"uv": [110, 47], "uv_size": [25, 1]}, @@ -1440,12 +1440,12 @@ { "name": "bone3", "parent": "bone2", - "pivot": [-0.00316, 4.24438, 20.46477], + "pivot": [-0.00237, 2.93328, 15.34857], "cubes": [ { - "origin": [-0.50079, 3.63052, -19.65172], - "size": [0.57669, 0.38888, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.37559, 2.47289, -14.73879], + "size": [0.43252, 0.29166, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 71], "uv": { "north": {"uv": [123, 151], "uv_size": [1, 1]}, @@ -1457,9 +1457,9 @@ } }, { - "origin": [-0.71952, 3.68258, -19.65172], - "size": [0.57669, 0.22821, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.53964, 2.51193, -14.73879], + "size": [0.43252, 0.17116, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 45], "uv": { "north": {"uv": [151, 121], "uv_size": [1, 1]}, @@ -1471,9 +1471,9 @@ } }, { - "origin": [-0.08223, 3.63052, -19.65172], - "size": [0.57669, 0.38888, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.06167, 2.47289, -14.73879], + "size": [0.43252, 0.29166, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -71], "uv": { "north": {"uv": [120, 151], "uv_size": [1, 1]}, @@ -1485,9 +1485,9 @@ } }, { - "origin": [0.1365, 3.68258, -19.65172], - "size": [0.57669, 0.22821, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [0.10238, 2.51193, -14.73879], + "size": [0.43252, 0.17116, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -45], "uv": { "north": {"uv": [151, 118], "uv_size": [1, 1]}, @@ -1499,9 +1499,9 @@ } }, { - "origin": [0.29696, 3.72627, -19.65172], - "size": [0.57669, 0.27321, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [0.22272, 2.5447, -14.73879], + "size": [0.43252, 0.20491, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [151, 117], "uv_size": [1, 1]}, @@ -1513,8 +1513,8 @@ } }, { - "origin": [-0.37809, 4.10164, 3.74828], - "size": [0.74966, 0.54, 16.335], + "origin": [-0.28357, 2.82623, 2.81121], + "size": [0.56224, 0.405, 12.25125], "uv": { "north": {"uv": [149, 57], "uv_size": [2, 1]}, "east": {"uv": [105, 68], "uv_size": [36, 1]}, @@ -1525,8 +1525,8 @@ } }, { - "origin": [-0.51309, 4.59664, 3.74828], - "size": [1.01966, 0.09, 1.82004], + "origin": [-0.38482, 3.19748, 2.81121], + "size": [0.76474, 0.0675, 1.36503], "uv": { "north": {"uv": [150, 17], "uv_size": [2, 1]}, "east": {"uv": [145, 58], "uv_size": [4, 1]}, @@ -1537,8 +1537,8 @@ } }, { - "origin": [-0.40059, 6.39664, 3.92828], - "size": [0.79466, 0.6075, 0.08754], + "origin": [-0.30045, 4.54748, 2.94621], + "size": [0.59599, 0.45562, 0.06565], "uv": { "north": {"uv": [150, 23], "uv_size": [2, 1]}, "east": {"uv": [153, 44], "uv_size": [1, 1]}, @@ -1549,8 +1549,8 @@ } }, { - "origin": [-0.40059, 6.89164, 4.01581], - "size": [0.79466, 0.1125, 0.495], + "origin": [-0.30045, 4.91873, 3.01186], + "size": [0.59599, 0.08437, 0.37125], "uv": { "north": {"uv": [150, 46], "uv_size": [2, 1]}, "east": {"uv": [153, 48], "uv_size": [1, 1]}, @@ -1561,9 +1561,9 @@ } }, { - "origin": [-0.40059, 6.71849, 6.47995], - "size": [0.79466, 0.1125, 0.36], - "pivot": [-0.00326, 6.77474, 4.54495], + "origin": [-0.30045, 4.78887, 4.85996], + "size": [0.59599, 0.08438, 0.27], + "pivot": [-0.00245, 4.83106, 3.40871], "rotation": [-67.5, 0, 0], "uv": { "north": {"uv": [150, 52], "uv_size": [2, 1]}, @@ -1575,9 +1575,9 @@ } }, { - "origin": [-0.40059, 6.71849, 5.08495], - "size": [0.20966, 0.1125, 1.395], - "pivot": [-0.00326, 6.77474, 4.54495], + "origin": [-0.30045, 4.78887, 3.81371], + "size": [0.15724, 0.08438, 1.04625], + "pivot": [-0.00245, 4.83106, 3.40871], "rotation": [-67.5, 0, 0], "uv": { "north": {"uv": [153, 50], "uv_size": [1, 1]}, @@ -1589,9 +1589,9 @@ } }, { - "origin": [0.18441, 6.71849, 5.08495], - "size": [0.20966, 0.1125, 1.395], - "pivot": [0.58174, 6.77474, 4.54495], + "origin": [0.1383, 4.78887, 3.81371], + "size": [0.15724, 0.08438, 1.04625], + "pivot": [0.4363, 4.83106, 3.40871], "rotation": [-67.5, 0, 0], "uv": { "north": {"uv": [153, 51], "uv_size": [1, 1]}, @@ -1603,9 +1603,9 @@ } }, { - "origin": [-0.40059, 6.71849, 4.31995], - "size": [0.79466, 0.1125, 0.765], - "pivot": [-0.00326, 6.77474, 4.54495], + "origin": [-0.30045, 4.78887, 3.23996], + "size": [0.59599, 0.08438, 0.57375], + "pivot": [-0.00245, 4.83106, 3.40871], "rotation": [-67.5, 0, 0], "uv": { "north": {"uv": [58, 150], "uv_size": [2, 1]}, @@ -1617,8 +1617,8 @@ } }, { - "origin": [-0.40059, 4.68664, 3.92828], - "size": [0.79466, 0.2925, 0.08754], + "origin": [-0.30045, 3.26498, 2.94621], + "size": [0.59599, 0.21938, 0.06565], "uv": { "north": {"uv": [150, 28], "uv_size": [2, 1]}, "east": {"uv": [153, 45], "uv_size": [1, 1]}, @@ -1629,8 +1629,8 @@ } }, { - "origin": [0.18441, 4.97914, 3.92828], - "size": [0.20966, 1.4175, 0.08754], + "origin": [0.1383, 3.48436, 2.94621], + "size": [0.15724, 1.06313, 0.06565], "uv": { "north": {"uv": [73, 148], "uv_size": [1, 3]}, "east": {"uv": [74, 148], "uv_size": [1, 3]}, @@ -1641,8 +1641,8 @@ } }, { - "origin": [-0.40059, 4.97914, 3.92828], - "size": [0.20966, 1.4175, 0.08754], + "origin": [-0.30045, 3.48436, 2.94621], + "size": [0.15724, 1.06313, 0.06565], "uv": { "north": {"uv": [86, 148], "uv_size": [1, 3]}, "east": {"uv": [87, 148], "uv_size": [1, 3]}, @@ -1653,9 +1653,9 @@ } }, { - "origin": [-0.60309, 6.64414, 4.10828], - "size": [1.19966, 0.2475, 0.2475], - "pivot": [-0.00326, 6.76789, 4.23203], + "origin": [-0.45232, 4.73311, 3.08121], + "size": [0.89974, 0.18562, 0.18562], + "pivot": [-0.00245, 4.82592, 3.17402], "rotation": [90, 0, 0], "uv": { "north": {"uv": [148, 95], "uv_size": [3, 1]}, @@ -1667,8 +1667,8 @@ } }, { - "origin": [0.34191, 4.68664, 3.74828], - "size": [0.16466, 0.135, 1.82004], + "origin": [0.25643, 3.26498, 2.81121], + "size": [0.12349, 0.10125, 1.36503], "uv": { "north": {"uv": [153, 24], "uv_size": [1, 1]}, "east": {"uv": [145, 60], "uv_size": [4, 1]}, @@ -1679,8 +1679,8 @@ } }, { - "origin": [0.34191, 4.82164, 3.74828], - "size": [0.16466, 2.7, 0.27], + "origin": [0.25643, 3.36623, 2.81121], + "size": [0.12349, 2.025, 0.2025], "uv": { "north": {"uv": [106, 142], "uv_size": [1, 6]}, "east": {"uv": [126, 142], "uv_size": [1, 6]}, @@ -1691,8 +1691,8 @@ } }, { - "origin": [0.34191, 6.57664, 4.01828], - "size": [0.16466, 0.945, 0.43102], + "origin": [0.25643, 4.68248, 3.01371], + "size": [0.12349, 0.70875, 0.32326], "uv": { "north": {"uv": [19, 150], "uv_size": [1, 2]}, "east": {"uv": [150, 19], "uv_size": [1, 2]}, @@ -1703,8 +1703,8 @@ } }, { - "origin": [0.34191, 6.57664, 4.44929], - "size": [0.16466, 0.36, 0.135], + "origin": [0.25643, 4.68248, 3.33697], + "size": [0.12349, 0.27, 0.10125], "uv": { "north": {"uv": [153, 28], "uv_size": [1, 1]}, "east": {"uv": [153, 29], "uv_size": [1, 1]}, @@ -1715,9 +1715,9 @@ } }, { - "origin": [0.34191, 4.56313, 4.36021], - "size": [0.16466, 2.92289, 0.2475], - "pivot": [0.42424, 7.10563, 4.43896], + "origin": [0.25643, 3.17235, 3.27015], + "size": [0.12349, 2.19217, 0.18563], + "pivot": [0.31818, 5.07922, 3.32922], "rotation": [22.5, 0, 0], "uv": { "north": {"uv": [35, 143], "uv_size": [1, 6]}, @@ -1729,8 +1729,8 @@ } }, { - "origin": [-0.51309, 4.82164, 3.74828], - "size": [0.16466, 2.7, 0.27], + "origin": [-0.38482, 3.36623, 2.81121], + "size": [0.12349, 2.025, 0.2025], "uv": { "north": {"uv": [55, 143], "uv_size": [1, 6]}, "east": {"uv": [56, 143], "uv_size": [1, 6]}, @@ -1741,8 +1741,8 @@ } }, { - "origin": [-0.51309, 6.57664, 4.01828], - "size": [0.16466, 0.945, 0.43102], + "origin": [-0.38482, 4.68248, 3.01371], + "size": [0.12349, 0.70875, 0.32326], "uv": { "north": {"uv": [150, 21], "uv_size": [1, 2]}, "east": {"uv": [22, 150], "uv_size": [1, 2]}, @@ -1753,9 +1753,9 @@ } }, { - "origin": [-0.51309, 4.56313, 4.36021], - "size": [0.16466, 2.92289, 0.2475], - "pivot": [-0.43076, 7.10563, 4.43896], + "origin": [-0.38482, 3.17235, 3.27015], + "size": [0.12349, 2.19217, 0.18563], + "pivot": [-0.32307, 5.07922, 3.32922], "rotation": [22.5, 0, 0], "uv": { "north": {"uv": [48, 143], "uv_size": [1, 6]}, @@ -1767,8 +1767,8 @@ } }, { - "origin": [-0.51309, 6.57664, 4.44929], - "size": [0.16466, 0.36, 0.135], + "origin": [-0.38482, 4.68248, 3.33697], + "size": [0.12349, 0.27, 0.10125], "uv": { "north": {"uv": [33, 153], "uv_size": [1, 1]}, "east": {"uv": [153, 33], "uv_size": [1, 1]}, @@ -1779,8 +1779,8 @@ } }, { - "origin": [-0.51309, 4.68664, 3.74828], - "size": [0.16466, 0.135, 1.82004], + "origin": [-0.38482, 3.26498, 2.81121], + "size": [0.12349, 0.10125, 1.36503], "uv": { "north": {"uv": [32, 153], "uv_size": [1, 1]}, "east": {"uv": [145, 67], "uv_size": [4, 1]}, @@ -1791,8 +1791,8 @@ } }, { - "origin": [-0.37809, 3.20164, -6.15172], - "size": [0.74966, 1.215, 9.9], + "origin": [-0.28357, 2.15123, -4.61379], + "size": [0.56224, 0.91125, 7.425], "uv": { "north": {"uv": [30, 143], "uv_size": [2, 3]}, "east": {"uv": [85, 37], "uv_size": [22, 3]}, @@ -1803,8 +1803,8 @@ } }, { - "origin": [-0.37809, 4.10164, -19.65172], - "size": [0.74966, 0.54, 13.635], + "origin": [-0.28357, 2.82623, -14.73879], + "size": [0.56224, 0.405, 10.22625], "uv": { "north": {"uv": [149, 142], "uv_size": [2, 1]}, "east": {"uv": [105, 83], "uv_size": [30, 1]}, @@ -1815,8 +1815,8 @@ } }, { - "origin": [-0.37809, 4.64164, -19.65172], - "size": [0.74966, 2.38359, 0.1125], + "origin": [-0.28357, 3.23123, -14.73879], + "size": [0.56224, 1.7877, 0.08437], "uv": { "north": {"uv": [132, 132], "uv_size": [2, 5]}, "east": {"uv": [93, 143], "uv_size": [1, 5]}, @@ -1827,8 +1827,8 @@ } }, { - "origin": [-0.26559, 4.64164, -19.53922], - "size": [0.52466, 1.07859, 0.72], + "origin": [-0.1992, 3.23123, -14.65442], + "size": [0.39349, 0.80895, 0.54], "uv": { "north": {"uv": [88, 150], "uv_size": [1, 2]}, "east": {"uv": [145, 87], "uv_size": [2, 2]}, @@ -1839,8 +1839,8 @@ } }, { - "origin": [-0.26559, 5.72024, -19.53922], - "size": [0.52466, 1.26, 0.045], + "origin": [-0.1992, 4.04018, -14.65442], + "size": [0.39349, 0.945, 0.03375], "uv": { "north": {"uv": [119, 148], "uv_size": [1, 3]}, "east": {"uv": [120, 148], "uv_size": [1, 3]}, @@ -1851,8 +1851,8 @@ } }, { - "origin": [-0.26559, 6.30524, -19.49422], - "size": [0.52466, 0.675, 0.135], + "origin": [-0.1992, 4.47893, -14.62067], + "size": [0.39349, 0.50625, 0.10125], "uv": { "north": {"uv": [153, 114], "uv_size": [1, 1]}, "east": {"uv": [115, 153], "uv_size": [1, 1]}, @@ -1863,8 +1863,8 @@ } }, { - "origin": [-0.26559, 5.72024, -19.35922], - "size": [0.52466, 0.585, 0.225], + "origin": [-0.1992, 4.04018, -14.51942], + "size": [0.39349, 0.43875, 0.16875], "uv": { "north": {"uv": [153, 117], "uv_size": [1, 1]}, "east": {"uv": [118, 153], "uv_size": [1, 1]}, @@ -1875,9 +1875,9 @@ } }, { - "origin": [-0.26559, 5.67495, -19.22384], - "size": [0.52466, 1.32082, 0.33539], - "pivot": [-0.00326, 5.92245, -19.00094], + "origin": [-0.1992, 4.00621, -14.41788], + "size": [0.39349, 0.99062, 0.25154], + "pivot": [-0.00245, 4.19184, -14.25071], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [123, 148], "uv_size": [1, 3]}, @@ -1889,9 +1889,9 @@ } }, { - "origin": [-0.37809, 5.48676, -18.97354], - "size": [0.74966, 1.57359, 0.1125], - "pivot": [-0.00326, 5.93606, -18.91729], + "origin": [-0.28357, 3.86507, -14.23015], + "size": [0.56224, 1.1802, 0.08437], + "pivot": [-0.00245, 4.20205, -14.18797], "rotation": [17.5, 0, 0], "uv": { "north": {"uv": [143, 51], "uv_size": [2, 3]}, @@ -1903,8 +1903,8 @@ } }, { - "origin": [-0.37809, 4.62588, -18.84104], - "size": [0.74966, 0.89859, 0.1125], + "origin": [-0.28357, 3.21941, -14.13078], + "size": [0.56224, 0.67395, 0.08438], "uv": { "north": {"uv": [145, 78], "uv_size": [2, 2]}, "east": {"uv": [81, 150], "uv_size": [1, 2]}, @@ -1915,8 +1915,8 @@ } }, { - "origin": [-0.37809, 6.93524, -19.53923], - "size": [0.74966, 0.09, 0.3375], + "origin": [-0.28357, 4.95143, -14.65442], + "size": [0.56224, 0.0675, 0.25313], "uv": { "north": {"uv": [150, 73], "uv_size": [2, 1]}, "east": {"uv": [153, 106], "uv_size": [1, 1]}, @@ -1927,8 +1927,8 @@ } }, { - "origin": [-0.06309, 6.89024, -19.53923], - "size": [0.11966, 0.36, 0.11966], + "origin": [-0.04732, 4.91768, -14.65442], + "size": [0.08974, 0.27, 0.08974], "uv": { "north": {"uv": [153, 121], "uv_size": [1, 1]}, "east": {"uv": [122, 153], "uv_size": [1, 1]}, @@ -1939,9 +1939,9 @@ } }, { - "origin": [-0.08703, 7.2242, -19.56316], - "size": [0.16752, 0.16752, 0.16752], - "pivot": [-0.00326, 7.30795, -19.4794], + "origin": [-0.06527, 5.16815, -14.67237], + "size": [0.12564, 0.12564, 0.12564], + "pivot": [-0.00245, 5.23097, -14.60955], "rotation": [0, 0, -45], "uv": { "north": {"uv": [153, 124], "uv_size": [1, 1]}, @@ -1953,8 +1953,8 @@ } }, { - "origin": [0.25906, 7.02524, -19.65173], - "size": [0.1125, 0.1575, 0.45], + "origin": [0.1943, 5.01893, -14.73879], + "size": [0.08438, 0.11812, 0.3375], "uv": { "north": {"uv": [153, 107], "uv_size": [1, 1]}, "east": {"uv": [108, 153], "uv_size": [1, 1]}, @@ -1965,8 +1965,8 @@ } }, { - "origin": [-0.37809, 7.02524, -19.65173], - "size": [0.1125, 0.1575, 0.45], + "origin": [-0.28357, 5.01893, -14.73879], + "size": [0.08438, 0.11812, 0.3375], "uv": { "north": {"uv": [153, 110], "uv_size": [1, 1]}, "east": {"uv": [111, 153], "uv_size": [1, 1]}, @@ -1977,8 +1977,8 @@ } }, { - "origin": [-0.37809, 4.64164, 19.27328], - "size": [0.74966, 0.5625, 0.4725], + "origin": [-0.28357, 3.23123, 14.45496], + "size": [0.56224, 0.42188, 0.35437], "uv": { "north": {"uv": [133, 149], "uv_size": [2, 1]}, "east": {"uv": [117, 152], "uv_size": [1, 1]}, @@ -1989,9 +1989,9 @@ } }, { - "origin": [-0.37809, 4.52764, 19.62389], - "size": [0.74966, 0.6075, 0.2475], - "pivot": [-0.00326, 4.85389, 19.63514], + "origin": [-0.28357, 3.14573, 14.71792], + "size": [0.56224, 0.45563, 0.18562], + "pivot": [-0.00245, 3.39042, 14.72635], "rotation": [22.5, 0, 0], "uv": { "north": {"uv": [149, 137], "uv_size": [2, 1]}, @@ -2003,9 +2003,9 @@ } }, { - "origin": [-0.87998, 3.72627, -19.65172], - "size": [0.57669, 0.27321, 39.735], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.65999, 2.5447, -14.73879], + "size": [0.43252, 0.20491, 29.80125], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [116, 151], "uv_size": [1, 1]}, @@ -2021,11 +2021,11 @@ { "name": "bone28", "parent": "bone3", - "pivot": [0, 7.28851, 4.14791], + "pivot": [0, 5.21639, 3.11093], "cubes": [ { - "origin": [-0.05141, 7.48834, 4.05896], - "size": [0.10281, 0.08268, 0.17789], + "origin": [-0.03855, 5.36626, 3.04422], + "size": [0.07711, 0.06201, 0.13342], "uv": { "north": {"uv": [153, 52], "uv_size": [1, 1]}, "east": {"uv": [53, 153], "uv_size": [1, 1]}, @@ -2036,9 +2036,9 @@ } }, { - "origin": [0.01418, 7.46118, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.10108, 7.46386, 4.14791], + "origin": [0.01063, 5.34588, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.07581, 5.3479, 3.11093], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [153, 55], "uv_size": [1, 1]}, @@ -2050,9 +2050,9 @@ } }, { - "origin": [0.08517, 7.46118, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.10108, 7.46386, 4.14791], + "origin": [0.06388, 5.34588, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.07581, 5.3479, 3.11093], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 58], "uv_size": [1, 1]}, @@ -2064,9 +2064,9 @@ } }, { - "origin": [0.15075, 7.48834, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.10108, 7.46386, 4.14791], + "origin": [0.11306, 5.36626, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.07581, 5.3479, 3.11093], "rotation": [0, 0, 67.5], "uv": { "north": {"uv": [153, 61], "uv_size": [1, 1]}, @@ -2078,9 +2078,9 @@ } }, { - "origin": [0.20095, 7.23599, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.15128, 7.21151, 4.14791], + "origin": [0.15071, 5.17699, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.11346, 5.15863, 3.11093], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [153, 64], "uv_size": [1, 1]}, @@ -2092,9 +2092,9 @@ } }, { - "origin": [0.13536, 7.20882, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.15128, 7.21151, 4.14791], + "origin": [0.10152, 5.15662, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.11346, 5.15863, 3.11093], "rotation": [0, 0, 135], "uv": { "north": {"uv": [153, 67], "uv_size": [1, 1]}, @@ -2106,9 +2106,9 @@ } }, { - "origin": [0.06438, 7.20882, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.15128, 7.21151, 4.14791], + "origin": [0.04828, 5.15662, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.11346, 5.15863, 3.11093], "rotation": [0, 0, 112.5], "uv": { "north": {"uv": [153, 70], "uv_size": [1, 1]}, @@ -2120,9 +2120,9 @@ } }, { - "origin": [-0.00121, 7.23599, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [0.15128, 7.21151, 4.14791], + "origin": [-0.00091, 5.17699, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [0.11346, 5.15863, 3.11093], "rotation": [0, 0, 90], "uv": { "north": {"uv": [153, 73], "uv_size": [1, 1]}, @@ -2134,9 +2134,9 @@ } }, { - "origin": [-0.27022, 7.47169, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.20267, 5.35377, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, 180], "uv": { "north": {"uv": [153, 76], "uv_size": [1, 1]}, @@ -2148,9 +2148,9 @@ } }, { - "origin": [-0.36022, 7.55437, 4.01396], - "size": [0.28281, 0.09, 0.26789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.27017, 5.41577, 3.01047], + "size": [0.21211, 0.0675, 0.20092], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, 180], "uv": { "north": {"uv": [153, 100], "uv_size": [1, 1]}, @@ -2162,9 +2162,9 @@ } }, { - "origin": [-0.31522, 7.50937, 4.03646], - "size": [0.19281, 0.045, 0.22289], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.23642, 5.38202, 3.02735], + "size": [0.14461, 0.03375, 0.16717], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, 180], "uv": { "north": {"uv": [153, 103], "uv_size": [1, 1]}, @@ -2176,9 +2176,9 @@ } }, { - "origin": [-0.25871, 7.43045, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.19403, 5.32284, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -157.5], "uv": { "north": {"uv": [153, 79], "uv_size": [1, 1]}, @@ -2190,9 +2190,9 @@ } }, { - "origin": [-0.23229, 7.39676, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.17422, 5.29757, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -135], "uv": { "north": {"uv": [153, 82], "uv_size": [1, 1]}, @@ -2204,9 +2204,9 @@ } }, { - "origin": [-0.19499, 7.37575, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.14624, 5.28181, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -112.5], "uv": { "north": {"uv": [153, 85], "uv_size": [1, 1]}, @@ -2218,9 +2218,9 @@ } }, { - "origin": [-0.15249, 7.37061, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.11436, 5.27796, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -90], "uv": { "north": {"uv": [153, 88], "uv_size": [1, 1]}, @@ -2232,9 +2232,9 @@ } }, { - "origin": [-0.11125, 7.38212, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.08344, 5.28659, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -67.5], "uv": { "north": {"uv": [153, 91], "uv_size": [1, 1]}, @@ -2246,9 +2246,9 @@ } }, { - "origin": [-0.07756, 7.40854, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.05817, 5.30641, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -45], "uv": { "north": {"uv": [153, 94], "uv_size": [1, 1]}, @@ -2260,9 +2260,9 @@ } }, { - "origin": [-0.05655, 7.44584, 4.05896], - "size": [0.10281, 0.08268, 0.17789], - "pivot": [-0.10941, 7.30426, 4.14791], + "origin": [-0.04241, 5.33438, 3.04422], + "size": [0.07711, 0.06201, 0.13342], + "pivot": [-0.08206, 5.22819, 3.11093], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [153, 97], "uv_size": [1, 1]}, @@ -2278,12 +2278,12 @@ { "name": "bone5", "parent": "bone2", - "pivot": [-0.00318, 0.94876, -11.25922], + "pivot": [-0.00238, 0.46157, -8.44442], "rotation": [-1, 0, 0], "cubes": [ { - "origin": [-1.00975, 1.02743, -19.66661], - "size": [2.01317, 0.70071, 17.235], + "origin": [-0.75731, 0.52057, -14.74996], + "size": [1.50988, 0.52554, 12.92625], "uv": { "north": {"uv": [134, 19], "uv_size": [4, 2]}, "east": {"uv": [85, 6], "uv_size": [38, 2]}, @@ -2294,9 +2294,9 @@ } }, { - "origin": [-0.67392, 1.23258, -19.67046], - "size": [0.57669, 0.38888, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [-0.50544, 0.67443, -14.75285], + "size": [0.43252, 0.29166, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, -71], "uv": { "north": {"uv": [124, 151], "uv_size": [1, 1]}, @@ -2308,9 +2308,9 @@ } }, { - "origin": [-0.849, 1.27132, -19.67046], - "size": [0.57669, 0.22821, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [-0.63675, 0.70349, -14.75285], + "size": [0.43252, 0.17116, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, -45], "uv": { "north": {"uv": [125, 151], "uv_size": [1, 1]}, @@ -2322,9 +2322,9 @@ } }, { - "origin": [0.0909, 1.23258, -19.67046], - "size": [0.57669, 0.38888, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [0.06818, 0.67443, -14.75285], + "size": [0.43252, 0.29166, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, 71], "uv": { "north": {"uv": [126, 151], "uv_size": [1, 1]}, @@ -2336,9 +2336,9 @@ } }, { - "origin": [0.26598, 1.27132, -19.67046], - "size": [0.57669, 0.22821, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [0.19948, 0.70349, -14.75285], + "size": [0.43252, 0.17116, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, 45], "uv": { "north": {"uv": [127, 151], "uv_size": [1, 1]}, @@ -2350,9 +2350,9 @@ } }, { - "origin": [0.36704, 1.14294, -19.67046], - "size": [0.57669, 0.27321, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [0.27528, 0.6072, -14.75285], + "size": [0.43252, 0.20491, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [128, 151], "uv_size": [1, 1]}, @@ -2364,8 +2364,8 @@ } }, { - "origin": [-0.37809, 0.48684, -19.67046], - "size": [0.74966, 0.54, 17.235], + "origin": [-0.28357, 0.11513, -14.75285], + "size": [0.56224, 0.405, 12.92625], "uv": { "north": {"uv": [149, 58], "uv_size": [2, 1]}, "east": {"uv": [104, 32], "uv_size": [38, 1]}, @@ -2376,9 +2376,9 @@ } }, { - "origin": [-0.95005, 1.14294, -19.67046], - "size": [0.57669, 0.27321, 17.235], - "pivot": [-0.00316, 1.06721, -11.27796], + "origin": [-0.71254, 0.6072, -14.75285], + "size": [0.43252, 0.20491, 12.92625], + "pivot": [-0.00237, 0.55041, -8.45847], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [129, 151], "uv_size": [1, 1]}, @@ -2394,16 +2394,16 @@ { "name": "barrel", "parent": "gun", - "pivot": [1.82547, -0.85905, -2.10938] + "pivot": [1.3691, -0.89429, -1.58203] }, { "name": "bone8", "parent": "barrel", - "pivot": [-0.00318, 1.72765, -19.81023], + "pivot": [-0.00238, 1.04574, -14.85768], "cubes": [ { - "origin": [-0.86026, 1.30891, -20.1345], - "size": [1.71419, 2.77248, 0.64853], + "origin": [-0.64519, 0.73168, -15.10088], + "size": [1.28564, 2.07936, 0.4864], "uv": { "north": {"uv": [117, 14], "uv_size": [4, 6]}, "east": {"uv": [96, 142], "uv_size": [1, 6]}, @@ -2414,9 +2414,9 @@ } }, { - "origin": [-0.23026, 2.98309, -20.57286], - "size": [0.45419, 0.9, 0.9], - "pivot": [-0.00316, 3.43309, -20.12286], + "origin": [-0.17269, 1.98732, -15.42965], + "size": [0.34064, 0.675, 0.675], + "pivot": [-0.00237, 2.32482, -15.09215], "rotation": [45, 0, 0], "uv": { "north": {"uv": [95, 149], "uv_size": [1, 2]}, @@ -2428,9 +2428,9 @@ } }, { - "origin": [-0.23026, 2.98309, -20.57286], - "size": [0.45419, 0.9, 0.9], - "pivot": [-0.00316, 3.43309, -20.12286], + "origin": [-0.17269, 1.98732, -15.42965], + "size": [0.34064, 0.675, 0.675], + "pivot": [-0.00237, 2.32482, -15.09215], "rotation": [45, 0, 90], "uv": { "north": {"uv": [99, 149], "uv_size": [1, 2]}, @@ -2442,9 +2442,9 @@ } }, { - "origin": [0.25194, 3.76266, -20.1345], - "size": [0.49019, 0.23223, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [0.18896, 2.57199, -15.10088], + "size": [0.36764, 0.17417, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [114, 152], "uv_size": [1, 1]}, @@ -2456,9 +2456,9 @@ } }, { - "origin": [0.11555, 3.72552, -20.1345], - "size": [0.49019, 0.19398, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [0.08666, 2.54414, -15.10088], + "size": [0.36764, 0.14549, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, -45], "uv": { "north": {"uv": [111, 152], "uv_size": [1, 1]}, @@ -2470,9 +2470,9 @@ } }, { - "origin": [-0.07037, 3.68127, -20.1345], - "size": [0.49019, 0.33055, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [-0.05278, 2.51096, -15.10088], + "size": [0.36764, 0.24791, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, -71], "uv": { "north": {"uv": [108, 152], "uv_size": [1, 1]}, @@ -2484,9 +2484,9 @@ } }, { - "origin": [-0.42614, 3.68127, -20.1345], - "size": [0.49019, 0.33055, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [-0.31961, 2.51096, -15.10088], + "size": [0.36764, 0.24791, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, 71], "uv": { "north": {"uv": [105, 152], "uv_size": [1, 1]}, @@ -2498,9 +2498,9 @@ } }, { - "origin": [-0.74846, 3.76266, -20.1345], - "size": [0.49019, 0.23223, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [-0.56134, 2.57199, -15.10088], + "size": [0.36764, 0.17417, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [102, 152], "uv_size": [1, 1]}, @@ -2512,9 +2512,9 @@ } }, { - "origin": [-0.61207, 3.72552, -20.1345], - "size": [0.49019, 0.19398, 0.64853], - "pivot": [-0.00316, 4.20305, -19.81023], + "origin": [-0.45905, 2.54414, -15.10088], + "size": [0.36764, 0.14549, 0.4864], + "pivot": [-0.00237, 2.90229, -14.85768], "rotation": [0, 0, 45], "uv": { "north": {"uv": [99, 152], "uv_size": [1, 1]}, @@ -2526,8 +2526,8 @@ } }, { - "origin": [-0.32185, 4.08172, -20.1345], - "size": [0.63721, 0.459, 0.64853], + "origin": [-0.24139, 2.81129, -15.10088], + "size": [0.47791, 0.34425, 0.4864], "uv": { "north": {"uv": [96, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 96], "uv_size": [1, 1]}, @@ -2538,8 +2538,8 @@ } }, { - "origin": [-0.32185, 0.84957, -20.1345], - "size": [0.63721, 0.459, 0.64853], + "origin": [-0.24139, 0.38718, -15.10088], + "size": [0.47791, 0.34425, 0.4864], "uv": { "north": {"uv": [93, 152], "uv_size": [1, 1]}, "east": {"uv": [152, 93], "uv_size": [1, 1]}, @@ -2550,9 +2550,9 @@ } }, { - "origin": [0.25194, 1.39541, -20.1345], - "size": [0.49019, 0.23223, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [0.18896, 0.79656, -15.10088], + "size": [0.36764, 0.17417, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [90, 152], "uv_size": [1, 1]}, @@ -2564,9 +2564,9 @@ } }, { - "origin": [0.11555, 1.4708, -20.1345], - "size": [0.49019, 0.19398, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [0.08666, 0.8531, -15.10088], + "size": [0.36764, 0.14549, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, 45], "uv": { "north": {"uv": [87, 152], "uv_size": [1, 1]}, @@ -2578,9 +2578,9 @@ } }, { - "origin": [-0.07037, 1.37848, -20.1345], - "size": [0.49019, 0.33055, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [-0.05278, 0.78386, -15.10088], + "size": [0.36764, 0.24791, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, 71], "uv": { "north": {"uv": [84, 152], "uv_size": [1, 1]}, @@ -2592,9 +2592,9 @@ } }, { - "origin": [-0.61207, 1.4708, -20.1345], - "size": [0.49019, 0.19398, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [-0.45905, 0.8531, -15.10088], + "size": [0.36764, 0.14549, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, -45], "uv": { "north": {"uv": [81, 152], "uv_size": [1, 1]}, @@ -2606,9 +2606,9 @@ } }, { - "origin": [-0.74846, 1.39541, -20.1345], - "size": [0.49019, 0.23223, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [-0.56134, 0.79656, -15.10088], + "size": [0.36764, 0.17417, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [78, 152], "uv_size": [1, 1]}, @@ -2620,9 +2620,9 @@ } }, { - "origin": [-0.42614, 1.37848, -20.1345], - "size": [0.49019, 0.33055, 0.64853], - "pivot": [-0.00316, 1.18725, -19.81023], + "origin": [-0.31961, 0.78386, -15.10088], + "size": [0.36764, 0.24791, 0.4864], + "pivot": [-0.00237, 0.64044, -14.85768], "rotation": [0, 0, -71], "uv": { "north": {"uv": [75, 152], "uv_size": [1, 1]}, @@ -2638,12 +2638,12 @@ { "name": "guan", "parent": "barrel", - "pivot": [1.82547, -0.97155, -2.10938], + "pivot": [1.3691, -0.97866, -1.58203], "cubes": [ { - "origin": [-0.29844, 1.1216, -28.47622], - "size": [0.59055, 0.15007, 9], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.22383, 0.5912, -21.35716], + "size": [0.44291, 0.11256, 6.75], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [99, 118], "uv_size": [1, 1]}, @@ -2653,8 +2653,8 @@ } }, { - "origin": [-0.29844, 1.1216, -28.47622], - "size": [0.59055, 0.15007, 9], + "origin": [-0.22383, 0.5912, -21.35716], + "size": [0.44291, 0.11256, 6.75], "uv": { "north": {"uv": [129, 136], "uv_size": [1, 1]}, "south": {"uv": [138, 66], "uv_size": [1, 1]}, @@ -2663,9 +2663,9 @@ } }, { - "origin": [-0.29844, 2.39723, -28.47622], - "size": [0.59055, 0.15007, 9], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.22383, 1.54792, -21.35716], + "size": [0.44291, 0.11256, 6.75], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [8, 151], "uv_size": [1, 1]}, @@ -2675,8 +2675,8 @@ } }, { - "origin": [-0.29844, 2.39723, -28.47622], - "size": [0.59055, 0.15007, 9], + "origin": [-0.22383, 1.54792, -21.35716], + "size": [0.44291, 0.11256, 6.75], "uv": { "north": {"uv": [63, 151], "uv_size": [1, 1]}, "south": {"uv": [151, 63], "uv_size": [1, 1]}, @@ -2685,9 +2685,9 @@ } }, { - "origin": [0.55961, 1.53918, -28.47622], - "size": [0.15007, 0.59055, 9], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [0.41971, 0.90439, -21.35716], + "size": [0.11256, 0.44291, 6.75], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [64, 151], "uv_size": [1, 1]}, @@ -2697,8 +2697,8 @@ } }, { - "origin": [0.55961, 1.53918, -28.47622], - "size": [0.15007, 0.59055, 9], + "origin": [0.41971, 0.90439, -21.35716], + "size": [0.11256, 0.44291, 6.75], "uv": { "north": {"uv": [65, 151], "uv_size": [1, 1]}, "east": {"uv": [119, 61], "uv_size": [20, 1]}, @@ -2707,9 +2707,9 @@ } }, { - "origin": [-0.71601, 1.53918, -28.47622], - "size": [0.15007, 0.59055, 9], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.53701, 0.90439, -21.35716], + "size": [0.11256, 0.44291, 6.75], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [66, 151], "uv_size": [1, 1]}, @@ -2719,8 +2719,8 @@ } }, { - "origin": [-0.71601, 1.53918, -28.47622], - "size": [0.15007, 0.59055, 9], + "origin": [-0.53701, 0.90439, -21.35716], + "size": [0.11256, 0.44291, 6.75], "uv": { "north": {"uv": [67, 151], "uv_size": [1, 1]}, "east": {"uv": [123, 8], "uv_size": [20, 1]}, @@ -2729,9 +2729,9 @@ } }, { - "origin": [-0.35454, 0.98616, -20.64461], - "size": [0.70275, 0.17859, 0.50407], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.2659, 0.48962, -15.48346], + "size": [0.52706, 0.13394, 0.37806], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [149, 130], "uv_size": [2, 1]}, @@ -2741,8 +2741,8 @@ } }, { - "origin": [-0.35454, 0.98616, -20.64461], - "size": [0.70275, 0.17859, 0.50407], + "origin": [-0.2659, 0.48962, -15.48346], + "size": [0.52706, 0.13394, 0.37806], "uv": { "north": {"uv": [149, 127], "uv_size": [2, 1]}, "south": {"uv": [149, 128], "uv_size": [2, 1]}, @@ -2751,9 +2751,9 @@ } }, { - "origin": [-0.35454, 2.50416, -20.64461], - "size": [0.70275, 0.17859, 0.50407], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.2659, 1.62812, -15.48346], + "size": [0.52706, 0.13394, 0.37806], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [149, 123], "uv_size": [2, 1]}, @@ -2763,8 +2763,8 @@ } }, { - "origin": [-0.35454, 2.50416, -20.64461], - "size": [0.70275, 0.17859, 0.50407], + "origin": [-0.2659, 1.62812, -15.48346], + "size": [0.52706, 0.13394, 0.37806], "uv": { "north": {"uv": [149, 101], "uv_size": [2, 1]}, "south": {"uv": [149, 105], "uv_size": [2, 1]}, @@ -2773,9 +2773,9 @@ } }, { - "origin": [0.66654, 1.48308, -20.64461], - "size": [0.17859, 0.70275, 0.50407], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [0.49991, 0.86231, -15.48346], + "size": [0.13394, 0.52706, 0.37806], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [114, 149], "uv_size": [1, 2]}, @@ -2785,8 +2785,8 @@ } }, { - "origin": [0.66654, 1.48308, -20.64461], - "size": [0.17859, 0.70275, 0.50407], + "origin": [0.49991, 0.86231, -15.48346], + "size": [0.13394, 0.52706, 0.37806], "uv": { "north": {"uv": [149, 111], "uv_size": [1, 2]}, "east": {"uv": [112, 149], "uv_size": [1, 2]}, @@ -2795,9 +2795,9 @@ } }, { - "origin": [-0.85146, 1.48308, -20.64461], - "size": [0.17859, 0.70275, 0.50407], - "pivot": [-0.00316, 1.83446, -17.28667], + "origin": [-0.63859, 0.86231, -15.48346], + "size": [0.13394, 0.52706, 0.37806], + "pivot": [-0.00237, 1.12584, -12.965], "rotation": [0, 0, 45], "uv": { "north": {"uv": [107, 149], "uv_size": [1, 2]}, @@ -2807,8 +2807,8 @@ } }, { - "origin": [-0.85146, 1.48308, -20.64461], - "size": [0.17859, 0.70275, 0.50407], + "origin": [-0.63859, 0.86231, -15.48346], + "size": [0.13394, 0.52706, 0.37806], "uv": { "north": {"uv": [103, 149], "uv_size": [1, 2]}, "east": {"uv": [149, 103], "uv_size": [1, 2]}, @@ -2821,11 +2821,11 @@ { "name": "stock", "parent": "gun", - "pivot": [8.06804, -8.93025, -10.18058], + "pivot": [6.05103, -6.94769, -7.63543], "cubes": [ { - "origin": [-1.01151, -1.43697, 20.08328], - "size": [2.01669, 5.53821, 0.76298], + "origin": [-0.75863, -1.32772, 15.06246], + "size": [1.51252, 4.15366, 0.57224], "uv": { "north": {"uv": [103, 97], "uv_size": [4, 12]}, "east": {"uv": [9, 117], "uv_size": [2, 12]}, @@ -2836,8 +2836,8 @@ } }, { - "origin": [-1.05651, 1.39803, 18.41828], - "size": [2.10669, 0.49821, 1.79798], + "origin": [-0.79238, 0.79853, 13.81371], + "size": [1.58002, 0.37366, 1.34849], "uv": { "north": {"uv": [143, 105], "uv_size": [5, 1]}, "east": {"uv": [145, 30], "uv_size": [4, 1]}, @@ -2848,9 +2848,9 @@ } }, { - "origin": [0.29696, 3.72627, 20.08328], - "size": [0.57669, 0.27321, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [0.22272, 2.5447, 15.06246], + "size": [0.43252, 0.20491, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [151, 97], "uv_size": [1, 1]}, @@ -2862,9 +2862,9 @@ } }, { - "origin": [0.1365, 3.68258, 20.08328], - "size": [0.57669, 0.22821, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [0.10238, 2.51193, 15.06246], + "size": [0.43252, 0.17116, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -45], "uv": { "north": {"uv": [151, 98], "uv_size": [1, 1]}, @@ -2876,9 +2876,9 @@ } }, { - "origin": [-0.08223, 3.63052, 20.08328], - "size": [0.57669, 0.38888, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.06167, 2.47289, 15.06246], + "size": [0.43252, 0.29166, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, -71], "uv": { "north": {"uv": [100, 151], "uv_size": [1, 1]}, @@ -2890,9 +2890,9 @@ } }, { - "origin": [-0.50079, 3.63052, 20.08328], - "size": [0.57669, 0.38888, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.37559, 2.47289, 15.06246], + "size": [0.43252, 0.29166, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 71], "uv": { "north": {"uv": [104, 151], "uv_size": [1, 1]}, @@ -2904,9 +2904,9 @@ } }, { - "origin": [-0.87998, 3.72627, 20.08328], - "size": [0.57669, 0.27321, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.65999, 2.5447, 15.06246], + "size": [0.43252, 0.20491, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [151, 102], "uv_size": [1, 1]}, @@ -2918,9 +2918,9 @@ } }, { - "origin": [-0.71952, 3.68258, 20.08328], - "size": [0.57669, 0.22821, 0.76298], - "pivot": [-0.00316, 4.24438, 20.46477], + "origin": [-0.53964, 2.51193, 15.06246], + "size": [0.43252, 0.17116, 0.57224], + "pivot": [-0.00237, 2.93328, 15.34857], "rotation": [0, 0, 45], "uv": { "north": {"uv": [151, 101], "uv_size": [1, 1]}, @@ -2932,8 +2932,8 @@ } }, { - "origin": [-0.37809, 4.10164, 20.08328], - "size": [0.74966, 0.54, 0.76298], + "origin": [-0.28357, 2.82623, 15.06246], + "size": [0.56224, 0.405, 0.57224], "uv": { "north": {"uv": [137, 148], "uv_size": [2, 1]}, "east": {"uv": [148, 138], "uv_size": [2, 1]}, @@ -2944,8 +2944,8 @@ } }, { - "origin": [-0.37809, -1.97736, 20.08328], - "size": [0.74966, 0.54, 0.76298], + "origin": [-0.28357, -1.73302, 15.06246], + "size": [0.56224, 0.405, 0.57224], "uv": { "north": {"uv": [54, 149], "uv_size": [2, 1]}, "east": {"uv": [149, 55], "uv_size": [2, 1]}, @@ -2956,9 +2956,9 @@ } }, { - "origin": [0.29696, -1.3352, 20.08328], - "size": [0.57669, 0.27321, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [0.22272, -1.2514, 15.06246], + "size": [0.43252, 0.20491, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [114, 151], "uv_size": [1, 1]}, @@ -2970,9 +2970,9 @@ } }, { - "origin": [0.1365, -1.24651, 20.08328], - "size": [0.57669, 0.22821, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [0.10238, -1.18488, 15.06246], + "size": [0.43252, 0.17116, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, 45], "uv": { "north": {"uv": [112, 151], "uv_size": [1, 1]}, @@ -2984,9 +2984,9 @@ } }, { - "origin": [-0.08223, -1.35512, 20.08328], - "size": [0.57669, 0.38888, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [-0.06167, -1.26634, 15.06246], + "size": [0.43252, 0.29166, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, 71], "uv": { "north": {"uv": [110, 151], "uv_size": [1, 1]}, @@ -2998,9 +2998,9 @@ } }, { - "origin": [-0.71952, -1.24651, 20.08328], - "size": [0.57669, 0.22821, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [-0.53964, -1.18488, 15.06246], + "size": [0.43252, 0.17116, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, -45], "uv": { "north": {"uv": [108, 151], "uv_size": [1, 1]}, @@ -3012,9 +3012,9 @@ } }, { - "origin": [-0.87998, -1.3352, 20.08328], - "size": [0.57669, 0.27321, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [-0.65999, -1.2514, 15.06246], + "size": [0.43252, 0.20491, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [107, 151], "uv_size": [1, 1]}, @@ -3026,9 +3026,9 @@ } }, { - "origin": [-0.50079, -1.35512, 20.08328], - "size": [0.57669, 0.38888, 0.76298], - "pivot": [-0.00316, -1.58009, 20.46477], + "origin": [-0.37559, -1.26634, 15.06246], + "size": [0.43252, 0.29166, 0.57224], + "pivot": [-0.00237, -1.43507, 15.34857], "rotation": [0, 0, -71], "uv": { "north": {"uv": [151, 105], "uv_size": [1, 1]}, @@ -3044,12 +3044,12 @@ { "name": "qianwoba", "parent": "gun", - "pivot": [-0.00316, -1.62285, -11.99093], + "pivot": [-0.00237, -1.46714, -8.9932], "rotation": [-1, 0, 0], "cubes": [ { - "origin": [-0.55428, -0.09461, -13.23092], - "size": [1.10222, 0.55819, 2.48], + "origin": [-0.41571, -0.32096, -9.92319], + "size": [0.82667, 0.41865, 1.86], "uv": { "north": {"uv": [105, 124], "uv_size": [2, 1]}, "south": {"uv": [137, 131], "uv_size": [2, 1]}, @@ -3057,9 +3057,9 @@ } }, { - "origin": [-0.80619, -0.09461, -13.17385], - "size": [0.38969, 0.55819, 0.27556], - "pivot": [-0.55428, 0.07761, -13.03607], + "origin": [-0.60464, -0.32096, -9.88039], + "size": [0.29227, 0.41865, 0.20667], + "pivot": [-0.41571, -0.19179, -9.77706], "rotation": [0, 45, 0], "uv": { "north": {"uv": [72, 151], "uv_size": [1, 1]}, @@ -3068,9 +3068,9 @@ } }, { - "origin": [0.41017, -0.09461, -13.17385], - "size": [0.38969, 0.55819, 0.27556], - "pivot": [0.54795, 0.07761, -13.03607], + "origin": [0.30763, -0.32096, -9.88039], + "size": [0.29227, 0.41865, 0.20667], + "pivot": [0.41096, -0.19179, -9.77706], "rotation": [0, -45, 0], "uv": { "north": {"uv": [75, 151], "uv_size": [1, 1]}, @@ -3079,9 +3079,9 @@ } }, { - "origin": [-0.55917, -0.09461, -11.5992], - "size": [0.27556, 0.55819, 0.3897], - "pivot": [-0.00316, 0.07761, -10.98613], + "origin": [-0.41938, -0.32096, -8.6994], + "size": [0.20667, 0.41865, 0.29228], + "pivot": [-0.00237, -0.19179, -8.23959], "rotation": [0, 45, 0], "uv": { "east": {"uv": [78, 151], "uv_size": [1, 1]}, @@ -3090,9 +3090,9 @@ } }, { - "origin": [0.22022, -0.09461, -10.70568], - "size": [0.38969, 0.55819, 0.27556], - "pivot": [-0.00316, 0.07761, -10.98613], + "origin": [0.16517, -0.32096, -8.02926], + "size": [0.29227, 0.41865, 0.20667], + "pivot": [-0.00237, -0.19179, -8.23959], "rotation": [0, 45, 0], "uv": { "south": {"uv": [151, 79], "uv_size": [1, 1]}, @@ -3101,8 +3101,8 @@ } }, { - "origin": [-0.82983, -0.09461, -12.95537], - "size": [1.65333, 0.55819, 1.92889], + "origin": [-0.62237, -0.32096, -9.71653], + "size": [1.24, 0.41865, 1.44667], "uv": { "east": {"uv": [138, 22], "uv_size": [4, 1]}, "west": {"uv": [144, 112], "uv_size": [4, 1]}, @@ -3111,9 +3111,9 @@ } }, { - "origin": [-0.87483, 0.00972, -12.119], - "size": [1.74333, 0.3375, 0.3375], - "pivot": [-0.00316, 0.17847, -11.95025], + "origin": [-0.65612, -0.24271, -9.08925], + "size": [1.3075, 0.25313, 0.25313], + "pivot": [-0.00237, -0.11615, -8.96269], "rotation": [-45, 0, 0], "uv": { "east": {"uv": [95, 154], "uv_size": [1, 1]}, @@ -3123,8 +3123,8 @@ } }, { - "origin": [-0.55428, -0.37017, -12.95537], - "size": [1.10222, 0.27556, 1.92889], + "origin": [-0.41571, -0.52762, -9.71653], + "size": [0.82667, 0.20667, 1.44667], "uv": { "east": {"uv": [115, 144], "uv_size": [4, 1]}, "west": {"uv": [144, 115], "uv_size": [4, 1]}, @@ -3132,9 +3132,9 @@ } }, { - "origin": [0.67238, 0.48809, -12.95537], - "size": [0.39681, 0.39301, 1.92889], - "pivot": [-0.23145, 0.68981, -11.02648], + "origin": [0.50428, 0.11607, -9.71653], + "size": [0.29761, 0.29476, 1.44667], + "pivot": [-0.17358, 0.26736, -8.26986], "rotation": [0, 0, 45], "uv": { "north": {"uv": [151, 81], "uv_size": [1, 1]}, @@ -3144,9 +3144,9 @@ } }, { - "origin": [-1.07552, 0.48809, -12.95537], - "size": [0.39681, 0.39301, 1.92889], - "pivot": [0.22512, 0.68982, -11.02648], + "origin": [-0.80664, 0.11607, -9.71653], + "size": [0.29761, 0.29476, 1.44667], + "pivot": [0.16884, 0.26736, -8.26986], "rotation": [0, 0, -45], "uv": { "north": {"uv": [94, 154], "uv_size": [1, 1]}, @@ -3156,9 +3156,9 @@ } }, { - "origin": [-0.55428, -0.34293, -11.09224], - "size": [1.10222, 0.38969, 0.24112], - "pivot": [-0.00316, -0.14487, -10.97168], + "origin": [-0.41571, -0.5072, -8.31918], + "size": [0.82667, 0.29227, 0.18084], + "pivot": [-0.00237, -0.35865, -8.22876], "rotation": [-45, 0, 0], "uv": { "east": {"uv": [151, 83], "uv_size": [1, 1]}, @@ -3167,9 +3167,9 @@ } }, { - "origin": [-0.55428, 0.06062, -12.15649], - "size": [1.10222, 0.38969, 0.24111], - "pivot": [-0.00316, -1.11911, -12.03593], + "origin": [-0.41571, -0.20454, -9.11737], + "size": [0.82667, 0.29227, 0.18083], + "pivot": [-0.00237, -1.08934, -9.02695], "rotation": [45, 0, 0], "uv": { "north": {"uv": [148, 106], "uv_size": [2, 1]}, @@ -3178,16 +3178,16 @@ } }, { - "origin": [-0.55428, -5.64017, -12.67981], - "size": [1.10222, 4.27112, 1.37778], + "origin": [-0.41571, -4.48013, -9.50986], + "size": [0.82667, 3.20334, 1.03333], "uv": { "north": {"uv": [73, 125], "uv_size": [2, 9]}, "south": {"uv": [111, 126], "uv_size": [2, 9]} } }, { - "origin": [-0.69205, -5.64017, -12.54204], - "size": [1.37778, 4.27112, 1.10222], + "origin": [-0.51904, -4.48013, -9.40653], + "size": [1.03333, 3.20334, 0.82667], "uv": { "east": {"uv": [113, 126], "uv_size": [2, 9]}, "west": {"uv": [115, 126], "uv_size": [2, 9]}, @@ -3195,8 +3195,8 @@ } }, { - "origin": [-0.55428, -5.77795, -12.36981], - "size": [1.10222, 0.13778, 0.75778], + "origin": [-0.41571, -4.58346, -9.27736], + "size": [0.82667, 0.10333, 0.56833], "uv": { "north": {"uv": [148, 108], "uv_size": [2, 1]}, "east": {"uv": [148, 110], "uv_size": [2, 1]}, @@ -3206,9 +3206,9 @@ } }, { - "origin": [-0.55428, -5.80359, -11.64138], - "size": [1.10222, 0.13778, 0.34444], - "pivot": [-0.00316, -5.7347, -11.71026], + "origin": [-0.41571, -4.60269, -8.73103], + "size": [0.82667, 0.10333, 0.25833], + "pivot": [-0.00237, -4.55102, -8.7827], "rotation": [22.5, 0, 0], "uv": { "east": {"uv": [151, 85], "uv_size": [1, 1]}, @@ -3217,9 +3217,9 @@ } }, { - "origin": [-0.55428, -5.71132, -12.66656], - "size": [1.10222, 0.13778, 0.34444], - "pivot": [-0.00316, -5.64243, -12.49434], + "origin": [-0.41571, -4.53349, -9.49992], + "size": [0.82667, 0.10333, 0.25833], + "pivot": [-0.00237, -4.48182, -9.37076], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [148, 120], "uv_size": [2, 1]}, @@ -3229,9 +3229,9 @@ } }, { - "origin": [0.45022, -5.64017, -12.63958], - "size": [0.19509, 4.27112, 0.19509], - "pivot": [0.54777, -1.78239, -12.54204], + "origin": [0.33767, -4.48013, -9.47969], + "size": [0.14632, 3.20334, 0.14632], + "pivot": [0.41083, -1.58679, -9.40653], "rotation": [0, -45, 0], "uv": { "north": {"uv": [110, 97], "uv_size": [1, 9]}, @@ -3241,9 +3241,9 @@ } }, { - "origin": [0.06053, -5.64017, -11.69878], - "size": [0.19509, 4.27112, 0.19509], - "pivot": [0.15808, -1.78239, -11.05012], + "origin": [0.0454, -4.48013, -8.77408], + "size": [0.14632, 3.20334, 0.14632], + "pivot": [0.11856, -1.58679, -8.28759], "rotation": [0, -45, 0], "uv": { "south": {"uv": [100, 130], "uv_size": [1, 9]}, @@ -3253,9 +3253,9 @@ } }, { - "origin": [-0.55428, -1.55869, -12.5531], - "size": [1.10222, 0.82667, 0.27556], - "pivot": [-0.00316, -1.14536, -12.13977], + "origin": [-0.41571, -1.41902, -9.41483], + "size": [0.82667, 0.62, 0.20667], + "pivot": [-0.00237, -1.10902, -9.10483], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [122, 144], "uv_size": [2, 2]}, @@ -3264,9 +3264,9 @@ } }, { - "origin": [-0.55428, -1.45324, -11.72528], - "size": [1.10222, 0.82667, 0.27556], - "pivot": [-0.00316, -1.03991, -11.5875], + "origin": [-0.41571, -1.33993, -8.79396], + "size": [0.82667, 0.62, 0.20667], + "pivot": [-0.00237, -1.02993, -8.69062], "rotation": [22.5, 0, 0], "uv": { "east": {"uv": [127, 148], "uv_size": [1, 2]}, @@ -3275,8 +3275,8 @@ } }, { - "origin": [-0.55428, -1.36905, -12.47315], - "size": [1.10222, 1.03333, 0.96445], + "origin": [-0.41571, -1.27679, -9.35486], + "size": [0.82667, 0.775, 0.72333], "uv": { "north": {"uv": [127, 144], "uv_size": [2, 2]}, "east": {"uv": [133, 144], "uv_size": [2, 2]}, @@ -3285,9 +3285,9 @@ } }, { - "origin": [0.26248, -1.45324, -12.54204], - "size": [0.27556, 0.34444, 1.10222], - "pivot": [0.40026, -1.03991, -11.99092], + "origin": [0.19686, -1.33993, -9.40653], + "size": [0.20667, 0.25833, 0.82667], + "pivot": [0.3002, -1.02993, -8.99319], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [151, 91], "uv_size": [1, 1]}, @@ -3298,9 +3298,9 @@ } }, { - "origin": [-0.55428, -1.05905, -12.73147], - "size": [1.10222, 0.41333, 0.41333], - "pivot": [-0.00316, -0.54239, -13.09315], + "origin": [-0.41571, -1.04429, -9.54861], + "size": [0.82667, 0.31, 0.31], + "pivot": [-0.00237, -0.65679, -9.81986], "rotation": [45, 0, 0], "uv": { "north": {"uv": [133, 148], "uv_size": [2, 1]}, @@ -3309,9 +3309,9 @@ } }, { - "origin": [-0.55428, -1.74794, -12.05981], - "size": [1.10222, 0.41333, 0.41333], - "pivot": [-0.00316, -0.54239, -13.09315], + "origin": [-0.41571, -1.56096, -9.04486], + "size": [0.82667, 0.31, 0.31], + "pivot": [-0.00237, -0.65679, -9.81986], "rotation": [45, 0, 0], "uv": { "east": {"uv": [151, 93], "uv_size": [1, 1]}, @@ -3321,9 +3321,9 @@ } }, { - "origin": [-0.65165, -5.64017, -12.63958], - "size": [0.19509, 4.27112, 0.19509], - "pivot": [-0.5541, -1.78239, -12.54204], + "origin": [-0.48873, -4.48013, -9.47969], + "size": [0.14632, 3.20334, 0.14632], + "pivot": [-0.41557, -1.58679, -9.40653], "rotation": [0, 45, 0], "uv": { "north": {"uv": [95, 131], "uv_size": [1, 9]}, @@ -3333,9 +3333,9 @@ } }, { - "origin": [-0.26195, -5.64017, -11.69878], - "size": [0.19509, 4.27112, 0.19509], - "pivot": [-0.16441, -1.78239, -11.05012], + "origin": [-0.19647, -4.48013, -8.77408], + "size": [0.14632, 3.20334, 0.14632], + "pivot": [-0.12331, -1.58679, -8.28759], "rotation": [0, 45, 0], "uv": { "east": {"uv": [47, 133], "uv_size": [1, 9]}, @@ -3345,9 +3345,9 @@ } }, { - "origin": [-0.54437, -1.45324, -12.54204], - "size": [0.27556, 0.34444, 1.10222], - "pivot": [-0.40659, -1.03991, -11.99092], + "origin": [-0.40827, -1.33993, -9.40653], + "size": [0.20667, 0.25833, 0.82667], + "pivot": [-0.30494, -1.02993, -8.99319], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [151, 96], "uv_size": [1, 1]}, @@ -3362,18 +3362,18 @@ { "name": "rail", "parent": "gun", - "pivot": [-0.00316, -0.97155, -2.10938] + "pivot": [-0.00237, -0.97866, -1.58203] }, { "name": "bone20", "parent": "rail", - "pivot": [1.38057, 1.83394, -19.32471], + "pivot": [1.03543, 1.12546, -14.49353], "rotation": [0, 0, 90], "cubes": [ { - "origin": [1.63278, 2.05538, -24.27134], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [1.38059, 1.85939, -23.94959], + "origin": [1.22458, 1.29154, -18.20351], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [1.03544, 1.14454, -17.96219], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 127], "uv_size": [1, 1]}, @@ -3382,9 +3382,9 @@ } }, { - "origin": [1.63278, 2.05539, -22.98674], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -22.66498], + "origin": [1.22458, 1.29154, -17.24006], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.99874], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 128], "uv_size": [1, 1]}, @@ -3393,9 +3393,9 @@ } }, { - "origin": [1.63278, 2.05539, -22.34324], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -22.02148], + "origin": [1.22458, 1.29154, -16.75743], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.51611], "rotation": [0, 0, 45], "uv": { "north": {"uv": [130, 153], "uv_size": [1, 1]}, @@ -3404,9 +3404,9 @@ } }, { - "origin": [1.63278, 2.05539, -21.69974], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -21.37798], + "origin": [1.22458, 1.29154, -16.27481], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.03349], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 131], "uv_size": [1, 1]}, @@ -3415,9 +3415,9 @@ } }, { - "origin": [1.63278, 2.05539, -21.05624], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -20.73448], + "origin": [1.22458, 1.29154, -15.79218], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -15.55086], "rotation": [0, 0, 45], "uv": { "north": {"uv": [133, 153], "uv_size": [1, 1]}, @@ -3426,9 +3426,9 @@ } }, { - "origin": [1.63278, 2.05539, -20.41274], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -20.09098], + "origin": [1.22458, 1.29154, -15.30956], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -15.06824], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 134], "uv_size": [1, 1]}, @@ -3437,9 +3437,9 @@ } }, { - "origin": [1.63278, 2.05539, -19.76924], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -19.44748], + "origin": [1.22458, 1.29154, -14.82693], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -14.58561], "rotation": [0, 0, 45], "uv": { "north": {"uv": [136, 153], "uv_size": [1, 1]}, @@ -3448,9 +3448,9 @@ } }, { - "origin": [1.63278, 2.05539, -19.12574], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -18.80398], + "origin": [1.22458, 1.29154, -14.34431], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -14.10299], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 137], "uv_size": [1, 1]}, @@ -3459,9 +3459,9 @@ } }, { - "origin": [1.63278, 2.05539, -18.48224], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -18.16048], + "origin": [1.22458, 1.29154, -13.86168], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -13.62036], "rotation": [0, 0, 45], "uv": { "north": {"uv": [139, 153], "uv_size": [1, 1]}, @@ -3470,9 +3470,9 @@ } }, { - "origin": [1.63278, 2.05539, -17.83874], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [1.38059, 1.85939, -17.51698], + "origin": [1.22458, 1.29154, -13.37906], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [1.03544, 1.14454, -13.13774], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 140], "uv_size": [1, 1]}, @@ -3481,9 +3481,9 @@ } }, { - "origin": [0.90388, 2.05539, -24.27133], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [1.38059, 1.85939, -23.94958], + "origin": [0.67791, 1.29154, -18.2035], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [1.03544, 1.14454, -17.96218], "rotation": [0, 0, -45], "uv": { "north": {"uv": [142, 153], "uv_size": [1, 1]}, @@ -3492,9 +3492,9 @@ } }, { - "origin": [0.90388, 2.05539, -22.98673], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -22.66497], + "origin": [0.67791, 1.29154, -17.24005], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.99873], "rotation": [0, 0, -45], "uv": { "north": {"uv": [143, 153], "uv_size": [1, 1]}, @@ -3503,9 +3503,9 @@ } }, { - "origin": [0.90388, 2.05539, -22.34323], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -22.02147], + "origin": [0.67791, 1.29154, -16.75742], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.5161], "rotation": [0, 0, -45], "uv": { "north": {"uv": [153, 144], "uv_size": [1, 1]}, @@ -3514,9 +3514,9 @@ } }, { - "origin": [0.90388, 2.05539, -21.69973], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -21.37797], + "origin": [0.67791, 1.29154, -16.2748], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -16.03348], "rotation": [0, 0, -45], "uv": { "north": {"uv": [146, 153], "uv_size": [1, 1]}, @@ -3525,9 +3525,9 @@ } }, { - "origin": [0.90388, 2.05539, -21.05623], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -20.73447], + "origin": [0.67791, 1.29154, -15.79217], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -15.55085], "rotation": [0, 0, -45], "uv": { "north": {"uv": [153, 147], "uv_size": [1, 1]}, @@ -3536,9 +3536,9 @@ } }, { - "origin": [0.90388, 2.05539, -20.41273], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -20.09097], + "origin": [0.67791, 1.29154, -15.30955], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -15.06823], "rotation": [0, 0, -45], "uv": { "north": {"uv": [149, 153], "uv_size": [1, 1]}, @@ -3547,9 +3547,9 @@ } }, { - "origin": [0.90388, 2.05539, -19.76923], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -19.44747], + "origin": [0.67791, 1.29154, -14.82692], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -14.5856], "rotation": [0, 0, -45], "uv": { "north": {"uv": [153, 150], "uv_size": [1, 1]}, @@ -3558,9 +3558,9 @@ } }, { - "origin": [0.90388, 2.05539, -19.12573], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -18.80397], + "origin": [0.67791, 1.29154, -14.3443], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -14.10298], "rotation": [0, 0, -45], "uv": { "north": {"uv": [152, 153], "uv_size": [1, 1]}, @@ -3569,9 +3569,9 @@ } }, { - "origin": [0.90388, 2.05539, -18.48223], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [1.38059, 1.85939, -18.16047], + "origin": [0.67791, 1.29154, -13.86167], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [1.03544, 1.14454, -13.62035], "rotation": [0, 0, -45], "uv": { "north": {"uv": [0, 154], "uv_size": [1, 1]}, @@ -3580,9 +3580,9 @@ } }, { - "origin": [0.90388, 2.05539, -17.83873], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [1.38059, 1.85939, -17.51697], + "origin": [0.67791, 1.29154, -13.37905], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [1.03544, 1.14454, -13.13773], "rotation": [0, 0, -45], "uv": { "north": {"uv": [3, 154], "uv_size": [1, 1]}, @@ -3591,8 +3591,8 @@ } }, { - "origin": [0.90491, 1.81985, -17.83873], - "size": [0.95135, 0.15856, 0.45045], + "origin": [0.67868, 1.11489, -13.37905], + "size": [0.71351, 0.11892, 0.33784], "uv": { "north": {"uv": [150, 99], "uv_size": [2, 1]}, "south": {"uv": [150, 100], "uv_size": [2, 1]}, @@ -3600,8 +3600,8 @@ } }, { - "origin": [0.90491, 1.81985, -18.48223], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -13.86167], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 104], "uv_size": [2, 1]}, "south": {"uv": [150, 106], "uv_size": [2, 1]}, @@ -3609,8 +3609,8 @@ } }, { - "origin": [0.90491, 1.81985, -22.34323], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -16.75742], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 109], "uv_size": [2, 1]}, "south": {"uv": [150, 110], "uv_size": [2, 1]}, @@ -3618,8 +3618,8 @@ } }, { - "origin": [0.90491, 1.81985, -19.12573], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -14.3443], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 112], "uv_size": [2, 1]}, "south": {"uv": [150, 113], "uv_size": [2, 1]}, @@ -3627,8 +3627,8 @@ } }, { - "origin": [0.90491, 1.81985, -19.76923], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -14.82692], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 115], "uv_size": [2, 1]}, "south": {"uv": [150, 116], "uv_size": [2, 1]}, @@ -3636,8 +3636,8 @@ } }, { - "origin": [0.90491, 1.81985, -20.41273], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -15.30955], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 120], "uv_size": [2, 1]}, "south": {"uv": [150, 122], "uv_size": [2, 1]}, @@ -3645,8 +3645,8 @@ } }, { - "origin": [0.90491, 1.81985, -21.05623], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -15.79217], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [129, 150], "uv_size": [2, 1]}, "south": {"uv": [131, 150], "uv_size": [2, 1]}, @@ -3654,8 +3654,8 @@ } }, { - "origin": [0.90491, 1.81985, -21.69973], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -16.2748], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 133], "uv_size": [2, 1]}, "south": {"uv": [150, 134], "uv_size": [2, 1]}, @@ -3663,8 +3663,8 @@ } }, { - "origin": [0.90491, 1.81985, -22.98673], - "size": [0.95135, 0.15856, 0.32175], + "origin": [0.67868, 1.11489, -17.24005], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 135], "uv_size": [2, 1]}, "south": {"uv": [137, 150], "uv_size": [2, 1]}, @@ -3672,8 +3672,8 @@ } }, { - "origin": [0.90491, 1.81985, -24.27133], - "size": [0.95135, 0.15856, 0.96525], + "origin": [0.67868, 1.11489, -18.2035], + "size": [0.71351, 0.11892, 0.72394], "uv": { "north": {"uv": [139, 150], "uv_size": [2, 1]}, "south": {"uv": [150, 139], "uv_size": [2, 1]}, @@ -3681,8 +3681,8 @@ } }, { - "origin": [0.90491, 1.45238, -24.27133], - "size": [0.95135, 0.36748, 6.88215], + "origin": [0.67868, 0.83928, -18.2035], + "size": [0.71351, 0.27561, 5.16161], "uv": { "north": {"uv": [150, 140], "uv_size": [2, 1]}, "east": {"uv": [123, 66], "uv_size": [15, 1]}, @@ -3693,9 +3693,9 @@ } }, { - "origin": [0.06786, 1.36114, -24.27135], - "size": [0.00127, 0.22452, 6.88209], - "pivot": [1.32453, -0.64624, -13.29828], + "origin": [0.0509, 0.77085, -18.20351], + "size": [0.00095, 0.16839, 5.16157], + "pivot": [0.9934, -0.73468, -9.97371], "rotation": [0, 0, 45], "uv": { "west": {"uv": [127, 121], "uv_size": [15, 1]}, @@ -3703,8 +3703,8 @@ } }, { - "origin": [0.74655, 1.81839, -24.20674], - "size": [1.26847, 0.00127, 6.81749], + "origin": [0.55991, 1.11379, -18.15506], + "size": [0.95135, 0.00095, 5.11312], "uv": { "north": {"uv": [0, 0], "uv_size": [3, 0]}, "east": {"uv": [0, 0], "uv_size": [15, 0]}, @@ -3715,9 +3715,9 @@ } }, { - "origin": [2.70437, 1.39397, -24.27135], - "size": [0.00127, 0.22452, 6.88209], - "pivot": [1.48309, -0.64625, -13.29828], + "origin": [2.02828, 0.79548, -18.20351], + "size": [0.00095, 0.16839, 5.16157], + "pivot": [1.11232, -0.73469, -9.97371], "rotation": [0, 0, -45], "uv": { "north": {"uv": [0, 0], "uv_size": [0, 1]}, @@ -3732,13 +3732,13 @@ { "name": "bone17", "parent": "rail", - "pivot": [-1.39991, 1.83394, -19.32471], + "pivot": [-1.04993, 1.12546, -14.49353], "rotation": [0, 0, -90], "cubes": [ { - "origin": [-1.87663, 2.05538, -24.27134], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [-1.39992, 1.85939, -23.94959], + "origin": [-1.40747, 1.29154, -18.20351], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [-1.04994, 1.14454, -17.96219], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 127], "uv_size": [-1, 1]}, @@ -3747,9 +3747,9 @@ } }, { - "origin": [-1.87663, 2.05539, -22.98674], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -22.66498], + "origin": [-1.40747, 1.29154, -17.24006], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.99874], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 128], "uv_size": [-1, 1]}, @@ -3758,9 +3758,9 @@ } }, { - "origin": [-1.87663, 2.05539, -22.34324], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -22.02148], + "origin": [-1.40747, 1.29154, -16.75743], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.51611], "rotation": [0, 0, -45], "uv": { "north": {"uv": [131, 153], "uv_size": [-1, 1]}, @@ -3769,9 +3769,9 @@ } }, { - "origin": [-1.87663, 2.05539, -21.69974], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -21.37798], + "origin": [-1.40747, 1.29154, -16.27481], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.03349], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 131], "uv_size": [-1, 1]}, @@ -3780,9 +3780,9 @@ } }, { - "origin": [-1.87663, 2.05539, -21.05624], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -20.73448], + "origin": [-1.40747, 1.29154, -15.79218], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -15.55086], "rotation": [0, 0, -45], "uv": { "north": {"uv": [134, 153], "uv_size": [-1, 1]}, @@ -3791,9 +3791,9 @@ } }, { - "origin": [-1.87663, 2.05539, -20.41274], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -20.09098], + "origin": [-1.40747, 1.29154, -15.30956], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -15.06824], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 134], "uv_size": [-1, 1]}, @@ -3802,9 +3802,9 @@ } }, { - "origin": [-1.87663, 2.05539, -19.76924], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -19.44748], + "origin": [-1.40747, 1.29154, -14.82693], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -14.58561], "rotation": [0, 0, -45], "uv": { "north": {"uv": [137, 153], "uv_size": [-1, 1]}, @@ -3813,9 +3813,9 @@ } }, { - "origin": [-1.87663, 2.05539, -19.12574], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -18.80398], + "origin": [-1.40747, 1.29154, -14.34431], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -14.10299], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 137], "uv_size": [-1, 1]}, @@ -3824,9 +3824,9 @@ } }, { - "origin": [-1.87663, 2.05539, -18.48224], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -18.16048], + "origin": [-1.40747, 1.29154, -13.86168], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -13.62036], "rotation": [0, 0, -45], "uv": { "north": {"uv": [140, 153], "uv_size": [-1, 1]}, @@ -3835,9 +3835,9 @@ } }, { - "origin": [-1.87663, 2.05539, -17.83874], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [-1.39992, 1.85939, -17.51698], + "origin": [-1.40747, 1.29154, -13.37906], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [-1.04994, 1.14454, -13.13774], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 140], "uv_size": [-1, 1]}, @@ -3846,9 +3846,9 @@ } }, { - "origin": [-1.14773, 2.05539, -24.27133], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [-1.39992, 1.85939, -23.94958], + "origin": [-0.8608, 1.29154, -18.2035], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [-1.04994, 1.14454, -17.96218], "rotation": [0, 0, 45], "uv": { "north": {"uv": [143, 153], "uv_size": [-1, 1]}, @@ -3857,9 +3857,9 @@ } }, { - "origin": [-1.14773, 2.05539, -22.98673], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -22.66497], + "origin": [-0.8608, 1.29154, -17.24005], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.99873], "rotation": [0, 0, 45], "uv": { "north": {"uv": [144, 153], "uv_size": [-1, 1]}, @@ -3868,9 +3868,9 @@ } }, { - "origin": [-1.14773, 2.05539, -22.34323], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -22.02147], + "origin": [-0.8608, 1.29154, -16.75742], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.5161], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 144], "uv_size": [-1, 1]}, @@ -3879,9 +3879,9 @@ } }, { - "origin": [-1.14773, 2.05539, -21.69973], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -21.37797], + "origin": [-0.8608, 1.29154, -16.2748], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -16.03348], "rotation": [0, 0, 45], "uv": { "north": {"uv": [147, 153], "uv_size": [-1, 1]}, @@ -3890,9 +3890,9 @@ } }, { - "origin": [-1.14773, 2.05539, -21.05623], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -20.73447], + "origin": [-0.8608, 1.29154, -15.79217], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -15.55085], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 147], "uv_size": [-1, 1]}, @@ -3901,9 +3901,9 @@ } }, { - "origin": [-1.14773, 2.05539, -20.41273], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -20.09097], + "origin": [-0.8608, 1.29154, -15.30955], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -15.06823], "rotation": [0, 0, 45], "uv": { "north": {"uv": [150, 153], "uv_size": [-1, 1]}, @@ -3912,9 +3912,9 @@ } }, { - "origin": [-1.14773, 2.05539, -19.76923], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -19.44747], + "origin": [-0.8608, 1.29154, -14.82692], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -14.5856], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 150], "uv_size": [-1, 1]}, @@ -3923,9 +3923,9 @@ } }, { - "origin": [-1.14773, 2.05539, -19.12573], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -18.80397], + "origin": [-0.8608, 1.29154, -14.3443], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -14.10298], "rotation": [0, 0, 45], "uv": { "north": {"uv": [153, 153], "uv_size": [-1, 1]}, @@ -3934,9 +3934,9 @@ } }, { - "origin": [-1.14773, 2.05539, -18.48223], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [-1.39992, 1.85939, -18.16047], + "origin": [-0.8608, 1.29154, -13.86167], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [-1.04994, 1.14454, -13.62035], "rotation": [0, 0, 45], "uv": { "north": {"uv": [1, 154], "uv_size": [-1, 1]}, @@ -3945,9 +3945,9 @@ } }, { - "origin": [-1.14773, 2.05539, -17.83873], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [-1.39992, 1.85939, -17.51697], + "origin": [-0.8608, 1.29154, -13.37905], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [-1.04994, 1.14454, -13.13773], "rotation": [0, 0, 45], "uv": { "north": {"uv": [4, 154], "uv_size": [-1, 1]}, @@ -3956,8 +3956,8 @@ } }, { - "origin": [-1.8756, 1.81985, -17.83873], - "size": [0.95135, 0.15856, 0.45045], + "origin": [-1.4067, 1.11489, -13.37905], + "size": [0.71351, 0.11892, 0.33784], "uv": { "north": {"uv": [152, 99], "uv_size": [-2, 1]}, "south": {"uv": [152, 100], "uv_size": [-2, 1]}, @@ -3965,8 +3965,8 @@ } }, { - "origin": [-1.8756, 1.81985, -18.48223], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -13.86167], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 104], "uv_size": [-2, 1]}, "south": {"uv": [152, 106], "uv_size": [-2, 1]}, @@ -3974,8 +3974,8 @@ } }, { - "origin": [-1.8756, 1.81985, -22.34323], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -16.75742], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 109], "uv_size": [-2, 1]}, "south": {"uv": [152, 110], "uv_size": [-2, 1]}, @@ -3983,8 +3983,8 @@ } }, { - "origin": [-1.8756, 1.81985, -19.12573], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -14.3443], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 112], "uv_size": [-2, 1]}, "south": {"uv": [152, 113], "uv_size": [-2, 1]}, @@ -3992,8 +3992,8 @@ } }, { - "origin": [-1.8756, 1.81985, -19.76923], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -14.82692], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 115], "uv_size": [-2, 1]}, "south": {"uv": [152, 116], "uv_size": [-2, 1]}, @@ -4001,8 +4001,8 @@ } }, { - "origin": [-1.8756, 1.81985, -20.41273], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -15.30955], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 120], "uv_size": [-2, 1]}, "south": {"uv": [152, 122], "uv_size": [-2, 1]}, @@ -4010,8 +4010,8 @@ } }, { - "origin": [-1.8756, 1.81985, -21.05623], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -15.79217], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [131, 150], "uv_size": [-2, 1]}, "south": {"uv": [133, 150], "uv_size": [-2, 1]}, @@ -4019,8 +4019,8 @@ } }, { - "origin": [-1.8756, 1.81985, -21.69973], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -16.2748], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 133], "uv_size": [-2, 1]}, "south": {"uv": [152, 134], "uv_size": [-2, 1]}, @@ -4028,8 +4028,8 @@ } }, { - "origin": [-1.8756, 1.81985, -22.98673], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-1.4067, 1.11489, -17.24005], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [152, 135], "uv_size": [-2, 1]}, "south": {"uv": [139, 150], "uv_size": [-2, 1]}, @@ -4037,8 +4037,8 @@ } }, { - "origin": [-1.8756, 1.81985, -24.27133], - "size": [0.95135, 0.15856, 0.96525], + "origin": [-1.4067, 1.11489, -18.2035], + "size": [0.71351, 0.11892, 0.72394], "uv": { "north": {"uv": [141, 150], "uv_size": [-2, 1]}, "south": {"uv": [152, 139], "uv_size": [-2, 1]}, @@ -4046,8 +4046,8 @@ } }, { - "origin": [-1.8756, 1.45238, -24.27133], - "size": [0.95135, 0.36748, 6.88215], + "origin": [-1.4067, 0.83928, -18.2035], + "size": [0.71351, 0.27561, 5.16161], "uv": { "north": {"uv": [152, 140], "uv_size": [-2, 1]}, "east": {"uv": [142, 110], "uv_size": [-15, 1]}, @@ -4058,9 +4058,9 @@ } }, { - "origin": [-0.08847, 1.36114, -24.27135], - "size": [0.00127, 0.22452, 6.88209], - "pivot": [-1.34387, -0.64624, -13.29828], + "origin": [-0.06635, 0.77085, -18.20351], + "size": [0.00095, 0.16839, 5.16157], + "pivot": [-1.0079, -0.73468, -9.97371], "rotation": [0, 0, -45], "uv": { "east": {"uv": [142, 121], "uv_size": [-15, 1]}, @@ -4068,8 +4068,8 @@ } }, { - "origin": [-2.03435, 1.81839, -24.20674], - "size": [1.26847, 0.00127, 6.81749], + "origin": [-1.52577, 1.11379, -18.15506], + "size": [0.95135, 0.00095, 5.11312], "uv": { "north": {"uv": [3, 0], "uv_size": [-3, 0]}, "east": {"uv": [15, 0], "uv_size": [-15, 0]}, @@ -4080,9 +4080,9 @@ } }, { - "origin": [-2.72498, 1.39397, -24.27135], - "size": [0.00127, 0.22452, 6.88209], - "pivot": [-1.50243, -0.64625, -13.29828], + "origin": [-2.04373, 0.79548, -18.20351], + "size": [0.00095, 0.16839, 5.16157], + "pivot": [-1.12682, -0.73469, -9.97371], "rotation": [0, 0, 45], "uv": { "north": {"uv": [0, 0], "uv_size": [0, 1]}, @@ -4097,13 +4097,13 @@ { "name": "bone16", "parent": "rail", - "pivot": [0.00665, 0.25588, -17.10565], + "pivot": [0.00498, -0.05809, -12.82924], "rotation": [1, 0, -180], "cubes": [ { - "origin": [0.25885, 0.47182, -24.31634], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [0.00666, 0.27583, -23.99459], + "origin": [0.19414, 0.10387, -18.23726], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [0.00499, -0.04313, -17.99594], "rotation": [0, 0, 45], "uv": { "north": {"uv": [27, 154], "uv_size": [1, 1]}, @@ -4112,9 +4112,9 @@ } }, { - "origin": [0.25885, 0.47182, -23.03174], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -22.70998], + "origin": [0.19414, 0.10387, -17.27381], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -17.03249], "rotation": [0, 0, 45], "uv": { "north": {"uv": [28, 154], "uv_size": [1, 1]}, @@ -4123,9 +4123,9 @@ } }, { - "origin": [0.25885, 0.47182, -22.38824], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -22.06648], + "origin": [0.19414, 0.10387, -16.79118], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -16.54986], "rotation": [0, 0, 45], "uv": { "north": {"uv": [30, 154], "uv_size": [1, 1]}, @@ -4134,9 +4134,9 @@ } }, { - "origin": [0.25885, 0.47182, -21.74474], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -21.42298], + "origin": [0.19414, 0.10387, -16.30856], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -16.06724], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 31], "uv_size": [1, 1]}, @@ -4145,9 +4145,9 @@ } }, { - "origin": [0.25885, 0.47182, -21.10124], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -20.77948], + "origin": [0.19414, 0.10387, -15.82593], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -15.58461], "rotation": [0, 0, 45], "uv": { "north": {"uv": [33, 154], "uv_size": [1, 1]}, @@ -4156,9 +4156,9 @@ } }, { - "origin": [0.25885, 0.47182, -20.45774], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -20.13598], + "origin": [0.19414, 0.10387, -15.34331], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -15.10199], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 34], "uv_size": [1, 1]}, @@ -4167,9 +4167,9 @@ } }, { - "origin": [0.25885, 0.47182, -19.81424], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -19.49248], + "origin": [0.19414, 0.10387, -14.86068], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -14.61936], "rotation": [0, 0, 45], "uv": { "north": {"uv": [36, 154], "uv_size": [1, 1]}, @@ -4178,9 +4178,9 @@ } }, { - "origin": [0.25885, 0.47182, -19.17074], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -18.84898], + "origin": [0.19414, 0.10387, -14.37806], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -14.13674], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 37], "uv_size": [1, 1]}, @@ -4189,9 +4189,9 @@ } }, { - "origin": [0.25885, 0.47182, -18.52724], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -18.20548], + "origin": [0.19414, 0.10387, -13.89543], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -13.65411], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 40], "uv_size": [1, 1]}, @@ -4200,9 +4200,9 @@ } }, { - "origin": [0.25885, 0.47182, -17.88374], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -17.56198], + "origin": [0.19414, 0.10387, -13.41281], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -13.17149], "rotation": [0, 0, 45], "uv": { "north": {"uv": [45, 154], "uv_size": [1, 1]}, @@ -4211,9 +4211,9 @@ } }, { - "origin": [0.25885, 0.47182, -17.24024], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -16.91848], + "origin": [0.19414, 0.10387, -12.93018], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -12.68886], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 46], "uv_size": [1, 1]}, @@ -4222,9 +4222,9 @@ } }, { - "origin": [0.25885, 0.47182, -16.59674], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -16.27498], + "origin": [0.19414, 0.10387, -12.44756], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -12.20624], "rotation": [0, 0, 45], "uv": { "north": {"uv": [48, 154], "uv_size": [1, 1]}, @@ -4233,9 +4233,9 @@ } }, { - "origin": [0.25885, 0.47182, -10.80524], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [0.00666, 0.27583, -10.48348], + "origin": [0.19414, 0.10387, -8.10393], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [0.00499, -0.04313, -7.86261], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 49], "uv_size": [1, 1]}, @@ -4244,9 +4244,9 @@ } }, { - "origin": [-0.47006, 0.47182, -24.31633], - "size": [0.22452, 0.22452, 0.96525], - "pivot": [0.00665, 0.27583, -23.99458], + "origin": [-0.35254, 0.10387, -18.23725], + "size": [0.16839, 0.16839, 0.72394], + "pivot": [0.00499, -0.04313, -17.99593], "rotation": [0, 0, -45], "uv": { "north": {"uv": [51, 154], "uv_size": [1, 1]}, @@ -4255,9 +4255,9 @@ } }, { - "origin": [-0.47005, 0.47182, -23.03173], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -22.70997], + "origin": [-0.35254, 0.10387, -17.2738], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -17.03248], "rotation": [0, 0, -45], "uv": { "north": {"uv": [52, 154], "uv_size": [1, 1]}, @@ -4266,9 +4266,9 @@ } }, { - "origin": [-0.47005, 0.47182, -22.38823], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -22.06647], + "origin": [-0.35254, 0.10387, -16.79117], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -16.54985], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 53], "uv_size": [1, 1]}, @@ -4277,9 +4277,9 @@ } }, { - "origin": [-0.47005, 0.47182, -21.74473], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -21.42297], + "origin": [-0.35254, 0.10387, -16.30855], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -16.06723], "rotation": [0, 0, -45], "uv": { "north": {"uv": [55, 154], "uv_size": [1, 1]}, @@ -4288,9 +4288,9 @@ } }, { - "origin": [-0.47005, 0.47182, -21.10123], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -20.77947], + "origin": [-0.35254, 0.10387, -15.82592], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -15.5846], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 56], "uv_size": [1, 1]}, @@ -4299,9 +4299,9 @@ } }, { - "origin": [-0.47005, 0.47182, -20.45773], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -20.13597], + "origin": [-0.35254, 0.10387, -15.3433], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -15.10198], "rotation": [0, 0, -45], "uv": { "north": {"uv": [58, 154], "uv_size": [1, 1]}, @@ -4310,9 +4310,9 @@ } }, { - "origin": [-0.47005, 0.47182, -19.81423], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -19.49247], + "origin": [-0.35254, 0.10387, -14.86067], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -14.61935], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 59], "uv_size": [1, 1]}, @@ -4321,9 +4321,9 @@ } }, { - "origin": [-0.47005, 0.47182, -19.17073], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -18.84897], + "origin": [-0.35254, 0.10387, -14.37805], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -14.13673], "rotation": [0, 0, -45], "uv": { "north": {"uv": [61, 154], "uv_size": [1, 1]}, @@ -4332,9 +4332,9 @@ } }, { - "origin": [-0.47005, 0.47182, -18.52723], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -18.20547], + "origin": [-0.35254, 0.10387, -13.89542], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -13.6541], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 62], "uv_size": [1, 1]}, @@ -4343,9 +4343,9 @@ } }, { - "origin": [-0.47005, 0.47182, -17.88373], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -17.56197], + "origin": [-0.35254, 0.10387, -13.4128], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -13.17148], "rotation": [0, 0, -45], "uv": { "north": {"uv": [64, 154], "uv_size": [1, 1]}, @@ -4354,9 +4354,9 @@ } }, { - "origin": [-0.47005, 0.47182, -17.24023], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -16.91847], + "origin": [-0.35254, 0.10387, -12.93017], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -12.68885], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 65], "uv_size": [1, 1]}, @@ -4365,9 +4365,9 @@ } }, { - "origin": [-0.47005, 0.47182, -16.59673], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -16.27497], + "origin": [-0.35254, 0.10387, -12.44755], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -12.20623], "rotation": [0, 0, -45], "uv": { "north": {"uv": [67, 154], "uv_size": [1, 1]}, @@ -4376,9 +4376,9 @@ } }, { - "origin": [-0.47005, 0.47182, -10.80523], - "size": [0.22452, 0.22452, 0.45045], - "pivot": [0.00665, 0.27583, -10.48347], + "origin": [-0.35254, 0.10387, -8.10392], + "size": [0.16839, 0.16839, 0.33784], + "pivot": [0.00499, -0.04313, -7.8626], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 68], "uv_size": [1, 1]}, @@ -4387,8 +4387,8 @@ } }, { - "origin": [-0.46902, 0.23629, -10.80523], - "size": [0.95135, 0.15856, 0.45045], + "origin": [-0.35176, -0.07278, -8.10392], + "size": [0.71351, 0.11892, 0.33784], "uv": { "north": {"uv": [150, 146], "uv_size": [2, 1]}, "south": {"uv": [147, 150], "uv_size": [2, 1]}, @@ -4396,8 +4396,8 @@ } }, { - "origin": [-0.46902, 0.23629, -16.59673], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -12.44755], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [150, 149], "uv_size": [2, 1]}, "south": {"uv": [150, 150], "uv_size": [2, 1]}, @@ -4405,8 +4405,8 @@ } }, { - "origin": [-0.46902, 0.23629, -17.24023], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -12.93017], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [2, 151], "uv_size": [2, 1]}, "south": {"uv": [4, 151], "uv_size": [2, 1]}, @@ -4414,8 +4414,8 @@ } }, { - "origin": [-0.46902, 0.23629, -17.88373], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -13.4128], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 6], "uv_size": [2, 1]}, "south": {"uv": [151, 7], "uv_size": [2, 1]}, @@ -4423,8 +4423,8 @@ } }, { - "origin": [-0.46902, 0.23629, -18.52723], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -13.89542], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 9], "uv_size": [2, 1]}, "south": {"uv": [10, 151], "uv_size": [2, 1]}, @@ -4432,8 +4432,8 @@ } }, { - "origin": [-0.46902, 0.23629, -22.38823], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -16.79117], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 16], "uv_size": [2, 1]}, "south": {"uv": [17, 151], "uv_size": [2, 1]}, @@ -4441,8 +4441,8 @@ } }, { - "origin": [-0.46902, 0.23629, -19.17073], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -14.37805], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 20], "uv_size": [2, 1]}, "south": {"uv": [151, 21], "uv_size": [2, 1]}, @@ -4450,8 +4450,8 @@ } }, { - "origin": [-0.46902, 0.23629, -19.81423], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -14.86067], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 24], "uv_size": [2, 1]}, "south": {"uv": [25, 151], "uv_size": [2, 1]}, @@ -4459,8 +4459,8 @@ } }, { - "origin": [-0.46902, 0.23629, -20.45773], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -15.3433], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 26], "uv_size": [2, 1]}, "south": {"uv": [27, 151], "uv_size": [2, 1]}, @@ -4468,8 +4468,8 @@ } }, { - "origin": [-0.46902, 0.23629, -21.10123], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -15.82592], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [30, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 30], "uv_size": [2, 1]}, @@ -4477,8 +4477,8 @@ } }, { - "origin": [-0.46902, 0.23629, -21.74473], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -16.30855], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [32, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 32], "uv_size": [2, 1]}, @@ -4486,8 +4486,8 @@ } }, { - "origin": [-0.46902, 0.23629, -23.03173], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -17.2738], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [34, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 34], "uv_size": [2, 1]}, @@ -4495,9 +4495,9 @@ } }, { - "origin": [0.25885, 0.47182, -15.95324], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -15.63148], + "origin": [0.19414, 0.10387, -11.96493], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -11.72361], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 92], "uv_size": [1, 1]}, @@ -4506,9 +4506,9 @@ } }, { - "origin": [0.25885, 0.47182, -15.30974], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -14.98798], + "origin": [0.19414, 0.10387, -11.48231], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -11.24099], "rotation": [0, 0, 45], "uv": { "north": {"uv": [91, 154], "uv_size": [1, 1]}, @@ -4517,9 +4517,9 @@ } }, { - "origin": [0.25885, 0.47182, -14.66624], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -14.34448], + "origin": [0.19414, 0.10387, -10.99968], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -10.75836], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 89], "uv_size": [1, 1]}, @@ -4528,9 +4528,9 @@ } }, { - "origin": [0.25885, 0.47182, -14.02274], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -13.70098], + "origin": [0.19414, 0.10387, -10.51706], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -10.27574], "rotation": [0, 0, 45], "uv": { "north": {"uv": [88, 154], "uv_size": [1, 1]}, @@ -4539,9 +4539,9 @@ } }, { - "origin": [0.25885, 0.47182, -13.37924], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -13.05748], + "origin": [0.19414, 0.10387, -10.03443], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -9.79311], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 86], "uv_size": [1, 1]}, @@ -4550,9 +4550,9 @@ } }, { - "origin": [0.25885, 0.47182, -12.73574], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -12.41398], + "origin": [0.19414, 0.10387, -9.55181], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -9.31049], "rotation": [0, 0, 45], "uv": { "north": {"uv": [85, 154], "uv_size": [1, 1]}, @@ -4561,9 +4561,9 @@ } }, { - "origin": [0.25885, 0.47182, -12.09224], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -11.77048], + "origin": [0.19414, 0.10387, -9.06918], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -8.82786], "rotation": [0, 0, 45], "uv": { "north": {"uv": [154, 83], "uv_size": [1, 1]}, @@ -4572,9 +4572,9 @@ } }, { - "origin": [0.25885, 0.47182, -11.44874], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00666, 0.27583, -11.12698], + "origin": [0.19414, 0.10387, -8.58656], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -8.34524], "rotation": [0, 0, 45], "uv": { "north": {"uv": [82, 154], "uv_size": [1, 1]}, @@ -4583,9 +4583,9 @@ } }, { - "origin": [-0.47005, 0.47182, -15.95323], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -15.63147], + "origin": [-0.35254, 0.10387, -11.96492], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -11.7236], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 80], "uv_size": [1, 1]}, @@ -4594,9 +4594,9 @@ } }, { - "origin": [-0.47005, 0.47182, -15.30973], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -14.98797], + "origin": [-0.35254, 0.10387, -11.4823], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -11.24098], "rotation": [0, 0, -45], "uv": { "north": {"uv": [79, 154], "uv_size": [1, 1]}, @@ -4605,9 +4605,9 @@ } }, { - "origin": [-0.47005, 0.47182, -14.66623], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -14.34447], + "origin": [-0.35254, 0.10387, -10.99967], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -10.75835], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 77], "uv_size": [1, 1]}, @@ -4616,9 +4616,9 @@ } }, { - "origin": [-0.47005, 0.47182, -14.02273], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -13.70097], + "origin": [-0.35254, 0.10387, -10.51705], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -10.27573], "rotation": [0, 0, -45], "uv": { "north": {"uv": [76, 154], "uv_size": [1, 1]}, @@ -4627,9 +4627,9 @@ } }, { - "origin": [-0.47005, 0.47182, -13.37923], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -13.05747], + "origin": [-0.35254, 0.10387, -10.03442], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -9.7931], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 74], "uv_size": [1, 1]}, @@ -4638,9 +4638,9 @@ } }, { - "origin": [-0.47005, 0.47182, -12.73573], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -12.41397], + "origin": [-0.35254, 0.10387, -9.5518], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -9.31048], "rotation": [0, 0, -45], "uv": { "north": {"uv": [73, 154], "uv_size": [1, 1]}, @@ -4649,9 +4649,9 @@ } }, { - "origin": [-0.47005, 0.47182, -12.09223], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -11.77047], + "origin": [-0.35254, 0.10387, -9.06917], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -8.82785], "rotation": [0, 0, -45], "uv": { "north": {"uv": [154, 71], "uv_size": [1, 1]}, @@ -4660,9 +4660,9 @@ } }, { - "origin": [-0.47005, 0.47182, -11.44873], - "size": [0.22452, 0.22452, 0.32175], - "pivot": [0.00665, 0.27583, -11.12697], + "origin": [-0.35254, 0.10387, -8.58655], + "size": [0.16839, 0.16839, 0.24131], + "pivot": [0.00499, -0.04313, -8.34523], "rotation": [0, 0, -45], "uv": { "north": {"uv": [70, 154], "uv_size": [1, 1]}, @@ -4671,8 +4671,8 @@ } }, { - "origin": [-0.46902, 0.23629, -11.44873], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -8.58655], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 60], "uv_size": [2, 1]}, "south": {"uv": [61, 151], "uv_size": [2, 1]}, @@ -4680,8 +4680,8 @@ } }, { - "origin": [-0.46902, 0.23629, -15.30973], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -11.4823], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 58], "uv_size": [2, 1]}, "south": {"uv": [59, 151], "uv_size": [2, 1]}, @@ -4689,8 +4689,8 @@ } }, { - "origin": [-0.46902, 0.23629, -12.09223], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -9.06917], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 56], "uv_size": [2, 1]}, "south": {"uv": [57, 151], "uv_size": [2, 1]}, @@ -4698,8 +4698,8 @@ } }, { - "origin": [-0.46902, 0.23629, -12.73573], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -9.5518], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 54], "uv_size": [2, 1]}, "south": {"uv": [55, 151], "uv_size": [2, 1]}, @@ -4707,8 +4707,8 @@ } }, { - "origin": [-0.46902, 0.23629, -13.37923], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -10.03442], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [51, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 51], "uv_size": [2, 1]}, @@ -4716,8 +4716,8 @@ } }, { - "origin": [-0.46902, 0.23629, -14.02273], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -10.51705], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [49, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 49], "uv_size": [2, 1]}, @@ -4725,8 +4725,8 @@ } }, { - "origin": [-0.46902, 0.23629, -14.66623], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -10.99967], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 45], "uv_size": [2, 1]}, "south": {"uv": [47, 151], "uv_size": [2, 1]}, @@ -4734,8 +4734,8 @@ } }, { - "origin": [-0.46902, 0.23629, -15.95323], - "size": [0.95135, 0.15856, 0.32175], + "origin": [-0.35176, -0.07278, -11.96492], + "size": [0.71351, 0.11892, 0.24131], "uv": { "north": {"uv": [151, 39], "uv_size": [2, 1]}, "south": {"uv": [151, 40], "uv_size": [2, 1]}, @@ -4743,8 +4743,8 @@ } }, { - "origin": [-0.46902, 0.23629, -24.31633], - "size": [0.95135, 0.15856, 0.96525], + "origin": [-0.35176, -0.07278, -18.23725], + "size": [0.71351, 0.11892, 0.72394], "uv": { "north": {"uv": [36, 151], "uv_size": [2, 1]}, "south": {"uv": [151, 36], "uv_size": [2, 1]}, @@ -4752,8 +4752,8 @@ } }, { - "origin": [-0.46902, -0.13119, -24.31633], - "size": [0.95135, 0.36748, 13.95945], + "origin": [-0.35176, -0.34839, -18.23725], + "size": [0.71351, 0.27561, 10.46959], "uv": { "north": {"uv": [151, 37], "uv_size": [2, 1]}, "east": {"uv": [105, 79], "uv_size": [31, 1]}, @@ -4764,9 +4764,9 @@ } }, { - "origin": [-1.30607, -0.22242, -24.31635], - "size": [0.00127, 0.22452, 13.9594], - "pivot": [-0.0494, -2.2298, -13.34328], + "origin": [-0.97955, -0.41682, -18.23726], + "size": [0.00095, 0.16839, 10.46955], + "pivot": [-0.03705, -1.92235, -10.00746], "rotation": [0, 0, 45], "uv": { "west": {"uv": [105, 81], "uv_size": [31, 1]}, @@ -4774,8 +4774,8 @@ } }, { - "origin": [-0.62738, 0.23482, -24.25174], - "size": [1.26847, 0.00127, 13.89479], + "origin": [-0.47053, -0.07388, -18.18881], + "size": [0.95135, 0.00095, 10.4211], "uv": { "north": {"uv": [0, 0], "uv_size": [3, 0]}, "east": {"uv": [0, 0], "uv_size": [31, 0]}, @@ -4786,9 +4786,9 @@ } }, { - "origin": [1.33044, -0.1896, -24.31635], - "size": [0.00127, 0.22452, 13.9594], - "pivot": [0.10916, -2.22981, -13.34328], + "origin": [0.99783, -0.3922, -18.23726], + "size": [0.00095, 0.16839, 10.46955], + "pivot": [0.08187, -1.92236, -10.00746], "rotation": [0, 0, -45], "uv": { "north": {"uv": [0, 0], "uv_size": [0, 1]}, @@ -4803,12 +4803,12 @@ { "name": "bone14", "parent": "rail", - "pivot": [-0.00027, 1.83654, -21.22422], + "pivot": [-0.0002, 1.1274, -15.91817], "cubes": [ { - "origin": [-0.22101, 0.72152, -21.43233], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.16576, 0.29114, -16.07424], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [100, 143], "uv_size": [1, 5]}, @@ -4820,9 +4820,9 @@ } }, { - "origin": [-0.22128, 0.72192, -21.43233], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.16596, 0.29144, -16.07424], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, 45], "uv": { "north": {"uv": [0, 144], "uv_size": [1, 5]}, @@ -4834,9 +4834,9 @@ } }, { - "origin": [-0.22128, 0.72375, -21.43233], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.16596, 0.29281, -16.07424], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, -45], "uv": { "north": {"uv": [140, 143], "uv_size": [1, 5]}, @@ -4848,9 +4848,9 @@ } }, { - "origin": [-0.22101, 0.72415, -21.43233], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.16576, 0.29311, -16.07424], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [131, 143], "uv_size": [1, 5]}, @@ -4862,8 +4862,8 @@ } }, { - "origin": [-0.22229, 0.72435, -21.43233], - "size": [0.44377, 2.22741, 0.5062], + "origin": [-0.16671, 0.29326, -16.07424], + "size": [0.33283, 1.67055, 0.37965], "uv": { "north": {"uv": [120, 143], "uv_size": [1, 5]}, "east": {"uv": [121, 143], "uv_size": [1, 5]}, @@ -4874,9 +4874,9 @@ } }, { - "origin": [-1.11462, 1.61418, -21.43233], - "size": [2.22741, 0.44377, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.83596, 0.96063, -16.07424], + "size": [1.67055, 0.33283, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [143, 134], "uv_size": [5, 1]}, @@ -4888,8 +4888,8 @@ } }, { - "origin": [-1.11452, 1.61465, -21.43233], - "size": [2.22741, 0.44377, 0.5062], + "origin": [-0.83589, 0.96099, -16.07424], + "size": [1.67055, 0.33283, 0.37965], "uv": { "north": {"uv": [143, 122], "uv_size": [5, 1]}, "east": {"uv": [8, 154], "uv_size": [1, 1]}, @@ -4900,9 +4900,9 @@ } }, { - "origin": [-1.11462, 1.61512, -21.43233], - "size": [2.22741, 0.44377, 0.5062], - "pivot": [-0.00027, 1.83654, -21.22422], + "origin": [-0.83596, 0.96134, -16.07424], + "size": [1.67055, 0.33283, 0.37965], + "pivot": [-0.0002, 1.1274, -15.91817], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [110, 143], "uv_size": [5, 1]}, @@ -4918,12 +4918,12 @@ { "name": "bone15", "parent": "rail", - "pivot": [-0.00027, 1.83654, -24.05922], + "pivot": [-0.0002, 1.1274, -18.04442], "cubes": [ { - "origin": [-0.22101, 0.72152, -24.26733], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.16576, 0.29114, -18.20049], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [4, 144], "uv_size": [1, 5]}, @@ -4935,9 +4935,9 @@ } }, { - "origin": [-0.22128, 0.72192, -24.26733], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.16596, 0.29144, -18.20049], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, 45], "uv": { "north": {"uv": [8, 144], "uv_size": [1, 5]}, @@ -4949,9 +4949,9 @@ } }, { - "origin": [-0.22128, 0.72375, -24.26733], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.16596, 0.29281, -18.20049], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, -45], "uv": { "north": {"uv": [50, 144], "uv_size": [1, 5]}, @@ -4963,9 +4963,9 @@ } }, { - "origin": [-0.22101, 0.72415, -24.26733], - "size": [0.44377, 2.22741, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.16576, 0.29311, -18.20049], + "size": [0.33283, 1.67055, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [71, 144], "uv_size": [1, 5]}, @@ -4977,8 +4977,8 @@ } }, { - "origin": [-0.22229, 0.72435, -24.26733], - "size": [0.44377, 2.22741, 0.5062], + "origin": [-0.16671, 0.29326, -18.20049], + "size": [0.33283, 1.67055, 0.37965], "uv": { "north": {"uv": [90, 144], "uv_size": [1, 5]}, "east": {"uv": [91, 144], "uv_size": [1, 5]}, @@ -4989,9 +4989,9 @@ } }, { - "origin": [-1.11462, 1.61418, -24.26733], - "size": [2.22741, 0.44377, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.83596, 0.96063, -18.20049], + "size": [1.67055, 0.33283, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [144, 14], "uv_size": [5, 1]}, @@ -5003,8 +5003,8 @@ } }, { - "origin": [-1.11452, 1.61465, -24.26733], - "size": [2.22741, 0.44377, 0.5062], + "origin": [-0.83589, 0.96099, -18.20049], + "size": [1.67055, 0.33283, 0.37965], "uv": { "north": {"uv": [144, 48], "uv_size": [5, 1]}, "east": {"uv": [24, 154], "uv_size": [1, 1]}, @@ -5015,9 +5015,9 @@ } }, { - "origin": [-1.11462, 1.61512, -24.26733], - "size": [2.22741, 0.44377, 0.5062], - "pivot": [-0.00027, 1.83654, -24.05922], + "origin": [-0.83596, 0.96134, -18.20049], + "size": [1.67055, 0.33283, 0.37965], + "pivot": [-0.0002, 1.1274, -18.04442], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [144, 74], "uv_size": [5, 1]}, @@ -5030,46 +5030,26 @@ } ] }, - { - "name": "Rightarm", - "parent": "0", - "pivot": [-1.07481, -4.54143, 9.82165], - "rotation": [-101.81106, -12.40003, -2.46982], - "cubes": [ - { - "origin": [-3.41481, -11.56143, 7.48165], - "size": [4.68, 14.04, 4.68], - "uv": { - "north": {"uv": [0, 14], "uv_size": [10, 31]}, - "east": {"uv": [10, 14], "uv_size": [10, 31]}, - "south": {"uv": [20, 14], "uv_size": [10, 31]}, - "west": {"uv": [30, 14], "uv_size": [10, 31]}, - "up": {"uv": [75, 0], "uv_size": [10, 10]}, - "down": {"uv": [75, 31], "uv_size": [10, -10]} - } - } - ] - }, { "name": "magazine", "parent": "0", - "pivot": [0, -3.7, -0.9] + "pivot": [0, -3.025, -0.675] }, { "name": "bone13", "parent": "magazine", - "pivot": [0, -8.56, 4.68], + "pivot": [0, -6.67, 3.51], "rotation": [-2, 0, 0] }, { "name": "bone11", "parent": "bone13", - "pivot": [-0.07107, -3.66413, 0.48065], + "pivot": [-0.0533, -2.9981, 0.36049], "cubes": [ { - "origin": [-0.69203, -1.14637, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [-0.51902, -1.10978, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [139, 61], "uv_size": [4, 2]}, @@ -5081,9 +5061,9 @@ } }, { - "origin": [-0.31871, -1.6186, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [-0.23903, -1.46395, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, 45], "uv": { "north": {"uv": [139, 97], "uv_size": [4, 2]}, @@ -5095,9 +5075,9 @@ } }, { - "origin": [-0.49284, -6.50498, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [-0.36963, -5.12874, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, -45], "uv": { "north": {"uv": [139, 103], "uv_size": [4, 2]}, @@ -5109,9 +5089,9 @@ } }, { - "origin": [-0.78627, -7.0306, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [-0.5897, -5.52295, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [139, 119], "uv_size": [4, 2]}, @@ -5123,8 +5103,8 @@ } }, { - "origin": [-0.86109, -0.55546, -0.0247], - "size": [1.58004, 0.85666, 0.6957], + "origin": [-0.64582, -0.66659, -0.01852], + "size": [1.18503, 0.6425, 0.52178], "uv": { "north": {"uv": [139, 135], "uv_size": [4, 2]}, "east": {"uv": [147, 51], "uv_size": [2, 2]}, @@ -5135,9 +5115,9 @@ } }, { - "origin": [3.10605, -3.86166, -0.0247], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [2.32954, -3.14625, -0.01852], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [48, 139], "uv_size": [2, 4]}, @@ -5149,8 +5129,8 @@ } }, { - "origin": [3.03611, -4.45956, -0.0247], - "size": [0.85666, 1.58004, 0.6957], + "origin": [2.27709, -3.59467, -0.01852], + "size": [0.6425, 1.18503, 0.52178], "uv": { "north": {"uv": [7, 140], "uv_size": [2, 4]}, "east": {"uv": [140, 18], "uv_size": [2, 4]}, @@ -5161,9 +5141,9 @@ } }, { - "origin": [3.2003, -5.0387, -0.0247], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [1.47169, -3.54639, 0.61565], + "origin": [2.40022, -4.02902, -0.01852], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [1.10377, -2.9098, 0.46174], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [140, 78], "uv_size": [2, 4]}, @@ -5175,9 +5155,9 @@ } }, { - "origin": [-3.87178, -7.26607, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-2.90383, -5.69955, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [140, 37], "uv_size": [4, 2]}, @@ -5189,9 +5169,9 @@ } }, { - "origin": [-3.57835, -6.74045, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-2.68376, -5.30534, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, 135], "uv": { "north": {"uv": [140, 93], "uv_size": [4, 2]}, @@ -5203,9 +5183,9 @@ } }, { - "origin": [0.11479, -5.27417, -0.0247], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [0.08609, -4.20562, -0.01852], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, -157.5], "uv": { "north": {"uv": [94, 140], "uv_size": [2, 4]}, @@ -5217,9 +5197,9 @@ } }, { - "origin": [-0.0494, -4.69503, -0.0247], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-0.03705, -3.77127, -0.01852], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, -180], "uv": { "north": {"uv": [137, 140], "uv_size": [2, 4]}, @@ -5231,9 +5211,9 @@ } }, { - "origin": [0.02054, -4.09713, -0.0247], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [0.01541, -3.32285, -0.01852], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [23, 141], "uv_size": [2, 4]}, @@ -5245,9 +5225,9 @@ } }, { - "origin": [-3.40422, -1.85407, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-2.55316, -1.64055, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, -135], "uv": { "north": {"uv": [141, 55], "uv_size": [4, 2]}, @@ -5259,9 +5239,9 @@ } }, { - "origin": [-3.77754, -1.38184, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-2.83315, -1.28638, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, -157.5], "uv": { "north": {"uv": [99, 141], "uv_size": [4, 2]}, @@ -5273,9 +5253,9 @@ } }, { - "origin": [-3.9466, -0.79093, -0.0247], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, 0.61565], + "origin": [-2.95995, -0.8432, -0.01852], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, 0.46174], "rotation": [0, 0, -180], "uv": { "north": {"uv": [141, 123], "uv_size": [4, 2]}, @@ -5291,12 +5271,12 @@ { "name": "bone12", "parent": "bone13", - "pivot": [-0.07107, -3.66413, -2.17435], + "pivot": [-0.0533, -2.9981, -1.63076], "cubes": [ { - "origin": [-0.69203, -1.14637, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [-0.51902, -1.10978, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [135, 83], "uv_size": [4, 2]}, @@ -5308,9 +5288,9 @@ } }, { - "origin": [-0.31871, -1.6186, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [-0.23903, -1.46395, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, 45], "uv": { "north": {"uv": [135, 103], "uv_size": [4, 2]}, @@ -5322,9 +5302,9 @@ } }, { - "origin": [-0.49284, -6.50498, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [-0.36963, -5.12874, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, -45], "uv": { "north": {"uv": [135, 119], "uv_size": [4, 2]}, @@ -5336,9 +5316,9 @@ } }, { - "origin": [-0.78627, -7.0306, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [-0.5897, -5.52295, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [136, 14], "uv_size": [4, 2]}, @@ -5350,8 +5330,8 @@ } }, { - "origin": [-0.86109, -0.55546, -2.6797], - "size": [1.58004, 0.85666, 0.6957], + "origin": [-0.64582, -0.66659, -2.00977], + "size": [1.18503, 0.6425, 0.52178], "uv": { "north": {"uv": [136, 70], "uv_size": [4, 2]}, "east": {"uv": [145, 127], "uv_size": [2, 2]}, @@ -5362,9 +5342,9 @@ } }, { - "origin": [3.10605, -3.86166, -2.6797], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [2.32954, -3.14625, -2.00977], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [86, 135], "uv_size": [2, 4]}, @@ -5376,8 +5356,8 @@ } }, { - "origin": [3.03611, -4.45956, -2.6797], - "size": [0.85666, 1.58004, 0.6957], + "origin": [2.27709, -3.59467, -2.00977], + "size": [0.6425, 1.18503, 0.52178], "uv": { "north": {"uv": [88, 136], "uv_size": [2, 4]}, "east": {"uv": [90, 136], "uv_size": [2, 4]}, @@ -5388,9 +5368,9 @@ } }, { - "origin": [3.2003, -5.0387, -2.6797], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [1.47169, -3.54639, -2.03935], + "origin": [2.40022, -4.02902, -2.00977], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [1.10377, -2.9098, -1.52951], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [127, 136], "uv_size": [2, 4]}, @@ -5402,9 +5382,9 @@ } }, { - "origin": [-3.87178, -7.26607, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-2.90383, -5.69955, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [139, 39], "uv_size": [4, 2]}, @@ -5416,9 +5396,9 @@ } }, { - "origin": [-3.57835, -6.74045, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-2.68376, -5.30534, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, 135], "uv": { "north": {"uv": [137, 129], "uv_size": [4, 2]}, @@ -5430,9 +5410,9 @@ } }, { - "origin": [0.11479, -5.27417, -2.6797], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [0.08609, -4.20562, -2.00977], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, -157.5], "uv": { "north": {"uv": [45, 138], "uv_size": [2, 4]}, @@ -5444,9 +5424,9 @@ } }, { - "origin": [-0.0494, -4.69503, -2.6797], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-0.03705, -3.77127, -2.00977], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, -180], "uv": { "north": {"uv": [5, 138], "uv_size": [2, 4]}, @@ -5458,9 +5438,9 @@ } }, { - "origin": [0.02054, -4.09713, -2.6797], - "size": [0.85666, 1.58004, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [0.01541, -3.32285, -2.00977], + "size": [0.6425, 1.18503, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, 157.5], "uv": { "north": {"uv": [78, 137], "uv_size": [2, 4]}, @@ -5472,9 +5452,9 @@ } }, { - "origin": [-3.40422, -1.85407, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-2.55316, -1.64055, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, -135], "uv": { "north": {"uv": [109, 137], "uv_size": [4, 2]}, @@ -5486,9 +5466,9 @@ } }, { - "origin": [-3.77754, -1.38184, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-2.83315, -1.28638, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, -157.5], "uv": { "north": {"uv": [25, 137], "uv_size": [4, 2]}, @@ -5500,9 +5480,9 @@ } }, { - "origin": [-3.9466, -0.79093, -2.6797], - "size": [1.58004, 0.85666, 0.6957], - "pivot": [-1.61382, -3.78186, -2.03935], + "origin": [-2.95995, -0.8432, -2.00977], + "size": [1.18503, 0.6425, 0.52178], + "pivot": [-1.21037, -3.0864, -1.52951], "rotation": [0, 0, -180], "uv": { "north": {"uv": [136, 81], "uv_size": [4, 2]}, @@ -5518,12 +5498,12 @@ { "name": "bone9", "parent": "bone13", - "pivot": [-0.00797, -3.69377, -0.0463], + "pivot": [-0.00597, -3.02033, -0.03472], "cubes": [ { - "origin": [-2.62552, -4.17728, -2.68399], - "size": [5.10693, 1.01746, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-1.96914, -3.38296, -2.01299], + "size": [3.83019, 0.7631, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [112, 65], "uv_size": [11, 2]}, @@ -5535,9 +5515,9 @@ } }, { - "origin": [-0.84888, -7.60435, -2.5416], - "size": [1.56533, 7.85681, 3.13476], - "pivot": [-0.06622, -3.66964, 0.0887], + "origin": [-0.63666, -5.95326, -1.9062], + "size": [1.174, 5.89261, 2.35107], + "pivot": [-0.04967, -3.00223, 0.06653], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [99, 68], "uv_size": [3, 17]}, @@ -5549,8 +5529,8 @@ } }, { - "origin": [-2.62531, -4.17837, -2.68399], - "size": [5.10693, 1.01746, 3.41824], + "origin": [-1.96898, -3.38378, -2.01299], + "size": [3.83019, 0.7631, 2.56368], "uv": { "north": {"uv": [117, 20], "uv_size": [11, 2]}, "east": {"uv": [124, 76], "uv_size": [8, 2]}, @@ -5561,9 +5541,9 @@ } }, { - "origin": [-2.62553, -4.17946, -2.68399], - "size": [5.10693, 1.01746, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-1.96915, -3.38459, -2.01299], + "size": [3.83019, 0.7631, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [119, 57], "uv_size": [11, 2]}, @@ -5575,8 +5555,8 @@ } }, { - "origin": [-0.57962, -6.21962, -2.68399], - "size": [1.01746, 5.10693, 3.41824], + "origin": [-0.43471, -4.91472, -2.01299], + "size": [0.7631, 3.83019, 2.56368], "uv": { "north": {"uv": [21, 118], "uv_size": [2, 11]}, "east": {"uv": [88, 87], "uv_size": [8, 11]}, @@ -5587,9 +5567,9 @@ } }, { - "origin": [-0.57669, -6.22008, -2.68399], - "size": [1.01746, 5.10693, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-0.43252, -4.91506, -2.01299], + "size": [0.7631, 3.83019, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [25, 118], "uv_size": [2, 11]}, @@ -5601,9 +5581,9 @@ } }, { - "origin": [-0.57731, -6.221, -2.68399], - "size": [1.01746, 5.10693, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-0.43298, -4.91575, -2.01299], + "size": [0.7631, 3.83019, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, -45], "uv": { "north": {"uv": [30, 118], "uv_size": [2, 11]}, @@ -5615,9 +5595,9 @@ } }, { - "origin": [-0.57731, -6.22519, -2.68399], - "size": [1.01746, 5.10693, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-0.43298, -4.91889, -2.01299], + "size": [0.7631, 3.83019, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, 45], "uv": { "north": {"uv": [34, 118], "uv_size": [2, 11]}, @@ -5629,9 +5609,9 @@ } }, { - "origin": [-0.57669, -6.22611, -2.68399], - "size": [1.01746, 5.10693, 3.41824], - "pivot": [-0.07058, -3.66964, -2.4966], + "origin": [-0.43252, -4.91958, -2.01299], + "size": [0.7631, 3.83019, 2.56368], + "pivot": [-0.05293, -3.00223, -1.87245], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [78, 118], "uv_size": [2, 11]}, @@ -5643,9 +5623,9 @@ } }, { - "origin": [-4.00573, -4.47643, -2.5416], - "size": [7.85681, 1.56533, 3.13476], - "pivot": [-0.00797, -3.69377, 0.0887], + "origin": [-3.0043, -3.60732, -1.9062], + "size": [5.89261, 1.174, 2.35107], + "pivot": [-0.00597, -3.02033, 0.06653], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [103, 91], "uv_size": [17, 3]}, @@ -5657,8 +5637,8 @@ } }, { - "origin": [-4.00093, -4.45231, -2.5416], - "size": [7.85681, 1.56533, 3.13476], + "origin": [-3.0007, -3.58923, -1.9062], + "size": [5.89261, 1.174, 2.35107], "uv": { "north": {"uv": [103, 85], "uv_size": [17, 3]}, "east": {"uv": [121, 73], "uv_size": [7, 3]}, @@ -5669,9 +5649,9 @@ } }, { - "origin": [-4.59132, -1.48425, -2.5416], - "size": [7.85681, 1.56533, 3.13476], - "pivot": [7.09931, -0.70158, 0.0887], + "origin": [-3.44349, -1.36319, -1.9062], + "size": [5.89261, 1.174, 2.35107], + "pivot": [5.32448, -0.77619, 0.06653], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [98, 57], "uv_size": [17, 3]}, @@ -5683,8 +5663,8 @@ } }, { - "origin": [-0.85372, -7.59269, -2.5416], - "size": [1.56533, 7.85681, 3.13476], + "origin": [-0.64029, -5.94452, -1.9062], + "size": [1.174, 5.89261, 2.35107], "uv": { "north": {"uv": [102, 68], "uv_size": [3, 17]}, "east": {"uv": [59, 69], "uv_size": [7, 17]}, @@ -5695,9 +5675,9 @@ } }, { - "origin": [-0.84888, -7.59173, -2.5416], - "size": [1.56533, 7.85681, 3.13476], - "pivot": [-0.06622, -3.66964, 0.0887], + "origin": [-0.63666, -5.9438, -1.9062], + "size": [1.174, 5.89261, 2.35107], + "pivot": [-0.04967, -3.00223, 0.06653], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [30, 101], "uv_size": [3, 17]}, @@ -5709,9 +5689,9 @@ } }, { - "origin": [-0.84888, -7.59173, -2.5416], - "size": [1.56533, 7.85681, 3.13476], - "pivot": [-0.06622, -3.66964, 0.0887], + "origin": [-0.63666, -5.9438, -1.9062], + "size": [1.174, 5.89261, 2.35107], + "pivot": [-0.04967, -3.00223, 0.06653], "rotation": [0, 0, -45], "uv": { "north": {"uv": [23, 101], "uv_size": [3, 17]}, @@ -5723,9 +5703,9 @@ } }, { - "origin": [-0.84888, -7.60435, -2.5416], - "size": [1.56533, 7.85681, 3.13476], - "pivot": [-0.06622, -3.66964, 0.0887], + "origin": [-0.63666, -5.95326, -1.9062], + "size": [1.174, 5.89261, 2.35107], + "pivot": [-0.04967, -3.00223, 0.06653], "rotation": [0, 0, 45], "uv": { "north": {"uv": [17, 101], "uv_size": [3, 17]}, @@ -5741,12 +5721,12 @@ { "name": "bone10", "parent": "bone13", - "pivot": [-0.49915, 1.86612, -0.89755], + "pivot": [-0.37436, 1.14959, -0.67316], "cubes": [ { - "origin": [0.4353, 1.31122, -2.0168], - "size": [0.17809, 0.54228, 2.67989], - "pivot": [0.49282, 1.86612, -0.89755], + "origin": [0.32648, 0.73342, -1.5126], + "size": [0.13357, 0.40671, 2.00992], + "pivot": [0.36962, 1.14959, -0.67316], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [71, 151], "uv_size": [1, 1]}, @@ -5758,9 +5738,9 @@ } }, { - "origin": [0.38594, 0.13848, -2.60504], - "size": [0.35675, 1.26112, 0.35675], - "pivot": [0.56431, 0.26459, -2.42666], + "origin": [0.28945, -0.14614, -1.95378], + "size": [0.26756, 0.94584, 0.26756], + "pivot": [0.42323, -0.05156, -1.82], "rotation": [0, -45, 0], "uv": { "north": {"uv": [133, 137], "uv_size": [1, 3]}, @@ -5770,9 +5750,9 @@ } }, { - "origin": [-0.74901, 0.13848, -2.60504], - "size": [0.35675, 1.26112, 0.35675], - "pivot": [-0.57064, 0.26459, -2.42666], + "origin": [-0.56176, -0.14614, -1.95378], + "size": [0.26756, 0.94584, 0.26756], + "pivot": [-0.42798, -0.05156, -1.82], "rotation": [0, 45, 0], "uv": { "north": {"uv": [30, 148], "uv_size": [1, 3]}, @@ -5782,8 +5762,8 @@ } }, { - "origin": [-0.57064, 0.13848, -2.67893], - "size": [1.13501, 1.26112, 0.25223], + "origin": [-0.42798, -0.14614, -2.0092], + "size": [0.85126, 0.94584, 0.18917], "uv": { "north": {"uv": [133, 70], "uv_size": [3, 3]}, "east": {"uv": [98, 68], "uv_size": [1, 3]}, @@ -5794,8 +5774,8 @@ } }, { - "origin": [-0.8229, 0.13848, -2.42666], - "size": [1.63946, 1.26112, 3.08976], + "origin": [-0.61717, -0.14614, -1.82], + "size": [1.2296, 0.94584, 2.31732], "uv": { "north": {"uv": [76, 129], "uv_size": [4, 3]}, "east": {"uv": [120, 119], "uv_size": [7, 3]}, @@ -5806,9 +5786,9 @@ } }, { - "origin": [-0.61972, 1.31122, -2.0168], - "size": [0.17809, 0.54228, 2.67989], - "pivot": [-0.49915, 1.86612, -0.89755], + "origin": [-0.46479, 0.73342, -1.5126], + "size": [0.13357, 0.40671, 2.00992], + "pivot": [-0.37436, 1.14959, -0.67316], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [70, 151], "uv_size": [1, 1]}, @@ -5824,24 +5804,39 @@ { "name": "Lefthand", "parent": "magazine", - "pivot": [3.83625, -9.92125, -2.35125] - }, - { - "name": "leftarm", - "parent": "Lefthand", - "pivot": [4.10625, -9.42625, -2.89125], - "rotation": [-123.26088, 14.12613, -13.48213], + "pivot": [3.66122, -8.56314, -1.59133], + "rotation": [122.73595, -14.16793, 172.32959], "cubes": [ { - "origin": [1.76625, -23.46625, -5.23125], - "size": [4.68, 14.04, 4.68], + "origin": [1.66122, -8.66314, -3.89133], + "size": [4, 12, 4], "uv": { - "north": {"uv": [40, 14], "uv_size": [10, 31]}, - "east": {"uv": [0, 45], "uv_size": [10, 31]}, - "south": {"uv": [10, 45], "uv_size": [10, 31]}, - "west": {"uv": [20, 45], "uv_size": [10, 31]}, - "up": {"uv": [75, 31], "uv_size": [10, 10]}, - "down": {"uv": [7, 86], "uv_size": [10, -10]} + "north": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, + "east": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, + "south": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, + "west": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, + "up": {"uv": [0, 122.42188], "uv_size": [5.17969, 5.57812]}, + "down": {"uv": [0, 122.42188], "uv_size": [5.17969, 5.57812]} + } + } + ] + }, + { + "name": "Righthand", + "parent": "0", + "pivot": [-4.3, -5.9, 13.6], + "rotation": [106.17472, 17.33915, -175.00134], + "cubes": [ + { + "origin": [-6.3, -5.9, 11.6], + "size": [4, 12, 4], + "uv": { + "north": {"uv": [0, 124.25], "uv_size": [4, 3.75]}, + "east": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, + "south": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, + "west": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, + "up": {"uv": [22.75, 14.25], "uv_size": [-4, -2]}, + "down": {"uv": [22.75, 14.25], "uv_size": [-4, -2]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json b/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json index d40dc1316..4aacb0510 100644 --- a/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/abekiri.geo.json @@ -91,7 +91,7 @@ "name": "Lefthand", "parent": "stick", "pivot": [7.5, -2.4, 6.2], - "rotation": [66.45705, 40.58686, -6.47823], + "rotation": [113.54295, -40.58686, 173.52177], "cubes": [ { "origin": [5.5, -2.4, 4.2], @@ -148,11 +148,11 @@ { "name": "Righthand", "parent": "gun", - "pivot": [-1.7, -2, 14.7], - "rotation": [80, -10, 0], + "pivot": [-2.45, -2, 15.45], + "rotation": [100, 10, -180], "cubes": [ { - "origin": [-3.7, -2, 12.7], + "origin": [-4.45, -2, 13.45], "size": [4, 12, 4], "uv": { "north": {"uv": [2.84375, 40.65625], "uv_size": [-2.625, 0.75]}, diff --git a/src/main/resources/assets/superbwarfare/geo/ak.geo.json b/src/main/resources/assets/superbwarfare/geo/ak.geo.json index a2a43d66b..c5a605904 100644 --- a/src/main/resources/assets/superbwarfare/geo/ak.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ak.geo.json @@ -7866,12 +7866,12 @@ { "name": "Righthand", "parent": "0", - "pivot": [-3.50399, -4.80334, 12.29138], - "rotation": [72.76553, -13.26214, 6.20185], + "pivot": [-3.9878, -4.75077, 12.17668], + "rotation": [107.23447, 13.26214, -173.79815], "cubes": [ { - "origin": [-4.50399, -3.80334, 10.29138], - "size": [3, 12, 4], + "origin": [-5.9878, -3.75077, 10.17668], + "size": [4, 12, 4], "uv": { "north": {"uv": [7, 12], "uv_size": [3, 12]}, "east": {"uv": [8, 0], "uv_size": [4, 12]}, @@ -7886,11 +7886,11 @@ { "name": "Lefthand", "parent": "0", - "pivot": [5.9, -4.6, 1.6], - "rotation": [63.02145, 26.28878, -12.70535], + "pivot": [6.33731, -4.50141, 1.37855], + "rotation": [116.97855, -26.28878, 167.29465], "cubes": [ { - "origin": [4.3, -4.6, -0.15], + "origin": [4.73731, -4.50141, -0.37145], "size": [3, 12, 4], "uv": { "north": {"uv": [12, 0], "uv_size": [3, 12]}, diff --git a/src/main/resources/assets/superbwarfare/geo/bocek.geo.json b/src/main/resources/assets/superbwarfare/geo/bocek.geo.json index 80d45c2ef..c2f080342 100644 --- a/src/main/resources/assets/superbwarfare/geo/bocek.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/bocek.geo.json @@ -52,27 +52,25 @@ { "name": "lh", "parent": "anim", - "pivot": [3.54634, -1.54023, 2.7537], + "pivot": [1.02147, -0.55985, 0.2537], "rotation": [0, 0, -60] }, { "name": "Lefthand", "parent": "lh", - "pivot": [3.54634, -1.54023, 2.7537], - "rotation": [61.24687, 9.53274, -3.03513], + "pivot": [2.16391, -2.62838, 9.74825], + "rotation": [97.40532, -1.17018, 175.48224], "cubes": [ { - "origin": [1.58174, -11.94755, 1.52726], - "size": [4, 16, 4], - "pivot": [5.73174, -1.44755, 1.87726], - "rotation": [7.47178, -0.65182, 4.95744], + "origin": [0.16391, -2.62838, 7.74825], + "size": [4, 12, 4], "uv": { - "north": {"uv": [8, 12], "uv_size": [3, 14]}, - "east": {"uv": [0, 0], "uv_size": [4, 14]}, - "south": {"uv": [11, 12], "uv_size": [3, 14]}, - "west": {"uv": [4, 0], "uv_size": [4, 14]}, - "up": {"uv": [14, 12], "uv_size": [3, 4]}, - "down": {"uv": [16, 4], "uv_size": [3, -4]} + "north": {"uv": [2.77246, 3.44727], "uv_size": [-2.77246, -3.44727]}, + "east": {"uv": [2.77246, 3.44727], "uv_size": [-2.77246, -3.44727]}, + "south": {"uv": [2.77246, 3.44727], "uv_size": [-2.77246, -3.44727]}, + "west": {"uv": [2.77246, 3.44727], "uv_size": [-2.77246, -3.44727]}, + "up": {"uv": [0, 0], "uv_size": [2.77246, 3.44727]}, + "down": {"uv": [0, 0], "uv_size": [2.77246, 3.44727]} } } ] @@ -105,10 +103,10 @@ { "name": "deng", "parent": "r", - "pivot": [0.29877, 1.76423, -0.08826], + "pivot": [-0.86209, 3.86869, 1.02895], "cubes": [ { - "origin": [-0.94763, 4.12965, 1.02714], + "origin": [-0.94763, 4.12965, 1.01542], "size": [0.17108, 0.17108, 0.02707], "uv": { "north": {"uv": [60.125, 59.875], "uv_size": [1.5, 2.125]}, @@ -120,7 +118,7 @@ } }, { - "origin": [-0.94763, 3.78315, 1.02714], + "origin": [-0.94763, 3.78315, 1.01542], "size": [0.17108, 0.17108, 0.02707], "uv": { "north": {"uv": [60.125, 59.875], "uv_size": [1.5, 2.125]}, @@ -132,7 +130,7 @@ } }, { - "origin": [-0.94763, 3.43665, 1.02714], + "origin": [-0.94763, 3.43665, 1.01542], "size": [0.17108, 0.17108, 0.02707], "uv": { "north": {"uv": [60.125, 59.875], "uv_size": [1.5, 2.125]}, @@ -3576,8 +3574,10 @@ "rotation": [0, 0, -5], "cubes": [ { - "origin": [-0.20964, 2.18711, 18.94763], + "origin": [-0.51901, 2.18711, 16.64763], "size": [0.36493, 0.62821, 3.69133], + "pivot": [-0.02717, 2.50121, 19.4433], + "rotation": [0, -144, 0], "uv": { "north": {"uv": [9.125, 59.25], "uv_size": [3.375, 3]}, "east": {"uv": [9.125, 59.25], "uv_size": [3.375, 3]}, @@ -3650,19 +3650,25 @@ "up": {"uv": [6.5, 63], "uv_size": [-5.375, -3.625]}, "down": {"uv": [6.5, 63], "uv_size": [-5.375, -3.625]} } - }, + } + ] + }, + { + "name": "Righthand", + "parent": "bone2", + "pivot": [2.74382, -8.44436, 20.94696], + "rotation": [9.52074, 38.19258, 3.06255], + "cubes": [ { - "origin": [-0.74565, -8.44761, 20.46958], + "origin": [0.74382, -8.44436, 18.94696], "size": [4, 12, 4], - "pivot": [1.42935, -2.44761, 21.16958], - "rotation": [11.92695, 1.21261, -6.89469], "uv": { - "north": {"uv": [0, 14], "uv_size": [3, 12]}, - "east": {"uv": [8, 0], "uv_size": [4, 12]}, - "south": {"uv": [3, 14], "uv_size": [3, 12]}, - "west": {"uv": [12, 0], "uv_size": [4, 12]}, - "up": {"uv": [16, 4], "uv_size": [3, 4]}, - "down": {"uv": [16, 12], "uv_size": [3, -4]} + "north": {"uv": [2.625, 22.40625], "uv_size": [-2.625, 0.75]}, + "east": {"uv": [2.625, 22.40625], "uv_size": [-2.625, 0.75]}, + "south": {"uv": [2.625, 22.40625], "uv_size": [-2.625, 0.75]}, + "west": {"uv": [2.625, 22.40625], "uv_size": [-2.625, 0.75]}, + "up": {"uv": [0, 23.15625], "uv_size": [2.625, -0.75]}, + "down": {"uv": [0, 23.15625], "uv_size": [2.625, -0.75]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/devotion.geo.json b/src/main/resources/assets/superbwarfare/geo/devotion.geo.json index 4848cd202..e86ac694b 100644 --- a/src/main/resources/assets/superbwarfare/geo/devotion.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/devotion.geo.json @@ -11866,11 +11866,11 @@ { "name": "Lefthand", "parent": "magazine", - "pivot": [5.4, -6.5, -0.8], - "rotation": [55.50959, 20.84665, -19.04797], + "pivot": [5.84168, -6.3475, -0.97793], + "rotation": [124.49041, -20.84665, 160.95203], "cubes": [ { - "origin": [3.4, -6.5, -2.8], + "origin": [3.84168, -6.3475, -2.97793], "size": [4, 12, 4], "uv": { "north": {"uv": [51.09277, 62.58789], "uv_size": [-2.11621, -1.50977]}, @@ -13103,7 +13103,7 @@ "name": "Righthand", "parent": "0", "pivot": [-2.8, -5.1, 11.4], - "rotation": [72.22421, -10.59522, 2.97361], + "rotation": [107.77579, 10.59522, -177.02639], "cubes": [ { "origin": [-4.8, -5.1, 9.4], diff --git a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json index 2b901d894..35d7b9cfa 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json @@ -48,11 +48,11 @@ { "name": "Lefthand", "parent": "roll", - "pivot": [2.6, -5.7, 9.8], - "rotation": [66.65883, 15.32798, -1.88033], + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], "cubes": [ { - "origin": [0.8, -5.7, 7.6], + "origin": [0.6476, -5.69887, 7.82824], "size": [4, 12, 4], "uv": { "north": {"uv": [0, 36], "uv_size": [1, 1]}, @@ -87,11 +87,11 @@ { "name": "Righthand", "parent": "gun", - "pivot": [-2.2, -4.5, 11], - "rotation": [74.89566, -9.14542, 2.25271], + "pivot": [-2.78589, -3.86581, 11.33096], + "rotation": [105.10434, 9.14542, -177.74729], "cubes": [ { - "origin": [-4.5, -4.5, 9.7], + "origin": [-4.83589, -3.86581, 9.28096], "size": [4, 12, 4], "uv": { "north": {"uv": [0, 36], "uv_size": [1, 1]}, diff --git a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json index 0a3142e47..1563a828a 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json @@ -48,11 +48,11 @@ { "name": "Lefthand", "parent": "roll", - "pivot": [2.6, -5.7, 9.8], - "rotation": [66.65883, 15.32798, -1.88033], + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], "cubes": [ { - "origin": [0.8, -5.7, 7.6], + "origin": [0.6476, -5.69887, 7.82824], "size": [4, 12, 4], "uv": { "north": {"uv": [0, 36], "uv_size": [1, 1]}, @@ -87,11 +87,11 @@ { "name": "Righthand", "parent": "gun", - "pivot": [-2.2, -4.5, 11], - "rotation": [74.89566, -9.14542, 2.25271], + "pivot": [-2.78589, -3.86581, 11.33096], + "rotation": [105.10434, 9.14542, -177.74729], "cubes": [ { - "origin": [-4.5, -4.5, 9.7], + "origin": [-4.83589, -3.86581, 9.28096], "size": [4, 12, 4], "uv": { "north": {"uv": [0, 36], "uv_size": [1, 1]}, @@ -1419,7 +1419,7 @@ "name": "kuaimanji", "parent": "huatao", "pivot": [0.46028, 2.46294, 3.30764], - "rotation": [-22.5, 0, 0], + "rotation": [44.5, 0, 0], "cubes": [ { "origin": [0.29313, 2.11445, 3.16176], diff --git a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json index cb01fbff3..38915f638 100644 --- a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.hk416", "texture_width": 128, "texture_height": 128, - "visible_bounds_width": 18, + "visible_bounds_width": 11, "visible_bounds_height": 6, "visible_bounds_offset": [0, 0, 0] }, @@ -39,7 +39,7 @@ "name": "Righthand", "parent": "0", "pivot": [-2.7, -6.7, 10.6], - "rotation": [70.17995, -12.39135, -1.6575], + "rotation": [109.82005, 12.39135, 178.3425], "cubes": [ { "origin": [-4.7, -6.7, 8.6], @@ -8954,12 +8954,12 @@ { "name": "Lefthand", "parent": "magazine", - "pivot": [5.2, -4.7, 0], - "rotation": [65.81754, 23.7695, -7.98205], + "pivot": [5.56456, -4.97884, -0.31913], + "rotation": [123.91904, -8.99551, 153.59632], "cubes": [ { - "origin": [3.2, -8.7, -2], - "size": [4, 16, 4], + "origin": [3.56456, -4.97884, -2.31913], + "size": [4, 12, 4], "uv": { "north": {"uv": [0, 92], "uv_size": [4, 12]}, "east": {"uv": [0, 92], "uv_size": [4, 12]}, diff --git a/src/main/resources/assets/superbwarfare/geo/hunting_rifle.geo.json b/src/main/resources/assets/superbwarfare/geo/hunting_rifle.geo.json index 7965ca767..6cb930071 100644 --- a/src/main/resources/assets/superbwarfare/geo/hunting_rifle.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/hunting_rifle.geo.json @@ -39,7 +39,7 @@ "name": "Righthand", "parent": "0", "pivot": [-4.2, -5.8, 19.4], - "rotation": [61.32528, -17.33915, 4.99866], + "rotation": [118.67472, 17.33915, -175.00134], "cubes": [ { "origin": [-6.2, -5.8, 17.4], @@ -58,11 +58,11 @@ { "name": "Lefthand", "parent": "0", - "pivot": [2.6, -7.3, 5.6], - "rotation": [52.80418, -8.33077, -26.99661], + "pivot": [3.26122, -6.96314, 5.70867], + "rotation": [127.19582, 8.33077, 153.00339], "cubes": [ { - "origin": [0.6, -7.3, 3.6], + "origin": [1.26122, -6.96314, 3.70867], "size": [4, 12, 4], "uv": { "north": {"uv": [5.17969, 128], "uv_size": [-5.17969, -5.57812]}, diff --git a/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json b/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json index d7af27c41..ec4b91f57 100644 --- a/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json @@ -7,8 +7,8 @@ "texture_width": 64, "texture_height": 64, "visible_bounds_width": 4, - "visible_bounds_height": 3, - "visible_bounds_offset": [0, 0.5, 0] + "visible_bounds_height": 6, + "visible_bounds_offset": [0, 0, 0] }, "bones": [ { @@ -5034,12 +5034,12 @@ { "name": "Lefthand", "parent": "gun", - "pivot": [3.2, -5.8, 0.3], - "rotation": [55.2967, 9.58766, -16.41323], + "pivot": [3.50236, -5.65119, 1.01805], + "rotation": [98.98829, -29.92401, -133.94309], "cubes": [ { - "origin": [1.9, -5.8, -1.4], - "size": [3.5, 12, 3.5], + "origin": [1.20236, -5.65119, -0.93195], + "size": [4, 12, 4], "uv": { "north": {"uv": [63, 63], "uv_size": [1, 1]}, "east": {"uv": [63, 63], "uv_size": [1, 1]}, @@ -5054,12 +5054,12 @@ { "name": "Righthand", "parent": "gun", - "pivot": [-3.5, -5.2, 15.3], - "rotation": [71.43885, -15.99996, -3.28813], + "pivot": [-3.5, -4.45, 15.3], + "rotation": [108.56115, 15.99996, 176.71187], "cubes": [ { - "origin": [-5.3, -5.2, 14.5], - "size": [3.5, 12, 3.5], + "origin": [-5.55, -4.45, 13.25], + "size": [4, 12, 4], "uv": { "north": {"uv": [63, 63], "uv_size": [1, 1]}, "east": {"uv": [63, 63], "uv_size": [1, 1]}, diff --git a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json index ff692d356..787ddbdff 100644 --- a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json @@ -3046,19 +3046,19 @@ { "name": "Righthand", "parent": "gun", - "pivot": [-2.2, -4.5, 11], - "rotation": [74.89566, -9.14542, 2.25271], + "pivot": [-2.78589, -3.86581, 11.33096], + "rotation": [105.10434, 9.14542, -177.74729], "cubes": [ { - "origin": [-4, -4.5, 10.2], - "size": [3.5, 12, 3.5], + "origin": [-4.83589, -3.86581, 9.28096], + "size": [4, 12, 4], "uv": { - "north": {"uv": [63, 63], "uv_size": [1, 1]}, - "east": {"uv": [63, 63], "uv_size": [1, 1]}, - "south": {"uv": [63, 63], "uv_size": [1, 1]}, - "west": {"uv": [63, 63], "uv_size": [1, 1]}, - "up": {"uv": [64, 64], "uv_size": [-1, -1]}, - "down": {"uv": [64, 64], "uv_size": [-1, -1]} + "north": {"uv": [0, 36], "uv_size": [1, 1]}, + "east": {"uv": [0, 36], "uv_size": [1, 1]}, + "south": {"uv": [0, 36], "uv_size": [1, 1]}, + "west": {"uv": [0, 36], "uv_size": [1, 1]}, + "up": {"uv": [1, 37], "uv_size": [-1, -1]}, + "down": {"uv": [1, 37], "uv_size": [-1, -1]} } } ] @@ -3066,19 +3066,19 @@ { "name": "Lefthand", "parent": "roll", - "pivot": [2.6, -5.7, 9.8], - "rotation": [66.65883, 15.32798, -1.88033], + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], "cubes": [ { - "origin": [1.3, -5.7, 8.1], - "size": [3.5, 12, 3.5], + "origin": [0.6476, -5.69887, 7.82824], + "size": [4, 12, 4], "uv": { - "north": {"uv": [63, 63], "uv_size": [1, 1]}, - "east": {"uv": [63, 63], "uv_size": [1, 1]}, - "south": {"uv": [63, 63], "uv_size": [1, 1]}, - "west": {"uv": [63, 63], "uv_size": [1, 1]}, - "up": {"uv": [64, 64], "uv_size": [-1, -1]}, - "down": {"uv": [64, 64], "uv_size": [-1, -1]} + "north": {"uv": [0, 36], "uv_size": [1, 1]}, + "east": {"uv": [0, 36], "uv_size": [1, 1]}, + "south": {"uv": [0, 36], "uv_size": [1, 1]}, + "west": {"uv": [0, 36], "uv_size": [1, 1]}, + "up": {"uv": [1, 37], "uv_size": [-1, -1]}, + "down": {"uv": [1, 37], "uv_size": [-1, -1]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/m60.geo.json b/src/main/resources/assets/superbwarfare/geo/m60.geo.json index 45648cad8..645ee0a57 100644 --- a/src/main/resources/assets/superbwarfare/geo/m60.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m60.geo.json @@ -7268,7 +7268,7 @@ "name": "Righthand", "parent": "0", "pivot": [-2.8, -2.6, 10.9], - "rotation": [79.17995, -12.39135, -1.6575], + "rotation": [100.82005, 12.39135, 178.3425], "cubes": [ { "origin": [-4.8, -2.6, 8.9], @@ -7937,7 +7937,7 @@ "name": "Lefthand", "parent": "m60_mag", "pivot": [5.8742, -5.34057, -1.62584], - "rotation": [49.72532, 25.18478, -12.63318], + "rotation": [130.27468, -25.18478, 167.36682], "cubes": [ { "origin": [3.8742, -5.34057, -3.62584], diff --git a/src/main/resources/assets/superbwarfare/geo/m79.geo.json b/src/main/resources/assets/superbwarfare/geo/m79.geo.json index 43b25d91e..c9ef85680 100644 --- a/src/main/resources/assets/superbwarfare/geo/m79.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m79.geo.json @@ -58,7 +58,7 @@ "name": "Righthand", "parent": "gun", "pivot": [-4.6, -2.7, 20], - "rotation": [76.27852, -18.49512, 4.42911], + "rotation": [103.72148, 18.49512, -175.57089], "cubes": [ { "origin": [-6.6, -2.7, 18], @@ -78,7 +78,7 @@ "name": "Lefthand", "parent": "gun", "pivot": [3, -5.5, 8.2], - "rotation": [66.92679, 12.45515, -5.24927], + "rotation": [113.07321, -12.45515, 174.75073], "cubes": [ { "origin": [1, -5.5, 6.2], diff --git a/src/main/resources/assets/superbwarfare/geo/m870.geo.json b/src/main/resources/assets/superbwarfare/geo/m870.geo.json index 239fc4d1e..8e4ce3cc0 100644 --- a/src/main/resources/assets/superbwarfare/geo/m870.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m870.geo.json @@ -5455,43 +5455,41 @@ ] }, { - "name": "rightarm", + "name": "Righthand", "parent": "gun", - "pivot": [-4.95251, -6.20739, 14.0745], - "rotation": [-120.73962, -20.81182, 8.12503], + "pivot": [-4.22344, -6.07734, 14.06797], + "rotation": [117.43088, 19.3387, -178.95259], "cubes": [ { - "origin": [-6.55251, -18.20739, 12.0745], + "origin": [-6.22344, -6.07734, 12.06797], "size": [4, 12, 4], - "pivot": [-4.55251, -6.20739, 14.0745], - "rotation": [0, 8, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [-4, 4]}, - "east": {"uv": [4, 60], "uv_size": [-4, 4]}, - "south": {"uv": [4, 60], "uv_size": [-4, 4]}, - "west": {"uv": [4, 60], "uv_size": [-4, 4]}, - "up": {"uv": [0, 64], "uv_size": [4, -4]}, - "down": {"uv": [0, 64], "uv_size": [4, -4]} + "north": {"uv": [0, 60], "uv_size": [4, 4]}, + "east": {"uv": [0, 60], "uv_size": [4, 4]}, + "south": {"uv": [0, 60], "uv_size": [4, 4]}, + "west": {"uv": [0, 60], "uv_size": [4, 4]}, + "up": {"uv": [4, 64], "uv_size": [-4, -4]}, + "down": {"uv": [4, 64], "uv_size": [-4, -4]} } } ] }, { - "name": "leftarm", + "name": "Lefthand", "parent": "gun", - "pivot": [3.66208, -9.25915, -4.4376], - "rotation": [-138.45572, 6.39811, -18.75869], + "pivot": [2.98163, -8.10085, -4.00511], + "rotation": [127.19582, 8.33077, 153.00339], "cubes": [ { - "origin": [1.66208, -21.25915, -6.4376], + "origin": [0.98163, -8.10085, -6.00511], "size": [4, 12, 4], "uv": { - "north": {"uv": [4, 60], "uv_size": [-4, 4]}, - "east": {"uv": [4, 60], "uv_size": [-4, 4]}, - "south": {"uv": [4, 60], "uv_size": [-4, 4]}, - "west": {"uv": [4, 60], "uv_size": [-4, 4]}, - "up": {"uv": [0, 64], "uv_size": [4, -4]}, - "down": {"uv": [0, 64], "uv_size": [4, -4]} + "north": {"uv": [4, 64], "uv_size": [-4, -4]}, + "east": {"uv": [4, 64], "uv_size": [-4, -4]}, + "south": {"uv": [4, 64], "uv_size": [-4, -4]}, + "west": {"uv": [4, 64], "uv_size": [-4, -4]}, + "up": {"uv": [0, 60], "uv_size": [4, 4]}, + "down": {"uv": [0, 60], "uv_size": [4, 4]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/m98b.geo.json b/src/main/resources/assets/superbwarfare/geo/m98b.geo.json index 8992f9607..c642f5ded 100644 --- a/src/main/resources/assets/superbwarfare/geo/m98b.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m98b.geo.json @@ -15700,12 +15700,12 @@ { "name": "Lefthand", "parent": "magazine", - "pivot": [2.3, -6.6, -1.18047], - "rotation": [47.12788, 10.04762, -11.96812], + "pivot": [3.8, -6.6, -1.18047], + "rotation": [132.87212, -10.04762, 168.03188], "cubes": [ { - "origin": [1.3, -6.9, -2.18047], - "size": [3, 12, 3], + "origin": [1.8, -6.6, -3.18047], + "size": [4, 12, 4], "uv": { "north": {"uv": [0, 12], "uv_size": [3, 12]}, "east": {"uv": [12, 0], "uv_size": [3, 12]}, @@ -16367,12 +16367,12 @@ { "name": "Righthand", "parent": "0", - "pivot": [-4.1, -4.5, 10.85], - "rotation": [72.85133, -20.70481, 9.00717], + "pivot": [-3.75, -4.5, 11.35], + "rotation": [106.38323, 12.08573, -173.69651], "cubes": [ { - "origin": [-6.4, -4.8, 9.85], - "size": [3, 12, 3], + "origin": [-5.8, -4.5, 9.35], + "size": [4, 12, 4], "uv": { "north": {"uv": [0, 0], "uv_size": [3, 12]}, "east": {"uv": [3, 0], "uv_size": [3, 12]}, diff --git a/src/main/resources/assets/superbwarfare/geo/minigun.geo.json b/src/main/resources/assets/superbwarfare/geo/minigun.geo.json index 3a7792a87..591320bea 100644 --- a/src/main/resources/assets/superbwarfare/geo/minigun.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/minigun.geo.json @@ -3476,8 +3476,8 @@ } }, { - "origin": [-0.25564, 7.19018, 2.40216], - "size": [0.71128, 3.15, 0.75313], + "origin": [-0.25564, 6.69018, 2.40216], + "size": [0.71128, 4.15, 0.75313], "pivot": [0, 8.76518, 2.77873], "rotation": [0, 0, 90], "uv": { @@ -3490,8 +3490,8 @@ } }, { - "origin": [0.45564, 7.19018, 2.40216], - "size": [0.1, 0.6, 0.75313], + "origin": [0.45564, 6.69018, 2.40216], + "size": [0.1, 1.1, 0.75313], "pivot": [0, 8.76518, 2.77873], "rotation": [0, 0, 90], "uv": { @@ -3532,8 +3532,8 @@ } }, { - "origin": [-0.55564, 7.19018, 2.40216], - "size": [0.1, 0.6, 0.75313], + "origin": [-0.55564, 6.69018, 2.40216], + "size": [0.1, 1.1, 0.75313], "pivot": [0, 8.76518, 2.77873], "rotation": [0, 0, -90], "uv": { @@ -6549,12 +6549,12 @@ { "name": "Lefthand", "parent": "0", - "pivot": [5.08122, 7.47568, 11.26082], - "rotation": [93.23579, 26.55939, 19.67969], + "pivot": [5.08122, 7.97568, 11.26082], + "rotation": [116.59597, -2.89401, 108.23166], "cubes": [ { - "origin": [3.08122, 7.47568, 9.26082], - "size": [4, 12, 3], + "origin": [3.08122, 7.97568, 9.26082], + "size": [4, 12, 4], "uv": { "north": {"uv": [1.25, 32], "uv_size": [-1.25, -2]}, "east": {"uv": [1.25, 32], "uv_size": [-1.25, -2]}, @@ -6570,7 +6570,7 @@ "name": "Righthand", "parent": "0", "pivot": [-1.79027, 10.60727, 29.37886], - "rotation": [109.35832, -7.15102, 2.26708], + "rotation": [70.64168, 7.15102, -177.73292], "cubes": [ { "origin": [-3.79027, 10.60727, 27.37886], diff --git a/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json b/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json index 8b5a24dab..c62805055 100644 --- a/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json @@ -47,11 +47,11 @@ { "name": "Lefthand", "parent": "roll", - "pivot": [4.10118, -4.73279, 1.10701], - "rotation": [59.69513, 13.86164, -12.5355], + "pivot": [4.81198, -4.57475, 0.92732], + "rotation": [120.30487, -13.86164, 167.4645], "cubes": [ { - "origin": [2.08282, -4.69476, -1.17189], + "origin": [2.79362, -4.53672, -1.35157], "size": [4, 12, 4], "uv": { "north": {"uv": [63, 0], "uv_size": [1, 1]}, @@ -73,7 +73,7 @@ "name": "Righthand", "parent": "gun", "pivot": [-2.65902, -4.55507, 10.06908], - "rotation": [75.68232, -11.38297, -2.40375], + "rotation": [104.31768, 11.38297, 177.59625], "cubes": [ { "origin": [-4.70902, -4.55507, 8.01908], diff --git a/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json b/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json index 66495e32f..329cb74c7 100644 --- a/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json @@ -62,11 +62,11 @@ "name": "Lefthand", "parent": "0", "pivot": [3, -7.5, 10.5], - "rotation": [59.74687, 9.53274, -3.03513], + "rotation": [120.25313, -9.53274, 176.96487], "cubes": [ { - "origin": [1.25, -7.5, 9.5], - "size": [2.25, 12, 3], + "origin": [1, -7.5, 8.5], + "size": [4, 12, 4], "uv": { "north": {"uv": [3, 12], "uv_size": [2.25, 12]}, "east": {"uv": [6, 0], "uv_size": [3, 12]}, @@ -82,11 +82,11 @@ "name": "Righthand", "parent": "0", "pivot": [-3.5, -4.5, 12], - "rotation": [74.57362, -14.63639, 3.31914], + "rotation": [105.42638, 14.63639, -176.68086], "cubes": [ { - "origin": [-3.75, -4.5, 11], - "size": [2.25, 12, 3], + "origin": [-5.5, -4.5, 10], + "size": [4, 12, 4], "uv": { "north": {"uv": [0, 12], "uv_size": [2.25, 12]}, "east": {"uv": [0, 0], "uv_size": [3, 12]}, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json index ba22c042b..ca0479a46 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json @@ -8,9 +8,9 @@ "display": { "firstperson_righthand": { "translation": [ - -2, -4.75, - -9.25 + -2.75, + -4.5 ], "scale": [ 2, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json index 7ceec628e..9ebe71877 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json @@ -6,35 +6,11 @@ 128 ], "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 0.5, - 0.75 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - 0.5, - 0.75 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, "firstperson_righthand": { "translation": [ - 4, - -15.5, - -31.75 + 4.25, + -13.5, + -22 ], "scale": [ 4, @@ -44,61 +20,15 @@ }, "firstperson_lefthand": { "translation": [ - -1, - 3, - 2.5 + -3.5, + 2.75, + -4 ], "scale": [ - 0, + 0.02, 0, 0 ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "gui": { - "rotation": [ - 30, - -145, - 0 - ], - "translation": [ - -0.25, - -2.5, - 0 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "fixed": { - "rotation": [ - 0, - 90, - 0 - ], - "translation": [ - 0, - 1, - -2 - ], - "scale": [ - 1.1, - 1.1, - 1.1 - ] } } } \ No newline at end of file