add size, do some config element stuff, fixes for cards, finish mods page and performance page, cleanup and some more

8 files changed, 37 insertions, 25 deletions

diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigButton.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigButton.java
index 1cf0ab8..a19cb55 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigButton.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigButton.java
@@ -1,15 +1,21 @@
 package io.polyfrost.oneconfig.gui.elements.config;
 
+import io.polyfrost.oneconfig.config.OneConfigConfig;
 import io.polyfrost.oneconfig.config.interfaces.Option;
+import io.polyfrost.oneconfig.gui.elements.BasicElement;
+import io.polyfrost.oneconfig.lwjgl.RenderManager;
+import io.polyfrost.oneconfig.lwjgl.font.Fonts;
 
 import java.lang.reflect.Field;
 
 public class OConfigButton extends Option {
     private final String text;
+    private final BasicElement element;
 
-    public OConfigButton(Field field, String name, String description, String text) {
-        super(field, name, description);
+    public OConfigButton(Field field, String name, String description, String text, int size) {
+        super(field, name, description, size);
         this.text = text;
+        element = new BasicElement(128, 32, 1, true);
     }
 
     @Override
@@ -18,7 +24,13 @@ public class OConfigButton extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
-
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
+        if (size == 0) {
+            RenderManager.drawString(vg, name, x, y + 16, OneConfigConfig.WHITE_90, 14f, Fonts.INTER_MEDIUM);
+            element.setWidth((int) RenderManager.getTextWidth(vg, text, 12f) + 80);
+            element.draw(vg, x + 480 - element.getWidth(), y);
+            RenderManager.drawString(vg, text, x + element.getWidth() / 2f, y + 16, OneConfigConfig.WHITE, 12f, Fonts.INTER_MEDIUM);
+            // ???
+        }
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigCategory.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigCategory.java
index e57f130..aa763ef 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigCategory.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigCategory.java
@@ -7,8 +7,8 @@ import java.util.List;
 public class OConfigCategory extends Option {
     public final List<Option> options;
 
-    public OConfigCategory(String name, String description, List<Option> options) {
-        super(null, name, description);
+    public OConfigCategory(String name, String description, List<Option> options, int size) {
+        super(null, name, description, size);
         this.options = options;
     }
 
@@ -18,7 +18,7 @@ public class OConfigCategory extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigColor.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigColor.java
index fcad08f..ed98bd4 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigColor.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigColor.java
@@ -7,8 +7,8 @@ import java.lang.reflect.Field;
 public class OConfigColor extends Option {
     private final boolean allowAlpha;
 
-    public OConfigColor(Field field, String name, String description, boolean allowAlpha) {
-        super(field, name, description);
+    public OConfigColor(Field field, String name, String description, boolean allowAlpha, int size) {
+        super(field, name, description, size);
         this.allowAlpha = allowAlpha;
     }
 
@@ -18,7 +18,7 @@ public class OConfigColor extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigHud.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigHud.java
index 2d6141a..8e36fe9 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigHud.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigHud.java
@@ -6,8 +6,8 @@ import java.lang.reflect.Field;
 
 public class OConfigHud extends Option {
 
-    public OConfigHud(Field field, String name, String description) {
-        super(field, name, description);
+    public OConfigHud(Field field, String name, String description, int size) {
+        super(field, name, description, size);
     }
 
     @Override
@@ -16,7 +16,7 @@ public class OConfigHud extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSelector.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSelector.java
index 3e0e208..30bb709 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSelector.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSelector.java
@@ -8,8 +8,8 @@ public class OConfigSelector extends Option {
     private final String[] options;
     private final int defaultSelection;
 
-    public OConfigSelector(Field field, String name, String description, String[] options, int defaultSelection) {
-        super(field, name, description);
+    public OConfigSelector(Field field, String name, String description, String[] options, int defaultSelection, int size) {
+        super(field, name, description, size);
         this.options = options;
         this.defaultSelection = defaultSelection;
     }
@@ -20,7 +20,7 @@ public class OConfigSelector extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSlider.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSlider.java
index 0427b35..bb3a485 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSlider.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSlider.java
@@ -9,8 +9,8 @@ public class OConfigSlider extends Option {
     private final float max;
     private final float precision;
 
-    public OConfigSlider(Field field, String name, String description, float min, float max, float precision) {
-        super(field, name, description);
+    public OConfigSlider(Field field, String name, String description, float min, float max, float precision, int size) {
+        super(field, name, description, size);
         this.min = min;
         this.max = max;
         this.precision = precision;
@@ -22,7 +22,7 @@ public class OConfigSlider extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSwitch.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSwitch.java
index 08c315f..753d8f6 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSwitch.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigSwitch.java
@@ -6,8 +6,8 @@ import java.lang.reflect.Field;
 
 public class OConfigSwitch extends Option {
 
-    public OConfigSwitch(Field field, String name, String description) {
-        super(field, name, description);
+    public OConfigSwitch(Field field, String name, String description, int size) {
+        super(field, name, description, size);
     }
 
     @Override
@@ -16,7 +16,7 @@ public class OConfigSwitch extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigText.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigText.java
index 407f733..606d493 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigText.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/config/OConfigText.java
@@ -8,8 +8,8 @@ public class OConfigText extends Option {
     private final String placeholder;
     private final boolean hideText;
 
-    public OConfigText(Field field, String name, String description, String placeholder, boolean hideText) {
-        super(field, name, description);
+    public OConfigText(Field field, String name, String description, String placeholder, boolean hideText, int size) {
+        super(field, name, description, size);
         this.placeholder = placeholder;
         this.hideText = hideText;
     }
@@ -20,7 +20,7 @@ public class OConfigText extends Option {
     }
 
     @Override
-    public void draw(int x, int y, int width, int mouseX, int mouseY) {
+    public void draw(long vg, int x, int y, int mouseX, int mouseY) {
 
     }
 }