From ee8f6339e2cc574fa3d43ecf4a88c4103ef86710 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:16:42 -0500
Subject: [PATCH 01/15] Done

---
 .../ChocolateFactoryConfig.java               |   6 +
 .../storage/ProfileSpecificStorage.java       |   6 +
 .../ChocolateFactoryBlockOpen.kt              | 159 +++++++++++++++++-
 .../features/misc/NonGodPotEffectDisplay.kt   |  11 ++
 4 files changed, 174 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
index b999f95c5ff7..d73eb226cf83 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
@@ -200,6 +200,12 @@ public class ChocolateFactoryConfig {
     @FeatureToggle
     public boolean boosterCookieRequirement = false;
 
+    @Expose
+    @ConfigOption(name = "Hot Chocolate Mixin", desc = "Blocks running /cf without §9Hot Chocolate Mixin §7active.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hotChocolateMixinRequirement = false;
+
     @Expose
     @ConfigOption(name = "Stray Tracker", desc = "Track stray rabbits found in the Chocolate Factory menu.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
index 3514b9e8991c..b71e426db5a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -235,6 +235,9 @@ public static class HitmanStatsStorage {
 
         @Expose
         public HitmanStatsStorage hitmanStats = new HitmanStatsStorage();
+
+        @Expose
+        public SimpleTimeMark hotChocolateMixinExpiry = SimpleTimeMarkFarPast();
     }
 
     @Expose
@@ -303,6 +306,9 @@ public static class BitsStorage {
         public SimpleTimeMark boosterCookieExpiryTime = null;
     }
 
+    @Expose
+    public SimpleTimeMark godPotExpiryTime = SimpleTimeMarkFarPast();
+
     @Expose
     public Map<LorenzVec, MinionConfig> minions = new HashMap<>();
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index ab069e9b236f..4c889a22682b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -6,15 +6,22 @@ import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
+import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
@@ -22,7 +29,7 @@ import kotlin.time.Duration.Companion.seconds
 @SkyHanniModule
 object ChocolateFactoryBlockOpen {
     private val config get() = SkyHanniMod.feature.inventory.chocolateFactory
-    private val profileStorage get() = ProfileStorageData.profileSpecific?.bits
+    private val profileStorage get() = ProfileStorageData.profileSpecific
 
     /**
      * REGEX-TEST: /cf
@@ -45,6 +52,65 @@ object ChocolateFactoryBlockOpen {
         "§6(?:Open )?Chocolate Factory",
     )
 
+    /**
+     * REGEX-TEST: §a§lSCHLURP! §r§eThe effects of the §r§9Hot Chocolate Mixin §r§ehave been extended by §r§986h 24m§r§e!
+     * They will pause if your §r§cGod Potion §r§eexpires.
+     */
+    private val hotChocolateMixinConsumePattern by RepoPattern.pattern(
+        "stats.chatpatterns.hotchocolatemixinconsume",
+        "(?:§.)+.*(?:§.)+Hot Chocolate Mixin ?(?:§.)+.*extended by (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
+    )
+
+    /**
+     * REGEX-TEST: §a§lGULP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     * REGEX-TEST: §a§lSIP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     * REGEX-TEST: §a§lSLURP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     */
+    private val godPotConsumePattern by RepoPattern.pattern(
+        "stats.chatpatterns.godpotconsume",
+        "(?:§.)+.*(?:§.)+God Potion ?(?:§.)+.*grants you powers for (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
+    )
+
+    /**
+     * REGEX-TEST: §cGod Potion§f: 4d
+     */
+    private val godPotTabPattern by RepoPattern.pattern(
+        "stats.tabpatterns.godpot",
+        "(?:§.)*God Potion(?:§.)*: (?:§.)*(?<time>[dhms0-9 ]+)(?:§.)*",
+    )
+
+    /**
+     * REGEX-TEST: (1/2) Active Effects
+     */
+    private val effectsInventoryPattern by RepoPattern.pattern(
+        "inventory.effects",
+        "(?:§.)?(?:[(\\d\\/)]* )?Active Effects",
+    )
+
+    /**
+     * REGEX-TEST: §aFilter
+     */
+    private val filterPattern by RepoPattern.pattern(
+        "inventory.effects.filter",
+        "§aFilter",
+    )
+
+    /**
+     * REGEX-TEST: §b▶ God Potion Effects
+     */
+    private val godPotEffectsFilterSelectPattern by RepoPattern.pattern(
+        "inventory.effects.filtergodpotselect",
+        "§b▶ God Potion Effects",
+    )
+
+    /**
+     * REGEX-TEST: §7Remaining: §f105:01:34
+     */
+    private val potionRemainingLoreTimerPattern by RepoPattern.pattern(
+        "inventory.effects.effecttimeleft",
+        "§7Remaining: §f(?<time>[\\d:]+)",
+    )
+
     private var commandSentTimer = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -56,6 +122,61 @@ object ChocolateFactoryBlockOpen {
         if (checkIsBlocked()) event.cancel()
     }
 
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        hotChocolateMixinConsumePattern.matchMatcher(event.message) {
+            val durationAdded = TimeUtils.getDuration(group("time"))
+            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
+            val existingValue = profileStorage?.chocolateFactory?.hotChocolateMixinExpiry
+            profileStorage?.chocolateFactory?.hotChocolateMixinExpiry =
+                existingValue?.let { it + durationAdded } ?: asTimeMark
+        }
+        godPotConsumePattern.matchMatcher(event.message) {
+            val durationAdded = TimeUtils.getDuration(group("time"))
+            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
+            val existingValue = profileStorage?.godPotExpiryTime
+            profileStorage?.godPotExpiryTime = existingValue?.let { it + durationAdded } ?: asTimeMark
+        }
+    }
+
+    @SubscribeEvent
+    fun onTabUpdate(event: TablistFooterUpdateEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        for (line in event.footer.split("\n")) {
+            godPotTabPattern.matchMatcher(line) {
+                val expiryDuration = TimeUtils.getDuration(group("time"))
+                val expiryTime = SimpleTimeMark.now().plus(expiryDuration)
+                profileStorage?.godPotExpiryTime = expiryTime
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
+        if (!LorenzUtils.inSkyBlock || !event.isGodPotEffectsFilterSelect()) return
+
+        val potionLore = event.inventoryItems[10]?.getLore()
+        if (potionLore == null) {
+            // No active god pot effects found, reset the expiry time
+            profileStorage?.godPotExpiryTime = SimpleTimeMark.farPast()
+            return
+        }
+
+        potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
+            val expiryDuration = TimeUtils.getDuration(group("time"))
+            profileStorage?.godPotExpiryTime = SimpleTimeMark.now().plus(expiryDuration)
+        }
+    }
+
+    private fun InventoryUpdatedEvent.isGodPotEffectsFilterSelect(): Boolean =
+        effectsInventoryPattern.matches(this.inventoryName) &&
+            this.inventoryItems.values.firstOrNull {
+                filterPattern.matches(it.displayName)
+            }?.getLore()?.any {
+                godPotEffectsFilterSelectPattern.matches(it)
+            } ?: false
+
     @SubscribeEvent
     fun onCommandSend(event: MessageSendToServerEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -75,19 +196,20 @@ object ChocolateFactoryBlockOpen {
         SUCCESS,
         FAIL_NO_RABBIT,
         FAIL_NO_BOOSTER_COOKIE,
+        FAIL_NO_MIXIN,
     }
 
     private fun tryBlock(): TryBlockResult {
-        if (config.mythicRabbitRequirement && !MythicRabbitPetWarning.correctPet()) {
+        return if (config.mythicRabbitRequirement && !MythicRabbitPetWarning.correctPet()) {
             ChatUtils.clickToActionOrDisable(
                 "§cBlocked opening the Chocolate Factory without a §dMythic Rabbit Pet §cequipped!",
                 config::mythicRabbitRequirement,
                 actionName = "open pets menu",
                 action = { HypixelCommands.pet() },
             )
-            return TryBlockResult.FAIL_NO_RABBIT
+            TryBlockResult.FAIL_NO_RABBIT
         } else if (config.boosterCookieRequirement) {
-            profileStorage?.boosterCookieExpiryTime?.let {
+            profileStorage?.bits?.boosterCookieExpiryTime?.let {
                 if (it.timeUntil() > 0.seconds) return TryBlockResult.SUCCESS
                 ChatUtils.clickToActionOrDisable(
                     "§cBlocked opening the Chocolate Factory without a §dBooster Cookie §cactive!",
@@ -100,9 +222,30 @@ object ChocolateFactoryBlockOpen {
                         }
                     },
                 )
-                return TryBlockResult.FAIL_NO_BOOSTER_COOKIE
-            }
-        }
-        return TryBlockResult.SUCCESS
+                TryBlockResult.FAIL_NO_BOOSTER_COOKIE
+            } ?: TryBlockResult.SUCCESS
+        } else if (config.hotChocolateMixinRequirement) {
+            val mixinExpiryTime = profileStorage?.chocolateFactory?.hotChocolateMixinExpiry ?: SimpleTimeMark.farPast()
+            val godPotExpiryTime = profileStorage?.godPotExpiryTime ?: SimpleTimeMark.farPast()
+            if (mixinExpiryTime.isInPast()) {
+                ChatUtils.clickToActionOrDisable(
+                    "§cBlocked opening the Chocolate Factory without a §dHot Chocolate Mix §cactive! " +
+                        "§7You may need to open §c/effects §7to refresh mixin status.",
+                    config::hotChocolateMixinRequirement,
+                    actionName = "search AH for mixin",
+                    action = { HypixelCommands.auctionSearch("hot chocolate mixin") },
+                )
+                TryBlockResult.FAIL_NO_MIXIN
+            } else if (godPotExpiryTime.isInPast()) {
+                ChatUtils.clickToActionOrDisable(
+                    "§cBlocked opening the Chocolate Factory without a §dGod Potion §cactive! " +
+                        "§7You may need to open §c/effects §7and cycle the §aFilter §7to §bGod Potion Effects §7to refresh potion status.",
+                    config::hotChocolateMixinRequirement,
+                    actionName = "search AH for god potion",
+                    action = { HypixelCommands.auctionSearch("god potion") },
+                )
+                TryBlockResult.FAIL_NO_MIXIN
+            } else TryBlockResult.SUCCESS
+        } else TryBlockResult.SUCCESS
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 3ece93a79af2..e86057af98be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -22,6 +22,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils.playPlingSound
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils
@@ -31,6 +32,7 @@ import at.hannibal2.skyhanni.utils.Timer
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
@@ -229,11 +231,20 @@ object NonGodPotEffectDisplay {
                     }
                     effectDuration[effect] = Timer(duration)
                     update()
+                    effect.updateCfBlock(duration)
                 }
             }
         }
     }
 
+    private fun NonGodPotEffect.updateCfBlock(duration: Duration) {
+        if (this != NonGodPotEffect.HOT_CHOCOLATE) return
+
+        val chocolateFactory = ProfileStorageData.profileSpecific?.chocolateFactory ?: return
+        val currentExpiry = chocolateFactory.hotChocolateMixinExpiry ?: SimpleTimeMark.now()
+        chocolateFactory.hotChocolateMixinExpiry = currentExpiry.plus(duration)
+    }
+
     // TODO use TablistFooterUpdateEvent instead
     @HandleEvent(onlyOnSkyblock = true, priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {

From 743152d3b85afb3fb71b27a5129be107336857f4 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:18:00 -0500
Subject: [PATCH 02/15] Update there too

---
 .../hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index e86057af98be..2e1dcf08665b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -267,6 +267,7 @@ object NonGodPotEffectDisplay {
                             val duration = TimeUtils.getDuration(string.split("§f")[1])
                             effectDuration[effect] = Timer(duration)
                             update()
+                            effect.updateCfBlock(duration)
                         } catch (e: IndexOutOfBoundsException) {
                             ChatUtils.debug("Error while reading non god pot effects from tab list! line: '$line'")
                         }

From fe4e7da498f99fe0776b9c9240285607a3e46e4c Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:26:49 -0500
Subject: [PATCH 03/15] Push

---
 .../chocolatefactory/ChocolateFactoryBlockOpen.kt          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 4c889a22682b..6de38cdf72d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -156,16 +156,15 @@ object ChocolateFactoryBlockOpen {
     fun onInventoryUpdated(event: InventoryUpdatedEvent) {
         if (!LorenzUtils.inSkyBlock || !event.isGodPotEffectsFilterSelect()) return
 
-        val potionLore = event.inventoryItems[10]?.getLore()
-        if (potionLore == null) {
+        val potionLore = event.inventoryItems[10]?.getLore() ?: run {
             // No active god pot effects found, reset the expiry time
             profileStorage?.godPotExpiryTime = SimpleTimeMark.farPast()
             return
         }
 
-        potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
+        profileStorage?.godPotExpiryTime = potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
             val expiryDuration = TimeUtils.getDuration(group("time"))
-            profileStorage?.godPotExpiryTime = SimpleTimeMark.now().plus(expiryDuration)
+            SimpleTimeMark.now().plus(expiryDuration)
         }
     }
 

From 93e063a184bf7212404db5a04b2b94b088912154 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:35:54 -0500
Subject: [PATCH 04/15] Sure

---
 .../chocolatefactory/ChocolateFactoryBlockOpen.kt        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 6de38cdf72d7..0b8c3a80a6ca 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -162,10 +162,11 @@ object ChocolateFactoryBlockOpen {
             return
         }
 
-        profileStorage?.godPotExpiryTime = potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
-            val expiryDuration = TimeUtils.getDuration(group("time"))
-            SimpleTimeMark.now().plus(expiryDuration)
-        }
+        val expiryDuration =potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
+            TimeUtils.getDuration(group("time"))
+        } ?: return
+
+        profileStorage?.godPotExpiryTime = SimpleTimeMark.now().plus(expiryDuration)
     }
 
     private fun InventoryUpdatedEvent.isGodPotEffectsFilterSelect(): Boolean =

From 4b649a2ab20a70c10a85b8fbf605159d1eae1004 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:36:41 -0500
Subject: [PATCH 05/15] +

---
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 0b8c3a80a6ca..c3bc2939375e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -166,7 +166,7 @@ object ChocolateFactoryBlockOpen {
             TimeUtils.getDuration(group("time"))
         } ?: return
 
-        profileStorage?.godPotExpiryTime = SimpleTimeMark.now().plus(expiryDuration)
+        profileStorage?.godPotExpiryTime = SimpleTimeMark.now() + expiryDuration
     }
 
     private fun InventoryUpdatedEvent.isGodPotEffectsFilterSelect(): Boolean =

