constructors improvements

Author: beanbag44

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

@@ -17,28 +17,27 @@
 
 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;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.lambda.module.modules.player.InventoryMove;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 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;
 import net.minecraft.util.hit.HitResult;
-import net.minecraft.client.option.KeyBinding;
 import net.minecraft.util.thread.ThreadExecutor;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -53,10 +52,14 @@ public class MinecraftClientMixin {
     @Shadow
     @Nullable
     public Screen currentScreen;
+
     @Shadow
     @Nullable
     public HitResult crosshairTarget;
 
+    @Shadow
+    public int itemUseCooldown;
+
     @Inject(method = "close", at = @At("HEAD"))
     void closeImGui(CallbackInfo ci) {
         DearImGui.INSTANCE.destroy();
@@ -135,7 +138,7 @@ private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
 
     @Redirect(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
     private void redirectUnPressAll() {
-        if (InventoryMove.INSTANCE.isDisabled() || InventoryMove.hasInputOrNull(currentScreen)) {
+        if (!InventoryMove.getShouldMove()) {
             KeyBinding.unpressAll();
             return;
         }
@@ -166,6 +169,6 @@ boolean redirectMultiActon(ClientPlayerInteractionManager instance) {
     void injectFastPlace(CallbackInfo ci) {
         if (!Interact.INSTANCE.isEnabled()) return;
 
-        Lambda.getMc().itemUseCooldown = Interact.getPlaceDelay();
+        itemUseCooldown = Interact.getPlaceDelay();
     }
 }

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

@@ -28,8 +28,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static com.lambda.Lambda.getMc;
-
 @Mixin(Keyboard.class)
 public class KeyboardMixin {
     @Inject(method = "onKey", at = @At("HEAD"))
@@ -39,11 +37,9 @@ private void onKey(long window, int key, int scancode, int action, int modifiers
 
     @Inject(method = "onKey", at = @At("RETURN"))
     private void onKeyTail(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
-        if (InventoryMove.INSTANCE.isDisabled() || InventoryMove.hasInputOrNull(getMc().currentScreen)) return;
-        if (InventoryMove.isKeyMovementRelated(key)) {
-            InputUtil.Key fromCode = InputUtil.fromKeyCode(key, scancode);
-            KeyBinding.setKeyPressed(fromCode, action != 0);
-        }
+        if (!InventoryMove.getShouldMove() || !InventoryMove.isKeyMovementRelated(key)) return;
+        InputUtil.Key fromCode = InputUtil.fromKeyCode(key, scancode);
+        KeyBinding.setKeyPressed(fromCode, action != 0);
     }
 
     @Inject(method = "onChar", at = @At("HEAD"))

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

@@ -158,6 +158,12 @@ 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,
+    baseGroup: NamedEnum? = null,
     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

@@ -30,9 +30,9 @@ import com.lambda.util.KeyboardUtils.isKeyPressed
 import com.lambda.util.math.MathUtils.toFloatSign
 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_DOWN
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_2
 import org.lwjgl.glfw.GLFW.GLFW_KEY_KP_4
@@ -51,9 +51,24 @@ object InventoryMove : Module(
     private val speed by setting("Rotation Speed", 5, 1..20, 1, unit = "°/tick") { arrowKeys }
     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 AnvilScreen ||
+                this is AbstractCommandBlockScreen ||
+                this is LambdaScreen ||
+                this == null
+
     init {
         onRotate {
-            if (!arrowKeys || hasInputOrNull(mc.currentScreen)) return@onRotate
+            if (!arrowKeys || mc.currentScreen.hasInputOrNull) return@onRotate
 
             val pitch = (isKeyPressed(GLFW_KEY_DOWN, GLFW_KEY_KP_2).toFloatSign() -
                     isKeyPressed(GLFW_KEY_UP, GLFW_KEY_KP_8).toFloatSign()) * speed
@@ -66,18 +81,6 @@ object InventoryMove : Module(
         }
     }
 
-    /**
-     * Whether the current screen has text inputs or is null
-     */
-    @JvmStatic
-    fun hasInputOrNull(screen: Screen?) =
-        screen is ChatScreen ||
-                screen is SignEditScreen ||
-                screen is AnvilScreen ||
-                screen is CommandBlockScreen ||
-                screen is LambdaScreen ||
-                screen == null
-
     @JvmStatic
     fun isKeyMovementRelated(key: Int): Boolean {
         val options = mc.options