more config system stuff

4 files changed, 11 insertions, 16 deletions

diff --git a/src/main/java/io/polyfrost/oneconfig/config/data/OptionCategory.java b/src/main/java/io/polyfrost/oneconfig/config/data/OptionCategory.java
index 4286264..15c073c 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/data/OptionCategory.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/data/OptionCategory.java
@@ -1,17 +1,13 @@
 package io.polyfrost.oneconfig.config.data;
 
 import io.polyfrost.oneconfig.config.interfaces.BasicOption;
-import io.polyfrost.oneconfig.gui.elements.config.ConfigPage;
+import io.polyfrost.oneconfig.gui.elements.config.ConfigPageButton;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 public class OptionCategory {
-    public final HashMap<String, ArrayList<BasicOption>> options;
-    public final ArrayList<ConfigPage> pages;
-
-    public OptionCategory(HashMap<String, ArrayList<BasicOption>> options, ArrayList<ConfigPage> pages) {
-        this.options = options;
-        this.pages = pages;
-    }
+    public final HashMap<String, ArrayList<BasicOption>> subcategories = new HashMap<>();
+    public final ArrayList<ConfigPageButton> topPages = new ArrayList<>();
+    public final ArrayList<ConfigPageButton> bottomPages = new ArrayList<>();
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/config/data/OptionPage.java b/src/main/java/io/polyfrost/oneconfig/config/data/OptionPage.java
index 8dcd9a1..12aef6a 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/data/OptionPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/data/OptionPage.java
@@ -1,9 +1,6 @@
 package io.polyfrost.oneconfig.config.data;
 
 
-import io.polyfrost.oneconfig.config.interfaces.BasicOption;
-
-import java.util.ArrayList;
 import java.util.HashMap;
 
 public class OptionPage {
@@ -14,7 +11,7 @@ public class OptionPage {
      * Depth 2 = subcategories
      * Depth 3 = list of options
      */
-    public final HashMap<String, HashMap<String, ArrayList<BasicOption>>> categories = new HashMap<>();
+    public final HashMap<String, OptionCategory> categories = new HashMap<>();
 
     public OptionPage(String name, Mod mod) {
         this.name = name;
diff --git a/src/main/java/io/polyfrost/oneconfig/config/data/OptionType.java b/src/main/java/io/polyfrost/oneconfig/config/data/OptionType.java
index 4378d34..7e106f4 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/data/OptionType.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/data/OptionType.java
@@ -2,10 +2,6 @@ package io.polyfrost.oneconfig.config.data;
 
 public enum OptionType {
     /**
-     * Type: class
-     */
-    PAGE,
-    /**
      * Type: boolean
      */
     SWITCH,
diff --git a/src/main/java/io/polyfrost/oneconfig/config/data/PageLocation.java b/src/main/java/io/polyfrost/oneconfig/config/data/PageLocation.java
new file mode 100644
index 0000000..9fe0c91
--- /dev/null
+++ b/src/main/java/io/polyfrost/oneconfig/config/data/PageLocation.java
@@ -0,0 +1,6 @@
+package io.polyfrost.oneconfig.config.data;
+
+public enum PageLocation {
+    TOP,
+    BOTTOM
+}