1 files changed, 16 insertions, 14 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