From 4316f1d866669c67333065807d4a7617cbb70c20 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 20 Sep 2024 04:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=BC=98=E5=8C=96=E5=8A=A8?= =?UTF-8?q?=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK47ItemModel.java | 50 ++++++---------- .../client/model/item/AbekiriItemModel.java | 51 ++++++---------- .../client/model/item/BocekItemModel.java | 46 ++++++--------- .../client/model/item/DevotionItemModel.java | 51 ++++++---------- .../client/model/item/Glock17ItemModel.java | 51 ++++++---------- .../client/model/item/Glock18ItemModel.java | 51 ++++++---------- .../client/model/item/Hk416ItemModel.java | 51 ++++++---------- .../model/item/HuntingRifleItemModel.java | 51 ++++++---------- .../client/model/item/JavelinItemModel.java | 53 +++++++---------- .../client/model/item/K98ItemModel.java | 51 ++++++---------- .../client/model/item/M1911ItemModel.java | 51 ++++++---------- .../client/model/item/M4ItemModel.java | 51 ++++++---------- .../client/model/item/M60ItemModel.java | 51 ++++++---------- .../client/model/item/M79ItemModel.java | 51 ++++++---------- .../client/model/item/M870ItemModel.java | 51 ++++++---------- .../client/model/item/M98bItemModel.java | 58 +++++++------------ .../client/model/item/MarlinItemModel.java | 51 ++++++---------- .../client/model/item/MinigunItemModel.java | 51 ++++++---------- .../client/model/item/Mk14ItemModel.java | 51 ++++++---------- .../model/item/MosinNagantItemModel.java | 51 ++++++---------- .../client/model/item/Ntw20Model.java | 51 ++++++---------- .../client/model/item/Qbz95ItemModel.java | 51 ++++++---------- .../client/model/item/RpgItemModel.java | 51 ++++++---------- .../client/model/item/RpkItemModel.java | 51 ++++++---------- .../client/model/item/SentinelItemModel.java | 51 ++++++---------- .../client/model/item/SksItemModel.java | 51 ++++++---------- .../client/model/item/SvdItemModel.java | 57 +++++++----------- .../client/model/item/TaserItemModel.java | 50 ++++++---------- .../model/item/TracheliumItemModel.java | 51 ++++++---------- .../client/model/item/VectorItemModel.java | 51 ++++++---------- 30 files changed, 576 insertions(+), 962 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 b54c3ab35..9ac466f5c 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 @@ -79,42 +79,30 @@ public class AK47ItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2 * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.7f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.7f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 f0f84a8c1..a2fcf187d 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,43 +63,30 @@ public class AbekiriItemModel extends GeoModel { shen.setRotY(-0.15f * (float) fr); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 055940215..bd7e4a11c 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 @@ -109,38 +109,30 @@ public class BocekItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - double yaw = player.getPersistentData().getDouble("yaw"); - double pit = player.getPersistentData().getDouble("gun_pitch"); - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosY(-1 * (float) vy); - - move.setPosX(9.3f * (float) m); - - move.setRotX(0.5f * (float) pit); - - move.setRotZ(0.7f * (float) yaw + 2.7f * (float) m); - - move.setRotY(0.9f * (float) yaw - 1.7f * (float) m); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); 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 42eefeb86..cacb6c84b 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 @@ -614,43 +614,30 @@ public class DevotionItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2 * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(1.8f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(1.6f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); if (player.getPersistentData().getDouble("prone") > 0) { l.setRotX(1.5f); 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 549a458b3..179a3e5b9 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 @@ -88,43 +88,30 @@ public class Glock17ItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.7f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.7f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 3e50852ef..7e6ffdd5d 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 @@ -96,43 +96,30 @@ public class Glock18ItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.7f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.7f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 2bc76b588..081b8351e 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 @@ -72,43 +72,30 @@ public class Hk416ItemModel extends GeoModel { shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.75f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.75f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java index e29113d46..2bda22d8a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java @@ -75,43 +75,30 @@ public class HuntingRifleItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java index 5ea3da0e3..8d54f5207 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java @@ -62,45 +62,32 @@ public class JavelinItemModel extends GeoModel { shen.setRotX(0.17f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); shen.setPosX((float)(0.75f * fr * (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - - CoreGeoBone root = getAnimationProcessor().getBone("root"); - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone root = getAnimationProcessor().getBone("root"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.75f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.75f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); 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 704e7e2e4..31601238b 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 @@ -81,43 +81,30 @@ public class K98ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.75f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.75f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 6265e107b..a2279eaf1 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 @@ -86,43 +86,30 @@ public class M1911ItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.7f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.7f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 114c175cd..4fdb6c45f 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 @@ -72,43 +72,30 @@ 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 root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.65f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.65f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 d7a3b441e..dcd09265c 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 @@ -115,43 +115,30 @@ public class M60ItemModel extends GeoModel { tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 58455be86..1e26b5bda 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 @@ -70,43 +70,30 @@ public class M79ItemModel extends GeoModel { shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 cbb3e63d8..adf02ceea 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 @@ -73,43 +73,30 @@ public class M870ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("main"); 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 5f607a38d..556dcfe37 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 @@ -71,47 +71,33 @@ public class M98bItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + zhunxing.setPosX(75 * movePosX); + zhunxing.setPosY(75 * movePosY); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(movePosX); + root.setRotZ(movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - zhunxing.setPosX(75 * PosX); - - zhunxing.setPosY(75 * PosY); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java index 4c9a0dd65..377cc475e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java @@ -70,43 +70,30 @@ public class MarlinItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 d5562eb1a..0b7fd8c2c 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 @@ -64,43 +64,30 @@ 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)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java index 92dcf07da..0d208105a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java @@ -103,43 +103,30 @@ public class Mk14ItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.9f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.9f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/MosinNagantItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MosinNagantItemModel.java index a2accf5f8..8bc4ca046 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/MosinNagantItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/MosinNagantItemModel.java @@ -93,43 +93,30 @@ public class MosinNagantItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.75f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.75f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 2ed552081..c17040f77 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java @@ -85,43 +85,30 @@ public class Ntw20Model extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 4.3)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.8f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.6f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 3046be368..922376534 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 @@ -77,43 +77,30 @@ public class Qbz95ItemModel extends GeoModel { } CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.75f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.75f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java index 1df56d877..70d4e7142 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java @@ -73,43 +73,30 @@ public class RpgItemModel extends GeoModel { gun.setScaleZ(1f - (0.5f * (float) zp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java index bd1200705..bca62ef1b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java @@ -89,43 +89,30 @@ public class RpkItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.6f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.6f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java index bc2ceb17f..ad164ad51 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java @@ -92,43 +92,30 @@ public class SentinelItemModel extends GeoModel { charge.setRotZ(charge.getRotZ() + times * 0.05f); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(1.4f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(1.4f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); if ((stack.getOrCreateTag().getDouble("ammo") <= 5)) { ammo.setScaleX((float) (stack.getOrCreateTag().getDouble("ammo") / 5)); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java index 8d05dcc7e..25e439304 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SksItemModel.java @@ -84,43 +84,30 @@ public class SksItemModel extends GeoModel { shuan.setPosZ(2f * (float) fp); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java index dc3ca76f2..d39874584 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java @@ -91,54 +91,39 @@ public class SvdItemModel extends GeoModel { shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); } shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - holo.setPosY(0.05f + 1.1f * (float) fp); holo.setRotZ(-0.04f * (float) fp); holo.setScaleX(0.75f); holo.setScaleY(0.75f); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); - - glass.setPosX(0.25f * -PosX); - - glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) swayY + PosY); + glass.setPosX(0.25f * -movePosX); + glass.setPosY(0.2f * (float) fp + 0.5f * (float) vY + (float) swayY + movePosY); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java index c5ec287c0..0d4236ccf 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java @@ -96,42 +96,30 @@ public class TaserItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zpz)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2 * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); 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 264790d14..5d4bb34ff 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,43 +64,30 @@ public class TracheliumItemModel extends GeoModel { shen.setRotZ(-0.1f * (float) (fp + 1.3 * fr)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0"); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java index 67fef0553..eee64bf88 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java @@ -88,43 +88,30 @@ public class VectorItemModel extends GeoModel { shen.setPosX(0.5f * (float) fr * (float) ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); - - float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); - float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + CoreGeoBone move = getAnimationProcessor().getBone("move"); double swayX = ClientEventHandler.getSwayX(); double swayY = ClientEventHandler.getSwayY(); - root.setPosX(PosX); - root.setPosY((float) swayY + PosY); + float moveRotZ = (float) ClientEventHandler.getMoveRotZ(); + float movePosX = (float) ClientEventHandler.getMovePosX(); + float movePosY = (float) ClientEventHandler.getMovePosY(); + double mph = ClientEventHandler.getMovePosHorizon(); + double vY = ClientEventHandler.getVelocityY(); + double turnRotX = ClientEventHandler.getTurnRotX(); + double turnRotY = ClientEventHandler.getTurnRotY(); + double turnRotZ = ClientEventHandler.getTurnRotZ(); + + root.setPosX(movePosX); + root.setPosY((float) swayY + movePosY); root.setRotX((float) swayX); + root.setRotY(0.2f * movePosX); + root.setRotZ(0.2f * movePosX + moveRotZ); - float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); - - root.setRotY(0.2f * PosX); - - root.setRotZ(0.2f * PosX + RotZ); - - CoreGeoBone move = getAnimationProcessor().getBone("move"); - - double m = player.getPersistentData().getDouble("move"); - - double vy = player.getPersistentData().getDouble("vy"); - - move.setPosX(9.3f * (float) m); - - move.setPosY(-2f * (float) vy); - - double xRot = player.getPersistentData().getDouble("xRot"); - - double yRot = player.getPersistentData().getDouble("yRot"); - - double zRot = player.getPersistentData().getDouble("zRot"); - - move.setRotX(0.7f * Mth.DEG_TO_RAD * (float) xRot - 0.15f * (float) vy); - - move.setRotY(0.7f * Mth.DEG_TO_RAD * (float) yRot); - - move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + move.setPosX(9.3f * (float) mph); + move.setPosY(-2f * (float) vY); + move.setRotX(Mth.DEG_TO_RAD * (float) turnRotX - 0.15f * (float) vY); + move.setRotY(Mth.DEG_TO_RAD * (float) turnRotY); + move.setRotZ(2.7f * (float) mph + Mth.DEG_TO_RAD * (float) turnRotZ); CoreGeoBone camera = getAnimationProcessor().getBone("camera"); CoreGeoBone main = getAnimationProcessor().getBone("0");