Feature: All-Time Hoppity Stats

src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryConfig.java

@@ -6,7 +6,6 @@
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
-import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import io.github.notenoughupdates.moulconfig.observer.Property;
@@ -65,9 +64,9 @@ public enum HoppityStat {
         SIDE_DISH_EGGS("§7You found §b4 §6§lSide Dish Eggs §r§7in the §6Chocolate Factory§7."),
         MILESTONE_RABBITS("§7You claimed §b2 §6§lMilestone Rabbits§7."),
         EMPTY_1(""),
-        NEW_RABBITS("§7Unique Rabbits: §b7\n §f1 §7- §a1 §7- §91 §7- §51 §7- §61 §7- §d1 §7- §b1"),
+        NEW_RABBITS("§7Unique Rabbits: §f7\n §f1 §7- §a1 §7- §91 §7- §51 §7- §61 §7- §d1 §7- §b1"),
         EMPTY_2(""),
-        DUPLICATE_RABBITS("§7Duplicate Rabbits: §c10\n §f4 §7- §a3 §7- §92 §7- §51 §7- §60 §7- §d0 §7- §b0\n §6+250,000,000 Chocolate"),
+        DUPLICATE_RABBITS("§7Duplicate Rabbits: §f10\n §f4 §7- §a3 §7- §92 §7- §51 §7- §60 §7- §d0 §7- §b0\n §6+250,000,000 Chocolate"),
         EMPTY_3(""),
         STRAY_RABBITS("§7Stray Rabbits: §f20\n §f10 §7- §a6 §7- §93 §7- §51 §7- §60 §7- §d0 §7- §b0\n §6+8,000,000 Chocolate\n  §4* §c§oRequires Stray Tracker being enabled to work§4§o."),
         EMPTY_4(""),
@@ -87,4 +86,13 @@ public String toString() {
             return display;
         }
     }
+
+    @Expose
+    @ConfigOption(
+        name = "Show Count Diff",
+        desc = "Store and display the count of Uniques/Duplicates next to their respective rabbit count.\n" +
+            ".e.g. §7Unique Rabbits: §f5 §7(270 -> 275)"
+    )
+    @ConfigEditorBoolean
+    public boolean showCountDiff = true;
 }

src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryLiveDisplayConfig.java

