From 38abef2c4409cf32b2087918ac587e8bf370c091 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:23:57 +0100 Subject: Added Sea Creature Tracker. --- .../java/at/hannibal2/skyhanni/config/Storage.java | 9 +++++-- .../hannibal2/skyhanni/config/commands/Commands.kt | 13 +++++++--- .../config/features/event/diana/DianaConfig.java | 3 ++- .../config/features/fishing/FishingConfig.java | 5 ++++ .../features/fishing/SeaCreatureTrackerConfig.java | 30 ++++++++++++++++++++++ 5 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/SeaCreatureTrackerConfig.java (limited to 'src/main/java/at/hannibal2/skyhanni/config') diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index 07641b44c..2678f0259 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -6,9 +6,10 @@ 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.diana.DianaProfitTracker; -import at.hannibal2.skyhanni.features.event.diana.MythologicalMobTracker; +import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker; import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker; import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker; +import at.hannibal2.skyhanni.features.fishing.tracker.SeaCreatureTracker; import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity; import at.hannibal2.skyhanni.features.garden.CropAccessory; import at.hannibal2.skyhanni.features.garden.CropType; @@ -443,6 +444,9 @@ public class Storage { @Expose public FishingProfitTracker.Data fishingProfitTracker = new FishingProfitTracker.Data(); + @Expose + public SeaCreatureTracker.Data seaCreatureTracker = new SeaCreatureTracker.Data(); + } @Expose @@ -455,7 +459,8 @@ public class Storage { public DianaProfitTracker.Data dianaProfitTracker = new DianaProfitTracker.Data(); @Expose - public MythologicalMobTracker.Data mythologicalMobTracker = new MythologicalMobTracker.Data(); + // TODO renmae + public MythologicalCreatureTracker.Data mythologicalMobTracker = new MythologicalCreatureTracker.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 a202aa1dd..11f6de89a 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -17,11 +17,12 @@ import at.hannibal2.skyhanni.features.commands.PartyCommands import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare -import at.hannibal2.skyhanni.features.event.diana.MythologicalMobTracker +import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker 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.tracker.FishingProfitTracker +import at.hannibal2.skyhanni.features.fishing.tracker.SeaCreatureTracker import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.garden.GardenCropTimeCommand import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest @@ -215,9 +216,13 @@ object Commands { "Resets the Diana Profit Tracker" ) { DianaProfitTracker.resetCommand(it) } registerCommand( - "shresetmythologicalmobtracker", - "Resets the Mythological Mob Tracker" - ) { MythologicalMobTracker.resetCommand(it) } + "shresetmythologicalcreatureracker", + "Resets the Mythological Creature Tracker" + ) { MythologicalCreatureTracker.resetCommand(it) } + registerCommand( + "shresetseacreaturetracker", + "Resets the Sea Creature Tracker" + ) { SeaCreatureTracker.resetCommand(it) } } private fun usersBugFix() { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java index 2de341b4c..4867c0bcd 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java @@ -70,7 +70,8 @@ public class DianaConfig { public DianaProfitTrackerConfig dianaProfitTracker = new DianaProfitTrackerConfig(); @Expose - @ConfigOption(name = "Mythological Mob Tracker", desc = "") + @ConfigOption(name = "Mythological Creature Tracker", desc = "") @Accordion + // TODO renmae public MythologicalMobTrackerConfig mythologicalMobtracker = new MythologicalMobTrackerConfig(); } 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 349f4882e..d0bf5d1f3 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 @@ -55,6 +55,11 @@ public class FishingConfig { @Accordion public FishingProfitTrackerConfig fishingProfitTracker = new FishingProfitTrackerConfig(); + @Expose + @ConfigOption(name = "Sea Creature Tracker", desc = "") + @Accordion + public SeaCreatureTrackerConfig seaCreatureTracker = new SeaCreatureTrackerConfig(); + @Expose @ConfigOption( name = "Shark Fish Counter", diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/SeaCreatureTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/SeaCreatureTrackerConfig.java new file mode 100644 index 000000000..91c26aa21 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/SeaCreatureTrackerConfig.java @@ -0,0 +1,30 @@ +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.ConfigOption; +import io.github.moulberry.moulconfig.observer.Property; + +public class SeaCreatureTrackerConfig { + + @Expose + @ConfigOption(name = "Enabled", desc = "Count the different sea creatures you catch.") + @ConfigEditorBoolean + @FeatureToggle + public boolean enabled = false; + + @Expose + public Position position = new Position(20, 20, false, true); + + @Expose + @ConfigOption(name = "Show Percentage", desc = "Show percentage how often what sea creature got catched.") + @ConfigEditorBoolean + public Property showPercentage = Property.of(false); + + @Expose + @ConfigOption(name = "Hide Chat", desc = "Hide the chat messages when catching a sea creature.") + @ConfigEditorBoolean + public boolean hideChat = false; +} -- cgit