From 89f3852a42bb515515b5598319a3661f77132320 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 3 Jun 2024 01:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=88=E6=98=AF=E4=BF=AE=E5=A4=8D=E5=8A=A8?= =?UTF-8?q?=E7=94=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mcreator/target/client/model/item/AK47ItemModel.java | 1 + .../net/mcreator/target/client/model/item/Aa12ItemModel.java | 1 + .../net/mcreator/target/client/model/item/BocekItemModel.java | 1 + .../mcreator/target/client/model/item/DevotionItemModel.java | 1 + .../net/mcreator/target/client/model/item/Hk416ItemModel.java | 1 + .../target/client/model/item/HuntingRifleItemModel.java | 1 + .../net/mcreator/target/client/model/item/KraberItemModel.java | 1 + .../java/net/mcreator/target/client/model/item/M4ItemModel.java | 1 + .../net/mcreator/target/client/model/item/M60ItemModel.java | 1 + .../net/mcreator/target/client/model/item/M79ItemModel.java | 1 + .../net/mcreator/target/client/model/item/M870ItemModel.java | 1 + .../net/mcreator/target/client/model/item/M98bItemModel.java | 1 + .../net/mcreator/target/client/model/item/MinigunItemModel.java | 1 + .../net/mcreator/target/client/model/item/Mk14ItemModel.java | 1 + .../net/mcreator/target/client/model/item/RpgItemModel.java | 1 + .../net/mcreator/target/client/model/item/RpkItemModel.java | 1 + .../mcreator/target/client/model/item/SentinelItemModel.java | 1 + .../net/mcreator/target/client/model/item/SksItemModel.java | 1 + .../net/mcreator/target/client/model/item/SvdItemModel.java | 1 + .../net/mcreator/target/client/model/item/TaserItemModel.java | 1 + .../net/mcreator/target/client/model/item/VectorItemModel.java | 1 + src/main/java/net/mcreator/target/event/ClientEventHandler.java | 2 ++ 22 files changed, 23 insertions(+) diff --git a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java index 7762e0bda..d3946e2ad 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java @@ -83,6 +83,7 @@ public class AK47ItemModel extends GeoModel { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/Aa12ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/Aa12ItemModel.java index 56791ada4..d5e07a85b 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Aa12ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/Aa12ItemModel.java @@ -56,6 +56,7 @@ public class Aa12ItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(5f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java b/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java index c779490cc..3c2a4b57e 100644 --- a/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java @@ -119,6 +119,7 @@ public class BocekItemModel extends GeoModel { fire.setPosY(-0.01f * (float) (fp + 2 * fr)); fire.setPosZ(3f * (float) (fp + 0.54f * fr)); fire.setRotX(0.003f * (float) (fp + fr)); + fire.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { fire.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java index 45842dc06..bf063228e 100644 --- a/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java @@ -69,6 +69,7 @@ public class DevotionItemModel extends GeoModel { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.4f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java index e5a13a33f..f717d6d1a 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java @@ -80,6 +80,7 @@ public class Hk416ItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java index cb883d835..f9afb0dbb 100644 --- a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java @@ -57,6 +57,7 @@ public class HuntingRifleItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/KraberItemModel.java b/src/main/java/net/mcreator/target/client/model/item/KraberItemModel.java index f1aa93e07..330cfe013 100644 --- a/src/main/java/net/mcreator/target/client/model/item/KraberItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/KraberItemModel.java @@ -50,6 +50,7 @@ public class KraberItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java index 990dc87a4..3c8decee5 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java @@ -58,6 +58,7 @@ public class M4ItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java index 05c4d4bdd..df85f950b 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java @@ -98,6 +98,7 @@ public class M60ItemModel extends GeoModel { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java index 3f5ce224e..335ab4c11 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M79ItemModel.java @@ -68,6 +68,7 @@ public class M79ItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/M870ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M870ItemModel.java index c8fb35977..8d03d8153 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M870ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M870ItemModel.java @@ -68,6 +68,7 @@ public class M870ItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.12f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/M98bItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M98bItemModel.java index 0d2a89ce7..396bddd70 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M98bItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M98bItemModel.java @@ -42,6 +42,7 @@ public class M98bItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.12f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/MinigunItemModel.java b/src/main/java/net/mcreator/target/client/model/item/MinigunItemModel.java index 4ef512569..65a47b035 100644 --- a/src/main/java/net/mcreator/target/client/model/item/MinigunItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/MinigunItemModel.java @@ -52,6 +52,7 @@ public class MinigunItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java index 9fd292e90..1b9703f0f 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java @@ -72,6 +72,7 @@ public class Mk14ItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(2.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java b/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java index 934c70d7e..ec3dfd334 100644 --- a/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java @@ -49,6 +49,7 @@ public class RpgItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java b/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java index 2b09c4f1b..a3d06340a 100644 --- a/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java @@ -89,6 +89,7 @@ public class RpkItemModel extends GeoModel { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java index 24ee37103..e3da6a140 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java @@ -85,6 +85,7 @@ public class SentinelItemModel extends GeoModel { shen.setPosY(0.4f * (float) (fp + 2 * fr)); shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.12f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java index 4f44634d1..e9ede68ae 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java @@ -74,6 +74,7 @@ public class SksItemModel extends GeoModel { shen.setPosY(-0.01f * (float) (fp + 2 * fr)); shen.setPosZ(0.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java index 06d3b982f..eb6c9c6aa 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java @@ -97,6 +97,7 @@ public class SvdItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java index f3fc432dd..18f758b71 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java @@ -39,6 +39,7 @@ public class TaserItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(0.5f * (float) (fp + 0.54f * fr)); shen.setRotX(0.02f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.0025f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java b/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java index a50b9a35a..fcac85490 100644 --- a/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java @@ -73,6 +73,7 @@ public class VectorItemModel extends GeoModel { shen.setPosY(0.02f * (float) (fp + 2 * fr)); shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.003f * (float) (fp + fr)); + shen.setRotZ(0f); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { shen.setRotY(0.015f * (float) fr); } else { diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 301b21506..fa937b488 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -424,6 +424,8 @@ public class ClientEventHandler { (pose * (4.34 * Math.pow(data.getDouble("firetime"), 2) - 6.5 * data.getDouble("firetime") + 2.167 + data.getDouble("firepos2")))); } + + if (0 < data.getDouble("fire_rotx_time") && data.getDouble("fire_rotx_time") < 1.732) { data.putDouble("fire_rotx_time", (data.getDouble("fire_rotx_time") + 0.12 * (1.9 - data.getDouble("fire_rotx_time")) * times)); }