Merge branch 'beta' into 1.21.10

Author: BLACKUM

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.21.10
 loader_version=0.18.1
 
 # Mod Properties
-mod_version=0.2.1
+mod_version=0.2.2
 maven_group=org.blackum
 archives_base_name=BlackAddons
 

src/main/java/org/blackum/blackaddons/core/util/AlignUtils.java

@@ -19,6 +19,7 @@
 public class AlignUtils {
     private static final double ALIGN_EPSILON = 1.0E-4D;
     private static final long DEBUG_SAMPLE_DELAY_MS = 500L;
+    private static final int SNAP_MOVEMENT_LOCK_TICKS = 2;
     private static final int COLOR_WHITE = 0xFFFFFFFF;
     private static final int LINE_HEIGHT = 10;
     private static final int DEBUG_STEP_COUNT = 2;
@@ -39,6 +40,9 @@ public class AlignUtils {
     private static int alignState = 0;
     private static float yaw1 = 0;
     private static float yaw2 = 0;
+    private static int movementLockTicks = 0;
+    private static boolean forcedForward = false;
+    private static boolean forcedSneak = false;
 
     private static boolean debugExpectedAvailable;
     private static double debugExpectedX;
@@ -109,6 +113,10 @@ public static void tick() {
         Minecraft mc = Minecraft.getInstance();
         updateDebugMeasurement(mc);
 
+        if (movementLockTicks > 0) {
+            movementLockTicks--;
+        }
+
         if (!active) {
             return;
         }
@@ -190,22 +198,38 @@ public static void tick() {
     private static void applyMovement(Minecraft mc, LocalPlayer player, float targetYaw, boolean sneak) {
         capturePendingStep(player);
         applyExactYaw(player, targetYaw);
+        forcedForward = true;
+        forcedSneak = sneak;
         setKeyState(mc.options.keyUp, true);
         if (sneak) {
             setKeyState(mc.options.keyShift, true);
+        } else {
+            setKeyState(mc.options.keyShift, false);
         }
     }
 
     public static void cancel() {
         if (!active) return;
         active = false;
+        movementLockTicks = 0;
         releasePressedKeys(Minecraft.getInstance());
     }
 
     public static boolean isActive() {
         return active;
     }
 
+    public static boolean shouldBlockMovementInput() {
+        return active || movementLockTicks > 0;
+    }
+
+    public static boolean isAllowedMovementKey(Minecraft mc, KeyMapping keyMapping) {
+        if (mc == null || mc.options == null) return false;
+        if (keyMapping == mc.options.keyUp) return forcedForward;
+        if (keyMapping == mc.options.keyShift) return forcedSneak;
+        return false;
+    }
+
     public static List<String> getDebugInfo() {
         List<String> info = new ArrayList<>();
         if (!active && !debugAwaitingSample && !debugExpectedAvailable && !debugMeasuredAvailable) {
@@ -307,8 +331,10 @@ private static void finish(Minecraft mc) {
         debugAwaitingSample = true;
         releasePressedKeys(mc);
         if (!doLookAfter) {
+            movementLockTicks = 0;
             return;
         }
+        movementLockTicks = SNAP_MOVEMENT_LOCK_TICKS;
         if (alignUseLookAfterCoords) {
             RotationManager.getInstance().snapToBlock(alignLookAtX, alignLookAtY, alignLookAtZ, 0);
         } else {
@@ -318,6 +344,7 @@ private static void finish(Minecraft mc) {
 
     private static void releaseMovementKeys(Minecraft mc) {
         if (mc == null || mc.options == null) return;
+        clearForcedMovement();
         setKeyState(mc.options.keyUp, false);
         setKeyState(mc.options.keyDown, false);
         setKeyState(mc.options.keyLeft, false);
@@ -328,10 +355,16 @@ private static void releaseMovementKeys(Minecraft mc) {
 
     private static void releasePressedKeys(Minecraft mc) {
         if (mc == null || mc.options == null) return;
+        clearForcedMovement();
         restorePhysicalState(mc.options.keyUp, mc);
         restorePhysicalState(mc.options.keyShift, mc);
     }
 
+    private static void clearForcedMovement() {
+        forcedForward = false;
+        forcedSneak = false;
+    }
+
     private static void setKeyState(KeyMapping key, boolean pressed) {
         if (key instanceof KeyBindingAccessor accessor) {
             KeyMapping.set(accessor.getBoundKey(), pressed);

src/main/java/org/blackum/blackaddons/mixin/core/KeyboardInputMixin.java

@@ -1,7 +1,9 @@
 package org.blackum.blackaddons.mixin.core;
 
 import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.KeyboardInput;
+import org.blackum.blackaddons.core.util.AlignUtils;
 import org.blackum.blackaddons.feature.cheat.Freecam;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -15,6 +17,19 @@ private boolean onIsDown(KeyMapping keyMapping) {
         if (Freecam.getInstance().isActive()) {
             return false;
         }
+        Minecraft mc = Minecraft.getInstance();
+        if (AlignUtils.shouldBlockMovementInput() && mc.options != null && isMovementKey(mc, keyMapping)) {
+            return AlignUtils.isAllowedMovementKey(mc, keyMapping);
+        }
         return keyMapping.isDown();
     }
+
+    private boolean isMovementKey(Minecraft mc, KeyMapping keyMapping) {
+        return keyMapping == mc.options.keyUp
+                || keyMapping == mc.options.keyDown
+                || keyMapping == mc.options.keyLeft
+                || keyMapping == mc.options.keyRight
+                || keyMapping == mc.options.keyJump
+                || keyMapping == mc.options.keyShift;
+    }
 }