From 59a2175fb2e70b25ac67bb53e8a5c7312abe104f Mon Sep 17 00:00:00 2001
From: MeexReay <meexreay@gmail.com>
Date: Wed, 18 Jun 2025 16:18:48 +0300
Subject: [PATCH] port to 1.21.5

---
 gradle.properties                               | 10 +++++-----
 .../event/events/BlockInteractEvent.java        |  4 ++--
 .../repeating_mod/event/events/InputEvent.java  | 17 +++++++++++++----
 .../render/shader/ShaderManager.java            |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 63462f5..68634eb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,17 +4,17 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.14
 loom_version=1.10-SNAPSHOT
 
 # Fabric API
-fabric_version=0.119.3+1.21.4
+fabric_version=0.127.0+1.21.5
 
 # Mod Properties
-mod_version = 1.1.2+1.21.4
+mod_version = 1.1.2+1.21.5
 maven_group = ru.themixray
 archives_base_name = repeating-mod
 
-# Compatible with: 1.21.4, ?
\ No newline at end of file
+# Compatible with: 1.21.5
\ No newline at end of file
diff --git a/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java b/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java
index 789ea8f..16a8425 100644
--- a/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java
+++ b/src/main/java/ru/themixray/repeating_mod/event/events/BlockInteractEvent.java
@@ -19,7 +19,7 @@ public class BlockInteractEvent extends RecordEvent {
                         Double.parseDouble(a[0]),
                         Double.parseDouble(a[1]),
                         Double.parseDouble(a[2])),
-                        Direction.byId(Integer.parseInt(a[4])),
+                        Direction.byIndex(Integer.parseInt(a[4])),
                         new BlockPos(
                                 Integer.parseInt(a[0]),
                                 Integer.parseInt(a[1]),
@@ -44,7 +44,7 @@ public class BlockInteractEvent extends RecordEvent {
                 String.valueOf(hitResult.getBlockPos().getY()),
                 String.valueOf(hitResult.getBlockPos().getZ()),
                 (hitResult.isInsideBlock() ? "1" : "0"),
-                String.valueOf(hitResult.getSide().getId()),
+                String.valueOf(hitResult.getSide().getIndex()),
                 hand.name()
         };
     }
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 ac79afe..01d1f39 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
@@ -1,9 +1,13 @@
 package ru.themixray.repeating_mod.event.events;
 
+import net.minecraft.client.input.Input;
 import net.minecraft.util.PlayerInput;
+import net.minecraft.util.math.Vec2f;
 import ru.themixray.repeating_mod.Main;
 import ru.themixray.repeating_mod.event.RecordEvent;
 
+import java.lang.reflect.Field;
+
 public class InputEvent extends RecordEvent {
     public Boolean forward;
     public Boolean backward;
@@ -36,8 +40,8 @@ public class InputEvent extends RecordEvent {
             Main.client.player.getPitch(),
             Main.client.player.getYaw(),
             Main.client.player.getMovementSpeed(),
-            Main.client.player.input.movementForward,
-            Main.client.player.input.movementSideways
+            Main.client.player.input.getMovementInput().y,
+            Main.client.player.input.getMovementInput().x
         );
     }
 
@@ -168,8 +172,13 @@ public class InputEvent extends RecordEvent {
             if (Main.client.player.getMovementSpeed() != speed)
                 Main.client.player.setMovementSpeed(speed);
 
-            Main.client.player.input.movementSideways = movementSideways;
-            Main.client.player.input.movementForward = movementForward;
+            try {
+                Field field = Input.class.getDeclaredField("movementVector");
+                field.setAccessible(true);
+                field.set(Main.client.player.input, new Vec2f(movementSideways, movementForward));
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
 
             PlayerInput input = Main.client.player.input.playerInput;
             Main.client.player.input.playerInput = new PlayerInput(
diff --git a/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java b/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java
index 0879153..f5e26a6 100644
--- a/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java
+++ b/src/main/java/ru/themixray/repeating_mod/render/shader/ShaderManager.java
@@ -1,6 +1,6 @@
 package ru.themixray.repeating_mod.render.shader;
 
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.opengl.GlStateManager;
 import com.mojang.blaze3d.platform.TextureUtil;
 import lombok.Getter;
 import lombok.SneakyThrows;