Fix merge conflicts for moulberry

4 files changed, 63 insertions, 27 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index fcbed1af..5b0e0128 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -174,8 +174,8 @@ public class NEUConfig extends Config {
 
     @Expose
     @Category(
-            name = "Enchanting",
-            desc = "Enchanting"
+            name = "Enchanting GUI/Solvers",
+            desc = "Enchanting GUI/Solvers"
     )
     public Enchanting enchanting = new Enchanting();
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
index 1833df51..a505f8b7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
@@ -4,13 +4,55 @@ import com.google.gson.annotations.Expose;
 import io.github.moulberry.notenoughupdates.core.config.annotations.*;
 
 public class Enchanting {
+    @ConfigOption(
+            name = "Enchant Table GUI",
+            desc = ""
+    )
+    @ConfigEditorAccordion(id = 1)
+    public boolean tableGUIAccordion = false;
+
     @Expose
     @ConfigOption(
-            name = "Enable Custom Enchanting Gui",
-            desc = "Adds a BETA enchanting gui"
+            name = "Enable Enchant Table GUI",
+            desc = "Show a custom GUI when using the Enchant Table"
     )
     @ConfigEditorBoolean
-    public boolean enableGui = false;
+    @ConfigAccordionId(id = 1)
+    public boolean enableTableGUI = true;
+
+    @Expose
+    @ConfigOption(
+            name = "Incompatible Enchants",
+            desc = "Handle enchants that are incompatible with your current item, eg. Smite on a sword with Sharpness"
+    )
+    @ConfigEditorDropdown(
+            values = {"Highlight", "Hide"}
+    )
+    @ConfigAccordionId(id = 1)
+    public int incompatibleEnchants = 0;
+
+    @Expose
+    @ConfigOption(
+            name = "Enchant Sorting",
+            desc = "Change the method of sorting enchants in the GUI"
+    )
+    @ConfigEditorDropdown(
+            values = {"By Cost", "Alphabetical"}
+    )
+    @ConfigAccordionId(id = 1)
+    public int enchantSorting = 0;
+
+    @Expose
+    @ConfigOption(
+            name = "Enchant Ordering",
+            desc = "Change the method of ordered used by the sort"
+    )
+    @ConfigEditorDropdown(
+            values = {"Ascending", "Descending"}
+    )
+    @ConfigAccordionId(id = 1)
+    public int enchantOrdering = 0;
+
 
     @ConfigOption(
             name = "Enchanting Solvers",
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
index d31370b7..db36b111 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
@@ -42,7 +42,7 @@ public class MiscOverlays {
                     "\u00a73Experiments: \u00a7e3h38m"}

     )

     @ConfigAccordionId(id = 0)

-    public List<Integer> todoText = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6));

+    public List<Integer> todoText2 = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6));

 

     @ConfigOption(

             name = "Show Only If Soon",

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
index 2b48bc74..07e4ef86 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
@@ -13,6 +13,9 @@ public class StorageGUI {
     public boolean storageOverlayAccordion = false;

 

     @Expose

+    public int selectedIndex = 0;

+

+    @Expose

     @ConfigOption(

             name = "Enable Storage GUI",

             desc = "Show a custom storage overlay when accessing /storage. " +

@@ -20,7 +23,7 @@ public class StorageGUI {
     )

     @ConfigEditorBoolean

     @ConfigAccordionId(id = 1)

-    public boolean enableStorageGUI = false;

+    public boolean enableStorageGUI2 = false;

 

     @Expose

     @ConfigOption(

@@ -104,25 +107,13 @@ public class StorageGUI {
 

     @Expose

     @ConfigOption(

-            name = "Scroll Lock",

-            desc = "Stop scrolling when holding the key below.\n"+

-                    "Usefull for people using scrollable tooltips."

-    )

-    @ConfigEditorDropdown(

-            values = {"Off", "On"}

+            name = "Scrollable Tooltips",

+            desc = "Support for scrolling tooltips for users with small monitors\n" +

+                    "This will prevent the menu from scrolling while holding the key, allowing you to scroll tooltips"

     )

+    @ConfigEditorKeybind(defaultKey = 0)

     @ConfigAccordionId(id = 1)

-    public int scrollLock = 0;

-

-    @Expose

-    @ConfigOption(

-            name = "Scroll Lock Key",

-            desc = "Hold this keep to stop scrolling in the gui.\n" +

-                    "Don't forget to enable it above."

-    )

-    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_LSHIFT)

-    @ConfigAccordionId(id = 1)

-    public int slotLockKey = Keyboard.KEY_LSHIFT;

+    public int cancelScrollKey = 0;

 

 

     @ConfigOption(

@@ -145,11 +136,14 @@ public class StorageGUI {
     @Expose

     @ConfigOption(

             name = "Scroll to Backpack",

-            desc = "Allow scrolling to the backpack using the mouse wheel. If you have the hotkey enabled (default: KEY_GRAVE), you can still use that"

+            desc = "Allow scrolling to the backpack using the mouse wheel.\n" +

+                    "\"Scroll (Key)\" = Allow scrolling to 10th slot only while 'Backpack Scroll Key' (default: SHIFT) is pressed"

+    )

+    @ConfigEditorDropdown(

+            values = {"Scroll (Key)", "Scroll (Always)", "Don't Scroll"}

     )

-    @ConfigEditorBoolean

     @ConfigAccordionId(id = 0)

-    public boolean scrollToBackpack = false;

+    public int scrollToBackpack2 = 0;

 

     @Expose

     @ConfigOption(