Full migration to 26.2, working stuffHEADmain

13 files changed, 40 insertions, 38 deletions

diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
index 4b88206..bf33d44 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/ModuleManager.java
@@ -1,10 +1,12 @@
 package com.arslaancodes.arslaansmagichax.modules;
 
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.DrawContext;
+import net.minecraft.resources.Identifier;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import com.arslaancodes.arslaansmagichax.ArslaansMagicHax;
@@ -26,22 +28,22 @@ public class ModuleManager {
 
     public static void handleKeyPresses() {
         Minecraft client = Minecraft.getInstance();
-        if (client.player == null || client.screen != null) return;
+        if (client.player == null || client.gui.screen() != null) return;
 
         for (Module module : modules) {
             int key = module.getGlfwKeybinding();
             if (key == -1) continue;
 
-            boolean isPressed = InputConstants.isKeyDown(client.getWindow().getWindow(), key);
+            boolean isPressed = InputConstants.isKeyDown(client.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.displayClientMessage(Component.literal(
+                    client.player.sendSystemMessage(Component.literal(
                             "Toggled module " + module.getName() + " to " + (!wasEnabled ? "ON" : "OFF")
-                    ), false);
+                    ));
                 }
             }
 
@@ -78,12 +80,12 @@ public class ModuleManager {
 
     public void registerHUD() {
         if (!hudRegistered) {
-            HudRenderCallback.EVENT.register(this::onRenderHud);
-            hudRegistered = true;
+		HudElementRegistry.attachElementBefore(VanillaHudElements.CHAT,Identifier.fromNamespaceAndPath("arslaansmagichax", "hud"),this::onRenderHud);
+        	hudRegistered = true;
         }
     }
 
-    private void onRenderHud(DrawContext drawContext, DeltaTracker renderTickCounter) {
+    private void onRenderHud(GuiGraphicsExtractor drawContext, DeltaTracker renderTickCounter) {
         if (!ArslaansMagicHaxClient.hideModulesHUD.isEnabled()) {
             Font textRenderer = Minecraft.getInstance().font;
             float alpha = 1.0F;
@@ -93,12 +95,12 @@ public class ModuleManager {
 
             int titleColor = 16568909 | i; // weird magic
 
-            drawContext.drawStringWithBackdrop(textRenderer, Component.literal("Arslaan's Magic Hax"), x, y, 50, titleColor);
+            drawContext.text(textRenderer, Component.literal("Arslaan's Magic Hax"), x, y, titleColor);
             y += textRenderer.lineHeight + 4;
 
             for (Module module : ModuleManager.getEnabledModules()) {
                 int color = 16777215 | i; // more magic I don't understand
-                drawContext.drawString(textRenderer, Component.literal(module.getName()), x, y, color);
+                drawContext.text(textRenderer, Component.literal(module.getName()), x, y, color);
                 y += textRenderer.lineHeight + 2;
             }
         }
@@ -121,6 +123,10 @@ public class ModuleManager {
             properties.load(fis);
 
             for (Module module : modules) {
+		if (Objects.equals(module.getName(), "ClickGUI")) {
+		    module.setEnabled(false);
+		    continue;
+		}
                 String enabled = properties.getProperty(module.getName() + ".enabled");
                 if (Objects.equals(enabled, "true")) {
                     module.setEnabled(true);
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java
index 7c67201..1269a69 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/AutoClicker.java
@@ -25,7 +25,7 @@ public class AutoClicker extends Module {
     @Override
     public void tick() {
         if (!isEnabled() || mc.player == null || mc.level == null) return;
-        if (mc.screen != null) return;
+        if (mc.gui.screen() != null) return;
 
         HitResult hr = mc.hitResult;
         if (!(hr instanceof EntityHitResult eResult)) return;
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
index 6b86573..dc70a6d 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/ClickGUI.java
@@ -13,11 +13,11 @@ public class ClickGUI extends Module {
 
     @Override
     protected void onEnable() {
-        Minecraft.getInstance().setScreenAndShowAndShow(ClickGUIScreen.INSTANCE);
+        Minecraft.getInstance().setScreenAndShow(ClickGUIScreen.INSTANCE);
     }
 
     @Override
     protected void onDisable() {
-        Minecraft.getInstance().setScreenAndShowAndShow(null);
+        Minecraft.getInstance().setScreenAndShow(null);
     }
 }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java
index e8eaa7f..3bd5680 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Criticals.java
@@ -7,9 +7,8 @@ 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.c2s.play.*;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ServerboundInteractPacket;
+import net.minecraft.network.protocol.game.ServerboundAttackPacket;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
 import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
@@ -32,8 +31,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 ServerboundInteractPacket && ((IPacket) packet).hax$getTag() != 1337) {
+        if (packet instanceof ServerboundAttackPacket && ((IPacket) packet).hax$getTag() != 1337) {
             event.setCancelled(true);
 
             if (Objects.equals(mode.getMode(), "Packet")) {
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java
index c1a9125..538f049 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Flight.java
@@ -17,7 +17,7 @@ public class Flight extends Module {
     @Override
     protected void onEnable() {
         if (mc.player == null) return;
-        mc.player.displayClientMessage(Component.literal("[Flight] It is recommended to use this hack in combination with NoFall."), false);
+        mc.player.sendSystemMessage(Component.literal("[Flight] It is recommended to use this hack in combination with NoFall."));
     }
 
     @Override
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java
index 56b0800..2ccde19 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Fullbright.java
@@ -25,8 +25,8 @@ public class Fullbright extends Module {
         if (mc.options == null) return;
         applyMode(mode.getMode());
 
-        if (mc.levelRenderer != null) {
-            mc.levelRenderer.allChanged();
+        if (mc.levelExtractor != null) {
+            mc.levelExtractor.allChanged();
         }
     }
 
@@ -38,8 +38,8 @@ public class Fullbright extends Module {
         if (!Objects.equals(currentMode, lastMode)) {
             applyMode(currentMode);
 
-            if (mc.levelRenderer != null) {
-                mc.levelRenderer.allChanged();
+            if (mc.levelExtractor != null) {
+                mc.levelExtractor.allChanged();
             }
 
             lastMode = currentMode;
@@ -77,8 +77,8 @@ public class Fullbright extends Module {
 
         mc.options.gamma().set(previousGamma);
 
-        if (mc.levelRenderer != null) {
-            mc.levelRenderer.allChanged();
+        if (mc.levelExtractor != null) {
+            mc.levelExtractor.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
index 367edeb..b9582b0 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GUN.java
@@ -21,11 +21,9 @@ public class GUN extends Module {
         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.sendSystemMessage(Component.literal("[G U N] Enabled NoAttackCooldown, Criticals, AutoClicker"));
+            mc.player.sendSystemMessage(Component.literal("[G U N] Disabled ClickGUI & self (this is a macro module)"));
+            mc.player.sendSystemMessage(Component.literal("Tip: when using G U N, if there is no anticheat set AutoClicker mode to NoDelay"));
             mc.player.playSound(SoundEvent.createVariableRangeEvent(Identifier.parse("minecraft:entity.evoker.prepare_wololo")), 100, 1);
         }
     }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java
index 593963d..9c0f5ab 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/GravityModifier.java
@@ -17,7 +17,7 @@ public class GravityModifier extends Module {
 
     @Override
     protected void onEnable() {
-        if (mc.player != null) mc.player.displayClientMessage(Component.literal("[Gravity Modifier] It is recommended to use this hack with NoFall."), false);
+        if (mc.player != null) mc.player.sendSystemMessage(Component.literal("[Gravity Modifier] It is recommended to use this hack with NoFall."));
     }
 
     @Override
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java
index f1c1bbb..a1af3a7 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Jetpack.java
@@ -17,7 +17,7 @@ public class Jetpack extends Module {
     @Override
     protected void onEnable() {
         if (mc.player == null) return;
-        mc.player.displayClientMessage(Component.literal("[Jetpack] It is recommended to use this hack in combination with NoFall."), false);
+        mc.player.sendSystemMessage(Component.literal("[Jetpack] It is recommended to use this hack in combination with NoFall."));
     }
 
     @Override
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java
index cd25a3d..ca98cf5 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/NoPackets.java
@@ -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.displayClientMessage(Component.literal("Cancelled outgoing packet: " + event.packet().getClass().getSimpleName() + " -> " + event.packet()), false);
+        if (mc.player != null) mc.player.sendSystemMessage(Component.literal("Cancelled outgoing packet: " + event.packet().getClass().getSimpleName() + " -> " + event.packet()));
 
         event.setCancelled(true);
     }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java
index fe2b95f..5fac71b 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Speed.java
@@ -23,7 +23,7 @@ public class Speed extends Module {
     @Override
     protected void onEnable() {
         if (mc.player == null) return;
-        mc.player.displayClientMessage(Component.literal("[Speed] It is recommended to use this hack in combination with NoFall."), false);
+        mc.player.sendSystemMessage(Component.literal("[Speed] It is recommended to use this hack in combination with NoFall."));
     }
 
     @Override
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java
index 87a6e12..d691f45 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Spider.java
@@ -12,7 +12,7 @@ public class Spider extends Module {
     @Override
     protected void onEnable() {
         if (mc.player == null) return;
-        mc.player.displayClientMessage(Component.literal("[Spider] It is recommended to use this hack in combination with NoFall."), false);
+        mc.player.sendSystemMessage(Component.literal("[Spider] It is recommended to use this hack in combination with NoFall."));
     }
 
     public Spider() {
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java
index 51e16ca..0499276 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/modules/impl/Xray.java
@@ -45,15 +45,15 @@ public class Xray extends Module {
 
     @Override
     protected void onEnable() {
-        if (mc.levelRenderer != null) mc.levelRenderer.allChanged();
+        if (mc.levelExtractor != null) mc.levelExtractor.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);
+        if (mc.player != null) mc.player.sendSystemMessage(Component.literal("[Xray] It is recommended to use this hack with Fullbright for a better experience."));
     }
 
 
     @Override
     protected void onDisable() {
-        if (mc.levelRenderer != null) mc.levelRenderer.allChanged();
+        if (mc.levelExtractor != null) mc.levelExtractor.allChanged();
     }
 
     public boolean isInterestingBlock(BlockState state) {