Merge branch 'master' of https://github.com/ThatGravyboat/NotEnoughUpdates

1 files changed, 50 insertions, 15 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 1c0528da..1f70d235 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -219,6 +219,21 @@ public class NEUConfig extends Config {
 
     @Expose
     @Category(
+            name = "Smooth AOTE",
+            desc = "Smooth AOTE"
+    )
+    public SmoothAOTE smoothAOTE = new SmoothAOTE();
+
+
+    @Expose
+    @Category(
+            name = "AH Search GUI",
+            desc = "AH Search GUI"
+    )
+    public AuctionHouseSearch auctionHouseSearch = new AuctionHouseSearch();
+
+    @Expose
+    @Category(
             name = "Dungeon Block Overlay",
             desc = "Dungeon Block Overlay"
     )
@@ -233,13 +248,6 @@ public class NEUConfig extends Config {
 
     @Expose
     @Category(
-            name = "Smooth AOTE",
-            desc = "Smooth AOTE"
-    )
-    public SmoothAOTE smoothAOTE = new SmoothAOTE();
-
-    @Expose
-    @Category(
             name = "Custom Rod Colours",
             desc = "Custom Rod Colours"
     )
@@ -276,14 +284,6 @@ public class NEUConfig extends Config {
 
         @Expose
         @ConfigOption(
-                name = "Private Island Fly Fix",
-                desc = "Fix flying being delaying on private islands"
-        )
-        @ConfigEditorBoolean
-        public boolean flyFix = true;
-
-        @Expose
-        @ConfigOption(
                 name = "Hide Potion Effects",
                 desc = "Hide the potion effects inside your inventory while on skyblock"
         )
@@ -1218,6 +1218,41 @@ public class NEUConfig extends Config {
         public boolean showOwnHeadAsMarker = false;
     }
 
+    public static class AuctionHouseSearch {
+        @Expose
+        @ConfigOption(
+                name = "Enable Search GUI",
+                desc = "Use the advanced search GUI with autocomplete and history instead of the normal sign GUI"
+        )
+        @ConfigEditorBoolean
+        public boolean enableSearchOverlay = true;
+
+        @Expose
+        @ConfigOption(
+                name = "Keep Previous Search",
+                desc = "Don't clear the search bar after closing the GUI"
+        )
+        @ConfigEditorBoolean
+        public boolean keepPreviousSearch = false;
+
+        @Expose
+        @ConfigOption(
+                name = "Past Searches",
+                desc = "Show past searches below the autocomplete box"
+        )
+        @ConfigEditorBoolean
+        public boolean showPastSearches = true;
+
+        @Expose
+        @ConfigOption(
+                name = "ESC to Full Close",
+                desc = "Make pressing ESCAPE close the search GUI without opening up the AH again\n" +
+                        "ENTER can still be used to search"
+        )
+        @ConfigEditorBoolean
+        public boolean escFullClose = true;
+    }
+
     public static class DungeonBlock {
         @Expose
         @ConfigOption(