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 6d4b9ea85..403284b7f 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 @@ -84,22 +84,13 @@ public class AK47ItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(-0.03f * (float) (fp + 2 * fr)); shen.setPosZ(0.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); shuan.setPosZ(2.4f * (float) fp); 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 d0acfce02..332ea8d09 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 @@ -58,22 +58,13 @@ public class Aa12ItemModel extends GeoModel { shen.setPosZ(1.3f * (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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(0.08f * (float) (fp + 2 * fr)); shen.setPosZ(1.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); 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 3c2a4b57e..8e8f1e94d 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 @@ -120,21 +120,11 @@ public class BocekItemModel extends GeoModel { 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 { - fire.setRotY(-0.015f * (float) fr); - } } else { fire.setPosY(-0.03f * (float) (fp + 2 * fr)); fire.setPosZ(4f * (float) (fp + 0.54f * fr)); fire.setRotX(0.07f * (float) (0.18f * fp + fr)); fire.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - fire.setRotY(0.03f * (float) fr); - } else { - fire.setRotY(-0.03f * (float) fr); - } } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 e04cf308d..63adef6be 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 @@ -62,44 +62,31 @@ public class DevotionItemModel extends GeoModel { bolt.setPosZ(-2f * (float) bp); + CoreGeoBone holo = getAnimationProcessor().getBone("holo"); + CoreGeoBone flare = getAnimationProcessor().getBone("flare"); + if (gun.getPosX() > 1.2) { + holo.setHidden(false); + number.setHidden(false); + } else { + holo.setHidden(true); + number.setHidden(true); + } + double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - 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 { - shen.setRotY(-0.015f * (float) fr); - } + shen.setPosY(0.05f * (float) (fp + 2 * fr)); + holo.setPosY(-0.03f * (float) (fp + 2.3 * fr)); + shen.setPosZ(1.1f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.001f * (float) (fp + fr)); } else { shen.setPosY(-0.03f * (float) (fp + 2 * fr)); shen.setPosZ(0.75f * (float) (fp + 0.54f * fr)); shen.setRotX(0.02f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } - } - - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - if (gun.getPosX() > 1.2) { - holo.setScaleX(1); - holo.setScaleY(1); - number.setScaleX(1); - number.setScaleY(1); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - number.setScaleX(0); - number.setScaleY(0); } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); 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 dd50f7b85..0cc693ba4 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 @@ -77,26 +77,17 @@ public class Hk416ItemModel extends GeoModel { double fr = player.getPersistentData().getDouble("fire_rot"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - 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 { - shen.setRotY(-0.015f * (float) fr); - } + shen.setPosY(0.05f * (float) (fp + 2 * fr)); + holo.setPosY(-0.43f * (float) (fp + 2.3 * fr)); + shen.setPosZ(1.1f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.015f * (float) (fp + fr)); } else { shen.setPosY(0.04f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.03f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 94e3e8ab7..542de91a4 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 @@ -52,22 +52,13 @@ public class KraberItemModel extends GeoModel { 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 { - shen.setRotY(-0.025f * (float) fr); - } } else { shen.setPosY(1.2f * (float) (fp + 2 * fr)); shen.setPosZ(7.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); 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 2e92a050d..e12d596cc 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 @@ -59,22 +59,13 @@ public class M4ItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(0.04f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.03f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); 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 38e63d4a3..44c685343 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 @@ -100,22 +100,13 @@ public class M60ItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(-0.03f * (float) (fp + 2 * fr)); shen.setPosZ(0.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.04f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); tiba.setRotZ((float) (-0.25f * fp + 0.4 * fr)); 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 4bf738a47..a1e2e8429 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 @@ -69,22 +69,13 @@ public class M79ItemModel extends GeoModel { 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 { - shen.setRotY(-0.025f * (float) fr); - } } else { shen.setPosY(0.7f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.1f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 933800744..15eb58954 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 @@ -70,22 +70,13 @@ public class M870ItemModel extends GeoModel { shen.setPosZ(2.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.28f * (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 { - shen.setRotY(-0.025f * (float) fr); - } } else { shen.setPosY(0.3f * (float) (fp + 2 * fr)); shen.setPosZ(3.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.3f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); 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 a8b271928..705540296 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 @@ -44,22 +44,13 @@ public class M98bItemModel extends GeoModel { shen.setPosZ(3.6f * (float) (fp + 0.54f * fr)); shen.setRotX(0.18f * (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 { - shen.setRotY(-0.025f * (float) fr); - } } else { shen.setPosY(0.7f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.25f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); 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 745a6098c..fde93f9fa 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 @@ -58,12 +58,7 @@ public class MinigunItemModel extends GeoModel { shen.setPosZ(2.2f * (float) (0.5 * fp + 1.54f * fr)); shen.setRotX(0.05f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.02f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.055f * (float) fr); - } else { - shen.setRotY(-0.055f * (float) fr); - } - + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); if (stack.getOrCreateTag().getInt("fire_animation") > 0) { flare.setHidden(false); 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 dc1a9bd1a..da091c673 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 @@ -74,22 +74,13 @@ public class Mk14ItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(0.04f * (float) (fp + 2 * fr)); shen.setPosZ(3.5f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); if (gun.getPosX() > 5.5f) { 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 7aad726b7..021af43b9 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 @@ -55,22 +55,13 @@ public class RpgItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(0.04f * (float) (fp + 2 * fr)); shen.setPosZ(1.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); double p = 0; p = player.getPersistentData().getDouble("zoom_pos"); 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 6903bd5ef..63274ebab 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 @@ -90,22 +90,13 @@ public class RpkItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(-0.03f * (float) (fp + 2 * fr)); shen.setPosZ(0.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.04f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); shuan.setPosZ(2.4f * (float) fp); 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 7fd1f4697..39c80c9fc 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 @@ -51,7 +51,7 @@ public class SentinelItemModel extends GeoModel { gun.setPosX(3.08f * (float) p); - gun.setPosY(-0.94f * (float) p - (float) (0.2f * zp)); + gun.setPosY(-1.03f * (float) p - (float) (0.2f * zp)); gun.setPosZ(10f * (float) p + (float) (0.5f * zp)); @@ -87,22 +87,13 @@ public class SentinelItemModel extends GeoModel { 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 { - shen.setRotY(-0.025f * (float) fr); - } } else { shen.setPosY(0.7f * (float) (fp + 2 * fr)); shen.setPosZ(4.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.15f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone charge = getAnimationProcessor().getBone("charge"); 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 ef1ebb4e6..d55afec96 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 @@ -39,7 +39,7 @@ public class SksItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (stack.getOrCreateTag().getDouble("HoldOpen") == 1) { - bolt.setPosZ(3f); + bolt.setPosZ(2.5f); } double p = 0; @@ -71,28 +71,19 @@ public class SksItemModel extends GeoModel { double fr = player.getPersistentData().getDouble("fire_rot"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - 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 { - shen.setRotY(-0.015f * (float) fr); - } + shen.setPosY(0.04f * (float) (fp + 2 * fr)); + holo.setPosY(-0.43f * (float) (fp + 2.3 * fr)); + shen.setPosZ(0.6f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.015f * (float) (fp + fr)); } else { - shen.setPosY(-0.03f * (float) (fp + 2 * fr)); + shen.setPosY(0.08f * (float) (fp + 2 * fr)); shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); - shuan.setPosZ(2.5f * (float) fp); + shuan.setPosZ(2f * (float) fp); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); 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 49144b6da..4d8af49dc 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 @@ -95,22 +95,13 @@ public class SvdItemModel extends GeoModel { 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 { - shen.setRotY(-0.015f * (float) fr); - } } else { shen.setPosY(0.04f * (float) (fp + 2 * fr)); shen.setPosZ(1.8f * (float) (fp + 0.54f * fr)); shen.setRotX(0.07f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.03f * (float) fr); - } else { - shen.setRotY(-0.03f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); holo.setPosY(1.1f * (float) fp); 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 a4773d5e3..cd93d364a 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 @@ -50,12 +50,6 @@ public class VectorItemModel extends GeoModel { scope.setScaleZ(1f - (0.2f * (float) p)); - float fps = Minecraft.getInstance().getFps(); - if (fps <= 0) { - fps = 1f; - } - float times = 250f / fps; - CoreGeoBone holo = getAnimationProcessor().getBone("holo"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && gun.getPosX() > 2) { holo.setHidden(false); @@ -67,26 +61,17 @@ public class VectorItemModel extends GeoModel { double fr = player.getPersistentData().getDouble("fire_rot"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - 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 { - shen.setRotY(-0.015f * (float) fr); - } + shen.setPosY(0.05f * (float) (fp + 2 * fr)); + holo.setPosY(-0.43f * (float) (fp + 2.3 * fr)); + shen.setPosZ(0.9f * (float) (fp + 0.54f * fr)); + shen.setRotX(0.006f * (float) (fp + fr)); } else { - shen.setPosY(0.04f * (float) (fp + 2 * fr)); - shen.setPosZ(1.2f * (float) (fp + 0.54f * fr)); + shen.setPosY(0.08f * (float) (fp + 2 * fr)); + shen.setPosZ(0.9f * (float) (fp + 0.54f * fr)); shen.setRotX(0.03f * (float) (0.18f * fp + fr)); shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { - shen.setRotY(0.045f * (float) fr); - } else { - shen.setRotY(-0.045f * (float) fr); - } } + shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); CoreGeoBone root = getAnimationProcessor().getBone("root"); diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 7ebbcfe3b..3409517f5 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -267,52 +267,36 @@ public class ClientEventHandler { amplitude = 15000 * stack.getOrCreateTag().getDouble("recoil_y") * stack.getOrCreateTag().getDouble("recoil_x"); var data = entity.getPersistentData(); - if (entity.isShiftKeyDown() && entity.getBbHeight() >= 1 && data.getDouble("prone") == 0) { - pose = 0.9; - } else if (data.getDouble("prone") > 0) { - if (stack.getOrCreateTag().getDouble("bipod") == 1) { - pose = 0.75; - } else { - pose = 0.8; - } - } else { - pose = 1; - } var capability = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null); if (capability.orElse(new TargetModVariables.PlayerVariables()).firing > 0) { - data.putDouble("firetime", 0.02); - data.putDouble("fire_rotx_time", 0.02); - if (data.getDouble("firepos2") < 0.6) { - data.putDouble("firepos2", (data.getDouble("firepos2") + 0.06 * times)); - } - } - if (0 < data.getDouble("firepos2")) { - data.putDouble("firepos2", (data.getDouble("firepos2") - 0.015 * times)); - } else { - data.putDouble("firepos2", 0); + data.putDouble("firetime", 0.001); + data.putDouble("fire_rotx_time", 0.001); + data.putDouble("firepos2", 0.1); } + + data.putDouble("firepos2", Mth.clamp(data.getDouble("firepos2") - 0.01 * times,0,0.6)); + if (0 < data.getDouble("firetime")) { - data.putDouble("firetime", (data.getDouble("firetime") + 0.18 * (1.1 - data.getDouble("firetime")) * times)); + data.putDouble("firetime", (data.getDouble("firetime") + 0.25 * (1.1 - data.getDouble("firetime")) * times)); } if (0 < data.getDouble("firetime") && data.getDouble("firetime") < 0.454) { data.putDouble("fire_pos", - (pose * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + data.getDouble("firepos2")))); + ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + data.getDouble("firepos2"))); } if (0.454 <= data.getDouble("firetime") && data.getDouble("firetime") < 1) { data.putDouble("fire_pos", - (pose * (4.34 * Math.pow(data.getDouble("firetime"), 2) - 6.5 * data.getDouble("firetime") + 2.167 + data.getDouble("firepos2")))); + (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.18 * (1.9 - data.getDouble("fire_rotx_time")) * times)); } if (0 < data.getDouble("fire_rotx_time") && data.getDouble("fire_rotx_time") < 1.732) { data.putDouble("fire_rot", - (pose * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time") , 2)))); + (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time") , 2))); if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon > 0) { event.setYaw((float) (yaw - 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time") , 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"),0,1) * (2 * Math.random() - 1))); event.setPitch((float) (pitch + 1.3 * amplitude * (1 / 6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * Math.sin(6.3 * (data.getDouble("fire_rotx_time") - 0.5)) * (3 - Math.pow(data.getDouble("fire_rotx_time") , 2)) + 1 * Mth.clamp(0.3 - data.getDouble("fire_rotx_time"),0,1) * (2 * Math.random() - 1))); diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index fb6678866..db53d479a 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -309,22 +309,8 @@ public class GunEventHandler { public static void gunShoot(Player player) { ItemStack heldItem = player.getMainHandItem(); player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - if (Math.random() < 0.2) { - capability.recoilHorizon = -1; - } - if (Math.random() >= 0.2 && Math.random() < 0.4) { - capability.recoilHorizon = -0.5; - } - if (Math.random() >= 0.4 && Math.random() < 0.6) { - capability.recoilHorizon = 0; - } - if (Math.random() >= 0.6 && Math.random() < 0.8) { - capability.recoilHorizon = 0.5; - } - if (Math.random() > 0.8) { - capability.recoilHorizon = 1; - } + capability.recoilHorizon = 2 * Math.random() - 1; capability.recoil = 0.1; capability.firing = 1; capability.syncPlayerVariables(player); diff --git a/src/main/java/net/mcreator/target/network/message/FireMessage.java b/src/main/java/net/mcreator/target/network/message/FireMessage.java index dd945eba6..bbe30192d 100644 --- a/src/main/java/net/mcreator/target/network/message/FireMessage.java +++ b/src/main/java/net/mcreator/target/network/message/FireMessage.java @@ -115,7 +115,6 @@ public class FireMessage { } player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1; capability.recoil = 0.1; capability.firing = 1; capability.syncPlayerVariables(player); diff --git a/src/main/resources/assets/target/geo/hk416.geo.json b/src/main/resources/assets/target/geo/hk416.geo.json index 6ad821be6..cb01fbff3 100644 --- a/src/main/resources/assets/target/geo/hk416.geo.json +++ b/src/main/resources/assets/target/geo/hk416.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.hk416", "texture_width": 128, "texture_height": 128, - "visible_bounds_width": 11, + "visible_bounds_width": 18, "visible_bounds_height": 6, "visible_bounds_offset": [0, 0, 0] }, @@ -9510,7 +9510,7 @@ "uv": { "north": {"uv": [85.59375, 35.3125], "uv_size": [4, 4]}, "east": {"uv": [101.15625, 18.53125], "uv_size": [5.9375, 4]}, - "south": {"uv": [45.26233, 89.86003], "uv_size": [8, 8]}, + "south": {"uv": [55.20764, 90.39909], "uv_size": [36, 36]}, "west": {"uv": [92.0625, 17.21875], "uv_size": [7.53125, 4]}, "up": {"uv": [112.0625, 26.0625], "uv_size": [-4, -7.875]}, "down": {"uv": [116.1875, 31.125], "uv_size": [-4, -4.625]} diff --git a/src/main/resources/assets/target/textures/item/ak47.png b/src/main/resources/assets/target/textures/item/ak47.png index 331d114cc..a8116c529 100644 Binary files a/src/main/resources/assets/target/textures/item/ak47.png and b/src/main/resources/assets/target/textures/item/ak47.png differ diff --git a/src/main/resources/assets/target/textures/item/bocek.png b/src/main/resources/assets/target/textures/item/bocek.png index ce94eec65..a079b9349 100644 Binary files a/src/main/resources/assets/target/textures/item/bocek.png and b/src/main/resources/assets/target/textures/item/bocek.png differ diff --git a/src/main/resources/assets/target/textures/item/hk416.png b/src/main/resources/assets/target/textures/item/hk416.png index e32726214..c869797ee 100644 Binary files a/src/main/resources/assets/target/textures/item/hk416.png and b/src/main/resources/assets/target/textures/item/hk416.png differ diff --git a/src/main/resources/assets/target/textures/item/hk416_e.png b/src/main/resources/assets/target/textures/item/hk416_e.png index 8ecf2f477..c76f19f7e 100644 Binary files a/src/main/resources/assets/target/textures/item/hk416_e.png and b/src/main/resources/assets/target/textures/item/hk416_e.png differ diff --git a/src/main/resources/assets/target/textures/item/rpk.png b/src/main/resources/assets/target/textures/item/rpk.png index 42b1a9dd7..a3501505d 100644 Binary files a/src/main/resources/assets/target/textures/item/rpk.png and b/src/main/resources/assets/target/textures/item/rpk.png differ diff --git a/src/main/resources/assets/target/textures/item/sentinel.png b/src/main/resources/assets/target/textures/item/sentinel.png index 8ef6ddbe2..48469a6f2 100644 Binary files a/src/main/resources/assets/target/textures/item/sentinel.png and b/src/main/resources/assets/target/textures/item/sentinel.png differ diff --git a/src/main/resources/assets/target/textures/item/sks.png b/src/main/resources/assets/target/textures/item/sks.png index 7e21ca999..2e3d673c9 100644 Binary files a/src/main/resources/assets/target/textures/item/sks.png and b/src/main/resources/assets/target/textures/item/sks.png differ