there is too much shit to mention here.

10 files changed, 113 insertions, 9 deletions

diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java
new file mode 100644
index 0000000..29950e4
--- /dev/null
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java
@@ -0,0 +1,9 @@
+package net.justlearning.arslaan3102.arslaansmagichax.modules;
+
+public enum Category {
+    COMBAT,
+    MOVEMENT,
+    RENDER,
+    PLAYER,
+    MISC
+}
\ No newline at end of file
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java
index 8982f49..9334a53 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java
@@ -5,14 +5,18 @@ import net.minecraft.client.MinecraftClient;
 public abstract class Module {
     private final String name;
     private final String description;
+    private final Category category;
     public MinecraftClient mc;
+    private final int glfwKeybinding;
 
     private boolean enabled = false;
 
-    public Module(String name, String description) {
+    public Module(String name, String description, int glfwKeybinding, Category category) {
         this.name = name;
         this.description = description;
         this.mc = MinecraftClient.getInstance();
+        this.glfwKeybinding = glfwKeybinding;
+        this.category = category;
     }
 
     public String getName() {
@@ -23,6 +27,14 @@ public abstract class Module {
         return description;
     }
 
+    public int getGlfwKeybinding() {
+        return glfwKeybinding;
+    }
+
+    public Category getCategory() {
+        return category;
+    }
+
     public boolean isEnabled() {
         return enabled;
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
index 5a69e0b..24c24ae 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
@@ -5,16 +5,43 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderTickCounter;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class ModuleManager {
     private boolean hudRegistered = false;
 
+    private static Map<Module, Boolean> previousKeyState = new HashMap<>();
+
+    public static void handleKeyPresses() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client.player == null || client.currentScreen != null) return;
+
+        for (Module module : modules) {
+            int key = module.getGlfwKeybinding();
+            if (key == -1) continue;
+
+            boolean isPressed = InputUtil.isKeyPressed(client.getWindow().getHandle(), key);
+            boolean wasPressed = previousKeyState.getOrDefault(module, false);
+
+            // Only toggle on **key down** event (edge detection)
+            if (isPressed && !wasPressed) {
+                module.toggle();
+                if (!Objects.equals(module.getName(), "ClickGUI")) {
+                    client.player.sendMessage(Text.literal(
+                            "Toggled module " + module.getName() + " to " + (module.isEnabled() ? "ON" : "OFF")
+                    ), false);
+                }
+            }
+
+            previousKeyState.put(module, isPressed);
+        }
+    }
+
     private static List<Module> modules = new ArrayList<>();
     public static ModuleManager INSTANCE = new ModuleManager();
     public void register(Module module) {
@@ -29,10 +56,17 @@ public class ModuleManager {
         return modules.stream().filter(Module::isEnabled).collect(Collectors.toList());
     }
 
+    public List<Module> getModulesWithCategory(Category category) {
+        return modules.stream()
+                .filter(module -> module.getCategory() == category)
+                .collect(Collectors.toList());
+    }
+
     public static void tick() {
         for (Module module : modules) {
             module.tick();
         }
+        handleKeyPresses();
     }
 
     public void registerHUD() {
@@ -52,7 +86,7 @@ public class ModuleManager {
         int titleColor = 16568909 | i; // weird magic
 
         drawContext.drawTextWithBackground(textRenderer, Text.literal("Arslaan's Magic Hax"), x, y, 50, titleColor);
-        y += textRenderer.fontHeight + 2;
+        y += textRenderer.fontHeight + 4;
 
         for (Module module : ModuleManager.getEnabledModules()) {
             int color = 16777215 | i; // more magic I don't understand
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java
new file mode 100644
index 0000000..f5f3a4f
--- /dev/null
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java
@@ -0,0 +1,23 @@
+package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
+
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
+import net.justlearning.arslaan3102.arslaansmagichax.screens.ClickGUIScreen;
+import net.minecraft.client.MinecraftClient;
+import org.lwjgl.glfw.GLFW;
+
+public class ClickGUI extends Module {
+    public ClickGUI() {
+        super("ClickGUI", "GUI to manage modules.", GLFW.GLFW_KEY_RIGHT_SHIFT, Category.MISC);
+    }
+
+    @Override
+    protected void onEnable() {
+        MinecraftClient.getInstance().setScreen(ClickGUIScreen.INSTANCE);
+    }
+
+    @Override
+    protected void onDisable() {
+        MinecraftClient.getInstance().setScreen(null);
+    }
+}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java
new file mode 100644
index 0000000..011504c
--- /dev/null
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java
@@ -0,0 +1,20 @@
+package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
+
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
+import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
+import net.minecraft.util.PlayerInput;
+
+public class FakeSneak extends Module {
+    public FakeSneak() {
+        super("Fake Sneak", "Makes you appear as sneaking to the server when you're not. Can be used to hide nametags.", -1, Category.MOVEMENT);
+    }
+
+    @Override
+    public void tick() {
+        if (!this.isEnabled() || mc.player == null) return;
+        PlayerInput fakeSneak = new PlayerInput(false, false, false, false, false, true, false);
+        mc.player.networkHandler.sendPacket(new PlayerInputC2SPacket(fakeSneak));
+    }
+}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java
index 4c49a26..63c4a8f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java
@@ -1,10 +1,12 @@
 package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
 
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
 import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
+import org.lwjgl.glfw.GLFW;
 
 public class Flight extends Module {
     public Flight() {
-        super("Flight", "Enables creative flight in survival.");
+        super("Flight", "Enables creative flight in survival.", GLFW.GLFW_KEY_G, Category.MOVEMENT);
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java
index 156243e..453c0e0 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java
@@ -1,5 +1,6 @@
 package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
 
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
 import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -7,7 +8,7 @@ import net.minecraft.util.math.BlockPos;
 
 public class GhostScaffold extends Module {
     public GhostScaffold() {
-        super("GhostScaffold", "Allows you to scaffold but with ghost blocks");
+        super("GhostScaffold", "Allows you to scaffold but with ghost blocks", -1, Category.MOVEMENT);
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java
index 6e36667..b8b471c 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java
@@ -1,10 +1,11 @@
 package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
 
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
 import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
 
 public class NoAttackCooldown extends Module {
     public NoAttackCooldown() {
-        super("NoAttackCooldown", "Removes attack cooldown");
+        super("NoAttackCooldown", "Removes attack cooldown", -1, Category.COMBAT);
     }
 
     // removing cooldown handled in PlayerEntityMixin
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java
index 9fe8725..38cfc15 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java
@@ -1,11 +1,12 @@
 package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
 
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
 import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 
 public class NoFall extends Module {
     public NoFall() {
-        super("NoFall", "Negates fall damage.");
+        super("NoFall", "Negates fall damage.", -1, Category.PLAYER);
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Waterwalk.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Waterwalk.java
index 43ab16e..d1541b2 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Waterwalk.java
+++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Waterwalk.java
@@ -1,12 +1,13 @@
 package net.justlearning.arslaan3102.arslaansmagichax.modules.impl;
 
+import net.justlearning.arslaan3102.arslaansmagichax.modules.Category;
 import net.justlearning.arslaan3102.arslaansmagichax.modules.Module;
 import net.minecraft.block.Blocks;
 import net.minecraft.util.math.BlockPos;
 
 public class Waterwalk extends Module {
     public Waterwalk() {
-        super("Waterwalk", "Allows you to walk on water.");
+        super("Waterwalk", "Allows you to walk on water.", -1, Category.MOVEMENT);
     }
 
     @Override