From f9b8f9d055eea6b6d683fc8f78a791c2c8038eb4 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 11 Jan 2025 00:38:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E4=BB=93=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E6=AD=A6=E5=99=A8=E8=A7=86=E8=A7=92=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8D=95=E5=8F=91=E6=8D=A2=E5=BC=B9=E7=B1=BB=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E7=8B=82=E6=8C=89R=E6=97=A0=E6=B3=95=E6=8D=A2?= =?UTF-8?q?=E5=BC=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/model/item/Glock17ItemModel.java | 6 +++--- .../superbwarfare/client/model/item/Glock18ItemModel.java | 6 +++--- .../superbwarfare/client/model/item/M1911ItemModel.java | 4 ++-- .../superbwarfare/client/model/item/Mp443ItemModel.java | 4 ++-- .../atsuishio/superbwarfare/event/ClientEventHandler.java | 2 +- .../superbwarfare/network/message/ReloadMessage.java | 2 ++ .../superbwarfare/models/displaysettings/glock17.item.json | 4 ++-- .../superbwarfare/models/displaysettings/m1911.item.json | 4 ++-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java index 4d286d072..b7ee0ebd8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java @@ -63,9 +63,9 @@ public class Glock17ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(2.96f * (float) zp); + gun.setPosX(1.23f * (float) zp); - gun.setPosY(2.43f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(1.43f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz)); @@ -74,7 +74,7 @@ public class Glock17ItemModel extends GeoModel { shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); - shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz)); + shen.setRotX((float) (0.1f * fp + 0.15f * fr + 0.15f * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java index 1eeee193b..25d9f4869 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java @@ -72,9 +72,9 @@ public class Glock18ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(2.96f * (float) zp); + gun.setPosX(1.23f * (float) zp); - gun.setPosY(2.43f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(1.43f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz)); @@ -83,7 +83,7 @@ public class Glock18ItemModel extends GeoModel { shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); - shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz)); + shen.setRotX((float) (0.1f * fp + 0.15f * fr + 0.15f * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java index 42d3a32d9..f4ac55a6d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java @@ -64,9 +64,9 @@ public class M1911ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(2.96f * (float) zp); + gun.setPosX(1.23f * (float) zp); - gun.setPosY(2.53f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(1.53f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java index 9a6ab2f34..e0a78c1a5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java @@ -64,8 +64,8 @@ public class Mp443ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(2.96f * (float) zp); - gun.setPosY(2.53f * (float) zp - (float) (0.2f * zpz)); + gun.setPosX(1.23f * (float) zp); + gun.setPosY(1.53f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz)); gun.setScaleZ(1f - (0.55f * (float) zp)); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 1677542e1..10777e859 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -971,7 +971,7 @@ public class ClientEventHandler { } fireSpread = Mth.clamp(fireSpread - 0.1 * (Math.pow(fireSpread, 2) * times), 0, 2); - firePosZ = Mth.clamp(firePosZ - 1.2 * (Math.pow(firePosZ, 2) * times), 0, 1.5) * 0.98; + firePosZ = Mth.clamp(firePosZ - 1.2 * (Math.pow(firePosZ, 2) * times), 0, 1.5) * 0.95; if (0 < firePosTimer) { firePosTimer += 0.35 * (1.1 - firePosTimer) * times; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java index ba99b184c..7bcb6f844 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java @@ -54,6 +54,8 @@ public class ReloadMessage { && !GunsTool.getGunBooleanTag(stack, "Charging") && GunsTool.getGunIntTag(stack, "ReloadTime") == 0 && GunsTool.getGunIntTag(stack, "BoltActionTick") == 0 + && !GunsTool.getGunBooleanTag(stack, "Reloading") + ) { CompoundTag tag = stack.getOrCreateTag(); diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json index 74cb5b070..4ae83a3e3 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json @@ -33,8 +33,8 @@ }, "firstperson_righthand": { "translation": [ - -6.0, - 2.5, + -7.75, + 3.5, -1.5 ] }, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json index 4d30667a4..da3468e52 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json @@ -33,8 +33,8 @@ }, "firstperson_righthand": { "translation": [ - -6.75, - 2.75, + -7.75, + 3.75, -1.25 ] },