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 40a1bb5e9..7762e0bda 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 @@ -116,6 +116,7 @@ public class AK47ItemModel extends GeoModel { float PosX = (float) player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float) player.getPersistentData().getDouble("gun_move_posY"); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); double y = player.getPersistentData().getDouble("y"); double x = player.getPersistentData().getDouble("x"); @@ -126,7 +127,9 @@ public class AK47ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 78ca5a783..56791ada4 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 @@ -101,7 +101,11 @@ public class Aa12ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); diff --git a/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java index 0c076d0df..1abb49295 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java @@ -87,7 +87,11 @@ public class AbekiriItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 5d31acf6f..c779490cc 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 @@ -152,7 +152,11 @@ public class BocekItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 6a6120822..45842dc06 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 @@ -646,7 +646,11 @@ public class DevotionItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 742e9b3b3..e5a13a33f 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 @@ -113,7 +113,11 @@ public class Hk416ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); diff --git a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java index 82c55ad39..cb883d835 100644 --- a/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/HuntingRifleItemModel.java @@ -102,7 +102,11 @@ public class HuntingRifleItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 66b434afb..f1aa93e07 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 @@ -111,7 +111,11 @@ public class KraberItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 826605619..990dc87a4 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 @@ -103,7 +103,11 @@ public class M4ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 c669d0dd3..05c4d4bdd 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 @@ -143,7 +143,11 @@ public class M60ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 811aa86d1..3f5ce224e 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 @@ -101,7 +101,11 @@ public class M79ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 8f91d84d9..c8fb35977 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 @@ -113,7 +113,11 @@ public class M870ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 2d353e36e..0d2a89ce7 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 @@ -115,7 +115,11 @@ public class M98bItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); zhunxing.setPosX(75 * PosX); diff --git a/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java index 9c3aabcb6..647cc07d8 100644 --- a/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java @@ -94,7 +94,11 @@ public class MarlinItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 9d01653ad..4ef512569 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 @@ -96,7 +96,11 @@ public class MinigunItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 8773a62dd..9fd292e90 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 @@ -132,7 +132,11 @@ public class Mk14ItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 92bf4a75c..934c70d7e 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 @@ -108,7 +108,11 @@ public class RpgItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 a52381487..2b09c4f1b 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 @@ -132,7 +132,11 @@ public class RpkItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 013c6decb..24ee37103 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 @@ -130,7 +130,11 @@ public class SentinelItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 68ab223dc..4f44634d1 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 @@ -119,7 +119,11 @@ public class SksItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 da32132cc..06d3b982f 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 @@ -144,7 +144,11 @@ public class SvdItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); diff --git a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java index 352238cff..f3fc432dd 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java @@ -86,7 +86,11 @@ public class TaserItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); diff --git a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java index 596b297cb..d0f42c7ac 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java @@ -88,7 +88,11 @@ public class TracheliumItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); 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 819de8984..a50b9a35a 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 @@ -106,7 +106,11 @@ public class VectorItemModel extends GeoModel { root.setRotX((float) x); - root.setRotZ(0.1f * PosX); + float RotZ = (float) player.getPersistentData().getDouble("gun_move_rotZ"); + + root.setRotY(0.2f * PosX); + + root.setRotZ(0.2f * PosX + RotZ); CoreGeoBone move = getAnimationProcessor().getBone("move"); diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 8131b09e0..3a697e944 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -107,19 +107,31 @@ public class ClientEventHandler { on_ground = 0.001; } + if (data.getDouble("move_forward") == 1 && data.getDouble("firetime") == 0 && data.getDouble("zoom_time") == 0) { + if (data.getDouble("gun_move_rotZ") < 0.14) { + data.putDouble("gun_move_rotZ", data.getDouble("gun_move_rotZ") + 0.007 * times); + } + } else { + if (data.getDouble("gun_move_rotZ") > 0) { + data.putDouble("gun_move_rotZ", data.getDouble("gun_move_rotZ") - 0.007 * times); + } else { + data.putDouble("gun_move_rotZ", 0); + } + } + if ((data.getDouble("move_left") == 1 || data.getDouble("move_right") == 1 || data.getDouble("move_forward") == 1 || data.getDouble("move_backward") == 1) && data.getDouble("firetime") == 0) { if (data.getDouble("gun_moveY_time") < 1.25) { - data.putDouble("gun_moveY_time", data.getDouble("gun_moveY_time") + on_ground * times * move_speed); + data.putDouble("gun_moveY_time", data.getDouble("gun_moveY_time") + 1.2 * on_ground * times * move_speed); } else { data.putDouble("gun_moveY_time", 0.25); } if (data.getDouble("gun_moveX_time") < 2) { - data.putDouble("gun_moveX_time", data.getDouble("gun_moveX_time") + on_ground * times * move_speed); + data.putDouble("gun_moveX_time", data.getDouble("gun_moveX_time") + 1.2 * on_ground * times * move_speed); } else { data.putDouble("gun_moveX_time", 0); }