From d101b11c36c0232b3a1cac9da4d8f570f3ce423a Mon Sep 17 00:00:00 2001
From: MeexReay <meexreay@gmail.com>
Date: Sun, 15 Jun 2025 16:23:04 +0300
Subject: [PATCH] fix movements 1.21.2

---
 gradle.properties                             |  2 +-
 .../event/events/InputEvent.java              | 54 ++++++++++++-------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index bcf329b..1c01598 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,4 @@ mod_version = 1.1.2+1.21.2
 maven_group = ru.themixray
 archives_base_name = repeating-mod
 
-# Compatible with: 1.21, 1.21.1
\ No newline at end of file
+# Compatible with: 1.21.2, ?
\ No newline at end of file
diff --git a/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java
index e0ce865..ac79afe 100644
--- a/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java
+++ b/src/main/java/ru/themixray/repeating_mod/event/events/InputEvent.java
@@ -18,6 +18,8 @@ public class InputEvent extends RecordEvent {
     public float body_yaw;
     public float pitch;
     public float speed;
+    public float movementForward;
+    public float movementSideways;
 
     public static InputEvent current() {
         if (Main.client.player == null) return null;
@@ -33,7 +35,9 @@ public class InputEvent extends RecordEvent {
             Main.client.player.getBodyYaw(),
             Main.client.player.getPitch(),
             Main.client.player.getYaw(),
-            Main.client.player.getMovementSpeed()
+            Main.client.player.getMovementSpeed(),
+            Main.client.player.input.movementForward,
+            Main.client.player.input.movementSideways
         );
     }
 
@@ -48,7 +52,9 @@ public class InputEvent extends RecordEvent {
                       float body_yaw,
                       float head_pitch,
                       float yaw,
-                      float speed) {
+                      float speed,
+                      float movementForward,
+                      float movementSideways) {
         this.forward = forward;
         this.backward = backward;
         this.left = left;
@@ -62,6 +68,8 @@ public class InputEvent extends RecordEvent {
         this.pitch = head_pitch;
         this.yaw = yaw;
         this.speed = speed;
+        this.movementForward = movementForward;
+        this.movementSideways = movementSideways;
     }
 
     /**
@@ -80,7 +88,9 @@ public class InputEvent extends RecordEvent {
             body_yaw,
             pitch,
             yaw,
-            speed
+            speed,
+            movementForward,
+            movementSideways
         );
     }
 
@@ -97,24 +107,28 @@ public class InputEvent extends RecordEvent {
             Float.parseFloat(a[8]),
             Float.parseFloat(a[9]),
             Float.parseFloat(a[10]),
-            Float.parseFloat(a[11])
+            Float.parseFloat(a[11]),
+            Float.parseFloat(a[12]),
+            Float.parseFloat(a[13])
         );
     }
 
     protected String[] serializeArgs() {
         return new String[] {
-                ((forward == null) ? "n" : (forward ? "1" : "0")),
-                ((backward == null) ? "n" : (backward ? "1" : "0")),
-                ((left == null) ? "n" : (left ? "1" : "0")),
-                ((right == null) ? "n" : (right ? "1" : "0")),
-                ((jump == null) ? "n" : (jump ? "1" : "0")),
-                ((sneak == null) ? "n" : (sneak ? "1" : "0")),
-                ((sprint == null) ? "n" : (sprint ? "1" : "0")),
-                String.valueOf(head_yaw),
-                String.valueOf(body_yaw),
-                String.valueOf(pitch),
-                String.valueOf(yaw),
-                String.valueOf(speed),
+            ((forward == null) ? "n" : (forward ? "1" : "0")),
+            ((backward == null) ? "n" : (backward ? "1" : "0")),
+            ((left == null) ? "n" : (left ? "1" : "0")),
+            ((right == null) ? "n" : (right ? "1" : "0")),
+            ((jump == null) ? "n" : (jump ? "1" : "0")),
+            ((sneak == null) ? "n" : (sneak ? "1" : "0")),
+            ((sprint == null) ? "n" : (sprint ? "1" : "0")),
+            String.valueOf(head_yaw),
+            String.valueOf(body_yaw),
+            String.valueOf(pitch),
+            String.valueOf(yaw),
+            String.valueOf(speed),
+            String.valueOf(movementForward),
+            String.valueOf(movementSideways)
         };
     }
 
@@ -130,7 +144,9 @@ public class InputEvent extends RecordEvent {
             event.head_yaw == head_yaw &&
             event.body_yaw == body_yaw &&
             event.yaw == yaw &&
-            event.pitch == pitch;
+            event.pitch == pitch &&
+            event.movementForward == movementForward &&
+            event.movementSideways == movementSideways;
     }
 
     public void replay() {
@@ -152,8 +168,10 @@ public class InputEvent extends RecordEvent {
             if (Main.client.player.getMovementSpeed() != speed)
                 Main.client.player.setMovementSpeed(speed);
 
-            PlayerInput input = Main.client.player.input.playerInput;
+            Main.client.player.input.movementSideways = movementSideways;
+            Main.client.player.input.movementForward = movementForward;
 
+            PlayerInput input = Main.client.player.input.playerInput;
             Main.client.player.input.playerInput = new PlayerInput(
                 this.forward == null ? input.forward() : this.forward,
                 this.backward == null ? input.backward() : this.backward,