Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 55 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
index 80c7e33cd..50e60191a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
@@ -19,6 +20,7 @@ public class FishingConfig {
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean trophyCounter = false;
 
     @Expose
@@ -33,7 +35,7 @@ public class FishingConfig {
     public int trophyDesign = 0;
 
     @Expose
-    @ConfigOption(name = "Hide Repeated Catches", desc = "Delete past catches of the same trophy fish from chat.")
+    @ConfigOption(name = "Hide Repeated Catches", desc = "Delete past catches of the same Trophy Fish from chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean trophyFishDuplicateHider = false;
@@ -45,33 +47,35 @@ public class FishingConfig {
     public boolean trophyFishTotalAmount = false;
 
     @Expose
-    @ConfigOption(name = "Trophy Fish Info", desc = "Show information and stats about a trophy fish when hovering over a catch message in chat.")
+    @ConfigOption(name = "Trophy Fish Info", desc = "Show information and stats about a Trophy Fish when hovering over a catch message in chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean trophyFishTooltip = true;
 
     @Expose
-    @ConfigOption(name = "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 = "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 = "Fillet Tooltip", desc = "Show fillet value of trophy fish in tooltip.")
+    @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of Trophy Fish in tooltip.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean trophyFilletTooltip = true;
 
     @Expose
-    @ConfigOption(name = "Odger Waypoint", desc = "Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand.")
+    @ConfigOption(name = "Odger Waypoint", desc = "Show the Odger waypoint when Trophy Fishes are in the inventory and no lava rod in hand.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean odgerLocation = true;
 
     @ConfigOption(name = "Thunder Spark", desc = "")
@@ -82,6 +86,7 @@ public class FishingConfig {
     @ConfigOption(name = "Thunder Spark Highlight", desc = "Highlight Thunder Sparks after killing a Thunder")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
+    @FeatureToggle
     public boolean thunderSparkHighlight = false;
 
     @Expose
@@ -101,6 +106,7 @@ public class FishingConfig {
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 2)
+    @FeatureToggle
     public boolean barnTimer = true;
 
     @Expose
@@ -109,7 +115,7 @@ public class FishingConfig {
     @Expose
     @ConfigOption(
             name = "Worm Fishing",
-            desc = "Show the barn fishing timer even for worms or other sea creatures in the crystal hollows."
+            desc = "Show the Barn Fishing Timer even for worms or other sea creatures in the Crystal Hollows."
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 2)
@@ -117,6 +123,15 @@ public class FishingConfig {
 
     @Expose
     @ConfigOption(
+            name = "Stranded Fishing",
+            desc = "Show the Barn Fishing Timer even on all the different islands Stranded players can visit."
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 2)
+    public boolean barnTimerForStranded = true;
+
+    @Expose
+    @ConfigOption(
             name = "Worm Cap Alert",
             desc = "Alerts you with sound if you hit the Worm Sea Creature limit of 60."
     )
@@ -150,6 +165,7 @@ public class FishingConfig {
         @Expose
         @ConfigOption(name = "Enable", desc = "Hide the Chum/Chumcap Bucket name tags for other players.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public Property<Boolean> enabled = Property.of(true);
 
         @Expose
@@ -173,6 +189,7 @@ public class FishingConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Show the fished item name above the item when fishing.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
@@ -183,11 +200,40 @@ public class FishingConfig {
     }
 
     @Expose
+    @ConfigOption(name = "Fishing Hook Display", desc = "")
+    @Accordion
+    public FishingHookDisplay fishingHookDisplay = new FishingHookDisplay();
+
+    public static class FishingHookDisplay {
+
+        @Expose
+        @ConfigOption(name = "Enabled", desc = "Display the hypixel timer until the fishing hook can be pulled out of the water, only bigger and on your screen.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean enabled = true;
+
+        @Expose
+        @ConfigOption(name = "Hide Armor Stand", desc = "Hide the original armor stand from hypixel when the Skyhanni display is enabled.")
+        @ConfigEditorBoolean
+        public boolean hideArmorStand = true;
+
+        @Expose
+        public Position position = new Position(460, -240, 3.4f);
+    }
+
+    @Expose
+    @ConfigOption(name = "Highlight Rare", desc = "Highlight rare sea creatures in blue color.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean rareSeaCreatureHighlight = false;
+
+    @Expose
     @ConfigOption(
             name = "Shark Fish Counter",
             desc = "Counts how many sharks have been caught."
     )
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean sharkFishCounter = false;
 
     @Expose
@@ -196,10 +242,12 @@ public class FishingConfig {
     @Expose
     @ConfigOption(name = "Shorten Fishing Message", desc = "Shortens the chat message that says what type of sea creature you have fished.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean shortenFishingMessage = false;
 
     @Expose
     @ConfigOption(name = "Compact Double Hook", desc = "Adds Double Hook to the sea creature chat message instead of in a previous line.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean compactDoubleHook = true;
 }