From 79f7c1a3c765ee90fbfb31f673873a605f86664d Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 2 Nov 2024 22:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BD=8E=E5=B8=A7=E7=8E=87=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/model/item/AK12ItemModel.java | 2 +- .../superbwarfare/client/model/item/AK47ItemModel.java | 4 ++-- .../superbwarfare/client/model/item/Aa12ItemModel.java | 2 +- .../superbwarfare/client/model/item/AbekiriItemModel.java | 2 +- .../superbwarfare/client/model/item/BocekItemModel.java | 2 +- .../superbwarfare/client/model/item/DevotionItemModel.java | 2 +- .../superbwarfare/client/model/item/Glock17ItemModel.java | 2 +- .../superbwarfare/client/model/item/Glock18ItemModel.java | 2 +- .../superbwarfare/client/model/item/Hk416ItemModel.java | 2 +- .../client/model/item/HuntingRifleItemModel.java | 2 +- .../superbwarfare/client/model/item/JavelinItemModel.java | 2 +- .../superbwarfare/client/model/item/K98ItemModel.java | 2 +- .../superbwarfare/client/model/item/M1911ItemModel.java | 2 +- .../superbwarfare/client/model/item/M4ItemModel.java | 2 +- .../superbwarfare/client/model/item/M60ItemModel.java | 2 +- .../superbwarfare/client/model/item/M79ItemModel.java | 2 +- .../superbwarfare/client/model/item/M870ItemModel.java | 2 +- .../superbwarfare/client/model/item/M98bItemModel.java | 2 +- .../superbwarfare/client/model/item/MarlinItemModel.java | 2 +- .../superbwarfare/client/model/item/MinigunItemModel.java | 2 +- .../superbwarfare/client/model/item/Mk14ItemModel.java | 2 +- .../client/model/item/MosinNagantItemModel.java | 2 +- .../mcreator/superbwarfare/client/model/item/Ntw20Model.java | 2 +- .../superbwarfare/client/model/item/Qbz95ItemModel.java | 2 +- .../superbwarfare/client/model/item/RpgItemModel.java | 2 +- .../superbwarfare/client/model/item/RpkItemModel.java | 2 +- .../superbwarfare/client/model/item/SentinelItemModel.java | 2 +- .../superbwarfare/client/model/item/SksItemModel.java | 5 +++-- .../superbwarfare/client/model/item/SvdItemModel.java | 2 +- .../superbwarfare/client/model/item/TaserItemModel.java | 2 +- .../superbwarfare/client/model/item/TracheliumItemModel.java | 2 +- .../superbwarfare/client/model/item/VectorItemModel.java | 2 +- 32 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK12ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK12ItemModel.java index 58e2d4c2a..3df45b8fb 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/AK12ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/AK12ItemModel.java @@ -53,7 +53,7 @@ public class AK12ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 89dc2b9e2..c63d40f82 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 @@ -48,7 +48,7 @@ public class AK47ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -128,7 +128,7 @@ public class AK47ItemModel extends GeoModel { shen.setPosX(-0.4f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosY((float) (0.15f * fp + 0.18f * fr)); - shen.setPosZ((float) (0.275 * fp + 0.34f * fr + 0.65 * fpz)); + shen.setPosZ((float) (0.365 * fp + 0.42f * fr + 0.95 * fpz)); shen.setRotX((float) (0.01f * fp + 0.08f * fr + 0.01f * fpz)); shen.setRotY(fireRotY); shen.setRotZ(fireRotZ); 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 015ff97e3..044a42260 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 @@ -40,7 +40,7 @@ public class Aa12ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 0f7c43394..b228a45cd 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,7 +40,7 @@ public class AbekiriItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 ca867a1b9..73b128dcd 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 @@ -51,7 +51,7 @@ public class BocekItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double fpz = ClientEventHandler.firePosZ * 13 * times; double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; 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 9db1a83f1..6b0651c04 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 @@ -45,7 +45,7 @@ public class DevotionItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 246579cfe..95e08cbdc 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 @@ -42,7 +42,7 @@ public class Glock17ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 5f599f1a7..ac88422c4 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 @@ -50,7 +50,7 @@ public class Glock18ItemModel extends GeoModel { switch_.setRotX(0); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 dd6d96950..fcc16a996 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 @@ -51,7 +51,7 @@ public class Hk416ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; 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 d5b863b97..b39da3e07 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,7 +39,7 @@ public class HuntingRifleItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 e9459e679..7d1e6af98 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 @@ -40,7 +40,7 @@ public class JavelinItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; double swayX = ClientEventHandler.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 28ea46f62..eac8146f7 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 @@ -51,7 +51,7 @@ public class K98ItemModel extends GeoModel { clip.setScaleZ(1); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 65544e1ac..19d5b020a 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 @@ -42,7 +42,7 @@ public class M1911ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 ee1f8dfa0..dffcfe853 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 @@ -60,7 +60,7 @@ public class M4ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 dae40d3a9..4efbb78e1 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 @@ -85,7 +85,7 @@ public class M60ItemModel extends GeoModel { b1.setScaleZ(0); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 4c070de32..8123f4878 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java @@ -39,7 +39,7 @@ public class M79ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 773440a65..3188e2442 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 @@ -39,7 +39,7 @@ public class M870ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 bf9789d67..fdffdc596 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 @@ -42,7 +42,7 @@ public class M98bItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 22be5bf7d..ebba1b5e8 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,7 +40,7 @@ public class MarlinItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 aa4f2ab17..26007785f 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 @@ -40,7 +40,7 @@ public class MinigunItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double swayX = ClientEventHandler.swayX; double swayY = ClientEventHandler.swayY; 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 d10a26b82..2d154bc74 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 @@ -52,7 +52,7 @@ public class Mk14ItemModel extends GeoModel { r.setRotX(-1.5f); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 acfadbb94..526060b6c 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 @@ -45,7 +45,7 @@ public class MosinNagantItemModel extends GeoModel { if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 21315b736..a286ae692 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,7 +44,7 @@ public class Ntw20Model extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 af4369ca4..6a7dc24ad 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 @@ -40,7 +40,7 @@ public class Qbz95ItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 5a7990fa7..0e90c58c1 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 @@ -44,7 +44,7 @@ public class RpgItemModel extends GeoModel { hammer.setRotX(-90 * Mth.DEG_TO_RAD); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 fdb233263..d2e72b3b1 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 @@ -43,7 +43,7 @@ public class RpkItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 f92e46224..e8a34c5b3 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 @@ -42,7 +42,7 @@ public class SentinelItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 0ef9f1cec..3e5247ebe 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 @@ -1,10 +1,10 @@ package net.mcreator.superbwarfare.client.model.item; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.gun.rifle.SksItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -41,6 +41,7 @@ public class SksItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -54,7 +55,7 @@ public class SksItemModel extends GeoModel { double turnRotX = ClientEventHandler.turnRot[0]; double turnRotY = ClientEventHandler.turnRot[1]; double turnRotZ = ClientEventHandler.turnRot[2]; - double fpz = ClientEventHandler.firePosZ; + double fpz = ClientEventHandler.firePosZ * 13 * times; double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; 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 166eff42b..77ea33a71 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,7 +51,7 @@ public class SvdItemModel extends GeoModel { bolt.setPosZ(3.25f); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 4ded7acd7..1d8e69c29 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,7 +48,7 @@ public class TaserItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 ee7be3876..4d340cf3b 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,7 +39,7 @@ public class TracheliumItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; 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 2a5890414..aa370964f 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 @@ -52,7 +52,7 @@ public class VectorItemModel extends GeoModel { kmj.setRotX(0); } - float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 0.8); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ;