Revert "InventoryMove with proper keybinds"

This reverts commit 59b1071.

Author: Avanatiker

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -17,13 +17,13 @@
 
 package com.lambda.mixin;
 
+import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.gui.DearImGui;
 import com.lambda.module.modules.player.Interact;
-import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -33,7 +33,6 @@
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
-import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.sound.SoundManager;
 import net.minecraft.util.Hand;
@@ -56,9 +55,6 @@ public class MinecraftClientMixin {
     @Nullable
     public HitResult crosshairTarget;
 
-    @Shadow
-    public int itemUseCooldown;
-
     @Inject(method = "close", at = @At("HEAD"))
     void closeImGui(CallbackInfo ci) {
         DearImGui.INSTANCE.destroy();
@@ -155,19 +151,6 @@ boolean redirectMultiActon(ClientPlayerInteractionManager instance) {
     void injectFastPlace(CallbackInfo ci) {
         if (!Interact.INSTANCE.isEnabled()) return;
 
-        itemUseCooldown = Interact.getPlaceDelay();
-    }
-
-    @Redirect(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
-    private void redirectUnPressAll() {
-        if (InventoryMove.getShouldMove()) {
-            KeyBinding.unpressAll();
-            return;
-        }
-        for (KeyBinding bind : KeyBinding.KEYS_BY_ID.values()) {
-            if (!InventoryMove.isKeyMovementRelated(bind.boundKey.getCode())) {
-                bind.reset();
-            }
-        }
+        Lambda.getMc().itemUseCooldown = Interact.getPlaceDelay();
     }
 }

src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -19,10 +19,7 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.KeyboardEvent;
-import com.lambda.module.modules.player.InventoryMove;
 import net.minecraft.client.Keyboard;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,11 +40,4 @@ private void onChar(long window, int codePoint, int modifiers, CallbackInfo ci)
             EventFlow.post(new KeyboardEvent.Char(c));
         }
     }
-
-    @Inject(method = "onKey", at = @At("RETURN"))
-    private void onKeyTail(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
-        if (!InventoryMove.getShouldMove() || !InventoryMove.isKeyMovementRelated(key)) return;
-        InputUtil.Key fromCode = InputUtil.fromKeyCode(key, scancode);
-        KeyBinding.setKeyPressed(fromCode, action != 0);
-    }
 }

src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -158,12 +158,6 @@ abstract class AbstractSetting<T : Any>(
         groups.add(path.toList())
     }
 
