commands are overrated anyway (purge all commands because fabric 26.2 doesnt have another handler)

19 files changed, 24 insertions, 477 deletions

diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java
index 318fd4e..44bbca6 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java
@@ -32,12 +32,12 @@ public class ArslaansMagicHaxClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        ClientCommandRegistrationCallback.EVENT.register(HackTP::register);
+        /*ClientCommandRegistrationCallback.EVENT.register(HackTP::register);
         ClientCommandRegistrationCallback.EVENT.register(ModuleToggleCommand::register);
         ClientCommandRegistrationCallback.EVENT.register(HackXP::register);
         ClientCommandRegistrationCallback.EVENT.register(HackSetblock::register);
         ClientCommandRegistrationCallback.EVENT.register(HackGive::register);
-        ClientCommandRegistrationCallback.EVENT.register(CrashCommand::register); // crashes the game for the funny
+        ClientCommandRegistrationCallback.EVENT.register(CrashCommand::register); // crashes the game for the funny */
 
         ModuleManager.INSTANCE.register(flight);
         ModuleManager.INSTANCE.register(noFall);
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/CrashCommand.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/CrashCommand.java
deleted file mode 100644
index 09be43c..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/CrashCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-
-public class CrashCommand {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(ClientCommandManager.literal("surprise")
-                        .executes(CrashCommand::run)
-        );
-    }
-
-    private static int run(CommandContext<FabricClientCommandSource> ctx) {
-        Minecraft client = Minecraft.getInstance();
-
-        client.execute(() -> {
-            client.player.playSound(
-                    SoundEvent.createVariableRangeEvent(ResourceLocation.parse("minecraft:entity.evoker.prepare_wololo")),
-                    1.0f, // volume
-                    1.0f  // pitch
-            );
-        });
-
-        new Thread(() -> {
-            try { Thread.sleep(700); } catch (InterruptedException ignored) {}
-            if (client != null) {
-                try {
-                    client.player = null;
-                    client.cameraEntity = null;
-                    client.screen = null;
-                    client.hitResult = null;
-                    client.crosshairPickEntity = null;
-                } catch (Throwable ignored) {}
-            }
-            Runtime.getRuntime().halt(1);
-        }, "surprise-halt-thread").start();
-
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackGive.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackGive.java
deleted file mode 100644
index db36136..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackGive.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-
-public class HackGive {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(ClientCommandManager.literal("hackgive")
-                .then(ClientCommandManager.argument("item", StringArgumentType.string())
-                        .then(ClientCommandManager.argument("amount", IntegerArgumentType.integer(1))
-                                .executes(HackGive::run)
-                        )
-                )
-        );
-    }
-
-    private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
-        Minecraft client = Minecraft.getInstance();
-        if (client.level == null || client.player == null) return 0;
-
-        String itemId = StringArgumentType.getString(context, "item");
-        int amount = IntegerArgumentType.getInteger(context, "amount");
-        Item item = BuiltInRegistries.ITEM.getValue(ResourceLocation.parse(itemId));
-        if (item == null) {
-            context.getSource().sendError(Component.literal("Unknown item: " + itemId));
-            return 0;
-        }
-
-        ItemStack stack = new ItemStack(item, amount);
-        client.player.getInventory().add(stack);
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackSetblock.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackSetblock.java
deleted file mode 100644
index a26d0e9..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackSetblock.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class HackSetblock {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(ClientCommandManager.literal("hacksetblock")
-                .then(ClientCommandManager.argument("block", StringArgumentType.string())
-                        // Case: just block -> place at player's feet
-                        .executes(HackSetblock::runAtFeet)
-
-                        // Case: block + xyz -> place at given position
-                        .then(ClientCommandManager.argument("x", IntegerArgumentType.integer())
-                                .then(ClientCommandManager.argument("y", IntegerArgumentType.integer())
-                                        .then(ClientCommandManager.argument("z", IntegerArgumentType.integer())
-                                                .executes(HackSetblock::runAtPos)
-                                        )
-                                )
-                        )
-                )
-        );
-    }
-
-    private static int runAtFeet(CommandContext<FabricClientCommandSource> context) {
-        Minecraft client = Minecraft.getInstance();
-        if (client.level == null || client.player == null) return 0;
-
-        String blockId = StringArgumentType.getString(context, "block");
-        Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(blockId));
-        if (block == null) {
-            context.getSource().sendError(Component.literal("Unknown block: " + blockId));
-            return 0;
-        }
-
-        BlockPos pos = client.player.blockPosition();
-        BlockState blockState = block.defaultBlockState();
-
-        client.level.setBlockAndUpdate(pos, blockState);
-
-        return 1;
-    }
-
-    private static int runAtPos(CommandContext<FabricClientCommandSource> context) {
-        Minecraft client = Minecraft.getInstance();
-        if (client.level == null) return 0;
-
-        String blockId = StringArgumentType.getString(context, "block");
-        int x = IntegerArgumentType.getInteger(context, "x");
-        int y = IntegerArgumentType.getInteger(context, "y");
-        int z = IntegerArgumentType.getInteger(context, "z");
-
-        Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(blockId));
-        if (block == null) {
-            context.getSource().sendError(Component.literal("Unknown block: " + blockId));
-            return 0;
-        }
-
-        BlockPos pos = new BlockPos(x, y, z);
-        BlockState blockState = block.defaultBlockState();
-
-        client.level.setBlockAndUpdate(pos, blockState);
-
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackTP.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackTP.java
deleted file mode 100644
index 6c376ab..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackTP.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.level.Level;
-import java.util.LinkedList;
-import java.util.Queue;
-
-public class HackTP {
-    private static final Queue<double[]> stepQueue = new LinkedList<>();
-    private static int packetsPerTick = 5;
-
-    public static BlockPos findClosestAirNearPosition(int x, int y, int z) {
-        Level world = Minecraft.getInstance().level;
-        if (world == null) return null;
-
-        for (int blockY = y; blockY <= world.getHeight(); blockY++) {
-            BlockPos pos = new BlockPos(x, blockY, z);
-            if (world.getBlockState(pos).isAir() && world.getBlockState(pos.above()).isAir()) {
-                return pos;
-            }
-        }
-
-        for (int blockY = y; blockY >= 0; blockY--) {
-            BlockPos pos = new BlockPos(x, blockY, z);
-            if (world.getBlockState(pos).isAir() && world.getBlockState(pos.above()).isAir()) {
-                return pos;
-            }
-        }
-        return null;
-    }
-
-    private static int computeSafePacketsPerTick(int requestedSpeed) {
-        final int STEP_HORIZ = 2;
-        final double SAFE_HORIZ = 8.5; // server maximum horizontal move
-
-        int allowed = (int) Math.floor(SAFE_HORIZ / STEP_HORIZ);
-        if (allowed < 1) allowed = 1;
-
-        return Math.max(1, Math.min(requestedSpeed, allowed));
-    }
-
-    private static double parseCoordinate(String arg, double current) {
-        if (arg.startsWith("c")) {
-            if (arg.length() == 1) return current;
-            return current + Double.parseDouble(arg.substring(1));
-        } else {
-            return Double.parseDouble(arg);
-        }
-    }
-
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(ClientCommandManager.literal("hacktp")
-                .then(ClientCommandManager.argument("x", StringArgumentType.word())
-                        .then(ClientCommandManager.argument("y", StringArgumentType.word())
-                                .then(ClientCommandManager.argument("z", StringArgumentType.word())
-                                        .then(ClientCommandManager.argument("speed", IntegerArgumentType.integer(0, 25))
-                                                .executes(HackTP::run)
-                                        )
-                                )
-                        )
-                )
-        );
-
-//        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-//            if (!stepQueue.isEmpty() && client.player != null) {
-//                double[] pos = stepQueue.poll();
-//
-//                client.getNetworkHandler().sendPacket(
-//                        new PlayerMoveC2SPacket.PositionAndOnGround(pos[0], pos[1], pos[2], true, client.player.horizontalCollision)
-//                );
-//
-//                client.player.setPos(pos[0], pos[1], pos[2]);
-//
-//                client.player.sendMessage(Text.literal("Teleported to " + pos[0] + " " + pos[1] + " " + pos[2]), false);
-//            }
-//        });
-        ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            if (!stepQueue.isEmpty() && client.player != null) {
-                for (int i = 0; i < packetsPerTick && !stepQueue.isEmpty(); i++) {
-                    double[] pos = stepQueue.poll();
-
-//                    client.getNetworkHandler().sendPacket(
-//                            new PlayerMoveC2SPacket.PositionAndOnGround(
-//                                    pos[0], pos[1], pos[2], true, client.player.horizontalCollision
-//                            )
-//                    );
-
-                    client.player.setPosRaw(pos[0], pos[1], pos[2]);
-
-                    client.player.displayClientMessage(Component.literal("Teleported to " + pos[0] + " " + pos[1] + " " + pos[2] + " with packetsPerTick/speed " + packetsPerTick), false);
-                }
-            }
-        });
-    }
-
-    private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
-        int speed = IntegerArgumentType.getInteger(context, "speed");
-
-        LocalPlayer player = context.getSource().getPlayer();
-        if (player == null) {
-            context.getSource().sendFeedback(Component.literal("No player found."));
-            return -1;
-        }
-
-        double currentX = player.getX();
-        double currentY = player.getY();
-        double currentZ = player.getZ();
-
-        String xArg = context.getArgument("x", String.class);
-        String yArg = context.getArgument("y", String.class);
-        String zArg = context.getArgument("z", String.class);
-
-        double targetX = parseCoordinate(xArg, currentX);
-        double targetY = parseCoordinate(yArg, currentY);
-        double targetZ = parseCoordinate(zArg, currentZ);
-
-        if (speed < 1) {
-            packetsPerTick = computeSafePacketsPerTick(packetsPerTick);
-        } else {
-            packetsPerTick = computeSafePacketsPerTick(speed);
-        }
-
-        context.getSource().sendFeedback(Component.literal("Using " + packetsPerTick + " packets/tick (requested " + speed + ")"));
-
-        int stepX = (targetX > currentX) ? 2 : -2;
-        int stepY = (targetY > currentY) ? 2 : -2;
-        int stepZ = (targetZ > currentZ) ? 2 : -2;
-
-        for (int i = 1; i <= 8; i++) {
-            stepQueue.add(new double[]{currentX, currentY, currentZ});  // I don't know how this works but it makes Y more reliable (go through more blocks on the Y axis?)
-        }
-        while ((stepY > 0 && currentY < targetY) || (stepY < 0 && currentY > targetY)) {
-            currentY += stepY;
-            if ((stepY > 0 && currentY > targetY) || (stepY < 0 && currentY < targetY)) currentY = targetY;
-            stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Component.literal(
-                    "Queued teleport to " + currentX + " " + currentY + " " + currentZ
-            ));
-        }
-
-        while ((stepX > 0 && currentX < targetX) || (stepX < 0 && currentX > targetX)) {
-            currentX += stepX;
-            if ((stepX > 0 && currentX > targetX) || (stepX < 0 && currentX < targetX)) currentX = targetX;
-
-            BlockPos airPos = findClosestAirNearPosition((int) currentX, (int) currentY, (int) currentZ);
-            if (airPos != null) currentY = airPos.getY();
-
-            stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Component.literal(
-                    "Queued teleport to " + currentX + " " + currentY + " " + currentZ
-            ));
-        }
-
-        while ((stepZ > 0 && currentZ < targetZ) || (stepZ < 0 && currentZ > targetZ)) {
-            currentZ += stepZ;
-            if ((stepZ > 0 && currentZ > targetZ) || (stepZ < 0 && currentZ < targetZ)) currentZ = targetZ;
-
-            BlockPos airPos = findClosestAirNearPosition((int) currentX, (int) currentY, (int) currentZ);
-            if (airPos != null) currentY = airPos.getY();
-
-            stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Component.literal(
-                    "Queued teleport to " + currentX + " " + currentY + " " + currentZ
-            ));
-        }
-
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackXP.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackXP.java
deleted file mode 100644
index 024f5c4..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackXP.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.CommandBuildContext;
-
-public class HackXP {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(ClientCommandManager.literal("hackxp")
-                .then(ClientCommandManager.argument("xp", IntegerArgumentType.integer())
-                .executes(HackXP::run)
-                )
-        );
-    }
-
-    private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
-        int xp = IntegerArgumentType.getInteger(context,"xp");
-
-        if (Minecraft.getInstance().player == null) return -1;
-        Minecraft.getInstance().player.experienceLevel += xp;
-
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleSuggestionProvider.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleSuggestionProvider.java
deleted file mode 100644
index 881ddd6..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleSuggestionProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import com.arslaancodes.arslaansmagichax.modules.Module;
-import com.arslaancodes.arslaansmagichax.modules.ModuleManager;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-public class ModuleSuggestionProvider implements SuggestionProvider<FabricClientCommandSource> {
-    @Override
-    public CompletableFuture<Suggestions> getSuggestions(CommandContext<FabricClientCommandSource> context, SuggestionsBuilder builder) throws CommandSyntaxException {
-        List<Module> modules = ModuleManager.getAllModules();
-
-        for (Module module : modules) {
-            builder.suggest(module.getName());
-        }
-
-        return builder.buildFuture();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleToggleCommand.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleToggleCommand.java
deleted file mode 100644
index 60e6b52..0000000
--- a/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleToggleCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.arslaancodes.arslaansmagichax.commands;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.network.chat.Component;
-import com.arslaancodes.arslaansmagichax.modules.ModuleManager;
-
-public class ModuleToggleCommand {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
-        dispatcher.register(
-                ClientCommandManager.literal("module")
-                        .then(
-                                ClientCommandManager.literal("toggle")
-                                        .then(
-                                                ClientCommandManager.argument("moduleName", StringArgumentType.word())
-                                                        .suggests(new ModuleSuggestionProvider())
-                                                        .executes(ModuleToggleCommand::run)
-                                        )
-                        )
-        );
-    }
-
-    private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
-        String moduleName = StringArgumentType.getString(context, "moduleName");
-
-        ModuleManager.getAllModules().stream()
-                .filter(m -> m.getName().equalsIgnoreCase(moduleName))
-                .findFirst()
-                .ifPresentOrElse(module -> {
-                    module.toggle();
-                    context.getSource().sendFeedback(Component.literal(
-                            "Toggled module " + module.getName() + " to " + (module.isEnabled() ? "ON" : "OFF")
-                    ));
-                }, () -> context.getSource().sendError(Component.literal("Module not found: " + moduleName)));
-
-        return 1;
-    }
-}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
index bd4a243..4b88206 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
@@ -4,7 +4,7 @@ import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.DrawContext;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHax;
@@ -83,7 +83,7 @@ public class ModuleManager {
         }
     }
 
-    private void onRenderHud(GuiGraphics drawContext, DeltaTracker renderTickCounter) {
+    private void onRenderHud(DrawContext drawContext, DeltaTracker renderTickCounter) {
         if (!ArslaansMagicHaxClient.hideModulesHUD.isEnabled()) {
             Font textRenderer = Minecraft.getInstance().font;
             float alpha = 1.0F;
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
index d47abf5..6b86573 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
@@ -13,11 +13,11 @@ public class ClickGUI extends Module {
 
     @Override
     protected void onEnable() {
-        Minecraft.getInstance().setScreen(ClickGUIScreen.INSTANCE);
+        Minecraft.getInstance().setScreenAndShowAndShow(ClickGUIScreen.INSTANCE);
     }
 
     @Override
     protected void onDisable() {
-        Minecraft.getInstance().setScreen(null);
+        Minecraft.getInstance().setScreenAndShowAndShow(null);
     }
 }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
index a9b2b7b..367edeb 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
@@ -5,7 +5,7 @@ import com.arslaancodes.arslaansmagichax.modules.Category;
 import com.arslaancodes.arslaansmagichax.modules.Module;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 
 public class GUN extends Module {
@@ -26,7 +26,7 @@ public class GUN extends Module {
             mc.gui.setTitle(Component.literal("G U N").withStyle(ChatFormatting.RED));
             mc.gui.setSubtitle(Component.literal("THE POWER").withStyle(ChatFormatting.YELLOW));
             mc.player.displayClientMessage(Component.literal("Tip: when using G U N, if there is no anticheat set AutoClicker mode to NoDelay"), true);
-            mc.player.playSound(SoundEvent.createVariableRangeEvent(ResourceLocation.parse("minecraft:entity.evoker.prepare_wololo")), 100, 1);
+            mc.player.playSound(SoundEvent.createVariableRangeEvent(Identifier.parse("minecraft:entity.evoker.prepare_wololo")), 100, 1);
         }
     }
 }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
index 962a18e..e18c56d 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
@@ -6,7 +6,7 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.Component;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.KeybindingSelector;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screens.Screen;
 
 public class ClickGUIScreen extends Screen {
@@ -27,7 +27,7 @@ public class ClickGUIScreen extends Screen {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         for (Frame frame : frames) {
             frame.render(context, mouseX, mouseY, deltaTicks);
             frame.updatePosition(mouseX, mouseY);
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
index 6a99973..ef3a879 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
@@ -8,7 +8,7 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 
 public class Frame {
     public int x, y, width, height, dragX, dragY;
@@ -39,7 +39,7 @@ public class Frame {
         }
     }
 
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         context.fill(x, y, x + width, y + height, new Color(252, 210, 77, 255).getRGB());
 
         String text = category.name();
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
index 796c65e..7f361ca 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
@@ -9,7 +9,7 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.*;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 
 public class ModuleButton {
 
@@ -41,7 +41,7 @@ public class ModuleButton {
         }
     }
 
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
 
         context.fill(parent.x, parent.y + offset,  parent.x + parent.width, parent.y + offset + parent.height, new Color(30, 30, 47, alpha).getRGB());
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
index 2dacd2f..44b2f06 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
@@ -4,7 +4,7 @@ import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import java.awt.*;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.network.chat.Component;
 
 public class CheckBox extends Component {
@@ -17,7 +17,7 @@ public class CheckBox extends Component {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = booleanSetting.getName() + ": " + booleanSetting.isEnabled();
         int textWidth = mc.font.width(displayText);
         int padding = 5;
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
index 96a3bbd..2cbe9b8 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
@@ -3,7 +3,7 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 
 public class Component {
 
@@ -19,7 +19,7 @@ public class Component {
         this.offset = offset;
     }
 
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
 
     }
 
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
index a29c3a2..59bfe8f 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
@@ -4,7 +4,7 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 
 public class KeybindingSelector extends Component {
 
@@ -15,7 +15,7 @@ public class KeybindingSelector extends Component {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         int alpha = isHovered(mouseX, mouseY) ? 230 : 160;
         context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(30, 30, 47, alpha).getRGB());
 
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
index 1200fa0..b33374b 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
@@ -4,7 +4,7 @@ import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import java.awt.*;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.network.chat.Component;
 
 public class ModeBox extends Component {
@@ -17,7 +17,7 @@ public class ModeBox extends Component {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = modeSetting.getName() + ": " + modeSetting.getMode();
         int textWidth = mc.font.width(displayText);
 
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
index bacefd6..45e1c04 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
@@ -6,7 +6,7 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import java.awt.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.network.chat.Component;
 
 public class Slider extends Component {
@@ -21,7 +21,7 @@ public class Slider extends Component {
     }
 
     @Override
-    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = numberSetting.getName() + ": " + numberSetting.getValue();
         int defaultPadding = 5;
         int boxWidth = parent.parent.width;