From 871c9a8e01171c01bad2e907b8106027ab42dcb1 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:54:31 -0500
Subject: [PATCH 06/15] Detekt

---
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index c3bc2939375e..d8aa8ef5966e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -162,7 +162,7 @@ object ChocolateFactoryBlockOpen {
             return
         }
 
-        val expiryDuration =potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
+        val expiryDuration = potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
             TimeUtils.getDuration(group("time"))
         } ?: return
 

From f9b38308662c8c2086e82cccbbf525f293326a91 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 6 Dec 2024 08:31:48 -0500
Subject: [PATCH 07/15] Logical fix

---
 .../hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 2e1dcf08665b..610f903cf132 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -241,8 +241,7 @@ object NonGodPotEffectDisplay {
         if (this != NonGodPotEffect.HOT_CHOCOLATE) return
 
         val chocolateFactory = ProfileStorageData.profileSpecific?.chocolateFactory ?: return
-        val currentExpiry = chocolateFactory.hotChocolateMixinExpiry ?: SimpleTimeMark.now()
-        chocolateFactory.hotChocolateMixinExpiry = currentExpiry.plus(duration)
+        chocolateFactory.hotChocolateMixinExpiry = SimpleTimeMark.now() + duration
     }
 
     // TODO use TablistFooterUpdateEvent instead

From da3a05bc2df25ef7fbc0661963f163eec3a082cc Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:47:59 -0500
Subject: [PATCH 08/15] Requested changes

---
 .../events/EffectDurationChangeEvent.kt       |  17 +
 .../ChocolateFactoryBlockOpen.kt              | 137 +-------
 .../features/misc/NonGodPotEffectDisplay.kt   | 304 ------------------
 .../features/misc/effects/EffectAPI.kt        | 290 +++++++++++++++++
 .../misc/effects/NonGodPotEffectDisplay.kt    | 178 ++++++++++
 5 files changed, 502 insertions(+), 424 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