-    fun group(path: NamedEnum?) = apply {
-        if (path != null) {
-            groups.add(listOf(path))
-        }
-    }
-
     fun reset(silent: Boolean = false) {
         if (!silent && value == defaultValue) {
             ConfigCommand.info(notChangedMessage())

src/main/kotlin/com/lambda/config/groups/RotationSettings.kt

@@ -30,7 +30,7 @@ import kotlin.random.Random
 
 class RotationSettings(
     c: Configurable,
-    baseGroup: NamedEnum? = null,
+    baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
 ) : RotationConfig {
     override var rotationMode by c.setting("Mode", RotationMode.Sync, "How the player is being rotated on interaction", vis).group(baseGroup)

src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt

@@ -17,8 +17,7 @@
 
 package com.lambda.module.modules.player
 
-import com.lambda.Lambda.mc
-import com.lambda.config.groups.RotationSettings
+import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.LambdaScreen
@@ -29,49 +28,68 @@ import com.lambda.interaction.request.rotating.visibilty.lookAt
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.KeyboardUtils.isKeyPressed
-import com.lambda.util.NamedEnum
+import com.lambda.util.math.MathUtils.toDouble
 import com.lambda.util.math.MathUtils.toFloatSign
+import com.lambda.util.player.MovementUtils.update
 import net.minecraft.client.gui.screen.ChatScreen
 import net.minecraft.client.gui.screen.Screen
-import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen
-import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen
 import net.minecraft.client.gui.screen.ingame.AnvilScreen
+import net.minecraft.client.gui.screen.ingame.CommandBlockScreen
+import net.minecraft.client.gui.screen.ingame.SignEditScreen
+import org.lwjgl.glfw.GLFW.GLFW_KEY_A
+import org.lwjgl.glfw.GLFW.GLFW_KEY_D
 import org.lwjgl.glfw.GLFW.GLFW_KEY_DOWN
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_2
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_4
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_6
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_8
 import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT
+import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_CONTROL
+import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_SHIFT
 import org.lwjgl.glfw.GLFW.GLFW_KEY_RIGHT
+import org.lwjgl.glfw.GLFW.GLFW_KEY_S
+import org.lwjgl.glfw.GLFW.GLFW_KEY_SPACE
 import org.lwjgl.glfw.GLFW.GLFW_KEY_UP
+import org.lwjgl.glfw.GLFW.GLFW_KEY_W
 
 object InventoryMove : Module(
     name = "InventoryMove",
     description = "Allows you to move with GUIs opened",
     tag = ModuleTag.PLAYER,
 ) {
-    private val arrowKeys by setting("Arrow Keys", false, "Allows rotating the players camera using the arrow keys")
-    private val speed by setting("Rotation Speed", 5, 1..20, 1, unit = "°/tick") { arrowKeys }
+    private val speed by setting("Rotation Speed", 5, 1..20, 1, unit = "°/tick")
     private val rotationConfig = RotationConfig.Instant(RotationMode.Lock)
 
-    @JvmStatic
-    val shouldMove get() = isEnabled && !mc.currentScreen.hasInputOrNull
-
     /**
      * Whether the current screen has text inputs or is null
      */
-    @JvmStatic
     val Screen?.hasInputOrNull: Boolean
         get() = this is ChatScreen ||
-                this is AbstractSignEditScreen ||
+                this is SignEditScreen ||
                 this is AnvilScreen ||
-                this is AbstractCommandBlockScreen ||
+                this is CommandBlockScreen ||
                 this is LambdaScreen ||
                 this == null
 
     init {
+        listen<MovementEvent.InputUpdate>(20250415) { event ->
+            if (mc.currentScreen.hasInputOrNull) return@listen
+
+            val forward = isKeyPressed(GLFW_KEY_W).toDouble() -
+                    isKeyPressed(GLFW_KEY_S).toDouble()
+
+            val strafe = isKeyPressed(GLFW_KEY_A).toDouble() -
+                    isKeyPressed(GLFW_KEY_D).toDouble()
+
+            val jump = isKeyPressed(GLFW_KEY_SPACE)
+            val sneak = isKeyPressed(GLFW_KEY_LEFT_SHIFT)
+            val sprint = isKeyPressed(GLFW_KEY_LEFT_CONTROL)
+
+            event.input.update(forward, strafe, jump, sneak, sprint)
+        }
+
         listen<UpdateManagerEvent.Rotation> {
-            if (!arrowKeys || mc.currentScreen.hasInputOrNull) return@listen
+            if (mc.currentScreen.hasInputOrNull) return@listen
 
             val pitch = (isKeyPressed(GLFW_KEY_DOWN, GLFW_KEY_KP_2).toFloatSign() -
                     isKeyPressed(GLFW_KEY_UP, GLFW_KEY_KP_8).toFloatSign()) * speed
@@ -83,19 +101,4 @@ object InventoryMove : Module(
             ).requestBy(rotationConfig)
         }
     }
-
-    @JvmStatic
-    fun isKeyMovementRelated(key: Int): Boolean {
-        val options = mc.options
-        return when (key) {
-            options.forwardKey.boundKey.code,
-            options.backKey.boundKey.code,
-            options.leftKey.boundKey.code,
-            options.rightKey.boundKey.code,
-            options.jumpKey.boundKey.code,
-            options.sprintKey.boundKey.code,
-            options.sneakKey.boundKey.code -> true
-            else -> false
-        }
-    }
 }

src/main/resources/lambda.accesswidener

@@ -9,8 +9,6 @@ transitive-accessible field net/minecraft/client/input/Input movementVector Lnet
 transitive-accessible field net/minecraft/client/MinecraftClient renderTaskQueue Ljava/util/Queue;
 transitive-accessible field net/minecraft/client/option/KeyBinding boundKey Lnet/minecraft/client/util/InputUtil$Key;
 transitive-accessible method net/minecraft/client/MinecraftClient getWindowTitle ()Ljava/lang/String;
-transitive-accessible field net/minecraft/client/option/KeyBinding KEYS_BY_ID Ljava/util/Map;
-transitive-accessible method net/minecraft/client/option/KeyBinding reset ()V
 
 # World
 transitive-accessible field net/minecraft/client/world/ClientWorld entityManager Lnet/minecraft/world/entity/ClientEntityManager;