Restructuring the fishing category.

1 files changed, 20 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
index 46173740a..00d31a42b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
@@ -20,22 +20,17 @@ public class Fishing {
     public boolean trophyCounter = false;
 
     @Expose
-    @ConfigOption(name = "Hide Bronze Duplicates", desc = "Hide duplicate messages for bronze trophy fishes from chat.")
+    @ConfigOption(name = "Bronze Duplicates", desc = "Hide duplicate messages for bronze trophy fishes from chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean trophyFishBronzeHider = false;
 
     @Expose
-    @ConfigOption(name = "Hide Silver Duplicates", desc = "Hide duplicate messages for silver trophy fishes from chat.")
+    @ConfigOption(name = "Silver Duplicates", desc = "Hide duplicate messages for silver trophy fishes from chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean trophyFishSilverHider = false;
 
-    @Expose
-    @ConfigOption(name = "Shorten Fishing Message", desc = "Shorten the message what type of sea creature you have fished.")
-    @ConfigEditorBoolean
-    public boolean shortenFishingMessage = false;
-
     @ConfigOption(name = "Thunder Spark", desc = "")
     @ConfigEditorAccordion(id = 1)
     public boolean thunderSpark = false;
@@ -52,17 +47,23 @@ public class Fishing {
     @ConfigAccordionId(id = 1)
     public String thunderSparkColor = "0:255:255:255:255";
 
+    @ConfigOption(name = "Barn Fishing Timer", desc = "")
+    @ConfigEditorAccordion(id = 2)
+    public boolean barnTimer_ = false;
+
     @Expose
     @ConfigOption(
             name = "Barn Fishing Timer",
             desc = "Shows the time and amount of sea creatures while fishing on the barn via hub."
     )
     @ConfigEditorBoolean
+    @ConfigAccordionId(id = 2)
     public boolean barnTimer = true;
 
     @Expose
     @ConfigOption(name = "Fishing Timer Location", desc = "")
     @ConfigEditorButton(runnableId = "barnTimer", buttonText = "Edit")
+    @ConfigAccordionId(id = 2)
     public Position barnTimerPos = new Position(10, 10, false, true);
 
     @Expose
@@ -72,18 +73,30 @@ public class Fishing {
             maxValue = 360,
             minStep = 10
     )
+    @ConfigAccordionId(id = 2)
     public int barnTimerAlertTime = 330;
 
+    @ConfigOption(name = "Shark Fish", desc = "")
+    @ConfigEditorAccordion(id = 3)
+    public boolean sharkFish = false;
+
     @Expose
     @ConfigOption(
             name = "Shark Fish Counter",
             desc = "Counts how many sharks have been caught."
     )
     @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
     public boolean sharkFishCounter = false;
 
     @Expose
     @ConfigOption(name = "Shark Location", desc = "")
     @ConfigEditorButton(runnableId = "sharkFishCounter", buttonText = "Edit")
+    @ConfigAccordionId(id = 3)
     public Position sharkFishCounterPos = new Position(10, 10, false, true);
+
+    @Expose
+    @ConfigOption(name = "Shorten Fishing Message", desc = "Shorten the message what type of sea creature you have fished.")
+    @ConfigEditorBoolean
+    public boolean shortenFishingMessage = false;
 }
\ No newline at end of file