@@ -82,6 +82,14 @@ public String toString() {
     @ConfigEditorDropdown
     public HoppityDateTimeFormat dateTimeFormat = HoppityDateTimeFormat.RELATIVE;
 
+    @Expose
+    @ConfigOption(
+        name = "Show All-Time",
+        desc = "Add a dummy \"All-Time\" entry after the last set of stats, showing the total stats for all recorded events."
+    )
+    @ConfigEditorBoolean
+    public boolean showAllTime = true;
+
     @Expose
     @ConfigOption(name = "Card Toggle Keybind", desc = "Toggle the GUI element with this keybind.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)

src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.kt

@@ -193,6 +193,9 @@ class ProfileSpecificStorage {
         @Expose
         var mealLastFound: MutableMap<HoppityEggType, SimpleTimeMark> = enumMapOf()
 
+        @Expose
+        var mealNextSpawn: MutableMap<HoppityEggType, SimpleTimeMark> = enumMapOf()
+
         class HitmanStatsStorage {
             @Expose
             var availableHitmanEggs: Int = 0
@@ -719,44 +722,57 @@ class ProfileSpecificStorage {
     var hoppityStatLiveDisplayToggledOff: Boolean = false
 
     data class HoppityEventStats(
-        @Expose
-        var mealsFound: MutableMap<HoppityEggType, Int> = enumMapOf(),
-
-        @Expose
-        var rabbitsFound: MutableMap<LorenzRarity, RabbitData> = enumMapOf(),
-
-        @Expose
-        var dupeChocolateGained: Long = 0,
-
-        @Expose
-        var strayChocolateGained: Long = 0,
-
-        @Expose
-        var millisInCf: Duration = Duration.ZERO,
-
-        @Expose
-        var rabbitTheFishFinds: Int = 0,
-
-        @Expose
-        var initialLeaderboardPosition: LeaderboardPosition = LeaderboardPosition(-1, -1.0),
-
-        @Expose
-        var finalLeaderboardPosition: LeaderboardPosition = LeaderboardPosition(-1, -1.0),
-
-        @Expose
-        var lastLbUpdate: SimpleTimeMark = farPast(),
-
-        @Expose
-        var summarized: Boolean = false,
+        @Expose var mealsFound: MutableMap<HoppityEggType, Int> = enumMapOf(),
+        @Expose var rabbitsFound: MutableMap<LorenzRarity, RabbitData> = enumMapOf(),
+        @Expose var dupeChocolateGained: Long = 0,
+        @Expose var strayChocolateGained: Long = 0,
+        @Expose var rabbitTheFishFinds: Int = 0,
+
+        @Expose var millisInCf: Duration = Duration.ZERO,
+        @Expose var initialLeaderboardPosition: LeaderboardPosition = LeaderboardPosition(),
+        @Expose var finalLeaderboardPosition: LeaderboardPosition = LeaderboardPosition(),
+        @Expose var lastLbUpdate: SimpleTimeMark = farPast(),
+        @Expose var summarized: Boolean = false,
+
+        @Expose var typeCountSnapshot: RabbitData = RabbitData(),
+        @Expose var typeCountsSince: RabbitData = RabbitData(),
     ) {
+        operator fun plusAssign(it: HoppityEventStats) {
+            it.mealsFound.forEach { (key, value) ->
+                mealsFound.merge(key, value, Int::plus)
+            }
+            it.rabbitsFound.forEach { (key, rabbitData) ->
+                rabbitsFound.merge(key, rabbitData) { existing, new ->
+                    RabbitData(
+                        uniques = existing.uniques + new.uniques,
+                        dupes = existing.dupes + new.dupes,
+                        strays = existing.strays + new.strays
+                    )
+                }
+            }
+            dupeChocolateGained += it.dupeChocolateGained
+            strayChocolateGained += it.strayChocolateGained
+            rabbitTheFishFinds += it.rabbitTheFishFinds
+            millisInCf += it.millisInCf
+        }
+
         companion object {
             data class RabbitData(
                 @Expose var uniques: Int = 0,
                 @Expose var dupes: Int = 0,
                 @Expose var strays: Int = 0,
+            ) {
+                fun getByIndex(index: Int): Int = when (index) {
+                    0 -> uniques
+                    1 -> dupes
+                    2 -> strays
+                    else -> throw IllegalArgumentException("Invalid index: $index")
+                }
+            }
+            data class LeaderboardPosition(
+                @Expose var position: Int = -1,
+                @Expose var percentile: Double = -1.0,
             )
-
-            data class LeaderboardPosition(@Expose var position: Int, @Expose var percentile: Double)
         }
     }
 

src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt

@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.event.hoppity
 
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage.ChocolateFactoryStorage.HotspotRabbitStorage
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
@@ -23,6 +24,8 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.collectWhile
 import at.hannibal2.skyhanni.utils.CollectionUtils.consumeWhile
+import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
+import at.hannibal2.skyhanni.utils.CollectionUtils.sumOfPair
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.DisplayTableEntry
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -54,6 +57,8 @@ import net.minecraft.item.ItemStack
 import java.util.regex.Pattern
 import kotlin.time.Duration.Companion.seconds
 
+private typealias RabbitData = ProfileSpecificStorage.HoppityEventStats.Companion.RabbitData
+
 @SkyHanniModule
 object HoppityCollectionStats {
     private val collectionConfig get() = ChocolateFactoryApi.config.hoppityCollectionStats
@@ -184,12 +189,13 @@ object HoppityCollectionStats {
     )
     // </editor-fold>
 
+    private val profileStorage get() = ProfileStorageData.profileSpecific?.chocolateFactory
     private var shCountData: HoppityEggLocationsJson? = null
     private var neuCountData: HoppityInfo? = null
     private var hotspotRabbitCount = 0
     private var display = emptyList<Renderable>()
     private val loggedRabbits
-        get() = ProfileStorageData.profileSpecific?.chocolateFactory?.rabbitCounts ?: mutableMapOf()
+        get() = profileStorage?.rabbitCounts ?: mutableMapOf()
 
     enum class HighlightRabbitTypes(
         private val displayName: String,
@@ -228,17 +234,17 @@ object HoppityCollectionStats {
     }
 
     private val locationRabbitRequirements: MutableMap<String, LocationRabbit>
-        get() = ProfileStorageData.profileSpecific?.chocolateFactory?.locationRabbitRequirements ?: mutableMapOf()
+        get() = profileStorage?.locationRabbitRequirements ?: mutableMapOf()
 
     private val residentRabbitData: MutableMap<IslandType, MutableMap<String, Boolean?>>
-        get() = ProfileStorageData.profileSpecific?.chocolateFactory?.residentRabbits ?: mutableMapOf()
+        get() = profileStorage?.residentRabbits ?: mutableMapOf()
 
     private val hotspotRabbitData: HotspotRabbitStorage?
-        get() = ProfileStorageData.profileSpecific?.chocolateFactory?.hotspotRabbitStorage?.let { storage ->
+        get() = profileStorage?.hotspotRabbitStorage?.let { storage ->
             val yearNow = SkyBlockTime.now().year
             if (storage.skyblockYear != yearNow) {
                 HotspotRabbitStorage(yearNow).also {
-                    ProfileStorageData.profileSpecific?.chocolateFactory?.hotspotRabbitStorage = it
+                    profileStorage?.hotspotRabbitStorage = it
                 }
             } else storage
         }
@@ -601,7 +607,7 @@ object HoppityCollectionStats {
 
         val newList = mutableListOf<Renderable>()
         newList.add(Renderable.string("§eHoppity Rabbit Collection§f:"))
-        newList.add(LorenzUtils.fillTable(getRabbitStats(), padding = 5))
+        newList.add(LorenzUtils.fillTable(getRabbitStatsFormat(), padding = 5))
 
         addLocationRequirementRabbitsToHud(newList)
         addResidentRabbitsInformationToHud(newList)
@@ -622,7 +628,27 @@ object HoppityCollectionStats {
         return newList
     }
 
-    private fun getRabbitStats(): MutableList<DisplayTableEntry> {
+    fun getTypeCountSnapshot(): RabbitData {
+        val (uniqueCount, duplicateCount) = RabbitCollectionRarity.entries.sumOfPair(
+            selector = { rarity ->
+                val foundOfRarity = loggedRabbits.filterKeys {
+                    HoppityCollectionData.getRarity(it) == rarity
+                }
+                val uniquesFound = foundOfRarity.size
+                val duplicates = foundOfRarity.values.sum() - uniquesFound
+                uniquesFound to duplicates
+            },
+            resultConverter = Double::toInt
+        )
+
+        return RabbitData(
+            uniques = uniqueCount,
+            dupes = duplicateCount,
+            strays = profileStorage?.strayTracker?.straysCaught?.sumAllValues()?.toInt() ?: 0,
+        )
+    }
+
+    private fun getRabbitStatsFormat(): MutableList<DisplayTableEntry> {
         var totalUniquesFound = 0
         var totalDuplicates = 0
         var totalChocolatePerSecond = 0

src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt

@@ -80,9 +80,9 @@ object HoppityEggDisplayManager {
             HoppityEggType.resettingEntries.filter {
                 it.hasRemainingSpawns() // Only show eggs that have future spawns
             }.let { entries ->
-                if (config.unclaimedEggsOrder == SOONEST_FIRST) entries.sortedBy { it.timeUntil() }
+                if (config.unclaimedEggsOrder == SOONEST_FIRST) entries.sortedBy { it.timeUntil }
                 else entries
-            }.forEach { add("§7 - ${it.formattedName} ${it.timeUntil().format()}") }
+            }.forEach { add("§7 - ${it.formattedName} ${it.timeUntil.format()}") }
 
             if (!config.showCollectedLocationCount || !LorenzUtils.inSkyBlock) return@buildList
 

src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt

@@ -82,6 +82,10 @@ object HoppityEggLocator {
         lastParticlePosition = null
     }
 
+    fun mealSpawned(meal: HoppityEggType) {
+        if (currentEggType == meal) resetData()
+    }
+
     @HandleEvent
     fun onRenderWorld(event: SkyHanniRenderWorldEvent) {
         if (!isEnabled()) return
@@ -170,7 +174,7 @@ object HoppityEggLocator {
         drawDynamicText(location.up(), possibleDuplicateLabel, 1.5)
     }
 
-    private fun shouldShowAllEggs() = config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
+    private fun shouldShowAllEggs() = config.showAllWaypoints && !locatorInHotbar && HoppityEggType.anyEggsUnclaimed()
 
     @HandleEvent(onlyOnSkyblock = true)
     fun onReceiveParticle(event: ReceiveParticleEvent) {