From 95e69bd0967f141b23453790fe65c832f0f74c1d Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 20 Sep 2024 15:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A8=E7=94=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK47ItemModel.java | 31 ++-- .../client/model/item/Aa12ItemModel.java | 32 ++--- .../client/model/item/AbekiriItemModel.java | 32 ++--- .../client/model/item/BocekItemModel.java | 38 +++-- .../client/model/item/DevotionItemModel.java | 32 ++--- .../client/model/item/Glock17ItemModel.java | 32 ++--- .../client/model/item/Glock18ItemModel.java | 32 ++--- .../client/model/item/Hk416ItemModel.java | 32 ++--- .../model/item/HuntingRifleItemModel.java | 32 ++--- .../client/model/item/JavelinItemModel.java | 31 ++-- .../client/model/item/K98ItemModel.java | 33 ++--- .../client/model/item/M1911ItemModel.java | 32 ++--- .../client/model/item/M4ItemModel.java | 32 ++--- .../client/model/item/M60ItemModel.java | 32 ++--- .../client/model/item/M79ItemModel.java | 32 ++--- .../client/model/item/M870ItemModel.java | 32 ++--- .../client/model/item/M98bItemModel.java | 46 +++--- .../client/model/item/MarlinItemModel.java | 32 ++--- .../client/model/item/MinigunItemModel.java | 28 ++-- .../client/model/item/Mk14ItemModel.java | 32 ++--- .../model/item/MosinNagantItemModel.java | 32 ++--- .../client/model/item/Ntw20Model.java | 48 +++---- .../client/model/item/Qbz95ItemModel.java | 32 ++--- .../client/model/item/RpgItemModel.java | 32 ++--- .../client/model/item/RpkItemModel.java | 32 ++--- .../client/model/item/SentinelItemModel.java | 40 +++--- .../client/model/item/SksItemModel.java | 32 ++--- .../client/model/item/SvdItemModel.java | 32 ++--- .../client/model/item/TaserItemModel.java | 34 +++-- .../model/item/TracheliumItemModel.java | 32 ++--- .../client/model/item/VectorItemModel.java | 32 ++--- .../event/ClientEventHandler.java | 136 +++++------------- 32 files changed, 514 insertions(+), 655 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 e186c2f98..2fe7dd1f6 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 @@ -45,8 +45,20 @@ public class AK47ItemModel extends GeoModel { if (!stack.is(ModTags.Items.GUN)) return; double zt = ClientEventHandler.zoomTime; - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.97f * (float) zp); gun.setPosY(0.011f * (float) zp - (float) (0.2f * zpz)); @@ -56,10 +68,6 @@ public class AK47ItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.2f * (float) (fp + 0.54f * fr)); @@ -78,17 +86,6 @@ public class AK47ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 48accbfea..9168f8e1b 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 @@ -41,9 +41,21 @@ public class Aa12ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.105f * (float) zp); gun.setPosY(0.17f * (float) zp - (float) (0.2f * zpz)); @@ -51,9 +63,6 @@ public class Aa12ItemModel extends GeoModel { gun.setRotZ((float) (0.02f * zpz)); gun.setScaleZ(1f - (0.4f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(1.3f * (float) (fp + 0.54f * fr)); @@ -70,17 +79,6 @@ public class Aa12ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 2164d9270..b03a30f66 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 @@ -40,9 +40,21 @@ public class AbekiriItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.45f * (float) zp); @@ -52,9 +64,6 @@ public class AbekiriItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosX(-0.2f * (float) (fp + 2 * fr)); shen.setPosY(0.2f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr)); @@ -65,17 +74,6 @@ public class AbekiriItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 108a3996a..90277347b 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 @@ -52,9 +52,23 @@ public class BocekItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double pp = ClientEventHandler.getPullPos(); - double bp = ClientEventHandler.getBowPos(); - double hp = ClientEventHandler.getHandPos(); + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; + double pp = ClientEventHandler.pullPos; + double bp = ClientEventHandler.bowPos; + double hp = ClientEventHandler.handPos; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; arrow.setPosZ(9f * (float) bp); rh.setPosZ(9f * (float) hp); @@ -79,9 +93,6 @@ public class BocekItemModel extends GeoModel { deng3.setPosZ(0.05f * (float) bp); deng.setScaleZ(1f + (0.07f * (float) bp)); - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); lh.setRotX(0.2f * (float) zp); shen_pos.setPosX(-3.4f * (float) zp); @@ -92,10 +103,6 @@ public class BocekItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !((shen_pos.getPosX() < -0.7 && gun.getPosZ() < -2.6))); - - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { fire.setPosY(-0.01f * (float) (fp + 2 * fr)); fire.setPosZ(3f * (float) (fp + 0.54f * fr)); @@ -111,17 +118,6 @@ public class BocekItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 1213abd1f..d37e6ffc6 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 @@ -44,9 +44,21 @@ public class DevotionItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.17f * (float) zp); gun.setPosY(0.17f * (float) zp - (float) (0.5f * zpz)); @@ -67,9 +79,6 @@ public class DevotionItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.05f * (float) (fp + 2 * fr)); holo.setPosY(-0.03f * (float) (fp + 2.3 * fr)); @@ -606,17 +615,6 @@ public class DevotionItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 12c205d5b..3634c3996 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 @@ -43,9 +43,21 @@ public class Glock17ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(-1.34f * (float) zp); @@ -57,9 +69,6 @@ public class Glock17ItemModel extends GeoModel { gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.03f * (float) (fp + 2 * fr)); shen.setPosZ(2.6f * (float) (fp + 0.84f * fr)); @@ -90,17 +99,6 @@ public class Glock17ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 493ae2a67..be591f3b7 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 @@ -51,9 +51,21 @@ public class Glock18ItemModel extends GeoModel { switch_.setRotX(0); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(-1.34f * (float) zp); @@ -65,9 +77,6 @@ public class Glock18ItemModel extends GeoModel { gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.03f * (float) (fp + 2 * fr)); shen.setPosZ(2.6f * (float) (fp + 0.84f * fr)); @@ -98,17 +107,6 @@ public class Glock18ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 9e90f2727..427845342 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 @@ -42,9 +42,21 @@ public class Hk416ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(3.34f * (float) zp); gun.setPosY(0.54f * (float) zp - (float) (0.2f * zpz)); @@ -55,9 +67,6 @@ public class Hk416ItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); @@ -74,17 +83,6 @@ public class Hk416ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 aa1c547df..f4165b236 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 @@ -39,9 +39,21 @@ public class HuntingRifleItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.95f * (float) zp); @@ -53,9 +65,6 @@ public class HuntingRifleItemModel extends GeoModel { gun.setScaleZ(1f - (0.5f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosX(-0.05f * (float) (fp + 0.2 * fr)); shen.setPosY(0.3f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr)); @@ -77,17 +86,6 @@ public class HuntingRifleItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 e3636be2e..d6c5ca16e 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 @@ -41,9 +41,20 @@ public class JavelinItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.66f * (float) zp + (float) (0.2f * zpz)); gun.setPosY(5.5f * (float) zp + (float) (0.8f * zpz)); @@ -54,9 +65,6 @@ public class JavelinItemModel extends GeoModel { javelin.setHidden(gun.getPosZ() > 15.85); stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosZ() > 15.85)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosY(0.28f * (float) (fp + 2 * fr)); shen.setPosZ(3.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.17f * (float) (0.18f * fp + fr)); @@ -66,17 +74,6 @@ public class JavelinItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 0dca5286f..154cd66cc 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 @@ -53,19 +53,27 @@ public class K98ItemModel extends GeoModel { clip.setScaleZ(1); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.11f * (float) zp); gun.setPosY(1.52f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(10f * (float) zp + (float) (0.3f * zpz)); gun.setScaleZ(1f - (0.7f * (float) zp)); - - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.1f * (float) (fp + 2 * fr)); shen.setPosZ(5.6f * (float) (fp + 0.54f * fr)); @@ -83,17 +91,6 @@ public class K98ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 807e84cde..4d192aeef 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 @@ -43,9 +43,21 @@ public class M1911ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.86f * (float) zp); @@ -55,9 +67,6 @@ public class M1911ItemModel extends GeoModel { gun.setScaleZ(1f - (0.35f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.03f * (float) (fp + 2 * fr)); shen.setPosZ(2.6f * (float) (fp + 0.84f * fr)); @@ -88,17 +97,6 @@ public class M1911ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 47c67a86c..91fed8b7f 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 @@ -41,9 +41,21 @@ public class M4ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.935f * (float) zp); @@ -55,9 +67,6 @@ public class M4ItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); @@ -74,17 +83,6 @@ public class M4ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 2737b2243..29cfd99c4 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 @@ -84,9 +84,21 @@ public class M60ItemModel extends GeoModel { b1.setScaleZ(0); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(3.74f * (float) zp); @@ -96,9 +108,6 @@ public class M60ItemModel extends GeoModel { gun.setRotZ(-0.087f * (float) zp + (float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(-0.03f * (float) (fp + 2 * fr)); shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); @@ -117,17 +126,6 @@ public class M60ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 dd450acec..599661333 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 @@ -41,9 +41,21 @@ public class M79ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.2f * (float) zp); @@ -53,9 +65,6 @@ public class M79ItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zpz)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); @@ -72,17 +81,6 @@ public class M79ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 d74e23b2d..5e5f46d0a 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 @@ -41,9 +41,21 @@ public class M870ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.7f * (float) zp); @@ -55,9 +67,6 @@ public class M870ItemModel extends GeoModel { gun.setScaleZ(1f - (0.2f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.2f * (float) (fp + 2 * fr)); shen.setPosZ(2.6f * (float) (fp + 0.54f * fr)); @@ -75,17 +84,6 @@ public class M870ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 f8bf25404..cc756f912 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 @@ -41,26 +41,35 @@ public class M98bItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { - shen.setPosY(0.4f * (float) (fp + 2 * fr)); - shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.18f * (float) (fp + fr)); + shen.setPosY(0.2f * (float) (fp + 2 * fr)); + shen.setPosZ(4.6f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.1f * (float) (fp + fr)); shen.setRotZ(0f); } else { - shen.setPosY(0.7f * (float) (fp + 2 * fr)); - shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); - shen.setRotX(0.25f * (float) (0.18f * fp + fr)); + shen.setPosY(0.3f * (float) (fp + 2 * fr)); + shen.setPosZ(5.2f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.15f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (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)); - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); - gun.setPosX(2.245f * (float) zp); gun.setPosY(0.3f * (float) zp - (float) (0.2f * zpz)); @@ -69,21 +78,12 @@ public class M98bItemModel extends GeoModel { gun.setRotZ((float) (0.02f * zpz)); + stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.8)); + CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone zhunxing = getAnimationProcessor().getBone("shi"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 88ce5da79..9b68e3822 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 @@ -40,9 +40,21 @@ public class MarlinItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.712f * (float) zp); @@ -54,9 +66,6 @@ public class MarlinItemModel extends GeoModel { gun.setScaleZ(1f - (0.5f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosX(-0.2f * (float) (fp + 2 * fr)); shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(1.9f * (float) (1.3 * fp + 0.54f * fr)); @@ -72,17 +81,6 @@ public class MarlinItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 d16b5a3ab..89e22a01f 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 @@ -47,16 +47,25 @@ public class MinigunItemModel extends GeoModel { } float times = 250f / fps; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; + float heat = (float) stack.getOrCreateTag().getDouble("heat"); heat_barrels.setScaleZ(4 * heat); gun.setRotZ((float) (gun.getRotZ() + times * -0.008f * stack.getOrCreateTag().getDouble("minigun_rotation"))); - - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosY(0.1f * (float) (fp + 2 * fr)); shen.setPosZ(2.2f * (float) (0.5 * fp + 1.54f * fr)); shen.setRotX(0.05f * (float) (0.18f * fp + fr)); @@ -66,17 +75,6 @@ public class MinigunItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 d6907af0e..f8216233f 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 @@ -51,9 +51,21 @@ public class Mk14ItemModel extends GeoModel { r.setRotX(-1.5f); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(3.105f * (float) zp); @@ -71,9 +83,6 @@ public class Mk14ItemModel extends GeoModel { CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.06f * (float) (fp + 2 * fr)); shen.setPosZ(0.9f * (float) (fp + 0.54f * fr)); @@ -105,17 +114,6 @@ public class Mk14ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 e06055547..86e52b9bf 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 @@ -47,9 +47,21 @@ public class MosinNagantItemModel extends GeoModel { if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.105f * (float) zp); gun.setPosY(0.766f * (float) zp - (float) (0.2f * zpz)); @@ -72,9 +84,6 @@ public class MosinNagantItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.4)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.07f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); @@ -95,17 +104,6 @@ public class MosinNagantItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 d892c8795..ee84b5ff7 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 @@ -44,42 +44,45 @@ public class Ntw20Model extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; + if (player.getPersistentData().getDouble("prone") > 0) { l.setRotX(-1.5f); r.setRotX(-1.5f); } - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { - shen.setPosY(0.4f * (float) (fp + 2 * fr)); - shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); + shen.setPosY(0.1f * (float) (fp + 2 * fr)); + shen.setPosZ(5.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (fp + fr)); shen.setRotZ(0f); } else { - shen.setPosY(1.2f * (float) (fp + 2 * fr)); - shen.setPosZ(7.2f * (float) (fp + 0.54f * fr)); + shen.setPosY(0.2f * (float) (fp + 2 * fr)); + shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (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)); - - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); - gun.setPosX(4.54f * (float) zp); - gun.setPosY(-0.45f * (float) zp - (float) (0.2f * zpz)); - gun.setPosZ(10.0f * (float) zp + (float) (0.3f * zpz)); - gun.setRotZ((float) (0.02f * zpz)); - gun.setScaleZ(1f - (0.8f * (float) zp)); - scope.setScaleZ(1f - (0.85f * (float) zp)); stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 4.3)); @@ -87,17 +90,6 @@ public class Ntw20Model extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 be2756a61..c549ccadd 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 @@ -42,9 +42,21 @@ public class Qbz95ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(3.73f * (float) zp); gun.setPosY(-0.5f * (float) zp - (float) (0.2f * zpz)); @@ -54,9 +66,6 @@ public class Qbz95ItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 3.1)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); @@ -79,17 +88,6 @@ public class Qbz95ItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 20a80e251..52204c1b8 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 @@ -46,8 +46,21 @@ public class RpgItemModel extends GeoModel { hammer.setRotX(-90 * Mth.DEG_TO_RAD); } - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.02f * (float) (fp + 2 * fr)); @@ -62,10 +75,6 @@ public class RpgItemModel extends GeoModel { } shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); - gun.setPosX(0.91f * (float) zp); gun.setPosY(-0.04f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(2f * (float) zp + (float) (0.15f * zpz)); @@ -75,17 +84,6 @@ public class RpgItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 0eaec1af0..12e24a9a2 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 @@ -45,9 +45,21 @@ public class RpkItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.69f * (float) zp); @@ -70,9 +82,6 @@ public class RpkItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 1.65)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.7f * (float) (fp + 0.54f * fr)); @@ -91,17 +100,6 @@ public class RpkItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 3f1cf450a..d8e6509f0 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 @@ -44,9 +44,21 @@ public class SentinelItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.928f * (float) zp); @@ -71,17 +83,14 @@ public class SentinelItemModel extends GeoModel { CoreGeoBone holo = getAnimationProcessor().getBone("holo"); holo.setPosY(0.09f); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { - shen.setPosY(0.4f * (float) (fp + 2 * fr)); - shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); + shen.setPosY(0.1f * (float) (fp + 2 * fr)); + shen.setPosZ(4.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.12f * (float) (fp + fr)); shen.setRotZ(0f); } else { - shen.setPosY(0.7f * (float) (fp + 2 * fr)); - shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); + shen.setPosY(0.2f * (float) (fp + 2 * fr)); + shen.setPosZ(5.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.15f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); } @@ -94,17 +103,6 @@ public class SentinelItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 5979e1697..664babe86 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 @@ -47,9 +47,21 @@ public class SksItemModel extends GeoModel { bolt.setPosZ(2.5f); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.53f * (float) zp); @@ -65,9 +77,6 @@ public class SksItemModel extends GeoModel { CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.04f * (float) (fp + 2 * fr)); holo.setPosY(-0.43f * (float) (fp + 2.3 * fr)); @@ -86,17 +95,6 @@ public class SksItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 604513a6d..8e0762e39 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 @@ -51,9 +51,21 @@ public class SvdItemModel extends GeoModel { bolt.setPosZ(3.25f); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.02f * (float) zp); @@ -75,9 +87,6 @@ public class SvdItemModel extends GeoModel { CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); @@ -99,17 +108,6 @@ public class SvdItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 266679cf2..9d3307100 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 @@ -48,6 +48,22 @@ public class TaserItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; + AtomicInteger energy = new AtomicInteger(0); stack.getCapability(ForgeCapabilities.ENERGY).ifPresent( e -> energy.set(e.getEnergyStored()) @@ -73,9 +89,6 @@ public class TaserItemModel extends GeoModel { redcover.setScaleZ(1); } - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosX(-0.05f * (float) (fp + 0.2 * fr)); shen.setPosY(0.1f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (1.3 * fp + 0.54f * fr)); @@ -83,10 +96,6 @@ public class TaserItemModel extends GeoModel { shen.setRotY(0.02f * (float) fr); shen.setRotZ(-0.02f * (float) (fp + 1.3 * fr)); - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); - gun.setPosX(1.82f * (float) zp); gun.setPosY(1.3f * (float) zp - (float) (0.3f * zpz)); @@ -98,17 +107,6 @@ public class TaserItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 04048afcf..9d7e21a38 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 @@ -39,9 +39,21 @@ public class TracheliumItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(1.48f * (float) zp); @@ -53,9 +65,6 @@ public class TracheliumItemModel extends GeoModel { gun.setScaleZ(1f - (0.2f * (float) zp)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - shen.setPosX(-0.4f * (float) (fp + 0.2 * fr)); shen.setPosY(0.6f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (1.3 * fp + 0.54f * fr)); @@ -66,17 +75,6 @@ public class TracheliumItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); 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 01d5ab7fc..7ca90852d 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 @@ -53,9 +53,21 @@ public class VectorItemModel extends GeoModel { kmj.setRotX(0); } - double zt = ClientEventHandler.getZoomTime(); - double zp = ClientEventHandler.getZoomPos(); - double zpz = ClientEventHandler.getZoomPosZ(); + double zt = ClientEventHandler.zoomTime; + double zp = ClientEventHandler.zoomPos; + double zpz = ClientEventHandler.zoomPosZ; + double swayX = ClientEventHandler.swayX; + double swayY = ClientEventHandler.swayY; + float moveRotZ = (float) ClientEventHandler.moveRotZ; + float movePosX = (float) ClientEventHandler.movePosX; + float movePosY = (float) ClientEventHandler.movePosY; + double mph = ClientEventHandler.movePosHorizon; + double vY = ClientEventHandler.velocityY; + double turnRotX = ClientEventHandler.turnRot[0]; + double turnRotY = ClientEventHandler.turnRot[1]; + double turnRotZ = ClientEventHandler.turnRot[2]; + double fp = ClientEventHandler.firePos; + double fr = ClientEventHandler.fireRot; gun.setPosX(2.35f * (float) zp); @@ -71,9 +83,6 @@ public class VectorItemModel extends GeoModel { stack.getOrCreateTag().putBoolean("HoloHidden", !(gun.getPosX() > 2)); - double fp = ClientEventHandler.getFirePos(); - double fr = ClientEventHandler.getFireRot(); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { shen.setPosY(0.05f * (float) (fp + 2 * fr)); holo.setPosY(-0.43f * (float) (fp + 2.3 * fr)); @@ -90,17 +99,6 @@ public class VectorItemModel extends GeoModel { CoreGeoBone root = getAnimationProcessor().getBone("root"); CoreGeoBone move = getAnimationProcessor().getBone("move"); - double swayX = ClientEventHandler.getSwayX(); - double swayY = ClientEventHandler.getSwayY(); - 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); diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index caf8620b4..4716f84ea 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -35,41 +35,41 @@ import static net.mcreator.superbwarfare.entity.DroneEntity.ROT_Z; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) public class ClientEventHandler { public static double zoomTime = 0; - private static double zoomPos = 0; - private static double zoomPosZ = 0; - private static double swayTime = 0; - private static double swayX = 0; - private static double swayY = 0; - private static double moveXTime = 0; - private static double moveYTime = 0; - private static double movePosX = 0; - private static double movePosY = 0; - private static double moveRotZ = 0; - private static double movePosHorizon = 0; - private static double velocityY = 0; + public static double zoomPos = 0; + public static double zoomPosZ = 0; + public static double swayTime = 0; + public static double swayX = 0; + public static double swayY = 0; + public static double moveXTime = 0; + public static double moveYTime = 0; + public static double movePosX = 0; + public static double movePosY = 0; + public static double moveRotZ = 0; + public static double movePosHorizon = 0; + public static double velocityY = 0; public static double[] turnRot = {0, 0, 0}; public static double[] cameraRot = {0, 0, 0}; - private static double firePosTimer = 0; - private static double fireRotTimer = 0; - private static double firePos = 0; - private static double firePosZ = 0; - private static double fireRot = 0; - private static double droneCameraRotX = 0; - private static double droneCameraRotY = 0; - private static double droneRotX = 0; - private static double droneRotZ = 0; - private static double breathTime = 0; + public static double firePosTimer = 0; + public static double fireRotTimer = 0; + public static double firePos = 0; + public static double firePosZ = 0; + public static double fireRot = 0; + public static double droneCameraRotX = 0; + public static double droneCameraRotY = 0; + public static double droneRotX = 0; + public static double droneRotZ = 0; + public static double breathTime = 0; public static double fov = 0; - private static double pullTimer = 0; - private static double bowTimer = 0; - private static double handTimer = 0; - private static double pullPos = 0; - private static double bowPos = 0; - private static double handPos = 0; + public static double pullTimer = 0; + public static double bowTimer = 0; + public static double handTimer = 0; + public static double pullPos = 0; + public static double bowPos = 0; + public static double handPos = 0; @SubscribeEvent public static void handleWeaponTurn(RenderHandEvent event) { @@ -81,26 +81,16 @@ public class ClientEventHandler { float yRotOffset = Mth.lerp(event.getPartialTick(), player.yBobO, player.yBob); float xRot = player.getViewXRot(event.getPartialTick()) - xRotOffset; float yRot = player.getViewYRot(event.getPartialTick()) - yRotOffset; - turnRot[0] = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime); - turnRot[1] = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime); - turnRot[2] = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime); + if (player.getMainHandItem().is(ModTags.Items.GUN)) { + turnRot[0] = Mth.clamp(0.05 * xRot, -5, 5) * (1 - 0.75 * zoomTime); + turnRot[1] = Mth.clamp(0.05 * yRot, -10, 10) * (1 - 0.75 * zoomTime); + turnRot[2] = Mth.clamp(0.1 * yRot, -10, 10) * (1 - zoomTime); + } droneCameraRotX = Mth.clamp(0.25f * xRot, -10, 10); droneCameraRotY = Mth.clamp(0.25f * yRot, -20, 10); } - public static double getTurnRotX() { - return turnRot[0]; - } - - public static double getTurnRotY() { - return turnRot[1]; - } - - public static double getTurnRotZ() { - return turnRot[2]; - } - @SubscribeEvent public static void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) { ClientLevel level = Minecraft.getInstance().level; @@ -221,14 +211,6 @@ public class ClientEventHandler { } } - public static double getSwayX() { - return swayX; - } - - public static double getSwayY() { - return swayY; - } - private static void handleWeaponMove(LivingEntity entity) { if (entity.getMainHandItem().is(ModTags.Items.GUN)) { float times = 4.5f * Minecraft.getInstance().getDeltaFrameTime(); @@ -317,26 +299,6 @@ public class ClientEventHandler { } } - public static double getMoveRotZ() { - return moveRotZ; - } - - public static double getMovePosX() { - return movePosX; - } - - public static double getMovePosY() { - return movePosY; - } - - public static double getMovePosHorizon() { - return movePosHorizon; - } - - public static double getVelocityY() { - return velocityY; - } - private static void handleWeaponZoom() { float times = 5 * Minecraft.getInstance().getDeltaFrameTime(); if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { @@ -348,18 +310,6 @@ public class ClientEventHandler { zoomPosZ = -Math.pow(2 * zoomTime - 1, 2) + 1; } - public static double getZoomTime() { - return zoomTime; - } - - public static double getZoomPos() { - return zoomPos; - } - - public static double getZoomPosZ() { - return zoomPosZ; - } - private static void handleWeaponFire(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) { float times = 1.5f * Minecraft.getInstance().getDeltaFrameTime(); double yaw = event.getYaw(); @@ -415,14 +365,6 @@ public class ClientEventHandler { } } - public static double getFirePos() { - return firePos; - } - - public static double getFireRot() { - return fireRot; - } - private static void handlePlayerBreath(LivingEntity entity) { float times = 4 * Minecraft.getInstance().getDeltaFrameTime(); @@ -476,18 +418,6 @@ public class ClientEventHandler { bowPos = 0.5 * Math.cos(Math.PI * Math.pow(Math.pow(bowTimer, 2) - 1, 2)) + 0.5; } - public static double getHandPos() { - return handPos; - } - - public static double getPullPos() { - return pullPos; - } - - public static double getBowPos() { - return bowPos; - } - @SubscribeEvent public static void onFovUpdate(ViewportEvent.ComputeFov event) { Player player = Minecraft.getInstance().player;