From 1a22ac0cab78b2aefcb5af522a150b0e662a0128 Mon Sep 17 00:00:00 2001
From: DoKM <mcazzyman@gmail.com>
Date: Mon, 19 Jul 2021 10:51:09 +0200
Subject: left over merge fixes

---
 .../notenoughupdates/options/NEUConfig.java        |  4 +--
 .../options/seperateSections/Fishing.java          | 13 ++++---
 .../options/seperateSections/StorageGUI.java       | 42 ++++++++++++++++++++--
 .../options/seperateSections/Toolbar.java          |  2 +-
 4 files changed, 49 insertions(+), 12 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 3ef3ecd2..67db8723 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -151,10 +151,10 @@ public class NEUConfig extends Config {
     public SkillOverlays skillOverlays = new SkillOverlays();
 
     @Expose
-    /*@Category(
+    @Category(
             name = "Misc Overlays",
             desc = "Misc Overlays"
-    )*/
+    )
     public MiscOverlays miscOverlays = new MiscOverlays();
 
     @Expose
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java
index 3275ad46..61fcc559 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java
@@ -22,22 +22,21 @@ public class Fishing {
 
     @Expose
     @ConfigOption(
-            name = "Incoming Fish Warning",
-            desc = "Display a yellow '!' when a fish is incoming and a red '!' when you need to pull the fish up. " +
-                    "The red '!' also takes your ping into account"
+            name = "Fish Warning (R)",
+            desc = "Display a red '!' when you need to pull the fish up. The warning takes your ping into account"
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
-    public boolean incomingFishWarning = true;
+    public boolean incomingFishWarningR = true;
 
     @Expose
     @ConfigOption(
-            name = "Auto Fish",
-            desc = "shitty auto fish"
+            name = "Fish Warning (Y)",
+            desc = "Display a yellow '!' when a fish is approaching your bobber"
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
-    public boolean autoFish = true;
+    public boolean incomingFishWarning = true;
 
     @Expose
     @ConfigOption(
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 e54bd2f3..17c25117 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
@@ -15,7 +15,7 @@ public class StorageGUI {
     @Expose
     @ConfigOption(
             name = "Enable Storage GUI",
-            desc = "Show a custom storage overlay when accessing /storage." +
+            desc = "Show a custom storage overlay when accessing /storage. " +
                     "Makes switching between pages much easier and also allows for searching through all storages"
     )
     @ConfigEditorBoolean
@@ -62,7 +62,7 @@ public class StorageGUI {
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
-    public boolean backpackPreview = false;
+    public boolean backpackPreview = true;
 
     @Expose
     @ConfigOption(
@@ -73,6 +73,36 @@ public class StorageGUI {
     @ConfigAccordionId(id = 1)
     public boolean masonryMode = false;
 
+    @Expose
+    @ConfigOption(
+            name = "Fancy Glass Panes",
+            desc = "Replace the glass pane textures in your storage containers with a fancy connected texture"
+    )
+    @ConfigEditorDropdown(
+            values = {"On", "Locked", "Off"}
+    )
+    @ConfigAccordionId(id = 1)
+    public int fancyPanes = 0;
+
+    @Expose
+    @ConfigOption(
+            name = "Search Bar Autofocus",
+            desc = "Automatically focus the search bar when pressing keys"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 1)
+    public boolean searchBarAutofocus = true;
+
+    @Expose
+    @ConfigOption(
+            name = "Selected Storage Colour",
+            desc = "Change the colour used to draw the selected backpack border"
+    )
+    @ConfigEditorColour
+    @ConfigAccordionId(id = 1)
+    public String selectedStorageColour = "0:255:255:223:0";
+
+
     @ConfigOption(
             name = "Inventory Backpacks",
             desc = ""
@@ -90,6 +120,14 @@ public class StorageGUI {
     public boolean showInvBackpack = false;
 
     //public boolean showInvBackpack = false;
+    @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"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean scrollToBackpack = false;
 
     @Expose
     @ConfigOption(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java
index 2cdbc0ab..3719e120 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java
@@ -18,7 +18,7 @@ public class Toolbar {
             desc = "Show QuickCommands\u2122 in the NEU toolbar"
     )
     @ConfigEditorBoolean
-    public boolean quickCommands = true;
+    public boolean quickCommands = false;
 
     @Expose
     @ConfigOption(
-- 
cgit