migration to 26.2 - run migrateMappings with old loom then bring it back to new

27 files changed, 0 insertions, 1258 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
deleted file mode 100644
index 4e6267f..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.arslaancodes.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
deleted file mode 100644
index 329b34d..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules;
-
-import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
-import net.minecraft.client.MinecraftClient;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public abstract class Module {
-    private final String name;
-    private final String description;
-    private final Category category;
-    public static MinecraftClient mc;
-    private int glfwKeybinding;
-    private final List<Setting> settings = new ArrayList<>();
-
-    private boolean enabled = false;
-
-    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() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public int getGlfwKeybinding() {
-        return glfwKeybinding;
-    }
-
-    public Category getCategory() {
-        return category;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void toggle() {
-        enabled = !enabled;
-        if (enabled) onEnable();
-        else onDisable();
-    }
-
-    public void setEnabled(boolean state) {
-        if (enabled != state) toggle();
-    }
-
-    public void setGlfwKeybinding(int glfwKeybinding) {
-        this.glfwKeybinding = glfwKeybinding;
-    }
-
-    protected void onEnable() {}
-    protected void onDisable() {}
-
-    public void tick() {}
-
-    protected <T extends Setting> T addSetting(T setting) {
-        settings.add(setting);
-        return setting;
-    }
-
-    public List<Setting> getSettings() {
-        return settings;
-    }
-
-    public Optional<Setting> getSetting(String name) {
-        return settings.stream()
-                .filter(s -> s.getName().equalsIgnoreCase(name))
-                .findFirst();
-    }
-
-    public Optional<BooleanSetting> getBoolean(String name) {
-        return getSetting(name)
-                .filter(s -> s instanceof BooleanSetting)
-                .map(s -> (BooleanSetting) s);
-    }
-
-    public Optional<NumberSetting> getNumber(String name) {
-        return getSetting(name)
-                .filter(s -> s instanceof NumberSetting)
-                .map(s -> (NumberSetting) s);
-    }
-
-    public Optional<ModeSetting> getMode(String name) {
-        return getSetting(name)
-                .filter(s -> s instanceof ModeSetting)
-                .map(s -> (ModeSetting) s);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
deleted file mode 100644
index 5df64e7..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules;
-
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHax;
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
-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.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class ModuleManager {
-    private boolean hudRegistered = false;
-    private static final String CONFIG_FILE = "ArslaansMagicHax.properties";
-
-    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);
-
-            if (isPressed && !wasPressed) {
-                boolean wasEnabled = module.isEnabled(); // use !wasEnabled in the chat message for edge cases e.g. modules that toggle themselves off on enable
-                module.toggle();
-                if (!Objects.equals(module.getName(), "ClickGUI")) {
-                    client.player.sendMessage(Text.literal(
-                            "Toggled module " + module.getName() + " to " + (!wasEnabled ? "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) {
-        modules.add(module);
-    }
-
-    public static List<Module> getAllModules() {
-        return modules;
-    }
-
-    public static List<Module> getEnabledModules() {
-        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() {
-        if (!hudRegistered) {
-            HudRenderCallback.EVENT.register(this::onRenderHud);
-            hudRegistered = true;
-        }
-    }
-
-    private void onRenderHud(DrawContext drawContext, RenderTickCounter renderTickCounter) {
-        if (!ArslaansMagicHaxClient.hideModulesHUD.isEnabled()) {
-            TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-            float alpha = 1.0F;
-            int i = MathHelper.ceil(alpha * 255.0F) << 24; // I don't know what this dark magic is but it works
-            int x = 5;
-            int y = 5;
-
-            int titleColor = 16568909 | i; // weird magic
-
-            drawContext.drawTextWithBackground(textRenderer, Text.literal("Arslaan's Magic Hax"), x, y, 50, titleColor);
-            y += textRenderer.fontHeight + 4;
-
-            for (Module module : ModuleManager.getEnabledModules()) {
-                int color = 16777215 | i; // more magic I don't understand
-                drawContext.drawTextWithShadow(textRenderer, Text.literal(module.getName()), x, y, color);
-                y += textRenderer.fontHeight + 2;
-            }
-        }
-    }
-
-    public void close() {
-        // save then disable all
-        saveModuleStates();
-        for (Module module : modules) {
-            module.setEnabled(false);
-        }
-    }
-
-    public void loadModuleStates() {
-        File file = new File(CONFIG_FILE);
-        if (!file.exists()) return;
-
-        try (FileInputStream fis = new FileInputStream(file)) {
-            Properties properties = new Properties();
-            properties.load(fis);
-
-            for (Module module : modules) {
-                String enabled = properties.getProperty(module.getName() + ".enabled");
-                if (Objects.equals(enabled, "true")) {
-                    module.setEnabled(true);
-                } else {
-                    module.setEnabled(false);
-                }
-
-                String keyStr = properties.getProperty(module.getName() + ".key");
-                if (keyStr != null) {
-                    try {
-                        module.setGlfwKeybinding(Integer.parseInt(keyStr));
-                    } catch (NumberFormatException ignored) {}
-                }
-
-                for (Setting setting : module.getSettings()) {
-                    String value = properties.getProperty(module.getName() + "." + setting.getName());
-                    if (value != null) {
-                        setting.setValueFromString(value);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            ArslaansMagicHax.LOGGER.info("Failed to load module states and settings", e);
-        }
-    }
-
-    public void saveModuleStates() {
-        Properties properties = new Properties();
-        for (Module module : modules) {
-            properties.setProperty(module.getName() + ".enabled", String.valueOf(module.isEnabled()));
-            properties.setProperty(module.getName() + ".key", String.valueOf(module.getGlfwKeybinding()));
-
-            for (Setting setting : module.getSettings()) {
-                properties.setProperty(module.getName() + "." + setting.getName(), setting.getValueAsString());
-            }
-        }
-
-        try (FileOutputStream fos = new FileOutputStream(CONFIG_FILE)) {
-            properties.store(fos, "Arslaan's Magic Hax - Module States & Settings");
-        } catch (IOException e) {
-            ArslaansMagicHax.LOGGER.error("Failed to save module states and settings", e);
-        }
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/AutoClicker.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/AutoClicker.java
deleted file mode 100644
index 075b70c..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/AutoClicker.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.Hand;
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
-
-import java.util.Objects;
-import java.util.Random;
-
-public class AutoClicker extends Module {
-    private final NumberSetting cps = new NumberSetting("CPS", 5, 50, 12, 0.1); // default 10 CPS
-    private final ModeSetting mode = new ModeSetting("Mode", "NoDelay", "CPS", "NoDelay");
-    private long nextClickTime = 0L;
-
-    public AutoClicker() {
-        super("AutoClicker", "Automatically attacks entities under your crosshair.", -1, Category.COMBAT);
-        addSetting(mode);
-        addSetting(cps);
-    }
-
-    @Override
-    public void tick() {
-        if (!isEnabled() || mc.player == null || mc.world == null) return;
-        if (mc.currentScreen != null) return;
-
-        HitResult hr = mc.crosshairTarget;
-        if (!(hr instanceof EntityHitResult eResult)) return;
-
-        Entity target = eResult.getEntity();
-        if (target == null || !target.isAlive()) return;
-
-        if (!Objects.equals(mode.getMode(), "NoDelay")) {
-            long now = System.currentTimeMillis();
-            if (now < nextClickTime) return;
-
-            double delayMs = 1000.0 / cps.getValue();
-            nextClickTime = now + (long) Math.max(1, delayMs);
-        }
-
-        mc.interactionManager.attackEntity(mc.player, target);
-        mc.player.swingHand(Hand.MAIN_HAND);
-    }
-}
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
deleted file mode 100644
index 1fa8ae5..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.screens.clickgui.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/Criticals.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Criticals.java
deleted file mode 100644
index 221e7f5..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Criticals.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.events.PacketEvent;
-import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus;
-import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.play.*;
-import net.minecraft.util.PlayerInput;
-
-import java.util.Objects;
-
-public class Criticals extends Module {
-    private static ModeSetting mode = new ModeSetting("Mode", "Packet", "Packet", "Bypass");
-
-    public Criticals() {
-        super("Criticals", "Always gives critical hits.", -1, Category.COMBAT);
-        SendPacketEventBus.register(Criticals::packetEventListener);
-        addSetting(mode);
-    }
-
-    private static void packetEventListener(PacketEvent.Send event) {
-        if (!ArslaansMagicHaxClient.criticals.isEnabled() || mc.player == null) return;
-
-        String obamaHaveDih = "barapbarapba";  // kinda put it in mbappe
-
-        Packet<?> packet = event.packet();
-
-        // mojang did a mojang thing and you cant detect if packet is InteractType.ATTACK anymore so just assume it is and pray it works
-        if (packet instanceof PlayerInteractEntityC2SPacket && ((IPacket) packet).hax$getTag() != 1337) {
-            event.setCancelled(true);
-
-            if (Objects.equals(mode.getMode(), "Packet")) {
-                // fake not sprinting if sprinting so it lets you crit
-                boolean wasSprinting = false;
-
-                if (mc.player.isSprinting()) {
-                    PlayerInput fakeNoSprint = new PlayerInput(false, false, false, false, false, false, false);
-                    mc.player.networkHandler.sendPacket(new PlayerInputC2SPacket(fakeNoSprint));
-
-                    ClientCommandC2SPacket fakeNoSprintCommand = new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.STOP_SPRINTING);
-                    mc.player.networkHandler.sendPacket(fakeNoSprintCommand);
-
-                    wasSprinting = true;
-                }
-
-                sendYPacket(0.0625);
-                sendYPacket(0);
-
-                ((IPacket) packet).hax$setTag(1337);
-                mc.player.networkHandler.sendPacket(packet);
-
-                // send sprinting packet again just in case it stopped the player from sprinting client-side (happens)
-                if (wasSprinting) {
-                    PlayerInput fakeNoSprint = new PlayerInput(false, false, false, false, false, false, true);
-                    mc.player.networkHandler.sendPacket(new PlayerInputC2SPacket(fakeNoSprint));
-
-                    ClientCommandC2SPacket fakeNoSprintCommand = new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.START_SPRINTING);
-                    mc.player.networkHandler.sendPacket(fakeNoSprintCommand);
-
-                    mc.player.setSprinting(true);
-                }
-            } else if (Objects.equals(mode.getMode(), "Bypass")) {
-                // don't do the sprint bypass and make it more random-looking to throw off anticheat
-                sendYPacket(0.0625 + (Math.random() * 0.01));
-                sendYPacket(0.0);
-            }
-        }
-    }
-
-    private static void sendYPacket(double height) {
-        double x = mc.player.getX();
-        double y = mc.player.getY();
-        double z = mc.player.getZ();
-
-        PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.PositionAndOnGround(x, y + height, z, false, mc.player.horizontalCollision);
-
-        mc.player.networkHandler.sendPacket(packet);
-    }
-}
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
deleted file mode 100644
index 2078383..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.events.PacketEvent;
-import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus;
-import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.network.packet.Packet;
-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 original = mc.player.input.playerInput;
-
-        PlayerInput fakeSneak = new PlayerInput(original.forward(), original.backward(), original.left(), original.right(), original.jump(), true, original.sprint());
-        Packet fakeSneakPacket = new PlayerInputC2SPacket(fakeSneak);
-        ((IPacket) fakeSneakPacket).hax$setTag(1337);
-        mc.player.networkHandler.sendPacket(fakeSneakPacket);
-    }
-}
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
deleted file mode 100644
index 8dc4b24..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-import net.minecraft.text.Text;
-import org.lwjgl.glfw.GLFW;
-
-public class Flight extends Module {
-    private int flyingTickCounter = 0;
-    private boolean sentFirstPacket = false;
-
-    public Flight() {
-        super("Flight", "Enables creative flight in survival.", GLFW.GLFW_KEY_G, Category.MOVEMENT);
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.player == null) return;
-        mc.player.sendMessage(Text.literal("[Flight] It is recommended to use this hack in combination with NoFall."), false);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        mc.player.getAbilities().allowFlying = true;
-        mc.player.getAbilities().flying = true;
-
-        if (flyingTickCounter >= 20) {
-            if (!sentFirstPacket) {
-                sendYPacket(-0.0625);
-                sentFirstPacket = true;
-            } else {
-                sendYPacket(0);
-                sentFirstPacket = false;
-                flyingTickCounter = 0;
-            }
-        }
-        flyingTickCounter++;
-    }
-
-
-    @Override
-    protected void onDisable() {
-        if (mc.player != null) {
-            mc.player.getAbilities().allowFlying = false;
-            mc.player.getAbilities().flying = false;
-        }
-    }
-
-    private static void sendYPacket(double height) {
-        double x = mc.player.getX();
-        double y = mc.player.getY();
-        double z = mc.player.getZ();
-
-        PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.PositionAndOnGround(x, y + height, z, false, mc.player.horizontalCollision);
-
-        mc.player.networkHandler.sendPacket(packet);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Fullbright.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Fullbright.java
deleted file mode 100644
index f6243bf..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Fullbright.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.registry.Registries;
-
-import java.util.Objects;
-
-public class Fullbright extends Module {
-    public ModeSetting mode = new ModeSetting("Mode", "Gamma", "Effect", "Gamma", "Effect + Gamma", "Break AO Renderer");
-    private double previousGamma = 1.0;
-    private boolean setPreviousGamma = false;
-    private String lastMode = ""; // track previous mode
-
-    public Fullbright() {
-        super("Fullbright", "Brightens up your world!", -1, Category.RENDER);
-        addSetting(mode);
-        lastMode = mode.getMode(); // initialize
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.options == null) return;
-        applyMode(mode.getMode());
-
-        if (mc.worldRenderer != null) {
-            mc.worldRenderer.reload();
-        }
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        String currentMode = mode.getMode();
-        if (!Objects.equals(currentMode, lastMode)) {
-            applyMode(currentMode);
-
-            if (mc.worldRenderer != null) {
-                mc.worldRenderer.reload();
-            }
-
-            lastMode = currentMode;
-        }
-
-        if (Objects.equals(currentMode, "Effect")) {
-            mc.player.addStatusEffect(new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(StatusEffects.NIGHT_VISION.value()), 1, 255));
-        } else if (Objects.equals(currentMode, "Effect + Gamma")) {
-            mc.player.addStatusEffect(new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(StatusEffects.NIGHT_VISION.value()), 1, 255));
-        }
-    }
-
-    private void applyMode(String modeName) {
-        if (Objects.equals(modeName, "Gamma")) {
-            if (!setPreviousGamma) previousGamma = mc.options.getGamma().getValue();
-            setPreviousGamma = true;
-            mc.options.getGamma().setValue(1000.0);
-        } else if (Objects.equals(modeName, "Effect + Gamma")) {
-            if (!setPreviousGamma) previousGamma = mc.options.getGamma().getValue();
-            setPreviousGamma = true;
-            mc.options.getGamma().setValue(1000.0);
-        } else if (Objects.equals(modeName, "Effect")) {
-            mc.options.getGamma().setValue(previousGamma);
-            setPreviousGamma = false;
-        }
-    }
-
-    @Override
-    protected void onDisable() {
-        if (mc.player == null) return;
-
-        if (mc.player.hasStatusEffect(Registries.STATUS_EFFECT.getEntry(StatusEffects.NIGHT_VISION.value()))) {
-            mc.player.removeStatusEffect(Registries.STATUS_EFFECT.getEntry(StatusEffects.NIGHT_VISION.value()));
-        }
-
-        mc.options.getGamma().setValue(previousGamma);
-
-        if (mc.worldRenderer != null) {
-            mc.worldRenderer.reload();
-        }
-    }
-}
-
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GUN.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GUN.java
deleted file mode 100644
index 4cc7f0f..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GUN.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Identifier;
-
-public class GUN extends Module {
-    public GUN() {
-        super("G U N", "NoAttackCooldown + Criticals + AutoClicker = G U N", -1, Category.COMBAT);
-    }
-
-    @Override
-    protected void onEnable() {
-        ArslaansMagicHaxClient.clickGUI.setEnabled(false);
-        ArslaansMagicHaxClient.noAttackCooldown.setEnabled(true);
-        ArslaansMagicHaxClient.criticals.setEnabled(true);
-        ArslaansMagicHaxClient.autoClicker.setEnabled(true);
-        this.setEnabled(false);
-        if (mc.player != null) {
-            mc.player.sendMessage(Text.literal("[G U N] Enabled NoAttackCooldown, Criticals, AutoClicker"), false);
-            mc.player.sendMessage(Text.literal("[G U N] Disabled ClickGUI & self (this is a macro module)"), false);
-            mc.inGameHud.setTitle(Text.literal("G U N").formatted(Formatting.RED));
-            mc.inGameHud.setSubtitle(Text.literal("THE POWER").formatted(Formatting.YELLOW));
-            mc.player.sendMessage(Text.literal("Tip: when using G U N, if there is no anticheat set AutoClicker mode to NoDelay"), true);
-            mc.player.playSound(SoundEvent.of(Identifier.of("minecraft:entity.evoker.prepare_wololo")), 100, 1);
-        }
-    }
-}
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
deleted file mode 100644
index c2ee306..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.util.math.BlockPos;
-
-public class GhostScaffold extends Module {
-    public GhostScaffold() {
-        super("GhostScaffold", "Allows you to scaffold but with ghost blocks", -1, Category.MOVEMENT);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null || mc.world == null) return;
-
-        BlockPos pos = mc.player.getBlockPos().down();
-        BlockState blockState = Blocks.STONE.getDefaultState();
-
-        mc.world.setBlockState(pos, blockState);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GravityModifier.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GravityModifier.java
deleted file mode 100644
index 5bdbaaf..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GravityModifier.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
-import org.lwjgl.glfw.GLFW;
-
-public class GravityModifier extends Module {
-    private NumberSetting gravity = new NumberSetting("Modifier", -1, 1, 0, 0.01);
-
-    public GravityModifier() {
-        super("Gravity Modifier", "Changes gravity.", GLFW.GLFW_KEY_GRAVE_ACCENT, Category.MOVEMENT);
-        addSetting(gravity);
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.player != null) mc.player.sendMessage(Text.literal("[Gravity Modifier] It is recommended to use this hack with NoFall."), false);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        Vec3d velocity = mc.player.getVelocity();
-        Vec3d newVelocity = new Vec3d(velocity.x, velocity.y + gravity.getValue(), velocity.z);
-        mc.player.setVelocity(newVelocity);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/HideModulesHUD.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/HideModulesHUD.java
deleted file mode 100644
index 9a81291..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/HideModulesHUD.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-
-public class HideModulesHUD extends Module {
-    public HideModulesHUD() {
-        super("Hide Modules HUD", "Hides the list of modules in the top-left of the HUD.", -1, Category.RENDER);
-    }
-
-    // actual shit is in ModuleManager::onRenderHud (if condition to check if this is not enabled)
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Jetpack.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Jetpack.java
deleted file mode 100644
index 65b70df..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Jetpack.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
-
-public class Jetpack extends Module {
-    private NumberSetting speed = new NumberSetting("Thrust Speed", 1, 10, 1, 1);
-
-    public Jetpack() {
-        super("Jetpack", "Turns your jump key into a jetpack.", -1, Category.MOVEMENT);
-        addSetting(speed);
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.player == null) return;
-        mc.player.sendMessage(Text.literal("[Jetpack] It is recommended to use this hack in combination with NoFall."), false);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        if (mc.options.jumpKey.isPressed()) {
-            mc.player.setVelocity(new Vec3d(mc.player.getVelocity().x, 0.42 * speed.getValue(), mc.player.getVelocity().z));
-            mc.player.fallDistance = 0;
-        }
-    }
-}
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
deleted file mode 100644
index 3b8db2a..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-
-public class NoAttackCooldown extends Module {
-    public NoAttackCooldown() {
-        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
deleted file mode 100644
index 5fab957..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-
-public class NoFall extends Module {
-    public NoFall() {
-        super("NoFall", "Negates fall damage.", -1, Category.PLAYER);
-    }
-
-    @Override
-    public void tick() {
-        if (this.isEnabled()) {
-            if (mc.player != null) {
-                if (!mc.player.isOnGround() && mc.player.fallDistance > 3) {
-                    // magic hax
-                    PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.Full(mc.player.getX(), mc.player.getY() + 0.000000001, mc.player.getZ(),
-                            mc.player.getYaw(), mc.player.getPitch(), false, mc.player.horizontalCollision);
-                    mc.player.networkHandler.sendPacket(packet);
-                }
-            }
-        }
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoPackets.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoPackets.java
deleted file mode 100644
index b99b9aa..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoPackets.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus;
-import com.arslaancodes.arslaansmagichax.events.PacketEvent;
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.text.Text;
-
-public class NoPackets extends Module {
-    public NoPackets() {
-        super("NoPackets", "Stops all outgoing packets from being sent. ONLY USE THIS IF YOU KNOW WHAT YOU ARE DOING!", -1, Category.MISC);
-        SendPacketEventBus.register(NoPackets::packetEventListener);
-    }
-
-    private static void packetEventListener(PacketEvent.Send event) {
-        if (!ArslaansMagicHaxClient.noPackets.isEnabled()) return;
-
-        if (mc.player != null) mc.player.sendMessage(Text.literal("Cancelled outgoing packet: " + event.packet().getClass().getSimpleName() + " -> " + event.packet()), false);
-
-        event.setCancelled(true);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Poseidon.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Poseidon.java
deleted file mode 100644
index 39ae890..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Poseidon.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.registry.Registries;
-
-public class Poseidon extends Module {
-    public Poseidon() {
-        super("Poseidon", "Stops you from drowning.", -1, Category.PLAYER);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        mc.player.setAir(mc.player.getMaxAir());
-        mc.player.addStatusEffect(new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(StatusEffects.WATER_BREATHING.value()), 1, 255));
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Speed.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Speed.java
deleted file mode 100644
index 5d12188..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Speed.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.text.Text;
-
-public class Speed extends Module {
-    private final NumberSetting speed = new NumberSetting("Speed", 0.1, 2.0, 0.4, 0.05);
-    private final BooleanSetting enableWhileSneaking = new BooleanSetting("Enable while Sneaking", true);
-    private final BooleanSetting enableInWater = new BooleanSetting("Enable in Water", true);
-    private final BooleanSetting enableInLava = new BooleanSetting("Enable in Lava", true);
-
-    public Speed() {
-        super("Speed", "Makes you faster.", -1, Category.MOVEMENT);
-        addSetting(speed);
-        addSetting(enableWhileSneaking);
-        addSetting(enableInWater);
-        addSetting(enableInLava);
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.player == null) return;
-        mc.player.sendMessage(Text.literal("[Speed] It is recommended to use this hack in combination with NoFall."), false);
-    }
-
-    @Override
-    public void tick() {
-        if (!isEnabled() || mc.player == null) return;
-        if (!enableWhileSneaking.isEnabled() && mc.player.isSneaking()) return;
-        if (!enableInLava.isEnabled() && mc.player.isInLava()) return;
-        if (!enableInWater.isEnabled() && mc.player.isTouchingWater()) return;
-
-        float forward = mc.player.forwardSpeed;
-        float strafe = mc.player.sidewaysSpeed;
-        float yaw = mc.player.getYaw();
-
-        if (forward == 0 && strafe == 0) return;
-
-        if (forward != 0) {
-            if (strafe > 0) yaw += (forward > 0 ? -45 : 45);
-            else if (strafe < 0) yaw += (forward > 0 ? 45 : -45);
-            strafe = 0;
-            forward = forward > 0 ? 1 : -1;
-        }
-
-        double rad = Math.toRadians(yaw);
-        double sin = Math.sin(rad);
-        double cos = Math.cos(rad);
-
-        double x = (forward * -sin + strafe * cos) * speed.getValue();
-        double z = (forward * cos - strafe * -sin) * speed.getValue();
-
-        mc.player.setVelocity(x, mc.player.getVelocity().y, z);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Spider.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Spider.java
deleted file mode 100644
index 8cef6e8..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Spider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
-
-public class Spider extends Module {
-    private NumberSetting climbSpeed = new NumberSetting("Climb Speed", 0, 1, 0.2, 0.1);
-
-    @Override
-    protected void onEnable() {
-        if (mc.player == null) return;
-        mc.player.sendMessage(Text.literal("[Spider] It is recommended to use this hack in combination with NoFall."), false);
-    }
-
-    public Spider() {
-        super("Spider", "Allows you to climb walls like a spider.", -1, Category.MOVEMENT);
-        addSetting(climbSpeed);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-        if (!mc.player.horizontalCollision) return;
-
-        Vec3d velocity = mc.player.getVelocity();
-        if (velocity.y >= 0.2) return;
-
-        mc.player.setVelocity(velocity.x, climbSpeed.getValue(), velocity.z);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/TickRateLock.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/TickRateLock.java
deleted file mode 100644
index 7290a0d..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/TickRateLock.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import com.arslaancodes.arslaansmagichax.events.PacketEvent;
-import com.arslaancodes.arslaansmagichax.events.ReceivePacketEventBus;
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
-import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
-import net.minecraft.network.listener.ClientPlayPacketListener;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.s2c.play.UpdateTickRateS2CPacket;
-import net.minecraft.world.tick.TickManager;
-
-public class TickRateLock extends Module {
-
-    private NumberSetting tickRate = new NumberSetting("Tick Rate", 1, 100, 20, 1);
-    private BooleanSetting frozen = new BooleanSetting("Frozen", false);
-    private static float serverTickRate = 20; // default 20 tps
-    private static boolean serverFrozen = false; // default not frozen
-
-    public TickRateLock() {
-        super("Tick Rate Lock", "Locks the tick rate to a specified value (Does not affect the server - client-side only)", -1, Category.MISC);
-        addSetting(tickRate);
-        addSetting(frozen);
-        ReceivePacketEventBus.register(TickRateLock::onPacketReceive);
-    }
-
-    private static void onPacketReceive(PacketEvent.Receive event) {
-        if (!ArslaansMagicHaxClient.tickRateLock.isEnabled()) return;
-
-        Packet packet = event.packet();
-
-        if (packet instanceof UpdateTickRateS2CPacket) {
-            serverTickRate = ((UpdateTickRateS2CPacket) packet).tickRate(); // save server tick rate
-            serverFrozen = ((UpdateTickRateS2CPacket) packet).isFrozen(); // save server frozen
-            event.setCancelled(true); // ignores the server, frick them with all their rules
-        }
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null || mc.world == null) return;
-
-        TickManager tickManager = mc.world.getTickManager();
-        if (tickManager.getTickRate() != tickRate.getValue() || tickManager.isFrozen() != frozen.isEnabled()) {
-            tickManager.setTickRate(tickRate.getValueFloat());
-            tickManager.setFrozen(frozen.isEnabled());
-        }
-    }
-
-    @Override
-    protected void onDisable() {
-        if (mc.player == null || mc.world == null) return;
-        TickManager tickManager = mc.world.getTickManager();
-        tickManager.setTickRate(serverTickRate);
-        tickManager.setFrozen(serverFrozen);
-    }
-}
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
deleted file mode 100644
index 27e4b15..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Waterwalk.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.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.", -1, Category.MOVEMENT);
-    }
-
-    @Override
-    public void tick() {
-        if (!this.isEnabled() || mc.player == null) return;
-
-        BlockPos blockBelow = mc.player.getBlockPos().down();
-
-        if (mc.world.getBlockState(blockBelow).isOf(Blocks.WATER)) {
-            if (mc.player.getVelocity().y < 0) {
-                mc.player.setVelocity(mc.player.getVelocity().x, 0.0, mc.player.getVelocity().z);
-
-                if (!mc.player.isJumping()) mc.player.setPos(mc.player.getX(), Math.floor(mc.player.getY()), mc.player.getZ());
-            }
-            mc.player.setOnGround(true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Xray.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Xray.java
deleted file mode 100644
index 6824229..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Xray.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.impl;
-
-import com.arslaancodes.arslaansmagichax.modules.Category;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-public class Xray extends Module {
-    private List<BlockState> interestingBlocks = new ArrayList<>();
-
-    public Xray() {
-        super("Xray", "Allows you to see through blocks.", -1, Category.RENDER);
-
-        // Add ores, spawners, liquids, etc.
-        interestingBlocks.add(Blocks.DIAMOND_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_DIAMOND_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.GOLD_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_GOLD_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.IRON_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_IRON_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.REDSTONE_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_REDSTONE_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.LAPIS_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_LAPIS_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.EMERALD_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_EMERALD_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.COAL_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_COAL_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.COPPER_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.DEEPSLATE_COPPER_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.NETHER_QUARTZ_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.NETHER_GOLD_ORE.getDefaultState());
-        interestingBlocks.add(Blocks.SPAWNER.getDefaultState());
-        interestingBlocks.add(Blocks.CHEST.getDefaultState());
-        interestingBlocks.add(Blocks.ANCIENT_DEBRIS.getDefaultState());
-        interestingBlocks.add(Blocks.GLOWSTONE.getDefaultState());
-        interestingBlocks.add(Blocks.WATER.getDefaultState());
-        interestingBlocks.add(Blocks.LAVA.getDefaultState());
-    }
-
-    @Override
-    protected void onEnable() {
-        if (mc.worldRenderer != null) mc.worldRenderer.reload();
-
-        if (mc.player != null) mc.player.sendMessage(Text.literal("[Xray] It is recommended to use this hack with Fullbright for a better experience."), false);
-    }
-
-
-    @Override
-    protected void onDisable() {
-        if (mc.worldRenderer != null) mc.worldRenderer.reload();
-    }
-
-    public boolean isInterestingBlock(BlockState state) {
-        return interestingBlocks.contains(state);
-    }
-
-    // xraying is handled in BlockMixin.java
-}
-
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/BooleanSetting.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/BooleanSetting.java
deleted file mode 100644
index 618f2f4..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/BooleanSetting.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.settings;
-
-public class BooleanSetting extends Setting {
-
-    private boolean enabled;
-
-    public BooleanSetting(String name, boolean defaultValue) {
-        super(name);
-        this.enabled = defaultValue;
-    }
-
-    public void toggle() {
-        this.enabled = !this.enabled;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    @Override
-    public String getValueAsString() {
-        return String.valueOf(enabled);
-    }
-
-    @Override
-    public void setValueFromString(String value) {
-        this.enabled = Boolean.parseBoolean(value);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/ModeSetting.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/ModeSetting.java
deleted file mode 100644
index 796c3aa..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/ModeSetting.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.settings;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-public class ModeSetting extends Setting {
-
-    private String mode;
-    private List<String> modes;
-    private int index;
-
-    public ModeSetting(String name, String defaultMode, String... modes) {
-        super(name);
-        this.mode = defaultMode;
-        this.modes = Arrays.asList(modes);
-        this.index = this.mode.indexOf(defaultMode);
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public List<String> getModes() {
-        return modes;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-        this.index = modes.indexOf(mode);
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-        this.mode = modes.get(index);
-    }
-
-    public void cycle() {
-        if (index < modes.size() - 1) {
-            index++;
-            mode = modes.get(index);
-        } else if (index >= modes.size() - 1) {
-            index = 0;
-            mode = modes.get(0);
-        }
-    }
-
-    public boolean isMode(String mode) {
-        return Objects.equals(this.mode, mode);
-    }
-
-    @Override
-    public String getValueAsString() {
-        return mode;
-    }
-
-    @Override
-    public void setValueFromString(String value) {
-        setMode(value);
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/NumberSetting.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/NumberSetting.java
deleted file mode 100644
index ea6d9f5..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/NumberSetting.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.settings;
-
-public class NumberSetting extends Setting {
-
-    private double min, max, increment;
-    private double value;
-
-    public NumberSetting(String name, double min, double max, double defaultValue, double increment) {
-        super(name);
-        this.min = min;
-        this.max = max;
-        this.value = defaultValue;
-        this.increment = increment;
-    }
-
-    public static double clamp(double value, double min, double max) {
-        value = Math.max(min, value);
-        value = Math.min(max, value);
-        return value;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public float getValueFloat() {
-        return (float) value;
-    }
-
-    public int getValueInt() {
-        return (int) value;
-    }
-
-    public double getIncrement() {
-        return increment;
-    }
-
-    public double getMin() {
-        return min;
-    }
-
-    public double getMax() {
-        return max;
-    }
-
-    public void setValue(double value) {
-        value = clamp(value, this.min, this.max);
-        value = Math.round(value * (1.0 / this.increment)) / (1.0 / this.increment);
-        this.value = value;
-    }
-
-    public void increment(boolean positive) {
-        if (positive) setValue(getValue() + getIncrement());
-        else setValue(getValue() - getIncrement());
-    }
-
-    @Override
-    public String getValueAsString() {
-        return String.valueOf(value);
-    }
-
-    @Override
-    public void setValueFromString(String value) {
-        setValue(Double.parseDouble(value));
-    }
-}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/Setting.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/Setting.java
deleted file mode 100644
index a272faa..0000000
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/Setting.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.arslaancodes.arslaansmagichax.modules.settings;
-
-public abstract class Setting {
-    private String name;
-    private boolean visible = true;
-
-    public Setting(String name) {
-        this.name = name;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public void setVisible(boolean visible) {
-        this.visible = visible;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public abstract String getValueAsString();
-    public abstract void setValueFromString(String value);
-}