From cb1756f6b13c847ef0fd50156ce018d0dfadf3ab Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 2 Nov 2024 22:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=BC=98=E5=8C=96=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BD=8E=E5=B8=A7=E7=8E=87?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/AK12ItemModel.java | 12 +-- .../client/model/item/AK47ItemModel.java | 10 +-- .../client/model/item/Aa12ItemModel.java | 5 +- .../client/model/item/AbekiriItemModel.java | 3 +- .../client/model/item/BocekItemModel.java | 4 +- .../client/model/item/DevotionItemModel.java | 5 +- .../client/model/item/Glock17ItemModel.java | 5 +- .../client/model/item/Glock18ItemModel.java | 5 +- .../client/model/item/Hk416ItemModel.java | 17 ++-- .../model/item/HuntingRifleItemModel.java | 3 +- .../client/model/item/JavelinItemModel.java | 3 +- .../client/model/item/K98ItemModel.java | 3 +- .../client/model/item/M1911ItemModel.java | 5 +- .../client/model/item/M4ItemModel.java | 8 +- .../client/model/item/M60ItemModel.java | 5 +- .../client/model/item/M79ItemModel.java | 3 +- .../client/model/item/M870ItemModel.java | 3 +- .../client/model/item/M98bItemModel.java | 3 +- .../client/model/item/MarlinItemModel.java | 3 +- .../client/model/item/MinigunItemModel.java | 8 +- .../client/model/item/Mk14ItemModel.java | 5 +- .../model/item/MosinNagantItemModel.java | 3 +- .../client/model/item/Ntw20Model.java | 3 +- .../client/model/item/Qbz95ItemModel.java | 3 +- .../client/model/item/RpgItemModel.java | 3 +- .../client/model/item/RpkItemModel.java | 6 +- .../client/model/item/SentinelItemModel.java | 9 +- .../client/model/item/SvdItemModel.java | 5 +- .../client/model/item/TaserItemModel.java | 3 +- .../model/item/TracheliumItemModel.java | 3 +- .../client/model/item/VectorItemModel.java | 5 +- .../assets/superbwarfare/geo/hk416.geo.json | 86 +++++++++---------- 32 files changed, 130 insertions(+), 117 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 ba729d293..58e2d4c2a 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 @@ -67,7 +67,7 @@ public class AK12ItemModel extends GeoModel { double turnRotX = ClientEventHandler.turnRot[0]; double turnRotY = ClientEventHandler.turnRot[1]; double turnRotZ = ClientEventHandler.turnRot[2]; - double fpz = ClientEventHandler.firePosZ * 13 * times;; + double fpz = ClientEventHandler.firePosZ * 13 * times; double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; @@ -122,21 +122,21 @@ public class AK12ItemModel extends GeoModel { }; } - fireRotY = (float) Mth.lerp(0.5f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); - fireRotZ = (float) Mth.lerp(0.7f * times, fireRotZ, (0.4f + 0.5 * fr) * ClientEventHandler.recoilHorizon); + fireRotY = (float) Mth.lerp(0.3f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); + fireRotZ = (float) Mth.lerp(2f * times, fireRotZ, (0.4f + 0.5 * fpz) * ClientEventHandler.recoilHorizon); - shen.setPosX((float) (-1.65f * ClientEventHandler.recoilHorizon * fpz * fp)); + 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.setRotX((float) (0.01f * fp + 0.08f * fr + 0.01f * fpz)); shen.setRotY(fireRotY); shen.setRotZ(fireRotZ); - shen.setPosX((float) (shen.getPosX() * (1 - 0.1 * zt))); + shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosY((float) (shen.getPosY() * (-1 + 0.8 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.6 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - 0.9 * zt))); - shen.setRotY((float) (shen.getRotY() * (1 - 0.75 * zt))); + shen.setRotY((float) (shen.getRotY() * (1 - 0.85 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.4 * zt))); shuan.setPosZ(2.4f * (float) fp); 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 643bfbdb1..89dc2b9e2 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 @@ -123,21 +123,21 @@ public class AK47ItemModel extends GeoModel { }; } - fireRotY = (float) Mth.lerp(0.5f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); - fireRotZ = (float) Mth.lerp(0.7f * times, fireRotZ, (0.4f + 0.5 * fr) * ClientEventHandler.recoilHorizon); + fireRotY = (float) Mth.lerp(0.3f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); + fireRotZ = (float) Mth.lerp(2f * times, fireRotZ, (0.4f + 0.5 * fpz) * ClientEventHandler.recoilHorizon); - shen.setPosX((float) (-1.65f * ClientEventHandler.recoilHorizon * fpz * fp)); + 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.setRotX((float) (0.01f * fp + 0.08f * fr + 0.01f * fpz)); shen.setRotY(fireRotY); shen.setRotZ(fireRotZ); - shen.setPosX((float) (shen.getPosX() * (1 - 0.1 * zt))); + shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosY((float) (shen.getPosY() * (-1 + 0.8 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.6 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - 0.9 * zt))); - shen.setRotY((float) (shen.getRotY() * (1 - 0.75 * zt))); + shen.setRotY((float) (shen.getRotY() * (1 - 0.85 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.4 * zt))); shuan.setPosZ(2.4f * (float) fp); 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 924a0fd44..015ff97e3 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 @@ -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.shotgun.Aa12Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -40,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -53,7 +54,7 @@ public class Aa12ItemModel 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/AbekiriItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/AbekiriItemModel.java index 9cb4f9329..0f7c43394 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -53,7 +54,7 @@ public class AbekiriItemModel 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/BocekItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/BocekItemModel.java index 9e4277ff7..ca867a1b9 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,8 @@ public class BocekItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - double fpz = ClientEventHandler.firePosZ; + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); + double fpz = ClientEventHandler.firePosZ * 13 * times; double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; double pp = ClientEventHandler.pullPos; @@ -69,7 +70,6 @@ public class BocekItemModel extends GeoModel { double turnRotX = ClientEventHandler.turnRot[0]; double turnRotY = ClientEventHandler.turnRot[1]; double turnRotZ = ClientEventHandler.turnRot[2]; - double zt = ClientEventHandler.zoomTime; arrow.setPosZ(9f * (float) bp); rh.setPosZ(9f * (float) hp); 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 1b4816236..9db1a83f1 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 @@ -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.machinegun.DevotionItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -45,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -58,7 +59,7 @@ public class DevotionItemModel 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/Glock17ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock17ItemModel.java index fb3c22fd3..246579cfe 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 @@ -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.handgun.Glock17Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -42,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -55,7 +56,7 @@ public class Glock17ItemModel 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/Glock18ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Glock18ItemModel.java index 0390edbdd..5f599f1a7 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 @@ -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.handgun.Glock18Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -50,6 +50,7 @@ public class Glock18ItemModel extends GeoModel { switch_.setRotX(0); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -63,7 +64,7 @@ public class Glock18ItemModel 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/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index e9b06cb47..dd6d96950 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 @@ -80,12 +80,15 @@ public class Hk416ItemModel extends GeoModel { default -> 0f; }; float scaleZ = switch (type) { + case 0 -> 0.2f; + case 1 -> 0.4f; case 2 -> 0.8f; case 3 -> 0.78f; default -> 0f; }; float posZ = switch (type) { - case 0, 1 -> 3.8f; + case 0 -> 3f; + case 1 -> 3.5f; case 2 -> 7.4f; case 3 -> 6.8f; default -> 0f; @@ -116,9 +119,9 @@ public class Hk416ItemModel extends GeoModel { } fireRotY = (float) Mth.lerp(0.5f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); - fireRotZ = (float) Mth.lerp(0.9f * times, fireRotZ, (0.2f + 0.3 * fr) * ClientEventHandler.recoilHorizon); + fireRotZ = (float) Mth.lerp(2f * times, fireRotZ, (0.2f + 0.3 * fpz) * ClientEventHandler.recoilHorizon); - shen.setPosX((float) (-3.45f * ClientEventHandler.recoilHorizon * fpz * fp)); + 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.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); @@ -127,17 +130,15 @@ public class Hk416ItemModel extends GeoModel { shen.setPosX((float) (shen.getPosX() * (1 - 0.1 * zt))); shen.setPosY((float) (shen.getPosY() * (-1 + 0.8 * zt))); - shen.setPosZ((float) (shen.getPosZ() * (1 - 0.6 * zt))); - shen.setRotX((float) (shen.getRotX() * (1 - 0.9 * zt))); - shen.setRotY((float) (shen.getRotY() * (1 - 0.75 * zt))); + shen.setPosZ((float) (shen.getPosZ() * (1 + 0.3 * zt))); + shen.setRotX((float) (shen.getRotX() * (1 - (type == 3 ? 0.96 : type == 1 ? 0.8 : 0.9) * zt))); + shen.setRotY((float) (shen.getRotY() * (1 - (type == 3 ? 0.95 : 0.9) * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.4 * zt))); cross1.setPosY(-0.75f * (float) fpz); cross2.setPosY(-0.7f * (float) fpz); cross3.setPosY(-0.2f * (float) fpz); - shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); - CoreGeoBone l = getAnimationProcessor().getBone("l"); CoreGeoBone r = getAnimationProcessor().getBone("r"); rotXBipod = Mth.lerp(1.5f * times, rotXBipod, isProne(player) ? -90 : 0); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java index d9209f0ec..d5b863b97 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -52,7 +53,7 @@ public class HuntingRifleItemModel 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/JavelinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/JavelinItemModel.java index 977e951aa..e9459e679 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,6 +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); double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; double swayX = ClientEventHandler.swayX; @@ -52,7 +53,7 @@ public class JavelinItemModel 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/K98ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/K98ItemModel.java index 48f77aee6..28ea46f62 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,6 +51,7 @@ public class K98ItemModel extends GeoModel { clip.setScaleZ(1); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -64,7 +65,7 @@ public class K98ItemModel 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/M1911ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M1911ItemModel.java index 59392b067..65544e1ac 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 @@ -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.handgun.M1911Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -42,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -55,7 +56,7 @@ public class M1911ItemModel 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/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index e1d54732a..ee1f8dfa0 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 @@ -138,9 +138,9 @@ public class M4ItemModel extends GeoModel { } fireRotY = (float) Mth.lerp(0.5f * times, fireRotY, 0.2f * ClientEventHandler.recoilHorizon * fpz); - fireRotZ = (float) Mth.lerp(0.9f * times, fireRotZ, (0.2f + 0.3 * fr) * ClientEventHandler.recoilHorizon); + fireRotZ = (float) Mth.lerp(2f * times, fireRotZ, (0.2f + 0.3 * fpz) * ClientEventHandler.recoilHorizon); - shen.setPosX((float) (-3.45f * ClientEventHandler.recoilHorizon * fpz * fp)); + 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.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); @@ -154,13 +154,11 @@ public class M4ItemModel extends GeoModel { shen.setPosX((float) (shen.getPosX() * (1 - 0.1 * zt))); shen.setPosY((float) (shen.getPosY() * (-1 + 0.8 * zt))); - shen.setPosZ((float) (shen.getPosZ() * (1 - 0.6 * zt))); + shen.setPosZ((float) (shen.getPosZ() * (1 + 0.3 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - (type == 3 ? 0.96 : type == 1 ? 0.8 : 0.9) * zt))); shen.setRotY((float) (shen.getRotY() * (1 - (type == 3 ? 0.95 : 0.9) * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.4 * zt))); - shen.setPosX(0.2f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); - CoreGeoBone l = getAnimationProcessor().getBone("l"); CoreGeoBone r = getAnimationProcessor().getBone("r"); rotXBipod = Mth.lerp(1.5f * times, rotXBipod, isProne(player) ? -90 : 0); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M60ItemModel.java index a3df78ead..dae40d3a9 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 @@ -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.machinegun.M60Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -85,6 +85,7 @@ public class M60ItemModel extends GeoModel { b1.setScaleZ(0); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -98,7 +99,7 @@ public class M60ItemModel 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/M79ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M79ItemModel.java index b922dee31..4c070de32 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -52,7 +53,7 @@ public class M79ItemModel 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/M870ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M870ItemModel.java index 9369b7122..773440a65 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -52,7 +53,7 @@ public class M870ItemModel 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/M98bItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M98bItemModel.java index 6138f8881..bf9789d67 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -55,7 +56,7 @@ public class M98bItemModel 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/MarlinItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MarlinItemModel.java index d2827f917..22be5bf7d 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -53,7 +54,7 @@ public class MarlinItemModel 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/MinigunItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MinigunItemModel.java index fda0620af..aa4f2ab17 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,11 +40,7 @@ public class MinigunItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return; - float fps = Minecraft.getInstance().getFps(); - if (fps <= 0) { - fps = 1f; - } - float times = 250f / fps; + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double swayX = ClientEventHandler.swayX; double swayY = ClientEventHandler.swayY; @@ -56,7 +52,7 @@ public class MinigunItemModel 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/Mk14ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Mk14ItemModel.java index 93641649d..d10a26b82 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 @@ -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.Mk14Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -52,6 +52,7 @@ public class Mk14ItemModel extends GeoModel { r.setRotX(-1.5f); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -65,7 +66,7 @@ public class Mk14ItemModel 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/MosinNagantItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/MosinNagantItemModel.java index 60ada5e04..acfadbb94 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -58,7 +59,7 @@ public class MosinNagantItemModel 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/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 75ad37128..21315b736 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -57,7 +58,7 @@ public class Ntw20Model 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/Qbz95ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Qbz95ItemModel.java index c524ca533..af4369ca4 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -53,7 +54,7 @@ public class Qbz95ItemModel 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/RpgItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpgItemModel.java index 8603a25c5..5a7990fa7 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -57,7 +58,7 @@ public class RpgItemModel 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/RpkItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/RpkItemModel.java index 3d7ddfcbf..fdb233263 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 @@ -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.machinegun.RpkItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -35,7 +35,6 @@ public class RpkItemModel extends GeoModel { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone scope = getAnimationProcessor().getBone("pka"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone button = getAnimationProcessor().getBone("button"); CoreGeoBone shuan = getAnimationProcessor().getBone("shuan"); @@ -44,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -57,7 +57,7 @@ public class RpkItemModel 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/SentinelItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SentinelItemModel.java index ae2c6a9bd..f92e46224 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -55,7 +56,7 @@ public class SentinelItemModel 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; @@ -71,12 +72,6 @@ public class SentinelItemModel extends GeoModel { scope.setScaleZ(1f - (0.8f * (float) zp)); - float fps = Minecraft.getInstance().getFps(); - if (fps <= 0) { - fps = 1f; - } - float times = 250f / fps; - cb.setRotZ(cb.getRotZ() + times * 0.03f * (float) (stack.getOrCreateTag().getDouble("chamber_rot"))); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); 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 54d0fb8e2..166eff42b 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 @@ -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.sniper.SvdItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -51,6 +51,7 @@ public class SvdItemModel extends GeoModel { bolt.setPosZ(3.25f); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -64,7 +65,7 @@ public class SvdItemModel 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/TaserItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TaserItemModel.java index 13b14096d..4ded7acd7 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,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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -61,7 +62,7 @@ public class TaserItemModel 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/TracheliumItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/TracheliumItemModel.java index e994ea8fc..ee7be3876 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,6 +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); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -52,7 +53,7 @@ public class TracheliumItemModel 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/VectorItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/VectorItemModel.java index cc7150c04..2a5890414 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 @@ -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.smg.VectorItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -52,6 +52,7 @@ public class VectorItemModel extends GeoModel { kmj.setRotX(0); } + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getDeltaFrameTime(), 1.6); double zt = ClientEventHandler.zoomTime; double zp = ClientEventHandler.zoomPos; double zpz = ClientEventHandler.zoomPosZ; @@ -65,7 +66,7 @@ public class VectorItemModel 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/resources/assets/superbwarfare/geo/hk416.geo.json b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json index 9fdd9740f..48a1b1f4b 100644 --- a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.hk416", "texture_width": 256, "texture_height": 256, - "visible_bounds_width": 60, + "visible_bounds_width": 62, "visible_bounds_height": 12, "visible_bounds_offset": [0, -3, 0] }, @@ -9015,190 +9015,190 @@ { "name": "Cross1", "parent": "0", - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "cubes": [ { - "origin": [-1, 9.33906, -327.5], + "origin": [-1, 9.33906, -497.5], "size": [2, 0.5, 0], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-2.4319, 8.74595, -327.5], + "origin": [-2.4319, 8.74595, -497.5], "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.1145, -327.5], + "pivot": [-2.20684, 8.1145, -497.5], "rotation": [0, 0, -22.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-3.98178, 8.74595, -327.5], + "origin": [-3.98178, 8.74595, -497.5], "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.1145, -327.5], + "pivot": [-2.20684, 8.1145, -497.5], "rotation": [0, 0, -45], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-5.41369, 9.33906, -327.5], + "origin": [-5.41369, 9.33906, -497.5], "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.1145, -327.5], + "pivot": [-2.20684, 8.1145, -497.5], "rotation": [0, 0, -67.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-5.07771, 3.23633, -327.5], + "origin": [-5.07771, 3.23633, -497.5], "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.60488, -327.5], + "pivot": [-3.30277, 2.60488, -497.5], "rotation": [0, 0, -135], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-6.50962, 3.82945, -327.5], + "origin": [-6.50962, 3.82945, -497.5], "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.60488, -327.5], + "pivot": [-3.30277, 2.60488, -497.5], "rotation": [0, 0, -157.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-3.52783, 3.23633, -327.5], + "origin": [-3.52783, 3.23633, -497.5], "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.60488, -327.5], + "pivot": [-3.30277, 2.60488, -497.5], "rotation": [0, 0, -112.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-5.77734, 4.56172, -327.5], + "origin": [-5.77734, 4.56172, -497.5], "size": [2, 0.5, 0], - "pivot": [-4.77734, 4.81172, -327.5], + "pivot": [-4.77734, 4.81172, -497.5], "rotation": [0, 0, -90], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-0.25, 9.83906, -327.5], + "origin": [-0.25, 9.83906, -497.5], "size": [0.5, 2, 0], - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "rotation": [0, 0, -90], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-0.25, 9.83906, -327.5], + "origin": [-0.25, 9.83906, -497.5], "size": [0.5, 2, 0], - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "rotation": [0, 0, 90], "uv": { "south": {"uv": [78.25, 56], "uv_size": [-0.25, 0.25]} } }, { - "origin": [-0.25, 9.83906, -327.5], + "origin": [-0.25, 9.83906, -497.5], "size": [0.5, 2, 0], - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "rotation": [0, 0, 0], "uv": { "south": {"uv": [78.25, 56], "uv_size": [-0.25, 0.25]} } }, { - "origin": [-0.25, 9.83906, -327.5], + "origin": [-0.25, 9.83906, -497.5], "size": [0.5, 2, 0], - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "rotation": [0, 0, -180], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-0.5, 4.31172, -327.5], + "origin": [-0.5, 4.31172, -497.5], "size": [1, 1, 0], - "pivot": [0, 4.81172, -327.5], + "pivot": [0, 4.81172, -497.5], "rotation": [0, 0, -135], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [3.52593, 8.07515, -327.5], + "origin": [3.52593, 8.07515, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 157.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [2.13479, 6.88081, -327.5], + "origin": [2.13479, 6.88081, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 112.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [2.94914, 7.33962, -327.5], + "origin": [2.94914, 7.33962, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 135], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [1.20684, 6.76857, -327.5], + "origin": [1.20684, 6.76857, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 90], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [0.30658, 7.01997, -327.5], + "origin": [0.30658, 7.01997, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 67.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-0.88776, 8.41112, -327.5], + "origin": [-0.88776, 8.41112, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 22.5], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [-0.42895, 7.59676, -327.5], + "origin": [-0.42895, 7.59676, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, 45], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]} } }, { - "origin": [3.77734, 8.97541, -327.5], + "origin": [3.77734, 8.97541, -497.5], "size": [2, 0.5, 0], - "pivot": [2.38867, 4.6299, -327.5], + "pivot": [2.38867, 4.6299, -497.5], "rotation": [0, 0, -180], "uv": { "south": {"uv": [78, 56], "uv_size": [0.25, 0.25]}