new file mode 100644
index 000000000000..f1a0328b5376
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
@@ -0,0 +1,17 @@
+package at.hannibal2.skyhanni.events
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.misc.effects.EffectAPI
+import kotlin.time.Duration
+
+class EffectDurationChangeEvent(
+    val effect: EffectAPI.NonGodPotEffect,
+    val durationChangeType: EffectDurationChangeType,
+    val duration: Duration? = null
+) : SkyHanniEvent()
+
+enum class EffectDurationChangeType {
+    ADD,
+    REMOVE,
+    SET
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index d8aa8ef5966e..9c5e67fd9671 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -1,27 +1,24 @@
 package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
-import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
-import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
-import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
+import at.hannibal2.skyhanni.features.misc.effects.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
-import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
-import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
-import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
@@ -31,6 +28,7 @@ object ChocolateFactoryBlockOpen {
     private val config get() = SkyHanniMod.feature.inventory.chocolateFactory
     private val profileStorage get() = ProfileStorageData.profileSpecific
 
+    // <editor-fold desc="Patterns">
     /**
      * REGEX-TEST: /cf
      * REGEX-TEST: /cf test
@@ -51,67 +49,21 @@ object ChocolateFactoryBlockOpen {
         "inventory.chocolatefactory.openitem",
         "§6(?:Open )?Chocolate Factory",
     )
+    // </editor-fold>
 
-    /**
-     * REGEX-TEST: §a§lSCHLURP! §r§eThe effects of the §r§9Hot Chocolate Mixin §r§ehave been extended by §r§986h 24m§r§e!
-     * They will pause if your §r§cGod Potion §r§eexpires.
-     */
-    private val hotChocolateMixinConsumePattern by RepoPattern.pattern(
-        "stats.chatpatterns.hotchocolatemixinconsume",
-        "(?:§.)+.*(?:§.)+Hot Chocolate Mixin ?(?:§.)+.*extended by (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
-    )
-
-    /**
-     * REGEX-TEST: §a§lGULP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
-     * REGEX-TEST: §a§lSIP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
-     * REGEX-TEST: §a§lSLURP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
-     */
-    private val godPotConsumePattern by RepoPattern.pattern(
-        "stats.chatpatterns.godpotconsume",
-        "(?:§.)+.*(?:§.)+God Potion ?(?:§.)+.*grants you powers for (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
-    )
-
-    /**
-     * REGEX-TEST: §cGod Potion§f: 4d
-     */
-    private val godPotTabPattern by RepoPattern.pattern(
-        "stats.tabpatterns.godpot",
-        "(?:§.)*God Potion(?:§.)*: (?:§.)*(?<time>[dhms0-9 ]+)(?:§.)*",
-    )
-
-    /**
-     * REGEX-TEST: (1/2) Active Effects
-     */
-    private val effectsInventoryPattern by RepoPattern.pattern(
-        "inventory.effects",
-        "(?:§.)?(?:[(\\d\\/)]* )?Active Effects",
-    )
-
-    /**
-     * REGEX-TEST: §aFilter
-     */
-    private val filterPattern by RepoPattern.pattern(
-        "inventory.effects.filter",
-        "§aFilter",
-    )
+    private var commandSentTimer = SimpleTimeMark.farPast()
 
-    /**
-     * REGEX-TEST: §b▶ God Potion Effects
-     */
-    private val godPotEffectsFilterSelectPattern by RepoPattern.pattern(
-        "inventory.effects.filtergodpotselect",
-        "§b▶ God Potion Effects",
-    )
+    @HandleEvent
+    fun onEffectUpdate(event: EffectDurationChangeEvent) {
+        if (event.effect != NonGodPotEffect.HOT_CHOCOLATE || event.duration == null) return
+        val chocolateFactory = profileStorage?.chocolateFactory ?: return
 
-    /**
-     * REGEX-TEST: §7Remaining: §f105:01:34
-     */
-    private val potionRemainingLoreTimerPattern by RepoPattern.pattern(
-        "inventory.effects.effecttimeleft",
-        "§7Remaining: §f(?<time>[\\d:]+)",
-    )
-
-    private var commandSentTimer = SimpleTimeMark.farPast()
+        chocolateFactory.hotChocolateMixinExpiry = when (event.durationChangeType) {
+            EffectDurationChangeType.ADD -> chocolateFactory.hotChocolateMixinExpiry + event.duration
+            EffectDurationChangeType.REMOVE -> SimpleTimeMark.farPast()
+            EffectDurationChangeType.SET -> SimpleTimeMark.now() + event.duration
+        }
+    }
 
     @SubscribeEvent
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
@@ -122,61 +74,6 @@ object ChocolateFactoryBlockOpen {
         if (checkIsBlocked()) event.cancel()
     }
 
-    @SubscribeEvent
-    fun onChat(event: LorenzChatEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        hotChocolateMixinConsumePattern.matchMatcher(event.message) {
-            val durationAdded = TimeUtils.getDuration(group("time"))
-            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
-            val existingValue = profileStorage?.chocolateFactory?.hotChocolateMixinExpiry
-            profileStorage?.chocolateFactory?.hotChocolateMixinExpiry =
-                existingValue?.let { it + durationAdded } ?: asTimeMark
-        }
-        godPotConsumePattern.matchMatcher(event.message) {
-            val durationAdded = TimeUtils.getDuration(group("time"))
-            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
-            val existingValue = profileStorage?.godPotExpiryTime
-            profileStorage?.godPotExpiryTime = existingValue?.let { it + durationAdded } ?: asTimeMark
-        }
-    }
-
-    @SubscribeEvent
-    fun onTabUpdate(event: TablistFooterUpdateEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        for (line in event.footer.split("\n")) {
-            godPotTabPattern.matchMatcher(line) {
-                val expiryDuration = TimeUtils.getDuration(group("time"))
-                val expiryTime = SimpleTimeMark.now().plus(expiryDuration)
-                profileStorage?.godPotExpiryTime = expiryTime
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
-        if (!LorenzUtils.inSkyBlock || !event.isGodPotEffectsFilterSelect()) return
-
-        val potionLore = event.inventoryItems[10]?.getLore() ?: run {
-            // No active god pot effects found, reset the expiry time
-            profileStorage?.godPotExpiryTime = SimpleTimeMark.farPast()
-            return
-        }
-
-        val expiryDuration = potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
-            TimeUtils.getDuration(group("time"))
-        } ?: return
-
-        profileStorage?.godPotExpiryTime = SimpleTimeMark.now() + expiryDuration
-    }
-
-    private fun InventoryUpdatedEvent.isGodPotEffectsFilterSelect(): Boolean =
-        effectsInventoryPattern.matches(this.inventoryName) &&
-            this.inventoryItems.values.firstOrNull {
-                filterPattern.matches(it.displayName)
-            }?.getLore()?.any {
-                godPotEffectsFilterSelectPattern.matches(it)
-            } ?: false
-
     @SubscribeEvent
     fun onCommandSend(event: MessageSendToServerEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
deleted file mode 100644
index 610f903cf132..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ /dev/null
@@ -1,304 +0,0 @@
-package at.hannibal2.skyhanni.features.misc
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.api.event.HandleEvent
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
-import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
-import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
-import at.hannibal2.skyhanni.features.rift.RiftAPI
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
-import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SoundUtils.playPlingSound
-import at.hannibal2.skyhanni.utils.TimeUnit
-import at.hannibal2.skyhanni.utils.TimeUtils
-import at.hannibal2.skyhanni.utils.TimeUtils.format
-import at.hannibal2.skyhanni.utils.TimeUtils.timerColor
-import at.hannibal2.skyhanni.utils.Timer
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.hours
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
-
-@SkyHanniModule
-object NonGodPotEffectDisplay {
-
-    private val config get() = SkyHanniMod.feature.misc.potionEffect
-    private var checkFooter = false
-    private val effectDuration = mutableMapOf<NonGodPotEffect, Timer>()
-    private var display = emptyList<String>()
-
-    // TODO move the whole list into the repo
-    enum class NonGodPotEffect(
-        val tabListName: String,
-        val isMixin: Boolean = false,
-        val inventoryItemName: String = tabListName,
-    ) {
-
-        SMOLDERING("§aSmoldering Polarization I"),
-        GLOWY("§2Mushed Glowy Tonic I"),
-        WISP("§bWisp's Ice-Flavored Water I"),
-        GOBLIN("§2King's Scent I"),
-
-        INVISIBILITY("§8Invisibility I"), // when wearing sorrow armor
-
-        REV("§cZombie Brain Mixin", true),
-        TARA("§6Spider Egg Mixin", true),
-        SVEN("§bWolf Fur Mixin", true),
-        VOID("§6Ender Portal Fumes", true),
-        BLAZE("§fGabagoey", true),
-        GLOWING_MUSH("§2Glowing Mush Mixin", true),
-        HOT_CHOCOLATE("§6Hot Chocolate Mixin", true),
-
-        DEEP_TERROR("§4Deepterror", true),
-
-        GREAT_SPOOK("§fGreat Spook I", inventoryItemName = "§fGreat Spook Potion"),
-
-        HARVEST_HARBINGER("§6Harvest Harbinger V"),
-
-        PEST_REPELLENT("§6Pest Repellent I§r"),
-        PEST_REPELLENT_MAX("§6Pest Repellent II"),
-
-        CURSE_OF_GREED("§4Curse of Greed I"),
-
-        COLD_RESISTANCE_4("§bCold Resistance IV"),
-
-        POWDER_PUMPKIN("§fPowder Pumpkin I"),
-        FILET_O_FORTUNE("§fFilet O' Fortune I"),
-        CHILLED_PRISTINE_POTATO("§fChilled Pristine Potato I"),
-    }
-
-    private val effectsCountPattern by RepoPattern.pattern(
-        "misc.nongodpot.effects",
-        "§7You have §e(?<name>\\d+) §7non-god effects\\.",
-    )
-    private var totalEffectsCount = 0
-
-    @SubscribeEvent
-    fun onProfileJoin(event: ProfileJoinEvent) {
-        effectDuration.clear()
-        display = emptyList()
-    }
-
-    // todo : cleanup and add support for poison candy I, and add support for splash / other formats
-    @SubscribeEvent
-    @Suppress("MaxLineLength")
-    fun onChat(event: LorenzChatEvent) {
-        if (event.message == "§aYou cleared all of your active effects!") {
-            effectDuration.clear()
-            update()
-        }
-
-        if (event.message == "§aYou ate a §r§aRe-heated Gummy Polar Bear§r§a!") {
-            effectDuration[NonGodPotEffect.SMOLDERING] = Timer(1.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou have gained §r§2Mushed Glowy Tonic I§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.GLOWY] = Timer(1.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou splashed yourself with §r§bWisp's Ice-Flavored Water I§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.WISP] = Timer(5.minutes)
-            update()
-        }
-
-        if (event.message == "§eYou consumed a §r§fGreat Spook Potion§r§e!") {
-            effectDuration[NonGodPotEffect.GREAT_SPOOK] = Timer(24.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou have gained §r§6Harvest Harbinger V§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.HARVEST_HARBINGER] = Timer(25.minutes)
-            update()
-        }
-
-        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a2x §r§7less while you break crops for the next §r§a60m§r§7!") {
-            effectDuration[NonGodPotEffect.PEST_REPELLENT] = Timer(1.hours)
-        }
-
-        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a4x §r§7less while you break crops for the next §r§a60m§r§7!") {
-            effectDuration[NonGodPotEffect.PEST_REPELLENT_MAX] = Timer(1.hours)
-        }
-
-        if (event.message == "§e[NPC] §6King Yolkar§f: §rThese eggs will help me stomach my pain.") {
-            effectDuration[NonGodPotEffect.GOBLIN] = Timer(20.minutes)
-            update()
-        }
-
-        if (event.message == "§cThe Goblin King's §r§afoul stench §r§chas dissipated!") {
-            effectDuration.remove(NonGodPotEffect.GOBLIN)
-            update()
-        }
-    }
-
-    private fun update() {
-        if (effectDuration.values.removeIf { it.ended }) {
-            // to fetch the real amount of active pots
-            totalEffectsCount = 0
-            checkFooter = true
-        }
-
-        display = drawDisplay()
-    }
-
-    private fun drawDisplay(): MutableList<String> {
-        val newDisplay = mutableListOf<String>()
-        for ((effect, time) in effectDuration.sorted()) {
-            if (time.ended) continue
-            if (effect == NonGodPotEffect.INVISIBILITY) continue
-
-            if (effect.isMixin && !config.nonGodPotEffectShowMixins) continue
-
-            val remaining = time.remaining.coerceAtLeast(0.seconds)
-            val format = remaining.format(TimeUnit.HOUR)
-            val color = remaining.timerColor()
-
-            val displayName = effect.tabListName
-            newDisplay.add("$displayName $color$format")
-        }
-        val diff = totalEffectsCount - effectDuration.size
-        if (diff > 0) {
-            newDisplay.add("§eOpen the /effects inventory")
-            newDisplay.add("§eto show the missing $diff effects!")
-            checkFooter = true
-        }
-        return newDisplay
-    }
-
-    @SubscribeEvent
-    fun onSecondPassed(event: SecondPassedEvent) {
-        if (!isEnabled()) return
-        if (!ProfileStorageData.loaded) return
-
-        if (config.nonGodPotEffectDisplay) update()
-
-        val effectWarning = config.expireWarning
-        val effectSound = config.expireSound
-
-        if (!effectWarning && !effectSound) return
-
-        effectDuration.sorted().forEach { (effect, time) ->
-            if (time.remaining.inWholeSeconds != config.expireWarnTime.toLong()) return
-
-            if (effectWarning) LorenzUtils.sendTitle(effect.tabListName, 3.seconds)
-            if (effectSound) repeat(5) { playPlingSound() }
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        checkFooter = true
-    }
-
-    @SubscribeEvent
-    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!event.inventoryName.endsWith("Active Effects")) return
-
-        for (stack in event.inventoryItems.values) {
-            val name = stack.name
-            for (effect in NonGodPotEffect.entries) {
-                if (!name.contains(effect.inventoryItemName)) continue
-                for (line in stack.getLore()) {
-                    if (!line.contains("Remaining") || line == "§7Time Remaining: §aCompleted!" || line.contains("Remaining Uses")) continue
-                    val duration = try {
-                        TimeUtils.getDuration(line.split("§f")[1])
-                    } catch (e: IndexOutOfBoundsException) {
-                        ErrorManager.logErrorWithData(
-                            e, "Error while reading Non God-Potion effects from tab list",
-                            "line" to line,
-                        )
-                        continue
-                    }
-                    effectDuration[effect] = Timer(duration)
-                    update()
-                    effect.updateCfBlock(duration)
-                }
-            }
-        }
-    }
-
-    private fun NonGodPotEffect.updateCfBlock(duration: Duration) {
-        if (this != NonGodPotEffect.HOT_CHOCOLATE) return
-
-        val chocolateFactory = ProfileStorageData.profileSpecific?.chocolateFactory ?: return
-        chocolateFactory.hotChocolateMixinExpiry = SimpleTimeMark.now() + duration
-    }
-
-    // TODO use TablistFooterUpdateEvent instead
-    @HandleEvent(onlyOnSkyblock = true, priority = HandleEvent.LOW, receiveCancelled = true)
-    fun onPacketReceive(event: PacketReceivedEvent) {
-        val packet = event.packet
-        if (!checkFooter) return
-        if (packet is S47PacketPlayerListHeaderFooter) {
-            val formattedText = packet.footer.formattedText
-            val lines = formattedText.replace("§r", "").split("\n")
-
-            if (!lines.any { it.contains("§a§lActive Effects") }) return
-            checkFooter = false
-
-            var effectsCount = 0
-            for (line in lines) {
-                for (effect in NonGodPotEffect.entries) {
-                    val tabListName = effect.tabListName
-                    if ("$line§r".startsWith(tabListName)) {
-                        val string = line.substring(tabListName.length)
-                        try {
-                            val duration = TimeUtils.getDuration(string.split("§f")[1])
-                            effectDuration[effect] = Timer(duration)
-                            update()
-                            effect.updateCfBlock(duration)
-                        } catch (e: IndexOutOfBoundsException) {
-                            ChatUtils.debug("Error while reading non god pot effects from tab list! line: '$line'")
-                        }
-                    }
-                }
-                effectsCountPattern.matchMatcher(line) {
-                    val group = group("name")
-                    effectsCount = group.toInt()
-                }
-            }
-            totalEffectsCount = effectsCount
-        }
-    }
-
-    @SubscribeEvent
-    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
-        if (!isEnabled() || !config.nonGodPotEffectDisplay) return
-        if (RiftAPI.inRift()) return
-
-        config.nonGodPotEffectPos.renderStrings(
-            display,
-            extraSpace = 3,
-            posLabel = "Non God Pot Effects",
-        )
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(3, "misc.nonGodPotEffectDisplay", "misc.potionEffect.nonGodPotEffectDisplay")
-        event.move(3, "misc.nonGodPotEffectShowMixins", "misc.potionEffect.nonGodPotEffectShowMixins")
-        event.move(3, "misc.nonGodPotEffectPos", "misc.potionEffect.nonGodPotEffectPos")
-    }
-
-    private fun isEnabled() = LorenzUtils.inSkyBlock && !DungeonAPI.inDungeon() && !LorenzUtils.inKuudraFight
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
new file mode 100644
index 000000000000..510a9e81b1ad
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
@@ -0,0 +1,290 @@
+package at.hannibal2.skyhanni.features.misc.effects
+
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.EffectDurationChangeType
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+
+@SkyHanniModule
+object EffectAPI {
+
+    // <editor-fold desc="Patterns">
+    /**
+     * REGEX-TEST: §cGod Potion§f: 4d
+     */
+    private val godPotTabPattern by RepoPattern.pattern(
+        "stats.tabpatterns.godpot",
+        "(?:§.)*God Potion(?:§.)*: (?:§.)*(?<time>[dhms0-9 ]+)(?:§.)*",
+    )
+
+    /**
+     * REGEX-TEST: §a§lSCHLURP! §r§eThe effects of the §r§9Hot Chocolate Mixin §r§ehave been extended by §r§986h 24m§r§e!
+     * They will pause if your §r§cGod Potion §r§eexpires.
+     */
+    private val hotChocolateMixinConsumePattern by RepoPattern.pattern(
+        "stats.chatpatterns.hotchocolatemixinconsume",
+        "(?:§.)+.*(?:§.)+Hot Chocolate Mixin ?(?:§.)+.*extended by (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
+    )
+
+    /**
+     * REGEX-TEST: §a§lGULP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     * REGEX-TEST: §a§lSIP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     * REGEX-TEST: §a§lSLURP! §r§eThe §r§cGod Potion §r§egrants you powers for §r§928h 48m§r§e!
+     */
+    private val godPotConsumePattern by RepoPattern.pattern(
+        "stats.chatpatterns.godpotconsume",
+        "(?:§.)+.*(?:§.)+God Potion ?(?:§.)+.*grants you powers for (?:§.)+(?<time>[dhms0-9 ]*)(?:§.)+!.*",
+    )
+
+    /**
+     * REGEX-TEST: (1/2) Active Effects
+     */
+    private val effectsInventoryPattern by RepoPattern.pattern(
+        "inventory.effects",
+        "(?:§.)?(?:[(\\d\\/)]* )?Active Effects",
+    )
+
+    /**
+     * REGEX-TEST: §aFilter
+     */
+    private val filterPattern by RepoPattern.pattern(
+        "inventory.effects.filter",
+        "§aFilter",
+    )
+
+    /**
+     * REGEX-TEST: §b▶ God Potion Effects
+     */
+    private val godPotEffectsFilterSelectPattern by RepoPattern.pattern(
+        "inventory.effects.filtergodpotselect",
+        "§b▶ God Potion Effects",
+    )
+
+    /**
+     * REGEX-TEST: §7Remaining: §f105:01:34
+     */
+    private val potionRemainingLoreTimerPattern by RepoPattern.pattern(
+        "inventory.effects.effecttimeleft",
+        "§7Remaining: §f(?<time>[\\d:]+)",
+    )
+    // </editor-fold>
+
+    private val profileStorage get() = ProfileStorageData.profileSpecific
+
+    // TODO move the whole list into the repo
+    enum class NonGodPotEffect(
+        val tabListName: String,
+        val isMixin: Boolean = false,
+        val inventoryItemName: String = tabListName,
+    ) {
+
+        SMOLDERING("§aSmoldering Polarization I"),
+        GLOWY("§2Mushed Glowy Tonic I"),
+        WISP("§bWisp's Ice-Flavored Water I"),
+        GOBLIN("§2King's Scent I"),
+
+        INVISIBILITY("§8Invisibility I"), // when wearing sorrow armor
+
+        REV("§cZombie Brain Mixin", true),
+        TARA("§6Spider Egg Mixin", true),
+        SVEN("§bWolf Fur Mixin", true),
+        VOID("§6Ender Portal Fumes", true),
+        BLAZE("§fGabagoey", true),
+        GLOWING_MUSH("§2Glowing Mush Mixin", true),
+        HOT_CHOCOLATE("§6Hot Chocolate Mixin", true),
+
+        DEEP_TERROR("§4Deepterror", true),
+
+        GREAT_SPOOK("§fGreat Spook I", inventoryItemName = "§fGreat Spook Potion"),
+
+        HARVEST_HARBINGER("§6Harvest Harbinger V"),
+
+        PEST_REPELLENT("§6Pest Repellent I§r"),
+        PEST_REPELLENT_MAX("§6Pest Repellent II"),
+
+        CURSE_OF_GREED("§4Curse of Greed I"),
+
+        COLD_RESISTANCE_4("§bCold Resistance IV"),
+
+        POWDER_PUMPKIN("§fPowder Pumpkin I"),
+        FILET_O_FORTUNE("§fFilet O' Fortune I"),
+        CHILLED_PRISTINE_POTATO("§fChilled Pristine Potato I"),
+    }
+
+    // Todo : cleanup and add support for poison candy I, and add support for splash / other formats
+    @SubscribeEvent
+    @Suppress("MaxLineLength")
+    fun onChat(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        hotChocolateMixinConsumePattern.matchMatcher(event.message) {
+            val durationAdded = TimeUtils.getDuration(group("time"))
+            EffectDurationChangeEvent(
+                NonGodPotEffect.HOT_CHOCOLATE,
+                EffectDurationChangeType.ADD,
+                durationAdded,
+            ).post()
+        }
+        godPotConsumePattern.matchMatcher(event.message) {
+            val durationAdded = TimeUtils.getDuration(group("time"))
+            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
+            val existingValue = profileStorage?.godPotExpiryTime
+            profileStorage?.godPotExpiryTime = existingValue?.let { it + durationAdded } ?: asTimeMark
+        }
+
+        var effect: NonGodPotEffect? = null
+        var changeType: EffectDurationChangeType? = null
+        var duration: Duration? = null
+
+        if (event.message == "§aYou ate a §r§aRe-heated Gummy Polar Bear§r§a!") {
+            effect = NonGodPotEffect.SMOLDERING
+            changeType = EffectDurationChangeType.SET
+            duration = 1.hours
+        }
+
+        if (event.message == "§a§lBUFF! §fYou have gained §r§2Mushed Glowy Tonic I§r§f! Press TAB or type /effects to view your active effects!") {
+            effect = NonGodPotEffect.GLOWY
+            changeType = EffectDurationChangeType.SET
+            duration = 1.hours
+        }
+
+        if (event.message == "§a§lBUFF! §fYou splashed yourself with §r§bWisp's Ice-Flavored Water I§r§f! Press TAB or type /effects to view your active effects!") {
+            effect = NonGodPotEffect.WISP
+            changeType = EffectDurationChangeType.SET
+            duration = 5.minutes
+        }
+
+        if (event.message == "§eYou consumed a §r§fGreat Spook Potion§r§e!") {
+            effect = NonGodPotEffect.GREAT_SPOOK
+            changeType = EffectDurationChangeType.SET
+            duration = 24.hours
+        }
+
+        if (event.message == "§a§lBUFF! §fYou have gained §r§6Harvest Harbinger V§r§f! Press TAB or type /effects to view your active effects!") {
+            effect = NonGodPotEffect.HARVEST_HARBINGER
+            changeType = EffectDurationChangeType.SET
+            duration = 25.minutes
+        }
+
+        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a2x §r§7less while you break crops for the next §r§a60m§r§7!") {
+            effect = NonGodPotEffect.PEST_REPELLENT
+            changeType = EffectDurationChangeType.SET
+            duration = 1.hours
+        }
+
+        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a4x §r§7less while you break crops for the next §r§a60m§r§7!") {
+            effect = NonGodPotEffect.PEST_REPELLENT_MAX
+            changeType = EffectDurationChangeType.SET
+            duration = 1.hours
+        }
+
+        if (event.message == "§e[NPC] §6King Yolkar§f: §rThese eggs will help me stomach my pain.") {
+            effect = NonGodPotEffect.CURSE_OF_GREED
+            changeType = EffectDurationChangeType.SET
+            duration = 20.minutes
+        }
+
+        if (event.message == "§cThe Goblin King's §r§afoul stench §r§chas dissipated!") {
+            effect = NonGodPotEffect.GOBLIN
+            changeType = EffectDurationChangeType.REMOVE
+        }
+
+        effect?.let {
+            if (changeType == null) return@let
+            EffectDurationChangeEvent(it, changeType, duration).post()
+        }
+    }
+
+    @SubscribeEvent
+    fun onTabUpdate(event: TablistFooterUpdateEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        for (line in event.footer.split("\n")) {
+            godPotTabPattern.matchMatcher(line) {
+                val expiryDuration = TimeUtils.getDuration(group("time"))
+                val expiryTime = SimpleTimeMark.now().plus(expiryDuration)
+                profileStorage?.godPotExpiryTime = expiryTime
+            }
+            for (effect in NonGodPotEffect.entries) {
+                val tabListName = effect.tabListName
+                if ("$line§r".startsWith(tabListName)) {
+                    val string = line.substring(tabListName.length)
+                    try {
+                        val duration = TimeUtils.getDuration(string.split("§f")[1])
+                        EffectDurationChangeEvent(effect, EffectDurationChangeType.SET, duration).post()
+                    } catch (e: IndexOutOfBoundsException) {
+                        ChatUtils.debug("Error while reading non god pot effects from tab list! line: '$line'")
+                    }
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
+        if (!LorenzUtils.inSkyBlock || !event.isGodPotEffectsFilterSelect()) return
+
+        val potionLore = event.inventoryItems[10]?.getLore() ?: run {
+            // No active god pot effects found, reset the expiry time
+            profileStorage?.godPotExpiryTime = SimpleTimeMark.farPast()
+            return
+        }
+
+        val expiryDuration = potionRemainingLoreTimerPattern.firstMatcher(potionLore) {
+            TimeUtils.getDuration(group("time"))
+        } ?: return
+
+        profileStorage?.godPotExpiryTime = SimpleTimeMark.now() + expiryDuration
+    }
+
+    private fun InventoryUpdatedEvent.isGodPotEffectsFilterSelect(): Boolean =
+        effectsInventoryPattern.matches(this.inventoryName) &&
+            this.inventoryItems.values.firstOrNull {
+                filterPattern.matches(it.displayName)
+            }?.getLore()?.any {
+                godPotEffectsFilterSelectPattern.matches(it)
+            } ?: false
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!event.inventoryName.endsWith("Active Effects")) return
+
+        for (stack in event.inventoryItems.values) {
+            val name = stack.name
+            for (effect in NonGodPotEffect.entries) {
+                if (!name.contains(effect.inventoryItemName)) continue
+                for (line in stack.getLore()) {
+                    if (!line.contains("Remaining") || line == "§7Time Remaining: §aCompleted!" || line.contains("Remaining Uses")) continue
+                    val duration = try {
+                        TimeUtils.getDuration(line.split("§f")[1])
+                    } catch (e: IndexOutOfBoundsException) {
+                        ErrorManager.logErrorWithData(
+                            e, "Error while reading Non God-Potion effects from tab list",
+                            "line" to line,
+                        )
+                        continue
+                    }
+                    EffectDurationChangeEvent(effect, EffectDurationChangeType.SET, duration).post()
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
new file mode 100644
index 000000000000..68d1d3ddd3b8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -0,0 +1,178 @@
+package at.hannibal2.skyhanni.features.misc.effects
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.EffectDurationChangeType
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
+import at.hannibal2.skyhanni.features.misc.effects.EffectAPI.NonGodPotEffect
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.SoundUtils.playPlingSound
+import at.hannibal2.skyhanni.utils.TimeUnit
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.TimeUtils.timerColor
+import at.hannibal2.skyhanni.utils.Timer
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object NonGodPotEffectDisplay {
+
+    private val config get() = SkyHanniMod.feature.misc.potionEffect
+    private var checkFooter = false
+    private val effectDuration = mutableMapOf<NonGodPotEffect, Timer>()
+    private var display = emptyList<String>()
+
+    private val effectsCountPattern by RepoPattern.pattern(
+        "misc.nongodpot.effects",
+        "§7You have §e(?<name>\\d+) §7non-god effects\\.",
+    )
+    private var totalEffectsCount = 0
+
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        effectDuration.clear()
+        display = emptyList()
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (event.message == "§aYou cleared all of your active effects!") {
+            effectDuration.clear()
+            update()
+        }
+    }
+
+    @HandleEvent
+    fun onEffectUpdate(event: EffectDurationChangeEvent) {
+        when (event.durationChangeType) {
+            EffectDurationChangeType.ADD -> {
+                event.duration?.let {
+                    val existing = effectDuration[event.effect]?.duration ?: Duration.ZERO
+                    effectDuration[event.effect] = Timer(existing + it)
+                }
+            }
+            EffectDurationChangeType.SET -> {
+                event.duration?.let {
+                    effectDuration[event.effect] = Timer(it)
+                }
+            }
+            EffectDurationChangeType.REMOVE -> {
+                effectDuration.remove(event.effect)
+            }
+        }
+        update()
+    }
+
+    private fun update() {
+        if (effectDuration.values.removeIf { it.ended }) {
+            // to fetch the real amount of active pots
+            totalEffectsCount = 0
+            checkFooter = true
+        }
+
+        display = drawDisplay()
+    }
+
+    private fun drawDisplay(): MutableList<String> {
+        val newDisplay = mutableListOf<String>()
+        for ((effect, time) in effectDuration.sorted()) {
+            if (time.ended) continue
+            if (effect == NonGodPotEffect.INVISIBILITY) continue
+
+            if (effect.isMixin && !config.nonGodPotEffectShowMixins) continue
+
+            val remaining = time.remaining.coerceAtLeast(0.seconds)
+            val format = remaining.format(TimeUnit.HOUR)
+            val color = remaining.timerColor()
+
+            val displayName = effect.tabListName
+            newDisplay.add("$displayName $color$format")
+        }
+        val diff = totalEffectsCount - effectDuration.size
+        if (diff > 0) {
+            newDisplay.add("§eOpen the /effects inventory")
+            newDisplay.add("§eto show the missing $diff effects!")
+            checkFooter = true
+        }
+        return newDisplay
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        if (!ProfileStorageData.loaded) return
+
+        if (config.nonGodPotEffectDisplay) update()
+
+        val effectWarning = config.expireWarning
+        val effectSound = config.expireSound
+
+        if (!effectWarning && !effectSound) return
+
+        effectDuration.sorted().forEach { (effect, time) ->
+            if (time.remaining.inWholeSeconds != config.expireWarnTime.toLong()) return
+
+            if (effectWarning) LorenzUtils.sendTitle(effect.tabListName, 3.seconds)
+            if (effectSound) repeat(5) { playPlingSound() }
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        checkFooter = true
+    }
+
+    @SubscribeEvent
+    fun onTabUpdate(event: TablistFooterUpdateEvent) {
+        if (!LorenzUtils.inSkyBlock || !checkFooter) return
+        val lines = event.footer.split("\n")
+        if (!lines.any { it.contains("§a§lActive Effects") }) return
+
+        checkFooter = false
+        var effectsCount = 0
+        for (line in lines) {
+            effectsCountPattern.matchMatcher(line) {
+                val group = group("name")
+                effectsCount = group.toInt()
+            }
+        }
+        totalEffectsCount = effectsCount
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled() || !config.nonGodPotEffectDisplay) return
+        if (RiftAPI.inRift()) return
+
+        config.nonGodPotEffectPos.renderStrings(
+            display,
+            extraSpace = 3,
+            posLabel = "Non God Pot Effects",
+        )
+    }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(3, "misc.nonGodPotEffectDisplay", "misc.potionEffect.nonGodPotEffectDisplay")
+        event.move(3, "misc.nonGodPotEffectShowMixins", "misc.potionEffect.nonGodPotEffectShowMixins")
+        event.move(3, "misc.nonGodPotEffectPos", "misc.potionEffect.nonGodPotEffectPos")
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && !DungeonAPI.inDungeon() && !LorenzUtils.inKuudraFight
+}

From ab3b58aca9730e5d8678c20266e7738fd11ebfdc Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:18:24 -0500
Subject: [PATCH 09/15] Imps

---
 .../skyhanni/features/misc/effects/EffectAPI.kt          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
index 510a9e81b1ad..dc16fc6bbd19 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
@@ -145,9 +145,8 @@ object EffectAPI {
         }
         godPotConsumePattern.matchMatcher(event.message) {
             val durationAdded = TimeUtils.getDuration(group("time"))
-            val asTimeMark = SimpleTimeMark.now().plus(durationAdded)
-            val existingValue = profileStorage?.godPotExpiryTime
-            profileStorage?.godPotExpiryTime = existingValue?.let { it + durationAdded } ?: asTimeMark
+            val existingValue = profileStorage?.godPotExpiryTime?.takeIfInitialized() ?: SimpleTimeMark.now()
+            profileStorage?.godPotExpiryTime = existingValue + durationAdded
         }
 
         var effect: NonGodPotEffect? = null
@@ -218,9 +217,7 @@ object EffectAPI {
         if (!LorenzUtils.inSkyBlock) return
         for (line in event.footer.split("\n")) {
             godPotTabPattern.matchMatcher(line) {
-                val expiryDuration = TimeUtils.getDuration(group("time"))
-                val expiryTime = SimpleTimeMark.now().plus(expiryDuration)
-                profileStorage?.godPotExpiryTime = expiryTime
+                profileStorage?.godPotExpiryTime = SimpleTimeMark.now() + TimeUtils.getDuration(group("time"))
             }
             for (effect in NonGodPotEffect.entries) {
                 val tabListName = effect.tabListName

From 68d110ddac5e7053c0417c6993d603909321ca97 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 9 Dec 2024 07:42:44 -0500
Subject: [PATCH 10/15] Refactor to API

---
 .../skyhanni/{features/misc/effects => api}/EffectAPI.kt        | 2 +-
 .../at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt   | 2 +-
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt     | 2 +-
 .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/{features/misc/effects => api}/EffectAPI.kt (99%)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
similarity index 99%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
rename to src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
index dc16fc6bbd19..9584a8c0cfad 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/EffectAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.misc.effects
+package at.hannibal2.skyhanni.api
 
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
index f1a0328b5376..2a6de4f1c0be 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
-import at.hannibal2.skyhanni.features.misc.effects.EffectAPI
+import at.hannibal2.skyhanni.api.EffectAPI
 import kotlin.time.Duration
 
 class EffectDurationChangeEvent(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 9c5e67fd9671..460c2fb38508 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.events.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
-import at.hannibal2.skyhanni.features.misc.effects.EffectAPI.NonGodPotEffect
+import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index 68d1d3ddd3b8..82131c3494f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
-import at.hannibal2.skyhanni.features.misc.effects.EffectAPI.NonGodPotEffect
+import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted

From 40c0ec2b4ae1e5c5bed2974c01850f3d9b870dca Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:03:41 -0500
Subject: [PATCH 11/15] Detekt

---
 .../at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt | 2 +-
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt   | 2 +-
 .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
index 2a6de4f1c0be..bc005c1b674a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.api.EffectAPI
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import kotlin.time.Duration
 
 class EffectDurationChangeEvent(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 460c2fb38508..654011420bcc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandGraphs
@@ -11,7 +12,6 @@ import at.hannibal2.skyhanni.events.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
-import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index 82131c3494f1..ad70fbe1fb11 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc.effects
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ProfileStorageData
@@ -13,7 +14,6 @@ import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
-import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
@@ -67,11 +67,13 @@ object NonGodPotEffectDisplay {
                     effectDuration[event.effect] = Timer(existing + it)
                 }
             }
+
             EffectDurationChangeType.SET -> {
                 event.duration?.let {
                     effectDuration[event.effect] = Timer(it)
                 }
             }
+
             EffectDurationChangeType.REMOVE -> {
                 effectDuration.remove(event.effect)
             }

From 13f28e037d62d4f6c3f7b841d3bde4244a9ff5b2 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:48:35 -0500
Subject: [PATCH 12/15] Fixes

---
 .../at/hannibal2/skyhanni/api/EffectAPI.kt    |   3 +-
 .../features/misc/NonGodPotEffectDisplay.kt   | 293 ------------------
 .../misc/effects/NonGodPotEffectDisplay.kt    |   4 +-
 3 files changed, 4 insertions(+), 296 deletions(-)
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
index 9584a8c0cfad..fd106579930c 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.api
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
 import at.hannibal2.skyhanni.events.EffectDurationChangeType
@@ -212,7 +213,7 @@ object EffectAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onTabUpdate(event: TablistFooterUpdateEvent) {
         if (!LorenzUtils.inSkyBlock) return
         for (line in event.footer.split("\n")) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
deleted file mode 100644
index 31efab14d9d4..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ /dev/null
@@ -1,293 +0,0 @@
-package at.hannibal2.skyhanni.features.misc
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.api.event.HandleEvent
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
-import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
-import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
-import at.hannibal2.skyhanni.features.rift.RiftAPI
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
-import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.SoundUtils.playPlingSound
-import at.hannibal2.skyhanni.utils.TimeUnit
-import at.hannibal2.skyhanni.utils.TimeUtils
-import at.hannibal2.skyhanni.utils.TimeUtils.format
-import at.hannibal2.skyhanni.utils.TimeUtils.timerColor
-import at.hannibal2.skyhanni.utils.Timer
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.hours
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
-
-@SkyHanniModule
-object NonGodPotEffectDisplay {
-
-    private val config get() = SkyHanniMod.feature.misc.potionEffect
-    private var checkFooter = false
-    private val effectDuration = mutableMapOf<NonGodPotEffect, Timer>()
-    private var display = emptyList<String>()
-
-    // TODO move the whole list into the repo
-    enum class NonGodPotEffect(
-        val tabListName: String,
-        val isMixin: Boolean = false,
-        val inventoryItemName: String = tabListName,
-    ) {
-
-        SMOLDERING("§aSmoldering Polarization I"),
-        GLOWY("§2Mushed Glowy Tonic I"),
-        WISP("§bWisp's Ice-Flavored Water I"),
-        GOBLIN("§2King's Scent I"),
-
-        INVISIBILITY("§8Invisibility I"), // when wearing sorrow armor
-
-        REV("§cZombie Brain Mixin", true),
-        TARA("§6Spider Egg Mixin", true),
-        SVEN("§bWolf Fur Mixin", true),
-        VOID("§6Ender Portal Fumes", true),
-        BLAZE("§fGabagoey", true),
-        GLOWING_MUSH("§2Glowing Mush Mixin", true),
-        HOT_CHOCOLATE("§6Hot Chocolate Mixin", true),
-
-        DEEP_TERROR("§4Deepterror", true),
-
-        GREAT_SPOOK("§fGreat Spook I", inventoryItemName = "§fGreat Spook Potion"),
-
-        HARVEST_HARBINGER("§6Harvest Harbinger V"),
-
-        PEST_REPELLENT("§6Pest Repellent I§r"),
-        PEST_REPELLENT_MAX("§6Pest Repellent II"),
-
-        CURSE_OF_GREED("§4Curse of Greed I"),
-
-        COLD_RESISTANCE_4("§bCold Resistance IV"),
-
-        POWDER_PUMPKIN("§fPowder Pumpkin I"),
-        FILET_O_FORTUNE("§fFilet O' Fortune I"),
-        CHILLED_PRISTINE_POTATO("§fChilled Pristine Potato I"),
-    }
-
-    private val effectsCountPattern by RepoPattern.pattern(
-        "misc.nongodpot.effects",
-        "§7You have §e(?<name>\\d+) §7non-god effects\\.",
-    )
-    private var totalEffectsCount = 0
-
-    @HandleEvent
-    fun onProfileJoin(event: ProfileJoinEvent) {
-        effectDuration.clear()
-        display = emptyList()
-    }
-
-    // todo : cleanup and add support for poison candy I, and add support for splash / other formats
-    @SubscribeEvent
-    @Suppress("MaxLineLength")
-    fun onChat(event: LorenzChatEvent) {
-        if (event.message == "§aYou cleared all of your active effects!") {
-            effectDuration.clear()
-            update()
-        }
-
-        if (event.message == "§aYou ate a §r§aRe-heated Gummy Polar Bear§r§a!") {
-            effectDuration[NonGodPotEffect.SMOLDERING] = Timer(1.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou have gained §r§2Mushed Glowy Tonic I§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.GLOWY] = Timer(1.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou splashed yourself with §r§bWisp's Ice-Flavored Water I§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.WISP] = Timer(5.minutes)
-            update()
-        }
-
-        if (event.message == "§eYou consumed a §r§fGreat Spook Potion§r§e!") {
-            effectDuration[NonGodPotEffect.GREAT_SPOOK] = Timer(24.hours)
-            update()
-        }
-
-        if (event.message == "§a§lBUFF! §fYou have gained §r§6Harvest Harbinger V§r§f! Press TAB or type /effects to view your active effects!") {
-            effectDuration[NonGodPotEffect.HARVEST_HARBINGER] = Timer(25.minutes)
-            update()
-        }
-
-        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a2x §r§7less while you break crops for the next §r§a60m§r§7!") {
-            effectDuration[NonGodPotEffect.PEST_REPELLENT] = Timer(1.hours)
-        }
-
-        if (event.message == "§a§lYUM! §r§6Pests §r§7will now spawn §r§a4x §r§7less while you break crops for the next §r§a60m§r§7!") {
-            effectDuration[NonGodPotEffect.PEST_REPELLENT_MAX] = Timer(1.hours)
-        }
-
-        if (event.message == "§e[NPC] §6King Yolkar§f: §rThese eggs will help me stomach my pain.") {
-            effectDuration[NonGodPotEffect.GOBLIN] = Timer(20.minutes)
-            update()
-        }
-
-        if (event.message == "§cThe Goblin King's §r§afoul stench §r§chas dissipated!") {
-            effectDuration.remove(NonGodPotEffect.GOBLIN)
-            update()
-        }
-    }
-
-    private fun update() {
-        if (effectDuration.values.removeIf { it.ended }) {
-            // to fetch the real amount of active pots
-            totalEffectsCount = 0
-            checkFooter = true
-        }
-
-        display = drawDisplay()
-    }
-
-    private fun drawDisplay(): MutableList<String> {
-        val newDisplay = mutableListOf<String>()
-        for ((effect, time) in effectDuration.sorted()) {
-            if (time.ended) continue
-            if (effect == NonGodPotEffect.INVISIBILITY) continue
-
-            if (effect.isMixin && !config.nonGodPotEffectShowMixins) continue
-
-            val remaining = time.remaining.coerceAtLeast(0.seconds)
-            val format = remaining.format(TimeUnit.HOUR)
-            val color = remaining.timerColor()
-
-            val displayName = effect.tabListName
-            newDisplay.add("$displayName $color$format")
-        }
-        val diff = totalEffectsCount - effectDuration.size
-        if (diff > 0) {
-            newDisplay.add("§eOpen the /effects inventory")
-            newDisplay.add("§eto show the missing $diff effects!")
-            checkFooter = true
-        }
-        return newDisplay
-    }
-
-    @SubscribeEvent
-    fun onSecondPassed(event: SecondPassedEvent) {
-        if (!isEnabled()) return
-        if (!ProfileStorageData.loaded) return
-
-        if (config.nonGodPotEffectDisplay) update()
-
-        val effectWarning = config.expireWarning
-        val effectSound = config.expireSound
-
-        if (!effectWarning && !effectSound) return
-
-        effectDuration.sorted().forEach { (effect, time) ->
-            if (time.remaining.inWholeSeconds != config.expireWarnTime.toLong()) return
-
-            if (effectWarning) LorenzUtils.sendTitle(effect.tabListName, 3.seconds)
-            if (effectSound) repeat(5) { playPlingSound() }
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        checkFooter = true
-    }
-
-    @SubscribeEvent
-    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!event.inventoryName.endsWith("Active Effects")) return
-
-        for (stack in event.inventoryItems.values) {
-            val name = stack.name
-            for (effect in NonGodPotEffect.entries) {
-                if (!name.contains(effect.inventoryItemName)) continue
-                for (line in stack.getLore()) {
-                    if (!line.contains("Remaining") || line == "§7Time Remaining: §aCompleted!" || line.contains("Remaining Uses")) continue
-                    val duration = try {
-                        TimeUtils.getDuration(line.split("§f")[1])
-                    } catch (e: IndexOutOfBoundsException) {
-                        ErrorManager.logErrorWithData(
-                            e, "Error while reading Non God-Potion effects from tab list",
-                            "line" to line,
-                        )
-                        continue
-                    }
-                    effectDuration[effect] = Timer(duration)
-                    update()
-                }
-            }
-        }
-    }
-
-    // TODO use TablistFooterUpdateEvent instead
-    @HandleEvent(onlyOnSkyblock = true, priority = HandleEvent.LOW, receiveCancelled = true)
-    fun onPacketReceive(event: PacketReceivedEvent) {
-        val packet = event.packet
-        if (!checkFooter) return
-        if (packet is S47PacketPlayerListHeaderFooter) {
-            val formattedText = packet.footer.formattedText
-            val lines = formattedText.replace("§r", "").split("\n")
-
-            if (!lines.any { it.contains("§a§lActive Effects") }) return
-            checkFooter = false
-
-            var effectsCount = 0
-            for (line in lines) {
-                for (effect in NonGodPotEffect.entries) {
-                    val tabListName = effect.tabListName
-                    if ("$line§r".startsWith(tabListName)) {
-                        val string = line.substring(tabListName.length)
-                        try {
-                            val duration = TimeUtils.getDuration(string.split("§f")[1])
-                            effectDuration[effect] = Timer(duration)
-                            update()
-                        } catch (e: IndexOutOfBoundsException) {
-                            ChatUtils.debug("Error while reading non god pot effects from tab list! line: '$line'")
-                        }
-                    }
-                }
-                effectsCountPattern.matchMatcher(line) {
-                    val group = group("name")
-                    effectsCount = group.toInt()
-                }
-            }
-            totalEffectsCount = effectsCount
-        }
-    }
-
-    @SubscribeEvent
-    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
-        if (!isEnabled() || !config.nonGodPotEffectDisplay) return
-        if (RiftAPI.inRift()) return
-
-        config.nonGodPotEffectPos.renderStrings(
-            display,
-            extraSpace = 3,
-            posLabel = "Non God Pot Effects",
-        )
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(3, "misc.nonGodPotEffectDisplay", "misc.potionEffect.nonGodPotEffectDisplay")
-        event.move(3, "misc.nonGodPotEffectShowMixins", "misc.potionEffect.nonGodPotEffectShowMixins")
-        event.move(3, "misc.nonGodPotEffectPos", "misc.potionEffect.nonGodPotEffectPos")
-    }
-
-    private fun isEnabled() = LorenzUtils.inSkyBlock && !DungeonAPI.inDungeon() && !LorenzUtils.inKuudraFight
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index ad70fbe1fb11..af3a8ebd7500 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -44,7 +44,7 @@ object NonGodPotEffectDisplay {
     )
     private var totalEffectsCount = 0
 
-    @SubscribeEvent
+    @HandleEvent
     fun onProfileJoin(event: ProfileJoinEvent) {
         effectDuration.clear()
         display = emptyList()
@@ -140,7 +140,7 @@ object NonGodPotEffectDisplay {
         checkFooter = true
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onTabUpdate(event: TablistFooterUpdateEvent) {
         if (!LorenzUtils.inSkyBlock || !checkFooter) return
         val lines = event.footer.split("\n")

From 2851344e8ce61d3b89f899a1688ed2139b6f10b6 Mon Sep 17 00:00:00 2001
From: Cal <cwolfson58@gmail.com>
Date: Sat, 14 Dec 2024 11:50:29 +1100
Subject: [PATCH 13/15] fix merge

---
 .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index af3a8ebd7500..909fbd53f2d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -169,7 +169,7 @@ object NonGodPotEffectDisplay {
         )
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "misc.nonGodPotEffectDisplay", "misc.potionEffect.nonGodPotEffectDisplay")
         event.move(3, "misc.nonGodPotEffectShowMixins", "misc.potionEffect.nonGodPotEffectShowMixins")

From 5ee6d402423e9ad2dff0eb6fe285316f5ff0621e Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 13 Dec 2024 23:56:58 -0500
Subject: [PATCH 14/15] Create package

---
 src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt          | 4 ++--
 .../events/{ => effects}/EffectDurationChangeEvent.kt         | 2 +-
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt   | 4 ++--
 .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/events/{ => effects}/EffectDurationChangeEvent.kt (89%)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
index fd106579930c..f647c1e1d176 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.api
 
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.EffectDurationChangeType
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/effects/EffectDurationChangeEvent.kt
similarity index 89%
rename from src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
rename to src/main/java/at/hannibal2/skyhanni/events/effects/EffectDurationChangeEvent.kt
index bc005c1b674a..242087114224 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EffectDurationChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/effects/EffectDurationChangeEvent.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.events
+package at.hannibal2.skyhanni.events.effects
 
 import at.hannibal2.skyhanni.api.EffectAPI
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index 9887972b28c8..a4c411f1442a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.EffectDurationChangeType
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index 909fbd53f2d5..71bf5c9c8476 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -5,8 +5,8 @@ import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.EffectDurationChangeType
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent

From 18e8db641ae5a8dab1019cab4ecaaf43746e5269 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 14 Dec 2024 00:04:13 -0500
Subject: [PATCH 15/15] Detekt

---
 src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt          | 4 ++--
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt   | 4 ++--
 .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
index f647c1e1d176..9b2789552e9a 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/EffectAPI.kt
@@ -2,12 +2,12 @@ package at.hannibal2.skyhanni.api
 
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
index a4c411f1442a..7061fb611aeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt
@@ -7,10 +7,10 @@ import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.features.event.hoppity.MythicRabbitPetWarning
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
index 71bf5c9c8476..e1877f63c84c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt
@@ -5,14 +5,14 @@ import at.hannibal2.skyhanni.api.EffectAPI.NonGodPotEffect
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
-import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeEvent
+import at.hannibal2.skyhanni.events.effects.EffectDurationChangeType
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule