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

63 files changed, 444 insertions, 474 deletions

diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/ArslaansMagicHax.java b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHax.java
index 493e8d7..493e8d7 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/ArslaansMagicHax.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHax.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/ArslaansMagicHaxClient.java b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java
index 318fd4e..318fd4e 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/ArslaansMagicHaxClient.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/ArslaansMagicHaxClient.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/CrashCommand.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/CrashCommand.java
index 0129366..09be43c 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/CrashCommand.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/CrashCommand.java
@@ -7,24 +7,24 @@ 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.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.util.Identifier;
+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, CommandRegistryAccess access) {
+    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
         dispatcher.register(ClientCommandManager.literal("surprise")
                         .executes(CrashCommand::run)
         );
     }
 
     private static int run(CommandContext<FabricClientCommandSource> ctx) {
-        MinecraftClient client = MinecraftClient.getInstance();
+        Minecraft client = Minecraft.getInstance();
 
         client.execute(() -> {
             client.player.playSound(
-                    SoundEvent.of(Identifier.of("minecraft:entity.evoker.prepare_wololo")),
+                    SoundEvent.createVariableRangeEvent(ResourceLocation.parse("minecraft:entity.evoker.prepare_wololo")),
                     1.0f, // volume
                     1.0f  // pitch
             );
@@ -36,9 +36,9 @@ public class CrashCommand {
                 try {
                     client.player = null;
                     client.cameraEntity = null;
-                    client.currentScreen = null;
-                    client.crosshairTarget = null;
-                    client.targetedEntity = null;
+                    client.screen = null;
+                    client.hitResult = null;
+                    client.crosshairPickEntity = null;
                 } catch (Throwable ignored) {}
             }
             Runtime.getRuntime().halt(1);
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackGive.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackGive.java
index ea2e1d9..db36136 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackGive.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackGive.java
@@ -7,17 +7,16 @@ 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.block.Block;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
+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, CommandRegistryAccess access) {
+    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))
@@ -28,19 +27,19 @@ public class HackGive {
     }
 
     private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.world == null || client.player == null) return 0;
+        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 = Registries.ITEM.get(Identifier.of(itemId));
+        Item item = BuiltInRegistries.ITEM.getValue(ResourceLocation.parse(itemId));
         if (item == null) {
-            context.getSource().sendError(Text.literal("Unknown item: " + itemId));
+            context.getSource().sendError(Component.literal("Unknown item: " + itemId));
             return 0;
         }
 
         ItemStack stack = new ItemStack(item, amount);
-        client.player.getInventory().insertStack(stack);
+        client.player.getInventory().add(stack);
         return 1;
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackSetblock.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackSetblock.java
index aba8bb6..a26d0e9 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackSetblock.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackSetblock.java
@@ -6,17 +6,17 @@ 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.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
+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, CommandRegistryAccess access) {
+    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
@@ -35,43 +35,43 @@ public class HackSetblock {
     }
 
     private static int runAtFeet(CommandContext<FabricClientCommandSource> context) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.world == null || client.player == null) return 0;
+        Minecraft client = Minecraft.getInstance();
+        if (client.level == null || client.player == null) return 0;
 
         String blockId = StringArgumentType.getString(context, "block");
-        Block block = Registries.BLOCK.get(Identifier.of(blockId));
+        Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(blockId));
         if (block == null) {
-            context.getSource().sendError(Text.literal("Unknown block: " + blockId));
+            context.getSource().sendError(Component.literal("Unknown block: " + blockId));
             return 0;
         }
 
-        BlockPos pos = client.player.getBlockPos();
-        BlockState blockState = block.getDefaultState();
+        BlockPos pos = client.player.blockPosition();
+        BlockState blockState = block.defaultBlockState();
 
-        client.world.setBlockState(pos, blockState);
+        client.level.setBlockAndUpdate(pos, blockState);
 
         return 1;
     }
 
     private static int runAtPos(CommandContext<FabricClientCommandSource> context) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.world == null) return 0;
+        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 = Registries.BLOCK.get(Identifier.of(blockId));
+        Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(blockId));
         if (block == null) {
-            context.getSource().sendError(Text.literal("Unknown block: " + blockId));
+            context.getSource().sendError(Component.literal("Unknown block: " + blockId));
             return 0;
         }
 
         BlockPos pos = new BlockPos(x, y, z);
-        BlockState blockState = block.getDefaultState();
+        BlockState blockState = block.defaultBlockState();
 
-        client.world.setBlockState(pos, blockState);
+        client.level.setBlockAndUpdate(pos, blockState);
 
         return 1;
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackTP.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackTP.java
index 8e11635..6c376ab 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackTP.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackTP.java
@@ -8,15 +8,12 @@ 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.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
+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;
 
@@ -25,19 +22,19 @@ public class HackTP {
     private static int packetsPerTick = 5;
 
     public static BlockPos findClosestAirNearPosition(int x, int y, int z) {
-        World world = MinecraftClient.getInstance().world;
+        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.up()).isAir()) {
+            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.up()).isAir()) {
+            if (world.getBlockState(pos).isAir() && world.getBlockState(pos.above()).isAir()) {
                 return pos;
             }
         }
@@ -63,7 +60,7 @@ public class HackTP {
         }
     }
 
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess access) {
+    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())
@@ -100,9 +97,9 @@ public class HackTP {
 //                            )
 //                    );
 
-                    client.player.setPos(pos[0], pos[1], pos[2]);
+                    client.player.setPosRaw(pos[0], pos[1], pos[2]);
 
-                    client.player.sendMessage(Text.literal("Teleported to " + pos[0] + " " + pos[1] + " " + pos[2] + " with packetsPerTick/speed " + packetsPerTick), false);
+                    client.player.displayClientMessage(Component.literal("Teleported to " + pos[0] + " " + pos[1] + " " + pos[2] + " with packetsPerTick/speed " + packetsPerTick), false);
                 }
             }
         });
@@ -111,9 +108,9 @@ public class HackTP {
     private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
         int speed = IntegerArgumentType.getInteger(context, "speed");
 
-        ClientPlayerEntity player = context.getSource().getPlayer();
+        LocalPlayer player = context.getSource().getPlayer();
         if (player == null) {
-            context.getSource().sendFeedback(Text.literal("No player found."));
+            context.getSource().sendFeedback(Component.literal("No player found."));
             return -1;
         }
 
@@ -135,7 +132,7 @@ public class HackTP {
             packetsPerTick = computeSafePacketsPerTick(speed);
         }
 
-        context.getSource().sendFeedback(Text.literal("Using " + packetsPerTick + " packets/tick (requested " + speed + ")"));
+        context.getSource().sendFeedback(Component.literal("Using " + packetsPerTick + " packets/tick (requested " + speed + ")"));
 
         int stepX = (targetX > currentX) ? 2 : -2;
         int stepY = (targetY > currentY) ? 2 : -2;
@@ -148,7 +145,7 @@ public class HackTP {
             currentY += stepY;
             if ((stepY > 0 && currentY > targetY) || (stepY < 0 && currentY < targetY)) currentY = targetY;
             stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Text.literal(
+            context.getSource().sendFeedback(Component.literal(
                     "Queued teleport to " + currentX + " " + currentY + " " + currentZ
             ));
         }
@@ -161,7 +158,7 @@ public class HackTP {
             if (airPos != null) currentY = airPos.getY();
 
             stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Text.literal(
+            context.getSource().sendFeedback(Component.literal(
                     "Queued teleport to " + currentX + " " + currentY + " " + currentZ
             ));
         }
@@ -174,7 +171,7 @@ public class HackTP {
             if (airPos != null) currentY = airPos.getY();
 
             stepQueue.add(new double[]{currentX, currentY, currentZ});
-            context.getSource().sendFeedback(Text.literal(
+            context.getSource().sendFeedback(Component.literal(
                     "Queued teleport to " + currentX + " " + currentY + " " + currentZ
             ));
         }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackXP.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackXP.java
index bbfb818..024f5c4 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/HackXP.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/HackXP.java
@@ -7,16 +7,11 @@ 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.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.inventory.StackWithSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.network.packet.s2c.play.ExperienceBarUpdateS2CPacket;
-import net.minecraft.storage.WriteView;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.CommandBuildContext;
 
 public class HackXP {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess access) {
+    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
         dispatcher.register(ClientCommandManager.literal("hackxp")
                 .then(ClientCommandManager.argument("xp", IntegerArgumentType.integer())
                 .executes(HackXP::run)
@@ -27,8 +22,8 @@ public class HackXP {
     private static int run(CommandContext<FabricClientCommandSource> context) throws CommandSyntaxException {
         int xp = IntegerArgumentType.getInteger(context,"xp");
 
-        if (MinecraftClient.getInstance().player == null) return -1;
-        MinecraftClient.getInstance().player.experienceLevel += xp;
+        if (Minecraft.getInstance().player == null) return -1;
+        Minecraft.getInstance().player.experienceLevel += xp;
 
         return 1;
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/ModuleSuggestionProvider.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleSuggestionProvider.java
index 881ddd6..881ddd6 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/ModuleSuggestionProvider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleSuggestionProvider.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/ModuleToggleCommand.java b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleToggleCommand.java
index 6453e4c..60e6b52 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/commands/ModuleToggleCommand.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/commands/ModuleToggleCommand.java
@@ -7,12 +7,12 @@ 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;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.text.Text;
 
 public class ModuleToggleCommand {
-    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess access) {
+    public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext access) {
         dispatcher.register(
                 ClientCommandManager.literal("module")
                         .then(
@@ -34,10 +34,10 @@ public class ModuleToggleCommand {
                 .findFirst()
                 .ifPresentOrElse(module -> {
                     module.toggle();
-                    context.getSource().sendFeedback(Text.literal(
+                    context.getSource().sendFeedback(Component.literal(
                             "Toggled module " + module.getName() + " to " + (module.isEnabled() ? "ON" : "OFF")
                     ));
-                }, () -> context.getSource().sendError(Text.literal("Module not found: " + moduleName)));
+                }, () -> context.getSource().sendError(Component.literal("Module not found: " + moduleName)));
 
         return 1;
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/PacketEvent.java b/src/main/java/com/arslaancodes/arslaansmagichax/events/PacketEvent.java
index b979fd0..494eb7a 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/PacketEvent.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/events/PacketEvent.java
@@ -1,6 +1,6 @@
 package com.arslaancodes.arslaansmagichax.events;
 
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.protocol.Packet;
 
 public final class PacketEvent {
     private PacketEvent() {}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/ReceivePacketEventBus.java b/src/main/java/com/arslaancodes/arslaansmagichax/events/ReceivePacketEventBus.java
index 2f6b498..2f6b498 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/ReceivePacketEventBus.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/events/ReceivePacketEventBus.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/SendPacketEventBus.java b/src/main/java/com/arslaancodes/arslaansmagichax/events/SendPacketEventBus.java
index 1832ab4..1832ab4 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/events/SendPacketEventBus.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/events/SendPacketEventBus.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockMixin.java
index 0556448..4a3ddc9 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockMixin.java
@@ -1,27 +1,27 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Objects;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
 
-@Mixin(AbstractBlock.class)
+@Mixin(BlockBehaviour.class)
 public class AbstractBlockMixin {
-    private static MinecraftClient mc = MinecraftClient.getInstance();
+    private static Minecraft mc = Minecraft.getInstance();
 
-    @Inject(method = "getAmbientOcclusionLightLevel", at = @At("HEAD"), cancellable = true)
-    private void onGetAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos, CallbackInfoReturnable<Float> cir) {
-        if (mc == null) mc = MinecraftClient.getInstance(); // just in case :)
+    @Inject(method = "getShadeBrightness", at = @At("HEAD"), cancellable = true)
+    private void onGetAmbientOcclusionLightLevel(BlockState state, BlockGetter world, BlockPos pos, CallbackInfoReturnable<Float> cir) {
+        if (mc == null) mc = Minecraft.getInstance(); // just in case :)
         if (mc != null) {
-            if (mc.world != null && (ArslaansMagicHaxClient.fullbright.isEnabled())) {
+            if (mc.level != null && (ArslaansMagicHaxClient.fullbright.isEnabled())) {
                 if (Objects.equals(ArslaansMagicHaxClient.fullbright.mode.getMode(), "Break AO Renderer")) {
                     cir.setReturnValue(15.0F); // over the limit of 1.0F, breaks the ambient occlusion renderer and messes everything up :) yay
                 } else {
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockStateMixin.java
index cba7c24..cfdc76f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockStateMixin.java
@@ -6,23 +6,23 @@ New logic is implemented in AbstractBlockMixin.java
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import net.minecraft.block.AbstractBlock.AbstractBlockState;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(AbstractBlockState.class)
+@Mixin(BlockStateBase.class)
 public class AbstractBlockStateMixin {
-    private static MinecraftClient mc = MinecraftClient.getInstance();
+    private static Minecraft mc = Minecraft.getInstance();
 
-    @Inject(method = "getLuminance", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getLightEmission", at = @At("HEAD"), cancellable = true)
     private void onGetLuminance(CallbackInfoReturnable<Integer> cir) {
-        AbstractBlockState state = (AbstractBlockState)(Object)this;
+        BlockStateBase state = (BlockStateBase)(Object)this;
 
-        if (mc.world != null && (ArslaansMagicHaxClient.xray.isEnabled() && ArslaansMagicHaxClient.xray.isInterestingBlock((BlockState) state) || ArslaansMagicHaxClient.fullbright.isEnabled())) {
+        if (mc.level != null && (ArslaansMagicHaxClient.xray.isEnabled() && ArslaansMagicHaxClient.xray.isInterestingBlock((BlockState) state) || ArslaansMagicHaxClient.fullbright.isEnabled())) {
             cir.setReturnValue(15);
         }
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/BlockMixin.java
index ed4b24e..2a088c2 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/BlockMixin.java
@@ -1,10 +1,9 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.math.Direction;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(Block.class)
 public class BlockMixin {
 
-    @Inject(method = "shouldDrawSide", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "shouldRenderFace", at = @At("HEAD"), cancellable = true)
     private static void onShouldDrawSide(BlockState state, BlockState otherState, Direction side, CallbackInfoReturnable<Boolean> cir) {
         if (ArslaansMagicHaxClient.xray.isEnabled()) {
             if (ArslaansMagicHaxClient.xray.isInterestingBlock(state)) {
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java
index 246ec30..30390ee 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java
@@ -1,17 +1,17 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus;
+import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
+import net.minecraft.network.protocol.Packet;
 import com.arslaancodes.arslaansmagichax.events.PacketEvent;
-import net.minecraft.client.network.ClientCommonNetworkHandler;
-import net.minecraft.network.packet.Packet;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ClientCommonNetworkHandler.class)
+@Mixin(ClientCommonPacketListenerImpl.class)
 public class ClientCommonNetworkHandlerMixin {
-    @Inject(method = "sendPacket", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "send", at = @At("HEAD"), cancellable = true)
     private void onSendPacket(Packet<?> packet, CallbackInfo ci) {
         PacketEvent.Send ev = new PacketEvent.Send(packet);
         SendPacketEventBus.post(ev);
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientConnectionMixin.java
index 0eefb9d..320d627 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientConnectionMixin.java
@@ -3,25 +3,25 @@ package com.arslaancodes.arslaansmagichax.mixin;
 import io.netty.channel.ChannelHandlerContext;
 import com.arslaancodes.arslaansmagichax.events.PacketEvent;
 import com.arslaancodes.arslaansmagichax.events.ReceivePacketEventBus;
-import net.minecraft.network.ClientConnection;
-import net.minecraft.network.listener.ClientPlayPacketListener;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.s2c.play.BundleS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Iterator;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.protocol.game.ClientboundBundlePacket;
 
-@Mixin(ClientConnection.class)
+@Mixin(Connection.class)
 public class ClientConnectionMixin {
-    @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;handlePacket(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;)V", shift = At.Shift.BEFORE), cancellable = true)
+    @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;)V",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;genericsFtw(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;)V", shift = At.Shift.BEFORE), cancellable = true)
     private void onHandlePacket(ChannelHandlerContext channelHandlerContext, Packet<?> packet, CallbackInfo ci) {
-        if (packet instanceof BundleS2CPacket bundle) {
-            for (Iterator<Packet<? super ClientPlayPacketListener>> it = bundle.getPackets().iterator(); it.hasNext(); ) {
-                Packet<? super ClientPlayPacketListener> innerPacket = it.next();
+        if (packet instanceof ClientboundBundlePacket bundle) {
+            for (Iterator<Packet<? super ClientGamePacketListener>> it = bundle.subPackets().iterator(); it.hasNext(); ) {
+                Packet<? super ClientGamePacketListener> innerPacket = it.next();
                 PacketEvent.Receive ev = new PacketEvent.Receive(innerPacket);
                 ReceivePacketEventBus.post(ev);
                 if (ev.isCancelled()) it.remove();
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java
index 9e61561..e868708 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java
@@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Optional;
 
-@Mixin(targets = "net.minecraft.client.option.SimpleOption$DoubleSliderCallbacks")
+@Mixin(targets = "net.minecraft.client.OptionInstance$UnitDouble")
 public class DoubleSliderCallbacksMixin {
-    @Inject(method = "validate", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "validateValue", at = @At("HEAD"), cancellable = true)
     private void allowHighGamma(Double value, CallbackInfoReturnable<Optional<Double>> cir) {
         if (ArslaansMagicHaxClient.fullbright.isEnabled() || ArslaansMagicHaxClient.xray.isEnabled()) {
             cir.setReturnValue(Optional.of(value));
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/MinecraftClientMixin.java
index f4d9c71..188ba27 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/MinecraftClientMixin.java
@@ -1,14 +1,14 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(MinecraftClient.class)
+@Mixin(Minecraft.class)
 public class MinecraftClientMixin {
-    @Inject(method = "getWindowTitle", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "createTitle", at = @At("HEAD"), cancellable = true)
     private void onGetWindowTitle(CallbackInfoReturnable<String> cir) {
         cir.setReturnValue("Arslaan's Magic Hax | Minecraft 1.21.8");
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerEntityMixin.java
index e844124..73583e9 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerEntityMixin.java
@@ -2,16 +2,15 @@ package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
 import com.arslaancodes.arslaansmagichax.modules.impl.NoAttackCooldown;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(PlayerEntity.class)
+@Mixin(Player.class)
 public abstract class PlayerEntityMixin {
-    @Inject(method = "getAttackCooldownProgress", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getAttackStrengthScale", at = @At("HEAD"), cancellable = true)
     private void onGetAttackCooldownProgress(CallbackInfoReturnable<Float> cir) {
         if (ArslaansMagicHaxClient.noAttackCooldown.isEnabled()) cir.setReturnValue(1.0F);
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java
index bc89acc..c2992fd 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java
@@ -1,10 +1,10 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
-import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(PlayerInputC2SPacket.class)
+@Mixin(ServerboundPlayerInputPacket.class)
 public abstract class PlayerInputC2SPacketMixin implements IPacket {
     private int tag = -1;
 
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java
index 0c66b82..f6253b3 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java
@@ -1,11 +1,10 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
-import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
+import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(PlayerInteractEntityC2SPacket.class)
+@Mixin(ServerboundInteractPacket.class)
 public abstract class PlayerInteractEntityC2SPacketMixin implements IPacket {
     private int tag = -1;
 
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java
index 8a8bd0e..18422a8 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java
@@ -1,10 +1,10 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
 import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(PlayerMoveC2SPacket.class)
+@Mixin(ServerboundMovePlayerPacket.class)
 public abstract class PlayerMoveC2SPacketMixin implements IPacket {
     private int tag = -1;
 
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java
index 8a6942e..b927325 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java
@@ -1,22 +1,22 @@
 package com.arslaancodes.arslaansmagichax.mixin;
 
-import net.minecraft.client.gui.screen.SplashTextRenderer;
-import net.minecraft.client.resource.SplashTextResourceSupplier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Random;
+import net.minecraft.client.gui.components.SplashRenderer;
+import net.minecraft.client.resources.SplashManager;
 
-@Mixin(SplashTextResourceSupplier.class)
+@Mixin(SplashManager.class)
 public class SplashTextResourceSupplierMixin {
     private static final Random RANDOM = new Random();
 
-    @Inject(method = "get", at = @At("HEAD"), cancellable = true)
-    public void onGet(CallbackInfoReturnable<SplashTextRenderer> cir) {
+    @Inject(method = "getSplash", at = @At("HEAD"), cancellable = true)
+    public void onGet(CallbackInfoReturnable<SplashRenderer> cir) {
         String[] splashes = {"\"one can only hope.\"", "hackerman approved", "Cheater!", "totally not malware", "cheats for block game", "dont use /surprise"};
         String selected = splashes[RANDOM.nextInt(splashes.length)];
-        cir.setReturnValue(new SplashTextRenderer(selected));
+        cir.setReturnValue(new SplashRenderer(selected));
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixininterface/IPacket.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixininterface/IPacket.java
index d0b6bd7..d0b6bd7 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixininterface/IPacket.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixininterface/IPacket.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/Category.java
index 4e6267f..4e6267f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Category.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/Category.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/Module.java
index 329b34d..37a957b 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/Module.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/Module.java
@@ -4,17 +4,16 @@ 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;
+import net.minecraft.client.Minecraft;
 
 public abstract class Module {
     private final String name;
     private final String description;
     private final Category category;
-    public static MinecraftClient mc;
+    public static Minecraft mc;
     private int glfwKeybinding;
     private final List<Setting> settings = new ArrayList<>();
 
@@ -23,7 +22,7 @@ public abstract class Module {
     public Module(String name, String description, int glfwKeybinding, Category category) {
         this.name = name;
         this.description = description;
-        this.mc = MinecraftClient.getInstance();
+        this.mc = Minecraft.getInstance();
         this.glfwKeybinding = glfwKeybinding;
         this.category = category;
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
index 5df64e7..bd4a243 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/ModuleManager.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
@@ -1,17 +1,16 @@
 package com.arslaancodes.arslaansmagichax.modules;
 
 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.network.chat.Component;
+import net.minecraft.util.Mth;
 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 com.mojang.blaze3d.platform.InputConstants;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -26,21 +25,21 @@ public class ModuleManager {
     private static Map<Module, Boolean> previousKeyState = new HashMap<>();
 
     public static void handleKeyPresses() {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.player == null || client.currentScreen != null) return;
+        Minecraft client = Minecraft.getInstance();
+        if (client.player == null || client.screen != null) return;
 
         for (Module module : modules) {
             int key = module.getGlfwKeybinding();
             if (key == -1) continue;
 
-            boolean isPressed = InputUtil.isKeyPressed(client.getWindow().getHandle(), key);
+            boolean isPressed = InputConstants.isKeyDown(client.getWindow().getWindow(), 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(
+                    client.player.displayClientMessage(Component.literal(
                             "Toggled module " + module.getName() + " to " + (!wasEnabled ? "ON" : "OFF")
                     ), false);
                 }
@@ -84,23 +83,23 @@ public class ModuleManager {
         }
     }
 
-    private void onRenderHud(DrawContext drawContext, RenderTickCounter renderTickCounter) {
+    private void onRenderHud(GuiGraphics drawContext, DeltaTracker renderTickCounter) {
         if (!ArslaansMagicHaxClient.hideModulesHUD.isEnabled()) {
-            TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+            Font textRenderer = Minecraft.getInstance().font;
             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 i = Mth.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;
+            drawContext.drawStringWithBackdrop(textRenderer, Component.literal("Arslaan's Magic Hax"), x, y, 50, titleColor);
+            y += textRenderer.lineHeight + 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;
+                drawContext.drawString(textRenderer, Component.literal(module.getName()), x, y, color);
+                y += textRenderer.lineHeight + 2;
             }
         }
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/AutoClicker.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java
index 075b70c..7c67201 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/AutoClicker.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java
@@ -4,13 +4,12 @@ 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;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
 
 public class AutoClicker extends Module {
     private final NumberSetting cps = new NumberSetting("CPS", 5, 50, 12, 0.1); // default 10 CPS
@@ -25,10 +24,10 @@ public class AutoClicker extends Module {
 
     @Override
     public void tick() {
-        if (!isEnabled() || mc.player == null || mc.world == null) return;
-        if (mc.currentScreen != null) return;
+        if (!isEnabled() || mc.player == null || mc.level == null) return;
+        if (mc.screen != null) return;
 
-        HitResult hr = mc.crosshairTarget;
+        HitResult hr = mc.hitResult;
         if (!(hr instanceof EntityHitResult eResult)) return;
 
         Entity target = eResult.getEntity();
@@ -42,7 +41,7 @@ public class AutoClicker extends Module {
             nextClickTime = now + (long) Math.max(1, delayMs);
         }
 
-        mc.interactionManager.attackEntity(mc.player, target);
-        mc.player.swingHand(Hand.MAIN_HAND);
+        mc.gameMode.attack(mc.player, target);
+        mc.player.swing(InteractionHand.MAIN_HAND);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
index 1fa8ae5..d47abf5 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/ClickGUI.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
@@ -3,7 +3,7 @@ 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 net.minecraft.client.Minecraft;
 import org.lwjgl.glfw.GLFW;
 
 public class ClickGUI extends Module {
@@ -13,11 +13,11 @@ public class ClickGUI extends Module {
 
     @Override
     protected void onEnable() {
-        MinecraftClient.getInstance().setScreen(ClickGUIScreen.INSTANCE);
+        Minecraft.getInstance().setScreen(ClickGUIScreen.INSTANCE);
     }
 
     @Override
     protected void onDisable() {
-        MinecraftClient.getInstance().setScreen(null);
+        Minecraft.getInstance().setScreen(null);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Criticals.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java
index 221e7f5..e8eaa7f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Criticals.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java
@@ -7,10 +7,13 @@ 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 net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ServerboundInteractPacket;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
+import net.minecraft.world.entity.player.Input;
 import java.util.Objects;
 
 public class Criticals extends Module {
@@ -30,7 +33,7 @@ public class Criticals extends Module {
         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) {
+        if (packet instanceof ServerboundInteractPacket && ((IPacket) packet).hax$getTag() != 1337) {
             event.setCancelled(true);
 
             if (Objects.equals(mode.getMode(), "Packet")) {
@@ -38,11 +41,11 @@ public class Criticals extends Module {
                 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));
+                    Input fakeNoSprint = new Input(false, false, false, false, false, false, false);
+                    mc.player.connection.send(new ServerboundPlayerInputPacket(fakeNoSprint));
 
-                    ClientCommandC2SPacket fakeNoSprintCommand = new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.STOP_SPRINTING);
-                    mc.player.networkHandler.sendPacket(fakeNoSprintCommand);
+                    ServerboundPlayerCommandPacket fakeNoSprintCommand = new ServerboundPlayerCommandPacket(mc.player, ServerboundPlayerCommandPacket.Action.STOP_SPRINTING);
+                    mc.player.connection.send(fakeNoSprintCommand);
 
                     wasSprinting = true;
                 }
@@ -51,15 +54,15 @@ public class Criticals extends Module {
                 sendYPacket(0);
 
                 ((IPacket) packet).hax$setTag(1337);
-                mc.player.networkHandler.sendPacket(packet);
+                mc.player.connection.send(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));
+                    Input fakeNoSprint = new Input(false, false, false, false, false, false, true);
+                    mc.player.connection.send(new ServerboundPlayerInputPacket(fakeNoSprint));
 
-                    ClientCommandC2SPacket fakeNoSprintCommand = new ClientCommandC2SPacket(mc.player, ClientCommandC2SPacket.Mode.START_SPRINTING);
-                    mc.player.networkHandler.sendPacket(fakeNoSprintCommand);
+                    ServerboundPlayerCommandPacket fakeNoSprintCommand = new ServerboundPlayerCommandPacket(mc.player, ServerboundPlayerCommandPacket.Action.START_SPRINTING);
+                    mc.player.connection.send(fakeNoSprintCommand);
 
                     mc.player.setSprinting(true);
                 }
@@ -76,8 +79,8 @@ public class Criticals extends Module {
         double y = mc.player.getY();
         double z = mc.player.getZ();
 
-        PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.PositionAndOnGround(x, y + height, z, false, mc.player.horizontalCollision);
+        ServerboundMovePlayerPacket packet = new ServerboundMovePlayerPacket.Pos(x, y + height, z, false, mc.player.horizontalCollision);
 
-        mc.player.networkHandler.sendPacket(packet);
+        mc.player.connection.send(packet);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/FakeSneak.java
index 2078383..8154a20 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/FakeSneak.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/FakeSneak.java
@@ -6,10 +6,9 @@ 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;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
+import net.minecraft.world.entity.player.Input;
 
 public class FakeSneak extends Module {
     public FakeSneak() {
@@ -20,11 +19,11 @@ public class FakeSneak extends Module {
     public void tick() {
         if (!this.isEnabled() || mc.player == null) return;
 
-        PlayerInput original = mc.player.input.playerInput;
+        Input original = mc.player.input.keyPresses;
 
-        PlayerInput fakeSneak = new PlayerInput(original.forward(), original.backward(), original.left(), original.right(), original.jump(), true, original.sprint());
-        Packet fakeSneakPacket = new PlayerInputC2SPacket(fakeSneak);
+        Input fakeSneak = new Input(original.forward(), original.backward(), original.left(), original.right(), original.jump(), true, original.sprint());
+        Packet fakeSneakPacket = new ServerboundPlayerInputPacket(fakeSneak);
         ((IPacket) fakeSneakPacket).hax$setTag(1337);
-        mc.player.networkHandler.sendPacket(fakeSneakPacket);
+        mc.player.connection.send(fakeSneakPacket);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java
index 8dc4b24..c1a9125 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Flight.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java
@@ -2,8 +2,8 @@ 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 net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import org.lwjgl.glfw.GLFW;
 
 public class Flight extends Module {
@@ -17,14 +17,14 @@ public class Flight extends Module {
     @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);
+        mc.player.displayClientMessage(Component.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().mayfly = true;
         mc.player.getAbilities().flying = true;
 
         if (flyingTickCounter >= 20) {
@@ -44,7 +44,7 @@ public class Flight extends Module {
     @Override
     protected void onDisable() {
         if (mc.player != null) {
-            mc.player.getAbilities().allowFlying = false;
+            mc.player.getAbilities().mayfly = false;
             mc.player.getAbilities().flying = false;
         }
     }
@@ -54,8 +54,8 @@ public class Flight extends Module {
         double y = mc.player.getY();
         double z = mc.player.getZ();
 
-        PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.PositionAndOnGround(x, y + height, z, false, mc.player.horizontalCollision);
+        ServerboundMovePlayerPacket packet = new ServerboundMovePlayerPacket.Pos(x, y + height, z, false, mc.player.horizontalCollision);
 
-        mc.player.networkHandler.sendPacket(packet);
+        mc.player.connection.send(packet);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Fullbright.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java
index f6243bf..56b0800 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Fullbright.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java
@@ -3,11 +3,10 @@ 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;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
 
 public class Fullbright extends Module {
     public ModeSetting mode = new ModeSetting("Mode", "Gamma", "Effect", "Gamma", "Effect + Gamma", "Break AO Renderer");
@@ -26,8 +25,8 @@ public class Fullbright extends Module {
         if (mc.options == null) return;
         applyMode(mode.getMode());
 
-        if (mc.worldRenderer != null) {
-            mc.worldRenderer.reload();
+        if (mc.levelRenderer != null) {
+            mc.levelRenderer.allChanged();
         }
     }
 
@@ -39,31 +38,31 @@ public class Fullbright extends Module {
         if (!Objects.equals(currentMode, lastMode)) {
             applyMode(currentMode);
 
-            if (mc.worldRenderer != null) {
-                mc.worldRenderer.reload();
+            if (mc.levelRenderer != null) {
+                mc.levelRenderer.allChanged();
             }
 
             lastMode = currentMode;
         }
 
         if (Objects.equals(currentMode, "Effect")) {
-            mc.player.addStatusEffect(new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(StatusEffects.NIGHT_VISION.value()), 1, 255));
+            mc.player.addEffect(new MobEffectInstance(BuiltInRegistries.MOB_EFFECT.wrapAsHolder(MobEffects.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));
+            mc.player.addEffect(new MobEffectInstance(BuiltInRegistries.MOB_EFFECT.wrapAsHolder(MobEffects.NIGHT_VISION.value()), 1, 255));
         }
     }
 
     private void applyMode(String modeName) {
         if (Objects.equals(modeName, "Gamma")) {
-            if (!setPreviousGamma) previousGamma = mc.options.getGamma().getValue();
+            if (!setPreviousGamma) previousGamma = mc.options.gamma().get();
             setPreviousGamma = true;
-            mc.options.getGamma().setValue(1000.0);
+            mc.options.gamma().set(1000.0);
         } else if (Objects.equals(modeName, "Effect + Gamma")) {
-            if (!setPreviousGamma) previousGamma = mc.options.getGamma().getValue();
+            if (!setPreviousGamma) previousGamma = mc.options.gamma().get();
             setPreviousGamma = true;
-            mc.options.getGamma().setValue(1000.0);
+            mc.options.gamma().set(1000.0);
         } else if (Objects.equals(modeName, "Effect")) {
-            mc.options.getGamma().setValue(previousGamma);
+            mc.options.gamma().set(previousGamma);
             setPreviousGamma = false;
         }
     }
@@ -72,14 +71,14 @@ public class Fullbright extends Module {
     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()));
+        if (mc.player.hasEffect(BuiltInRegistries.MOB_EFFECT.wrapAsHolder(MobEffects.NIGHT_VISION.value()))) {
+            mc.player.removeEffect(BuiltInRegistries.MOB_EFFECT.wrapAsHolder(MobEffects.NIGHT_VISION.value()));
         }
 
-        mc.options.getGamma().setValue(previousGamma);
+        mc.options.gamma().set(previousGamma);
 
-        if (mc.worldRenderer != null) {
-            mc.worldRenderer.reload();
+        if (mc.levelRenderer != null) {
+            mc.levelRenderer.allChanged();
         }
     }
 }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
new file mode 100644
index 0000000..a9b2b7b
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
@@ -0,0 +1,32 @@
+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.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
+
+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.displayClientMessage(Component.literal("[G U N] Enabled NoAttackCooldown, Criticals, AutoClicker"), false);
+            mc.player.displayClientMessage(Component.literal("[G U N] Disabled ClickGUI & self (this is a macro module)"), false);
+            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);
+        }
+    }
+}
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GhostScaffold.java
index c2ee306..8f27d35 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GhostScaffold.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GhostScaffold.java
@@ -2,9 +2,9 @@ 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;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 
 public class GhostScaffold extends Module {
     public GhostScaffold() {
@@ -13,11 +13,11 @@ public class GhostScaffold extends Module {
 
     @Override
     public void tick() {
-        if (!this.isEnabled() || mc.player == null || mc.world == null) return;
+        if (!this.isEnabled() || mc.player == null || mc.level == null) return;
 
-        BlockPos pos = mc.player.getBlockPos().down();
-        BlockState blockState = Blocks.STONE.getDefaultState();
+        BlockPos pos = mc.player.blockPosition().below();
+        BlockState blockState = Blocks.STONE.defaultBlockState();
 
-        mc.world.setBlockState(pos, blockState);
+        mc.level.setBlockAndUpdate(pos, blockState);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GravityModifier.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java
index 5bdbaaf..593963d 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/GravityModifier.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java
@@ -3,8 +3,8 @@ 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 net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec3;
 import org.lwjgl.glfw.GLFW;
 
 public class GravityModifier extends Module {
@@ -17,15 +17,15 @@ public class GravityModifier extends Module {
 
     @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);
+        if (mc.player != null) mc.player.displayClientMessage(Component.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);
+        Vec3 velocity = mc.player.getDeltaMovement();
+        Vec3 newVelocity = new Vec3(velocity.x, velocity.y + gravity.getValue(), velocity.z);
+        mc.player.setDeltaMovement(newVelocity);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/HideModulesHUD.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/HideModulesHUD.java
index 9a81291..9a81291 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/HideModulesHUD.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/HideModulesHUD.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Jetpack.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java
index 65b70df..f1c1bbb 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Jetpack.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java
@@ -3,8 +3,8 @@ 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 net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec3;
 
 public class Jetpack extends Module {
     private NumberSetting speed = new NumberSetting("Thrust Speed", 1, 10, 1, 1);
@@ -17,15 +17,15 @@ public class Jetpack extends Module {
     @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);
+        mc.player.displayClientMessage(Component.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));
+        if (mc.options.keyJump.isDown()) {
+            mc.player.setDeltaMovement(new Vec3(mc.player.getDeltaMovement().x, 0.42 * speed.getValue(), mc.player.getDeltaMovement().z));
             mc.player.fallDistance = 0;
         }
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoAttackCooldown.java
index 3b8db2a..3b8db2a 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoAttackCooldown.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoAttackCooldown.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoFall.java
index 5fab957..927b435 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoFall.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoFall.java
@@ -2,7 +2,7 @@ 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.network.protocol.game.ServerboundMovePlayerPacket;
 
 public class NoFall extends Module {
     public NoFall() {
@@ -13,11 +13,11 @@ public class NoFall extends Module {
     public void tick() {
         if (this.isEnabled()) {
             if (mc.player != null) {
-                if (!mc.player.isOnGround() && mc.player.fallDistance > 3) {
+                if (!mc.player.onGround() && 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);
+                    ServerboundMovePlayerPacket packet = new ServerboundMovePlayerPacket.PosRot(mc.player.getX(), mc.player.getY() + 0.000000001, mc.player.getZ(),
+                            mc.player.getYRot(), mc.player.getXRot(), false, mc.player.horizontalCollision);
+                    mc.player.connection.send(packet);
                 }
             }
         }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoPackets.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java
index b99b9aa..cd25a3d 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/NoPackets.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java
@@ -5,7 +5,7 @@ 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;
+import net.minecraft.network.chat.Component;
 
 public class NoPackets extends Module {
     public NoPackets() {
@@ -16,7 +16,7 @@ public class NoPackets extends Module {
     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);
+        if (mc.player != null) mc.player.displayClientMessage(Component.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/com/arslaancodes/arslaansmagichax/modules/impl/Poseidon.java
index 39ae890..260e836 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Poseidon.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Poseidon.java
@@ -2,9 +2,9 @@ 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;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
 
 public class Poseidon extends Module {
     public Poseidon() {
@@ -15,7 +15,7 @@ public class Poseidon extends Module {
     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));
+        mc.player.setAirSupply(mc.player.getMaxAirSupply());
+        mc.player.addEffect(new MobEffectInstance(BuiltInRegistries.MOB_EFFECT.wrapAsHolder(MobEffects.WATER_BREATHING.value()), 1, 255));
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Speed.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java
index 5d12188..fe2b95f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Speed.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java
@@ -4,7 +4,7 @@ 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;
+import net.minecraft.network.chat.Component;
 
 public class Speed extends Module {
     private final NumberSetting speed = new NumberSetting("Speed", 0.1, 2.0, 0.4, 0.05);
@@ -23,19 +23,19 @@ public class Speed extends Module {
     @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);
+        mc.player.displayClientMessage(Component.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 (!enableWhileSneaking.isEnabled() && mc.player.isShiftKeyDown()) return;
         if (!enableInLava.isEnabled() && mc.player.isInLava()) return;
-        if (!enableInWater.isEnabled() && mc.player.isTouchingWater()) return;
+        if (!enableInWater.isEnabled() && mc.player.isInWater()) return;
 
-        float forward = mc.player.forwardSpeed;
-        float strafe = mc.player.sidewaysSpeed;
-        float yaw = mc.player.getYaw();
+        float forward = mc.player.zza;
+        float strafe = mc.player.xxa;
+        float yaw = mc.player.getYRot();
 
         if (forward == 0 && strafe == 0) return;
 
@@ -53,6 +53,6 @@ public class Speed extends Module {
         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);
+        mc.player.setDeltaMovement(x, mc.player.getDeltaMovement().y, z);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Spider.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java
index 8cef6e8..87a6e12 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/Spider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java
@@ -3,8 +3,8 @@ 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 net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec3;
 
 public class Spider extends Module {
     private NumberSetting climbSpeed = new NumberSetting("Climb Speed", 0, 1, 0.2, 0.1);
@@ -12,7 +12,7 @@ public class Spider extends Module {
     @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);
+        mc.player.displayClientMessage(Component.literal("[Spider] It is recommended to use this hack in combination with NoFall."), false);
     }
 
     public Spider() {
@@ -25,9 +25,9 @@ public class Spider extends Module {
         if (!this.isEnabled() || mc.player == null) return;
         if (!mc.player.horizontalCollision) return;
 
-        Vec3d velocity = mc.player.getVelocity();
+        Vec3 velocity = mc.player.getDeltaMovement();
         if (velocity.y >= 0.2) return;
 
-        mc.player.setVelocity(velocity.x, climbSpeed.getValue(), velocity.z);
+        mc.player.setDeltaMovement(velocity.x, climbSpeed.getValue(), velocity.z);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/TickRateLock.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/TickRateLock.java
index 7290a0d..b5202df 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/impl/TickRateLock.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/TickRateLock.java
@@ -7,10 +7,9 @@ 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;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
+import net.minecraft.world.TickRateManager;
 
 public class TickRateLock extends Module {
 
@@ -31,19 +30,19 @@ public class TickRateLock extends Module {
 
         Packet packet = event.packet();
 
-        if (packet instanceof UpdateTickRateS2CPacket) {
-            serverTickRate = ((UpdateTickRateS2CPacket) packet).tickRate(); // save server tick rate
-            serverFrozen = ((UpdateTickRateS2CPacket) packet).isFrozen(); // save server frozen
+        if (packet instanceof ClientboundTickingStatePacket) {
+            serverTickRate = ((ClientboundTickingStatePacket) packet).tickRate(); // save server tick rate
+            serverFrozen = ((ClientboundTickingStatePacket) 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;
+        if (!this.isEnabled() || mc.player == null || mc.level == null) return;
 
-        TickManager tickManager = mc.world.getTickManager();
-        if (tickManager.getTickRate() != tickRate.getValue() || tickManager.isFrozen() != frozen.isEnabled()) {
+        TickRateManager tickManager = mc.level.tickRateManager();
+        if (tickManager.tickrate() != tickRate.getValue() || tickManager.isFrozen() != frozen.isEnabled()) {
             tickManager.setTickRate(tickRate.getValueFloat());
             tickManager.setFrozen(frozen.isEnabled());
         }
@@ -51,8 +50,8 @@ public class TickRateLock extends Module {
 
     @Override
     protected void onDisable() {
-        if (mc.player == null || mc.world == null) return;
-        TickManager tickManager = mc.world.getTickManager();
+        if (mc.player == null || mc.level == null) return;
+        TickRateManager tickManager = mc.level.tickRateManager();
         tickManager.setTickRate(serverTickRate);
         tickManager.setFrozen(serverFrozen);
     }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Waterwalk.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Waterwalk.java
new file mode 100644
index 0000000..7949203
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Waterwalk.java
@@ -0,0 +1,28 @@
+package com.arslaancodes.arslaansmagichax.modules.impl;
+
+import com.arslaancodes.arslaansmagichax.modules.Category;
+import com.arslaancodes.arslaansmagichax.modules.Module;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Blocks;
+
+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.blockPosition().below();
+
+        if (mc.level.getBlockState(blockBelow).is(Blocks.WATER)) {
+            if (mc.player.getDeltaMovement().y < 0) {
+                mc.player.setDeltaMovement(mc.player.getDeltaMovement().x, 0.0, mc.player.getDeltaMovement().z);
+
+                if (!mc.player.isJumping()) mc.player.setPosRaw(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/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java
new file mode 100644
index 0000000..51e16ca
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java
@@ -0,0 +1,65 @@
+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 java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+
+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.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_DIAMOND_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.GOLD_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_GOLD_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.IRON_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_IRON_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.REDSTONE_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_REDSTONE_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.LAPIS_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_LAPIS_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.EMERALD_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_EMERALD_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.COAL_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_COAL_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.COPPER_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.DEEPSLATE_COPPER_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.NETHER_QUARTZ_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.NETHER_GOLD_ORE.defaultBlockState());
+        interestingBlocks.add(Blocks.SPAWNER.defaultBlockState());
+        interestingBlocks.add(Blocks.CHEST.defaultBlockState());
+        interestingBlocks.add(Blocks.ANCIENT_DEBRIS.defaultBlockState());
+        interestingBlocks.add(Blocks.GLOWSTONE.defaultBlockState());
+        interestingBlocks.add(Blocks.WATER.defaultBlockState());
+        interestingBlocks.add(Blocks.LAVA.defaultBlockState());
+    }
+
+    @Override
+    protected void onEnable() {
+        if (mc.levelRenderer != null) mc.levelRenderer.allChanged();
+
+        if (mc.player != null) mc.player.displayClientMessage(Component.literal("[Xray] It is recommended to use this hack with Fullbright for a better experience."), false);
+    }
+
+
+    @Override
+    protected void onDisable() {
+        if (mc.levelRenderer != null) mc.levelRenderer.allChanged();
+    }
+
+    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/com/arslaancodes/arslaansmagichax/modules/settings/BooleanSetting.java
index 618f2f4..618f2f4 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/BooleanSetting.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/BooleanSetting.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/ModeSetting.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/ModeSetting.java
index 796c3aa..796c3aa 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/ModeSetting.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/ModeSetting.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/NumberSetting.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/NumberSetting.java
index ea6d9f5..ea6d9f5 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/NumberSetting.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/NumberSetting.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/Setting.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/Setting.java
index a272faa..a272faa 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/modules/settings/Setting.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/settings/Setting.java
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ClickGUIScreen.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
index 7a017e2..962a18e 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
@@ -4,12 +4,10 @@ import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
 import com.arslaancodes.arslaansmagichax.modules.Category;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.Component;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.KeybindingSelector;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.Text;
-
 import java.util.ArrayList;
 import java.util.List;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 public class ClickGUIScreen extends Screen {
     public static final ClickGUIScreen INSTANCE = new ClickGUIScreen();
@@ -17,7 +15,7 @@ public class ClickGUIScreen extends Screen {
     private List<Frame> frames;
 
     private ClickGUIScreen() {
-        super(Text.literal("ClickGUI"));
+        super(net.minecraft.network.chat.Component.literal("ClickGUI"));
 
         frames = new ArrayList<>();
 
@@ -29,7 +27,7 @@ public class ClickGUIScreen extends Screen {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
         for (Frame frame : frames) {
             frame.render(context, mouseX, mouseY, deltaTicks);
             frame.updatePosition(mouseX, mouseY);
@@ -72,13 +70,13 @@ public class ClickGUIScreen extends Screen {
     }
 
     @Override
-    public boolean shouldPause() {
+    public boolean isPauseScreen() {
         return false;
     }
 
     @Override
-    public void close() {
-        super.close();
+    public void onClose() {
+        super.onClose();
         ArslaansMagicHaxClient.clickGUI.setEnabled(false);
     }
 }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/Frame.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
index 8400038..6a99973 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/Frame.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
@@ -4,13 +4,11 @@ import com.arslaancodes.arslaansmagichax.modules.Category;
 import com.arslaancodes.arslaansmagichax.modules.Module;
 import com.arslaancodes.arslaansmagichax.modules.ModuleManager;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.Component;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 
 public class Frame {
     public int x, y, width, height, dragX, dragY;
@@ -22,7 +20,7 @@ public class Frame {
 
     private List<ModuleButton> buttons;
 
-    protected MinecraftClient mc = MinecraftClient.getInstance();
+    protected Minecraft mc = Minecraft.getInstance();
 
     public Frame(Category category, int x, int y, int width, int height) {
         this.category = category;
@@ -41,14 +39,14 @@ public class Frame {
         }
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics 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();
-        int textY = y + (height - mc.textRenderer.fontHeight) / 2;
+        int textY = y + (height - mc.font.lineHeight) / 2;
 
-        context.drawText(mc.textRenderer, Text.literal(text), x + 5, textY, new Color(30, 30, 47, 255).getRGB(), false);
-        context.drawText(mc.textRenderer, isOpen ? "-" : "+", x + width - 5 - mc.textRenderer.getWidth("+"), textY, new Color(30, 30, 47, 255).getRGB(), false);
+        context.drawString(mc.font, net.minecraft.network.chat.Component.literal(text), x + 5, textY, new Color(30, 30, 47, 255).getRGB(), false);
+        context.drawString(mc.font, isOpen ? "-" : "+", x + width - 5 - mc.font.width("+"), textY, new Color(30, 30, 47, 255).getRGB(), false);
 
         if (isOpen) {
             for (ModuleButton button : buttons) {
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ModuleButton.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
index 777c88c..796c65e 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ModuleButton.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
@@ -6,12 +6,10 @@ import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.*;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
+import net.minecraft.client.gui.GuiGraphics;
 
 public class ModuleButton {
 
@@ -43,23 +41,23 @@ public class ModuleButton {
         }
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics 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());
 
         if (isHovered(mouseX, mouseY)) {
-            context.drawTooltip(Text.literal(module.getDescription()), mouseX, mouseY);
+            context.setTooltipForNextFrame(net.minecraft.network.chat.Component.literal(module.getDescription()), mouseX, mouseY);
         }
 
         String text = module.getName();
 
         int textX = parent.x + 5;
-        int textY = parent.y + offset + (parent.height - parent.mc.textRenderer.fontHeight) / 2;
+        int textY = parent.y + offset + (parent.height - parent.mc.font.lineHeight) / 2;
 
         int textColor = module.isEnabled() ? new Color(252, 210, 77, 255).getRGB() : Color.white.getRGB();
 
-        context.drawTextWithShadow(parent.mc.textRenderer, Text.literal(text), textX, textY, textColor);
+        context.drawString(parent.mc.font, net.minecraft.network.chat.Component.literal(text), textX, textY, textColor);
 
         if (extended) {
             for (Component component : components) {
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
index e1f8dd0..2dacd2f 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
@@ -3,11 +3,9 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-
 import java.awt.*;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
 
 public class CheckBox extends Component {
 
@@ -19,9 +17,9 @@ public class CheckBox extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = booleanSetting.getName() + ": " + booleanSetting.isEnabled();
-        int textWidth = mc.textRenderer.getWidth(displayText);
+        int textWidth = mc.font.width(displayText);
         int padding = 5;
         int boxWidth = Math.max(parent.parent.width, textWidth + (padding * 2));
 
@@ -34,11 +32,11 @@ public class CheckBox extends Component {
                 new Color(30, 30, 47, alpha).getRGB()
         );
 
-        context.drawTextWithShadow(
-                mc.textRenderer,
-                Text.literal(displayText),
+        context.drawString(
+                mc.font,
+                Component.literal(displayText),
                 parent.parent.x + padding,
-                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2,
                 Color.white.getRGB()
         );
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Component.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
index 481adac..96a3bbd 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Component.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
@@ -2,8 +2,8 @@ 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.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 
 public class Component {
 
@@ -11,7 +11,7 @@ public class Component {
     public ModuleButton parent;
     public int offset;
 
-    protected static MinecraftClient mc = MinecraftClient.getInstance();
+    protected static Minecraft mc = Minecraft.getInstance();
 
     public Component(Setting setting, ModuleButton parent, int offset) {
         this.setting = setting;
@@ -19,7 +19,7 @@ public class Component {
         this.offset = offset;
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
 
     }
 
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
index 5322c14..a29c3a2 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
@@ -1,10 +1,10 @@
 package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
-import net.minecraft.client.gui.DrawContext;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
+import net.minecraft.client.gui.GuiGraphics;
 
 public class KeybindingSelector extends Component {
 
@@ -15,7 +15,7 @@ public class KeybindingSelector extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics 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());
 
@@ -24,7 +24,7 @@ public class KeybindingSelector extends Component {
         }
 
         String displayText = listening ? "Press a key..." : "Keybind: " + getKeyName(parent.module.getGlfwKeybinding());
-        context.drawTextWithShadow(mc.textRenderer, displayText, parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2, Color.white.getRGB());
+        context.drawString(mc.font, displayText, parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2, Color.white.getRGB());
     }
 
     @Override
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
index 83de061..1200fa0 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
@@ -3,10 +3,9 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-
 import java.awt.*;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
 
 public class ModeBox extends Component {
 
@@ -18,9 +17,9 @@ public class ModeBox extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = modeSetting.getName() + ": " + modeSetting.getMode();
-        int textWidth = mc.textRenderer.getWidth(displayText);
+        int textWidth = mc.font.width(displayText);
 
         int padding = 5;
         int boxWidth = Math.max(parent.parent.width, textWidth + padding * 2);
@@ -34,11 +33,11 @@ public class ModeBox extends Component {
                 new Color(30, 30, 47, alpha).getRGB()
         );
 
-        context.drawTextWithShadow(
-                mc.textRenderer,
-                Text.literal(displayText),
+        context.drawString(
+                mc.font,
+                Component.literal(displayText),
                 parent.parent.x + padding, // left padding
-                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2,
                 Color.white.getRGB()
         );
     }
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
index 0fc906b..bacefd6 100644
--- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
@@ -3,12 +3,11 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-
 import java.awt.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
 
 public class Slider extends Component {
 
@@ -22,7 +21,7 @@ public class Slider extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = numberSetting.getName() + ": " + numberSetting.getValue();
         int defaultPadding = 5;
         int boxWidth = parent.parent.width;
@@ -56,17 +55,17 @@ public class Slider extends Component {
             }
         }
 
-        int textWidth = mc.textRenderer.getWidth(displayText);
+        int textWidth = mc.font.width(displayText);
         int leftPadding = defaultPadding;
         if (textWidth + 2 * defaultPadding > boxWidth) {
             leftPadding = Math.max(2, boxWidth - textWidth - 2);
         }
 
-        context.drawTextWithShadow(
-                mc.textRenderer,
-                Text.literal(displayText),
+        context.drawString(
+                mc.font,
+                Component.literal(displayText),
                 parent.parent.x + leftPadding,
-                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 2,
+                parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2,
                 Color.white.getRGB()
         );
     }
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/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
-}
-