Full migration to 26.2, working stuffHEADmain

5 files changed, 24 insertions, 20 deletions

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,