fishing profit tracker (#703)

Fishing Tracker #703

7 files changed, 95 insertions, 0 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index ddd51b18f..5893fbf06 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.jsonobjects.FriendsJson
 import at.hannibal2.skyhanni.utils.jsonobjects.JacobContestsJson
 import at.hannibal2.skyhanni.utils.jsonobjects.KnownFeaturesJson
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 import com.google.gson.TypeAdapter
@@ -37,6 +38,8 @@ import java.nio.file.StandardCopyOption
 import java.util.UUID
 import kotlin.concurrent.fixedRateTimer
 
+typealias TrackerDisplayMode = SkyHanniTracker.DefaultDisplayMode
+
 class ConfigManager {
     companion object {
         val gson = GsonBuilder().setPrettyPrinting()
@@ -108,6 +111,15 @@ class ConfigManager {
                     return IslandType.valueOf(reader.nextString().uppercase())
                 }
             }.nullSafe())
+            .registerTypeAdapter(TrackerDisplayMode::class.java, object : TypeAdapter<TrackerDisplayMode>() {
+                override fun write(out: JsonWriter, value: TrackerDisplayMode) {
+                    out.value(value.name)
+                }
+
+                override fun read(reader: JsonReader): TrackerDisplayMode {
+                    return TrackerDisplayMode.valueOf(reader.nextString())
+                }
+            }.nullSafe())
             .enableComplexMapKeySerialization()
             .create()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index b21361b6f..162f804e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker;
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostData;
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI;
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker;
+import at.hannibal2.skyhanni.features.fishing.FishingProfitTracker;
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity;
 import at.hannibal2.skyhanni.features.garden.CropAccessory;
 import at.hannibal2.skyhanni.features.garden.CropType;
@@ -19,6 +20,7 @@ import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal;
 import at.hannibal2.skyhanni.features.slayer.SlayerProfitTracker;
 import at.hannibal2.skyhanni.utils.LorenzVec;
 import at.hannibal2.skyhanni.utils.NEUInternalName;
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker;
 import com.google.gson.annotations.Expose;
 import net.minecraft.item.ItemStack;
 
@@ -50,6 +52,9 @@ public class Storage {
     public Boolean contestSendingAsked = false;
 
     @Expose
+    public Map<String, SkyHanniTracker.DisplayMode> trackerDisplayModes = new HashMap<>();
+
+    @Expose
     public Map<UUID, PlayerSpecific> players = new HashMap<>();
 
     public static class PlayerSpecific {
@@ -389,5 +394,15 @@ public class Storage {
             @Expose
             public Map<DungeonAPI.DungeonFloor, Integer> bosses = new HashMap<>();
         }
+
+        @Expose
+        public FishingStorage fishing = new FishingStorage();
+
+        public static class FishingStorage {
+
+            @Expose
+            public FishingProfitTracker.Data fishingProfitTracker = new FishingProfitTracker.Data();
+
+        }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index d14628560..8bf1be499 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker
 import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder
 import at.hannibal2.skyhanni.features.fame.CityProjectFeatures
+import at.hannibal2.skyhanni.features.fishing.FishingProfitTracker
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.GardenCropTimeCommand
 import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest
@@ -174,6 +175,7 @@ object Commands {
         ) { EnderNodeTracker.resetCommand(it) }
         registerCommand("shresetarmordroptracker", "Resets the Armor Drop Tracker") { ArmorDropTracker.resetCommand(it) }
         registerCommand("shresetfrozentreasuretracker", "Resets the Frozen Treasure Tracker") { FrozenTreasureTracker.resetCommand(it) }
+        registerCommand("shresetfishingtracker", "Resets the Frozen Treasure Tracker") { FishingProfitTracker.resetCommand(it) }
         registerCommand("shbingotoggle", "Toggle the bingo card display mode") { BingoCardDisplay.toggleCommand() }
         registerCommand(
             "shfarmingprofile",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
index 13ef30f84..349f4882e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
@@ -51,6 +51,11 @@ public class FishingConfig {
     public RareCatchesConfig rareCatches = new RareCatchesConfig();
 
     @Expose
+    @ConfigOption(name = "Fishing Profit Tracker", desc = "")
+    @Accordion
+    public FishingProfitTrackerConfig fishingProfitTracker = new FishingProfitTrackerConfig();
+
+    @Expose
     @ConfigOption(
         name = "Shark Fish Counter",
         desc = "Counts how many Sharks have been caught."
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingProfitTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingProfitTrackerConfig.java
new file mode 100644
index 000000000..af8d9d3de
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingProfitTrackerConfig.java
@@ -0,0 +1,35 @@
+package at.hannibal2.skyhanni.config.features.fishing;
+
+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.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class FishingProfitTrackerConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Count all items you pick up while fishing.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    public Position position = new Position(20, 20, false, true);
+
+    @Expose
+    @ConfigOption(name = "Show Price From", desc = "Show price from Bazaar or NPC.")
+    @ConfigEditorDropdown(values = {"Instant Sell", "Sell Offer", "NPC"})
+    public int priceFrom = 1;
+
+    @Expose
+    @ConfigOption(name = "Recent Drops", desc = "Highlight the amount in green on recently caught items.")
+    @ConfigEditorBoolean
+    public boolean showRecentDropss = true;
+
+    @Expose
+    @ConfigOption(name = "Hide Moving", desc = "Hide the Fishing Profit Tracker while moving.")
+    @ConfigEditorBoolean
+    public boolean hideMoving = true;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 1ac453a8d..c9465ea2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -88,6 +88,11 @@ public class MiscConfig {
     public KickDurationConfig kickDuration = new KickDurationConfig();
 
     @Expose
+    @ConfigOption(name = "Tracker", desc = "Tracker Config")
+    @Accordion
+    public TrackerConfig tracker = new TrackerConfig();
+
+    @Expose
     @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.")
     @ConfigEditorBoolean
     @FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
new file mode 100644
index 000000000..a2f7da58d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
@@ -0,0 +1,21 @@
+package at.hannibal2.skyhanni.config.features.misc;
+
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.observer.Property;
+
+public class TrackerConfig {
+
+    @Expose
+    @ConfigOption(name = "Hide with Item Value", desc = "Hide all trackers while the Estimated Item Value is visible.")
+    @ConfigEditorBoolean
+    public boolean hideInEstimatedItemValue = true;
+
+    @Expose
+    @ConfigOption(name = "Default Display Mode", desc = "Change the display mode that gets shown when starting.")
+    @ConfigEditorDropdown
+    public Property<SkyHanniTracker.DefaultDisplayMode> defaultDisplayMode = Property.of(SkyHanniTracker.DefaultDisplayMode.TOTAL);
+}