Full migration to 26.2, working stuffHEADmain

8 files changed, 53 insertions, 47 deletions

diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
index e18c56d..cb94a04 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ClickGUIScreen.java
@@ -2,12 +2,14 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui;
 
 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.SettingComponent;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.KeybindingSelector;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
 
 public class ClickGUIScreen extends Screen {
     public static final ClickGUIScreen INSTANCE = new ClickGUIScreen();
@@ -27,46 +29,46 @@ public class ClickGUIScreen extends Screen {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
         for (Frame frame : frames) {
             frame.render(context, mouseX, mouseY, deltaTicks);
             frame.updatePosition(mouseX, mouseY);
         }
-        super.render(context, mouseX, mouseY, deltaTicks);
+        super.extractRenderState(context, mouseX, mouseY, deltaTicks);
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
         for (Frame frame : frames) {
-            frame.mouseClicked(mouseX, mouseY, button);
+            frame.mouseClicked(event.x(), event.y(), event.button());
         }
-        return super.mouseClicked(mouseX, mouseY, button);
+        return super.mouseClicked(event, doubleClick);
     }
 
     @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+    public boolean mouseReleased(MouseButtonEvent event) {
         for (Frame frame : frames) {
-            frame.mouseReleased(mouseX, mouseY, button);
+            frame.mouseReleased(event.x(), event.y(), event.button());
         }
-        return super.mouseReleased(mouseX, mouseY, button);
+        return super.mouseReleased(event);
     }
 
     @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+    public boolean keyPressed(KeyEvent event) {
         for (Frame frame : frames) {
             if (frame.isOpen) {
                 for (ModuleButton button : frame.getButtons()) {
                     if (button.extended) {
-                        for (Component comp : button.components) {
+                        for (SettingComponent comp : button.components) {
                             if (comp instanceof KeybindingSelector keybindingSelector) {
-                                keybindingSelector.onKeyPressed(keyCode);
+                                keybindingSelector.onKeyPressed(event.key());
                             }
                         }
                     }
                 }
             }
         }
-        return super.keyPressed(keyCode, scanCode, modifiers);
+        return super.keyPressed(event);
     }
 
     @Override
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
index ef3a879..a90b62a 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/Frame.java
@@ -3,12 +3,12 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui;
 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 com.arslaancodes.arslaansmagichax.screens.clickgui.setting.SettingComponent;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 
 public class Frame {
     public int x, y, width, height, dragX, dragY;
@@ -39,14 +39,14 @@ public class Frame {
         }
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor 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.font.lineHeight) / 2;
 
-        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);
+        context.text(mc.font, net.minecraft.network.chat.Component.literal(text), x + 5, textY, new Color(30, 30, 47, 255).getRGB(), false);
+        context.text(mc.font, isOpen ? "-" : "+", x + width - 5 - mc.font.width("+"), textY, new Color(30, 30, 47, 255).getRGB(), false);
 
         if (isOpen) {
             for (ModuleButton button : buttons) {
@@ -108,7 +108,7 @@ public class Frame {
             offset += height;
 
             if (button.extended) {
-                for (Component component : button.components) {
+                for (SettingComponent component : button.components) {
                     if (component.setting != null) {
                         if (component.setting.isVisible()) {
                             offset += height;
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
index 7f361ca..6d18e3f 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/ModuleButton.java
@@ -9,14 +9,14 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.*;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 
 public class ModuleButton {
 
     public Module module;
     public Frame parent;
     public int offset;
-    public List<Component> components;
+    public List<SettingComponent> components;
     public boolean extended;
 
     public ModuleButton(Module module, Frame parent, int offset) {
@@ -41,7 +41,7 @@ public class ModuleButton {
         }
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor 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());
@@ -57,10 +57,10 @@ public class ModuleButton {
 
         int textColor = module.isEnabled() ? new Color(252, 210, 77, 255).getRGB() : Color.white.getRGB();
 
-        context.drawString(parent.mc.font, net.minecraft.network.chat.Component.literal(text), textX, textY, textColor);
+        context.text(parent.mc.font, net.minecraft.network.chat.Component.literal(text), textX, textY, textColor);
 
         if (extended) {
-            for (Component component : components) {
+            for (SettingComponent component : components) {
                 component.render(context, mouseX, mouseY, deltaTicks);
             }
         }
@@ -77,7 +77,7 @@ public class ModuleButton {
             }
         }
 
-        for (Component component : components) {
+        for (SettingComponent component : components) {
             component.mouseClicked(mouseX, mouseY, button);
         }
     }
@@ -86,7 +86,7 @@ public class ModuleButton {
         // luigi wins by doing absolutely nothing
 
         // nevermind we did something
-        for (Component component : components) {
+        for (SettingComponent component : components) {
             component.mouseReleased(mouseX, mouseY, button);
         }
     }
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
index 44b2f06..1223aea 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java
@@ -4,10 +4,11 @@ import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import java.awt.*;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
+import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.SettingComponent;
 
-public class CheckBox extends Component {
+public class CheckBox extends SettingComponent {
 
     private BooleanSetting booleanSetting = (BooleanSetting) setting;
 
@@ -17,7 +18,7 @@ public class CheckBox extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = booleanSetting.getName() + ": " + booleanSetting.isEnabled();
         int textWidth = mc.font.width(displayText);
         int padding = 5;
@@ -32,7 +33,7 @@ public class CheckBox extends Component {
                 new Color(30, 30, 47, alpha).getRGB()
         );
 
-        context.drawString(
+        context.text(
                 mc.font,
                 Component.literal(displayText),
                 parent.parent.x + padding,
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
index 59bfe8f..699ec0d 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java
@@ -4,9 +4,10 @@ import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.SettingComponent;
 
-public class KeybindingSelector extends Component {
+public class KeybindingSelector extends SettingComponent {
 
     private boolean listening = false;
 
@@ -15,7 +16,7 @@ public class KeybindingSelector extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor 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 +25,7 @@ public class KeybindingSelector extends Component {
         }
 
         String displayText = listening ? "Press a key..." : "Keybind: " + getKeyName(parent.module.getGlfwKeybinding());
-        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());
+        context.text(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/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
index b33374b..815fa47 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java
@@ -4,10 +4,11 @@ import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import java.awt.*;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
+import com.arslaancodes.arslaansmagichax.screens.clickgui.setting.SettingComponent;
 
-public class ModeBox extends Component {
+public class ModeBox extends SettingComponent {
 
     private ModeSetting modeSetting = (ModeSetting) setting;
 
@@ -17,7 +18,7 @@ public class ModeBox extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = modeSetting.getName() + ": " + modeSetting.getMode();
         int textWidth = mc.font.width(displayText);
 
@@ -33,7 +34,7 @@ public class ModeBox extends Component {
                 new Color(30, 30, 47, alpha).getRGB()
         );
 
-        context.drawString(
+        context.text(
                 mc.font,
                 Component.literal(displayText),
                 parent.parent.x + padding, // left padding
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/SettingComponent.java
index 2cbe9b8..565cf96 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/SettingComponent.java
@@ -3,9 +3,9 @@ package com.arslaancodes.arslaansmagichax.screens.clickgui.setting;
 import com.arslaancodes.arslaansmagichax.modules.settings.Setting;
 import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 
-public class Component {
+public class SettingComponent {
 
     public Setting setting;
     public ModuleButton parent;
@@ -13,13 +13,13 @@ public class Component {
 
     protected static Minecraft mc = Minecraft.getInstance();
 
-    public Component(Setting setting, ModuleButton parent, int offset) {
+    public SettingComponent(Setting setting, ModuleButton parent, int offset) {
         this.setting = setting;
         this.parent = parent;
         this.offset = offset;
     }
 
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float deltaTicks) {
 
     }
 
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
index 45e1c04..27229a1 100644
--- a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java
@@ -3,13 +3,14 @@ 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 com.arslaancodes.arslaansmagichax.screens.clickgui.setting.SettingComponent;
 import java.awt.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
 
-public class Slider extends Component {
+public class Slider extends SettingComponent {
 
     public NumberSetting numberSetting = (NumberSetting) setting;
 
@@ -21,7 +22,7 @@ public class Slider extends Component {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+    public void render(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
         String displayText = numberSetting.getName() + ": " + numberSetting.getValue();
         int defaultPadding = 5;
         int boxWidth = parent.parent.width;
@@ -61,7 +62,7 @@ public class Slider extends Component {
             leftPadding = Math.max(2, boxWidth - textWidth - 2);
         }
 
-        context.drawString(
+        context.text(
                 mc.font,
                 Component.literal(displayText),
                 parent.parent.x + leftPadding,