From 8b51cb356a7e03f28a2cf41442d0c7e02f760607 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 23 Jun 2024 13:31:21 +0200
Subject: [PATCH 001/721] Fix: Ore Event (#2115)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 940b4ea35fac..be36bc11b61a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -46,7 +46,7 @@ object MiningAPI {
         "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)",
     )
 
-    data class MinedBlock(val ore: OreBlock, var position: LorenzVec, var confirmed: Boolean, val time: SimpleTimeMark)
+    private data class MinedBlock(val ore: OreBlock, var confirmed: Boolean, val time: SimpleTimeMark = SimpleTimeMark.now())
 
     private var lastInitSound = SimpleTimeMark.farPast()
 
@@ -68,9 +68,9 @@ object MiningAPI {
 
     private var lastSkyblockArea: String? = null
 
-    private var recentClickedBlocks = mutableListOf<MinedBlock>()
-    private var surroundingMinedBlocks = mutableListOf<MinedBlock>()
-    private val allowedSoundNames = listOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth")
+    private var recentClickedBlocks = mutableMapOf<LorenzVec, MinedBlock>()
+    private var surroundingMinedBlocks = mutableMapOf<LorenzVec, MinedBlock>()
+    private val allowedSoundNames = listOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
 
     var cold: Int = 0
         private set
@@ -119,7 +119,7 @@ object MiningAPI {
         val position = event.position
         val blockState = event.getBlockState
         val ore = OreBlock.getByStateOrNull(blockState) ?: return
-        recentClickedBlocks.add(MinedBlock(ore, position, false, SimpleTimeMark.now()))
+        recentClickedBlocks[position] = MinedBlock(ore, false)
     }
 
     @SubscribeEvent
@@ -142,10 +142,11 @@ object MiningAPI {
     @SubscribeEvent
     fun onPlaySound(event: PlaySoundEvent) {
         if (!inCustomMiningIsland()) return
+        if (event.soundName !in allowedSoundNames) return
         if (waitingForInitSound) {
-            if (event.soundName in allowedSoundNames && event.pitch == 0.7936508f) {
+            if (event.soundName != "random.orb" && event.pitch == 0.7936508f) {
                 val pos = event.location.roundLocationToBlock()
-                if (recentClickedBlocks.none { it.position == pos }) return
+                if (pos !in recentClickedBlocks) return
                 waitingForInitSound = false
                 waitingForInitBlock = true
                 waitingForInitBlockPos = event.location.roundLocationToBlock()
@@ -155,12 +156,11 @@ object MiningAPI {
         }
         if (waitingForEffMinerSound) {
             if (surroundingMinedBlocks.isEmpty()) return
-            if (event.soundName in allowedSoundNames || event.soundName == "random.orb") {
-                if (surroundingMinedBlocks.last().confirmed) return
-                waitingForEffMinerSound = false
-                surroundingMinedBlocks.last().confirmed = true
-                waitingForEffMinerBlock = true
-            }
+            val lastBlock = surroundingMinedBlocks.values.minByOrNull { it.time.passedSince() } ?: return
+            if (lastBlock.confirmed) return
+            waitingForEffMinerSound = false
+            lastBlock.confirmed = true
+            waitingForEffMinerBlock = true
         }
     }
 
@@ -178,14 +178,14 @@ object MiningAPI {
         if (waitingForInitBlock) {
             if (waitingForInitBlockPos != event.location) return
             waitingForInitBlock = false
-            surroundingMinedBlocks.add(MinedBlock(ore, event.location, true, SimpleTimeMark.now()))
+            surroundingMinedBlocks[event.location] = MinedBlock(ore, true)
             waitingForEffMinerBlock = true
             return
         }
         if (waitingForEffMinerBlock) {
-            if (surroundingMinedBlocks.any { it.position == event.location }) return
+            if (event.location in surroundingMinedBlocks) return
             waitingForEffMinerBlock = false
-            surroundingMinedBlocks.add(MinedBlock(ore, event.location, false, SimpleTimeMark.now()))
+            surroundingMinedBlocks[event.location] = MinedBlock(ore, false)
             waitingForEffMinerSound = true
             return
         }
@@ -201,34 +201,37 @@ object MiningAPI {
         if (currentAreaOreBlocks.isEmpty()) return
 
         // if somehow you take more than 20 seconds to mine a single block, congrats
-        recentClickedBlocks.removeIf { it.time.passedSince() > 20.seconds }
-        surroundingMinedBlocks.removeIf { it.time.passedSince() > 20.seconds }
+        recentClickedBlocks = recentClickedBlocks.filter { it.value.time.passedSince() <= 20.seconds }.toMutableMap()
+        surroundingMinedBlocks = surroundingMinedBlocks.filter { it.value.time.passedSince() <= 20.seconds }.toMutableMap()
 
-        if (surroundingMinedBlocks.isEmpty()) return
+        if (waitingForInitSound) return
         if (lastInitSound.passedSince() < 200.milliseconds) return
 
         resetOreEvent()
 
-        val originalBlock = surroundingMinedBlocks.firstOrNull { it.confirmed } ?: run {
-            surroundingMinedBlocks = mutableListOf()
-            recentClickedBlocks = mutableListOf()
-            return
-        }
+        if (surroundingMinedBlocks.isEmpty()) return
+
+        val originalBlock = surroundingMinedBlocks.maxByOrNull { it.value.time.passedSince() }?.takeIf { it.value.confirmed }?.value
+            ?: run {
+                surroundingMinedBlocks.clear()
+                recentClickedBlocks.clear()
+                return
+            }
 
-        val extraBlocks = surroundingMinedBlocks.filter { it.confirmed }.countBy { it.ore }
+        val extraBlocks = surroundingMinedBlocks.values.filter { it.confirmed }.countBy { it.ore }
 
         OreMinedEvent(originalBlock.ore, extraBlocks).post()
 
-        surroundingMinedBlocks = mutableListOf()
-        recentClickedBlocks.removeIf { it.time.passedSince() >= originalBlock.time.passedSince() }
+        surroundingMinedBlocks.clear()
+        recentClickedBlocks = recentClickedBlocks.filter { it.value.time.passedSince() < originalBlock.time.passedSince() }.toMutableMap()
     }
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         if (cold != 0) updateCold(0)
         lastColdReset = SimpleTimeMark.now()
-        recentClickedBlocks = mutableListOf()
-        surroundingMinedBlocks = mutableListOf()
+        recentClickedBlocks.clear()
+        surroundingMinedBlocks.clear()
         currentAreaOreBlocks = setOf()
         resetOreEvent()
     }
@@ -261,7 +264,7 @@ object MiningAPI {
             add("waitingForInitBlockPos: $waitingForInitBlockPos")
             add("waitingForEffMinerSound: $waitingForEffMinerSound")
             add("waitingForEffMinerBlock: $waitingForEffMinerBlock")
-            add("recentClickedBlocks: ${recentClickedBlocks.joinToString { it.position.toCleanString() }}")
+            add("recentClickedBlocks: ${recentClickedBlocks.entries.joinToString { it.key.toCleanString() }}")
         }
     }
 

From 7ff28af498fdba6e5a2a1150c3e2620c613c2c48 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 23 Jun 2024 07:45:28 -0400
Subject: [PATCH 002/721] Feature & Fix: Powder Tracker Hard Stone & Goblin
 Eggs (#2138)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/mining/PowderTrackerConfig.java  |  8 +++-
 .../mining/powdertracker/PowderTracker.kt     | 37 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
index 2f277d92500b..1c32cabc2e95 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
@@ -22,6 +22,7 @@
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.FTX;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.GEMSTONE_POWDER;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.GOLD_ESSENCE;
+import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.HARD_STONE;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.JADE;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.MITHRIL_POWDER;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.ROBOTRON;
@@ -29,6 +30,7 @@
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SAPPHIRE;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_1;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_2;
+import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_3;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.TOPAZ;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.TOTAL_CHESTS;
 
@@ -60,6 +62,8 @@ public class PowderTrackerConfig {
         DIAMOND_ESSENCE,
         GOLD_ESSENCE,
         SPACER_2,
+        HARD_STONE,
+        SPACER_3,
         RUBY,
         SAPPHIRE,
         AMBER,
@@ -80,6 +84,8 @@ public enum PowderDisplayEntry implements HasLegacyId {
         DIAMOND_ESSENCE("§b129 §bDiamond Essence §7(600/h)", 7),
         GOLD_ESSENCE("§b234 §6Gold Essence §7(700/h)", 8),
         SPACER_2("", 9),
+        HARD_STONE("§b1000 §fHard Stone §bCompacted §7(500/h)"),
+        SPACER_3(""),
         RUBY("§50§7-§90§7-§a0§f-0 §cRuby Gemstone", 10),
         SAPPHIRE("§50§7-§90§7-§a0§f-0 §bSapphire Gemstone", 11),
         AMBER("§50§7-§90§7-§a0§f-0 §6Amber Gemstone", 12),
@@ -93,7 +99,7 @@ public enum PowderDisplayEntry implements HasLegacyId {
         CONTROL_SWITCH("§b14 §9Control Switch", 20),
         SYNTHETIC_HEART("§b14 §9Synthetic Heart", 21),
         TOTAL_ROBOT_PARTS("§b14 §9Total Robot Parts", 22),
-        GOBLIN_EGGS("§90§7-§a0§7-§c0§f-§e0§f-§30 §fGoblin Egg", 23),
+        GOBLIN_EGGS("§30§7-§c0§7-§e0§f-§a0§f-§90 §fGoblin Egg", 23),
         WISHING_COMPASS("§b12 §aWishing Compass", 24),
         SLUDGE_JUICE("§b320 §aSludge Juice", 25),
         ASCENSION_ROPE("§b2 §9Ascension Rope", 26),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index a936f963622a..f302b669b3be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -57,6 +57,14 @@ object PowderTracker {
         "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?<time>.*)§r"
     )
 
+    /**
+     * REGEX-TEST: §b§lCOMPACT! §r§fYou found an §r§aEnchanted Hard Stone§r§f!
+     */
+    private val compactedPattern by patternGroup.pattern(
+        "compacted",
+        "§b§lCOMPACT! §r§fYou found an §r§aEnchanted Hard Stone§r§f!",
+    )
+
     private var lastChestPicked = SimpleTimeMark.farPast()
     private var isGrinding = false
     private val gemstoneInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
@@ -64,6 +72,7 @@ object PowderTracker {
     private val diamondEssenceInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private val goldEssenceInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private val chestInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
+    private val hardStoneInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private var doublePowder = false
     private var powderTimer = ""
     private val gemstones = listOf(
@@ -87,6 +96,7 @@ object PowderTracker {
         calculateResourceHour(diamondEssenceInfo)
         calculateResourceHour(goldEssenceInfo)
         calculateResourceHour(chestInfo)
+        calculateResourceHour(hardStoneInfo)
 
         doublePowder = powderBossBarPattern.matcher(BossbarData.getBossbar()).find()
         powderBossBarPattern.matchMatcher(BossbarData.getBossbar()) {
@@ -109,11 +119,15 @@ object PowderTracker {
         override fun reset() {
             rewards.clear()
             totalChestPicked = 0
+            totalHardStoneCompacted = 0
         }
 
         @Expose
         var totalChestPicked = 0
 
+        @Expose
+        var totalHardStoneCompacted = 0
+
         @Expose
         var rewards: MutableMap<PowderChestReward, Long> = mutableMapOf()
     }
@@ -153,6 +167,12 @@ object PowderTracker {
         powderStartedPattern.matchMatcher(msg) { doublePowder = true }
         powderEndedPattern.matchMatcher(msg) { doublePowder = false }
 
+        compactedPattern.matchMatcher(msg) {
+            tracker.modify {
+                it.totalHardStoneCompacted += 1
+            }
+        }
+
         for (reward in PowderChestReward.entries) {
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
@@ -192,6 +212,9 @@ object PowderTracker {
         chestInfo.perHour = 0.0
         chestInfo.stoppedChecks = 0
         chestInfo.perMin.clear()
+        hardStoneInfo.perHour = 0.0
+        hardStoneInfo.stoppedChecks = 0
+        hardStoneInfo.perMin.clear()
         doublePowder = false
         tracker.update()
     }
@@ -240,6 +263,7 @@ object PowderTracker {
         calculate(data, diamondEssenceInfo, PowderChestReward.DIAMOND_ESSENCE)
         calculate(data, goldEssenceInfo, PowderChestReward.GOLD_ESSENCE)
         calculateChest(data)
+        calculateHardStone(data)
 
         val chestPerHour = format(chestInfo.perHour)
         addAsSingletonList("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
@@ -252,11 +276,10 @@ object PowderTracker {
         addAsSingletonList("")
         addPerHour(rewards, entries[46], diamondEssenceInfo)
         addPerHour(rewards, entries[47], goldEssenceInfo)
-
-
         addAsSingletonList("")
-
-
+        val hardStonePerHour = format(hardStoneInfo.perHour)
+        addAsSingletonList("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)")
+        addAsSingletonList("")
         for ((gem, color) in gemstones) {
             var totalGemstone = 0L
 
@@ -289,7 +312,7 @@ object PowderTracker {
         val redEgg = rewards.getOrDefault(PowderChestReward.RED_GOBLIN_EGG, 0)
         val yellowEgg = rewards.getOrDefault(PowderChestReward.YELLOW_GOBLIN_EGG, 0)
         val blueEgg = rewards.getOrDefault(PowderChestReward.BLUE_GOBLIN_EGG, 0)
-        addAsSingletonList("§9$goblinEgg§7-§a$greenEgg§7-§c$redEgg§f-§e$yellowEgg§f-§3$blueEgg §fGoblin Egg")
+        addAsSingletonList("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
 
         for (reward in entries.subList(37, 46)) {
             val count = rewards.getOrDefault(reward, 0).addSeparators()
@@ -341,6 +364,10 @@ object PowderTracker {
         chestInfo.estimated = data.totalChestPicked.toLong()
     }
 
+    private fun calculateHardStone(data: Data) {
+        hardStoneInfo.estimated = data.totalHardStoneCompacted.toLong()
+    }
+
     private fun convert(roughCount: Long): Gem {
         val flawlessRatio = 512000
         val fineRatio = 6400

From 1108b56295e43606e6ed5533f3b35b418c8bb624 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 23 Jun 2024 13:46:09 +0200
Subject: [PATCH 003/721] formatting

---
 .../mining/powdertracker/PowderTracker.kt      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index f302b669b3be..cd148db112da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -38,23 +38,23 @@ object PowderTracker {
     private val patternGroup = RepoPattern.group("mining.powder.tracker")
     private val pickedPattern by patternGroup.pattern(
         "picked",
-        "§6You have successfully picked the lock on this chest!"
+        "§6You have successfully picked the lock on this chest!",
     )
     private val uncoveredPattern by patternGroup.pattern(
         "uncovered",
-        "§aYou uncovered a treasure chest!"
+        "§aYou uncovered a treasure chest!",
     )
     private val powderStartedPattern by patternGroup.pattern(
         "powder.started",
-        ".*§r§b§l2X POWDER STARTED!.*"
+        ".*§r§b§l2X POWDER STARTED!.*",
     )
     private val powderEndedPattern by patternGroup.pattern(
         "powder.ended",
-        ".*§r§b§l2X POWDER ENDED!.*"
+        ".*§r§b§l2X POWDER ENDED!.*",
     )
     private val powderBossBarPattern by patternGroup.pattern(
         "powder.bossbar",
-        "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?<time>.*)§r"
+        "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?<time>.*)§r",
     )
 
     /**
@@ -81,7 +81,7 @@ object PowderTracker {
         "Amber" to "§6",
         "Amethyst" to "§5",
         "Jade" to "§a",
-        "Topaz" to "§e"
+        "Topaz" to "§e",
     )
 
     init {
@@ -111,8 +111,7 @@ object PowderTracker {
         }
     }
 
-    private val tracker = SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker })
-    { formatDisplay(drawDisplay(it)) }
+    private val tracker = SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker }) { formatDisplay(drawDisplay(it)) }
 
     class Data : TrackerData() {
 
@@ -178,8 +177,9 @@ object PowderTracker {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
                     var amount = group("amount").formatLong()
-                    if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder)
+                    if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder) {
                         amount *= 2
+                    }
                     it.rewards[reward] = count + amount
                 }
             }

From e1f1563c4951b3a72bf2dcdd822327b917988c20 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 23 Jun 2024 14:30:01 +0200
Subject: [PATCH 004/721] Version 0.26 Beta 13

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 32 +++++++++++++++++++
 docs/FEATURES.md                              | 10 ++++++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5089a0a4533e..2d991fcc09e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.12"
+version = "0.26.Beta.13"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index ff301fc45c5b..f6aeed6a3d14 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -60,6 +60,8 @@
     + This data is partially enriched using the duplicate egg location tracker.
 + Added Rabbit Pet Warning. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2087)
     + Warns when using the Egglocator without having a Mythic Rabbit Pet selected.
++ Flash your screen when a special stray rabbit appears. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2040)
+    + Option to also flash on normal stray rabbits.
 
 #### Mining Features
 
@@ -73,6 +75,7 @@
     + Added powder cost for 10 levels.
 + Added Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655)
     + Displays information about Mineshaft spawns, your progress towards a Pity Mineshaft, and more.
++ Added Compacted Hard Stone to Powder Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2138)
 
 #### Inventory Features
 
@@ -87,6 +90,11 @@
 + Added Favorite Power Stones. - saga (https://github.com/hannibal002/SkyHanni/pull/2002)
     + Highlighted in the Thaumaturgy inventory.
     + Shift-click to add/remove them.
++ Added an option to block Chocolate Factory access without a mythic rabbit pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2124)
++ Shows a list of items that can be crafted with the items in your inventory when inside the crafting menu. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1334)
+    + Click on an item to open /recipe.
+    + Option to include items from inside sacks.
+    + Option to include vanilla items.
 
 #### Fishing Features
 
@@ -124,6 +132,8 @@
     + This can be viewed in /sbmenu, /equipment, and the Misc Stats submenu.
 + Added a source download verification checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/1914)
     + Warns you when the mod has been downloaded from an untrusted source (not the official GitHub or Modrinth).
++ Added Chunked Stats as a draggable list to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1341)
+    + Select and prioritize the order of the stats you want to see.
 
 ### Improvements
 
@@ -186,6 +196,7 @@
 #### Chat Improvements
 
 + Added Pet Rarity to Oringo Abiphone messages. - Empa (https://github.com/hannibal002/SkyHanni/pull/1862)
++ Improved many chat message hover descriptions. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/1919)
 
 #### Inventory Improvements
 
@@ -257,6 +268,8 @@
 + Fixed Area Walls being broken in Nucleus. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1994)
 + Consider Y=64 part of Magma Fields. - Luna (https://github.com/hannibal002/SkyHanni/pull/2029)
     + Hypixel quietly changed this in or around SkyBlock 0.20.1.
++ Fixed the order of Goblin Eggs in the Powder Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2138)
++ Fixed ore event sometimes getting stuck. - Empa (https://github.com/hannibal002/SkyHanni/pull/2115)
 
 #### Garden Fixes
 
@@ -289,6 +302,8 @@
 + Fixed highlight missing requirements even when Hoppity Rabbit is already found. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2101)
 + Fixed Compact Hoppity Chat not working with rabbits purchased from the Hoppity NPC. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2100)
 + Fixed a rare case where golden strays caused incorrect duplicate detection during Compact Chat for Hoppity's. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2090)
++ Fixed the custom reminder in the Chocolate Factory activating when using the Time Tower charge. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2126)
++ Fixed compact Hoppity chat breaking with special mythic rabbits. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2093)
 
 #### Custom Scoreboard Fixes
 
@@ -298,6 +313,9 @@
 + Fixed unknown lines not appearing instantly in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2063)
 + Fixed Anniversary Line not being detected in Custom Scoreboard. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2058)
 + Fixed Perkapocalypse Mayor's time being longer than Jerry's time in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2045)
++ Fixed Unknown lines in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/2119)
++ Fixed broken event start time for upcoming events in the Custom Scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2113)
++ Fixed the New Year Event missing in the Custom Scoreboard.. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2122)
 
 #### Dungeon Fixes
 
@@ -320,6 +338,9 @@
   Empa (https://github.com/hannibal002/SkyHanni/pull/1858)
 + Fixed Trophy Fish Display not working for stranded players. - HiZe (https://github.com/hannibal002/SkyHanni/pull/1966)
 + Fixed Sea Creature highlight not working when the damage indicator was enabled. - Empa (https://github.com/hannibal002/SkyHanni/pull/1985)
++ Fixed Fishing Bait warnings not working. - Empa (https://github.com/hannibal002/SkyHanni/pull/2135)
++ Fixed a rare double hook detection issue. - appable (https://github.com/hannibal002/SkyHanni/pull/2125)
++ Fixed Commission Mob Highlighter incorrectly highlighting Deep Sea Protectors as Automatons. - Luna (https://github.com/hannibal002/SkyHanni/pull/2130)
 
 #### Performance Fixes
 
@@ -343,11 +364,13 @@
 + Fixed showing the favorite wardrobe slot background color while in "Only Favorites" mode. - Empa (https://github.com/hannibal002/SkyHanni/pull/2072)
 + Fixed incorrect stripping of some prefixes from non-Kuudra armor items in the estimated item value calculation. - Luna (https://github.com/hannibal002/SkyHanni/pull/2057)
     + This broke other items, like Hot Bait.
++ Fixed a Custom Wardrobe error when retrieving an item price. - j10a1n15, Empa (https://github.com/hannibal002/SkyHanni/pull/2123)
 
 #### Combat Fixes
 
 + Fixed summons not being removed from Summoning Mob Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1964)
 + Fixed area mini boss spawn durations below 1 second not displaying. - Empa (https://github.com/hannibal002/SkyHanni/pull/2110)
++ Fixed summons death messages getting blocked even when the feature is disabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2132)
 
 #### Chat Fixes
 
@@ -373,6 +396,8 @@
 + Fixed waypoint text being hidden when more than 80 blocks away. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2103)
 + Fixed durations displaying with milliseconds. - Empa (https://github.com/hannibal002/SkyHanni/pull/2095)
 + Fixed getting security error when download from GitHub. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2111)
++ Fixed Trevor Tracker not working when Trevor Solver is disabled. - appable (https://github.com/hannibal002/SkyHanni/pull/2116)
++ Fixed Hypixel detection on non-Hypixel servers. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2131)
 
 ### Technical Details
 
@@ -456,6 +481,13 @@
 + Fixed HotmAPI saving incorrect level values when using Blue Egg. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2097)
 + Fixed the interest widget and added a scrap widget. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2094)
 + Made SkyHanni into a Mod. - hannibal2 + nea (https://github.com/hannibal002/SkyHanni/pull/2099)
++ Fixed illegal mob detection with ridable pets. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2010)
++ Removed yet another deprecated function. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2021)
++ Created and implemented PlayerDeathEvent. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1544)
++ Added a list of named nodes for the graph editor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2059)
++ Added debug command /shtestisland. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2107)
+    + Simulate being on a SkyBlock island.
++ Fixed a ConcurrentModificationException in RepoPatternManager during tests. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2098)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 06f7e2c5c5f0..e397f2b95ab1 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -816,6 +816,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Fully customizable: change what items or stats to show.
     + Has support for the maxed Great Explorer perk.
     + Option to hide while not grinding powder.
+    + Added Compacted Hard Stone to Powder Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2138)
 + Deep Caverns Parkour. - hannibal2
     + Shows a parkour to the bottom of Deep Caverns and to Rhys.
 + Display upcoming mining events. - CalMWolfs
@@ -937,6 +938,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + This data is partially enriched using the duplicate egg location tracker.
 + Rabbit Pet Warning. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2087)
     + Warns when using the Egglocator without having a Mythic Rabbit Pet selected.
++ Flash your screen when a special stray rabbit appears. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2040)
+    + Option to also flash on normal stray rabbits.
++ Added an option to block Chocolate Factory access without a mythic rabbit pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2124)
 
 </details>
 <details open><summary>
@@ -1203,6 +1207,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Hide the Hypixel Scoreboard, add a custom Image as a background, rounded corners.
     + Supports colored month names & better garden plot names.
     + A ton of settings.
+    + Added Chunked Stats as a draggable list to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1341)
+        + Select and prioritize the order of the stats you want to see.
 + No Bits Available Warning. - Empa (https://github.com/hannibal002/SkyHanni/pull/1286)
     + Warns when you run out of available bits to generate.
 + Link from HUD elements to config options. - nea (https://github.com/hannibal002/SkyHanni/pull/1383)
@@ -1242,6 +1248,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added a Chat Message if the Perkapocalypse Mayor is unknown. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2009)
 + Added a source download verification checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/1914)
     + Warns you when the mod has been downloaded from an untrusted source (not the official GitHub or Modrinth).
++ Shows a list of items that can be crafted with the items in your inventory when inside the crafting menu. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1334)
+    + Click on an item to open /recipe.
+    + Option to include items from inside sacks.
+    + Option to include vanilla items.
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index e9335260a3f1..cee61d034068 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.12",
+    version = "0.26.Beta.13",
 )
 class SkyHanniMod {
 

From 796bdf65f24057d170b91cc043a7fa8e024905ad Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 23 Jun 2024 15:04:27 +0200
Subject: [PATCH 005/721] Improvement: Better message to load trophy fishing
 data from NEU PV (#2139)

There is now another thing (found egg locations) being loaded from NEU
PV which is not updated by this, so it's best to clarify.
---
 .../skyhanni/features/fishing/trophy/TrophyFishManager.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
index 8d21a7da7dcf..9f3e83f4ed3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
@@ -55,7 +55,7 @@ object TrophyFishManager {
         }
         if (changed) {
             ChatUtils.clickableChat(
-                "Click here to load data from NEU PV!", onClick = {
+                "Click here to load Trophy Fishing data from NEU PV!", onClick = {
                     updateFromNeuPv(savedFishes, neuData)
                 },
                 "§eClick to load!",

From cc291932906c38943e20cee29ee591695a9875b5 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:13:52 +0200
Subject: [PATCH 006/721] Backend: Usage of TabWidget (#1240)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/HypixelData.kt | 22 ++++++----------
 .../skyhanni/data/ProfileStorageData.kt       | 17 ++++---------
 .../skyhanni/events/WidgetUpdateEvent.kt      |  2 ++
 .../features/combat/FerocityDisplay.kt        | 11 +++++---
 .../features/garden/GardenCropMilestoneFix.kt |  8 +++---
 .../garden/composter/ComposterDisplay.kt      | 11 ++++----
 .../garden/visitor/VisitorListener.kt         | 12 +++++----
 .../nether/VolcanoExplosivityDisplay.kt       | 18 +++++++++----
 .../dailyquest/DailyQuestHelper.kt            | 15 +++++------
 .../dailyquest/QuestLoader.kt                 |  3 ++-
 .../test/garden/VisitorListenerTest.kt        | 25 +++++++++++--------
 11 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 7599cc80fa0c..82bd6d315abc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent
 import at.hannibal2.skyhanni.features.bingo.BingoAPI
@@ -59,10 +58,6 @@ object HypixelData {
         "serverid.scoreboard",
         "§7\\d+/\\d+/\\d+ §8(?<servertype>[mM])(?<serverid>\\S+).*",
     )
-    private val serverIdTablistPattern by patternGroup.pattern(
-        "serverid.tablist",
-        " Server: §r§8(?<serverid>\\S+)",
-    )
     private val lobbyTypePattern by patternGroup.pattern(
         "lobbytype",
         "(?<lobbyType>.*lobby)\\d+",
@@ -161,14 +156,14 @@ object HypixelData {
         if (LorenzUtils.lastWorldSwitch.passedSince() < 1.seconds) return
         if (!TabListData.fullyLoaded) return
 
-        ScoreboardData.sidebarLinesFormatted.matchFirst(serverIdScoreboardPattern) {
-            val serverType = if (group("servertype") == "M") "mega" else "mini"
-            serverId = "$serverType${group("serverid")}"
+        TabWidget.SERVER.matchMatcherFirstLine {
+            serverId = group("serverid")
             return
         }
 
-        TabListData.getTabList().matchFirst(serverIdTablistPattern) {
-            serverId = group("serverid")
+        ScoreboardData.sidebarLinesFormatted.matchFirst(serverIdScoreboardPattern) {
+            val serverType = if (group("servertype") == "M") "mega" else "mini"
+            serverId = "$serverType${group("serverid")}"
             return
         }
 
@@ -301,11 +296,9 @@ object HypixelData {
         }
     }
 
-    @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
-        event.tabList.matchFirst(UtilsPatterns.tabListProfilePattern) {
+    private fun checkProfile() {
+        TabWidget.PROFILE.matchMatcherFirstLine {
             var newProfile = group("profile").lowercase()
-
             // Hypixel shows the profile name reversed while in the Rift
             if (RiftAPI.inRift()) newProfile = newProfile.reversed()
             if (profileName == newProfile) return
@@ -374,6 +367,7 @@ object HypixelData {
     fun onTabListUpdate(event: WidgetUpdateEvent) {
         when (event.widget) {
             TabWidget.AREA -> checkIsland(event)
+            TabWidget.PROFILE -> checkProfile()
             else -> Unit
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
index 3d9bdcf78ed2..18211ccd8637 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
@@ -4,21 +4,20 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.SackData
 import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.HypixelJoinEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TabListData
-import at.hannibal2.skyhanni.utils.UtilsPatterns
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
@@ -75,15 +74,9 @@ object ProfileStorageData {
     }
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-
-        event.tabList.matchFirst(UtilsPatterns.tabListProfilePattern) {
-            noTabListTime = SimpleTimeMark.farPast()
-            return
-        }
-
-        noTabListTime = SimpleTimeMark.now()
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
+        if (!event.isWidget(TabWidget.PROFILE)) return
+        noTabListTime = if (event.isClear()) SimpleTimeMark.now() else SimpleTimeMark.farPast()
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt
index 60300628f232..a91e7dca3a03 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.utils.LorenzUtils.isAnyOf
 
 /** The events get send on change of the widget and on island switch */
 open class WidgetUpdateEvent(
@@ -9,6 +10,7 @@ open class WidgetUpdateEvent(
 ) : LorenzEvent() {
 
     fun isWidget(widgetType: TabWidget) = widget == widgetType
+    fun isWidget(vararg widgetType: TabWidget) = widget.isAnyOf(*widgetType)
 
     fun isClear() = lines.isEmpty()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
index 31b85ddd0b73..c30299e4f167 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
@@ -1,8 +1,9 @@
 package at.hannibal2.skyhanni.features.combat
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
@@ -20,16 +21,18 @@ object FerocityDisplay {
      */
     private val ferocityPattern by RepoPattern.pattern(
         "combat.ferocity.tab",
-        " Ferocity: §r§c⫽(?<stat>.*)"
+        " Ferocity: §r§c⫽(?<stat>.*)",
     )
 
     private var display = ""
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
         if (!isEnabled()) return
+        if (!event.isWidget(TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS)) return
         display = ""
-        val stat = event.tabList.matchFirst(ferocityPattern) {
+        if (event.isClear()) return
+        val stat = event.lines.matchFirst(ferocityPattern) {
             group("stat")
         } ?: return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
index b154a72e0219..127ee3f305a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
@@ -4,8 +4,9 @@ import at.hannibal2.skyhanni.data.GardenCropMilestones
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
 import at.hannibal2.skyhanni.data.GardenCropMilestones.setCounter
 import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.features.garden.farming.GardenCropMilestoneDisplay
 import at.hannibal2.skyhanni.features.garden.pests.PestAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -86,8 +87,9 @@ object GardenCropMilestoneFix {
     }
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
-        event.tabList.matchFirst(tabListPattern) {
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
+        if (!event.isWidget(TabWidget.CROP_MILESTONE)) return
+        event.lines.matchFirst(tabListPattern) {
             val tier = group("tier").toInt()
             val percentage = group("percentage").toDouble()
             val cropName = group("crop")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index bd4c8274c880..7c88acfca264 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -3,8 +3,9 @@ package at.hannibal2.skyhanni.features.garden.composter
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.enums.OutsideSbFeature
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -53,10 +54,11 @@ object ComposterDisplay {
     }
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
         if (!(config.displayEnabled && GardenAPI.inGarden())) return
+        if (!event.isWidget(TabWidget.COMPOSTER)) return
 
-        readData(event.tabList)
+        readData(event.lines)
 
         if (tabListData.isNotEmpty()) {
             composterEmptyTime = ComposterAPI.estimateEmptyTimeFromTab()
@@ -137,8 +139,7 @@ object ComposterDisplay {
             storage.informedAboutLowMatter = 5.0.minutes.fromNow()
         }
 
-        if (ComposterAPI.getFuel() <= config.notifyLow.fuel && storage.informedAboutLowFuel.isInPast()
-        ) {
+        if (ComposterAPI.getFuel() <= config.notifyLow.fuel && storage.informedAboutLowFuel.isInPast()) {
             if (config.notifyLow.title) {
                 LorenzUtils.sendTitle("§cYour Fuel is low", 4.seconds)
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
index 2914aa1c3928..66d03745f372 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
@@ -3,13 +3,14 @@ package at.hannibal2.skyhanni.features.garden.visitor
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.GuiKeyPressEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.events.garden.visitor.VisitorOpenEvent
 import at.hannibal2.skyhanni.events.garden.visitor.VisitorRenderEvent
 import at.hannibal2.skyhanni.events.item.ItemHoverEvent
@@ -42,7 +43,7 @@ import kotlin.time.Duration.Companion.seconds
 object VisitorListener {
     private val offersAcceptedPattern by RepoPattern.pattern(
         "garden.visitor.offersaccepted",
-        "§7Offers Accepted: §a(?<offersAccepted>\\d+)"
+        "§7Offers Accepted: §a(?<offersAccepted>\\d+)",
     )
 
     private val config get() = VisitorAPI.config
@@ -68,13 +69,14 @@ object VisitorListener {
     }
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
         if (!GardenAPI.inGarden()) return
+        if (!event.isWidget(TabWidget.VISITORS)) return
 
-        val hasVisitorInfo = event.tabList.any { VisitorAPI.visitorCountPattern.matches(it) }
+        val hasVisitorInfo = event.lines.any { VisitorAPI.visitorCountPattern.matches(it) }
         if (!hasVisitorInfo) return
 
-        val visitorsInTab = VisitorAPI.visitorsInTabList(event.tabList)
+        val visitorsInTab = VisitorAPI.visitorsInTabList(event.lines)
 
         if (LorenzUtils.lastWorldSwitch.passedSince() > 2.seconds) {
             for (visitor in VisitorAPI.getVisitors()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt
index 6cb7f3bf45ad..441dac11bbea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt
@@ -2,11 +2,12 @@ package at.hannibal2.skyhanni.features.nether
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -22,14 +23,21 @@ object VolcanoExplosivityDisplay {
      */
     private val statusPattern by patternGroup.pattern(
         "tablistline",
-        " *Volcano: (?<status>(?:§.)*\\S+)"
+        " *Volcano: (?<status>(?:§.)*\\S+)",
     )
     private var display = ""
 
     @SubscribeEvent
-    fun onTabListUpdate(event: TabListUpdateEvent) {
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
         if (!isEnabled()) return
-        event.tabList.matchFirst(statusPattern) {
+        if (!event.isWidget(TabWidget.VOLCANO)) return
+
+        if (event.isClear()) {
+            display = ""
+            return
+        }
+        // TODO merge widget pattern with statusPattern
+        statusPattern.matchMatcher(event.lines.first()) {
             display = "§bVolcano Explosivity§7: ${group("status")}"
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
index d0b37ffcd1de..ef7423990581 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
@@ -65,7 +65,7 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
      */
     val minibossAmountPattern by RepoPattern.pattern(
         "crimson.reputationhelper.quest.minibossamount",
-        "(?:§7Kill the §c.+ §7|.*)miniboss §a(?<amount>\\d) §7times?!"
+        "(?:§7Kill the §c.+ §7|.*)miniboss §a(?<amount>\\d) §7times?!",
     )
 
     private val config get() = SkyHanniMod.feature.crimsonIsle.reputationHelper
@@ -87,11 +87,11 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
     }
 
     @SubscribeEvent
-    fun onTabListWidgetUpdate(event: WidgetUpdateEvent) {
-        if (event.isWidget(TabWidget.FACTION_QUESTS)) {
-            if (!isEnabled()) return
-            questLoader.loadFromTabList()
-        }
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
+        if (!event.isWidget(TabWidget.FACTION_QUESTS)) return
+        if (!isEnabled()) return
+
+        questLoader.loadFromTabList()
     }
 
     @SubscribeEvent
@@ -211,7 +211,8 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
     }
 
     private fun Quest.needsTownBoardLocation(): Boolean = state.let { state ->
-        state == QuestState.READY_TO_COLLECT || state == QuestState.NOT_ACCEPTED ||
+        state == QuestState.READY_TO_COLLECT ||
+            state == QuestState.NOT_ACCEPTED ||
             (this is RescueMissionQuest && state == QuestState.ACCEPTED)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
index 694ebed350e8..686f46827cef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
@@ -214,7 +214,8 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) {
                     quest.haveAmount = haveAmount
                 } catch (e: IndexOutOfBoundsException) {
                     ErrorManager.logErrorWithData(
-                        e, "Error loading Crimson Isle Quests from config.",
+                        e,
+                        "Error loading Crimson Isle Quests from config.",
                         "text" to text,
                     )
                 }
diff --git a/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorListenerTest.kt b/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorListenerTest.kt
index 78304f0ae892..d9c31bbff834 100644
--- a/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorListenerTest.kt
+++ b/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorListenerTest.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.test.garden
 
-import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorListener
@@ -33,7 +34,7 @@ class VisitorListenerTest {
     @Test
     fun `onTablistUpdate it should add new visitors to the list`() {
         listener.onTabListUpdate(
-            TabListUpdateEvent(
+            fakeTabWidget(
                 mutableListOf(
                     "§b§lVisitors: §r§f(3)",
                     " §r§cSpaceman",
@@ -41,8 +42,8 @@ class VisitorListenerTest {
                     " §r§fJacob",
                     "ThePlayerName",
                     "",
-                )
-            )
+                ),
+            ),
         )
 
         verify { VisitorAPI.addVisitor("§fJacob") }
@@ -57,9 +58,9 @@ class VisitorListenerTest {
         )
 
         listener.onTabListUpdate(
-            TabListUpdateEvent(
-                mutableListOf("§b§lVisitors: §r§f(0)", "")
-            )
+            fakeTabWidget(
+                mutableListOf("§b§lVisitors: §r§f(0)", ""),
+            ),
         )
 
         verify { VisitorAPI.removeVisitor("§fJacob") }
@@ -74,11 +75,15 @@ class VisitorListenerTest {
         every { LorenzUtils.lastWorldSwitch } returns SimpleTimeMark.now()
 
         listener.onTabListUpdate(
-            TabListUpdateEvent(
-                mutableListOf("§b§lVisitors: §r§f(0)", "")
-            )
+            fakeTabWidget(
+                mutableListOf("§b§lVisitors: §r§f(0)", ""),
+            ),
         )
 
         verify(exactly = 0) { VisitorAPI.removeVisitor("§fJacob") }
     }
+
+    private fun fakeTabWidget(lines: List<String>): WidgetUpdateEvent {
+        return WidgetUpdateEvent(TabWidget.VISITORS, lines)
+    }
 }

From b08dc623846886802093f0a00893ed96dc248ea9 Mon Sep 17 00:00:00 2001
From: appable <16139460+appable0@users.noreply.github.com>
Date: Sun, 23 Jun 2024 09:18:01 -0700
Subject: [PATCH 007/721] Replace: Time Tower Reminder feature (#2133)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../ChocolateFactoryConfig.java               |  2 +-
 .../ChocolateFactoryTimeTowerManager.kt       | 52 ++++++++++---------
 2 files changed, 29 insertions(+), 25 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 c1da5e511bdc..39758745a9ff 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
@@ -113,7 +113,7 @@ public class ChocolateFactoryConfig {
     public boolean timeTowerWarning = false;
 
     @Expose
-    @ConfigOption(name = "Time Tower Reminder", desc = "Notify a minute before the time tower ends.")
+    @ConfigOption(name = "Time Tower Expiry Reminder", desc = "Notify when the time tower ends and you have one or more remaining charges.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean timeTowerReminder = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
index a853b4741889..9df1be965832 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.StringUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
@@ -22,7 +23,12 @@ object ChocolateFactoryTimeTowerManager {
     private val profileStorage get() = ChocolateFactoryAPI.profileStorage
 
     private var lastTimeTowerWarning = SimpleTimeMark.farPast()
-    private var lastTimeTowerReminder = SimpleTimeMark.farPast()
+    private var wasTimeTowerRecentlyActive = false
+
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        wasTimeTowerRecentlyActive = false
+    }
 
     private const val HOVER_TEXT = "§eClick to run /cf!"
 
@@ -35,11 +41,9 @@ object ChocolateFactoryTimeTowerManager {
             profileStorage.currentTimeTowerEnds = SimpleTimeMark.farPast()
         }
 
-        if (ChocolateFactoryAPI.inChocolateFactory) return
+        checkTimeTowerExpired()
 
-        if (config.timeTowerReminder) {
-            timeTowerReminder()
-        }
+        if (ChocolateFactoryAPI.inChocolateFactory) return
 
         val nextCharge = profileStorage.nextTimeTower
 
@@ -49,10 +53,10 @@ object ChocolateFactoryTimeTowerManager {
             val nextTimeTower = profileStorage.nextTimeTower + profileStorage.timeTowerCooldown.hours
             profileStorage.nextTimeTower = nextTimeTower
 
-            if (!config.timeTowerWarning) return
+            if (!config.timeTowerWarning || timeTowerActive()) return
             ChatUtils.clickableChat(
                 "Your Time Tower has another charge available §7(${timeTowerCharges()})§e, " +
-                    "Click here to use one",
+                    "Click here to use one.",
                 onClick = { HypixelCommands.chocolateFactory() },
                 HOVER_TEXT,
             )
@@ -63,6 +67,22 @@ object ChocolateFactoryTimeTowerManager {
         checkTimeTowerWarning(false)
     }
 
+    private fun checkTimeTowerExpired() {
+        val isTimeTowerActive = timeTowerActive()
+        if (!isTimeTowerActive && wasTimeTowerRecentlyActive && config.timeTowerReminder && currentCharges() > 0) {
+            val charges = StringUtils.pluralize(currentCharges(), "charge", "charges", withNumber = true)
+            ChatUtils.clickableChat(
+                "§cYour Time Tower just expired and has $charges remaining. Click here to use one.",
+                onClick = {
+                    HypixelCommands.chocolateFactory()
+                },
+                hover = "§eClick to run /cf!",
+            )
+            SoundUtils.playBeepSound()
+        }
+        wasTimeTowerRecentlyActive = isTimeTowerActive
+    }
+
     fun checkTimeTowerWarning(inInventory: Boolean) {
         if (!ChocolateFactoryAPI.isEnabled()) return
         if (!config.timeTowerWarning) return
@@ -76,7 +96,7 @@ object ChocolateFactoryTimeTowerManager {
             "§cYour Time Tower is full §7(${timeTowerCharges()})§c, " +
                 "Use one to avoid wasting time tower usages!",
             onClick = { HypixelCommands.chocolateFactory() },
-            HOVER_TEXT
+            HOVER_TEXT,
         )
         SoundUtils.playBeepSound()
         lastTimeTowerWarning = SimpleTimeMark.now()
@@ -105,22 +125,6 @@ object ChocolateFactoryTimeTowerManager {
 
     private fun timeTowerEnds(): SimpleTimeMark = profileStorage?.currentTimeTowerEnds ?: SimpleTimeMark.farPast()
 
-    private fun timeTowerReminder() {
-        if (lastTimeTowerReminder.passedSince() < 20.seconds) return
-
-        val timeUntil = timeTowerEnds().timeUntil()
-        if (timeUntil < 1.minutes && timeUntil.isPositive()) {
-            ChatUtils.clickableChat(
-                "§cYour Time Tower is about to end! " +
-                    "Open the Chocolate Factory to avoid wasting the multiplier!",
-                onClick = { HypixelCommands.chocolateFactory() },
-                HOVER_TEXT
-            )
-            SoundUtils.playBeepSound()
-            lastTimeTowerReminder = SimpleTimeMark.now()
-        }
-    }
-
     fun timeTowerFullTimeMark(): SimpleTimeMark {
         val profileStorage = profileStorage ?: return SimpleTimeMark.farPast()
         if (timeTowerFull()) return SimpleTimeMark.farPast()

From 78f5f7b94bdc48c3395ef17f30022b8cd653a776 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 23 Jun 2024 12:31:23 -0400
Subject: [PATCH 008/721] Feature: Add option to maintain sound levels during
 SoundUtils usage (#2129)

---
 .../skyhanni/config/features/misc/MiscConfig.java         | 6 ++++++
 src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt   | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 5dc2aa5a082b..cc606e7aaa1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -276,4 +276,10 @@ public class MiscConfig {
     @Accordion
     @Expose
     public HideFarEntitiesConfig hideFarEntities = new HideFarEntitiesConfig();
+
+    @Expose
+    @ConfigOption(name = "Maintain Volume During Warnings", desc = "Do not change game volume levels when warning sounds are played.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean maintainGameVolume = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
index 423747b790a6..70e6242c621c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
@@ -22,7 +22,9 @@ object SoundUtils {
         Minecraft.getMinecraft().addScheduledTask {
             val gameSettings = Minecraft.getMinecraft().gameSettings
             val oldLevel = gameSettings.getSoundLevel(SoundCategory.PLAYERS)
-            gameSettings.setSoundLevel(SoundCategory.PLAYERS, 1f)
+            if (!SkyHanniMod.feature.misc.maintainGameVolume) {
+                gameSettings.setSoundLevel(SoundCategory.PLAYERS, 1f)
+            }
             try {
                 Minecraft.getMinecraft().soundHandler.playSound(this)
             } catch (e: Exception) {
@@ -39,7 +41,9 @@ object SoundUtils {
                     "soundLocation" to this.soundLocation
                 )
             } finally {
-                gameSettings.setSoundLevel(SoundCategory.PLAYERS, oldLevel)
+                if (!SkyHanniMod.feature.misc.maintainGameVolume) {
+                    gameSettings.setSoundLevel(SoundCategory.PLAYERS, oldLevel)
+                }
             }
         }
     }

From 6eb085f4e2ba69e98934ffa9489c8679ba23d244 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:06:17 +0200
Subject: [PATCH 009/721] Feature: Reforge helper (#1437)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/api/ReforgeAPI.kt   | 198 ++++++++
 .../inventory/helper/HelperConfig.java        |   5 +
 .../inventory/helper/ReforgeHelperConfig.java |  36 ++
 ...uReforgeStoneJson.kt => NeuReforgeJson.kt} |  28 +-
 .../skyhanni/data/model/SkyblockStat.kt       |  80 ++++
 .../events/NeuRepositoryReloadEvent.kt        |   7 +-
 .../features/inventory/ReforgeHelper.kt       | 432 ++++++++++++++++++
 .../features/misc/items/EstimatedItemValue.kt |   4 -
 .../items/EstimatedItemValueCalculator.kt     |  13 +-
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |  70 +--
 .../at/hannibal2/skyhanni/utils/NumberUtil.kt |   4 +-
 .../utils/json/SkyHanniTypeAdapters.kt        |  29 +-
 12 files changed, 843 insertions(+), 63 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
 rename src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/{NeuReforgeStoneJson.kt => NeuReforgeJson.kt} (70%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
new file mode 100644
index 000000000000..70f6910c9173
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -0,0 +1,198 @@
+package at.hannibal2.skyhanni.api
+
+import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuReforgeJson
+import at.hannibal2.skyhanni.data.model.SkyblockStat
+import at.hannibal2.skyhanni.data.model.SkyblockStatList
+import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
+import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.json.BaseGsonBuilder
+import at.hannibal2.skyhanni.utils.json.SkyHanniTypeAdapters
+import com.google.gson.Gson
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ReforgeAPI {
+    var reforgeList: List<Reforge> = emptyList()
+        private set(value) {
+            field = value
+            nonePowerStoneReforge = value.filterNot { it.isReforgeStone }
+            onlyPowerStoneReforge = value.filter { it.isReforgeStone }
+        }
+
+    var nonePowerStoneReforge: List<Reforge> = emptyList()
+        private set
+
+    var onlyPowerStoneReforge: List<Reforge> = emptyList()
+        private set
+
+    enum class ReforgeType {
+        SWORD,
+        BOW,
+        ARMOR,
+        CHESTPLATE,
+        HELMET,
+        CLOAK,
+        AXE,
+        HOE,
+        AXE_AND_HOE,
+        PICKAXE,
+        EQUIPMENT,
+        ROD,
+        SWORD_AND_ROD,
+        SPECIAL_ITEMS,
+        VACUUM
+    }
+
+    class Reforge(
+        val name: String,
+        val type: ReforgeType,
+        val stats: Map<LorenzRarity, SkyblockStatList>,
+        val reforgeStone: NEUInternalName? = null,
+        val specialItems: List<NEUInternalName>? = null,
+        val extraProperty: Map<LorenzRarity, String> = emptyMap(),
+        val costs: Map<LorenzRarity, Long>? = null,
+    ) {
+
+        val isReforgeStone = reforgeStone != null
+
+        val rawReforgeStoneName = reforgeStone?.itemNameWithoutColor
+
+        val lowercaseName = name.lowercase()
+
+        fun isValid(itemStack: ItemStack) = isValid(itemStack.getItemCategoryOrNull(), itemStack.getInternalName())
+
+        fun isValid(itemCategory: ItemCategory?, internalName: NEUInternalName) = when (type) {
+            ReforgeType.SWORD -> setOf(
+                ItemCategory.SWORD,
+                ItemCategory.GAUNTLET,
+                ItemCategory.LONGSWORD,
+                ItemCategory.FISHING_WEAPON,
+            ).contains(itemCategory)
+
+            ReforgeType.BOW -> itemCategory == ItemCategory.BOW || itemCategory == ItemCategory.SHORT_BOW
+            ReforgeType.ARMOR -> setOf(
+                ItemCategory.HELMET,
+                ItemCategory.CHESTPLATE,
+                ItemCategory.LEGGINGS,
+                ItemCategory.BOOTS,
+            ).contains(itemCategory)
+
+            ReforgeType.CHESTPLATE -> itemCategory == ItemCategory.CHESTPLATE
+            ReforgeType.HELMET -> itemCategory == ItemCategory.HELMET
+            ReforgeType.CLOAK -> itemCategory == ItemCategory.CLOAK
+            ReforgeType.AXE -> itemCategory == ItemCategory.AXE
+            ReforgeType.HOE -> itemCategory == ItemCategory.HOE
+            ReforgeType.AXE_AND_HOE -> itemCategory == ItemCategory.HOE || itemCategory == ItemCategory.AXE
+            ReforgeType.PICKAXE ->
+                itemCategory == ItemCategory.PICKAXE ||
+                    itemCategory == ItemCategory.DRILL ||
+                    itemCategory == ItemCategory.GAUNTLET
+
+            ReforgeType.EQUIPMENT -> setOf(
+                ItemCategory.CLOAK,
+                ItemCategory.BELT,
+                ItemCategory.NECKLACE,
+                ItemCategory.BRACELET,
+                ItemCategory.GLOVES,
+            ).contains(itemCategory)
+
+            ReforgeType.ROD -> itemCategory == ItemCategory.FISHING_ROD || itemCategory == ItemCategory.FISHING_WEAPON
+            ReforgeType.SWORD_AND_ROD -> setOf(
+                ItemCategory.SWORD,
+                ItemCategory.GAUNTLET,
+                ItemCategory.LONGSWORD,
+                ItemCategory.FISHING_ROD,
+                ItemCategory.FISHING_WEAPON,
+            ).contains(itemCategory)
+
+            ReforgeType.VACUUM -> itemCategory == ItemCategory.VACUUM
+            ReforgeType.SPECIAL_ITEMS -> specialItems?.contains(internalName) ?: false
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Reforge
+
+            if (name != other.name) return false
+            if (type != other.type) return false
+            if (stats != other.stats) return false
+            if (reforgeStone != other.reforgeStone) return false
+            if (specialItems != other.specialItems) return false
+            if (extraProperty != other.extraProperty) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = name.hashCode()
+            result = 31 * result + type.hashCode()
+            result = 31 * result + stats.hashCode()
+            result = 31 * result + (reforgeStone?.hashCode() ?: 0)
+            result = 31 * result + (specialItems?.hashCode() ?: 0)
+            result = 31 * result + extraProperty.hashCode()
+            return result
+        }
+
+        override fun toString(): String = "Reforge $name"
+    }
+
+    @SubscribeEvent
+    fun onNeuRepoReload(event: NeuRepositoryReloadEvent) {
+        val reforgeStoneData = event.readConstant<Map<String, NeuReforgeJson>>("reforgestones", reforgeGson).values
+        val reforgeData = event.readConstant<Map<String, NeuReforgeJson>>("reforges", reforgeGson).values
+        reforgeList = (reforgeStoneData + reforgeData).map(::mapReforge)
+    }
+
+    private val reforgeGson: Gson = BaseGsonBuilder.gson()
+        .registerTypeAdapter(SkyblockStat::class.java, SkyHanniTypeAdapters.SKYBLOCK_STAT.nullSafe())
+        .registerTypeAdapter(
+            SkyblockStatList::class.java,
+            object : TypeAdapter<SkyblockStatList>() {
+                override fun write(out: JsonWriter, value: SkyblockStatList) {
+                    out.beginObject()
+                    value.entries.forEach {
+                        out.name(it.key.name.lowercase()).value(it.value)
+                    }
+                    out.endObject()
+                }
+
+                override fun read(reader: JsonReader): SkyblockStatList {
+                    reader.beginObject()
+                    val list = SkyblockStatList()
+                    while (reader.hasNext()) {
+                        val name = reader.nextName()
+                        val value = reader.nextDouble()
+                        list[SkyblockStat.valueOf(name.uppercase())] = value
+                    }
+                    reader.endObject()
+                    return list
+                }
+            },
+        ).create()
+
+    private fun mapReforge(it: NeuReforgeJson): Reforge {
+        val type = it.itemType
+        return Reforge(
+            name = it.reforgeName,
+            type = LorenzUtils.enumValueOf<ReforgeType>(type.first),
+            stats = it.reforgeStats ?: emptyMap(),
+            reforgeStone = it.internalName,
+            specialItems = type.second.takeIf { it.isNotEmpty() },
+            extraProperty = it.reforgeAbility,
+            costs = it.reforgeCosts,
+        )
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
index 990399d62b89..f6818d2c8969 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
@@ -52,6 +52,11 @@ public static class HarpConfig {
     @Accordion
     public TiaRelayConfig tiaRelay = new TiaRelayConfig();
 
+    @Expose
+    @ConfigOption(name = "Reforge Helper", desc = "")
+    @Accordion
+    public ReforgeHelperConfig reforge = new ReforgeHelperConfig();
+
     @Expose
     @ConfigOption(name = "Enchanting", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
new file mode 100644
index 000000000000..43bba7f8c61b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
@@ -0,0 +1,36 @@
+package at.hannibal2.skyhanni.config.features.inventory.helper;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ReforgeHelperConfig {
+
+    @Expose
+    @ConfigLink(owner = ReforgeHelperConfig.class, field = "enabled")
+    public Position position = new Position(80, 85, true, true);
+
+    @Expose
+    @ConfigOption(name = "Enable", desc = "Enables the reforge helper.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Stones Hex Only", desc = "Displays reforge stones only when in Hex.")
+    @ConfigEditorBoolean
+    public boolean reforgeStonesOnlyHex = true;
+
+    @Expose
+    @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the slecetion list.")
+    @ConfigEditorBoolean
+    public boolean showDiff = false;
+
+    @Expose
+    @ConfigOption(name = "Hide chat", desc = "Hides the vanilla chat messages from reforging.")
+    @ConfigEditorBoolean
+    public boolean hideChat = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeJson.kt
similarity index 70%
rename from src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt
rename to src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeJson.kt
index 8ebe2dea60fe..a8c8f3fe4646 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeJson.kt
@@ -1,21 +1,26 @@
 package at.hannibal2.skyhanni.data.jsonobjects.repo.neu
 
+import at.hannibal2.skyhanni.data.model.SkyblockStatList
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import net.minecraft.item.Item
 
-data class NeuReforgeStoneJson(
-    @Expose val internalName: NEUInternalName,
+data class NeuReforgeJson(
+    @Expose val internalName: NEUInternalName?,
     @Expose val reforgeName: String,
     @Expose @SerializedName("itemTypes") val rawItemTypes: Any,
     @Expose val requiredRarities: List<LorenzRarity>,
-    @Expose val reforgeCosts: Map<LorenzRarity, Long>,
-    @Expose val reforgeStats: Map<LorenzRarity, Map<String, Double>>,
+    @Expose val reforgeCosts: Map<LorenzRarity, Long>?,
+    @Expose val reforgeStats: Map<LorenzRarity, SkyblockStatList>?,
     @Expose @SerializedName("reforgeAbility") val rawReforgeAbility: Any?,
 ) {
 
     private lateinit var reforgeAbilityField: Map<LorenzRarity, String>
+    private lateinit var itemTypeField: Pair<String, List<NEUInternalName>>
 
     val reforgeAbility
         get() = if (this::reforgeAbilityField.isInitialized) reforgeAbilityField
@@ -27,7 +32,7 @@ data class NeuReforgeStoneJson(
 
                 is Map<*, *> -> (this.rawReforgeAbility as? Map<String, String>)?.mapKeys {
                     LorenzRarity.valueOf(
-                        it.key.uppercase().replace(" ", "_")
+                        it.key.uppercase().replace(" ", "_"),
                     )
                 } ?: emptyMap()
 
@@ -36,28 +41,27 @@ data class NeuReforgeStoneJson(
             reforgeAbilityField
         }
 
-    /* used in ReforgeAPI which isn't in beta yet
-        val itemType: Pair<String, List<NEUInternalName>> by lazy {
+    val itemType: Pair<String, List<NEUInternalName>>
+        get() = if (this::itemTypeField.isInitialized) itemTypeField
+        else run {
             val any = this.rawItemTypes
-            return@lazy when (any) {
+            return when (any) {
                 is String -> {
                     any.replace("/", "_AND_").uppercase() to emptyList()
                 }
 
                 is Map<*, *> -> {
                     val type = "SPECIAL_ITEMS"
-                    val map = any as? Map<String, List<String>> ?: return@lazy type to emptyList()
+                    val map = any as? Map<String, List<String>> ?: return type to emptyList()
                     val internalNames = map["internalName"]?.map { it.asInternalName() } ?: emptyList()
                     val itemType = map["itemid"]?.map {
                         NEUItems.getInternalNamesForItemId(Item.getByNameOrId(it))
-                    }?.flatten()
-                        ?: emptyList()
+                    }?.flatten() ?: emptyList()
                     type to (internalNames + itemType)
                 }
 
                 else -> throw IllegalStateException()
             }
         }
-*/
 }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
new file mode 100644
index 000000000000..161ec76f5ad6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -0,0 +1,80 @@
+package at.hannibal2.skyhanni.data.model
+
+import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
+import net.minecraft.client.Minecraft
+import java.util.EnumMap
+
+enum class SkyblockStat(val icon: String) {
+    DAMAGE("§c❁"),
+    HEALTH("§c❤"),
+    DEFENSE("§a❈"),
+    STRENGTH("§c❁"),
+    INTELLIGENCE("§b✎"),
+    CRIT_DAMAGE("§9☠"),
+    CRIT_CHANCE("§9☣"),
+    FEROCITY("§c⫽"),
+    BONUS_ATTACK_SPEED("§e⚔"),
+    ABILITY_DAMAGE("§c๑"),
+    HEALTH_REGEN("§c❣"),
+    VITALITY("§4♨"),
+    MENDING("§a☄"),
+    TRUE_DEFENCE("§7❂"),
+    SWING_RANGE("§eⓈ"),
+    SPEED("§f✦"),
+    SEA_CREATURE_CHANCE("§3α"),
+    MAGIC_FIND("§b✯"),
+    PET_LUCK("§d♣"),
+    FISHING_SPEED("§b☂"),
+    BONUS_PEST_CHANCE("§2ൠ"),
+    COMBAT_WISDOM("§3☯"),
+    MINING_WISDOM("§3☯"),
+    FARMING_WISDOM("§3☯"),
+    FORAGING_WISDOM("§3☯"),
+    FISHING_WISDOM("§3☯"),
+    ENCHANTING_WISDOM("§3☯"),
+    ALCHEMY_WISDOM("§3☯"),
+    CARPENTRY_WISDOM("§3☯"),
+    RUNECRAFTING_WISDOM("§3☯"),
+    SOCIAL_WISDOM("§3☯"),
+    TAMING_WISDOM("§3☯"),
+    MINING_SPEED("§6⸕"),
+    BREAKING_POWER("§2Ⓟ"),
+    PRISTINE("§5✧"),
+    FORAGING_FORTUNE("§☘"),
+    FARMING_FORTUNE("§6☘"),
+    MINING_FORTUNE("§6☘"),
+    FEAR("§a☠")
+    ;
+
+    val capitalizedName = name.lowercase().allLettersFirstUppercase()
+
+    val iconWithName = "$icon $capitalizedName"
+
+    fun asString(value: Int) = (if (value > 0) "+" else "") + value.toString() + " " + this.icon
+
+    companion object {
+        val fontSizeOfLargestIcon by lazy {
+            entries.maxOf { Minecraft.getMinecraft().fontRendererObj.getStringWidth(it.icon) } + 1
+        }
+    }
+}
+
+class SkyblockStatList : EnumMap<SkyblockStat, Double>(SkyblockStat::class.java), Map<SkyblockStat, Double> {
+    operator fun minus(other: SkyblockStatList): SkyblockStatList {
+        return SkyblockStatList().apply {
+            val keys = this.keys + other.keys
+            for (key in keys) {
+                this[key] = (this@SkyblockStatList[key] ?: 0.0) - (other[key] ?: 0.0)
+            }
+        }
+    }
+
+    companion object {
+        fun mapOf(vararg list: Pair<SkyblockStat, Double>) = SkyblockStatList().apply {
+            for ((key, value) in list) {
+                this[key] = value
+            }
+        }
+    }
+}
+
diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
index a02cb308fb82..6f7df596422b 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.NEUItems.manager
 import at.hannibal2.skyhanni.utils.json.fromJson
+import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonSyntaxException
 import java.io.File
@@ -13,14 +14,14 @@ class NeuRepositoryReloadEvent : LorenzEvent() {
         return manager.getJsonFromFile(File(manager.repoLocation, "constants/$file.json"))
     }
 
-    inline fun <reified T : Any> readConstant(file: String): T {
+    inline fun <reified T : Any> readConstant(file: String, gson: Gson = ConfigManager.gson): T {
         val data = getConstant(file) ?: ErrorManager.skyHanniError("$file failed to load from neu repo!")
         return try {
-            ConfigManager.gson.fromJson<T>(data)
+            gson.fromJson<T>(data)
         } catch (e: JsonSyntaxException) {
             ErrorManager.logErrorWithData(
                 e, "$file failed to read from neu repo!",
-                "data" to data
+                "data" to data,
             )
             throw e
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
new file mode 100644
index 000000000000..d1826b481896
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
@@ -0,0 +1,432 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.ReforgeAPI
+import at.hannibal2.skyhanni.data.model.SkyblockStat
+import at.hannibal2.skyhanni.data.model.SkyblockStatList
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.toStringWithPlus
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.drawSlotText
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getReforgeName
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.ticks
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
+import net.minecraft.init.Items
+import net.minecraft.inventory.Container
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+import java.util.concurrent.atomic.AtomicBoolean
+import at.hannibal2.skyhanni.utils.renderables.Renderable.Companion.string as renderableString
+
+@SkyHanniModule
+object ReforgeHelper {
+
+    private val config get() = SkyHanniMod.feature.inventory.helper.reforge
+
+    private val repoGroup = RepoPattern.group("reforge")
+
+    private val reforgeMenu by repoGroup.pattern(
+        "menu.blacksmith",
+        "Reforge Item",
+    )
+    private val reforgeHexMenu by repoGroup.pattern(
+        "menu.hex",
+        "The Hex ➜ Reforges",
+    )
+    private val reforgeChatMessage by repoGroup.pattern(
+        "chat.success",
+        "§aYou reforged your .* §r§ainto a .*!|§aYou applied a .* §r§ato your .*!",
+    )
+    private val reforgeChatFail by repoGroup.pattern(
+        "chat.fail",
+        "§cWait a moment before reforging again!|§cWhoa! Slow down there!",
+    )
+
+    private var isInReforgeMenu = false
+    private var isInHexReforgeMenu = false
+
+    private fun isReforgeMenu(chestName: String) = reforgeMenu.matches(chestName)
+    private fun isHexReforgeMenu(chestName: String) = reforgeHexMenu.matches(chestName)
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && isInReforgeMenu
+
+    private var itemToReforge: ItemStack? = null
+    private var inventoryContainer: Container? = null
+
+    private var currentReforge: ReforgeAPI.Reforge? = null
+    private var reforgeToSearch: ReforgeAPI.Reforge? = null
+
+    private var hoveredReforge: ReforgeAPI.Reforge? = null
+
+    private val reforgeItem get() = if (isInHexReforgeMenu) 19 else 13
+    private val reforgeButton get() = if (isInHexReforgeMenu) 48 else 22
+
+    private const val HEX_REFORGE_NEXT_DOWN_BUTTON = 35
+    private const val HEX_REFORGE_NEXT_UP_BUTTON = 17
+
+    private const val EXIT_BUTTON = 40
+
+    private var waitForChat = AtomicBoolean(false)
+
+    /** Gatekeeps instant double switches of the state */
+    private var waitDelay = false
+
+    private var sortAfter: SkyblockStat? = null
+
+    private var display: List<Renderable> = generateDisplay()
+
+    private val hoverColor = LorenzColor.GOLD.addOpacity(50)
+    private val selectedColor = LorenzColor.BLUE.addOpacity(100)
+    private val finishedColor = LorenzColor.GREEN.addOpacity(75)
+
+    private fun itemUpdate() {
+        val newItem = inventoryContainer?.getSlot(reforgeItem)?.stack
+        if (newItem?.getInternalName() != itemToReforge?.getInternalName()) {
+            reforgeToSearch = null
+        }
+        itemToReforge = newItem
+        val newReforgeName = itemToReforge?.getReforgeName() ?: ""
+        if (newReforgeName == currentReforge?.lowercaseName) return
+        currentReforge = ReforgeAPI.reforgeList.firstOrNull { it.lowercaseName == newReforgeName }
+        updateDisplay()
+    }
+
+    @SubscribeEvent
+    fun onClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!isEnabled()) return
+        if (event.slot?.slotNumber == reforgeButton) {
+            if (event.slot.stack?.name == "§eReforge Item" || event.slot.stack?.name == "§cError!") return
+            if (handleReforgeButtonClick(event)) return
+        }
+
+        DelayedRun.runNextTick {
+            itemUpdate()
+        }
+    }
+
+    private fun handleReforgeButtonClick(event: GuiContainerEvent.SlotClickEvent): Boolean {
+        if (currentReforge == reforgeToSearch) {
+            event.cancel()
+            waitForChat.set(false)
+            SoundUtils.playBeepSound()
+        } else if (waitForChat.get()) {
+            waitDelay = true
+            event.cancel()
+        } else {
+            if (event.clickedButton == 2) return true
+            if (waitDelay) {
+                waitDelay = false
+            } else {
+                waitForChat.set(true)
+            }
+        }
+        return false
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        when {
+            reforgeChatMessage.matches(event.message) -> {
+                DelayedRun.runDelayed(2.ticks) {
+                    itemUpdate()
+                    waitForChat.set(false)
+                }
+                if (config?.hideChat == true) {
+                    event.blockedReason = "reforge_hide"
+                }
+            }
+
+            reforgeChatFail.matches(event.message) -> {
+                DelayedRun.runDelayed(2.ticks) {
+                    waitForChat.set(false)
+                }
+                if (config?.hideChat == true) {
+                    event.blockedReason = "reforge_hide"
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onOpen(event: InventoryFullyOpenedEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        when {
+            isHexReforgeMenu(event.inventoryName) -> {
+                isInHexReforgeMenu = true
+                DelayedRun.runDelayed(2.ticks) {
+                    itemUpdate() // update since an item must already be in place
+                }
+            }
+
+            isReforgeMenu(event.inventoryName) -> {
+                itemToReforge = null
+                currentReforge = null
+            }
+
+            else -> return
+        }
+        isInReforgeMenu = true
+        waitForChat.set(false)
+        DelayedRun.runNextTick {
+            inventoryContainer = Minecraft.getMinecraft().thePlayer.openContainer
+        }
+    }
+
+    @SubscribeEvent
+    fun onClose(event: InventoryCloseEvent) {
+        if (!isInReforgeMenu) return
+        isInReforgeMenu = false
+        isInHexReforgeMenu = false
+        reforgeToSearch = null
+        currentReforge = null
+        hoveredReforge = null
+        sortAfter = null
+        itemToReforge = null
+        display = emptyList()
+    }
+
+    private fun updateDisplay() {
+        display = generateDisplay()
+    }
+
+    private fun generateDisplay() = buildList<Renderable> {
+        this.add(renderableString("§6Reforge Overlay"))
+
+        val item = itemToReforge ?: run {
+            reforgeToSearch = null
+            return@buildList
+        }
+
+        val internalName = item.getInternalName()
+        val itemType = item.getItemCategoryOrNull()
+        val itemRarity = item.getItemRarityOrNull() ?: return@buildList
+
+        val rawReforgeList =
+            if (!isInHexReforgeMenu && config.reforgeStonesOnlyHex) ReforgeAPI.nonePowerStoneReforge else ReforgeAPI.reforgeList
+        val reforgeList = rawReforgeList.filter { it.isValid(itemType, internalName) }
+
+        val statTypes = reforgeList.mapNotNull { it.stats[itemRarity]?.keys }.flatten().toSet()
+
+        val statTypeButtons = (listOf(getStatButton(null)) + statTypes.map { getStatButton(it) }).chunked(9)
+        this.add(Renderable.table(statTypeButtons, xPadding = 3, yPadding = 2))
+
+        val list = reforgeList.sortedWith(getSortSelector(itemRarity, sortAfter)).map(getReforgeView(itemRarity))
+        this.addAll(list)
+    }
+
+    private fun getReforgeColour(reforge: ReforgeAPI.Reforge) = when {
+        currentReforge == reforge -> "§6"
+        reforgeToSearch == reforge -> "§3"
+        reforge.isReforgeStone -> "§9"
+        else -> "§7"
+    }
+
+    private fun getReforgeView(itemRarity: LorenzRarity): (ReforgeAPI.Reforge) -> Renderable = { reforge ->
+        val text = getReforgeColour(reforge) + reforge.name
+        val tips = getReforgeTips(reforge, itemRarity)
+        val onHover = if (!isInHexReforgeMenu) {
+            {}
+        } else {
+            { hoveredReforge = reforge }
+        }
+
+        Renderable.clickAndHover(
+            text, tips,
+            onClick = {
+                SoundUtils.playClickSound()
+                reforgeToSearch = reforge
+                updateDisplay()
+            },
+            onHover = onHover,
+        )
+    }
+
+    private fun getReforgeTips(
+        reforge: ReforgeAPI.Reforge,
+        itemRarity: LorenzRarity,
+    ): List<Renderable> {
+        val stats: List<Renderable>
+        val removedEffect: List<Renderable>
+        val addEffectText: String
+        val click: List<Renderable>
+        if (currentReforge == reforge) {
+            stats = currentReforge?.stats?.get(itemRarity)?.print() ?: emptyList()
+            removedEffect = emptyList()
+            addEffectText = "§aEffect:"
+            click = listOf(renderableString(""), renderableString("§3Reforge is currently applied!"))
+        } else {
+            stats = reforge.stats[itemRarity]?.print(currentReforge?.stats?.get(itemRarity)) ?: emptyList()
+            removedEffect = getReforgeEffect(
+                currentReforge,
+                itemRarity,
+            )?.let { listOf(renderableString("§cRemoves Effect:")) + it }?.takeIf { config.showDiff } ?: emptyList()
+            addEffectText = "§aAdds Effect:"
+            click = if (reforgeToSearch != reforge) {
+                listOf(renderableString(""), renderableString("§eClick to select!"))
+            } else emptyList()
+        }
+
+        val addedEffect = getReforgeEffect(reforge, itemRarity)?.let { listOf(renderableString(addEffectText)) + it } ?: emptyList()
+
+        return listOf(renderableString("§6Reforge Stats")) + stats + removedEffect + addedEffect + click
+    }
+
+    private fun getReforgeEffect(reforge: ReforgeAPI.Reforge?, rarity: LorenzRarity) =
+        reforge?.extraProperty?.get(rarity)?.let {
+            Renderable.wrappedString(
+                it,
+                190,
+                color = LorenzColor.GRAY.toColor(),
+            )
+        }
+
+    private fun getSortSelector(
+        itemRarity: LorenzRarity,
+        sorting: SkyblockStat?,
+    ): Comparator<ReforgeAPI.Reforge> =
+        if (sorting != null) {
+            Comparator.comparing<ReforgeAPI.Reforge, Double> { it.stats[itemRarity]?.get(sorting) ?: 0.0 }.reversed()
+        } else {
+            Comparator.comparing { it.isReforgeStone }
+        }
+
+    private fun getStatButton(stat: SkyblockStat?): Renderable {
+        val icon: String
+        val tip: String
+        if (stat == null) {
+            icon = "§7D"
+            tip = "§7Default"
+        } else {
+            icon = stat.icon
+            tip = stat.iconWithName
+        }
+
+        val alreadySelected = sortAfter == stat
+        val fieldColor = if (alreadySelected) LorenzColor.GRAY else LorenzColor.DARK_GRAY
+
+
+        val tips = if (alreadySelected) {
+            listOf("§6Sort by", tip)
+        } else {
+            listOf("§6Sort by", tip, "", "§eClick to apply sorting!")
+        }
+        val sortField =
+            Renderable.drawInsideRoundedRect(
+                Renderable.hoverTips(
+                    Renderable.fixedSizeLine(
+                        renderableString(icon, horizontalAlign = RenderUtils.HorizontalAlignment.CENTER),
+                        SkyblockStat.fontSizeOfLargestIcon,
+                    ),
+                    tips,
+                ),
+                fieldColor.toColor(), radius = 15, padding = 1,
+            )
+        return if (alreadySelected) {
+            sortField
+        } else {
+            Renderable.clickable(
+                sortField,
+                {
+                    sortAfter = stat
+                    updateDisplay()
+                },
+            )
+        }
+    }
+
+    @SubscribeEvent
+    fun onRender(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        config.position.renderRenderables(display, posLabel = "Reforge Overlay")
+    }
+
+    @SubscribeEvent
+    fun onForegroundDrawn(event: GuiContainerEvent.ForegroundDrawnEvent) {
+        if (!isEnabled()) return
+        if (currentReforge == null) return
+
+        inventoryContainer?.getSlot(reforgeItem)?.let {
+            event.drawSlotText(it.xDisplayPosition - 5, it.yDisplayPosition, "§e${currentReforge?.name}", 1f)
+        }
+    }
+
+    @SubscribeEvent
+    fun onGuiContainerBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+        if (hoveredReforge != null && isInHexReforgeMenu) {
+            if (hoveredReforge != currentReforge) {
+                colorReforgeStone(hoverColor, hoveredReforge?.rawReforgeStoneName ?: "Random Basic Reforge")
+            } else {
+                inventoryContainer?.getSlot(reforgeItem)?.highlight(hoverColor)
+
+                //?.get(reforgeItem)?. = hoverColor
+            }
+            hoveredReforge = null
+        }
+
+        if (reforgeToSearch == null) return
+        if (reforgeToSearch != currentReforge) {
+            colorSelected()
+        } else {
+            inventoryContainer?.getSlot(reforgeItem)?.highlight(finishedColor)
+        }
+    }
+
+    private fun colorSelected() = if (reforgeToSearch?.isReforgeStone == true) {
+        if (isInHexReforgeMenu) {
+            colorReforgeStone(selectedColor, reforgeToSearch?.rawReforgeStoneName)
+        } else {
+            inventoryContainer?.getSlot(EXIT_BUTTON)?.highlight(selectedColor)
+        }
+    } else {
+        inventoryContainer?.getSlot(reforgeButton)?.highlight(selectedColor)
+    }
+
+    private fun colorReforgeStone(color: Color, reforgeStone: String?) {
+        val inventory = inventoryContainer?.inventorySlots ?: return
+        val slot = inventory.firstOrNull { it?.stack?.cleanName() == reforgeStone }
+        if (slot != null) {
+            slot highlight color
+        } else {
+            inventory[HEX_REFORGE_NEXT_DOWN_BUTTON]?.takeIf { it.stack.item == Items.skull }?.highlight(color)
+            inventory[HEX_REFORGE_NEXT_UP_BUTTON]?.takeIf { it.stack.item == Items.skull }?.highlight(color)
+        }
+    }
+
+    private fun SkyblockStatList.print(appliedReforge: SkyblockStatList? = null): List<Renderable> {
+        val diff = appliedReforge?.takeIf { config.showDiff }?.let { this - it }
+        val main = ((diff ?: this).mapNotNull {
+            val key = it.key
+            val value = this[key] ?: 0.0
+            buildList<Renderable> {
+                add(renderableString("§9${value.toStringWithPlus().removeSuffix(".0")}"))
+                diff?.get(key)?.let { add(renderableString((if (it < 0) "§c" else "§a") + it.toStringWithPlus().removeSuffix(".0"))) }
+                add(renderableString(key.iconWithName))
+            }
+        })
+        val table = Renderable.table(main, 5)
+        return listOf(table)
+    }
+}
+
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 724583e20fee..dee0a6749b73 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.jsonobjects.repo.ItemsJson
-import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuReforgeStoneJson
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
@@ -45,7 +44,6 @@ object EstimatedItemValue {
     private val cache = mutableMapOf<ItemStack, List<List<Any>>>()
     private var lastToolTipTime = 0L
     var gemstoneUnlockCosts = HashMap<NEUInternalName, HashMap<String, List<String>>>()
-    var reforges = mapOf<NEUInternalName, NeuReforgeStoneJson>()
     var bookBundleAmount = mapOf<String, Int>()
     private var currentlyShowing = false
 
@@ -55,8 +53,6 @@ object EstimatedItemValue {
     fun onNeuRepoReload(event: NeuRepositoryReloadEvent) {
         gemstoneUnlockCosts =
             event.readConstant<HashMap<NEUInternalName, HashMap<String, List<String>>>>("gemstonecosts")
-        reforges =
-            event.readConstant<Map<NEUInternalName, NeuReforgeStoneJson>>("reforgestones")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index e1619ad92107..05d53fa657d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc.items
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.ReforgeAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -130,7 +131,7 @@ object EstimatedItemValueCalculator {
             )
             if (price != null) {
                 val name = attributes[0].first.fixMending().allLettersFirstUppercase()
-                list.add("§7Attribute §9$name ${attributes[0].second}§7: (§6${price.shortFormat()}§7)",)
+                list.add("§7Attribute §9$name ${attributes[0].second}§7: (§6${price.shortFormat()}§7)")
                 return price
             }
         }
@@ -214,15 +215,15 @@ object EstimatedItemValueCalculator {
     private fun addReforgeStone(stack: ItemStack, list: MutableList<String>): Double {
         val rawReforgeName = stack.getReforgeName() ?: return 0.0
 
-        val reforge = EstimatedItemValue.reforges.values.firstOrNull {
-            rawReforgeName == it.reforgeName.lowercase() || rawReforgeName == it.internalName.asString().lowercase()
+        val reforge = ReforgeAPI.onlyPowerStoneReforge.firstOrNull {
+            rawReforgeName == it.lowercaseName || rawReforgeName == it.reforgeStone?.asString()?.lowercase()
         } ?: return 0.0
-        val internalName = reforge.internalName.asString().asInternalName()
+        val internalName = reforge.reforgeStone ?: return 0.0
         val reforgeStonePrice = internalName.getPrice()
         val reforgeStoneName = internalName.itemName
-        val applyCost = getReforgeStoneApplyCost(stack, reforge.reforgeCosts, internalName) ?: return 0.0
+        val applyCost = reforge.costs?.let { getReforgeStoneApplyCost(stack, it, internalName) } ?: return 0.0
 
-        list.add("§7Reforge: §9${reforge.reforgeName}")
+        list.add("§7Reforge: §9${reforge.name}")
         list.add("  §7Stone $reforgeStoneName §7(§6" + reforgeStonePrice.shortFormat() + "§7)")
         list.add("  §7Apply cost: (§6" + applyCost.shortFormat() + "§7)")
         return reforgeStonePrice + applyCost
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index bb2d3fd3edf0..4b334d0270f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -42,6 +42,7 @@ import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.client.renderer.RenderHelper
 import net.minecraft.init.Blocks
 import net.minecraft.init.Items
+import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -54,35 +55,39 @@ object NEUItems {
     private val multiplierCache = mutableMapOf<NEUInternalName, PrimitiveItemStack>()
     private val recipesCache = mutableMapOf<NEUInternalName, Set<NeuRecipe>>()
     private val ingredientsCache = mutableMapOf<NeuRecipe, Set<Ingredient>>()
+    private val itemIdCache = mutableMapOf<Item, List<NEUInternalName>>()
 
     private val hypixelApiGson by lazy {
         BaseGsonBuilder.gson()
-            .registerTypeAdapter(HypixelApiTrophyFish::class.java, object : TypeAdapter<HypixelApiTrophyFish>() {
-                override fun write(out: JsonWriter, value: HypixelApiTrophyFish) {}
-
-                override fun read(reader: JsonReader): HypixelApiTrophyFish {
-                    val trophyFish = mutableMapOf<String, Int>()
-                    var totalCaught = 0
-                    reader.beginObject()
-                    while (reader.hasNext()) {
-                        val key = reader.nextName()
-                        if (key == "total_caught") {
-                            totalCaught = reader.nextInt()
-                            continue
-                        }
-                        if (reader.peek() == JsonToken.NUMBER) {
-                            val valueAsString = reader.nextString()
-                            if (valueAsString.isInt()) {
-                                trophyFish[key] = valueAsString.toInt()
+            .registerTypeAdapter(
+                HypixelApiTrophyFish::class.java,
+                object : TypeAdapter<HypixelApiTrophyFish>() {
+                    override fun write(out: JsonWriter, value: HypixelApiTrophyFish) {}
+
+                    override fun read(reader: JsonReader): HypixelApiTrophyFish {
+                        val trophyFish = mutableMapOf<String, Int>()
+                        var totalCaught = 0
+                        reader.beginObject()
+                        while (reader.hasNext()) {
+                            val key = reader.nextName()
+                            if (key == "total_caught") {
+                                totalCaught = reader.nextInt()
                                 continue
                             }
+                            if (reader.peek() == JsonToken.NUMBER) {
+                                val valueAsString = reader.nextString()
+                                if (valueAsString.isInt()) {
+                                    trophyFish[key] = valueAsString.toInt()
+                                    continue
+                                }
+                            }
+                            reader.skipValue()
                         }
-                        reader.skipValue()
+                        reader.endObject()
+                        return HypixelApiTrophyFish(totalCaught, trophyFish)
                     }
-                    reader.endObject()
-                    return HypixelApiTrophyFish(totalCaught, trophyFish)
-                }
-            }.nullSafe())
+                }.nullSafe(),
+            )
             .create()
     }
 
@@ -94,7 +99,7 @@ object NEUItems {
         Utils.createItemStack(
             ItemStack(Blocks.barrier).item,
             "§cMissing Repo Item",
-            "§cYour NEU repo seems to be out of date"
+            "§cYour NEU repo seems to be out of date",
         )
     }
 
@@ -119,7 +124,7 @@ object NEUItems {
         } catch (e: Exception) {
             ErrorManager.logErrorWithData(
                 e, "Error reading hypixel player api data",
-                "data" to apiData
+                "data" to apiData,
             )
         }
     }
@@ -210,7 +215,7 @@ object NEUItems {
                     "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
                     "Discord if this is the case.",
                 "Item name" to this.asString(),
-                "repo commit" to manager.latestRepoCommit
+                "repo commit" to manager.latestRepoCommit,
             )
             fallbackItem
         }
@@ -225,7 +230,7 @@ object NEUItems {
         x: Float,
         y: Float,
         scaleMultiplier: Double = itemFontSize,
-        rescaleSkulls: Boolean = true
+        rescaleSkulls: Boolean = true,
     ) {
         val item = checkBlinkItem()
         val isSkull = rescaleSkulls && item.item === Items.skull
@@ -281,13 +286,24 @@ object NEUItems {
 
     fun allNeuRepoItems(): Map<String, JsonObject> = NotEnoughUpdates.INSTANCE.manager.itemInformation
 
+    fun getInternalNamesForItemId(item: Item): List<NEUInternalName> {
+        itemIdCache[item]?.let {
+            return it
+        }
+        val result = allNeuRepoItems()
+            .filter { Item.getByNameOrId(it.value.get("itemid").asString) == item }
+            .keys.map { it.asInternalName() }
+        itemIdCache[item] = result
+        return result
+    }
+
     fun getPrimitiveMultiplier(internalName: NEUInternalName, tryCount: Int = 0): PrimitiveItemStack {
         multiplierCache[internalName]?.let { return it }
         if (tryCount == 10) {
             ErrorManager.logErrorStateWithData(
                 "Could not load recipe data.",
                 "Failed to find item multiplier",
-                "internalName" to internalName
+                "internalName" to internalName,
             )
             return internalName.makePrimitiveStack()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index 1ee34699c4a8..b97298ce43dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -33,7 +33,7 @@ object NumberUtil {
             5 to "V",
             4 to "IV",
             1 to "I",
-        )
+        ),
     )
 
     @Deprecated("outdated", ReplaceWith("value.shortFormat(preciseBillions)"))
@@ -170,6 +170,8 @@ object NumberUtil {
         } else romanSymbols[l] + (this - l).toRoman()
     }
 
+    fun Number.toStringWithPlus() = (if (this.toDouble() >= 0.0) "+" else "") + this.toString()
+
     private fun processDecimal(decimal: Int, lastNumber: Int, lastDecimal: Int) = if (lastNumber > decimal) {
         lastDecimal - decimal
     } else {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
index dc50eef74a2a..7859853ca45f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.utils.json
 
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.SkyblockStat
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
 import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.pests.PestType
@@ -24,22 +25,22 @@ object SkyHanniTypeAdapters {
 
     val UUID: TypeAdapter<UUID> = SimpleStringTypeAdapter(
         { this.toString() },
-        { java.util.UUID.fromString(this) }
+        { java.util.UUID.fromString(this) },
     )
 
     val INTERNAL_NAME: TypeAdapter<NEUInternalName> = SimpleStringTypeAdapter(
         { this.asString() },
-        { this.asInternalName() }
+        { this.asInternalName() },
     )
 
     val VEC_STRING: TypeAdapter<LorenzVec> = SimpleStringTypeAdapter(
         { "$x:$y:$z" },
-        { LorenzVec.decodeFromString(this) }
+        { LorenzVec.decodeFromString(this) },
     )
 
     val TROPHY_RARITY: TypeAdapter<TrophyRarity> = SimpleStringTypeAdapter(
         { name },
-        { TrophyRarity.getByName(this) ?: error("Could not parse TrophyRarity from '$this'") }
+        { TrophyRarity.getByName(this) ?: error("Could not parse TrophyRarity from '$this'") },
     )
 
     val TIME_MARK: TypeAdapter<SimpleTimeMark> = object : TypeAdapter<SimpleTimeMark>() {
@@ -54,12 +55,17 @@ object SkyHanniTypeAdapters {
 
     val CROP_TYPE: TypeAdapter<CropType> = SimpleStringTypeAdapter(
         { name },
-        { CropType.getByName(this) }
+        { CropType.getByName(this) },
     )
 
     val PEST_TYPE: TypeAdapter<PestType> = SimpleStringTypeAdapter(
         { name },
-        { PestType.getByName(this) }
+        { PestType.getByName(this) },
+    )
+
+    val SKYBLOCK_STAT: TypeAdapter<SkyblockStat> = SimpleStringTypeAdapter(
+        { name.lowercase() },
+        { SkyblockStat.valueOf(this.uppercase()) },
     )
 
     val TRACKER_DISPLAY_MODE = SimpleStringTypeAdapter.forEnum<SkyHanniTracker.DefaultDisplayMode>()
@@ -70,10 +76,13 @@ object SkyHanniTypeAdapters {
         crossinline write: (JsonWriter, T) -> Unit,
         crossinline read: (JsonReader) -> T,
     ): GsonBuilder {
-        this.registerTypeAdapter(T::class.java, object : TypeAdapter<T>() {
-            override fun write(out: JsonWriter, value: T) = write(out, value)
-            override fun read(reader: JsonReader) = read(reader)
-        }.nullSafe())
+        this.registerTypeAdapter(
+            T::class.java,
+            object : TypeAdapter<T>() {
+                override fun write(out: JsonWriter, value: T) = write(out, value)
+                override fun read(reader: JsonReader) = read(reader)
+            }.nullSafe(),
+        )
         return this
     }
 }

From 739a48d4679ce05c1f555a04fcdaa4e509d59d5d Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:18:45 +0200
Subject: [PATCH 010/721] Backend: Drag and Drop for Renderables (#1864)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/events/GuiContainerEvent.kt      |  12 +-
 .../inventory/wardrobe/CustomWardrobe.kt      |   2 +-
 .../skyhanni/mixins/hooks/GuiContainerHook.kt |   7 +-
 .../transformers/gui/MixinGuiContainer.java   |   5 +
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  47 +++++++-
 .../skyhanni/utils/renderables/DragNDrop.kt   | 106 ++++++++++++++++++
 .../skyhanni/utils/renderables/Renderable.kt  |   2 +-
 .../utils/renderables/RenderableUtils.kt      |   7 ++
 8 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/renderables/DragNDrop.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
index 9837e1529e06..34bc2a2a5d13 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
@@ -19,7 +19,7 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container:
     ) : GuiContainerEvent(gui, container)
 
     @Cancelable
-    data class BeforeDraw(
+    data class PreDraw(
         override val gui: GuiContainer,
         override val container: Container,
         val mouseX: Int,
@@ -30,6 +30,14 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container:
             GuiRenderUtils.drawGradientRect(0, 0, gui.width, gui.height, -1072689136, -804253680, 0.0)
     }
 
+    data class PostDraw(
+        override val gui: GuiContainer,
+        override val container: Container,
+        val mouseX: Int,
+        val mouseY: Int,
+        val partialTicks: Float,
+    ) : GuiContainerEvent(gui, container)
+
     @Cancelable
     data class CloseWindowEvent(override val gui: GuiContainer, override val container: Container) :
         GuiContainerEvent(gui, container)
@@ -78,7 +86,7 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container:
             if (this.clickedButton == 2 && this.clickTypeEnum == ClickType.MIDDLE) return
             slot?.slotNumber?.let { slotNumber ->
                 Minecraft.getMinecraft().playerController.windowClick(
-                    container.windowId, slotNumber, 2, 3, Minecraft.getMinecraft().thePlayer
+                    container.windowId, slotNumber, 2, 3, Minecraft.getMinecraft().thePlayer,
                 )
                 isCanceled = true
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
index 1c3f36aebb04..08abfa34dccc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
@@ -58,7 +58,7 @@ object CustomWardrobe {
     private var guiName = "Custom Wardrobe"
 
     @SubscribeEvent
-    fun onGuiRender(event: GuiContainerEvent.BeforeDraw) {
+    fun onGuiRender(event: GuiContainerEvent.PreDraw) {
         if (!isEnabled() || editMode) return
         val renderable = displayRenderable ?: run {
             update()
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
index 041457d25735..552b16f00ce0 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
@@ -36,7 +36,7 @@ class GuiContainerHook(guiAny: Any) {
         ci: CallbackInfo,
     ) {
         if (!SkyHanniDebugsAndTests.globalRender) return
-        if (GuiContainerEvent.BeforeDraw(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()) {
+        if (GuiContainerEvent.PreDraw(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()) {
             NEUApi.setInventoryButtonsToDisabled()
             GuiData.preDrawEventCancelled = true
             ci.cancel()
@@ -47,6 +47,11 @@ class GuiContainerHook(guiAny: Any) {
         }
     }
 
+    fun postDraw(mouseX: Int, mouseY: Int, partialTicks: Float) {
+        if (!SkyHanniDebugsAndTests.globalRender) return
+        GuiContainerEvent.PostDraw(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()
+    }
+
     fun foregroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float) {
         GuiContainerEvent.ForegroundDrawnEvent(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
index c92f2ab7c985..acec9ffac7dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
@@ -36,6 +36,11 @@ private void preDraw(int mouseX, int mouseY, float partialTicks, CallbackInfo ci
         skyHanni$hook.preDraw(mouseX, mouseY, partialTicks, ci);
     }
 
+    @Inject(method = "drawScreen", at = @At("TAIL"))
+    private void postDraw(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
+        skyHanni$hook.postDraw(mouseX, mouseY, partialTicks);
+    }
+
     @Inject(method = "drawScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/inventory/GuiContainer;drawGuiContainerForegroundLayer(II)V", shift = At.Shift.AFTER))
     private void onForegroundDraw(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
         skyHanni$hook.foregroundDrawn(mouseX, mouseY, partialTicks);
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index f3fe16222309..e718593f3577 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -56,8 +56,11 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.renderables.DragNDrop
+import at.hannibal2.skyhanni.utils.renderables.Droppable
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.Renderable.Companion.renderBounds
+import at.hannibal2.skyhanni.utils.renderables.toDragItem
 import kotlinx.coroutines.launch
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Blocks
@@ -202,7 +205,7 @@ object SkyHanniDebugsAndTests {
             onClick = { resetConfig() },
             "§eClick to confirm.",
             prefix = false,
-            oneTimeClick = true
+            oneTimeClick = true,
         )
     }
 
@@ -535,6 +538,45 @@ object SkyHanniDebugsAndTests {
         config.debugPos.renderStringsAndItems(displayList, posLabel = "Test Display")
     }
 
+    @SubscribeEvent
+    fun onGuiRenderChestGuiOverlayRender(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        @Suppress("ConstantConditionIf")
+        if (false) {
+            dragAbleTest()
+        }
+    }
+
+    private fun dragAbleTest() {
+        val bone = ItemStack(Items.bone, 1).toDragItem()
+        val leaf = ItemStack(Blocks.leaves, 1).toDragItem()
+
+        config.debugItemPos.renderRenderables(
+            listOf(
+                DragNDrop.draggable(Renderable.string("A Bone"), { bone }),
+                Renderable.placeholder(0, 30),
+                DragNDrop.draggable(Renderable.string("A Leaf"), { leaf }),
+                Renderable.placeholder(0, 30),
+                DragNDrop.droppable(
+                    Renderable.string("Feed Dog"),
+                    object : Droppable {
+                        override fun handle(drop: Any?) {
+                            val unit = drop as ItemStack
+                            if (unit.item == Items.bone) {
+                                LorenzDebug.chatAndLog("Oh, a bone!")
+                            } else {
+                                LorenzDebug.chatAndLog("Disgusting that is not a bone!")
+                            }
+                        }
+
+                        override fun validTarget(item: Any?) = item is ItemStack
+
+                    },
+                ),
+            ),
+            posLabel = "Item Debug",
+        )
+    }
+
     private fun itemRenderDebug() {
         val scale = 0.1
         val renderables = listOf(
@@ -547,7 +589,8 @@ object SkyHanniDebugsAndTests {
         }.editCopy {
             this.add(
                 0,
-                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.round(1).toString()) }.toList(),
+                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.round(1).toString()) }
+                    .toList(),
             )
         }
         config.debugItemPos.renderRenderables(
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/DragNDrop.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/DragNDrop.kt
new file mode 100644
index 000000000000..70cab119e779
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/DragNDrop.kt
@@ -0,0 +1,106 @@
+package at.hannibal2.skyhanni.utils.renderables
+
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraft.init.Blocks
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object DragNDrop {
+
+    private var currentDrag: DragItem<*>? = null
+
+    private var isInvalidDrop = false
+
+    private const val BUTTON = 0
+
+    private const val BUTTON_MAPPED = BUTTON - 100
+
+    private val invalidItem = Renderable.itemStack(ItemStack(Blocks.barrier), 1.0)
+
+    @SubscribeEvent
+    fun onGuiContainerBeforeDraw(event: GuiContainerEvent.PreDraw) {
+        isInvalidDrop = false
+    }
+
+    @SubscribeEvent
+    fun onGuiContainerAfterDraw(event: GuiContainerEvent.PostDraw) {
+        val item = currentDrag ?: return
+        if (!BUTTON_MAPPED.isKeyHeld()) {
+            currentDrag = null
+            return
+        }
+        GlStateManager.translate(event.mouseX.toFloat(), event.mouseY.toFloat(), 0f)
+        if (isInvalidDrop) {
+            invalidItem.render(event.mouseX, event.mouseY)
+        } else {
+            item.onRender(event.mouseX, event.mouseY)
+        }
+        GlStateManager.translate(-event.mouseX.toFloat(), -event.mouseY.toFloat(), 0f)
+    }
+
+    fun draggable(
+        display: Renderable,
+        item: () -> DragItem<*>,
+        bypassChecks: Boolean = false,
+        condition: () -> Boolean = { true },
+    ) = Renderable.clickable(
+        display,
+        onClick = { currentDrag = item() },
+        button = BUTTON,
+        bypassChecks = bypassChecks,
+        condition = condition,
+    )
+
+    fun droppable(
+        display: Renderable,
+        drop: Droppable,
+        bypassChecks: Boolean = false,
+        condition: () -> Boolean = { true },
+    ): Renderable = object : RenderableWrapper(display) {
+        override fun render(posX: Int, posY: Int) {
+            if (isHovered(posX, posY) && condition() && Renderable.shouldAllowLink(true, bypassChecks)) {
+                handelDroppable(drop)
+            }
+            content.render(posX, posY)
+        }
+    }
+
+    private fun handelDroppable(drop: Droppable) {
+        val item = currentDrag ?: return
+        if (drop.validTarget(item.get())) {
+            if (!BUTTON_MAPPED.isKeyHeld()) {
+                drop.handle(item.get())
+                currentDrag = null
+            }
+        } else {
+            isInvalidDrop = true
+        }
+
+    }
+}
+
+fun ItemStack.toDragItem(scale: Double = 1.0) = object : DragItem<ItemStack> {
+
+    val render = Renderable.itemStack(this@toDragItem, scale, 0)
+
+    override fun get(): ItemStack = this@toDragItem
+
+    override fun onRender(mouseX: Int, mouseY: Int) = render.render(mouseX, mouseY)
+}
+
+interface DragItem<T> {
+
+    fun get(): T
+    fun onRender(mouseX: Int, mouseY: Int)
+
+}
+
+interface Droppable {
+
+    fun handle(drop: Any?)
+    fun validTarget(item: Any?): Boolean
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index f00cba6c5163..0ed5621524e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -233,7 +233,7 @@ interface Renderable {
             }
         }
 
-        private fun shouldAllowLink(debug: Boolean = false, bypassChecks: Boolean): Boolean {
+        internal fun shouldAllowLink(debug: Boolean = false, bypassChecks: Boolean): Boolean {
             val guiScreen = Minecraft.getMinecraft().currentScreen
 
             val isGuiScreen = guiScreen != null
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
index d1a8aae02b1d..a78044d72790 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -73,3 +73,10 @@ internal object RenderableUtils {
         return yOffset
     }
 }
+
+internal abstract class RenderableWrapper internal constructor(protected val content: Renderable) : Renderable {
+    override val width = content.width
+    override val height = content.height
+    override val horizontalAlign = content.horizontalAlign
+    override val verticalAlign = content.verticalAlign
+}

From acc90c5794be8457b98bfa0dadf52f19a079c996 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:25:07 +0200
Subject: [PATCH 011/721] code cleanup

---
 .../features/event/hoppity/HoppityEggsManager.kt         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 3d13e04d841f..f340ff0d84e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -234,14 +234,13 @@ object HoppityEggsManager {
     }
 
     private fun checkWarn() {
+        val allEggsRemaining = HoppityEggType.allEggsRemaining()
         if (!warningActive) {
-            warningActive = !HoppityEggType.allEggsRemaining()
+            warningActive = !allEggsRemaining
         }
 
-        if (warningActive) {
-            if (HoppityEggType.allEggsRemaining()) {
-                warn()
-            }
+        if (warningActive && allEggsRemaining) {
+            warn()
         }
     }
 

From 25be3499b062b159543c615acc0a29b6ba0ab6a8 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 24 Jun 2024 23:44:33 +0200
Subject: [PATCH 012/721] Fix: Barn full message (#2146)

---
 .../inventory/chocolatefactory/ChocolateFactoryBarnManager.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 8fb591ecf3fc..62a156ca8d52 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -101,9 +101,9 @@ object ChocolateFactoryBarnManager {
 
         if (config.rabbitCrushOnlyDuringHoppity && !ChocolateFactoryAPI.isHoppityEvent()) return
 
-        val fullLevel = if (profileStorage.currentRabbits == profileStorage.maxRabbits) "almost full" else "full"
+        val fullLevel = if (profileStorage.currentRabbits == profileStorage.maxRabbits) "full" else "almost full"
         ChatUtils.clickableChat(
-            "§cYour barn is $fullLevel! §7(${barnStatus()}). §cUpgrade it so they don't get crushed",
+            "§cYour barn is $fullLevel §7(${barnStatus()}). §cUpgrade it so they don't get crushed!",
             onClick = { HypixelCommands.chocolateFactory() },
             "§eClick to run /cf!",
         )

From e88f416c48f9659f89b7047d7629cd9a1d1535bc Mon Sep 17 00:00:00 2001
From: Brady <thatgravyboat@gmail.com>
Date: Tue, 25 Jun 2024 14:53:39 -0230
Subject: [PATCH 013/721] Fix: launchers reading mod as libninepatch (#2147)

---
 build.gradle.kts                   |  2 +-
 src/main/resources/fabric.mod.json | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/fabric.mod.json

diff --git a/build.gradle.kts b/build.gradle.kts
index 2d991fcc09e2..b3bac5561e8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -196,7 +196,7 @@ loom {
 // Tasks:
 tasks.processResources {
     inputs.property("version", version)
-    filesMatching("mcmod.info") {
+    filesMatching(listOf("mcmod.info", "fabric.mod.json")) {
         expand("version" to version)
     }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 000000000000..d86c9cd51efb
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,12 @@
+{
+    "schemaVersion": 1,
+    "version": "${version}",
+    "id": "skyhanni",
+    "name": "SkyHanni",
+    "description": "SkyHanni is a Minecraft Mod for Hypixel SkyBlock.",
+    "icon": "assets/skyhanni/logo.png",
+    "authors": [],
+    "depends": {
+        "minecraft": "1.8.9"
+    }
+}

From 41f2ff07c87e6b47bcbec531e6a8bcff53d800dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Wed, 26 Jun 2024 08:28:26 +0200
Subject: [PATCH 014/721] Add OneConfig mods to quick mod switcher (#2155)

---
 .../features/misc/QuickModMenuSwitch.kt       | 77 ++++++-------------
 1 file changed, 22 insertions(+), 55 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
index 2741605ef222..95f18c3c3092 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
@@ -34,17 +34,10 @@ object QuickModMenuSwitch {
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
         val modsJar = event.getConstant<ModGuiSwitcherJson>("ModGuiSwitcher")
-        mods = buildList {
-            out@ for ((name, mod) in modsJar.mods) {
-                for (path in mod.guiPath) {
-                    try {
-                        Class.forName(path)
-                        add(Mod(name, mod.description, mod.command, mod.guiPath))
-                        continue@out
-                    } catch (_: Exception) {
-                    }
-                }
-            }
+        mods = modsJar.mods.filter { mod ->
+            mod.value.guiPath.any { runCatching { Class.forName(it) }.isSuccess }
+        }.map { (name, mod) ->
+            Mod(name, mod.description, mod.command, mod.guiPath)
         }
     }
 
@@ -108,11 +101,21 @@ object QuickModMenuSwitch {
             return config.javaClass.name
         }
         if (openGui == "cc.polyfrost.oneconfig.gui.OneConfigGui") {
-            /** TODO support different oneconfig mods:
-             * Partly Sane Skies
-             * Dankers SkyBlock Mod
-             * Dulkir
-             */
+            val actualGui = Minecraft.getMinecraft().currentScreen
+            val currentPage = actualGui.javaClass.getDeclaredField("currentPage")
+                .makeAccessible()
+                .get(actualGui)
+            if (currentPage.javaClass.simpleName == "ModConfigPage") {
+                val optionPage = currentPage.javaClass.getDeclaredField("page")
+                    .makeAccessible()
+                    .get(currentPage)
+                val mod = optionPage.javaClass.getField("mod")
+                    .makeAccessible()
+                    .get(optionPage)
+                val modName = mod.javaClass.getField("name")
+                    .get(mod) as String
+                return "cc.polyfrost.oneconfig.gui.OneConfigGui:$modName"
+            }
         }
 
         return openGui
@@ -132,7 +135,7 @@ object QuickModMenuSwitch {
                 Renderable.string(nameFormat + mod.name),
                 bypassChecks = true,
                 onClick = { open(mod) },
-                condition = { System.currentTimeMillis() > lastGuiOpen + 250 }
+                condition = { System.currentTimeMillis() > lastGuiOpen + 250 },
             )
             add(listOf(renderable, nameSuffix))
         }
@@ -143,44 +146,8 @@ object QuickModMenuSwitch {
         currentlyOpeningMod = mod.name
         update()
         try {
-            when (mod.command) {
-                "patcher" -> {
-                    val patcher = Class.forName("club.sk1er.patcher.Patcher")
-                    val instance = patcher.getDeclaredField("instance").get(null)
-                    val config = instance.javaClass.getDeclaredMethod("getPatcherConfig").invoke(instance)
-                    val gui = Class.forName("gg.essential.vigilance.Vigilant").getDeclaredMethod("gui").invoke(config)
-                    val guiUtils = Class.forName("gg.essential.api.utils.GuiUtil")
-                    for (method in guiUtils.declaredMethods) {
-                        try {
-                            method.invoke(null, gui)
-                            return
-                        } catch (_: Exception) {
-                        }
-                    }
-                    ErrorManager.skyHanniError("Error trying to open the gui for mod " + mod.name + "!")
-                }
-
-                "hytil" -> {
-                    val hytilsReborn = Class.forName("cc.woverflow.hytils.HytilsReborn")
-                    val instance = hytilsReborn.getDeclaredField("INSTANCE").get(null)
-                    val config = instance.javaClass.getDeclaredMethod("getConfig").invoke(instance)
-                    val gui = Class.forName("gg.essential.vigilance.Vigilant").getDeclaredMethod("gui").invoke(config)
-                    val guiUtils = Class.forName("gg.essential.api.utils.GuiUtil")
-                    for (method in guiUtils.declaredMethods) {
-                        try {
-                            method.invoke(null, gui)
-                            return
-                        } catch (_: Exception) {
-                        }
-                    }
-                    ChatUtils.chat("Error trying to open the gui for mod " + mod.name + "!")
-                }
-
-                else -> {
-                    val thePlayer = Minecraft.getMinecraft().thePlayer
-                    ClientCommandHandler.instance.executeCommand(thePlayer, "/${mod.command}")
-                }
-            }
+            val thePlayer = Minecraft.getMinecraft().thePlayer
+            ClientCommandHandler.instance.executeCommand(thePlayer, "/" + mod.command)
         } catch (e: Exception) {
             ErrorManager.logErrorWithData(e, "Error trying to open the gui for mod " + mod.name)
         }

From 968014f07cd32b76d530348e7535739cb1ce16c2 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:38:25 +0200
Subject: [PATCH 015/721] Docs: Fixed Link of Last Example being broken (#2153)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 CONTRIBUTING.md     | 2 +-
 docs/DISCORD_FAQ.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c0d399186f5d..b622b4a6db93 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,7 +90,7 @@ for more information and usages.
 - Please use Regex instead of String comparison when it is likely Hypixel will change the message in the future.
 - Do not use `fixedRateTimer` when possible and instead use `SecondPassedEvent` to safely execute the repeating event on
   the main thread.
-- When updating a config option variable, use the `ConfigUpdaterMigrator.ConfigFixEvent` with event.move(), when moving a value, and event.transform() when updating a value. [For Example](https://github.com/hannibal002/SkyHanni/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt#L241).
+- When updating a config option variable, use the `ConfigUpdaterMigrator.ConfigFixEvent` with event.move() when moving a value, and event.transform() when updating a value. [For Example](https://github.com/hannibal002/SkyHanni/blob/e88f416c48f9659f89b7047d7629cd9a1d1535bc/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt#L276).
 
 ## Software Used in SkyHanni
 
diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index a2b01e519600..634bc1f03a78 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -55,10 +55,10 @@ _Frequently Asked Questions_
 > **12: Why can I still see the normal Scoreboard when using Custom Scoreboard?**
 > Most of the time, this is a mod conflict.
 > If you are using [Sidebar Mod](https://github.com/Alexdoru/SidebarMod), please remove this mod.
-> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please disable its Scoreboard by clicking on the blue bar below "Scoreboard" in the OneConfig Menu.
+> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.7 or newer to resolve this issue.
 > If you are using [Apec](https://github.com/BananaFructa/Apec/) and want to remove their Scoreboard, you need to remove Apec since they don't have an option to disable their Scoreboard.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.
 
 
-*This FAQ was last updated on May 27th, 2024.
+*This FAQ was last updated on June 26th, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*

From 0e6572f5af0bc9bb677f2a64f0a700b55e060075 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:12:07 +0200
Subject: [PATCH 016/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 82bd6d315abc..dd4a91fb97eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -453,6 +453,7 @@ object HypixelData {
             islandType = getIslandType(foundIsland, guesting)
         }
 
+        // TODO dont send events when one of the arguments is none, at least when not on sb anymore
         if (skyBlockIsland != islandType) {
             IslandChangeEvent(islandType, skyBlockIsland).postAndCatch()
             if (islandType == IslandType.UNKNOWN) {

From 6535c3aa0925baf7fc7c9a24c047541fb7e199f3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 28 Jun 2024 08:52:53 +0200
Subject: [PATCH 017/721] Improvement: rename mushroom tier (#2159)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/cropmilestones/MushroomPetPerkConfig.java  | 3 ++-
 .../features/garden/farming/GardenCropMilestoneDisplay.kt      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/MushroomPetPerkConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/MushroomPetPerkConfig.java
index 3a994d832373..afb5b0028b5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/MushroomPetPerkConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/MushroomPetPerkConfig.java
@@ -44,7 +44,8 @@ public class MushroomPetPerkConfig {
 
     public enum MushroomTextEntry implements HasLegacyId {
         TITLE("§6Mooshroom Cow Perk", 0),
-        MUSHROOM_TIER("§7Mushroom Tier 8", 1),
+        // TODO change to mushroom milestone
+        MUSHROOM_TIER("§7Mushroom Milestone 8", 1),
         NUMBER_OUT_OF_TOTAL("§e6,700§8/§e15,000", 2),
         TIME("§7In §b12m 34s", 3),
         PERCENTAGE("§7Percentage: §e12.34%", 4),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index ba7651d03ba6..4e91eadb2ed9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -319,7 +319,7 @@ object GardenCropMilestoneDisplay {
         lineMap[MushroomTextEntry.TITLE] = Renderable.string("§6Mooshroom Cow Perk")
         lineMap[MushroomTextEntry.MUSHROOM_TIER] = Renderable.horizontalContainer(buildList {
             addCropIconRenderable(mushroom)
-            addString("§7Mushroom Tier $nextTier")
+            addString("§7Mushroom Milestone $nextTier")
         })
 
         lineMap[MushroomTextEntry.NUMBER_OUT_OF_TOTAL] = Renderable.string("§e$haveFormat§8/§e$needFormat")

From 9659a44f1d2735a95b7352fedeffe7d4b181cce5 Mon Sep 17 00:00:00 2001
From: aphased <152172867+aphased@users.noreply.github.com>
Date: Sat, 29 Jun 2024 22:04:41 +0200
Subject: [PATCH 018/721] Fix typo/duplicate word in cf config (#2169)

---
 .../chocolatefactory/ChocolateFactoryCustomReminderConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryCustomReminderConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryCustomReminderConfig.java
index afade78a98ef..266216cdcc2a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryCustomReminderConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryCustomReminderConfig.java
@@ -20,7 +20,7 @@ public class ChocolateFactoryCustomReminderConfig {
     public boolean enabled = false;
 
     @Expose
-    @ConfigOption(name = "Always Custom Reminder", desc = "Always show the display always, even outside the chocolate factory.")
+    @ConfigOption(name = "Always Custom Reminder", desc = "Always show the display, even outside the chocolate factory.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean always = false;

From c0067955cdf8c4fceb0bf9564c7b0427e4b7b992 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 30 Jun 2024 11:06:45 +0200
Subject: [PATCH 019/721] Fix: Chocolate per Time Tower charge ignoring Mu
 Rabbit (#2165)

---
 .../features/inventory/chocolatefactory/ChocolateFactoryAPI.kt  | 2 +-
 .../inventory/chocolatefactory/ChocolateFactoryTooltip.kt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 7df0f5bd299b..a6f3626b6e3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -163,7 +163,7 @@ object ChocolateFactoryAPI {
     fun timeTowerChargeDuration() =
         if (HoppityCollectionStats.hasFoundRabbit("Einstein")) 7.hours else 8.hours
 
-    private fun timeTowerMultiplier(): Double {
+    fun timeTowerMultiplier(): Double {
         var multiplier = (profileStorage?.timeTowerLevel ?: 0) * 0.1
         if (HoppityCollectionStats.hasFoundRabbit("Mu")) multiplier += 0.7
         return multiplier
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
index f73655bc5aaf..8973bc1e4fbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
@@ -45,7 +45,7 @@ object ChocolateFactoryTooltip {
 
     private fun chocPerTimeTower(): Int {
         val profileStorage = profileStorage ?: return 0
-        val amountPerSecond = profileStorage.rawChocPerSecond * profileStorage.timeTowerLevel * .1
+        val amountPerSecond = profileStorage.rawChocPerSecond * ChocolateFactoryAPI.timeTowerMultiplier()
         val amountPerHour = amountPerSecond * 60 * 60
         return amountPerHour.toInt()
     }

From 87814c6454555f48494265f41d4767dcc8483bb2 Mon Sep 17 00:00:00 2001
From: evhan3584 <elabrie26@gmail.com>
Date: Sun, 30 Jun 2024 05:14:12 -0400
Subject: [PATCH 020/721] Fix: Skill Progress ETA (#2163)

---
 .../skyhanni/features/skillprogress/SkillProgress.kt         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index 06bee04476bc..2e033b7e45b5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -149,7 +149,7 @@ object SkillProgress {
         allDisplay = formatAllDisplay(drawAllDisplay())
         etaDisplay = drawETADisplay()
 
-        if (event.repeatSeconds(2)) {
+        if (event.repeatSeconds(1)) {
             update()
             updateSkillInfo()
         }
@@ -503,8 +503,7 @@ object SkillProgress {
             xpInfo.xpGainQueue.removeLast()
         }
 
-        var totalGain = 0f
-        for (f in xpInfo.xpGainQueue) totalGain += f
+        val totalGain = xpInfo.xpGainQueue.sum()
 
         xpInfo.xpGainHour = totalGain * (60 * 60) / xpInfo.xpGainQueue.size
         xpInfo.isActive = true

From 7c2f45cc229b8767f83fdf74f6a0aea870f114c3 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 30 Jun 2024 11:14:55 +0200
Subject: [PATCH 021/721] Fix: Overflow level up message on Milestone 46
 (#2161)

---
 .../features/garden/farming/GardenCropMilestoneDisplay.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index 4e91eadb2ed9..69e12796e75b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -237,7 +237,7 @@ object GardenCropMilestoneDisplay {
         }
 
         if (overflowConfig.chat) {
-            if (currentTier >= 46 && currentTier == previousNext &&
+            if (currentTier > 46 && currentTier == previousNext &&
                 nextRealTier == currentTier + 1 && lastWarnedLevel != currentTier
             ) {
                 GardenCropMilestones.onOverflowLevelUp(crop, currentTier - 1, nextRealTier - 1)
@@ -246,7 +246,7 @@ object GardenCropMilestoneDisplay {
         }
 
         if (overflowConfig.chat) {
-            if (currentTier >= 46 && currentTier == previousNext &&
+            if (currentTier > 46 && currentTier == previousNext &&
                 nextRealTier == currentTier + 1 && lastWarnedLevel != currentTier
             ) {
                 GardenCropMilestones.onOverflowLevelUp(crop, currentTier - 1, nextRealTier - 1)
@@ -338,7 +338,7 @@ object GardenCropMilestoneDisplay {
         val percentageFormat = LorenzUtils.formatPercentage(have.toDouble() / need.toDouble())
         lineMap[MushroomTextEntry.PERCENTAGE] = Renderable.string("§7Percentage: §e$percentageFormat")
 
-        if (currentTier >= 46 && currentTier == previousMushNext && nextTier == currentTier + 1 && lastMushWarnedLevel != currentTier) {
+        if (currentTier > 46 && currentTier == previousMushNext && nextTier == currentTier + 1 && lastMushWarnedLevel != currentTier) {
             GardenCropMilestones.onOverflowLevelUp(mushroom, currentTier - 1, nextTier - 1)
             lastMushWarnedLevel = currentTier
         }

From aaee44528385506884774c35d73017cf6e0b2935 Mon Sep 17 00:00:00 2001
From: evhan3584 <elabrie26@gmail.com>
Date: Sun, 30 Jun 2024 05:15:45 -0400
Subject: [PATCH 022/721] Fix: Farming Weight Overtake ETA (#2158)

---
 .../skyhanni/features/garden/farming/FarmingWeightDisplay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 535163f81cc7..a2ca09f15a32 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -310,7 +310,7 @@ object FarmingWeightDisplay {
 
         val timeFormat = if (weightPerSecond != -1.0) {
             val timeTillOvertake = try {
-                (weightUntilOvertake / weightPerSecond).minutes
+                (weightUntilOvertake / weightPerSecond).seconds
             } catch (e: Exception) {
                 ErrorManager.logErrorWithData(
                     e,

From 0b78af1a396b3c6bebb8acd94fe3642a2894bd7a Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 30 Jun 2024 11:30:43 +0200
Subject: [PATCH 023/721] Fix: Also block opening Chocolate Factory with
 /factory (#2154)

---
 .../inventory/chocolatefactory/ChocolateFactoryBlockOpen.kt    | 3 ++-
 1 file changed, 2 insertions(+), 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 74c1ca234116..625fd1d6bdff 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
@@ -21,10 +21,11 @@ object ChocolateFactoryBlockOpen {
      * REGEX-TEST: /cf test
      * REGEX-TEST: /chocolatefactory
      * REGEX-TEST: /chocolatefactory123456789
+     * REGEX-TEST: /factory
      */
     private val commandPattern by RepoPattern.pattern(
         "inventory.chocolatefactory.opencommand",
-        "\\/(?:cf|chocolatefactory)(?: .*)?",
+        "\\/(?:cf|(?:chocolate)?factory)(?: .*)?",
     )
 
     private var commandSentTimer = SimpleTimeMark.farPast()

From 20f2a1c9ecb79f39f4c95eaf30a55f1279988e35 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 30 Jun 2024 11:35:13 +0200
Subject: [PATCH 024/721] Fix: Powder cost formulas and calculations (#2145)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/HotmData.kt    | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 3f2d54b31881..f86cc1de82a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -34,7 +34,6 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.inventory.Slot
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.ceil
-import kotlin.math.floor
 import kotlin.math.pow
 
 
@@ -64,43 +63,43 @@ enum class HotmData(
     MINING_SPEED(
         "Mining Speed",
         50,
-        { currentLevel -> (currentLevel + 2.0).pow(3) },
+        { level -> (level + 1.0).pow(3) },
         { level -> mapOf(HotmReward.MINING_SPEED to level * 20.0) },
     ),
     MINING_FORTUNE(
         "Mining Fortune",
         50,
-        { currentLevel -> (currentLevel + 2.0).pow(3.05) },
+        { level -> (level + 1.0).pow(3.05) },
         { level -> mapOf(HotmReward.MINING_FORTUNE to level * 5.0) },
     ),
     QUICK_FORGE(
         "Quick Forge",
         20,
-        { currentLevel -> (currentLevel + 2.0).pow(4) },
-        { level -> mapOf(HotmReward.FORGE_TIME_DECREASE to 10.0 + (level * 0.5)) },
+        { level -> (level + 1.0).pow(4) },
+        { level -> mapOf(HotmReward.FORGE_TIME_DECREASE to if (level >= 20) 30.0 else 10.0 + (level * 0.5)) },
     ),
     TITANIUM_INSANIUM(
         "Titanium Insanium",
         50,
-        { currentLevel -> (currentLevel + 2.0).pow(3.1) },
+        { level -> (level + 1.0).pow(3.1) },
         { level -> mapOf(HotmReward.TITANIUM_CHANCE to 2.0 + (level * 0.1)) },
     ),
     DAILY_POWDER(
         "Daily Powder",
         100,
-        { currentLevel -> 200.0 + (currentLevel * 18.0) },
+        { level -> 200 + ((level - 1) * 18.0) },
         { level -> mapOf(HotmReward.DAILY_POWDER to (200.0 + ((level - 1.0) * 18.0)) * 2.0) },
     ),
     LUCK_OF_THE_CAVE(
         "Luck of the Cave",
         45,
-        { currentLevel -> (currentLevel + 2.0).pow(3.07) },
+        { level -> (level + 1.0).pow(3.07) },
         { level -> mapOf(HotmReward.EXTRA_CHANCE_TRIGGER_RARE_OCCURRENCES to 5.0 + level) },
     ),
     CRYSTALLIZED(
         "Crystallized",
         30,
-        { currentLevel -> (currentLevel + 2.0).pow(3.4) },
+        { level -> (level + 1.0).pow(3.4) },
         { level ->
             mapOf(
                 HotmReward.MINING_SPEED to 20.0 + ((level - 1.0) * 6.0),
@@ -111,43 +110,43 @@ enum class HotmData(
     EFFICIENT_MINER(
         "Efficient Miner",
         100,
-        { currentLevel -> (currentLevel + 2.0).pow(2.6) },
+        { level -> (level + 1.0).pow(2.6) },
         { level -> mapOf(HotmReward.AVERAGE_BLOCK_BREAKS to (10.0 + (level * 0.4)) * (1.0 + (level * 0.05))) },
     ),
     ORBITER(
         "Orbiter",
         80,
-        { currentLevel -> (currentLevel + 1.0) * 70.0 },
+        { level -> level * 70.0 },
         { level -> mapOf(HotmReward.CHANCE_EXTRA_XP_ORBS to 0.2 + (level * 0.01)) },
     ),
     SEASONED_MINEMAN(
         "Seasoned Mineman",
         100,
-        { currentLevel -> (currentLevel + 2.0).pow(2.3) },
+        { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_WISDOM to 5.0 + (level * 0.1)) },
     ),
     MOLE(
         "Mole",
         190,
-        { currentLevel -> (currentLevel + 2.0).pow(2.2) },
+        { level -> (level + 1.0).pow(2.2) },
         { level -> mapOf(HotmReward.AVERAGE_BLOCK_BREAKS to 1.0 + ((level + 9.0) * 0.05 * ((level + 8) % 20))) },
     ),
     PROFESSIONAL(
         "Professional",
         140,
-        { currentLevel -> (currentLevel + 2.0).pow(2.3) },
+        { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_SPEED to 50.0 + (level * 5.0)) },
     ),
     LONESOME_MINER(
         "Lonesome Miner",
         45,
-        { currentLevel -> (currentLevel + 2.0).pow(3.07) },
+        { level -> (level + 1.0).pow(3.07) },
         { level -> mapOf(HotmReward.COMBAT_STAT_BOOST to 5.0 + ((level - 1.0) * 0.5)) },
     ),
     GREAT_EXPLORER(
         "Great Explorer",
         20,
-        { currentLevel -> (currentLevel + 2.0).pow(4.0) },
+        { level -> (level + 1.0).pow(4.0) },
         { level ->
             mapOf(
                 HotmReward.CHANCE_OF_TREASURE_CHEST to (0.2 * (0.2 + 0.04 * (level - 1.0))),
@@ -158,13 +157,13 @@ enum class HotmData(
     FORTUNATE(
         "Fortunate",
         20,
-        { currentLevel -> (currentLevel + 1.0).pow(3.05) },
+        { level -> (level + 1.0).pow(3.05) },
         { level -> mapOf(HotmReward.MINING_FORTUNE to 20.0 + (level * 4.0)) },
     ),
     POWDER_BUFF(
         "Powder Buff",
         50,
-        { currentLevel -> (currentLevel + 1.0).pow(3.2) },
+        { level -> (level + 1.0).pow(3.2) },
         { level ->
             mapOf(
                 HotmReward.MORE_MITHRIL_POWER to level.toDouble(),
@@ -175,13 +174,13 @@ enum class HotmData(
     MINING_SPEED_II(
         "Mining Speed II",
         50,
-        { currentLevel -> (currentLevel + 2.0).pow(3.2) },
+        { level -> (level + 1.0).pow(3.2) },
         { level -> mapOf(HotmReward.MINING_SPEED to level * 40.0) },
     ),
     MINING_FORTUNE_II(
         "Mining Fortune II",
         50,
-        { currentLevel -> (currentLevel + 2.0).pow(3.2) },
+        { level -> (level + 1.0).pow(3.2) },
         { level -> mapOf(HotmReward.MINING_FORTUNE to level * 5.0) },
     ),
 
@@ -273,78 +272,78 @@ enum class HotmData(
     DAILY_GRIND(
         "Daily Grind",
         100,
-        { currentLevel -> 218.0 + (18.0 * (currentLevel - 2.0)) },
+        { level -> 218 + (18 * (level - 1.0)) },
         { level -> mapOf(HotmReward.DAILY_POWDER to 50.0 * level) },
     ),
     DUST_COLLECTOR(
         "Dust Collector",
         20,
-        { currentLevel -> (currentLevel + 1.0).pow(4) },
+        { level -> (level + 1.0).pow(4) },
         { level -> mapOf(HotmReward.FOSSIL_DUST to 1.0 * level) },
     ),
     WARM_HEARTED(
         "Warm Hearted",
         50,
-        { currentLevel -> floor((currentLevel + 1.0).pow(3.1)) },
+        { level -> (level + 1.0).pow(3.1) },
         { level -> mapOf(HotmReward.COLD_RESISTANCE to 0.2 * level) },
     ),
 
     STRONG_ARM(
         "Strong Arm",
         100,
-        { currentLevel -> floor((currentLevel + 1.0).pow(2.3)) },
+        { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_SPEED to 5.0 * level) },
     ),
     NO_STONE_UNTURNED(
         "No Stone Unturned",
         50,
-        { currentLevel -> floor((currentLevel + 1.0).pow(3.05)) },
+        { level -> (level + 1.0).pow(3.05) },
         { level -> mapOf(HotmReward.UNKNOWN to 0.5 * level) },
     ),
 
     SUB_ZERO_MINING(
         "SubZero Mining",
         100,
-        { currentLevel -> floor((currentLevel + 1.0).pow(2.3)) },
+        { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_FORTUNE to 1.0 * level) },
     ),
     SURVEYOR(
         "Surveyor",
         20,
-        { currentLevel -> (currentLevel + 1.0).pow(4) },
+        { level -> (level + 1.0).pow(4) },
         { level -> mapOf(HotmReward.MINESHAFT_CHANCE to 0.75 * level) },
     ),
     EAGER_ADVENTURER(
         "Eager Adventurer",
         100,
-        { currentLevel -> floor((currentLevel + 1.0).pow(2.3)) },
+        { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_SPEED to 2.0 * level) },
     ),
 
     DEAD_MANS_CHEST(
         "Dead Man's Chest",
         50,
-        { currentLevel -> floor((currentLevel + 1.0).pow(3.2)) },
+        { level -> (level + 1.0).pow(3.2) },
         { level -> mapOf(HotmReward.UNKNOWN to 1.0 * level) },
     ),
 
     GIFTS_FROM_THE_DEPARTED(
         "Gifts from the Departed",
         100,
-        { currentLevel -> floor((currentLevel + 1.0).pow(2.45)) },
+        { level -> (level + 1.0).pow(2.45) },
         { level -> mapOf(HotmReward.UNKNOWN to 0.2 * level) },
     ),
 
     EXCAVATOR(
         "Excavator",
         50,
-        { currentLevel -> (currentLevel + 1.0).pow(3) },
+        { level -> (level + 1.0).pow(3) },
         { level -> mapOf(HotmReward.UNKNOWN to 0.5 * level) },
     ),
     RAGS_TO_RICHES(
         "Rags to Riches",
         50,
-        { currentLevel -> floor((currentLevel + 1.0).pow(3.05)) },
+        { level -> (level + 1.0).pow(3.05) },
         { level -> mapOf(HotmReward.MINING_FORTUNE to 2.0 * level) },
     ),
 
@@ -393,7 +392,7 @@ enum class HotmData(
 
     fun getReward() = if (enabled) rewardFun(activeLevel) else emptyMap()
 
-    fun calculateTotalCost(desiredLevel: Int) = (1 until desiredLevel).sumOf { level -> costFun(level) ?: 0.0 }.toInt()
+    fun calculateTotalCost(desiredLevel: Int) = (2..desiredLevel).sumOf { level -> costFun(level)?.toInt() ?: 0 }
 
     val totalCostMaxLevel = calculateTotalCost(maxLevel)
 

From dd24ac5cbd234b656ac69804fa34059d08767fda Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Sun, 30 Jun 2024 04:44:09 -0500
Subject: [PATCH 025/721] Improvement: Make unclaimed eggs gui clickable
 (#1934)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../event/hoppity/HoppityEggsManager.kt       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index f340ff0d84e4..13afcac42f1b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LocationUtils
 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.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
@@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
 import kotlin.time.Duration.Companion.seconds
@@ -195,14 +196,13 @@ object HoppityEggsManager {
 
     // TODO move logic into second passed event and cache
     @SubscribeEvent
-    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+    fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isActive()) return
         if (!config.showClaimedEggs) return
         if (isBusy()) return
 
-        val displayList = HoppityEggType.entries
-            .map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }
-            .toMutableList()
+        val displayList =
+            HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
         displayList.add(0, "§bUnclaimed Eggs:")
 
         if (config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
@@ -215,7 +215,12 @@ object HoppityEggsManager {
         }
         if (displayList.size == 1) return
 
-        config.position.renderStrings(displayList, posLabel = "Hoppity Eggs")
+        val clickableDisplayList = listOf(Renderable.clickAndHover(
+            Renderable.verticalContainer(displayList.map(Renderable::string)),
+            tips = listOf("§eClick to ${"/warp ${config.warpDestination}".trim()}!"),
+            onClick = { HypixelCommands.warp(config.warpDestination) }
+        ))
+        config.position.renderRenderables(clickableDisplayList, posLabel = "Hoppity Eggs")
     }
 
     private fun formatEggsCollected(collectedEggs: Int): String =
@@ -257,7 +262,7 @@ object HoppityEggsManager {
                 ChatUtils.clickableChat(
                     message,
                     onClick = { HypixelCommands.warp(config.warpDestination) },
-                    "§eClick to /warp ${config.warpDestination}!"
+                    "§eClick to ${"/warp ${config.warpDestination}".trim()}!"
                 )
             } else {
                 ChatUtils.clickableChat(

From 19606e3e9eda872c7f8036197213026d1326db45 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 11:47:51 +0200
Subject: [PATCH 026/721] formatting

---
 .../event/hoppity/HoppityEggsManager.kt       | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 13afcac42f1b..bb3753c13d68 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -42,7 +42,7 @@ object HoppityEggsManager {
      */
     val eggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.found",
-        "§d§lHOPPITY'S HUNT §r§dYou found a §r§.Chocolate (?<meal>\\w+) Egg §r§d(?<note>.*)§r§d!"
+        "§d§lHOPPITY'S HUNT §r§dYou found a §r§.Chocolate (?<meal>\\w+) Egg §r§d(?<note>.*)§r§d!",
     )
 
     /**
@@ -51,7 +51,7 @@ object HoppityEggsManager {
      */
     val eggBoughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.bought",
-        "§aYou bought §r§.(?<rabbitname>.*?) §r§afor §r§6((\\d|,)*) Coins§r§a!"
+        "§aYou bought §r§.(?<rabbitname>.*?) §r§afor §r§6((\\d|,)*) Coins§r§a!",
     )
 
     /**
@@ -61,7 +61,7 @@ object HoppityEggsManager {
      */
     val rabbitFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.found",
-        "§D§LHOPPITY'S HUNT §7You found (?<name>.*) §7\\((?<rarity>.*)§7\\)!"
+        "§D§LHOPPITY'S HUNT §7You found (?<name>.*) §7\\((?<rarity>.*)§7\\)!",
     )
 
     /**
@@ -71,23 +71,23 @@ object HoppityEggsManager {
      */
     val newRabbitFound by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.found.new",
-        "§d§lNEW RABBIT! (?:((§6\\+(?<chocolate>.*) Chocolate §7and )?§6\\+(?<perSecond>.*)x Chocolate §7per second!)|(?<other>.*))"
+        "§d§lNEW RABBIT! (?:((§6\\+(?<chocolate>.*) Chocolate §7and )?§6\\+(?<perSecond>.*)x Chocolate §7per second!)|(?<other>.*))",
     )
     private val noEggsLeftPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.noneleft",
-        "§cThere are no hidden Chocolate Rabbit Eggs nearby! Try again later!"
+        "§cThere are no hidden Chocolate Rabbit Eggs nearby! Try again later!",
     )
     private val eggSpawnedPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.spawned",
-        "§d§lHOPPITY'S HUNT §r§dA §r§.Chocolate (?<meal>\\w+) Egg §r§dhas appeared!"
+        "§d§lHOPPITY'S HUNT §r§dA §r§.Chocolate (?<meal>\\w+) Egg §r§dhas appeared!",
     )
     private val eggAlreadyCollectedPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.alreadycollected",
-        "§cYou have already collected this Chocolate (?<meal>\\w+) Egg§r§c! Try again when it respawns!"
+        "§cYou have already collected this Chocolate (?<meal>\\w+) Egg§r§c! Try again when it respawns!",
     )
     private val hoppityEventNotOn by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.notevent",
-        "§cThis only works during Hoppity's Hunt!"
+        "§cThis only works during Hoppity's Hunt!",
     )
 
     private var lastMeal: HoppityEggType? = null
@@ -168,7 +168,7 @@ object HoppityEggsManager {
         HoppityEggType.getMealByName(group("meal")) ?: run {
             ErrorManager.skyHanniError(
                 "Unknown meal: ${group("meal")}",
-                "message" to event.message
+                "message" to event.message,
             )
         }
 
@@ -188,7 +188,7 @@ object HoppityEggsManager {
                     onClick = onClick,
                     "§eClick to share!",
                     expireAt = 30.seconds.fromNow(),
-                    oneTimeClick = true
+                    oneTimeClick = true,
                 )
             }
         }
@@ -215,11 +215,13 @@ object HoppityEggsManager {
         }
         if (displayList.size == 1) return
 
-        val clickableDisplayList = listOf(Renderable.clickAndHover(
-            Renderable.verticalContainer(displayList.map(Renderable::string)),
-            tips = listOf("§eClick to ${"/warp ${config.warpDestination}".trim()}!"),
-            onClick = { HypixelCommands.warp(config.warpDestination) }
-        ))
+        val clickableDisplayList = listOf(
+            Renderable.clickAndHover(
+                Renderable.verticalContainer(displayList.map(Renderable::string)),
+                tips = listOf("§eClick to ${"/warp ${config.warpDestination}".trim()}!"),
+                onClick = { HypixelCommands.warp(config.warpDestination) },
+            ),
+        )
         config.position.renderRenderables(clickableDisplayList, posLabel = "Hoppity Eggs")
     }
 
@@ -262,13 +264,13 @@ object HoppityEggsManager {
                 ChatUtils.clickableChat(
                     message,
                     onClick = { HypixelCommands.warp(config.warpDestination) },
-                    "§eClick to ${"/warp ${config.warpDestination}".trim()}!"
+                    "§eClick to ${"/warp ${config.warpDestination}".trim()}!",
                 )
             } else {
                 ChatUtils.clickableChat(
                     message,
                     onClick = { HypixelCommands.skyblock() },
-                    "§eClick to join /skyblock!"
+                    "§eClick to join /skyblock!",
                 )
             }
         } else ChatUtils.chat(message)
@@ -283,7 +285,7 @@ object HoppityEggsManager {
         event.move(
             44,
             "event.chocolateFactory.highlightHoppityShop",
-            "event.chocolateFactory.hoppityEggs.highlightHoppityShop"
+            "event.chocolateFactory.hoppityEggs.highlightHoppityShop",
         )
         event.move(44, "event.chocolateFactory.hoppityEggs", "event.hoppityEggs")
     }

From 8bcdd9b6de9f7fc53cfed31ab84187092ea4dc6e Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 30 Jun 2024 11:54:52 +0200
Subject: [PATCH 027/721] Feature: Scrolling pages (#2164)

---
 .../features/inventory/InventoryConfig.java   | 11 ++-
 .../inventory/PageScrollingConfig.java        | 30 ++++++++
 .../features/inventory/PageScrolling.kt       | 75 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/RegexUtils.kt |  6 ++
 .../utils/repopatterns/RepoPatternManager.kt  |  5 ++
 5 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/PageScrollingConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index fcdccfab73d4..45c0a9e98239 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -57,12 +57,12 @@ public class InventoryConfig {
     @Expose
     @Category(name = "Chocolate Factory", desc = "Features to help you master the Chocolate Factory idle game.")
     public ChocolateFactoryConfig chocolateFactory = new ChocolateFactoryConfig();
-  
+
     @Expose
     @Category(name = "Craftable Item List", desc = "")
     @Accordion
     public CraftableItemListConfig craftableItemList = new CraftableItemListConfig();
-  
+
     @Expose
     @ConfigOption(name = "Not Clickable Items", desc = "Better not click that item.")
     @Accordion
@@ -108,6 +108,11 @@ public class InventoryConfig {
     @Accordion
     public PocketSackInASackConfig pocketSackInASack = new PocketSackInASackConfig();
 
+    @Expose
+    @ConfigOption(name = "Page Scrolling", desc = "")
+    @Accordion
+    public PageScrollingConfig pageScrolling = new PageScrollingConfig();
+
     @Expose
     @ConfigOption(name = "Item Number", desc = "Showing the item number as a stack size for these items.")
     @ConfigEditorDraggableList
@@ -177,7 +182,7 @@ public String toString() {
     @Expose
     @ConfigOption(name = "Quick Craft Confirmation",
         desc = "Require Ctrl+Click to craft items that aren't often quick crafted " +
-        "(e.g. armor, weapons, accessories). " +
+            "(e.g. armor, weapons, accessories). " +
             "Sack items can be crafted normally."
     )
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PageScrollingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PageScrollingConfig.java
new file mode 100644
index 000000000000..098de295df37
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PageScrollingConfig.java
@@ -0,0 +1,30 @@
+package at.hannibal2.skyhanni.config.features.inventory;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import org.lwjgl.input.Keyboard;
+
+public class PageScrollingConfig {
+
+    @Expose
+    @ConfigOption(name = "Enable", desc = "Enables you to scroll in any inventory with multiple pages.")
+    @ConfigEditorBoolean
+    public boolean enable = false;
+
+    @Expose
+    @ConfigOption(name = "Bypass Key", desc = "When the key is held allows you to scroll even though you are over an item.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_LSHIFT)
+    public int bypassKey = Keyboard.KEY_LSHIFT;
+
+    @Expose
+    @ConfigOption(name = "Invert Bypass", desc = "Inverts the behaviour of the bypass key. With this option the bypass key blocks scrolling over items instead of allowing it.")
+    @ConfigEditorBoolean
+    public boolean invertBypass = false;
+
+    @Expose
+    @ConfigOption(name = "Invert Scroll", desc = "Inverts the direction of the scrolling.")
+    @ConfigEditorBoolean
+    public boolean invertScroll = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt
new file mode 100644
index 000000000000..f9855d0d4ff4
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt
@@ -0,0 +1,75 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ToolTipData
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
+import at.hannibal2.skyhanni.utils.renderables.ScrollValue
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.lwjgl.input.Mouse
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object PageScrolling {
+
+    private val config get() = SkyHanniMod.feature.inventory.pageScrolling
+
+    private val repoGroup = RepoPattern.group("inventory.pagescrolling")
+
+    private val illegalInventory by repoGroup.list(
+        "illegal",
+        "Large Chest",
+        "Chest",
+    )
+
+    private val forwardPattern by repoGroup.list(
+        "forward",
+        "§aNext Page",
+        "§aScroll Up",
+        "§aLevels 26 - 50",
+        "§aNext Page →",
+    )
+
+    private val backwardPattern by repoGroup.list(
+        "backward",
+        "§aPrevious Page",
+        "§aScroll Down",
+        "§aLevels 1 - 25",
+        "§a← Previous Page",
+    )
+
+    private val scroll = ScrollValue()
+
+    private var cooldown = SimpleTimeMark.farPast()
+
+    @SubscribeEvent
+    fun onLorenzTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        if (cooldown.isInFuture()) return
+        if (!scroll.isMouseEventValid()) return
+
+        val inventoryName = InventoryUtils.openInventoryName()
+        if (inventoryName.isEmpty()) return
+        if (illegalInventory.matches(inventoryName)) return
+
+        if (((ToolTipData.lastSlot != null) xor config.invertBypass xor config.bypassKey.isKeyHeld())) return
+
+        val dWheel = Mouse.getEventDWheel()
+        if (dWheel == 0) return
+        val patterns = if ((dWheel > 0) xor config.invertScroll) forwardPattern else backwardPattern
+        val slot = InventoryUtils.getItemsInOpenChest().firstOrNull {
+            patterns.matches(it.stack?.displayName)
+        } ?: return
+        InventoryUtils.clickSlot(slot.slotNumber)
+        cooldown = 1.0.seconds.fromNow() // 1 second is not specific it is just a reasonable cooldown
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.enable && InventoryUtils.inInventory()
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
index 927b08d54cb7..57c6c69e54a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
@@ -56,4 +56,10 @@ object RegexUtils {
         }
         return null
     }
+
+    fun Iterable<Pattern>.matches(string: String?): Boolean {
+        if (string == null) return false
+        return this.any { it.matches(string) }
+    }
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
index 2ec62fd3f6ee..8f55a8b1f56f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -213,6 +213,11 @@ object RepoPatternManager {
             arrayPattern.wasOverridden = false
         }
 
+        if (localLoading) {
+            setDefaultPatterns()
+            return
+        }
+
         if (patternMap.mapTo(mutableSetOf()) { it.first } != patternMap.indices.toSet()) {
             logger.error("Incorrect index set for $arrayPattern")
             setDefaultPatterns()

From e51dd4e7c0f94a47a74a8ec4fb6a1ef6d50099dd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 12:35:34 +0200
Subject: [PATCH 028/721] code cleanup

---
 .../skyhanni/features/inventory/HideNotClickableItems.kt | 9 +++++----
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index 3fad28589737..c2e8801bae64 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -26,6 +26,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.isCoopSoulBound
 import at.hannibal2.skyhanni.utils.ItemUtils.isEnchanted
 import at.hannibal2.skyhanni.utils.ItemUtils.isVanilla
 import at.hannibal2.skyhanni.utils.KeyboardManager
@@ -68,7 +69,7 @@ object HideNotClickableItems {
 
     private val seedsPattern by RepoPattern.pattern(
         "inventory.hidenotclickable.seeds",
-        "SEEDS|CARROT_ITEM|POTATO_ITEM|PUMPKIN_SEEDS|SUGAR_CANE|MELON_SEEDS|CACTUS|INK_SACK-3"
+        "SEEDS|CARROT_ITEM|POTATO_ITEM|PUMPKIN_SEEDS|SUGAR_CANE|MELON_SEEDS|CACTUS|INK_SACK-3",
     )
 
     private val netherWart by lazy { "NETHER_STALK".asInternalName() }
@@ -304,7 +305,7 @@ object HideNotClickableItems {
             "CLOAK",
             "BELT",
             "GLOVES",
-            "BRACELET"
+            "BRACELET",
         )
         for (type in list) {
             if (stack.getLore().any { it.contains("§l") && it.contains(type) }) {// todo use item api
@@ -445,7 +446,7 @@ object HideNotClickableItems {
     private fun hidePlayerTrade(chestName: String, stack: ItemStack): Boolean {
         if (!chestName.startsWith("You    ")) return false
 
-        if (ItemUtils.isCoopSoulBound(stack)) {
+        if (stack.isCoopSoulBound()) {
             hideReason = "Soulbound items cannot be traded!"
             return true
         }
@@ -582,7 +583,7 @@ object HideNotClickableItems {
     }
 
     private fun isNotAuctionable(stack: ItemStack): Boolean {
-        if (ItemUtils.isCoopSoulBound(stack)) {
+        if (stack.isCoopSoulBound()) {
             hideReason = "Soulbound items cannot be auctioned!"
             return true
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 54cdfa91edcb..1fb4c4554ed7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -44,8 +44,8 @@ object ItemUtils {
     }
 
     // TODO change else janni is sad
-    fun isCoopSoulBound(stack: ItemStack): Boolean =
-        stack.getLore().any {
+    fun ItemStack.isCoopSoulBound(): Boolean =
+        getLore().any {
             it == "§8§l* §8Co-op Soulbound §8§l*" || it == "§8§l* §8Soulbound §8§l*"
         }
 

From 2e93920ab64bacfc428cf8bf040a2b10b6d9f2f8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 12:36:34 +0200
Subject: [PATCH 029/721] code cleanup

---
 .../skyhanni/features/inventory/HideNotClickableItems.kt       | 3 ++-
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt         | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index c2e8801bae64..d1bb4dbda783 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -28,6 +28,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.isCoopSoulBound
 import at.hannibal2.skyhanni.utils.ItemUtils.isEnchanted
+import at.hannibal2.skyhanni.utils.ItemUtils.isSoulBound
 import at.hannibal2.skyhanni.utils.ItemUtils.isVanilla
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -339,7 +340,7 @@ object HideNotClickableItems {
 
         // TODO make check if player is on private island
 
-        if (!ItemUtils.isSoulBound(stack)) return false
+        if (!stack.isSoulBound()) return false
 
         hideReason = "This item cannot be stored into a chest!"
         return true
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 1fb4c4554ed7..67f2865eb155 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -50,8 +50,7 @@ object ItemUtils {
         }
 
     // TODO change else janni is sad
-    fun isSoulBound(stack: ItemStack): Boolean =
-        stack.getLore().any { it == "§8§l* §8Soulbound §8§l*" }
+    fun ItemStack.isSoulBound(): Boolean = getLore().any { it == "§8§l* §8Soulbound §8§l*" }
 
     fun isRecombobulated(stack: ItemStack) = stack.isRecombobulated()
 

From 4a55a7d4d8c3551cc4cfa3bd82867579494e3c70 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 30 Jun 2024 12:40:10 +0200
Subject: [PATCH 030/721] Backend: Enabling Shader with Enum (#2035)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/chroma/ChromaShaderManager.kt    |  8 ++--
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  4 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  2 +-
 .../skyhanni/utils/shader/ShaderManager.kt    | 37 ++++---------------
 4 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt
index db6e06d25af2..ffded8099903 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt
@@ -33,7 +33,7 @@ object ChromaShaderManager {
     private fun enable(chromaType: ChromaType) {
         if (!chromaEnabled) {
             chromaEnabled = true
-            ShaderManager.enableShader(chromaType.shaderName)
+            ShaderManager.enableShader(chromaType.shader)
         }
     }
 
@@ -45,14 +45,14 @@ object ChromaShaderManager {
     }
 }
 
-enum class ChromaType(val shaderName: String) {
+enum class ChromaType(val shader: ShaderManager.Shaders) {
     /**
      * See [StandardChromaShader]
      */
-    STANDARD("standard_chroma"),
+    STANDARD(ShaderManager.Shaders.STANDARD_CHROMA),
 
     /**
      * See [TexturedChromaShader]
      */
-    TEXTURED("textured_chroma")
+    TEXTURED(ShaderManager.Shaders.TEXTURED_CHROMA)
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 89489518ccf0..fe9e9df6a1fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -1731,7 +1731,7 @@ object RenderUtils {
         RoundedRectangleShader.centerPos = floatArrayOf(xIn + (widthIn / 2f), yIn + (heightIn / 2f))
 
         GlStateManager.pushMatrix()
-        ShaderManager.enableShader("rounded_rect")
+        ShaderManager.enableShader(ShaderManager.Shaders.ROUNDED_RECTANGLE)
 
         Gui.drawRect(x - 5, y - 5, x + width + 5, y + height + 5, color)
 
@@ -1784,7 +1784,7 @@ object RenderUtils {
         RoundedRectangleOutlineShader.borderBlur = max(1 - blur, 0f)
 
         GlStateManager.pushMatrix()
-        ShaderManager.enableShader("rounded_rect_outline")
+        ShaderManager.enableShader(ShaderManager.Shaders.ROUNDED_RECT_OUTLINE)
 
         drawGradientRect(
             x - borderAdjustment,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 0ed5621524e5..b51c83295023 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -392,7 +392,7 @@ interface Renderable {
 
             override fun render(posX: Int, posY: Int) {
                 DarkenShader.darknessLevel = amount
-                ShaderManager.enableShader("darken")
+                ShaderManager.enableShader(ShaderManager.Shaders.DARKEN)
                 this@darken.render(posX, posY)
                 ShaderManager.disableShader()
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
index b32e3fa26dc3..057e0a031945 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
@@ -31,40 +31,19 @@ object ShaderManager {
         DARKEN(DarkenShader.INSTANCE)
         ;
 
-        fun enableShader() = ShaderManager.enableShader(name.lowercase())
-
-        companion object {
-
-            fun getShaderInstance(shaderName: String): Shader? = when (shaderName) {
-                "standard_chroma" -> STANDARD_CHROMA.shader
-                "textured_chroma" -> TEXTURED_CHROMA.shader
-                "rounded_rect" -> ROUNDED_RECTANGLE.shader
-                "rounded_rect_outline" -> ROUNDED_RECT_OUTLINE.shader
-                "darken" -> DARKEN.shader
-                else -> {
-                    null
-                }
-            }
-        }
+        fun enableShader() = enableShader(this)
     }
 
-    private val shaders: MutableMap<String, Shader> = mutableMapOf()
     private var activeShader: Shader? = null
 
-    fun enableShader(shaderName: String) {
-        var shader = shaders[shaderName]
-
-        if (shader == null) {
-            shader = Shaders.getShaderInstance(shaderName)
-            if (shader == null) return
-            shaders[shaderName] = shader
-        }
+    fun enableShader(shader: Shaders) {
+        val shaderInstance = shader.shader
 
-        if (!shader.created) return
+        if (!shaderInstance.created) return
 
-        activeShader = shader
-        shader.enable()
-        shader.updateUniforms()
+        activeShader = shaderInstance
+        shaderInstance.enable()
+        shaderInstance.updateUniforms()
     }
 
     fun attachShader(shaderProgram: Int, shaderID: Int) {
@@ -101,7 +80,7 @@ object ShaderManager {
                 ErrorManager.logErrorWithData(
                     OpenGLException("Shader compilation error."),
                     errorMessage,
-                    "GLSL Compilation Error:\n" to errorLog
+                    "GLSL Compilation Error:\n" to errorLog,
                 )
             } else {
                 LorenzUtils.consoleLog("$errorMessage $errorLog")

From e1c195aa3656d4ca1bceb1764818654a2b081288 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 30 Jun 2024 06:42:50 -0400
Subject: [PATCH 031/721] Feature: Block achievements message spam on Alpha
 (#2076)

---
 .../skyhanni/config/features/chat/FilterTypesConfig.java | 5 +++++
 .../at/hannibal2/skyhanni/features/chat/ChatFilter.kt    | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
index ebab020bc4b5..c87102b5b9bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
@@ -106,6 +106,11 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean sacrifice = false;
 
+    @Expose
+    @ConfigOption(name = "Block Alpha Achievements", desc = "Hide achievement messages while on the Alpha network.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideAlphaAchievements = false;
 
     //TODO remove
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index f424b52a3cea..fca2582c9920 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenAPI
@@ -408,6 +409,11 @@ object ChatFilter {
         "§d[\\w']+ the Fairy§r§f: Have a great life!".toPattern()
     )
 
+    // §e§ka§a>>   §aAchievement Unlocked: §6§r§6Agile§r§a   <<§e§ka
+    private val achievementGetPatterns = listOf(
+        "§e§k.§a>> {3}§aAchievement Unlocked: .* {3}<<§e§k.".toPattern()
+    )
+
     private val patternsMap: Map<String, List<Pattern>> = mapOf(
         "lobby" to lobbyPatterns,
         "warping" to warpingPatterns,
@@ -430,6 +436,7 @@ object ChatFilter {
         "solo_class" to soloClassPatterns,
         "solo_stats" to soloStatsPatterns,
         "fairy" to fairyPatterns,
+        "achievement_get" to achievementGetPatterns,
     )
 
     private val messagesMap: Map<String, List<String>> = mapOf(
@@ -481,6 +488,8 @@ object ChatFilter {
         config.killCombo && message.isPresent("kill_combo") -> "kill_combo"
         config.profileJoin && message.isPresent("profile_join") -> "profile_join"
 
+        config.hideAlphaAchievements && HypixelData.hypixelAlpha && message.isPresent("achievement_get") -> "achievement_get"
+
         config.others && isOthers(message) -> othersMsg
 
         config.winterGift && message.isPresent("winter_gift") -> "winter_gift"

From d16f39c67a239173d293b473ca37c179fc628df4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 12:43:34 +0200
Subject: [PATCH 032/721] formatting

---
 .../skyhanni/features/chat/ChatFilter.kt      | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index fca2582c9920..bc14934abe2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -46,7 +46,7 @@ object ChatFilter {
 
     private val lobbyMessages = listOf(
         // prototype
-        "  §r§f§l➤ §r§6You have reached your Hype limit! Add Hype to Prototype Lobby minigames by right-clicking with the Hype Diamond!"
+        "  §r§f§l➤ §r§6You have reached your Hype limit! Add Hype to Prototype Lobby minigames by right-clicking with the Hype Diamond!",
     )
     private val lobbyMessagesContains = listOf(
         // prototype
@@ -58,7 +58,7 @@ object ChatFilter {
         "§r§e§6§lHYPIXEL§e is hosting a §b§lTNT RUN§e tournament!",
 
         // other
-        "§aYou are still radiating with §bGenerosity§r§a!"
+        "§aYou are still radiating with §bGenerosity§r§a!",
     )
 
     // Warping
@@ -68,40 +68,40 @@ object ChatFilter {
         "§7Request join for Dungeon Hub #(.*)\\.\\.\\.".toPattern(),
         // warp portals on public islands
         // (canvas room – flower house, election room – community center, void sepulchre – the end)
-        "§dWarped to (.*)§r§d!".toPattern()
+        "§dWarped to (.*)§r§d!".toPattern(),
     )
     private val warpingMessages = listOf(
         "§7Warping...", "§7Warping you to your SkyBlock island...", "§7Warping using transfer token...",
 
         // visiting other players
-        "§7Finding player...", "§7Sending a visit request..."
+        "§7Finding player...", "§7Sending a visit request...",
     )
 
     // Welcome
     private val welcomeMessages = listOf(
-        "§eWelcome to §r§aHypixel SkyBlock§r§e!"
+        "§eWelcome to §r§aHypixel SkyBlock§r§e!",
     )
 
     // Guild EXP
     private val guildExpPatterns = listOf(
         // §aYou earned §r§22 GEXP §r§afrom playing SkyBlock!
         // §aYou earned §r§22 GEXP §r§a+ §r§c210 Event EXP §r§afrom playing SkyBlock!
-        "§aYou earned §r§2.* GEXP (§r§a\\+ §r§.* Event EXP )?§r§afrom playing SkyBlock!".toPattern()
+        "§aYou earned §r§2.* GEXP (§r§a\\+ §r§.* Event EXP )?§r§afrom playing SkyBlock!".toPattern(),
     )
 
     // Kill Combo
     private val killComboPatterns = listOf(
         //§a§l+5 Kill Combo §r§8+§r§b3% §r§b? Magic Find
         "§.§l\\+(.*) Kill Combo (.*)".toPattern(),
-        "§cYour Kill Combo has expired! You reached a (.*) Kill Combo!".toPattern()
+        "§cYour Kill Combo has expired! You reached a (.*) Kill Combo!".toPattern(),
     )
     private val killComboMessages = listOf(
-        "§6§l+50 Kill Combo"
+        "§6§l+50 Kill Combo",
     )
 
     // Profile Join
     private val profileJoinMessageStartsWith = listOf(
-        "§aYou are playing on profile: §e", "§8Profile ID: "
+        "§aYou are playing on profile: §e", "§8Profile ID: ",
     )
 
     // OTHERS
@@ -127,7 +127,7 @@ object ChatFilter {
 
         // Bank
         "§8Depositing coins...",
-        "§8Withdrawing coins..."
+        "§8Withdrawing coins...",
     )
 
     // Slayer
@@ -139,13 +139,13 @@ object ChatFilter {
         // end
         " {2}§r§a§lSLAYER QUEST COMPLETE!".toPattern(),
         " {3}§r§e(.*)Slayer LVL 9 §r§5- §r§a§lLVL MAXED OUT!".toPattern(),
-        " {3}§r§5§l» §r§7Talk to Maddox to claim your (.*) Slayer XP!".toPattern()
+        " {3}§r§5§l» §r§7Talk to Maddox to claim your (.*) Slayer XP!".toPattern(),
     )
     private val slayerMessages = listOf(
-        "  §r§6§lNICE! SLAYER BOSS SLAIN!", "§eYou received kill credit for assisting on a slayer miniboss!"
+        "  §r§6§lNICE! SLAYER BOSS SLAIN!", "§eYou received kill credit for assisting on a slayer miniboss!",
     )
     private val slayerMessageStartWith = listOf(
-        "§e✆ RING... "
+        "§e✆ RING... ",
     )
 
     // Slayer Drop
@@ -183,7 +183,7 @@ object ChatFilter {
         // Blaze
         "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§fWisp's Ice-Flavored Water I Splash Potion§r§7\\) (.*)".toPattern(),
         "§b§lRARE DROP! §r§7\\(§r§f§r§5Bundle of Magma Arrows§r§7\\) (.*)".toPattern(),
-        "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§7\\d+x §r§f§r§9(Glowstone|Blaze Rod|Magma Cream|Nether Wart) Distillate§r§7\\) (.*)".toPattern()
+        "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§7\\d+x §r§f§r§9(Glowstone|Blaze Rod|Magma Cream|Nether Wart) Distillate§r§7\\) (.*)".toPattern(),
     )
 
     // Useless Drop
@@ -193,7 +193,7 @@ object ChatFilter {
         "§6§lRARE DROP! §r§fPotato (.*)".toPattern(),
         "§6§lRARE DROP! §r§9Machine Gun Bow (.*)".toPattern(),
         "§6§lRARE DROP! §r§5Earth Shard (.*)".toPattern(),
-        "§6§lRARE DROP! §r§5Zombie Lord Chestplate (.*)".toPattern()
+        "§6§lRARE DROP! §r§5Zombie Lord Chestplate (.*)".toPattern(),
     )
     private val uselessDropMessages = listOf(
         "§6§lRARE DROP! §r§aEnchanted Ender Pearl",
@@ -203,7 +203,7 @@ object ChatFilter {
 
     // Useless Notification
     private val uselessNotificationPatterns = listOf(
-        "§aYou tipped \\d+ players? in \\d+(?: different)? games?!".toPattern()
+        "§aYou tipped \\d+ players? in \\d+(?: different)? games?!".toPattern(),
     )
     private val uselessNotificationMessages = listOf(
         "§eYour previous §r§6Plasmaflux Power Orb §r§ewas removed!",
@@ -256,7 +256,7 @@ object ChatFilter {
     private val annoyingSpamPatterns = listOf(
         "§7Your Implosion hit (.*) for §r§c(.*) §r§7damage.".toPattern(),
         "§7Your Molten Wave hit (.*) for §r§c(.*) §r§7damage.".toPattern(),
-        "§cYou need a tool with a §r§aBreaking Power §r§cof §r§6(\\d)§r§c to mine (.*)§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!".toPattern()
+        "§cYou need a tool with a §r§aBreaking Power §r§cof §r§6(\\d)§r§c to mine (.*)§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!".toPattern(),
     )
     private val annoyingSpamMessages = listOf(
         "§cThere are blocks in the way!",
@@ -283,12 +283,12 @@ object ChatFilter {
      */
     private val anitaFortunePattern by RepoPattern.pattern(
         "chat.jacobevent.accessory",
-        "§e\\[NPC] Jacob§f: §rYour §9Anita's \\w+ §fis giving you §6\\+\\d{1,2}☘ .+ Fortune §fduring the contest!"
+        "§e\\[NPC] Jacob§f: §rYour §9Anita's \\w+ §fis giving you §6\\+\\d{1,2}☘ .+ Fortune §fduring the contest!",
     )
 
     private val skymallPerkPattern by RepoPattern.pattern(
         "chat.skymall.perk",
-        "§eNew buff§r§r§r:(.*)"
+        "§eNew buff§r§r§r:(.*)",
     )
 
     // Winter Gift
@@ -340,7 +340,7 @@ object ChatFilter {
 
     private val fireSalePattern by RepoPattern.pattern(
         "chat.firesale",
-        "§6§k§lA§r §c§lFIRE SALE §r§6§k§lA(?:\\n|.)*"
+        "§6§k§lA§r §c§lFIRE SALE §r§6§k§lA(?:\\n|.)*",
     )
     private val fireSalePatterns = listOf(
         "§c♨ §eFire Sales for .* §eare starting soon!".toPattern(),
@@ -361,13 +361,14 @@ object ChatFilter {
         "§7You will now produce §r§6.* Chocolate §r§7per click!".toPattern(),
         "§7You upgraded to §r§d.*?§r§7!".toPattern(),
     )
+
     /**
      * REGEX-TEST: §c§lSACRIFICE! §r§6[MVP§r§d++§r§6] Mikecraft1224§r§f §r§eturned §r§6Young Dragon Boots §r§einto §r§d40 Dragon Essence§r§e!
      * REGEX-TEST: §c§lBONUS LOOT! §r§eThey also received §r§5Ritual Residue §r§efrom their sacrifice!
      */
     private val sacrificePatterns = listOf(
         "§c§lSACRIFICE! (.*) §r§eturned (.*) §r§einto (.*) Dragon Essence§r§e!".toPattern(),
-        "§c§lBONUS LOOT! §r§eThey also received (.*) §r§efrom their sacrifice!".toPattern()
+        "§c§lBONUS LOOT! §r§eThey also received (.*) §r§efrom their sacrifice!".toPattern(),
     )
     private val powderMiningMessages = listOf(
         "§aYou uncovered a treasure chest!",
@@ -390,28 +391,28 @@ object ChatFilter {
      * REGEX-TEST: §6§lRARE REWARD! §r§bLeebys §r§efound a §r§6Recombobulator 3000 §r§ein their Obsidian Chest§r§e!
      */
     private val rareDropsMessages = listOf(
-        "§6§lRARE REWARD! (.*) §r§efound a (.*) §r§ein their (.*) Chest§r§e!".toPattern()
+        "§6§lRARE REWARD! (.*) §r§efound a (.*) §r§ein their (.*) Chest§r§e!".toPattern(),
     )
 
     // &r&6Your &r&aMage &r&6stats are doubled because you are the only player using this class!&r
     private val soloClassPatterns = listOf(
-        "§6Your §r§a(Healer|Mage|Berserk|Archer|Tank) §r§6stats are doubled because you are the only player using this class!".toPattern()
+        "§6Your §r§a(Healer|Mage|Berserk|Archer|Tank) §r§6stats are doubled because you are the only player using this class!".toPattern(),
     )
 
     private val soloStatsPatterns = listOf(
-        "§a\\[(Healer|Mage|Berserk|Archer|Tank)].*".toPattern()
+        "§a\\[(Healer|Mage|Berserk|Archer|Tank)].*".toPattern(),
     )
 
     // &r&dGenevieve the Fairy&r&f: You killed me! Take this &r&6Revive Stone &r&fso that my death is not in vain!&r
     private val fairyPatterns = listOf(
         "§d[\\w']+ the Fairy§r§f: You killed me! Take this §r§6Revive Stone §r§fso that my death is not in vain!".toPattern(),
         "§d[\\w']+ the Fairy§r§f: You killed me! I'll revive you so that my death is not in vain!".toPattern(),
-        "§d[\\w']+ the Fairy§r§f: Have a great life!".toPattern()
+        "§d[\\w']+ the Fairy§r§f: Have a great life!".toPattern(),
     )
 
     // §e§ka§a>>   §aAchievement Unlocked: §6§r§6Agile§r§a   <<§e§ka
     private val achievementGetPatterns = listOf(
-        "§e§k.§a>> {3}§aAchievement Unlocked: .* {3}<<§e§k.".toPattern()
+        "§e§k.§a>> {3}§aAchievement Unlocked: .* {3}<<§e§k.".toPattern(),
     )
 
     private val patternsMap: Map<String, List<Pattern>> = mapOf(

From 48f26364f0572793f38f32a94697e1154447fcfc Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 30 Jun 2024 06:49:41 -0400
Subject: [PATCH 033/721] Feature: Add Recipe Link to Shopping List Craftable!
 text (#2075)

Co-authored-by: Luna <luna@alexia.lol>
---
 .../garden/visitor/GardenVisitorFeatures.kt     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 4d7c45cd0141..2df429c7b6e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -30,6 +30,7 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils.getAmountInInventory
 import at.hannibal2.skyhanni.utils.ItemBlink
 import at.hannibal2.skyhanni.utils.ItemUtils
@@ -253,7 +254,21 @@ object GardenVisitorFeatures {
             }
         }
         if (hasIngredients) {
-            list.add(" §7(§aCraftable!§7)")
+            val leftToCraft = amount - amountInSacks
+            list.add(" §7(")
+            list.add(
+                Renderable.optionalLink(
+                    "§aCraftable!",
+                    {
+                        if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
+                            LorenzUtils.setTextIntoSign("$leftToCraft")
+                        } else {
+                            HypixelCommands.viewRecipe(internalName.toString())
+                        }
+                    },
+                ) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() },
+            )
+            list.add("§7)")
         }
     }
 

From a5efa012118932200973c6b1cd3bb049c06e62a3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 12:52:17 +0200
Subject: [PATCH 034/721] formatting and code cleanup

---
 .../garden/visitor/GardenVisitorFeatures.kt   | 102 ++++++++++--------
 1 file changed, 55 insertions(+), 47 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 2df429c7b6e4..77ba00da7f51 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -81,23 +81,23 @@ object GardenVisitorFeatures {
     private val patternGroup = RepoPattern.group("garden.visitor")
     private val visitorArrivePattern by patternGroup.pattern(
         "visitorarrive",
-        ".* §r§ehas arrived on your §r§bGarden§r§e!"
+        ".* §r§ehas arrived on your §r§bGarden§r§e!",
     )
     private val copperPattern by patternGroup.pattern(
         "copper",
-        " §8\\+§c(?<amount>.*) Copper"
+        " §8\\+§c(?<amount>.*) Copper",
     )
     private val gardenExperiencePattern by patternGroup.pattern(
         "gardenexperience",
-        " §8\\+§2(?<amount>.*) §7Garden Experience"
+        " §8\\+§2(?<amount>.*) §7Garden Experience",
     )
     private val visitorChatMessagePattern by patternGroup.pattern(
         "visitorchat",
-        "§e\\[NPC] (?<color>§.)?(?<name>.*)§f: §r.*"
+        "§e\\[NPC] (?<color>§.)?(?<name>.*)§f: §r.*",
     )
     private val partialAcceptedPattern by patternGroup.pattern(
         "partialaccepted",
-        "§aYou gave some of the required items!"
+        "§aYou gave some of the required items!",
     )
 
     private val logger = LorenzLogger("garden/visitors")
@@ -130,7 +130,7 @@ object GardenVisitorFeatures {
                     "line" to line,
                     "offerItem" to offerItem,
                     "lore" to lore,
-                    "visitor" to visitor
+                    "visitor" to visitor,
                 )
                 continue
             }
@@ -194,13 +194,18 @@ object GardenVisitorFeatures {
             list.add(" §7- ")
             list.add(itemStack)
 
-            list.add(Renderable.optionalLink("$name §ex${amount.addSeparators()}", {
-                if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
-                    LorenzUtils.setTextIntoSign("$amount")
-                } else {
-                    BazaarApi.searchForBazaarItem(name, amount)
-                }
-            }) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() })
+            list.add(
+                Renderable.optionalLink(
+                    "$name §ex${amount.addSeparators()}",
+                    {
+                        if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
+                            LorenzUtils.setTextIntoSign("$amount")
+                        } else {
+                            BazaarApi.searchForBazaarItem(name, amount)
+                        }
+                    },
+                ) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() },
+            )
 
             if (config.shoppingList.showPrice) {
                 val price = internalName.getPrice() * amount
@@ -273,43 +278,46 @@ object GardenVisitorFeatures {
     }
 
     private fun MutableList<List<Any>>.drawVisitors(
-        newVisitors: MutableList<String>,
-        shoppingList: MutableMap<NEUInternalName, Int>,
+        newVisitors: List<String>,
+        shoppingList: Map<NEUInternalName, Int>,
     ) {
-        if (newVisitors.isNotEmpty()) {
-            if (shoppingList.isNotEmpty()) {
-                addAsSingletonList("")
+        if (newVisitors.isEmpty()) return
+        if (shoppingList.isNotEmpty()) {
+            addAsSingletonList("")
+        }
+        val amount = newVisitors.size
+        val visitorLabel = if (amount == 1) "visitor" else "visitors"
+        addAsSingletonList("§e$amount §7new $visitorLabel:")
+        for (visitor in newVisitors) {
+            drawVisitor(visitor)
+        }
+    }
+
+    private fun MutableList<List<Any>>.drawVisitor(visitor: String) {
+        val displayName = GardenVisitorColorNames.getColoredName(visitor)
+
+        val list = mutableListOf<Any>()
+        list.add(" §7- $displayName")
+
+        if (config.shoppingList.itemPreview) {
+            val items = GardenVisitorColorNames.visitorItems[visitor.removeColor()]
+            if (items == null) {
+                val text = "Visitor '$visitor' has no items in repo!"
+                logger.log(text)
+                ChatUtils.debug(text)
+                list.add(" §7(§c?§7)")
+                return
             }
-            val amount = newVisitors.size
-            val visitorLabel = if (amount == 1) "visitor" else "visitors"
-            addAsSingletonList("§e$amount §7new $visitorLabel:")
-            for (visitor in newVisitors) {
-                val displayName = GardenVisitorColorNames.getColoredName(visitor)
-
-                val list = mutableListOf<Any>()
-                list.add(" §7- $displayName")
-
-                if (config.shoppingList.itemPreview) {
-                    val items = GardenVisitorColorNames.visitorItems[visitor.removeColor()]
-                    if (items == null) {
-                        val text = "Visitor '$visitor' has no items in repo!"
-                        logger.log(text)
-                        ChatUtils.debug(text)
-                        list.add(" §7(§c?§7)")
-                        continue
-                    }
-                    if (items.isEmpty()) {
-                        list.add(" §7(§fAny§7)")
-                    } else {
-                        for (item in items) {
-                            list.add(NEUInternalName.fromItemName(item).getItemStack())
-                        }
-                    }
+            if (items.isEmpty()) {
+                list.add(" §7(§fAny§7)")
+            } else {
+                for (item in items) {
+                    list.add(NEUInternalName.fromItemName(item).getItemStack())
                 }
-
-                add(list)
             }
         }
+
+        add(list)
     }
 
     @SubscribeEvent
@@ -570,7 +578,7 @@ object GardenVisitorFeatures {
                 if (color != -1) {
                     RenderLivingEntityHelper.setEntityColor(
                         entity,
-                        color
+                        color,
                     ) { config.highlightStatus == HighlightMode.COLOR || config.highlightStatus == HighlightMode.BOTH }
                 }
                 // Haven't gotten either of the known effected visitors (Vex and Leo) so can't test for sure
@@ -689,7 +697,7 @@ object GardenVisitorFeatures {
         event.move(
             3,
             "garden.visitorRewardWarning.preventRefusing",
-            "garden.visitors.rewardWarning.preventRefusing"
+            "garden.visitors.rewardWarning.preventRefusing",
         )
         event.move(3, "garden.visitorRewardWarning.bypassKey", "garden.visitors.rewardWarning.bypassKey")
         event.move(3, "garden.visitorRewardWarning.drops", "garden.visitors.rewardWarning.drops")

From fa580e7c7ae78c4d7b7e2b305b60ccd3c30a69c4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 30 Jun 2024 17:40:40 +0200
Subject: [PATCH 035/721] Version 0.26 Beta 14

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 37 ++++++++++++++++++-
 docs/FEATURES.md                              | 11 ++++++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b3bac5561e8d..91b8f1a97a61 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.13"
+version = "0.26.Beta.14"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f6aeed6a3d14..b9b4c19b0327 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -38,6 +38,7 @@
 
 + Added new chat filters. - Mikecraft1224 (https://github.com/hannibal002/SkyHanni/pull/1750)
     + Filters for rare dungeon chest rewards and sacrifice messages from other players.
++ Add config option to hide achievement spam on Alpha. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2076)
 
 #### Event Features
 
@@ -95,6 +96,16 @@
     + Click on an item to open /recipe.
     + Option to include items from inside sacks.
     + Option to include vanilla items.
++ Add Page Scrolling. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2164)
+    + Allows scrolling in any inventory with multiple pages.
++ Add Reforge Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
+    + Add reforge locking similar to SkyblockAddons.
+    + Work with Hex.
+    + Show a list of all possible reforges for the item, with stats.
+    + The reforge list can be sorted by a specific stat.
+    + Optionally show the different stat values compared to the current reforge.
++ Add reminder that the Time Tower is expired and has extra charges available. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
+    + Replaces the previous Time Tower Reminder feature.
 
 #### Fishing Features
 
@@ -153,6 +164,8 @@
     + Also shortened the default display.
 + Minor GUI improvements in /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/873)
 + Displays in /ff the fortune from bestiary and armor stats for enchantments and gemstones. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/1861)
++ Allow clicking on the Craftable! text in the shopping list to open the "view recipe" menu. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2075)
++ Rename Mushroom Tier to Mushroom Milestone in Mooshroom Cow Perk. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2159)
 
 #### Hoppity Event Improvements
 
@@ -170,6 +183,8 @@
 + Added collected egg location API import. - appable (https://github.com/hannibal002/SkyHanni/pull/1972)
     + Open your NEU profile viewer and click the chat message to load data.
 + Added Carnival lines to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1995)
++ Made the unclaimed eggs GUI clickable. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/1934)
++ Improve punctuation in the rabbit barn full/almost full messages. - Luna (https://github.com/hannibal002/SkyHanni/pull/2146)
 
 #### Mining Improvements
 
@@ -215,6 +230,7 @@
 
 + Added option to show the name of the sea creature in the title notification. -
   Empa (https://github.com/hannibal002/SkyHanni/pull/1858)
++ Clarified chat prompt to load trophy fishing data from NEU PV. - Luna (https://github.com/hannibal002/SkyHanni/pull/2139)
 
 #### Diana Improvements
 
@@ -248,6 +264,8 @@
 + Added an exclude dungeon toggle to hide far entities. - Iceshadow (https://github.com/hannibal002/SkyHanni/pull/2036)
 + Improved Custom Wardrobe outline color. - Empa (https://github.com/hannibal002/SkyHanni/pull/2079)
 + Improved phrasing of config descriptions, enhanced overall readability, fixed typos, newlines, etc. - zapteryx (https://github.com/hannibal002/SkyHanni/pull/2067)
++ Add some OneConfig mods to the quick mod switcher. - nea (https://github.com/hannibal002/SkyHanni/pull/2155)
++ Add config option to maintain "current" sound settings levels while warning sounds are played. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2129)
 
 ### Fixes
 
@@ -270,6 +288,7 @@
     + Hypixel quietly changed this in or around SkyBlock 0.20.1.
 + Fixed the order of Goblin Eggs in the Powder Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2138)
 + Fixed ore event sometimes getting stuck. - Empa (https://github.com/hannibal002/SkyHanni/pull/2115)
++ Fix incorrect powder costs and powder spent amounts being displayed for some HOTM perks. - Luna (https://github.com/hannibal002/SkyHanni/pull/2145)
 
 #### Garden Fixes
 
@@ -284,7 +303,9 @@
 + Fixed stats in visitor inventory not showing under certain circumstances. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2018)
 + Fixed calculation of universal farming fortune in /ff. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/1861)
     + Removed 100 base ff and added garden bonus from bestiary.
-+ + Fixed cake buff in /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2034)
++ Fixed cake buff in /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2034)
++ Fix an issue where the farming overtake ETA was being displayed as 60 times longer than it actually was. - Evhan_ (https://github.com/hannibal002/SkyHanni/pull/2158)
++ Fix overflow level up message being sent upon reaching crop milestone 46. - Luna (https://github.com/hannibal002/SkyHanni/pull/2161)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -304,6 +325,10 @@
 + Fixed a rare case where golden strays caused incorrect duplicate detection during Compact Chat for Hoppity's. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2090)
 + Fixed the custom reminder in the Chocolate Factory activating when using the Time Tower charge. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2126)
 + Fixed compact Hoppity chat breaking with special mythic rabbits. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2093)
++ Fix opening Chocolate Factory without Mythic Rabbit Pet not being blocked when using the `/factory` command. - Luna (https://github.com/hannibal002/SkyHanni/pull/2154)
++ Fix Time Tower "One charge will give" calculation not accounting for the player having the Mu Rabbit in their collection. - Luna (https://github.com/hannibal002/SkyHanni/pull/2165)
++ Fix typo in Chocolate Factory custom reminder config. - aphased (https://github.com/hannibal002/SkyHanni/pull/2169)
++ Fix the warning messages for the rabbit barn being full/almost full being reversed. - Luna (https://github.com/hannibal002/SkyHanni/pull/2146)
 
 #### Custom Scoreboard Fixes
 
@@ -398,6 +423,8 @@
 + Fixed getting security error when download from GitHub. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2111)
 + Fixed Trevor Tracker not working when Trevor Solver is disabled. - appable (https://github.com/hannibal002/SkyHanni/pull/2116)
 + Fixed Hypixel detection on non-Hypixel servers. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2131)
++ Fix the skill progress ETA XP/hour being doubled. - Evhan_ (https://github.com/hannibal002/SkyHanni/pull/2163)
++ Fix launchers showing SkyHanni as LibNinePatch. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2147)
 
 ### Technical Details
 
@@ -488,10 +515,18 @@
 + Added debug command /shtestisland. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2107)
     + Simulate being on a SkyBlock island.
 + Fixed a ConcurrentModificationException in RepoPatternManager during tests. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2098)
++ Updated the shader enabling system to work with enums instead of shader names. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2035)
++ Add DragNDrop. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1864)
+    + Handler for drag and drop behavior for renderables.
++ Add SkyblockStats. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
++ Add ReforgeAPI. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
++ Switch some stuff from TabListUpdate to TabWidgetUpdate. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1240)
 
 ### Removed Features
 
 + Removed Mineshaft from mining event display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2083)
++ Remove the original Time Tower Reminder feature. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
+    + Hypixel now correctly calculates Time Tower offline.
 
 ## Version 0.25
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index e397f2b95ab1..4aded1014236 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -56,6 +56,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 - Many other messages (Not separated into own categories yet)
 + More chat filters. - Mikecraft1224 (https://github.com/hannibal002/SkyHanni/pull/1750)
     + Filters for rare dungeon chest rewards and sacrifice messages from other players.
++ Add config option to hide achievement spam on Alpha. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2076)
 
 </details>
 <details open><summary>
@@ -206,6 +207,14 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Favorite Power Stones. - saga (https://github.com/hannibal002/SkyHanni/pull/2002)
     + Highlighted in the Thaumaturgy inventory.
     + Shift-click to add/remove them.
++ Add Page Scrolling. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2164)
+    + Allows scrolling in any inventory with multiple pages.
++ Add Reforge Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
+    + Add reforge locking similar to SkyblockAddons.
+    + Work with Hex.
+    + Show a list of all possible reforges for the item, with stats.
+    + The reforge list can be sorted by a specific stat.
+    + Optionally show the different stat values compared to the current reforge.
 
 </details>
 <details open><summary>
@@ -941,6 +950,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Flash your screen when a special stray rabbit appears. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2040)
     + Option to also flash on normal stray rabbits.
 + Added an option to block Chocolate Factory access without a mythic rabbit pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2124)
++ Add reminder that the Time Tower is expired and has extra charges available. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
+    + Replaces the previous Time Tower Reminder feature.
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index cee61d034068..5548893f9d62 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.13",
+    version = "0.26.Beta.14",
 )
 class SkyHanniMod {
 

From 68179984a6f8373e4a185492794954e4f77a0ffe Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 30 Jun 2024 20:15:07 +0200
Subject: [PATCH 036/721] Fix: Custom Scoreboard Submerges In Pattern (#2176)

---
 .../features/gui/customscoreboard/ScoreboardPattern.kt      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 826dd74501d2..b9f80612ec24 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -145,9 +145,13 @@ object ScoreboardPattern {
         "tokens",
         "^(§.)*Tokens: §.[\\w,]+$",
     )
+
+    /**
+     * REGEX-TEST: Submerges In: §e01m 00s
+     */
     val submergesPattern by kuudraSb.pattern(
         "submerges",
-        "^(§.)*Submerges In: (§.)*[\\w,?:]+$",
+        "(?:§.)*Submerges In: (?:§.)*[\\w\\s]+",
     )
 
     // farming

From f99c9479ee7493d7347d957134d8e9ff43125b1d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 1 Jul 2024 00:13:15 +0200
Subject: [PATCH 037/721] fixed missing party message

---
 src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
index ee2257545c8f..f066191699f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
@@ -177,7 +177,8 @@ object PartyAPI {
         }
         if (message == "§eYou left the party." ||
             message == "§cThe party was disbanded because all invites expired and the party was empty." ||
-            message == "§cYou are not currently in a party."
+            message == "§cYou are not currently in a party." ||
+            message == "§cYou are not in a party."
         ) {
             partyLeft()
         }

From 30b08ee4185f6924857762f0ece55598a2a24bea Mon Sep 17 00:00:00 2001
From: ev chang <wyvestbusiness@gmail.com>
Date: Tue, 2 Jul 2024 16:00:10 +0900
Subject: [PATCH 038/721] Backend: Add PolyPatcher to Discord FAQ +
 Installation guide (#2177)

---
 docs/DISCORD_FAQ.md | 10 ++++++----
 docs/INSTALLING.md  |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 634bc1f03a78..8a4f9714ad6d 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -24,8 +24,10 @@ _Frequently Asked Questions_
 > **7: My Jacob Contest Display crops are wrong, how do I fix this?**
 > Run the command `/shclearcontestdata` to clear the Jacob contest data.
 
-> **8: How can I get bigger crop hit boxes?**
-> Use [Patcher](<https://sk1er.club/mods/patcher>) to have 1.12 hitboxes in 1.8.9.
+> **8: How can I get bigger crop hitboxes?**
+> Use Patcher or PolyPatcher to have 1.12 hitboxes in 1.8.9.
+> - [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>)
+> - [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes)
 
 > **9: Why does my Item Tracker feature not track this item?**
 > 1. Check if the item goes directly into your sacks. 
@@ -55,10 +57,10 @@ _Frequently Asked Questions_
 > **12: Why can I still see the normal Scoreboard when using Custom Scoreboard?**
 > Most of the time, this is a mod conflict.
 > If you are using [Sidebar Mod](https://github.com/Alexdoru/SidebarMod), please remove this mod.
-> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.7 or newer to resolve this issue.
+> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.8 or newer to resolve this issue.
 > If you are using [Apec](https://github.com/BananaFructa/Apec/) and want to remove their Scoreboard, you need to remove Apec since they don't have an option to disable their Scoreboard.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.
 
 
-*This FAQ was last updated on June 26th, 2024.
+*This FAQ was last updated on July 1st, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*
diff --git a/docs/INSTALLING.md b/docs/INSTALLING.md
index 6b09e11c33fe..091b064f87ca 100644
--- a/docs/INSTALLING.md
+++ b/docs/INSTALLING.md
@@ -122,7 +122,8 @@ select new installation, under version you need to find Forge for 1.8.9 (most li
 <summary>10. Recommended additional mods (optional)</summary>
 
 [OptiFine](https://optifine.net/adloadx?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar)
-and [Patcher](https://sk1er.club/mods/patcher).
+and either [Sk1erLLC's Patcher](https://sk1er.club/mods/patcher) or [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes)
+
 Those two mods help you get more FPS in game and let you change many more performance
 settings.
 

From 8d0758ecf3ccffef632a3d6e2c84fd705a0035b7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 2 Jul 2024 09:00:36 +0200
Subject: [PATCH 039/721] Fix: Gillsplash in Estimated Item Value (#2173)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/dev/DebugConfig.java      |  5 +++++
 .../inventory/craft/CraftableItemList.kt      | 15 ++-----------
 .../items/EstimatedItemValueCalculator.kt     | 13 ++++++++++++
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 10 +++++++++
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 21 ++++++++++++++++++-
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |  5 ++++-
 6 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
index 9164aacc30ed..8b58e49197be 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
@@ -65,6 +65,11 @@ public class DebugConfig {
     @ConfigEditorBoolean
     public boolean showNpcPrice = false;
 
+    @Expose
+    @ConfigOption(name = "Show Craft Price", desc = "Show craft price in item lore.")
+    @ConfigEditorBoolean
+    public boolean showCraftPrice = false;
+
     @Expose
     @ConfigOption(name = "Show BZ Price", desc = "Show BZ price in item lore.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
index 741021d87b7b..6b841f5a40d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
@@ -10,10 +10,10 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
-import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.isVanillaItem
@@ -26,7 +26,6 @@ import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
-import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.floor
 
@@ -85,7 +84,7 @@ object CraftableItemList {
         pricePer: MutableMap<NEUInternalName, Double>,
         internalName: NEUInternalName,
     ): Renderable? {
-        val neededItems = neededItems(recipe)
+        val neededItems = ItemUtils.neededItems(recipe)
         // Just a fail save, should not happen normally
         if (neededItems.isEmpty()) return null
 
@@ -142,16 +141,6 @@ object CraftableItemList {
         return canCraftTotal.min()
     }
 
-    private fun neededItems(recipe: NeuRecipe): MutableMap<NEUInternalName, Int> {
-        val neededItems = mutableMapOf<NEUInternalName, Int>()
-        for (ingredient in recipe.ingredients) {
-            val material = ingredient.internalItemId.asInternalName()
-            val amount = ingredient.count.toInt()
-            neededItems.addOrPut(material, amount)
-        }
-        return neededItems
-    }
-
     private fun readItems(): Map<NEUInternalName, Long> {
         val materials = mutableMapOf<NEUInternalName, Long>()
         for (stack in InventoryUtils.getItemsInOwnInventory()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 05d53fa657d7..1d6b21d2e1cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -16,8 +16,10 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
@@ -538,6 +540,17 @@ object EstimatedItemValueCalculator {
             price = 0.0
         }
 
+        // If craft cost price is greater than npc price, and there is no ah/bz price, use craft cost instead
+        internalName.getNpcPriceOrNull()?.let { npcPrice ->
+            if (price == npcPrice) {
+                internalName.getRawCraftCostOrNull()?.let { rawCraftPrice ->
+                    if (rawCraftPrice > npcPrice) {
+                        price = rawCraftPrice
+                    }
+                }
+            }
+        }
+
         val name = internalName.itemName
         if (internalName.startsWith("ENCHANTED_BOOK_BUNDLE_")) {
             list.add("§7Base item: $name")
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index e718593f3577..2a5092f27026 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -46,6 +46,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
@@ -468,6 +469,15 @@ object SkyHanniDebugsAndTests {
         event.toolTip.add("§7NPC price: ${npcPrice.addSeparators()}")
     }
 
+    @SubscribeEvent
+    fun onSHowCraftPrice(event: LorenzToolTipEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!debugConfig.showCraftPrice) return
+        val price = event.itemStack.getInternalNameOrNull()?.getRawCraftCostOrNull() ?: return
+
+        event.toolTip.add("§7Craft price: ${price.addSeparators()}")
+    }
+
     @SubscribeEvent
     fun onShowBzPrice(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 67f2865eb155..c094df489071 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -2,8 +2,10 @@ package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -14,6 +16,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
+import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
@@ -339,7 +342,7 @@ object ItemUtils {
                 "internal name" to pet.getInternalName(),
                 "item name" to name,
                 "rarity id" to rarityId,
-                "inventory name" to InventoryUtils.openInventoryName()
+                "inventory name" to InventoryUtils.openInventoryName(),
             )
         }
         return rarity
@@ -409,4 +412,20 @@ object ItemUtils {
         }
         return list
     }
+
+    fun neededItems(recipe: NeuRecipe): Map<NEUInternalName, Int> {
+        val neededItems = mutableMapOf<NEUInternalName, Int>()
+        for (ingredient in recipe.ingredients) {
+            val material = ingredient.internalItemId.asInternalName()
+            val amount = ingredient.count.toInt()
+            neededItems.addOrPut(material, amount)
+        }
+        return neededItems
+    }
+
+    fun getRecipePrice(recipe: NeuRecipe): Double =
+        neededItems(recipe).map {
+            it.key.getPrice() * it.value
+        }.sum()
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 4b334d0270f8..75d394631fd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -197,7 +197,10 @@ object NEUItems {
         return getNpcPriceOrNull() ?: getRawCraftCostOrNull()
     }
 
-    fun NEUInternalName.getRawCraftCostOrNull(): Double? = manager.auctionManager.getCraftCost(asString())?.craftCost
+    // If NEU fails to calculate the craft costs, we calculate it ourself.
+    fun NEUInternalName.getRawCraftCostOrNull(): Double? = manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
+        getRecipes(this).map { ItemUtils.getRecipePrice(it) }.minOrNull()
+    }
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
         .withKnownInternalName(asString())

From 406225e030892acf8a3e35791571af23b3bb8225 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:11:05 +0200
Subject: [PATCH 040/721] Backend: Readme Update (#2174)

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 README.md | 57 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 9258d2af03ee..a7c00b495c57 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,50 @@
-
-
-<h1 align = "center">
-	SkyHanni: Mod for Hypixel SkyBlock
+<h1 align="center">
+  SkyHanni: Mod for Hypixel SkyBlock
 </h1>
 
+
 <div align="center">
 
-[![discord badge](https://img.shields.io/discord/997079228510117908?label=discord&color=9089DA&logo=discord&style=for-the-badge)](https://discord.gg/skyhanni-997079228510117908)
-[![made with kotlin](https://img.shields.io/badge/Made%20With-Kotlin-orange?style=for-the-badge&logo=kotlin&logocolor=white)](https://kotlinlang.org/)
-[![downloads](https://img.shields.io/github/downloads/hannibal002/SkyHanni/total?label=downloads&color=208a19&logo=github&style=for-the-badge)](https://github.com/hannibal002/SkyHanni/releases)
+![sh_logo](https://github.com/hannibal002/SkyHanni/assets/24389977/2f52afa0-0330-434e-ba1c-f2affee96bc1)
+
+[![Discord](https://img.shields.io/discord/997079228510117908?label=discord&color=9089DA&logo=discord&style=for-the-badge)](https://discord.gg/skyhanni-997079228510117908)
+[![Made with Kotlin](https://img.shields.io/badge/Made%20With-Kotlin-orange?style=for-the-badge&logo=kotlin&logocolor=white)](https://kotlinlang.org/)
+[![Downloads](https://img.shields.io/github/downloads/hannibal002/SkyHanni/total?label=downloads&color=208a19&logo=github&style=for-the-badge)](https://github.com/hannibal002/SkyHanni/releases)
 </div>
 
-SkyHanni is a Forge mod for Minecraft 1.8.9. It adds many features to Hypixel SkyBlock.
-The mod is filled with GUIs, extra chat messages, reminders, message hiders and entity highlighters.
-The majority of these features are centered around the Garden, Slayer, Bingo, Diana, and Rift.
+## What it does
+
+SkyHanni is a Forge mod for Minecraft 1.8.9 that adds many useful features to Hypixel SkyBlock. With SkyHanni, you'll get:
+
+* **Helpful GUIs:** Access important information at a glance.
+* **Extra Chat Messages:** Receive reminders and helpful tips.
+* **Message Hiders:** Control which messages you see in chat.
+* **Entity/Item Highlighters:** Focus on important mobs or items in the world/your inventory.
+* **[And much more!](docs/FEATURES.md)**
+
+SkyHanni is especially helpful when doing activities like farming, slayers, Bingo, Diana, fishing, or Rift.
+
+## Getting Started
+
+1. **Install:**  Check out the [installation guide](docs/INSTALLING.md).
+2. **Set Up:** Type `/sh` or `/skyhanni` in-game to configure your settings.
+3. **Explore:** See all the features [here](docs/FEATURES.md).
+
+## Discord & Support
+
+Give feedback or just chat with others on our community Discord!
 
-We have a [tutorial](docs/INSTALLING.md)
-for how to download and install the mod.
+* **Bug Reports:** Use the `#bug-reports` channel.
+* **Feature Suggestions:** Use the `#suggestions` channel.
+* **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel.
 
-Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+[Join the Discord](https://discord.gg/skyhanni-997079228510117908)
 
-[Here](docs/FEATURES.md)  is a large list of all features.
+## Contributing
 
-For bug reports, feature requests, and other feedback, please visit
-our [Discord](https://discord.gg/skyhanni-997079228510117908).
+Interested in writing your own SkyHanni feature or fixing that one annoying bug yourself? Check out our [contributing guide](CONTRIBUTING.md) for more information.
 
-If you are interested in the technical side of SkyHanni, read
-the [Contributing Guide](CONTRIBUTING.md).
+---
 
-*Check out some other really cool 1.8.9 mods [here](https://sbmw.ca/mod-lists/skyblock-mod-list/)*
+**SkyHanni is part of an active modding community. Explore other useful mods [here](https://sbmw.ca/mod-lists/skyblock-mod-list/) to
+complete your SkyBlock setup!**

From 34ba8c5fb8304e7b568822f8d3f675a0f133c6da Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 6 Jul 2024 07:57:22 +0200
Subject: [PATCH 041/721] Improvement: Estimated Item Value (#2180)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../misc/EstimatedItemValueConfig.java        | 31 +++++++++++++++++++
 .../items/EstimatedItemValueCalculator.kt     | 25 +++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
index d1d3e242551e..dcbb65d15862 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
@@ -4,6 +4,7 @@
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
@@ -63,6 +64,36 @@ public class EstimatedItemValueConfig {
     @ConfigEditorBoolean
     public boolean ignoreRunes = false;
 
+    @Expose
+    @ConfigOption(name = "Bazaar Price Source", desc = "Use Instant Buy or Buy Order.")
+    @ConfigEditorDropdown
+    public BazaarPriceSource bazaarPriceSource = BazaarPriceSource.BUY_ORDER;
+
+    public enum BazaarPriceSource {
+        INSTANT_BUY("Instant Buy"),
+        BUY_ORDER("Buy Order"),
+        ;
+        private final String str;
+
+        BazaarPriceSource(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+
+    @Expose
+    @ConfigOption(
+        name = "Use Attribute Price",
+        desc = "Show composite price for attributes instead of lowest bin. " +
+            "This will drastically decrease the estimated value but might be correct when buying multiple low tier items and combining them."
+    )
+    @ConfigEditorBoolean
+    public boolean useAttributeComposite = false;
+
     @Expose
     @ConfigLink(owner = EstimatedItemValueConfig.class, field = "enabled")
     public Position itemPriceDataPos = new Position(140, 90, false, true);
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 1d6b21d2e1cb..54f8f675eb55 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.misc.items
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.ReforgeAPI
+import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -17,7 +18,6 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
@@ -208,7 +208,8 @@ object EstimatedItemValueCalculator {
     private fun String.fixMending() = if (this == "MENDING") "VITALITY" else this
 
     private fun getPriceOrCompositePriceForAttribute(attributeName: String, level: Int): Double? {
-        return (1..10).mapNotNull { lowerLevel ->
+        val intRange = if (config.useAttributeComposite) 1..10 else level..level
+        return intRange.mapNotNull { lowerLevel ->
             "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()
                 ?.let { it / (1 shl lowerLevel) * (1 shl level).toDouble() }
         }.minOrNull()
@@ -585,9 +586,10 @@ object EstimatedItemValueCalculator {
         val map = mutableMapOf<String, Double>()
 
         //todo use repo
-        val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb")
+        val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb", "toxophilite")
         val onlyTierOnePrices =
             listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
+        val onlyTierFivePrices = listOf("ferocious_mana", "hardened_mana", "mana_vampire", "strong_mana")
 
         val internalName = stack.getInternalName()
         for ((rawName, rawLevel) in enchantments) {
@@ -614,6 +616,16 @@ object EstimatedItemValueCalculator {
                 }
                 level = 1
             }
+            if (rawName in onlyTierFivePrices) {
+                when (rawLevel) {
+                    6 -> multiplier = 2
+                    7 -> multiplier = 4
+                    8 -> multiplier = 8
+                    9 -> multiplier = 16
+                    10 -> multiplier = 32
+                }
+                level = 5
+            }
             if (internalName.startsWith("ENCHANTED_BOOK_BUNDLE_")) {
                 multiplier = EstimatedItemValue.bookBundleAmount.getOrDefault(rawName, 5)
             }
@@ -743,4 +755,11 @@ object EstimatedItemValueCalculator {
         list += priceMap.sortedDesc().keys
         return totalPrice
     }
+
+    private fun NEUInternalName.getPrice(): Double = getPriceOrNull() ?: -1.0
+
+    private fun NEUInternalName.getPriceOrNull(): Double? {
+        val useSellPrice = config.bazaarPriceSource == EstimatedItemValueConfig.BazaarPriceSource.BUY_ORDER
+        return getPriceOrNull(useSellPrice)
+    }
 }

From 7b3ed85d171c156f895fdbaeff4d18572fc0f18e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:08:52 +0200
Subject: [PATCH 042/721] Backend: Fixed typos everywhere (#2175)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           | 499 ++++++++++--------
 CONTRIBUTING.md                               |   2 +-
 .../skyhannimodule/ModuleProcessor.kt         |   6 +-
 docs/CHANGELOG.md                             | 110 ++--
 docs/DISCORD_FAQ.md                           |   4 +-
 docs/FEATURES.md                              |  44 +-
 .../at/hannibal2/skyhanni/api/SkillAPI.kt     |   4 +-
 .../skyhanni/config/commands/Commands.kt      |   8 +-
 .../config/features/dev/DebugConfig.java      |   3 +-
 .../features/event/diana/DianaConfig.java     |   2 +-
 .../winter/GiftingOpportunitiesConfig.java    |   1 +
 .../config/features/garden/GardenConfig.java  |   2 +-
 .../garden/visitor/ShoppingListConfig.java    |   2 +-
 .../inventory/helper/ReforgeHelperConfig.java |   2 +-
 .../config/features/misc/MiscConfig.java      |   1 +
 .../compacttablist/CompactTabListConfig.java  |   2 +-
 .../area/stillgorechateau/EffigiesConfig.java |   1 +
 .../at/hannibal2/skyhanni/data/HypixelData.kt |   6 +-
 .../data/bazaar/HypixelBazaarFetcher.kt       |   4 +-
 .../at/hannibal2/skyhanni/data/model/Graph.kt |   6 +-
 .../skyhanni/data/model/SkyblockStat.kt       |   1 +
 .../skyhanni/data/model/TextInput.kt          |  32 +-
 .../hannibal2/skyhanni/data/repo/RepoUtils.kt |   8 +-
 ...pEvent.kt => SkillOverflowLevelUpEvent.kt} |   2 +-
 .../features/bingo/card/BingoCardReader.kt    |   6 +-
 .../features/bingo/card/goals/BingoGoal.kt    |   3 +-
 .../skyhanni/features/combat/FlareDisplay.kt  |   4 +-
 .../combat/damageindicator/BossType.kt        |   6 +-
 .../damageindicator/DamageIndicatorManager.kt |   2 +-
 .../combat/damageindicator/MobFinder.kt       |   2 +-
 .../combat/ghostcounter/GhostCounter.kt       |   4 +-
 .../features/commands/PartyChatCommands.kt    |   2 +-
 .../features/dungeon/CroesusChestTracker.kt   |   2 +-
 .../skyhanni/features/dungeon/DungeonAPI.kt   |   4 +-
 .../features/dungeon/DungeonHideItems.kt      |   2 +-
 .../features/event/diana/DianaFixChat.kt      |   2 +-
 .../event/diana/GriffinBurrowHelper.kt        |   4 +-
 .../features/event/diana/SoopyGuessBurrow.kt  |  30 +-
 .../skyhanni/features/garden/GardenPlotAPI.kt |   4 +-
 .../garden/contest/JacobContestTimeNeeded.kt  |   4 +-
 .../garden/fortuneguide/pages/CropPage.kt     |   2 +-
 .../features/misc/FixGhostEntities.kt         |   2 +-
 .../features/misc/PatcherSendCoordinates.kt   |   6 +-
 .../misc/compacttablist/AdvancedPlayerList.kt |   8 +-
 .../misc/discordrpc/DiscordLocationKey.kt     |   2 +-
 .../features/misc/limbo/LimboTimeTracker.kt   |  16 +-
 .../dailyquest/QuestLoader.kt                 |   2 +-
 .../stillgorechateau/RiftBloodEffigies.kt     |   2 +-
 .../features/skillprogress/SkillProgress.kt   |   4 +-
 .../features/slayer/SlayerProfitTracker.kt    |   2 +-
 .../features/slayer/SlayerRngMeterDisplay.kt  |   4 +-
 .../slayer/enderman/EndermanSlayerFeatures.kt |   2 +-
 .../AccessorRendererLivingEntity.java         |   2 +-
 .../MixinContributorRendererEntityLiving.java |   2 +-
 .../skyhanni/test/TestCopyBestiaryValues.kt   |   4 +-
 .../test/hotswap/HotswapSupportImpl.kt        |   2 +-
 .../hannibal2/skyhanni/utils/CombatUtils.kt   |   4 +-
 .../skyhanni/utils/EntityOutlineRenderer.kt   |  40 +-
 .../skyhanni/utils/InventoryUtils.kt          |   2 +-
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  |   2 +-
 .../hannibal2/skyhanni/utils/LocationUtils.kt |   6 +-
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   |   2 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  88 ++-
 .../utils/SkyBlockItemModifierUtils.kt        |   2 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  16 +-
 .../utils/repopatterns/RepoPatternManager.kt  |   8 +-
 .../hannibal2/skyhanni/utils/shader/Shader.kt |   2 +-
 .../skyhanni/utils/shader/ShaderHelper.kt     |  12 +-
 .../skyhanni/utils/shader/ShaderManager.kt    |   2 +-
 .../skyhanni/utils/tracker/ItemTrackerData.kt |   2 +-
 .../utils/tracker/SkyHanniItemTracker.kt      |   2 +-
 71 files changed, 573 insertions(+), 512 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/events/{SkillOverflowLevelupEvent.kt => SkillOverflowLevelUpEvent.kt} (69%)

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index 3de37f4054d4..64c012a13789 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -1,225 +1,276 @@
 <component name="ProjectDictionaryState">
-    <dictionary name="default.user">
-        <words>
-            <w>abiphone</w>
-            <w>agaricus</w>
-            <w>allinvite</w>
-            <w>apec</w>
-            <w>arachne</w>
-            <w>arachne's</w>
-            <w>ashfang</w>
-            <w>autopet</w>
-            <w>bacte</w>
-            <w>bandana</w>
-            <w>berberis</w>
-            <w>biome</w>
-            <w>bladesoul</w>
-            <w>blobbercysts</w>
-            <w>bloodfiend</w>
-            <w>bobber</w>
-            <w>bobber's</w>
-            <w>bonzo</w>
-            <w>bonzo's</w>
-            <w>bonzos</w>
-            <w>boop</w>
-            <w>bossbar</w>
-            <w>broodfather</w>
-            <w>broodmother</w>
-            <w>cadycous</w>
-            <w>carrolyn</w>
-            <w>cata</w>
-            <w>cavespider</w>
-            <w>chestplate</w>
-            <w>chocolatefactory</w>
-            <w>chronomatron</w>
-            <w>chumcap</w>
-            <w>citrine</w>
-            <w>coflnet</w>
-            <w>coords</w>
-            <w>craftable</w>
-            <w>cropie</w>
-            <w>crosshair</w>
-            <w>deathmite</w>
-            <w>deathmites</w>
-            <w>deathripper</w>
-            <w>demonlord</w>
-            <w>derpy</w>
-            <w>despawn</w>
-            <w>dicer</w>
-            <w>disintegrator</w>
-            <w>disintegrators</w>
-            <w>dragontail</w>
-            <w>dreadfarm</w>
-            <w>dreadlord</w>
-            <w>dungeoneering</w>
-            <w>dwarven</w>
-            <w>egglocator</w>
-            <w>einary</w>
-            <w>einary's</w>
-            <w>elitebot</w>
-            <w>enderman</w>
-            <w>endermen</w>
-            <w>endermite</w>
-            <w>enderstone</w>
-            <w>endstone</w>
-            <w>etherwarp</w>
-            <w>explosivity</w>
-            <w>fermento</w>
-            <w>firedust</w>
-            <w>firesale</w>
-            <w>firesales</w>
-            <w>getfromsacks</w>
-            <w>glacite</w>
-            <w>glowstone</w>
-            <w>goldor</w>
-            <w>gratitudes</w>
-            <w>hardstone</w>
-            <w>hatcessory</w>
-            <w>hecatomb</w>
-            <w>hideparticles</w>
-            <w>hoppity</w>
-            <w>hoppity's</w>
-            <w>horsezooka</w>
-            <w>hotbar</w>
-            <w>hotm</w>
-            <w>hoverable</w>
-            <w>hpb's</w>
-            <w>hypixel</w>
-            <w>hypixel's</w>
-            <w>ichor</w>
-            <w>igrupan</w>
-            <w>igrupan's</w>
-            <w>ingame</w>
-            <w>inquis</w>
-            <w>inquistiors</w>
-            <w>internalname</w>
-            <w>interp</w>
-            <w>itemstack</w>
-            <w>jawbus</w>
-            <w>jerries</w>
-            <w>jerrypocalypse</w>
-            <w>jyrre</w>
-            <w>kaeso</w>
-            <w>keybind</w>
-            <w>keybinds</w>
-            <w>kindlebane</w>
-            <w>kismets</w>
-            <w>kloon</w>
-            <w>kuudra</w>
-            <w>kuudra's</w>
-            <w>laggy</w>
-            <w>lapis</w>
-            <w>larvas</w>
-            <w>lclick</w>
-            <w>lerp</w>
-            <w>livids</w>
-            <w>matriach</w>
-            <w>mawdredge</w>
-            <w>maxor</w>
-            <w>mcmod</w>
-            <w>millenia</w>
-            <w>miniboss</w>
-            <w>mirrorverse</w>
-            <w>mmclick</w>
-            <w>mobtracker</w>
-            <w>modid</w>
-            <w>moldfin</w>
-            <w>mooshroom</w>
-            <w>moul</w>
-            <w>moulberry</w>
-            <w>moulconfig</w>
-            <w>mouselocked</w>
-            <w>mouselowered</w>
-            <w>mycelium</w>
-            <w>nametag</w>
-            <w>nametags</w>
-            <w>necron</w>
-            <w>netherrack</w>
-            <w>neu's</w>
-            <w>npcs</w>
-            <w>nukekebi</w>
-            <w>nukekubi</w>
-            <w>odger</w>
-            <w>odger's</w>
-            <w>odonata</w>
-            <w>odonatas</w>
-            <w>opengenerowmenu</w>
-            <w>opti</w>
-            <w>oruo</w>
-            <w>packmaster</w>
-            <w>peridot</w>
-            <w>perkpocalypse</w>
-            <w>pickblock</w>
-            <w>pickobulus</w>
-            <w>pickonimbus</w>
-            <w>plhlegblast</w>
-            <w>polarvoid</w>
-            <w>preinitialization</w>
-            <w>procs</w>
-            <w>punchcard</w>
-            <w>pyrochaos</w>
-            <w>quazii</w>
-            <w>rclick</w>
-            <w>recombobulated</w>
-            <w>recombobulator</w>
-            <w>redstone</w>
-            <w>reindrake</w>
-            <w>renderable</w>
-            <w>renderables</w>
-            <w>revenant</w>
-            <w>riftstalker</w>
-            <w>robotron</w>
-            <w>runecrafting</w>
-            <w>sadan</w>
-            <w>scatha</w>
-            <w>sethome</w>
-            <w>shcopytranslation</w>
-            <w>shcropstartlocation</w>
-            <w>shlanedetection</w>
-            <w>shmarkplayer</w>
-            <w>shmouselock</w>
-            <w>shoutout</w>
-            <w>shulker</w>
-            <w>shwords</w>
-            <w>shworldedit</w>
-            <w>skeletor</w>
-            <w>skyblock</w>
-            <w>skyhanni</w>
-            <w>skyhanni's</w>
-            <w>skymall</w>
-            <w>skytils</w>
-            <w>skytils's</w>
-            <w>soopy</w>
-            <w>soopy's</w>
-            <w>soulsand</w>
-            <w>soulweaver</w>
-            <w>sprayonator</w>
-            <w>stillgore</w>
-            <w>stonk</w>
-            <w>superboom</w>
-            <w>supercraft</w>
-            <w>supercrafting</w>
-            <w>superlite</w>
-            <w>superpairs</w>
-            <w>tablist</w>
-            <w>terracottas</w>
-            <w>thaumaturgy</w>
-            <w>treasurite</w>
-            <w>tubulator</w>
-            <w>turbomax</w>
-            <w>twinclaws</w>
-            <w>typhoeus</w>
-            <w>ultrasequencer</w>
-            <w>unobtained</w>
-            <w>untrackable</w>
-            <w>vermins</w>
-            <w>viewrecipe</w>
-            <w>voidgloom</w>
-            <w>voidling</w>
-            <w>voltas</w>
-            <w>wikithis</w>
-            <w>wyld</w>
-            <w>yoggie</w>
-        </words>
-    </dictionary>
-</component>
+  <dictionary name="default.user">
+    <words>
+      <w>aatrox</w>
+      <w>abiphone</w>
+      <w>agaricus</w>
+      <w>allinvite</w>
+      <w>apec</w>
+      <w>arachne</w>
+      <w>arachne's</w>
+      <w>armorstand</w>
+      <w>armorstands</w>
+      <w>ashfang</w>
+      <w>astraea</w>
+      <w>attunement</w>
+      <w>autopet</w>
+      <w>azrael</w>
+      <w>bacte</w>
+      <w>bandana</w>
+      <w>berberis</w>
+      <w>bezal</w>
+      <w>biblio</w>
+      <w>biome</w>
+      <w>bladesoul</w>
+      <w>blobbercyst</w>
+      <w>blobbercysts</w>
+      <w>bloodfiend</w>
+      <w>bobber</w>
+      <w>bobber's</w>
+      <w>bonzo</w>
+      <w>bonzo's</w>
+      <w>bonzos</w>
+      <w>boop</w>
+      <w>bossbar</w>
+      <w>branchstrutter</w>
+      <w>broodfather</w>
+      <w>broodmother</w>
+      <w>burningsoul</w>
+      <w>caducous</w>
+      <w>cadycous</w>
+      <w>carrolyn</w>
+      <w>cata</w>
+      <w>cavespider</w>
+      <w>chestplate</w>
+      <w>chocolatefactory</w>
+      <w>chronomatron</w>
+      <w>chumcap</w>
+      <w>cinderbat</w>
+      <w>citrine</w>
+      <w>coflnet</w>
+      <w>coords</w>
+      <w>craftable</w>
+      <w>crit</w>
+      <w>cropie</w>
+      <w>crosshair</w>
+      <w>deathmite</w>
+      <w>deathmites</w>
+      <w>deathripper</w>
+      <w>deepterror</w>
+      <w>demonlord</w>
+      <w>derpy</w>
+      <w>despawn</w>
+      <w>dicer</w>
+      <w>disintegrator</w>
+      <w>disintegrators</w>
+      <w>dragontail</w>
+      <w>dreadfarm</w>
+      <w>dreadlord</w>
+      <w>dungeoneering</w>
+      <w>dwarven</w>
+      <w>egglocator</w>
+      <w>einary</w>
+      <w>einary's</w>
+      <w>elitebot</w>
+      <w>enderman</w>
+      <w>endermen</w>
+      <w>endermite</w>
+      <w>enderstone</w>
+      <w>endstone</w>
+      <w>etherwarp</w>
+      <w>explosivity</w>
+      <w>ezpz</w>
+      <w>fairylosopher</w>
+      <w>fermento</w>
+      <w>firedust</w>
+      <w>firesale</w>
+      <w>firesales</w>
+      <w>framebuffer</w>
+      <w>getfromsacks</w>
+      <w>ghast</w>
+      <w>glacite</w>
+      <w>glowstone</w>
+      <w>goldor</w>
+      <w>golem</w>
+      <w>gratitudes</w>
+      <w>hardstone</w>
+      <w>hatcessory</w>
+      <w>hecatomb</w>
+      <w>hexatorum</w>
+      <w>hideparticles</w>
+      <w>hoppity</w>
+      <w>hoppity's</w>
+      <w>horsezooka</w>
+      <w>hotbar</w>
+      <w>hotm</w>
+      <w>hoverable</w>
+      <w>hpb's</w>
+      <w>hypixel</w>
+      <w>hypixel's</w>
+      <w>ichor</w>
+      <w>igrupan</w>
+      <w>igrupan's</w>
+      <w>ingame</w>
+      <w>inquis</w>
+      <w>inquistiors</w>
+      <w>insanium</w>
+      <w>internalname</w>
+      <w>interp</w>
+      <w>itemstack</w>
+      <w>jawbus</w>
+      <w>jerries</w>
+      <w>jerrypocalypse</w>
+      <w>jyrre</w>
+      <w>kada</w>
+      <w>kaeso</w>
+      <w>keybind</w>
+      <w>keybinds</w>
+      <w>kindlebane</w>
+      <w>kismets</w>
+      <w>kloon</w>
+      <w>kuudra</w>
+      <w>kuudra's</w>
+      <w>laggy</w>
+      <w>lapis</w>
+      <w>larvas</w>
+      <w>lclick</w>
+      <w>lerp</w>
+      <w>livids</w>
+      <w>locraw</w>
+      <w>magmafish</w>
+      <w>matriach</w>
+      <w>mawdredge</w>
+      <w>maxor</w>
+      <w>mcmod</w>
+      <w>millenia</w>
+      <w>minecart</w>
+      <w>mineman</w>
+      <w>miniboss</w>
+      <w>mirrorverse</w>
+      <w>misclick</w>
+      <w>missclick</w>
+      <w>mmclick</w>
+      <w>mobtracker</w>
+      <w>modid</w>
+      <w>modrinth</w>
+      <w>moldfin</w>
+      <w>mooshroom</w>
+      <w>moul</w>
+      <w>moulberry</w>
+      <w>moulconfig</w>
+      <w>mouselocked</w>
+      <w>mouselowered</w>
+      <w>mycelium</w>
+      <w>nametag</w>
+      <w>nametags</w>
+      <w>necron</w>
+      <w>netherrack</w>
+      <w>neu's</w>
+      <w>npcs</w>
+      <w>nukekebi</w>
+      <w>nukekubi</w>
+      <w>odger</w>
+      <w>odger's</w>
+      <w>odonata</w>
+      <w>odonatas</w>
+      <w>opengenerowmenu</w>
+      <w>opti</w>
+      <w>oruo</w>
+      <w>otherside</w>
+      <w>overworld</w>
+      <w>packmaster</w>
+      <w>peridot</w>
+      <w>perkpocalypse</w>
+      <w>pesterminator</w>
+      <w>pickblock</w>
+      <w>pickobulus</w>
+      <w>pickonimbus</w>
+      <w>pitchin</w>
+      <w>plhlegblast</w>
+      <w>pling</w>
+      <w>pocalypse</w>
+      <w>polarvoid</w>
+      <w>preinitialization</w>
+      <w>procs</w>
+      <w>prospection</w>
+      <w>pumpgrotto</w>
+      <w>punchcard</w>
+      <w>pyrochaos</w>
+      <w>quazii</w>
+      <w>ragnarock</w>
+      <w>rclick</w>
+      <w>recombobulated</w>
+      <w>recombobulator</w>
+      <w>redstone</w>
+      <w>reindrake</w>
+      <w>renderable</w>
+      <w>renderables</w>
+      <w>revenant</w>
+      <w>riftstalker</w>
+      <w>rngesus</w>
+      <w>robotron</w>
+      <w>runecrafting</w>
+      <w>sadan</w>
+      <w>scarleton</w>
+      <w>scatha</w>
+      <w>sepulture</w>
+      <w>seraphine</w>
+      <w>sethome</w>
+      <w>shcopytranslation</w>
+      <w>shcropstartlocation</w>
+      <w>shlanedetection</w>
+      <w>shmarkplayer</w>
+      <w>shmouselock</w>
+      <w>shoutout</w>
+      <w>shulker</w>
+      <w>shwords</w>
+      <w>shworldedit</w>
+      <w>skeletor</w>
+      <w>skyblock</w>
+      <w>skyhanni</w>
+      <w>skyhanni's</w>
+      <w>skymall</w>
+      <w>skytils</w>
+      <w>skytils's</w>
+      <w>slimehill</w>
+      <w>soopy</w>
+      <w>soopy's</w>
+      <w>soulbound</w>
+      <w>soulflow</w>
+      <w>soulsand</w>
+      <w>soulweaver</w>
+      <w>sprayonator</w>
+      <w>statspocalypse</w>
+      <w>stillgore</w>
+      <w>stonk</w>
+      <w>superboom</w>
+      <w>supercraft</w>
+      <w>supercrafting</w>
+      <w>superlite</w>
+      <w>superpairs</w>
+      <w>tablist</w>
+      <w>terracottas</w>
+      <w>thaumaturgist</w>
+      <w>thaumaturgy</w>
+      <w>townsquare</w>
+      <w>treasurite</w>
+      <w>tubulator</w>
+      <w>turbomax</w>
+      <w>twinclaws</w>
+      <w>typhoeus</w>
+      <w>ultrasequencer</w>
+      <w>unobtained</w>
+      <w>untrackable</w>
+      <w>vermins</w>
+      <w>viewrecipe</w>
+      <w>voidgloom</w>
+      <w>voidling</w>
+      <w>voltas</w>
+      <w>weaponsmith</w>
+      <w>wikithis</w>
+      <w>wyld</w>
+      <w>yoggie</w>
+      <w>yolkar</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b622b4a6db93..3194902b8403 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -145,7 +145,7 @@ The repo is located at https://github.com/hannibal002/SkyHanni-REPO.
 A copy of all json files is stored on the computer under `.minecraft\config\skyhanni\repo`.
 On every game start, the copy gets updated (if outdated and if not manually disabled).
 If you add stuff to the repo make sure it gets serialised. See
-the [jsonobjects](src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo)
+the [JsonObjects](src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo)
 folder for how to properly do this. You also may have to disable repo auto update in game.
 
 ### Discord IPC
diff --git a/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt b/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt
index 99d7904d0b33..5ce90261351b 100644
--- a/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt
+++ b/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt
@@ -90,10 +90,10 @@ class ModuleProcessor(private val codeGenerator: CodeGenerator, private val logg
             error("${warnings.size} errors related to event annotations found, please fix them before continuing. Click on the kspKotlin build log for more information.")
         }
 
-        val dependencies = symbols.mapNotNull { it.containingFile }.toTypedArray()
-        val deps = Dependencies(true, *dependencies)
+        val sources = symbols.mapNotNull { it.containingFile }.toTypedArray()
+        val dependencies = Dependencies(true, *sources)
 
-        val file = codeGenerator.createNewFile(deps, "at.hannibal2.skyhanni.skyhannimodule", "LoadedModules")
+        val file = codeGenerator.createNewFile(dependencies, "at.hannibal2.skyhanni.skyhannimodule", "LoadedModules")
 
         OutputStreamWriter(file).use {
             it.write("package at.hannibal2.skyhanni.skyhannimodule\n\n")
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b9b4c19b0327..22be128be8c9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -12,7 +12,7 @@
     + Show effective area (as a wireframe, filled or circle).
     + Show mana regeneration buff next to the GUI element.
     + Option to hide flare particles.
-+ Added a "Line to Arachne" setting, just like with slayer minibosses. -
++ Added a "Line to Arachne" setting, just like with slayer mini bosses. -
   azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888)
 + Added In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
@@ -256,7 +256,7 @@
   Empa (https://github.com/hannibal002/SkyHanni/pull/1875)
 + Updated /shclearminiondata to remove only bugged minions nearby, not all minions. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1951)
-+ Added information about the current Perkopocalypse Mayor's perks to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003)
++ Added information about the current Perkpocalypse Mayor's perks to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003)
 + Added support for Fancy Contributors in nametags. - Empa (https://github.com/hannibal002/SkyHanni/pull/1687)
 + Improved overall performance slightly by about ~1%. - nea (https://github.com/hannibal002/SkyHanni/pull/2033)
 + Improved Hypixel server detection. - Luna (https://github.com/hannibal002/SkyHanni/pull/2064)
@@ -337,7 +337,7 @@
 + Fixed showing "No Magical Power detected" message multiple times. - Empa (https://github.com/hannibal002/SkyHanni/pull/2065)
 + Fixed unknown lines not appearing instantly in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2063)
 + Fixed Anniversary Line not being detected in Custom Scoreboard. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2058)
-+ Fixed Perkapocalypse Mayor's time being longer than Jerry's time in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2045)
++ Fixed Perkpocalypse Mayor's time being longer than Jerry's time in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2045)
 + Fixed Unknown lines in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/2119)
 + Fixed broken event start time for upcoming events in the Custom Scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2113)
 + Fixed the New Year Event missing in the Custom Scoreboard.. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2122)
@@ -449,7 +449,7 @@
     + Reserves a key namespace, that is only accessible from this group.
 + Increased usage of seconds passed. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1899)
 + Refactored /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/873)
-+ Added Perkopocalypse Mayor to MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003)
++ Added Perkpocalypse Mayor to MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003)
 + Created FmlEventApi to hold Forge events before dispatching them as SkyHanniEvents. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1986)
 + Ensured correct config version when downgrading the mod. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1990)
 + Changed CachedItemData to use SimpleTimeMark. - nea (https://github.com/hannibal002/SkyHanni/pull/2006)
@@ -500,7 +500,7 @@
     + This is separate from chroma.
     + This is achieved by using §#§0§0§0§f§f§f§/.
     + Simply use the ExtendedChatColor class.
-+ Refactored Area Miniboss Features to use mob detection. - Empa (https://github.com/hannibal002/SkyHanni/pull/2095)
++ Refactored Area Mini boss Features to use mob detection. - Empa (https://github.com/hannibal002/SkyHanni/pull/2095)
 + Added OreBlock and OreType. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655)
 + Added OreMinedEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655)
     + Provides information on the original block mined, and any other blocks mined by sources like Efficient Miner, Mole, etc.
@@ -508,7 +508,7 @@
 + Fixed HotmAPI saving incorrect level values when using Blue Egg. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2097)
 + Fixed the interest widget and added a scrap widget. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2094)
 + Made SkyHanni into a Mod. - hannibal2 + nea (https://github.com/hannibal002/SkyHanni/pull/2099)
-+ Fixed illegal mob detection with ridable pets. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2010)
++ Fixed illegal mob detection with rideable pets. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2010)
 + Removed yet another deprecated function. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2021)
 + Created and implemented PlayerDeathEvent. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1544)
 + Added a list of named nodes for the graph editor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2059)
@@ -661,7 +661,7 @@
 + Added Factory Chat Filters. - RobotHanzo (https://github.com/hannibal002/SkyHanni/pull/1574)
     + Hide chocolate factory upgrade and employee promotion messages.
 + Copy Chocolate Factory Stats to clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
-+ Highlight unbought items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
++ Highlight non-purchased items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
 + Added time tower status to the chocolate factory stats. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1506)
     + Also can notify you when you get a new charge or your charges are full.
@@ -702,7 +702,7 @@
     + Highlights the Heavy Pearls.
     + Draws a line to the Heavy Pearls.
 
-#### Slayer Featues
+#### Slayer Features
 
 + Added Blaze Slayer fire pillar display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1766)
     + Shows a large display with a timer when the Fire Pillar is about to explode.
@@ -838,7 +838,7 @@
 
 #### Commands Improvements
 
-+ Add /trade to tab completeable commands. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1354)
++ Add /trade to tab completable commands. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1354)
 + Improved gfs to have support for calculations in amount. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1493)
 + Cleanup the format for the /shcommand hover description. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1531)
@@ -926,7 +926,7 @@
 + Improved various Hoppity features. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
 + Show an estimation of when you will prestige based on your chocolate/second. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1514)
-+ Removed the Hoppity Menu Shortcut in The Rift, Kuudra, Catacombs and Mineshafts. -
++ Removed the Hoppity Menu Shortcut in Rift, Kuudra, Catacombs and Mineshaft. -
   raven (https://github.com/hannibal002/SkyHanni/pull/1585)
     + You cannot use the chocolate factory in these areas, resulting in the button being removed.
 + Live update chocolate amounts in other inventories related to the chocolate factory. -
@@ -1241,7 +1241,7 @@
 
 #### Rift Fixes
 
-+ Fixed Rift NPC shops being treated as overworld ones for selling items to them. -
++ Fixed Rift NPC shops being treated as Overworld ones for selling items to them. -
   Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1494)
 + Fixed Blood Effigies timers in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1649)
     + Fixed timers showing even when above the set respawn time.
@@ -1289,7 +1289,7 @@
 
 #### Crimson Isle Fixes
 
-+ Fixed incorrect miniboss amount displayed by Crimson Isle Reputation Helper. -
++ Fixed incorrect mini boss amount displayed by Crimson Isle Reputation Helper. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1633)
 + Fixed Volcano Explosivity Display. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1821)
     + Broken when Hypixel introduced the new tab list.
@@ -1344,7 +1344,7 @@
 + Fixed updater downloading the wrong version. - Empa (https://github.com/hannibal002/SkyHanni/pull/1590)
 + Fixed some mob features not working with Skytils' ping display. - Thunderblade73 &
   martimavocado (https://github.com/hannibal002/SkyHanni/pull/1605)
-+ Fixed overly frequent bazaar price error messages. - hannnibal2 (https://github.com/hannibal002/SkyHanni/pull/1597)
++ Fixed overly frequent bazaar price error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1597)
 + Fixed overly long description for Patcher send coordinates waypoints. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1631)
 + Fixed the low quiver warning. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1629)
@@ -1354,7 +1354,7 @@
   Luna (https://github.com/hannibal002/SkyHanni/pull/1706)
 + Fixed bugged minion name tags on your private island when opening a minion. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1630)
-+ Fixed supercrafted items being incorrectly added to profit trackers. -
++ Fixed super-crafted items being incorrectly added to profit trackers. -
   Empa (https://github.com/hannibal002/SkyHanni/pull/1784)
 + Fixed typo in the Mythological Creature Tracker reset command. -
   Jordyrat (https://github.com/hannibal002/SkyHanni/pull/1800)
@@ -1383,7 +1383,7 @@
 + Added offset to tick event. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1342)
 + Made dungeon milestone use repo instead of local patterns. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1342)
-+ Unprivate LorenzVec.toCleanString. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1344)
++ Removed private modifier from LorenzVec.toCleanString. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1344)
 + Removed Old TimeMark Class. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1322)
 + Remove a lot of usage of fixed rate timers and replace with a new event. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1264)
@@ -1414,7 +1414,7 @@
 + Added Renderable.verticalContainer. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1318)
 + Remove a lot of deprecated methods. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1371)
 + Added Renderable.table. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/822)
-+ Add API for rendering fake ghostly/holograhpic entities in the world. -
++ Add API for rendering fake ghostly/holographic entities in the world. -
   nea (https://github.com/hannibal002/SkyHanni/pull/731)
 + Added a `removeSpray` method to `Plot`. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1178)
 + Changed stuff around with chat messages. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1227)
@@ -1454,7 +1454,7 @@
 + Removed use of notenoughupdates.util.Constants. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1191)
 + Made a generic gson builder containing common type adapters. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1308)
-    + Moved specific gson types (Elite api data and Hypixel api data) to their own gsons.
+    + Moved specific gson types (Elite api data and Hypixel api data) to their own Gson objects.
 + Elitebot api now uses CropType and PestType instead of strings. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1308)
 + Added Renderable.multiClickable. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1407)
@@ -1609,7 +1609,7 @@
     + Highlights your selected class in green if it's available.
 + Kismet tracking for dungeon chests. - Thunderblade73
     + Highlight chests which have been rerolled inside Croesus
-    + Shows kismet amount at the reroll button
+    + Shows kismet amount at the re-roll button
 
 #### Garden Features
 
@@ -1724,7 +1724,7 @@
   j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1221)
     + Using a draggable list, you can fully customise, what events will be shown which what priority.
 + Updated default Scoreboard Elements config option. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1221)
-+ Added feature to showcase foxy's extra in Custom Scoreboard. -
++ Added feature to showcase Foxy' extra event in Custom Scoreboard. -
   j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1270)
 
 ##### Garden Improvements
@@ -1767,7 +1767,7 @@
   Empa (https://github.com/hannibal002/SkyHanni/pull/1284)
 + Immediately hide waypoints when there are no pests left. - Empa (https://github.com/hannibal002/SkyHanni/pull/1284)
 
-#### Crimson Improvelemts
+#### Crimson Improvements
 
 + Show Town Board waypoint when there is an accepted Rescue Mission quest. -
   Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1157)
@@ -1848,7 +1848,7 @@
   martimavocado (https://github.com/hannibal002/SkyHanni/pull/1211)
 + Fix a typo in Not Clickable Items in the /equipment menu. -
   martimavocado (https://github.com/hannibal002/SkyHanni/pull/1242)
-+ Fixed `/playtimedetailed`'s Limbo displaying incorrectly for x.0 playtimes. -
++ Fixed `/playtimedetailed`'s Limbo displaying incorrectly for x.0 play times. -
   martimavocado (https://github.com/hannibal002/SkyHanni/pull/1252)
 
 #### Chat Fixes
@@ -1920,7 +1920,7 @@
 
 #### Slayer Fixes
 
-+ Added Burningsoul Demon (75M HP miniboss) to line to miniboss and highlight slayer minibosses. -
++ Added Burningsoul Demon (75M HP mini boss) to line to mini boss and highlight slayer mini bosses. -
   Empa (https://github.com/hannibal002/SkyHanni/pull/1144)
 + Fixed Damage Indicator not hiding vanilla names. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1179)
 + Fixed Slayer Profit Tracker not detecting the slayer spawn cost when taking money from the bank. -
@@ -2014,7 +2014,7 @@
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1195)
 + Remove the removed stack size option from config. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1274)
 
-#### Fishign Fixes
+#### Fishing Fixes
 
 + Renamed "fishing contest" to "fishing festival". - Empa (https://github.com/hannibal002/SkyHanni/pull/1222)
 + Fixed duplicate chat prefix when updating trophy fishing data from NEU PV. -
@@ -2152,7 +2152,7 @@
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1226)
 + Refactored visitor handling code slightly. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1224)
     + Removed unneeded inSacks property.
-+ Added "unknownAmmount" to PestSpawnEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1237)
++ Added "unknownAmount" to PestSpawnEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1237)
 + Added StringUtils.generateRandomId(). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1128)
 + Added ChatUtils.clickableChat support for runnable action. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1128)
@@ -2516,7 +2516,7 @@
 + Fixed no bait warning appearing at the wrong moment or not appearing at all. - hannibal2
 + Fixed Crimson Isle Fishing Geyser Box showing even when very far away. - Obsidian
 
-#### Invenory Fixes
+#### Inventory Fixes
 
 + Fixed hide non-clickable items not working in some bazaar pages. - hannibal2
 + Fixed rogue sword ability taking into account mage cooldown reduction. - Empa
@@ -2555,7 +2555,7 @@
 + Fixed GUI positions moving into the bottom-right corner when leaving the GUI position editor while pressing the mouse
   button on next reopen. - hannibal2
 + Fixed parts of Compact Tab List being uncoloured. - CalMWolfs
-+ Fixed Compact Tab List' Toggle Tab not working when using patcher. - hannibal2
++ Fixed Compact Tab List' Toggle Tab not working when using Patcher. - hannibal2
 + Fixed Skill progress display size too small when not using the progress bar. - Thunderblade73
 + Fixed the skill progress bar trying to get out of the screen. - HiZe
 + Fixed the negative time remaining in the skill ETA display. - HiZe
@@ -2651,7 +2651,7 @@
 + Added the SkyHanni icon to the IntelliJ profile view. - Erymanthus
 + Fixed key name in utils patterns. - CalMWolfs
 + Using NEUInternalName in the Reputation Helper Quest. - CalMWolfs
-+ Limit RAM to 4 GB in the developement enviroment. - CalMWolfs
++ Limit RAM to 4 GB in the development environment. - CalMWolfs
     + This is just the default and can be changed if needed.
 + Made /shupdaterepo better. - CalMWolfs
 + Added alignment support to Renderable. - Thunderblade73
@@ -2777,7 +2777,7 @@
 #### Diana Features
 
 + Added Diana Profit Tracker. - hannibal2
-    + Same options as slayer and fising trackers.
+    + Same options as slayer and fishing trackers.
 + Added highlight for the Minos Inquisitors to make them easier to see. - Cad
 + Added Mythological Mob Tracker. - hannibal2
     + Counts the different mythological mobs you have dug up.
@@ -2809,7 +2809,7 @@
 
 #### Stranded Features
 
-+ Highlights NPCs in the stranded menu that are placeable but havent been placed. - walker
++ Highlights NPCs in the stranded menu that are placeable but haven't been placed. - walker
 
 #### Rift Features
 
@@ -3056,7 +3056,7 @@
 + Created Matcher.groupOrNull. - walker
 + cleanPlayerName respects playerRankHider option now. - hannibal2
 + Replaced ItemWarnEntry with VisitorReward. This should fix some errors. - hannibal2
-+ GardenNextJacobContest now uses SimpleTimeMark. SimpleTimeMark is storable in the config and comparable - hannibal2
++ GardenNextJacobContest now uses SimpleTimeMark. SimpleTimeMark can now be saved in the config directly and compared - hannibal2
 + No longer sending contest data to elite close to new year. - hannibal2
 + Added RepoPatterns. - nea
 + Use LorenzToolTipEvent over ItemTooltipEvent if possible. - hannibal2
@@ -3174,7 +3174,7 @@
 + Fixed opening the Pet menu no longer updating the current pet display. - hannibal2
 + Fixed Archfiend Dice and High Class Archfiend Dice counting as slayer drops when rolled. - hannibal2
 + Fixed dice roll profit counting as Mob Kill Coins in Slayer Tracker. - hannibal2
-+ Fixed Sack Display sometimes not formatting a million correctly. - Hize
++ Fixed Sack Display sometimes not formatting a million correctly. - HiZe
 + Fixed Estimated Item Value getting shown in stats breakdown menu. - hannibal2
 + Fixed a bug with the ender chest and SkyHanni GUI editor. - hannibal2
 + Fixed crimson isle faction icon in tab list showing twice and not going away fully when enabling the "hide faction"
@@ -3190,7 +3190,7 @@
 + Add log clearing. - CalMWolfs
 + Add auto-prefix to chat message methods. - walker
 + Added support for extra data in error manager. - hannibal2
-+ Added /readcropmilestonefromclipboard. - hannibal2
++ Added /shreadcropmilestonefromclipboard. - hannibal2
     + This command reads the clipboard content, in the format of users sending crop milestone step data.
     + The new data gets compared to the currently saved data, differences are getting replaced and the result gets put
       into the clipboard. The clipboard context can be used to update the repo content.
@@ -3220,7 +3220,7 @@
 
 + Added **Compact Tab List**.
     + Compacts the tablist to make it look much nicer (old SBA feature, but fewer bugs). - CalMWolfs
-    + Option to hide Hypixel advertisment banners. - CalMWolfs
+    + Option to hide Hypixel advertisement banners. - CalMWolfs
     + Added **Advanced Player List**. - hannibal2
         + Customize the player list (inside the tab list) in various ways.
         + Change the sort order of players: Default, SkyBlock Level, alphabetical name, Iron Man first/bingo level,
@@ -3242,7 +3242,7 @@
 
 + Added Highlight Party Members. - Cad
     + Marking party members with a bright outline to better find them in the world.
-+ Porting SBA's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev
++ Porting SkyBlockAddon's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev
     + Options to change speed, size, saturation and direction.
 + Added Modify Visual Words (command /shwords). - CalMWolfs
     + Allows you to replace text on your screen with different text (like the SBE one, just less costly).
@@ -3300,11 +3300,11 @@
     + Thanks Tobbbb for the coordinates!
     + Support for hiding basket waypoints once you have clicked on them. - hannibal2
     + Option to show only the closest basket. - hannibal2
-+ Help with the 2023 Halloween visitor challenge (ephemeral dingsibumsi or something) - nea
++ Help with the 2023 Halloween visitor challenge (Ephemeral Gratitude) - nea
     + New Visitor Ping: Pings you when you are less than 10 seconds away from getting a new visitor.
     + Accept Hotkey: Accept a visitor when you press this keybind while in the visitor GUI.
 + Added support for showing the Primal Fear data from tab list as GUI elements. - Erymanthus
-+ Play warning sound when the next Primal Fear can spawn. - thunderblade73
++ Play warning sound when the next Primal Fear can spawn. - Thunderblade73
 
 #### Commands
 
@@ -3365,7 +3365,7 @@
     + Only items with recipes are tab completed.
 + Added option to set the size of highlighted motes orbs in rift and make them smaller by default. - cimbraien
 + Disabled clicks on SkyHanni GUIs while inside NEU's or Skytils profile viewer. - hannibal2
-+ Removed armor stand checks for Trevor Solver. This fixes or nerfs the feature to not highlight mobs behind blocks
++ Removed armor stand checks for Trevor Solver. This fixes or de-buffs the feature to not highlight mobs behind blocks
   sometimes. - hannibal2
 + Added diamond and gold essence support to PowderTracker. - walker
 + Change the fandom wiki search engine (under the /wiki command) from Google to the fandom wiki's built-in search
@@ -3611,7 +3611,7 @@
     + Change the color, width, and duration of the line.
 + Show alert when reaching max super-pairs clicks. - pretz
     + Plays a beep sound and sends a message in chat when the player reaches the maximum number of clicks gained for
-      super-pairs minigames.
+      super-pair mini games.
 + Added gemstone slot unlock costs to the Estimated Item Value. - Fix3dll
 + **Powder Grinding Tracker** - HiZe
     + Shows the Mithril/Gemstone Powder gained, the number of chests opened, if Double Powder is active, and the items
@@ -3668,7 +3668,7 @@
 + Adds **Double Hook** to the **sea creature chat message** instead of in a previous line. - appable0
 + Rune display now shows always in sack display.
 + Shark fish counter now counts twice for Double hook. - appable0
-+ Ghost counter check for Mist now ignores y coordiantes - HiZe
++ Ghost counter check for Mist now ignores y coordinates - HiZe
 + Telling the user about the bypass hotkey when the visitor drop warning blocks a visitor refusal. - CalMWolfs
 + Added warning sound when the worm fishing cap of 60 is hit. - CarsCupcake
 + Shared inquisitor waypoints will now get removed after 75 seconds. - hannibal2
@@ -3805,7 +3805,7 @@
 + Fixed maxed pet exp progress bar is wrong for bingo pet. - hannibal2
 + Hopefully fixed bug that opening a visitor too quickly causes detection problems. - hannibal2
 + Added nametags for minions as soon as they are placed. - Cad
-+ Fixed wrong display offset in Powder Tracker. - Hize
++ Fixed wrong display offset in Powder Tracker. - HiZe
 + Fixed some features not working correctly because of broken location detection for wrong Hypixel area names. - Cad
 + This includes:
 + Wilted Berberis Helper (in the Rift, Dreadfarm)
@@ -3829,7 +3829,7 @@
 + This should also fix problems with false positive detections in the crimson isle.
 + Fixed item rarity problems. - hannibal2
 + Fixed a rare error when opening minion inventory. - hannibal2
-+ Fixed stuff in the **Trozen Treasure Tracker**. - CalMWolfs
++ Fixed stuff in the **Frozen Treasure Tracker**. - CalMWolfs
     + The ice/hour calculation
     + Rate Timer
     + Typos
@@ -3840,12 +3840,12 @@
 + Added workaround for new fire sale cosmetics (pet skin, helmet skin, rune) in estimated item value. - hannibal2
 + Fixed garden visitors not highlighting on status "new". - hannibal2
 + Fixed wrongly highlighting enchanted sacks for reputation helper fetch quests. - hannibal2
-+ Fixed Fragged Spirit Mask not showing a cooldown after being triggered. - Cad
++ Fixed Fragmented Spirit Mask not showing a cooldown after being triggered. - Cad
 + Fixed item rarity problems with very special. - hannibal2
 + Fixed party member detection issues for the tab complete feature. - CalMWolfs
 + Hide item rarity error message in /ff. - hannibal2
 + Fixed an issue with the Wheat Profit Display not showing the correct value when combined with seeds. - Thunderblade73
-+ Tab complte party members now also detects if the party leader leaves. - CalMWolfs
++ Tab complete party members now also detects if the party leader leaves. - CalMWolfs
 + Fixed typos in many config settings. - Absterge
 + Fixed NEU Heavy Pearl detection. - hannibal2
 + Fixed showing Wrong Slayer Warning sometimes at the wrong time. - Cad
@@ -3906,7 +3906,7 @@
 + Added existing slayer feature support for **Vampire Slayer** - HiZe
     + This contains RNG Meter, Slayer quest warning and Items on ground
 + Added item ability cooldown support for **Weirder Tuba** and **Holy Ice** - HiZe
-+ Added **Lazer Parkour** Solver - CalMWolfs
++ Added **Laser Parkour** Solver - CalMWolfs
     + Highlights the location of the invisible blocks in the Mirrorverse
 + Added Mirrorverse **Dance Room Helper** - HiZe
     + Helps to solve the dance room in the Mirrorverse by showing multiple tasks at once.
@@ -3929,7 +3929,7 @@
 + **Living Metal Suit** Progress - HiZe
     + Display progress Living Metal Suit (Default disabled)
     + Option to show a compacted version of the overlay when the set is maxed
-+ Added Highlight for Blobbercysts in Bacte fight in colloseum in rift - HiZe
++ Added Highlight for Blobbercysts in Bacte fight in colosseum in rift - HiZe
 + Show a line between **Defense blocks** and the mob and highlight the blocks - hannibal2
     + Hide particles around Defense Blocks
 + Show a moving animation between **Living Metal** and the next block - hannibal2
@@ -3979,7 +3979,7 @@
 + Added Highlight enderman slayer Nukekubi (Skulls) - dragon99z
 + Added option to hide the vanilla particles around enderman
 + Hide particles around enderman slayer bosses and mini bosses
-+ Added support for Shadow Fury abilty cooldown - HiZe
++ Added support for Shadow Fury ability cooldown - HiZe
 + Added /sendcoords sending, detecting and rendering - dragon99z
 + Added **Boss Spawn Warning** - HiZe + hannibal2
     + Send a title when your slayer boss is about to spawn
@@ -4048,11 +4048,11 @@
 + Server restart timer no longer shows all the time if over 2 minutes
 + Fixed crazy rare drops not counting properly - ReyMaratov
 + Fixed individual attribute prices in estimated item value - nea
-+ Fixed sack display detection - hize
-+ Fixed rare Ghost Counter bugs - hize
++ Fixed sack display detection - HiZe
++ Fixed rare Ghost Counter bugs - HiZe
 + Fixed a bug that farming weight display does not show up if you only have one profile
 + Fixed broken thorn damage indicator detection in dungeon F4/M4
-+ Fixed togglesneak mod breaking escape menu open detection for quick mod menu switch
++ Fixed "toggle sneak mod" breaking escape menu open detection for quick mod menu switch
 + Fixed error with detecting hit phase during eman slayer in damage indicator
 + No longer double counting mob kill coins in slayer item profit tracker
 + Fixed jacob contest time chat message chat shows one second too long
@@ -4157,7 +4157,7 @@
     + Hide the RNG Meter message from chat if the current item is selected
 + Added **Ghost Counter** (Contributed by HiZe)
     + Shows number of ghosts killed in the Mist in Dwarven Mines
-    + Shows kill combo, coins per scavenger, all item drops, bestiarity, magic find and more
+    + Shows kill combo, coins per scavenger, all item drops, bestiary, magic find and more
     + Each display line is highly customizable
 
 ### Changes
@@ -4389,7 +4389,7 @@
 + Added Bingo Card display.
 + **Minion Craft Helper** - Show how many more items you need to upgrade the minion in your inventory. Especially useful
   for bingo.
-+ Hide dead entities - Similar to Skytil's feature for inside dungeon, but for everywhere.
++ Hide dead entities - Similar to Skytils' feature for inside dungeon, but for everywhere.
 + Hide Fireball particles and hide Fire Block particles.
 + Made **blaze slayer clear view** work with more particles.
 + Added colors for the missing slayer area bosses (Golden Ghoul, Old Wolf and Spider Keeper)
@@ -4658,7 +4658,7 @@
 - Added highlight the voidling extremist in pink color
 - Added highlight corrupted mobs in purple color
 - Added command /shmarkplayer <player> (marking a player with yellow color)
-- Added highlight slayer miniboss in blue color
+- Added highlight slayer mini boss in blue color
 - Added option to hide the death messages of other players, except for players who are close to the player, inside
   dungeon or during a Kuudra fight.
 - Added highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)
@@ -4674,7 +4674,7 @@
 - Added /wiki command (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
 - Added hiding damage splashes while inside the boss room (replacing a broken feature from Skytils)
 - Added Summoning Mob Display (Show the health of your spawned summoning mobs listed in an extra GUI element and hiding
-  the corresponding spawning/despawning chat messages)
+  the corresponding spawning/de-spawning chat messages)
 - Added option to hide the nametag of your spawned summoning mobs
 - Added option to mark the own summoning mobs in green
 - Added Ashfang Blazing Souls display
@@ -4768,8 +4768,8 @@
 ## Version 0.1
 
 - Added damage indicator for some bosses who are outside dungeon (4 nether bosses: Ashfang, barbarian duke, mage outlaw
-  and Bladesoul, slayers: Enderman 1-4, revenant 5, and untested support for vanquisher in nether, Enderdragon and
-  Endstone protector in end)
+  and Bladesoul, slayers: Enderman 1-4, revenant 5, and untested support for Vanquisher in Crimson Isle, Ender Dragon and
+  Endstone Protector in end)
 - Added item ability cooldown background display (over the slot, work in progress)
 - Added Ashfang freeze cooldown (when you get hit by “anti ability” and slowness effect)
 - Changed “hot clickable items” to show items again, but only with dark gray overlay. Looks nicer
diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 8a4f9714ad6d..9edc758672ce 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -24,8 +24,8 @@ _Frequently Asked Questions_
 > **7: My Jacob Contest Display crops are wrong, how do I fix this?**
 > Run the command `/shclearcontestdata` to clear the Jacob contest data.
 
-> **8: How can I get bigger crop hitboxes?**
-> Use Patcher or PolyPatcher to have 1.12 hitboxes in 1.8.9.
+> **8: How can I get bigger crop hit boxes?**
+> Use Patcher or PolyPatcher to have 1.12 hit boxes in 1.8.9.
 > - [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>)
 > - [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes)
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 4aded1014236..d26e272a43e3 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -100,7 +100,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highlights your selected class in green if it's available.
 + Kismet tracking for dungeon chests. - Thunderblade73
     + Highlight chests which have been rerolled inside Croesus
-    + Shows kismet amount at the reroll button
+    + Shows kismet amount at the re-roll button
 + SA Jump Notification. - CarsCupcake (https://github.com/hannibal002/SkyHanni/pull/852)
     + Warn shorty before a Shadow Assassin jumps to you in dungeons.
 + Notifications for architect on puzzle fail. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1197)
@@ -244,7 +244,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 - Option to hide the nametag of your spawned summoning mobs.
 - Option to mark the own summoning mobs in green.
 - Summoning Mob Display (Show the health of your spawned summoning mobs listed in an extra GUI element and hiding the
-  corresponding spawning/despawning chat messages)
+  corresponding spawning/de-spawning chat messages)
 
 </details>
 <details open><summary>
@@ -322,7 +322,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Works in crystal hollows too (worm fishing)
     + Keybind to manually reset the barn/worm fishing timer. - CarsCupcake
     + Warning sound when the worm fishing cap of 60 is hit. - CarsCupcake
-    + Has support for the gamemode Stranded. - hannibal2
+    + Has support for the game mode Stranded. - hannibal2
 + **Shark Fish Counter** - Counts how many sharks have been caught.
 + **Odger waypoint** - Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand.
 + Showing fished item names
@@ -457,10 +457,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + **Griffin Pet Warning**
     + Warn when holding an Ancestral Spade while no Griffin pet is selected.
 + **Inquisitor Sharing**
-    + Share aypoints for inquisitors you find with your party.
+    + Share waypoints for inquisitors you find with your party.
     + Show a timer until the inquisitor will despawn.
 + Diana Profit Tracker. - hannibal2
-    + Same options as slayer and fising trackers.
+    + Same options as slayer and fishing trackers.
 + Highlight for the Minos Inquisitors to make them easier to see. - Cad
 + Mythological Mob Tracker. - hannibal2
     + Counts the different mythological mobs you have dug up.
@@ -520,7 +520,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Highlight corrupted mobs.
 + **Arachne Minis Hider** - Hides the nametag above arachne minis.
 + **Arachne Boss Highlighter** - Highlight the arachne boss in red and mini bosses and orange.
-+ "Line to Arachne" setting, just like with slayer minibosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888)
++ "Line to Arachne" setting, just like with slayer mini bosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888)
 + Countdown for Arachne spawn. - Cad
     + Supports quick spawns.
 + Option to hide the vanilla particles around enderman
@@ -557,7 +557,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + **Garden Level Display** - Show the current garden level and progress to the next level.
 + **Fake garden level up** message: - hannibal2
     + In 10k garden exp steps after level 15.
-    + Uses the overflow exp that hypixel still caluclates (maybe official upgrade with more garden levels in the
+    + Uses the overflow exp that hypixel still calculates (maybe official upgrade with more garden levels in the
       future?).
     + Click on the message to open the garden level display. - J10a1n15
 + **Farming Weight and Leaderboard**
@@ -570,7 +570,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
   switching to a different pet for leveling.
 + **Money per Hour**
     + Displays the money per hour YOU get with YOUR crop/minute value when selling the items to bazaar.
-    + Suppports the dicer drops from melon and pumpkins as well. - CalMWolfs
+    + Supports the dicer drops from melon and pumpkins as well. - CalMWolfs
     + Supports armor drops. - CalMWolfs
 + Farming contest timer.
 + Wrong fungi cutter mode warning.
@@ -764,7 +764,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Hide already completed kloon terminal waypoints
 + **Crux Talisman Progress** Display - HiZe
     + Show bonuses you get from the talisman
-+ **Lazer Parkour** Solver - CalMWolfs
++ **Laser Parkour** Solver - CalMWolfs
     + Highlights the location of the invisible blocks in the Mirrorverse
 + Mirrorverse **Dance Room Helper** - HiZe
     + Helps to solve the dance room in the Mirrorverse by showing multiple tasks at once.
@@ -784,7 +784,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Living Metal Suit Progress - HiZe
     + Display progress Living Metal Suit (Default disabled)
     + Option to show a compacted version of the overlay when the set is maxed
-+ Highlight for Blobbercysts in Bacte fight in colloseum in rift - HiZe
++ Highlight for Blobbercysts in Bacte fight in colosseum in rift - HiZe
 + Show a line between **Defense blocks** and the mob and highlight the blocks - hannibal2
     + Hide particles around Defense Blocks
 + Show a moving animation between **Living Metal** and the next block - hannibal2
@@ -880,11 +880,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Thanks Tobbbb for the coordinates!
     + Support for hiding basket waypoints once you have clicked on them. - hannibal2
     + Option to show only the closest basket. - hannibal2
-+ Help with the 2023 Halloween visitor challenge (ephemeral dingsibumsi or something) - nea
++ Help with the 2023 Halloween visitor challenge (Ephemeral Gratitude) - nea
     + New Visitor Ping: Pings you when you are less than 10 seconds away from getting a new visitor.
     + Accept Hotkey: Accept a visitor when you press this keybind while in the visitor GUI.
 + Support for showing the primal fear data from tab list as GUI elements. - Erymanthus
-+ Play warning sound when the next Primal Fear can spawn. - thunderblade73
++ Play warning sound when the next Primal Fear can spawn. - Thunderblade73
 + Unique Gifting Opportunities. - nea
     + Highlight players who you haven't given gifts to yet.
     + Only highlight ungifted players while holding a gift.
@@ -916,7 +916,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Factory Chat Filters. - RobotHanzo (https://github.com/hannibal002/SkyHanni/pull/1574)
     + Hide chocolate factory upgrade and employee promotion messages.
 + Copy Chocolate Factory Stats to clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
-+ Highlight unbought items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
++ Highlight non-purchased items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517)
 + Added time tower status to the chocolate factory stats. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1506)
     + Also can notify you when you get a new charge or your charges are full.
 + Extra tooltip stats about upgrades for the chocolate factory. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1594)
@@ -991,7 +991,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 
 </summary>
 
-+ Highlights NPCs in the stranded menu that are placeable but havent been placed. - walker
++ Highlights NPCs in the stranded menu that are placeable but haven't been placed. - walker
 
 </details>
 <details open><summary>
@@ -1036,7 +1036,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + **Tia Relay Waypoint** - Show the next Relay waypoint for Tia The Fairy, where maintenance for the abiphone network
   needs to be done.
 + **Tia Relay Helper** - Helps with solving the sound puzzle.
-+ **Hide dead entities** - Similar to Skytil's feature for inside dungeon, but for everywhere.
++ **Hide dead entities** - Similar to Skytils' feature for inside dungeon, but for everywhere.
 + **Tps Display** - Show the Tps of the current server.
 + **Particle Hider** - Hide blaze particles, fire block particles, fireball particles, near redstone particles, far
   particles or smoke particles.
@@ -1084,7 +1084,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Option to highlight items that are full in the sack inventory.
 + **Ghost Counter** (Contributed by HiZe)
     + Shows number of ghosts killed in the Mist in Dwarven Mines
-    + Shows kill combo, coins per scavenger, all item drops, bestiarity, magic find and more
+    + Shows kill combo, coins per scavenger, all item drops, bestiary, magic find and more
     + Each display line is highly customizable
 + **Frozen Treasure Tracker** (Contributed by CalMWolfs)
     + Show different items collected while breaking treasures in the Glacial Cave in Jerry's Workshop
@@ -1103,7 +1103,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + **Ender Node Tracker** - pretz
     + Tracks items and profit obtained from collecting ender nodes and killing normal endermen.
 + **Harp Keybinds** - NetheriteMiner
-    + In Melodys Harp, press buttons with your number row on the keyboard instead of clicking.
+    + In Melody's Harp, press buttons with your number row on the keyboard instead of clicking.
 + **Teleport Pad Compact Name**
     + Hide the 'Warp to' and 'No Destination' texts over teleport pads.
     + Only on Private island.
@@ -1127,10 +1127,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Allows to change those settings anytime again with /shdefaultoptions.
 + Show alert when reaching max super-pairs clicks. - pretz
     + Plays a beep sound and sends a message in chat when the player reaches the maximum number of clicks gained for
-      super-pairs minigames.
+      super-pairs mini games.
 + Anniversary Event Active Player Ticket Timer. - nea
     + Option to play a sound as well.
-+ **Travor Trapper** Features in Farming Islands
++ **Trevor Trapper** Features in Farming Islands
     + Trapper Cooldown GUI. - NetheriteMiner
         + Show the cooldown on screen in an overlay (intended for abiphone users).
     + **Trevor the Trapper Tracker**. - CalMWolfs
@@ -1145,7 +1145,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Change the scale with plus and minus keys. - CalMWolfs
 + **Compact Tab List**.
     + Compacts the tablist to make it look much nicer (old SBA feature, but fewer bugs). - CalMWolfs
-    + Option to hide Hypixel advertisment banners. - CalMWolfs
+    + Option to hide Hypixel advertisement banners. - CalMWolfs
     + **Advanced Player List**. - hannibal2
         + Customize the player list (inside the tab list) in various ways.
         + Change the sort order of players: Default, SkyBlock Level, alphabetical name, Iron Man first/bingo level,
@@ -1161,7 +1161,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Show a chat message for how long you were in limbo once you leave it.
 + Highlight Party Members. - Cad
     + Marking party members with a bright outline to better find them in the world.
-+ Porting SBA's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev
++ Porting SkyBlockAddon's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev
     + Options to change speed, size, saturation and direction.
 + Modify Visual Words (command /shwords). - CalMWolfs
     + Allows you to replace text on your screen with different text (like the SBE one, just less costly).
@@ -1256,7 +1256,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highly customizable: Colors, display sizes.
     + Estimated Price Integration.
     + Favorite slots; option to only display favorite slots.
-+ Added a Chat Message if the Perkapocalypse Mayor is unknown. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2009)
++ Added a Chat Message if the Perkpocalypse Mayor is unknown. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2009)
 + Added a source download verification checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/1914)
     + Warns you when the mod has been downloaded from an untrusted source (not the official GitHub or Modrinth).
 + Shows a list of items that can be crafted with the items in your inventory when inside the crafting menu. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1334)
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index 5c9c3017a7e3..b40255449226 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.SkillExpGainEvent
-import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent
+import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent
 import at.hannibal2.skyhanni.features.skillprogress.SkillProgress
 import at.hannibal2.skyhanni.features.skillprogress.SkillType
 import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.SPACE_SPLITTER
@@ -266,7 +266,7 @@ object SkillAPI {
             currentXp
         )
         if (skillInfo.overflowLevel > 60 && levelOverflow == skillInfo.overflowLevel + 1)
-            SkillOverflowLevelupEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch()
+            SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch()
 
         skillInfo.apply {
             this.level = level
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 4afced89b68f..959f81973ed5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -382,7 +382,7 @@ object Commands {
         ) { SkyHanniDebugsAndTests.toggleRender() }
         registerCommand(
             "shcarrolyn",
-            "Toggels if the specified crops effect is active from carrolyn",
+            "Toggles if the specified crops effect is active from carrolyn",
         ) {
             CaptureFarmingGear.handelCarrolyn(it)
         }
@@ -392,11 +392,11 @@ object Commands {
         ) { SkyHanniMod.repo.displayRepoStatus(false) }
         registerCommand(
             "shclearkismet",
-            "Cleares the saved values of the applied kismet feathers in Croesus",
+            "Clears the saved values of the applied kismet feathers in Croesus",
         ) { CroesusChestTracker.resetChest() }
         registerCommand(
             "shkingfix",
-            "Reseting the local King Talisman Helper offset.",
+            "Resets the local King Talisman Helper offset.",
         ) { KingTalismanHelper.kingFix() }
         registerCommand(
             "shupdate",
@@ -544,7 +544,7 @@ object Commands {
                 "(names, description, orderings and stuff).",
         ) { SkyHanniDebugsAndTests.resetConfigCommand() }
         registerCommand(
-            "readcropmilestonefromclipboard",
+            "shreadcropmilestonefromclipboard",
             "Read crop milestone from clipboard. This helps fixing wrong crop milestone data",
         ) { GardenCropMilestonesCommunityFix.readDataFromClipboard() }
         registerCommand(
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
index 8b58e49197be..d6a0eb0645eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
@@ -132,8 +132,9 @@ public class DebugConfig {
     public boolean currentAreaDebug = true;
 
     @Expose
-    @ConfigOption(name = "Oreblock Name", desc = "Show the OreBlock you are currently looking at.")
+    @ConfigOption(name = "OreBlock Name", desc = "Show the OreBlock you are currently looking at.")
     @ConfigEditorBoolean
+    // TODO rename to rayTracedOreBlock
     public boolean raytracedOreblock = true;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
index 4d1653b89c8f..132c0d827127 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
@@ -74,7 +74,7 @@ public class DianaConfig {
     @Expose
     @ConfigOption(name = "Mythological Creature Tracker", desc = "")
     @Accordion
-    // TODO renmae
+    // TODO rename mythologicalMobTracker
     public MythologicalMobTrackerConfig mythologicalMobtracker = new MythologicalMobTrackerConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java
index 396ab021750c..53c394469017 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java
@@ -15,6 +15,7 @@ public class GiftingOpportunitiesConfig {
     @Expose
     @ConfigOption(name = "Only While Holding Gift", desc = "Only highlight players you haven't gifted while holding a gift.")
     @ConfigEditorBoolean
+    // TODO highlightWithGiftOnly
     public boolean highlighWithGiftOnly = true;
 
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index f2bdf85d5fee..c4bbfacf34b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -79,7 +79,7 @@ public class GardenConfig {
     @Expose
     @ConfigOption(name = "Armor Drop Tracker", desc = "")
     @Accordion
-    // TODO renmae to armorDropTracker
+    // TODO rename to armorDropTracker
     public ArmorDropTrackerConfig farmingArmorDrop = new ArmorDropTrackerConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
index e02ddfcc48ee..98226eeb10b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
@@ -16,7 +16,7 @@ public class ShoppingListConfig {
     public boolean display = true;
 
     @Expose
-    // TODO renmae "position"
+    // TODO rename "position"
     @ConfigLink(owner = ShoppingListConfig.class, field = "display")
     public Position pos = new Position(180, 170, false, true);
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
index 43bba7f8c61b..d479149b8cea 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java
@@ -25,7 +25,7 @@ public class ReforgeHelperConfig {
     public boolean reforgeStonesOnlyHex = true;
 
     @Expose
-    @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the slecetion list.")
+    @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the selection list.")
     @ConfigEditorBoolean
     public boolean showDiff = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index cc606e7aaa1c..4a3aa732ea45 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -122,6 +122,7 @@ public class MiscConfig {
     @ConfigOption(name = "Armor Stands", desc = "Hide armor stands that are sometimes visible for a fraction of a second.")
     @ConfigEditorBoolean
     @FeatureToggle
+    // TODO rename to hideTemporaryArmorStands
     public boolean hideTemporaryArmorstands = true;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java
index 34939e567bb4..4bf6d57315e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java
@@ -20,7 +20,7 @@ public class CompactTabListConfig {
     @ConfigOption(
         name = "Toggle Tab",
         desc = "Use the tab key to toggle the tab list, not show tab list while the key is pressed. " +
-            "Similar to patcher's feature."
+            "Similar to Patcher's feature."
     )
     @ConfigEditorBoolean
     public boolean toggleTab = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java
index 56fa6e686f1f..6689326682b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java
@@ -27,6 +27,7 @@ public class EffigiesConfig {
         maxValue = 15,
         minStep = 1
     )
+    // TODO rename respawningSoonTime
     public int respwningSoonTime = 3;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index dd4a91fb97eb..94b1dc2837ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -86,7 +86,7 @@ object HypixelData {
         "solo.profile.amount",
         "^\\s*(?:§.)*Island\\s*$",
     )
-    private val scoreboardVisitingAmoutPattern by patternGroup.pattern(
+    private val scoreboardVisitingAmountPattern by patternGroup.pattern(
         "scoreboard.visiting.amount",
         "\\s+§.✌ §.\\(§.(?<currentamount>\\d+)§./(?<maxamount>\\d+)\\)",
     )
@@ -201,7 +201,7 @@ object HypixelData {
     }
 
     fun getMaxPlayersForCurrentServer(): Int {
-        ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmoutPattern) {
+        ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmountPattern) {
             return group("maxamount").toInt()
         }
 
@@ -453,7 +453,7 @@ object HypixelData {
             islandType = getIslandType(foundIsland, guesting)
         }
 
-        // TODO dont send events when one of the arguments is none, at least when not on sb anymore
+        // TODO don't send events when one of the arguments is none, at least when not on sb anymore
         if (skyBlockIsland != islandType) {
             IslandChangeEvent(islandType, skyBlockIsland).postAndCatch()
             if (islandType == IslandType.UNKNOWN) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
index dfbb0816418e..29a16944c3d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
@@ -94,7 +94,7 @@ object HypixelBazaarFetcher {
         failedAttempts++
         if (failedAttempts <= HIDDEN_FAILED_ATTEMPTS) {
             nextFetchTime = SimpleTimeMark.now() + 15.seconds
-            ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttepmts=$failedAttempts, $fetchType")
+            ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttempts=$failedAttempts, $fetchType")
             e.printStackTrace()
         } else {
             nextFetchTime = SimpleTimeMark.now() + 15.minutes
@@ -102,7 +102,7 @@ object HypixelBazaarFetcher {
                 e,
                 userMessage,
                 "fetchType" to fetchType,
-                "failedAttepmts" to failedAttempts,
+                "failedAttempts" to failedAttempts,
                 "rawResponse" to rawResponse,
             )
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index 76c97e662f93..ab5d1ca2d851 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -60,7 +60,7 @@ value class Graph(
             { reader ->
                 reader.beginObject()
                 val list = mutableListOf<GraphNode>()
-                val neigbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>()
+                val neighbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>()
                 while (reader.hasNext()) {
                     val id = reader.nextName().toInt()
                     reader.beginObject()
@@ -93,10 +93,10 @@ value class Graph(
                     }
                     val node = GraphNode(id, position!!, name)
                     list.add(node)
-                    neigbourMap[node] = neighbors
+                    neighbourMap[node] = neighbors
                     reader.endObject()
                 }
-                neigbourMap.forEach { (node, edge) ->
+                neighbourMap.forEach { (node, edge) ->
                     node.neighbours = edge.associate { (id, distance) ->
                         list.first { it.id == id } to distance
                     }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index 161ec76f5ad6..6fd65778ecfb 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -10,6 +10,7 @@ enum class SkyblockStat(val icon: String) {
     DEFENSE("§a❈"),
     STRENGTH("§c❁"),
     INTELLIGENCE("§b✎"),
+
     CRIT_DAMAGE("§9☠"),
     CRIT_CHANCE("§9☣"),
     FEROCITY("§c⫽"),
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index 22ac4982be1c..f1a5001ad67c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -75,23 +75,23 @@ class TextInput {
                 }
                 return
             }
-            val tcarriage = carriage
+            val carriage = carriage
 
             if (Keyboard.KEY_LEFT.isKeyClicked()) {
-                carriage = tcarriage?.moveCarriageLeft() ?: (textBox.length - 1)
+                this.carriage = carriage?.moveCarriageLeft() ?: (textBox.length - 1)
                 return
             }
             if (Keyboard.KEY_RIGHT.isKeyClicked()) {
-                carriage = when {
-                    tcarriage == null -> null
-                    (tcarriage >= textBox.length - 1) -> null
-                    else -> moveCarriageRight(tcarriage)
+                this.carriage = when {
+                    carriage == null -> null
+                    (carriage >= textBox.length - 1) -> null
+                    else -> moveCarriageRight(carriage)
                 }
                 return
             }
             if (Keyboard.KEY_DELETE.isKeyClicked()) { // Does not work for some reason
-                if (tcarriage != null) {
-                    textBox.removeRange(tcarriage, tcarriage + 1)
+                if (carriage != null) {
+                    textBox.removeRange(carriage, carriage + 1)
                 } else {
                     textBox.dropLast(1)
                 }
@@ -103,27 +103,27 @@ class TextInput {
             val char = Keyboard.getEventCharacter()
             textBox = when (char) {
                 Char(0) -> return
-                '\b' -> if (tcarriage != null) {
-                    if (tcarriage == 0) {
+                '\b' -> if (carriage != null) {
+                    if (carriage == 0) {
                         textBox.substring(1)
                     } else {
-                        carriage = tcarriage.minus(1)
-                        textBox.removeRange(tcarriage - 1, tcarriage)
+                        this.carriage = carriage.minus(1)
+                        textBox.removeRange(carriage - 1, carriage)
                     }
                 } else {
                     textBox.dropLast(1)
                 }
 
-                else -> if (tcarriage != null) {
-                    carriage = tcarriage + 1
-                    textBox.insert(tcarriage, char)
+                else -> if (carriage != null) {
+                    this.carriage = carriage + 1
+                    textBox.insert(carriage, char)
                 } else {
                     textBox + char
                 }
             }
         }
 
-        private fun moveCarriageRight(tcarriage: Int) = tcarriage + 1
+        private fun moveCarriageRight(carriage: Int) = carriage + 1
 
         private fun Int.moveCarriageLeft(): Int = when {
             this > 0 -> this - 1
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
index 1e9af5d69e2b..74241946faf2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
@@ -28,8 +28,8 @@ object RepoUtils {
     /**
      * Modified from https://www.journaldev.com/960/java-unzip-file-example
      */
-    fun unzipIgnoreFirstFolder(zipFilePath: String, destDir: String) {
-        val dir = File(destDir)
+    fun unzipIgnoreFirstFolder(zipFilePath: String, destinationDirectory: String) {
+        val dir = File(destinationDirectory)
         // create output directory if it doesn't exist
         if (!dir.exists()) dir.mkdirs()
         val fis: FileInputStream
@@ -43,7 +43,7 @@ object RepoUtils {
                 if (!ze.isDirectory) {
                     var fileName = ze.name
                     fileName = fileName.substring(fileName.split("/").toTypedArray()[0].length + 1)
-                    val newFile = File(destDir + File.separator + fileName)
+                    val newFile = File(destinationDirectory + File.separator + fileName)
                     // create directories for sub directories in zip
                     File(newFile.parent).mkdirs()
                     if (!isInTree(dir, newFile)) {
@@ -71,7 +71,7 @@ object RepoUtils {
                 e,
                 "unzipIgnoreFirstFolder failed",
                 "zipFilePath" to zipFilePath,
-                "destDir" to destDir,
+                "destinationDirectory" to destinationDirectory,
             )
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt
similarity index 69%
rename from src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt
rename to src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt
index ac9d14662db6..d3f356da7f7d 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.features.skillprogress.SkillType
 
-class SkillOverflowLevelupEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent()
+class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
index b04a081eab56..1afa6859dc3f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
@@ -73,7 +73,7 @@ object BingoCardReader {
             }
 
             val done = lore.any { it.contains("GOAL REACHED") }
-            val communtyGoalPercentage = readCommuntyGoalPercentage(lore)
+            val communityGoalPercentage = readCommunityGoalPercentage(lore)
             val hiddenGoalData = getHiddenGoalData(name, description, goalType)
             val visualDescription = hiddenGoalData.tipNote
 
@@ -89,7 +89,7 @@ object BingoCardReader {
                 this.done = done
                 this.hiddenGoalData = hiddenGoalData
             }
-            communtyGoalPercentage?.let {
+            communityGoalPercentage?.let {
                 bingoGoalDifference(bingoGoal, it)
                 bingoGoal.communtyGoalPercentage = it
             }
@@ -111,7 +111,7 @@ object BingoCardReader {
         ChatUtils.chat("$color${bingoGoal.displayName}: $oldFormat §b->" + " $newFormat")
     }
 
-    private fun readCommuntyGoalPercentage(lore: List<String>): Double? {
+    private fun readCommunityGoalPercentage(lore: List<String>): Double? {
         for (line in lore) {
             percentagePattern.matchMatcher(line) {
                 return group("percentage").toDouble() / 100
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt
index daccd37e3b1f..64148115d210 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt
@@ -25,8 +25,9 @@ class BingoGoal {
     @Expose
     lateinit var hiddenGoalData: HiddenGoalData
 
+    // TODO rename communityGoalPercentage
     @Expose
-    var communtyGoalPercentage: Double? = null // TODO fix typo (Needs changes inside of storage)
+    var communtyGoalPercentage: Double? = null
 
     override fun toString(): String = displayName
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
index 5ed2cdb8ad05..fd2b513cf561 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
@@ -80,7 +80,7 @@ object FlareDisplay {
             if (!entity.canBeSeen()) continue
             if (entity.ticksExisted.ticks > MAX_FLARE_TIME) continue
             if (isAlreadyKnownFlare(entity)) continue
-            getFlareTypeForTexuture(entity)?.let {
+            getFlareTypeForTexture(entity)?.let {
                 flares.add(Flare(it, entity))
             }
         }
@@ -131,7 +131,7 @@ object FlareDisplay {
 
     private fun getFlareForType(type: FlareType): Flare? = flares.firstOrNull { it.type == type }
 
-    private fun getFlareTypeForTexuture(entity: EntityArmorStand): FlareType? =
+    private fun getFlareTypeForTexture(entity: EntityArmorStand): FlareType? =
         flareSkins.entries.firstOrNull { entity.hasSkullTexture(it.key) }?.value
 
     private fun isAlreadyKnownFlare(entity: EntityArmorStand): Boolean =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
index 5562a4bf4840..3bc12fa4c8a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
@@ -84,7 +84,7 @@ enum class BossType(
     DUNGEON_F6_GIANT_1("§eBoulder Tosser", Type.DUNGEON_FLOOR_6, "§eGiant 1"),
     DUNGEON_F6_GIANT_2("§eSword Thrower", Type.DUNGEON_FLOOR_6, "§eGiant 2"),
     DUNGEON_F6_GIANT_3("§eBigfoot Jumper", Type.DUNGEON_FLOOR_6, "§eGiant 3"),
-    DUNGEON_F6_GIANT_4("§eLazer Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"),
+    DUNGEON_F6_GIANT_4("§eLaser Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"),
     DUNGEON_F6_SADAN("§cSadan", Type.DUNGEON_FLOOR_6),
 
     // TODO implement
@@ -92,7 +92,7 @@ enum class BossType(
 
     MINOS_INQUISITOR("§5Minos Inquisitor", Type.DIANA_MOBS),
     MINOS_CHAMPION("§2Minos Champion", Type.DIANA_MOBS),
-    GAIA_CONSTURUCT("§2Gaia Construct", Type.DIANA_MOBS),
+    GAIA_CONSTRUCT("§2Gaia Construct", Type.DIANA_MOBS),
     MINOTAUR("§2Minotaur", Type.DIANA_MOBS),
 
     THUNDER("§cThunder", Type.SEA_CREATURES),
@@ -121,7 +121,7 @@ enum class BossType(
 
     // TODO arachne
 
-    // TODO corelone
+    // TODO Corleone
     // TODO bal
 
     /**
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index fb549e7c2458..b7af2d72b2d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -888,7 +888,7 @@ object DamageIndicatorManager {
         } else {
             if (entityData != null && isEnabled() && config.hideVanillaNametag && entityData.isConfigEnabled()) {
                 val name = entity.name
-                if (name.contains("Plaesmaflux")) return
+                if (name.contains("Plasmaflux")) return
                 if (name.contains("Overflux")) return
                 if (name.contains("Mana Flux")) return
                 if (name.contains("Radiant")) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
index 3d54dce1b166..e9b2f879b693 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
@@ -356,7 +356,7 @@ class MobFinder {
         }
 
         entity.hasMaxHealth(1_500_000) -> {
-            EntityResult(bossType = BossType.GAIA_CONSTURUCT)
+            EntityResult(bossType = BossType.GAIA_CONSTRUCT)
         }
 
         entity.hasMaxHealth(100_000_000) -> {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 29b3c06e3a6a..3bc3c85d4b2a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -58,6 +58,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.moulberry.notenoughupdates.util.XPInformation
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.apache.commons.io.FilenameUtils
 import java.io.File
 import java.text.NumberFormat
 import java.util.Locale
@@ -70,8 +71,7 @@ object GhostCounter {
     val config get() = SkyHanniMod.feature.combat.ghostCounter
     val storage get() = ProfileStorageData.profileSpecific?.ghostCounter
     private var display = emptyList<List<Any>>()
-    var ghostCounterV3File =
-        File("." + File.separator + "config" + File.separator + "ChatTriggers" + File.separator + "modules" + File.separator + "GhostCounterV3" + File.separator + ".persistantData.json")
+    var ghostCounterV3File = File(FilenameUtils.separatorsToSystem("./config/ChatTriggers/modules/GhostCounterV3/.persistantData.json"))
 
     private val patternGroup = RepoPattern.group("combat.ghostcounter")
     private val skillXPPattern by patternGroup.pattern(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
index 05b04982d0d8..b6bcff3bd13e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@@ -96,7 +96,7 @@ object PartyChatCommands {
         if (isBlockedUser(name)) {
             if (config.showIgnoredReminder) ChatUtils.clickableChat(
                 "§cIgnoring chat command from ${event.author}. " +
-                    "Unignore them using /shignore remove <player> or click here!",
+                    "Stop ignoring them using /shignore remove <player> or click here!",
                 onClick = { blacklistModify(event.author) },
                 "§eClick to ignore ${event.author}!",
             )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
index ff6c277bb642..8b2d600695e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
@@ -147,7 +147,7 @@ object CroesusChestTracker {
                 unopenedPattern.anyMatches(lore) -> OpenedState.UNOPENED
                 else -> ErrorManager.logErrorStateWithData(
                     "Croesus Chest couldn't be read correctly.",
-                    "Openstate check failed for chest.",
+                    "Open state check failed for chest.",
                     "run" to run,
                     "lore" to lore
                 ).run { null }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index d79ac47ce8dd..f8d432613084 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -249,7 +249,7 @@ object DungeonAPI {
         val bossCollections = bossStorage ?: return
 
         if (event.inventoryName == "Boss Collections") {
-            readallCollections(bossCollections, event.inventoryItems)
+            readAllCollections(bossCollections, event.inventoryItems)
         } else if (event.inventoryName.endsWith(" Collection")) {
             readOneMaxCollection(bossCollections, event.inventoryItems, event.inventoryName)
         }
@@ -278,7 +278,7 @@ object DungeonAPI {
         }
     }
 
-    private fun readallCollections(
+    private fun readAllCollections(
         bossCollections: MutableMap<DungeonFloor, Int>,
         inventoryItems: Map<Int, ItemStack>,
     ) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
index 9d2c531a5a93..f0ce80b1b18e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@@ -151,7 +151,7 @@ object DungeonHideItems {
         }
 
         if (config.hideHealerFairy) {
-            // Healer Fairy texture is stored in id 0, not id 4 for some reasos.
+            // Healer Fairy texture is stored in id 0, not id 4 for some reasons.
             if (entity.inventory[0]?.getSkullTexture() == HEALER_FAIRY_TEXTURE) {
                 event.cancel()
                 return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
index d88f5c017180..20cf553b802c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
@@ -120,7 +120,7 @@ object DianaFixChat {
         if (hasSetToggleMusic) {
             ChatUtils.chat("Toggling the hypixel music has worked, good job!")
         } else if (hasSetParticleQuality) {
-            ChatUtils.chat("Changing the particle qualilty has worked, good job!")
+            ChatUtils.chat("Changing the particle quality has worked, good job!")
         }
 
         hasSetParticleQuality = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 6fe2870216c7..35a783f7d93f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -380,8 +380,8 @@ object GriffinBurrowHelper {
 
         val text = "§bWarp to " + warp.displayName
         val keybindSuffix = if (config.keyBindWarp != Keyboard.KEY_NONE) {
-            val keyname = KeyboardManager.getKeyName(config.keyBindWarp)
-            " §7(§ePress $keyname§7)"
+            val keyName = KeyboardManager.getKeyName(config.keyBindWarp)
+            " §7(§ePress $keyName§7)"
         } else ""
         if (lastTitleSentTime.passedSince() > 2.seconds) {
             lastTitleSentTime = SimpleTimeMark.now()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index d290c5df8dc2..0bb5e3dc17a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -36,7 +36,7 @@ object SoopyGuessBurrow {
     private var guessPoint: LorenzVec? = null
 
     private var lastSoundPoint: LorenzVec? = null
-    private var locs = mutableListOf<LorenzVec>()
+    private var locations = mutableListOf<LorenzVec>()
 
     private var dingSlope = mutableListOf<Float>()
 
@@ -81,7 +81,7 @@ object SoopyGuessBurrow {
             lastSoundPoint = null
             firstParticlePoint = null
             distance = null
-            locs.clear()
+            locations.clear()
         }
 
         if (lastDingPitch == 0f) {
@@ -91,7 +91,7 @@ object SoopyGuessBurrow {
             lastParticlePoint2 = null
             lastSoundPoint = null
             firstParticlePoint = null
-            locs.clear()
+            locations.clear()
             return
         }
 
@@ -158,19 +158,19 @@ object SoopyGuessBurrow {
             }
         }
         if (run) {
-            if (locs.size < 100 && locs.isEmpty() || locs.last().distance(currLoc) != 0.0) {
+            if (locations.size < 100 && locations.isEmpty() || locations.last().distance(currLoc) != 0.0) {
                 var distMultiplier = 1.0
-                if (locs.size > 2) {
-                    val predictedDist = 0.06507 * locs.size + 0.259
-                    val lastPos = locs.last()
+                if (locations.size > 2) {
+                    val predictedDist = 0.06507 * locations.size + 0.259
+                    val lastPos = locations.last()
                     val actualDist = currLoc.distance(lastPos)
                     distMultiplier = actualDist / predictedDist
                 }
-                locs.add(currLoc)
+                locations.add(currLoc)
 
-                if (locs.size > 5 && guessPoint != null) {
+                if (locations.size > 5 && guessPoint != null) {
 
-                    val slopeThing = locs.zipWithNext { a, b ->
+                    val slopeThing = locations.zipWithNext { a, b ->
                         atan((a.x - b.x) / (a.z - b.z))
                     }
 
@@ -186,14 +186,14 @@ object SoopyGuessBurrow {
                     val pr2 = mutableListOf<LorenzVec>()
 
                     val start = slopeThing.size - 1
-                    val lastPos = locs[start].toDoubleArray()
-                    val lastPos2 = locs[start].toDoubleArray()
+                    val lastPos = locations[start].toDoubleArray()
+                    val lastPos2 = locations[start].toDoubleArray()
 
                     var distCovered = 0.0
 
-                    val ySpeed = locs[locs.size - 1].x - locs[locs.size - 2].x / hypot(
-                        locs[locs.size - 1].x - locs[locs.size - 2].x,
-                        locs[locs.size - 1].z - locs[locs.size - 2].x
+                    val ySpeed = locations[locations.size - 1].x - locations[locations.size - 2].x / hypot(
+                        locations[locations.size - 1].x - locations[locations.size - 2].x,
+                        locations[locations.size - 1].z - locations[locations.size - 2].x
                     )
 
                     var i = start + 1
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
index 44adceb6d584..3ae865ac82a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
@@ -360,12 +360,12 @@ object GardenPlotAPI {
 
         // Render horizontal
         val buildLimit = minHeight + 11
-        val ints = if (showBuildLimit) {
+        val iterable = if (showBuildLimit) {
             (minHeight..maxHeight step 4) + buildLimit
         } else {
             minHeight..maxHeight step 4
         }
-        for (y in ints) {
+        for (y in iterable) {
             val start = LorenzVec(chunkMinX, y, chunkMinZ)
             val isRedLine = y == buildLimit
             val color = if (isRedLine) Color.red else lineColor
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
index b3fd91d32a8d..3e99c2683fd2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
@@ -116,7 +116,7 @@ object JacobContestTimeNeeded {
     ) {
         var lowBPSWarning = listOf<String>()
         val rawSpeed = speed.toDouble()
-        val speedForFormular = crop.getBps()?.let {
+        val speedForFormula = crop.getBps()?.let {
             if (it < 15) {
                 val v = rawSpeed / it
                 (v * 19.9).toInt()
@@ -132,7 +132,7 @@ object JacobContestTimeNeeded {
                 showLine = "§9${crop.cropName} §cBracket not revealed!"
                 continue
             }
-            val timeInMinutes = (amount.toDouble() / speedForFormular).seconds
+            val timeInMinutes = (amount.toDouble() / speedForFormula).seconds
             val formatDuration = timeInMinutes.format()
             val color = if (timeInMinutes < 20.minutes) "§b" else "§c"
             var marking = ""
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
index 926f83d501b8..6494986afbb0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
@@ -53,7 +53,7 @@ class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int
         FortuneStats.entries.filter { it.isActive() && it !in headers }.map { it.getFarmingBar() }
 
     private fun equipDisplay(): Renderable =
-        Renderable.fixedSizeCollum(
+        Renderable.fixedSizeColumn(
             Renderable.verticalContainer(
                 listOf(
                     crop.farmingItem.getDisplay(),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
index 0e891f44470f..a5b3a97b8b3a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -50,7 +50,7 @@ object FixGhostEntities {
             recentlySpawnedEntities.addLast(packet.entityID)
         } else if (packet is S13PacketDestroyEntities) {
             for (entityID in packet.entityIDs) {
-                // ingore entities that got properly spawned and then removed
+                // ignore entities that got properly spawned and then removed
                 if (entityID !in recentlySpawnedEntities) {
                     recentlyRemovedEntities.addLast(entityID)
                     if (recentlyRemovedEntities.size == 10) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
index 1f1f9dadd1e0..9953199c8695 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
@@ -55,7 +55,7 @@ object PatcherSendCoordinates {
                 split.first().toFloat()
             } else end.toFloat()
             patcherBeacon.add(PatcherBeacon(LorenzVec(x, y, z), description, System.currentTimeMillis() / 1000))
-            logger.log("got patcher coords and username")
+            logger.log("got Patcher coords and username")
         }
     }
 
@@ -76,10 +76,10 @@ object PatcherSendCoordinates {
         if (!event.isMod(10)) return
 
         val location = LocationUtils.playerLocation()
-        // removed patcher beacon!
+        // removed Patcher beacon!
         patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + 5 && location.distanceIgnoreY(it.location) < 5 }
 
-        // removed patcher beacon after time!
+        // removed Patcher beacon after time!
         patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + config.duration }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
index ac101a9096b2..518ebbaf929f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
@@ -39,9 +39,9 @@ object AdvancedPlayerList {
         ".*\\[(?<level>.*)] §r(?<name>.*)"
     )
 
-    private var playerDatas = mutableMapOf<String, PlayerData>()
+    private var playerData = mutableMapOf<String, PlayerData>()
 
-    fun createTabLine(text: String, type: TabStringType) = playerDatas[text]?.let {
+    fun createTabLine(text: String, type: TabStringType) = playerData[text]?.let {
         TabLine(text, type, createCustomName(it))
     } ?: TabLine(text, type)
 
@@ -90,7 +90,7 @@ object AdvancedPlayerList {
                 currentData[line] = it
             }
         }
-        playerDatas = currentData
+        playerData = currentData
         val prepare = currentData.entries
 
         val sorted = when (config.playerSortOrder) {
@@ -127,7 +127,7 @@ object AdvancedPlayerList {
         }
         newList.addAll(newPlayerList)
 
-        val rest = original.drop(playerDatas.size + extraTitles + 1)
+        val rest = original.drop(playerData.size + extraTitles + 1)
         newList.addAll(rest)
         return newList
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
index baeb1df046af..96759bc7d2e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
@@ -206,7 +206,7 @@ object DiscordLocationKey {
         "The Wasteland",
         "Throne Room"
     )
-    // list of nether locations because there are sooo many (truncated some according to scoreboard)
+    // list of nether locations because there are soo many (truncated some according to scoreboard)
 
     private val specialRiftRPC = mapOf(
         "Enigma's Crib" to "wyld-woods",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
index 2888cc7071d9..0a0b6b238181 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
@@ -41,10 +41,10 @@ object LimboTimeTracker {
     private const val FIRE_MULTIPLIER = 1.01F
     private var onFire = false
 
-    private val bedwarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0)
+    private val bedWarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0)
 
     private var doMigrate = false
-    private var unmigratedPB = 0
+    private var notMigratedPB = 0
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
@@ -74,7 +74,7 @@ object LimboTimeTracker {
         }
         val lobbyName: String? = HypixelData.locrawData?.get("lobbyname")?.asString
         if (lobbyName.toString().startsWith("bedwarslobby")) {
-            if (bedwarsLobbyLimbo.isPlayerInside()) {
+            if (bedWarsLobbyLimbo.isPlayerInside()) {
                 if (inFakeLimbo) return
                 limboJoinTime = SimpleTimeMark.now()
                 inLimbo = true
@@ -182,23 +182,23 @@ object LimboTimeTracker {
 
     fun workaroundMigration(personalBest: Int) {
         doMigrate = true
-        unmigratedPB = personalBest
+        notMigratedPB = personalBest
     }
 
     @SubscribeEvent
     fun onHypixelJoin(event: HypixelJoinEvent) {
         if (!doMigrate) return
-        if (unmigratedPB != 0) {
+        if (notMigratedPB != 0) {
             ChatUtils.debug("Migrating limbo personalBest")
-            storage?.personalBest = unmigratedPB
-            storage?.userLuck = unmigratedPB * USER_LUCK_MULTIPLIER
+            storage?.personalBest = notMigratedPB
+            storage?.userLuck = notMigratedPB * USER_LUCK_MULTIPLIER
         }
         if ((storage?.personalBest ?: 0) > (storage?.playtime ?: 0)) {
             ChatUtils.debug("Migrating limbo playtime")
             storage?.playtime = (storage?.personalBest ?: 0)
         }
         doMigrate = false
-        unmigratedPB = 0
+        notMigratedPB = 0
     }
 
     fun isEnabled() = config.showTimeInLimbo
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
index 686f46827cef..c5d4f5ea43bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
@@ -173,7 +173,7 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) {
         }
     }
 
-    // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for minibosses
+    // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for mini bosses
     private fun fixMinibossAmount(quest: Quest, stack: ItemStack) {
         if (quest !is MiniBossQuest) return
         val storedAmount = quest.needAmount
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index 647b2280b43d..ccb432f61905 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -74,7 +74,7 @@ object RiftBloodEffigies {
     fun onRepoReload(event: RepositoryReloadEvent) {
         val newLocations = event.getConstant<RiftEffigiesJson>("RiftEffigies").locations
         if (newLocations.size != 6) {
-            error("Invalid rift effigies size: ${newLocations.size} (expeced 6)")
+            error("Invalid rift effigies size: ${newLocations.size} (expected 6)")
         }
         locations = newLocations
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index 2e033b7e45b5..d2a98daed4d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent
+import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent
 import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.XP_NEEDED_FOR_60
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils.chat
@@ -156,7 +156,7 @@ object SkillProgress {
     }
 
     @SubscribeEvent
-    fun onLevelUp(event: SkillOverflowLevelupEvent) {
+    fun onLevelUp(event: SkillOverflowLevelUpEvent) {
         if (!isEnabled()) return
         if (!config.overflowConfig.enableInChat) return
         val skillName = event.skill.displayName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
index 92c76e4937bd..372c7daa9f6b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
@@ -86,7 +86,7 @@ object SlayerProfitTracker {
     private val ItemTrackerData.TrackedItem.timesDropped get() = timesGained
 
     private fun addSlayerCosts(price: Double) {
-        require(price < 0) { "slayer costs can not be positve" }
+        require(price < 0) { "slayer costs can not be positive" }
         getTracker()?.modify {
             it.slayerSpawnCost += price.toInt()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
index 1d434e298b82..26e0822b196e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -145,11 +145,11 @@ object SlayerRngMeterDisplay {
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
 
-        readRngmeterInventory(event)
+        readRngMeterInventory(event)
         readSlayerInventory(event)
     }
 
-    private fun readRngmeterInventory(event: InventoryFullyOpenedEvent) {
+    private fun readRngMeterInventory(event: InventoryFullyOpenedEvent) {
         val name = inventoryNamePattern.matchMatcher(event.inventoryName) {
             group("name")
         } ?: return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
index c59747c09fa5..c57c473c5fd6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
@@ -180,7 +180,7 @@ object EndermanSlayerFeatures {
             it.isDead
         }
 
-        // Removing the beacon if It's still there after 7 sesconds.
+        // Removing the beacon if It's still there after 7 seconds.
         // This is just a workaround for the cases where the ServerBlockChangeEvent don't detect the beacon despawn info.
         val toRemove = sittingBeacon.filter { it.value.passedSince() > 7.seconds }
         if (toRemove.isNotEmpty()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java
index d762dbb22507..2635874a3ec7 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java
@@ -9,7 +9,7 @@
 public interface AccessorRendererLivingEntity<T extends EntityLivingBase>
     extends AccessorRender<T> {
     @Invoker("setBrightness")
-    boolean setBrightness_skyhanni(T entitylivingbaseIn, float partialTicks, boolean combineTextures);
+    boolean setBrightness_skyhanni(T entityLivingBaseIn, float partialTicks, boolean combineTextures);
 
     @Invoker("unsetBrightness")
     void setBrightness_skyhanni();
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
index 7ffcfef8fdff..6fb71ccc0a4f 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
@@ -28,7 +28,7 @@ private String checkNameForUpsideDown(String displayName) {
     @Redirect(
         method = "rotateCorpse",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;isWearing(Lnet/minecraft/entity/player/EnumPlayerModelParts;)Z"))
-    private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts p_175148_1_) {
+    private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts enumPlayerModelParts) {
         // Always returning true here ensures maximal compatibility with other mods. This will no longer block other mods from implementing this same mixin.
         return true;
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
index 5898b5d98d46..4bf183d74fbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
@@ -24,7 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object TestCopyBestiaryValues {
 
-    class BestiarityObject { // TODO fix typo
+    class BestiaryObject { // TODO fix typo
 
         @Expose
         var name: String = ""
@@ -72,7 +72,7 @@ object TestCopyBestiaryValues {
     private fun copy(titleItem: ItemStack, inventoryItems: Map<Int, ItemStack>) {
         val titleName = titleItem.name.removeWordsAtEnd(1)
 
-        val obj = BestiarityObject()
+        val obj = BestiaryObject()
         obj.name = titleName
         obj.texture = titleItem.getSkullTexture() ?: "no texture found"
         obj.skullOwner = titleItem.getSkullOwner() ?: "no skullOwner found"
diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
index 45b81a1abd9c..a42a10faf858 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
@@ -37,7 +37,7 @@ class HotswapSupportImpl : HotswapSupportHandle {
                     ?.makeAccessible()
                     ?.removeFinal()
                 if (instanceField != null) {
-                    ChatUtils.chat("Reinjected static instance $newInstance!")
+                    ChatUtils.chat("Re-injected static instance $newInstance!")
                     instanceField.set(null, newInstance)
                 }
                 SkyHanniMod.modules.add(newInstance)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
index 5edd33bc019d..0ea909851fc2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
@@ -113,10 +113,10 @@ object CombatUtils {
     /**
      * Taken from NotEnoughUpdates
      */
-    fun interp(now: Float, last: Float, lastupdate: Long): Float {
+    fun interp(now: Float, last: Float, lastUpdate: Long): Float {
         var interp = now
         if (last >= 0 && last != now) {
-            var factor = (System.currentTimeMillis() - lastupdate) / 1000f
+            var factor = (System.currentTimeMillis() - lastUpdate) / 1000f
             factor = LerpUtils.clampZeroOne(factor)
             interp = last + (now - last) * factor
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
index 889530cd622e..97225369d6b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
@@ -37,7 +37,7 @@ import java.lang.reflect.Method
 object EntityOutlineRenderer {
 
     private val entityRenderCache: CachedInfo = CachedInfo(null, null, null)
-    private var stopLookingForOptifine = false
+    private var stopLookingForOptiFine = false
     private var isMissingMixin = false
     private var isFastRender: Method? = null
     private var isShaders: Method? = null
@@ -56,13 +56,13 @@ object EntityOutlineRenderer {
      */
     private fun initSwapBuffer(): Framebuffer {
         val main = mc.framebuffer
-        val framebuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true)
-        framebuffer.setFramebufferFilter(GL11.GL_NEAREST)
-        framebuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f)
-        return framebuffer
+        val frameBuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true)
+        frameBuffer.setFramebufferFilter(GL11.GL_NEAREST)
+        frameBuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f)
+        return frameBuffer
     }
 
-    private fun updateFramebufferSize() {
+    private fun updateFrameBufferSize() {
         val width = mc.displayWidth
         val height = mc.displayHeight
         if (swapBuffer.framebufferWidth != width || swapBuffer.framebufferHeight != height) {
@@ -94,7 +94,7 @@ object EntityOutlineRenderer {
         val renderGlobal = mc.renderGlobal as CustomRenderGlobal
         val renderManager = mc.renderManager
         mc.theWorld.theProfiler.endStartSection("entityOutlines")
-        updateFramebufferSize()
+        updateFrameBufferSize()
 
         // Clear and bind the outline framebuffer
         renderGlobal.frameBuffer.framebufferClear()
@@ -216,7 +216,7 @@ object EntityOutlineRenderer {
     }
 
     /**
-     * Caches optifine settings and determines whether outlines should be rendered
+     * Caches OptiFine settings and determines whether outlines should be rendered
      *
      * @return `true` iff outlines should be rendered
      */
@@ -232,8 +232,8 @@ object EntityOutlineRenderer {
         val renderGlobal = mc.renderGlobal as CustomRenderGlobal
         if (renderGlobal.frameBuffer == null || renderGlobal.shader == null || mc.thePlayer == null) return false
 
-        // Optifine Conditions
-        if (!stopLookingForOptifine && isFastRender == null) {
+        // OptiFine Conditions
+        if (!stopLookingForOptiFine && isFastRender == null) {
             try {
                 val config = Class.forName("Config")
                 try {
@@ -241,12 +241,12 @@ object EntityOutlineRenderer {
                     isShaders = config.getMethod("isShaders")
                     isAntialiasing = config.getMethod("isAntialiasing")
                 } catch (ex: Exception) {
-                    logger.log("Couldn't find Optifine methods for entity outlines.")
-                    stopLookingForOptifine = true
+                    logger.log("Couldn't find OptiFine methods for entity outlines.")
+                    stopLookingForOptiFine = true
                 }
             } catch (ex: Exception) {
-                logger.log("Couldn't find Optifine for entity outlines.")
-                stopLookingForOptifine = true
+                logger.log("Couldn't find OptiFine for entity outlines.")
+                stopLookingForOptiFine = true
             }
         }
         var isFastRenderValue = false
@@ -258,9 +258,9 @@ object EntityOutlineRenderer {
                 isShadersValue = isShaders!!.invoke(null) as Boolean
                 isAntialiasingValue = isAntialiasing!!.invoke(null) as Boolean
             } catch (ex: IllegalAccessException) {
-                logger.log("An error occurred while calling Optifine methods for entity outlines... $ex")
+                logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex")
             } catch (ex: InvocationTargetException) {
-                logger.log("An error occurred while calling Optifine methods for entity outlines... $ex")
+                logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex")
             }
         }
         return !isFastRenderValue && !isShadersValue && !isAntialiasingValue
@@ -373,15 +373,15 @@ object EntityOutlineRenderer {
             val xrayOutlineEvent = RenderEntityOutlineEvent(RenderEntityOutlineEvent.Type.XRAY, null)
             xrayOutlineEvent.postAndCatch()
             // Get all entities to render no xray outlines, using pre-filtered entities (no need to test xray outlined entities)
-            val noxrayOutlineEvent = RenderEntityOutlineEvent(
+            val noXrayOutlineEvent = RenderEntityOutlineEvent(
                 RenderEntityOutlineEvent.Type.NO_XRAY,
                 xrayOutlineEvent.entitiesToChooseFrom
             )
-            noxrayOutlineEvent.postAndCatch()
+            noXrayOutlineEvent.postAndCatch()
             // Cache the entities for future use
             entityRenderCache.xrayCache = xrayOutlineEvent.entitiesToOutline
-            entityRenderCache.noXrayCache = noxrayOutlineEvent.entitiesToOutline
-            entityRenderCache.noOutlineCache = noxrayOutlineEvent.entitiesToChooseFrom
+            entityRenderCache.noXrayCache = noXrayOutlineEvent.entitiesToOutline
+            entityRenderCache.noOutlineCache = noXrayOutlineEvent.entitiesToChooseFrom
             emptyLastTick = if (isCacheEmpty()) {
                 if (!emptyLastTick) {
                     renderGlobal.frameBuffer.framebufferClear()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index ab0afd93c50f..d2c24cecae34 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -76,7 +76,7 @@ object InventoryUtils {
             val booleanField = storage.javaClass.getDeclaredField("enableStorageGUI3")
             booleanField.get(storage) as Boolean
         } catch (e: Throwable) {
-            ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is emabled.")
+            ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is enabled.")
             false
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index c094df489071..5edc227dd85a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -295,7 +295,7 @@ object ItemUtils {
     private val itemAmountCache = mutableMapOf<String, Pair<String, Int>>()
 
     fun readItemAmount(originalInput: String): Pair<String, Int>? {
-        // This workaround fixes 'Tubto Cacti I Book'
+        // This workaround fixes 'Turbo Cacti I Book'
         val input = (if (originalInput.endsWith(" Book")) {
             originalInput.replace(" Book", "")
         } else originalInput).removeResets()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
index e322b5ae36b6..b9a790d31a9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
@@ -62,9 +62,9 @@ object LocationUtils {
         val t1 = (this.minBox() - origin) * rayDirectionInverse
         val t2 = (this.maxBox() - origin) * rayDirectionInverse
 
-        val tmin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY)
-        val tmax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY)
-        return tmax >= tmin && tmax >= 0.0
+        val tMin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY)
+        val tMax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY)
+        return tMax >= tMin && tMax >= 0.0
     }
 
     fun AxisAlignedBB.union(aabbs: List<AxisAlignedBB>?): AxisAlignedBB? {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index ee9228609f7f..ea2a935a3079 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -126,7 +126,7 @@ object LorenzUtils {
     val EntityLivingBase.baseMaxHealth: Int
         get() = this.getEntityAttribute(SharedMonsterAttributes.maxHealth).baseValue.toInt()
 
-    // TODO create extenstion function
+    // TODO create extension function
     fun formatPercentage(percentage: Double): String = formatPercentage(percentage, "0.00")
 
     fun formatPercentage(percentage: Double, format: String?): String =
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index fe9e9df6a1fe..1f389e51b766 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -215,7 +215,7 @@ object RenderUtils {
         val bottomOffset = 0
         val topOffset = bottomOffset + height
         val tessellator = Tessellator.getInstance()
-        val worldrenderer = tessellator.worldRenderer
+        val worldRenderer = tessellator.worldRenderer
         Minecraft.getMinecraft().textureManager.bindTexture(beaconBeam)
         GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0f)
         GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0f)
@@ -244,59 +244,59 @@ object RenderUtils {
         val d11 = 0.5 + sin(d2 + 5.497787143782138) * 0.2
         val d14 = -1.0 + d1
         val d15 = height.toDouble() * 2.5 + d14
-        worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR)
-        worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR)
+        worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
-        worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
+        worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex()
+        worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier)
             .endVertex()
         tessellator.draw()
         GlStateManager.disableCull()
         val d12 = -1.0 + d1
         val d13 = height + d12
-        worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR)
-        worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR)
+        worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
-        worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
-        worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
+        worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex()
+        worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier)
             .endVertex()
         tessellator.draw()
     }
@@ -809,19 +809,19 @@ object RenderUtils {
         bindCamera()
 
         val tessellator = Tessellator.getInstance()
-        val worldrenderer = tessellator.worldRenderer
-        worldrenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION)
+        val worldRenderer = tessellator.worldRenderer
+        worldRenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION)
         var currentAngle = 0f
         val angleStep = 0.1f
         while (currentAngle < 2 * Math.PI) {
             val xOffset = radius * cos(currentAngle.toDouble()).toFloat()
             val zOffset = radius * sin(currentAngle.toDouble()).toFloat()
-            worldrenderer.pos(x + xOffset, y + height, z + zOffset).endVertex()
-            worldrenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex()
+            worldRenderer.pos(x + xOffset, y + height, z + zOffset).endVertex()
+            worldRenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex()
             currentAngle += angleStep
         }
-        worldrenderer.pos(x + radius, y + height, z).endVertex()
-        worldrenderer.pos(x + radius, y + 0.0, z).endVertex()
+        worldRenderer.pos(x + radius, y + height, z).endVertex()
+        worldRenderer.pos(x + radius, y + 0.0, z).endVertex()
         tessellator.draw()
 
         GlStateManager.enableCull()
@@ -1388,9 +1388,9 @@ object RenderUtils {
                 GlStateManager.depthMask(false)
             }
             GlStateManager.color(color.red / 255f, color.green / 255f, color.blue / 255f, color.alpha / 255f)
-            val ctrlpoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray()
+            val ctrlPoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray()
             bezier2Buffer.clear()
-            ctrlpoints.forEach {
+            ctrlPoints.forEach {
                 bezier2Buffer.put(it)
             }
             bezier2Buffer.flip()
@@ -1477,8 +1477,6 @@ object RenderUtils {
                 GlStateManager.disableTexture2D()
                 GlStateManager.disableCull()
 
-                val tessellator = Tessellator.getInstance()
-
                 GlStateManager.pushMatrix()
                 RenderUtils.translate(getViewerPos(partialTicks).negated())
                 getViewerPos(partialTicks)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 1780764cdfcc..2b3ece2c721e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -327,7 +327,7 @@ object SkyBlockItemModifierUtils {
 
             fun getByName(name: String): GemstoneSlotType =
                 entries.firstOrNull { name.uppercase(Locale.ENGLISH).contains(it.name) }
-                    ?: error("Unknwon GemstoneSlotType: '$name'")
+                    ?: error("Unknown GemstoneSlotType: '$name'")
 
             fun getColorCode(name: String) = getByName(name).colorCode
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index b51c83295023..b12668d72b8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -250,10 +250,16 @@ interface Renderable {
             val openGui = guiScreen?.javaClass?.name ?: "none"
             val isInNeuPv = openGui == "io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer"
             val neuFocus = NEUItems.neuHasFocus()
-            val isInSkyTilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui"
+            val isInSkytilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui"
 
-            val result = isGuiScreen && isGuiPositionEditor && inMenu && isNotInSignAndOnSlot && isConfigScreen &&
-                !isInNeuPv && !isInSkyTilsPv && !neuFocus
+            val result = isGuiScreen &&
+                isGuiPositionEditor &&
+                inMenu &&
+                isNotInSignAndOnSlot &&
+                isConfigScreen &&
+                !isInNeuPv &&
+                !isInSkytilsPv &&
+                !neuFocus
 
             if (debug) {
                 if (!result) {
@@ -266,7 +272,7 @@ interface Renderable {
                     if (!isConfigScreen) logger.log("isConfigScreen")
                     if (isInNeuPv) logger.log("isInNeuPv")
                     if (neuFocus) logger.log("neuFocus")
-                    if (isInSkyTilsPv) logger.log("isInSkyTilsPv")
+                    if (isInSkytilsPv) logger.log("isInSkytilsPv")
                     logger.log("")
                 } else {
                     logger.log("allowed click")
@@ -647,7 +653,7 @@ interface Renderable {
             }
         }
 
-        fun fixedSizeCollum(
+        fun fixedSizeColumn(
             content: Renderable,
             height: Int,
             horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
index 8f55a8b1f56f..8d26cf46afc5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -58,7 +58,7 @@ object RepoPatternManager {
      */
     private var usedKeys: NavigableMap<String, CommonPatternInfo<*, *>> = TreeMap()
 
-    private var wasPreinitialized = false
+    private var wasPreInitialized = false
     private val isInDevEnv = try {
         Launch.blackboard["fml.deobfuscatedEnvironment"] as Boolean
     } catch (_: Exception) {
@@ -261,7 +261,7 @@ object RepoPatternManager {
 
     @HandleEvent
     fun onPreInitFinished(event: PreInitFinishedEvent) {
-        wasPreinitialized = true
+        wasPreInitialized = true
         val dumpDirective = System.getenv("SKYHANNI_DUMP_REGEXES")
         if (dumpDirective.isNullOrBlank()) return
         val (sourceLabel, path) = dumpDirective.split(":", limit = 2)
@@ -274,7 +274,7 @@ object RepoPatternManager {
 
     fun of(key: String, fallback: String, parentKeyHolder: RepoPatternKeyOwner? = null): RepoPattern {
         verifyKeyShape(key)
-        if (wasPreinitialized && !config.tolerateLateRegistration) {
+        if (wasPreInitialized && !config.tolerateLateRegistration) {
             crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.")
         }
         if (key in usedKeys) {
@@ -289,7 +289,7 @@ object RepoPatternManager {
         parentKeyHolder: RepoPatternKeyOwner? = null,
     ): RepoPatternList {
         verifyKeyShape(key)
-        if (wasPreinitialized && !config.tolerateLateRegistration) {
+        if (wasPreInitialized && !config.tolerateLateRegistration) {
             crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.")
         }
         if (key in usedKeys) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
index c110d6d6e0f1..83e8121494a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
@@ -66,7 +66,7 @@ abstract class Shader(val vertex: String, val fragment: String) {
 
         ShaderHelper.glLinkProgram(shaderProgram)
 
-        if (ShaderHelper.glGetProgrami(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) {
+        if (ShaderHelper.glGetProgramInt(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) {
             val errorMessage = "Failed to link vertex shader $vertex and fragment shader $fragment. Features that " +
                 "utilise this shader will not work correctly, if at all"
             val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderProgram, 1024))
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
index 89efd7d9f183..1e8062500340 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
@@ -82,11 +82,11 @@ class ShaderHelper {
             ) else GL20.glGetProgramInfoLog(program, maxLength)
         }
 
-        fun glGetProgrami(program: Int, pname: Int): Int {
+        fun glGetProgramInt(program: Int, pName: Int): Int {
             return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
                 program,
-                pname
-            ) else GL20.glGetProgrami(program, pname)
+                pName
+            ) else GL20.glGetProgrami(program, pName)
         }
 
         fun glUseProgram(program: Int) {
@@ -115,11 +115,11 @@ class ShaderHelper {
             if (USING_ARB_SHADERS) ARBShaderObjects.glCompileShaderARB(shader) else GL20.glCompileShader(shader)
         }
 
-        fun glGetShaderi(shader: Int, pname: Int): Int {
+        fun glGetShaderInt(shader: Int, pName: Int): Int {
             return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
                 shader,
-                pname
-            ) else GL20.glGetShaderi(shader, pname)
+                pName
+            ) else GL20.glGetShaderi(shader, pName)
         }
 
         fun glGetShaderInfoLog(shader: Int, maxLength: Int): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
index 057e0a031945..39a2fe302d3a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
@@ -71,7 +71,7 @@ object ShaderManager {
         ShaderHelper.glShaderSource(shaderID, source.toString())
         ShaderHelper.glCompileShader(shaderID)
 
-        if (ShaderHelper.glGetShaderi(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) {
+        if (ShaderHelper.glGetShaderInt(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) {
             val errorMessage = "Failed to compile shader $fileName${type.extension}. Features that utilise this " +
                 "shader will not work correctly, if at all"
             val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024))
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
index 5fa12dbb6c74..4b871377bdd3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
@@ -24,7 +24,7 @@ abstract class ItemTrackerData : TrackerData() {
         resetItems()
     }
 
-    fun additem(internalName: NEUInternalName, stackSize: Int) {
+    fun addItem(internalName: NEUInternalName, stackSize: Int) {
         val item = items.getOrPut(internalName) { TrackedItem() }
 
         item.timesGained++
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index f7bafb7f3a5c..21f115746d46 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -37,7 +37,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 
     fun addItem(internalName: NEUInternalName, amount: Int) {
         modify {
-            it.additem(internalName, amount)
+            it.addItem(internalName, amount)
         }
         getSharedTracker()?.let {
             val hidden = it.get(DisplayMode.TOTAL).items[internalName]!!.hidden

From b81896885d37df64ec01d39a9adbb59a269e387c Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:42:04 +0200
Subject: [PATCH 043/721] Improvement + Fix: FF exporting (#2194)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../garden/fortuneguide/CarrolynTable.kt      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
index b7163768b318..c6b6895cffba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
@@ -10,27 +10,36 @@ enum class CarrolynTable(val crop: CropType, val label: String, completeMessage:
         CropType.CARROT,
         "Exportable Carrots",
         "CARROTS EXPORTATION COMPLETE!",
-        "[NPC] Carrolyn: Thank you for the carrots."
+        "[NPC] Carrolyn: Thank you for the carrots.",
     ),
     EXPIRED_PUMPKIN(
         CropType.PUMPKIN,
         "Expired Pumpkin",
         "PUMPKINS EXPORTATION COMPLETE!",
-        "[NPC] Carrolyn: Thank you for the pumpkins."
+        "[NPC] Carrolyn: Thank you for the pumpkins.",
     ),
     SUPREME_CHOCOLATE_BAR(
         CropType.COCOA_BEANS,
         "Supreme Chocolate Bar",
-        "CHOCOLATE BARS EXPORTATION COMPLETE!",
-        "[NPC] Carrolyn: Thank you for the chocolate."
+        "COCOA BEANSS EXPORTATION COMPLETE!",
+        "[NPC] Carrolyn: Thank you for the chocolate.",
+    ),
+    FINE_FLOUR(
+        CropType.WHEAT,
+        "Fine Flour",
+        "WHEATS EXPORTATION COMPLETE!",
+        "[NPC] Carrolyn: Thank you for the flour.", // TODO confirm this, since this is only a estimate
     ),
     ;
 
+    /** Pattern without colour codes */
     val completeMessagePattern by RepoPattern.pattern(
-        "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage
+        "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage,
     )
+
+    /** Pattern without colour codes */
     val thxMessagePattern by RepoPattern.pattern(
-        "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage
+        "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage,
     )
 
     val thxResponse = "§aYou have already given Carrolyn enough $label."

From e6021c9ae79af2c34a6dce8f459c0a3205a88ff1 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:42:41 +0200
Subject: [PATCH 044/721] Fix: HypixelData Npe (#2193)

---
 src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 94b1dc2837ee..dbcf1276047a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -394,7 +394,7 @@ object HypixelData {
             }
         }
 
-        serverNameConnectionPattern.matchMatcher(mc.getCurrentServerData().serverIP) {
+        serverNameConnectionPattern.matchMatcher(mc.currentServerData?.serverIP ?: "") {
             hypixel = true
             if (group("prefix") == "alpha.") {
                 hypixelAlpha = true

From c4b09e50a6e49da34307c3694fc3d76db53c0ac8 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:43:15 +0200
Subject: [PATCH 045/721] Fix: Custom Scoreboard Winter Patterns (#2192)

---
 .../features/gui/customscoreboard/ScoreboardPattern.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index b9f80612ec24..11fdfba869c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -419,11 +419,11 @@ object ScoreboardPattern {
     )
     val winterEventStartPattern by eventsSb.pattern(
         "wintereventstart",
-        "(§.)*Event Start: §.\\d+:\\d+$",
+        "(§.)*Event Start: §.[\\d:]+$",
     )
     val winterNextWavePattern by eventsSb.pattern(
         "wintereventnextwave",
-        "(§.)*Next Wave: (§.)*(\\d+:\\d+|Soon!)$",
+        "(§.)*Next Wave: (§.)*([\\d:]+|Soon!)$",
     )
     val winterWavePattern by eventsSb.pattern(
         "wintereventwave",
@@ -435,11 +435,11 @@ object ScoreboardPattern {
     )
     val winterTotalDmgPattern by eventsSb.pattern(
         "wintereventtotaldmg",
-        "(§.)*Your Total Damage: §.\\d+.*$",
+        "(§.)*Your Total Damage: §.[\\d+,.]+.*$",
     )
     val winterCubeDmgPattern by eventsSb.pattern(
         "wintereventcubedmg",
-        "(§.)*Your Cube Damage: §.\\d+$",
+        "(§.)*Your Cube Damage: §.[\\d+,.]+$",
     )
 
     // rift

From c1f3d47ef4b445e968f0197ff9eaca6f6c362987 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:44:43 +0200
Subject: [PATCH 046/721] Fix: Guild Rank Chat Formatting (#2191)

---
 .../hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt
index 1ac35e11593a..b6c0e16f9cca 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt
@@ -62,7 +62,7 @@ object PlayerChatManager {
      */
     private val guildPattern by patternGroup.pattern(
         "guild",
-        "§2Guild > (?<author>.+?)(?<guildRank> §e\\[\\w*])?§f: (?<message>.*)"
+        "§2Guild > (?<author>.+?) ?(?<guildRank>§e\\[\\w*])?§f: (?<message>.*)",
     )
 
     /**

From 932a24258a254b5fa6f82aae91a50471e99d9962 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:45:21 +0200
Subject: [PATCH 047/721] Backend: Dragon Widget (#2190)

---
 src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
index bf2b424d5e7f..9d922f93d60a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
@@ -207,7 +207,7 @@ enum class TabWidget(
     ),
     DRAGON(
         // language=RegExp
-        "(?:§.)*Dragon: (?:§.)*\\((?<type>[^)])\\)",
+        "(?:§.)*Dragon: (?:§.)*\\((?<type>[^)]*)\\)",
     ),
     VOLCANO(
         // language=RegExp

From c045f391ed6ee70e0a30c8719f606496bf2ab2a0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:45:37 +0200
Subject: [PATCH 048/721] Backend: ItemCategory Carnival Mask (#2189)

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
index e0e17e0644e1..3c0673c648dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -32,6 +32,7 @@ enum class ItemCategory {
     BOOTS,
     HATCESSORY,
     ACCESSORY,
+    CARNIVAL_MASK,
     POWER_STONE,
     TRAVEL_SCROLL,
     REFORGE_STONE,

From 30d701c8cceaa532a9b0eee27f458feaf45aa201 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:47:44 +0200
Subject: [PATCH 049/721] Fix: Pet Pattern (#2188)

---
 src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
index 5b65c8e23cca..75835f054cb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
@@ -10,15 +10,19 @@ object PetAPI {
     private val patternGroup = RepoPattern.group("misc.pet")
     private val petMenuPattern by patternGroup.pattern(
         "menu.title",
-        "Pets(?: \\(\\d+/\\d+\\) )?"
+        "Pets(?: \\(\\d+/\\d+\\) )?",
     )
+
+    /**
+     * REGEX-TEST: §e⭐ §7[Lvl 200] §6Golden Dragon§d ✦
+     */
     private val petItemName by patternGroup.pattern(
         "item.name",
-        "(?:§.)*\\[Lvl (?<level>\\d+)] (?<name>.*)"
+        "(?<favorite>§.⭐ )?(?:§.)*\\[Lvl (?<level>\\d+)] (?<name>.*)",
     )
     private val neuRepoPetItemName by patternGroup.pattern(
         "item.name.neu.format",
-        "(§f§f)?§7\\[Lvl 1➡(100|200)] (?<name>.*)"
+        "(?:§f§f)?§7\\[Lvl 1➡(?:100|200)] (?<name>.*)",
     )
 
     private val ignoredPetStrings = listOf(

From df6ff252c99c99aa12790ef72fc5abaa1d4c84c0 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:48:58 +0200
Subject: [PATCH 050/721] Fix: Powder Percentage CW Conflict (#2186)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml                  | 2 +-
 src/main/java/at/hannibal2/skyhanni/data/HotmData.kt | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index 64c012a13789..29903e6587fb 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -273,4 +273,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
\ No newline at end of file
+</component>
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index f86cc1de82a3..f3a2189b0999 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -409,9 +409,13 @@ enum class HotmData(
             "Heart of the Mountain",
         )
 
+        /**
+         * REGEX-TEST: §5§o§7Level 1§8/50 §7(§b0 §l0%§7):skull:
+         * REGEX-TEST: §7Level 1§8/50
+         */
         private val levelPattern by patternGroup.pattern(
             "perk.level",
-            "§(?<color>.)Level (?<level>\\d+).*",
+            "(?:§.)*§(?<color>.)Level (?<level>\\d+).*",
         )
 
         private val notUnlockedPattern by patternGroup.pattern(
@@ -426,7 +430,7 @@ enum class HotmData(
         private val disabledPattern by patternGroup.pattern(
             "perk.disabled",
             "§c§lDISABLED|§7§eClick to select!",
-        ) // unused for now since the assumption is when enabled isn't found it is disabled,
+        ) // unused for now since the assumption is when enabled isn't found, it is disabled,
         // but the value might be useful in the future or for debugging
 
         val perkCostPattern by patternGroup.pattern(

From af1896b9c322765292a546eefa5d666b3ceb9108 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:50:46 +0200
Subject: [PATCH 051/721] Fix: Scoreboard Votes Pattern (#2184)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/gui/customscoreboard/ScoreboardPattern.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 11fdfba869c4..62b282b37cbc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -64,9 +64,14 @@ object ScoreboardPattern {
         "yearvotes",
         "(?<yearvotes>^§6Year \\d+ Votes\$)",
     )
+
+    /**
+     * REGEX-TEST: §f||||||||||||||| §aFoxy
+     * REGEX-TEST: §d|§f|||||||||||||| §dDiaz
+     */
     val votesPattern by mainSb.pattern(
         "votes",
-        "(?<votes>§[caebd]\\|+(§f)?\\|+ §(.+)$)",
+        "§.\\|+(?:§f)?\\|+ §.+",
     )
     val waitingForVotePattern by mainSb.pattern(
         "waitingforvote",

From 963edde72d6454235068a45c45a2a14d652972ff Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 6 Jul 2024 02:51:22 -0400
Subject: [PATCH 052/721] Fix: Craftable! Text and Internal Names (#2183)

---
 .../skyhanni/features/inventory/craft/CraftableItemList.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
index 6b841f5a40d0..03e6b6656a2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
@@ -114,7 +114,7 @@ object CraftableItemList {
             "§8x$amountFormat ${internalName.itemName}",
             tips = tooltip,
             onClick = {
-                HypixelCommands.viewRecipe(internalName.asString())
+                HypixelCommands.viewRecipe(internalName.itemName)
             },
         )
     }

From 2b9288aa84e5101ad7c8f3867509cb9b3298d775 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 6 Jul 2024 08:51:45 +0200
Subject: [PATCH 053/721] Fix: Double-Bit in Reforge Helper (#2182)

---
 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index 70f6910c9173..8d70e47ba7ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -68,7 +68,7 @@ object ReforgeAPI {
 
         val rawReforgeStoneName = reforgeStone?.itemNameWithoutColor
 
-        val lowercaseName = name.lowercase()
+        val lowercaseName = name.lowercase().replace('-', '_')
 
         fun isValid(itemStack: ItemStack) = isValid(itemStack.getItemCategoryOrNull(), itemStack.getInternalName())
 

From e6216643e5e85f8912f969a079f0100e3bd5cbf9 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Sat, 6 Jul 2024 08:52:20 +0200
Subject: [PATCH 054/721] Fix: Worldedit command (#2179)

---
 src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt b/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
index 01b943959637..9b3cec0a09b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
@@ -125,7 +125,7 @@ object WorldEdit {
             }
 
             "right", "pos2" -> {
-                leftPos = LocationUtils.playerLocation().toBlockPos()
+                rightPos = LocationUtils.playerLocation().toBlockPos()
                 ChatUtils.chat("Set right pos.")
             }
 

From a30e2437c657bbecb8039e783ce4d164b1e08631 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Sat, 6 Jul 2024 01:57:28 -0500
Subject: [PATCH 055/721] Improvement + Fix: Unclaimed Eggs feature while busy
 (#2091)

---
 .../config/features/event/HoppityEggsConfig.java       | 10 ++++++++--
 .../features/event/hoppity/HoppityEggsManager.kt       |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
index 0083b1343e5a..de86e01c4cd4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
@@ -93,10 +93,16 @@ public class HoppityEggsConfig {
     public String warpDestination = "nucleus";
 
     @Expose
-    @ConfigOption(name = "Show during Contest", desc = "Show during a farming contest.")
+    @ConfigOption(name = "Show While Busy", desc = "Show while \"busy\" (in a farming contest, doing Kuudra, in the rift, etc).")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean showDuringContest = false;
+    public boolean showWhileBusy = false;
+
+    @Expose
+    @ConfigOption(name = "Warn While Busy", desc = "Warn while \"busy\" (in a farming contest, doing Kuudra, in the rift, etc).")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean warnWhileBusy = false;
 
     @Expose
     @ConfigOption(name = "Show Outside SkyBlock", desc = "Show on Hypixel even when not playing SkyBlock.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index bb3753c13d68..de37de625f73 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -199,7 +199,7 @@ object HoppityEggsManager {
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isActive()) return
         if (!config.showClaimedEggs) return
-        if (isBusy()) return
+        if (isBusy() && !config.showWhileBusy) return
 
         val displayList =
             HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
@@ -253,7 +253,7 @@ object HoppityEggsManager {
 
     private fun warn() {
         if (!config.warnUnclaimedEggs) return
-        if (isBusy()) return
+        if (isBusy() && !config.warnWhileBusy) return
         if (lastWarnTime.passedSince() < 30.seconds) return
 
         lastWarnTime = now()
@@ -278,7 +278,7 @@ object HoppityEggsManager {
         SoundUtils.repeatSound(100, 10, SoundUtils.plingSound)
     }
 
-    private fun isBusy() = ReminderUtils.isBusy(config.showDuringContest)
+    private fun isBusy() = ReminderUtils.isBusy()
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
@@ -288,6 +288,7 @@ object HoppityEggsManager {
             "event.chocolateFactory.hoppityEggs.highlightHoppityShop",
         )
         event.move(44, "event.chocolateFactory.hoppityEggs", "event.hoppityEggs")
+        event.move(50, "event.hoppityEggs.showDuringContest", "event.hoppityEggs.showWhileBusy")
     }
 
     fun isActive() = (LorenzUtils.inSkyBlock || (LorenzUtils.onHypixel && config.showOutsideSkyblock)) &&

From b2079e539284b34892d24ab4f2411fbe8d920b3e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 09:03:49 +0200
Subject: [PATCH 056/721] moved hoppity egg display logic into another class

---
 .../event/hoppity/HoppityEggDisplayManager.kt | 57 +++++++++++++++++++
 .../event/hoppity/HoppityEggsManager.kt       | 46 +--------------
 2 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
index 55d6bc01d425..06948f27abff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
@@ -1,11 +1,18 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
 import at.hannibal2.skyhanni.data.mob.MobFilter.isRealPlayer
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
 import at.hannibal2.skyhanni.events.render.EntityRenderLayersEvent
+import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.player.EntityPlayer
@@ -18,6 +25,8 @@ object HoppityEggDisplayManager {
     private val config get() = HoppityEggsManager.config
     private var shouldHidePlayer: Boolean = false
 
+    var display = listOf<Renderable>()
+
     private fun canChangeOpacity(entity: EntityLivingBase): Boolean {
         if (!HoppityEggLocator.isEnabled()) return false
         if (entity !is EntityPlayer) return false
@@ -55,4 +64,52 @@ object HoppityEggDisplayManager {
         if (!shouldHidePlayer) return
         event.cancel()
     }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        display = updateDisplay()
+    }
+
+    private fun updateDisplay(): List<Renderable> {
+        if (!HoppityEggsManager.isActive()) return emptyList()
+        if (!HoppityEggsManager.config.showClaimedEggs) return emptyList()
+        if (ReminderUtils.isBusy() && !HoppityEggsManager.config.showWhileBusy) return emptyList()
+
+        val displayList =
+            HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
+        displayList.add(0, "§bUnclaimed Eggs:")
+
+        if (HoppityEggsManager.config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
+            val totalEggs = HoppityEggLocations.islandLocations.size
+            if (totalEggs > 0) {
+                val collectedEggs = HoppityEggLocations.islandCollectedLocations.size
+                val collectedFormat = formatEggsCollected(collectedEggs)
+                displayList.add("§7Locations: $collectedFormat$collectedEggs§7/§a$totalEggs")
+            }
+        }
+        if (displayList.size == 1) return emptyList()
+
+        return listOf(
+            Renderable.clickAndHover(
+                Renderable.verticalContainer(displayList.map(Renderable::string)),
+                tips = listOf("§eClick to ${"/warp ${HoppityEggsManager.config.warpDestination}".trim()}!"),
+                onClick = { HypixelCommands.warp(HoppityEggsManager.config.warpDestination) },
+            ),
+        )
+    }
+
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent) {
+        if (!HoppityEggsManager.isActive()) return
+        HoppityEggsManager.config.position.renderRenderables(display, posLabel = "Hoppity Eggs")
+    }
+
+    private fun formatEggsCollected(collectedEggs: Int): String =
+        when (collectedEggs) {
+            in 0 until 5 -> "§c"
+            in 5 until 10 -> "§6"
+            in 10 until 15 -> "§e"
+            else -> "§a"
+        }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index de37de625f73..8a60516b3e5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.event.hoppity
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
@@ -16,7 +15,6 @@ import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
@@ -25,7 +23,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
-import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
 import kotlin.time.Duration.Companion.seconds
@@ -194,45 +191,6 @@ object HoppityEggsManager {
         }
     }
 
-    // TODO move logic into second passed event and cache
-    @SubscribeEvent
-    fun onRenderOverlay(event: GuiRenderEvent) {
-        if (!isActive()) return
-        if (!config.showClaimedEggs) return
-        if (isBusy() && !config.showWhileBusy) return
-
-        val displayList =
-            HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
-        displayList.add(0, "§bUnclaimed Eggs:")
-
-        if (config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
-            val totalEggs = HoppityEggLocations.islandLocations.size
-            if (totalEggs > 0) {
-                val collectedEggs = HoppityEggLocations.islandCollectedLocations.size
-                val collectedFormat = formatEggsCollected(collectedEggs)
-                displayList.add("§7Locations: $collectedFormat$collectedEggs§7/§a$totalEggs")
-            }
-        }
-        if (displayList.size == 1) return
-
-        val clickableDisplayList = listOf(
-            Renderable.clickAndHover(
-                Renderable.verticalContainer(displayList.map(Renderable::string)),
-                tips = listOf("§eClick to ${"/warp ${config.warpDestination}".trim()}!"),
-                onClick = { HypixelCommands.warp(config.warpDestination) },
-            ),
-        )
-        config.position.renderRenderables(clickableDisplayList, posLabel = "Hoppity Eggs")
-    }
-
-    private fun formatEggsCollected(collectedEggs: Int): String =
-        when (collectedEggs) {
-            in 0 until 5 -> "§c"
-            in 5 until 10 -> "§6"
-            in 10 until 15 -> "§e"
-            else -> "§a"
-        }
-
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
         if (!isActive()) return
@@ -253,7 +211,7 @@ object HoppityEggsManager {
 
     private fun warn() {
         if (!config.warnUnclaimedEggs) return
-        if (isBusy() && !config.warnWhileBusy) return
+        if (ReminderUtils.isBusy() && !config.warnWhileBusy) return
         if (lastWarnTime.passedSince() < 30.seconds) return
 
         lastWarnTime = now()
@@ -278,8 +236,6 @@ object HoppityEggsManager {
         SoundUtils.repeatSound(100, 10, SoundUtils.plingSound)
     }
 
-    private fun isBusy() = ReminderUtils.isBusy()
-
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(

From 06d4a207346eaf685e8857b7bcc1cfff693b43ac Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 10:21:26 +0200
Subject: [PATCH 057/721] code cleanup

---
 .../features/event/hoppity/HoppityEggLocator.kt      | 12 +++++-------
 .../features/event/hoppity/HoppityEggsShared.kt      |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 893e0f6e5b09..419cd115c805 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -93,7 +93,7 @@ object HoppityEggLocator {
             }
         }
 
-        var islandEggsLocations = HoppityEggLocations.islandLocations ?: return
+        var islandEggsLocations = HoppityEggLocations.islandLocations
 
         if (shouldShowAllEggs()) {
             if (config.hideDuplicateWaypoints) {
@@ -145,10 +145,8 @@ object HoppityEggLocator {
                         )
                         drawDynamicText(it.add(y = 1), "§aGuess", 1.5)
                     }
-                    if (!drawLocations) {
-                        if (config.showLine) {
-                            draw3DLine(eyeLocation, it.add(0.5, 0.5, 0.5), LorenzColor.GREEN.toColor(), 2, false)
-                        }
+                    if (!drawLocations && config.showLine) {
+                        draw3DLine(eyeLocation, it.add(0.5, 0.5, 0.5), LorenzColor.GREEN.toColor(), 2, false)
                     }
                 }
             }
@@ -224,7 +222,7 @@ object HoppityEggLocator {
         lastGuessMade = SimpleTimeMark.now()
         possibleEggLocations = emptyList()
 
-        val islandEggsLocations = HoppityEggLocations.islandLocations ?: return
+        val islandEggsLocations = HoppityEggLocations.islandLocations
         val listSize = validParticleLocations.size
 
         if (listSize < 5) return
@@ -270,7 +268,7 @@ object HoppityEggLocator {
     }
 
     fun isValidEggLocation(location: LorenzVec): Boolean =
-        HoppityEggLocations.islandLocations?.any { it.distance(location) < 5.0 } ?: false
+        HoppityEggLocations.islandLocations.any { it.distance(location) < 5.0 }
 
     private fun ReceiveParticleEvent.isVillagerParticle() =
         type == EnumParticleTypes.VILLAGER_HAPPY && speed == 0.0f && count == 1
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
index c57150352948..8c32e897924b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
@@ -49,7 +49,7 @@ object HoppityEggsShared {
 
     fun shareNearbyEggLocation(playerLocation: LorenzVec, meal: HoppityEggType, note: String) {
         if (!isEnabled()) return
-        val islandEggsLocations = HoppityEggLocations.islandLocations ?: return
+        val islandEggsLocations = HoppityEggLocations.islandLocations
         val closestEgg = islandEggsLocations.minByOrNull { it.distance(playerLocation) } ?: return
 
         val x = closestEgg.x.toInt()

From d6358620457236f01ac32e9d5c406c9632b05369 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 6 Jul 2024 10:27:14 +0200
Subject: [PATCH 058/721] Feature: Line to Nukekebi Skull (#2148)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/slayer/SlayerConfig.java  |  3 +-
 .../slayer/endermen/EndermanConfig.java       |  6 ++
 .../slayer/enderman/EndermanSlayerFeatures.kt | 79 ++++++++++++-------
 3 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
index f0b3174f00c6..74f61be7f9a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
@@ -13,8 +13,9 @@
 public class SlayerConfig {
 
     @Expose
-    @Category(name = "Endermen", desc = "Endermen Slayer Feature")
+    @Category(name = "Enderman", desc = "Enderman Slayer Feature")
     @Accordion
+    // TODO rename to "enderman"
     public EndermanConfig endermen = new EndermanConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanConfig.java
index a28b7afa8123..1ff8b49d73d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanConfig.java
@@ -18,6 +18,12 @@ public class EndermanConfig {
     @FeatureToggle
     public boolean highlightNukekebi = false;
 
+    @Expose
+    @ConfigOption(name = "Line to Nukekubi Skulls", desc = "Draw a line to the Enderman Slayer Nukekubi Skulls.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean drawLineToNukekebi = false;
+
     @Expose
     @ConfigOption(name = "Phase Display", desc = "Show the current phase of the Enderman Slayer in damage indicator.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
index c57c473c5fd6..72ab05195e35 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
@@ -70,7 +70,7 @@ object EndermanSlayerFeatures {
                     flyingBeacons.add(entity)
                     RenderLivingEntityHelper.setEntityColor(
                         entity,
-                        beaconConfig.beaconColor.toChromaColor().withAlpha(1)
+                        beaconConfig.beaconColor.toChromaColor().withAlpha(1),
                     ) {
                         beaconConfig.highlightBeacon
                     }
@@ -85,7 +85,7 @@ object EndermanSlayerFeatures {
                 nukekubiSkulls.add(entity)
                 RenderLivingEntityHelper.setEntityColor(
                     entity,
-                    LorenzColor.GOLD.toColor().withAlpha(1)
+                    LorenzColor.GOLD.toColor().withAlpha(1),
                 ) { config.highlightNukekebi }
                 logger.log("Added Nukekubi skulls at ${entity.getLorenzVec()}")
             }
@@ -102,7 +102,6 @@ object EndermanSlayerFeatures {
     fun onWorldRender(event: LorenzRenderWorldEvent) {
         if (!IslandType.THE_END.isInIsland()) return
 
-
         if (beaconConfig.highlightBeacon) {
             endermenWithBeacons.removeIf { it.isDead || !hasBeaconInHand(it) }
 
@@ -111,26 +110,39 @@ object EndermanSlayerFeatures {
             }
         }
 
-        for ((location, time) in sittingBeacon) {
-            if (location.distanceToPlayer() > 20) continue
-            if (beaconConfig.showLine) {
+        drawSittingBeacon(event)
+        drawFlyingBeacon(event)
+        drawNukekubiSkulls(event)
+    }
+
+    private fun drawNukekubiSkulls(event: LorenzRenderWorldEvent) {
+        for (skull in nukekubiSkulls) {
+            if (skull.isDead) continue
+            if (config.highlightNukekebi) {
+                event.drawDynamicText(
+                    skull.getLorenzVec().add(-0.5, 1.5, -0.5),
+                    "§6Nukekubi Skull",
+                    1.6,
+                    ignoreBlocks = false,
+                    maxDistance = 20,
+                )
+            }
+            if (config.drawLineToNukekebi) {
+                val skullLocation = event.exactLocation(skull)
+                if (skullLocation.distanceToPlayer() > 20) continue
+                if (!skullLocation.canBeSeen()) continue
                 event.draw3DLine(
                     event.exactPlayerEyeLocation(),
-                    location.add(0.5, 1.0, 0.5),
-                    beaconConfig.lineColor.toChromaColor(),
-                    beaconConfig.lineWidth,
-                    true
+                    skullLocation.add(y = 1),
+                    LorenzColor.GOLD.toColor(),
+                    3,
+                    true,
                 )
             }
-
-            if (beaconConfig.highlightBeacon) {
-                val duration = 5.seconds - time.passedSince()
-                val durationFormat = duration.format(showMilliSeconds = true)
-                event.drawColor(location, beaconConfig.beaconColor.toChromaColor(), alpha = 1f)
-                event.drawWaypointFilled(location, beaconConfig.beaconColor.toChromaColor(), true, true)
-                event.drawDynamicText(location.add(y = 1), "§4Beacon §b$durationFormat", 1.8)
-            }
         }
+    }
+
+    private fun drawFlyingBeacon(event: LorenzRenderWorldEvent) {
         for (beacon in flyingBeacons) {
             if (beacon.isDead) continue
             if (beaconConfig.highlightBeacon) {
@@ -145,21 +157,32 @@ object EndermanSlayerFeatures {
                     beaconLocation.add(0.5, 1.0, 0.5),
                     beaconConfig.lineColor.toChromaColor(),
                     beaconConfig.lineWidth,
-                    true
+                    true,
                 )
             }
         }
+    }
 
-        config.highlightNukekebi
-        for (skull in nukekubiSkulls) {
-            if (!skull.isDead) {
-                event.drawDynamicText(
-                    skull.getLorenzVec().add(-0.5, 1.5, -0.5),
-                    "§6Nukekubi Skull",
-                    1.6,
-                    ignoreBlocks = false
+    private fun drawSittingBeacon(event: LorenzRenderWorldEvent) {
+        for ((location, time) in sittingBeacon) {
+            if (location.distanceToPlayer() > 20) continue
+            if (beaconConfig.showLine) {
+                event.draw3DLine(
+                    event.exactPlayerEyeLocation(),
+                    location.add(0.5, 1.0, 0.5),
+                    beaconConfig.lineColor.toChromaColor(),
+                    beaconConfig.lineWidth,
+                    true,
                 )
             }
+
+            if (beaconConfig.highlightBeacon) {
+                val duration = 5.seconds - time.passedSince()
+                val durationFormat = duration.format(showMilliSeconds = true)
+                event.drawColor(location, beaconConfig.beaconColor.toChromaColor(), alpha = 1f)
+                event.drawWaypointFilled(location, beaconConfig.beaconColor.toChromaColor(), true, true)
+                event.drawDynamicText(location.add(y = 1), "§4Beacon §b$durationFormat", 1.8)
+            }
         }
     }
 
@@ -226,7 +249,7 @@ object EndermanSlayerFeatures {
         event.move(
             3,
             "slayer.endermanBeaconConfig.highlightBeacon",
-            "slayer.endermen.endermanBeaconConfig.highlightBeacon"
+            "slayer.endermen.endermanBeaconConfig.highlightBeacon",
         )
         event.move(3, "slayer.endermanBeaconConfig.beaconColor", "slayer.endermen.endermanBeaconConfig.beaconColor")
         event.move(3, "slayer.endermanBeaconConfig.showWarning", "slayer.endermen.endermanBeaconConfig.showWarning")

From e6b2bcbcdb17f729ead84fd2a2d5d8c0dc6eebc3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 10:28:43 +0200
Subject: [PATCH 059/721] added debugs

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 5edc227dd85a..3a60dd3f4441 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -423,9 +423,13 @@ object ItemUtils {
         return neededItems
     }
 
-    fun getRecipePrice(recipe: NeuRecipe): Double =
-        neededItems(recipe).map {
+    // TODO remove debugs once stack overflow is found
+    fun getRecipePrice(recipe: NeuRecipe): Double {
+        println("getRecipePrice ${recipe.title}")
+        return neededItems(recipe).map {
+            println("ingredient: ${it.key}")
             it.key.getPrice() * it.value
         }.sum()
+    }
 
 }

From 4314c0c6fe9fdf46c4aeddfae2c212b2bcfe3a49 Mon Sep 17 00:00:00 2001
From: Xupie <81492239+Xupie@users.noreply.github.com>
Date: Sat, 6 Jul 2024 11:40:56 +0300
Subject: [PATCH 060/721] Feature: Armor Stack Display (#1811)

Co-authored-by: Xupie <>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/combat/CombatConfig.java  |  5 +++
 .../features/combat/StackDisplayConfig.java   | 20 +++++++++
 .../features/combat/ArmorStackDisplay.kt      | 43 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/StackDisplayConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
index 456c3451f82f..b01647609efc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
@@ -24,6 +24,11 @@ public class CombatConfig {
     @Accordion
     public QuiverConfig quiverConfig = new QuiverConfig();
 
+    @Expose
+    @ConfigOption(name = "Armor Stack Display", desc = "")
+    @Accordion
+    public StackDisplayConfig stackDisplayConfig = new StackDisplayConfig();
+
     @Expose
     @ConfigOption(name = "Summonings", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/StackDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/StackDisplayConfig.java
new file mode 100644
index 000000000000..a955fec7a797
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/StackDisplayConfig.java
@@ -0,0 +1,20 @@
+package at.hannibal2.skyhanni.config.features.combat;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class StackDisplayConfig {
+    @Expose
+    @ConfigOption(name = "Enable", desc = "Display the number of stacks on armor pieces like Crimson, Terror, Aurora etc.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigLink(owner = StackDisplayConfig.class, field = "enabled")
+    public Position position = new Position(480, -210, 1.9f);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt
new file mode 100644
index 000000000000..942adc20b901
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt
@@ -0,0 +1,43 @@
+package at.hannibal2.skyhanni.features.combat
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.findMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.renderString
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ArmorStackDisplay {
+    private val config get() = SkyHanniMod.feature.combat.stackDisplayConfig
+    private var display = ""
+
+    /**
+     * REGEX-TEST: §66,171/4,422❤  §6§l10ᝐ§r     §a1,295§a❈ Defense     §b525/1,355✎ §3400ʬ
+     * REGEX-TEST: §66,171/4,422❤  §65ᝐ     §b-150 Mana (§6Wither Impact§b)     §b1,016/1,355✎ §3400ʬ
+     */
+    private val armorStackPattern by RepoPattern.pattern(
+        "combat.armorstack.actionbar",
+        " (?:§6|§6§l)(?<stack>\\d+[ᝐ⁑|҉Ѫ⚶])"
+    )
+
+    @SubscribeEvent
+    fun onActionBar(event: ActionBarUpdateEvent) {
+        if (!isEnabled()) return
+        val stacks = armorStackPattern.findMatcher(event.actionBar) {
+            "§6§l" + group("stack")
+        } ?: ""
+        display = stacks
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        config.position.renderString(display, posLabel = "Armor Stack Display")
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}

From 63c89c9f4b00228362473180ddf91461a340ca1f Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 6 Jul 2024 10:51:25 +0200
Subject: [PATCH 061/721] Improvement: Estimated Item Value support in Custom
 Wardrobe (#2080)

---
 .../features/inventory/wardrobe/CustomWardrobe.kt | 15 +++++++++++++--
 .../features/misc/items/EstimatedItemValue.kt     |  6 +++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
index 08abfa34dccc..d12e61d35657 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI.MAX_PAGES
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI.MAX_SLOT_PER_PAGE
+import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
 import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
@@ -41,7 +42,6 @@ import java.awt.Color
 import kotlin.math.min
 import kotlin.time.Duration.Companion.milliseconds
 
-// TODO add support for estimated item value
 @SkyHanniModule
 object CustomWardrobe {
 
@@ -89,9 +89,16 @@ object CustomWardrobe {
             loadingPos.renderRenderable(loadingRenderable, posLabel = guiName, addToGuiManager = false)
         }
 
+        GlStateManager.pushMatrix()
         GlStateManager.translate(0f, 0f, 100f)
+
         pos.renderRenderable(renderable, posLabel = guiName, addToGuiManager = false)
-        GlStateManager.translate(0f, 0f, -100f)
+
+        if (EstimatedItemValue.config.enabled) {
+            GlStateManager.translate(0f, 0f, 400f)
+            EstimatedItemValue.tryRendering()
+        }
+        GlStateManager.popMatrix()
         event.cancel()
     }
 
@@ -210,9 +217,13 @@ object CustomWardrobe {
                     renderable = Renderable.hoverTips(
                         renderable,
                         tips = toolTip,
+                        stack = stack,
                         condition = {
                             !config.showTooltipOnlyKeybind || config.tooltipKeybind.isKeyHeld()
                         },
+                        onHover = {
+                            if (EstimatedItemValue.config.enabled) EstimatedItemValue.updateItem(stack)
+                        },
                     )
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index dee0a6749b73..711b126a5fe6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -39,7 +39,7 @@ import kotlin.math.roundToLong
 @SkyHanniModule
 object EstimatedItemValue {
 
-    private val config get() = SkyHanniMod.feature.inventory.estimatedItemValues
+    val config get() = SkyHanniMod.feature.inventory.estimatedItemValues
     private var display = emptyList<List<Any>>()
     private val cache = mutableMapOf<ItemStack, List<List<Any>>>()
     private var lastToolTipTime = 0L
@@ -86,7 +86,7 @@ object EstimatedItemValue {
         renderedItems = 0
     }
 
-    private fun tryRendering() {
+    fun tryRendering() {
         currentlyShowing = checkCurrentlyVisible()
         if (!currentlyShowing) return
 
@@ -129,7 +129,7 @@ object EstimatedItemValue {
         updateItem(event.stack)
     }
 
-    private fun updateItem(item: ItemStack) {
+    fun updateItem(item: ItemStack) {
         cache[item]?.let {
             display = it
             lastToolTipTime = System.currentTimeMillis()

From 7c488b9741ca089e4419a5cc1ea44bad99ae6cea Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 10:52:25 +0200
Subject: [PATCH 062/721] resetting estimated item value cache on config update

---
 .../misc/EstimatedItemValueConfig.java         | 12 ++++++------
 .../features/misc/items/EstimatedItemValue.kt  | 18 ++++++++++++++----
 .../misc/items/EstimatedItemValueCalculator.kt | 11 ++++++-----
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
index dcbb65d15862..10d97ebfdb0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
@@ -41,7 +41,7 @@ public class EstimatedItemValueConfig {
     @Expose
     @ConfigOption(name = "Show Exact Price", desc = "Show the exact total price instead of the compact number.")
     @ConfigEditorBoolean
-    public boolean exactPrice = false;
+    public Property<Boolean> exactPrice = Property.of(false);
 
     @Expose
     @ConfigOption(name = "Show Armor Value", desc = "Show the value of the full armor set in the Wardrobe inventory.")
@@ -52,22 +52,22 @@ public class EstimatedItemValueConfig {
     @Expose
     @ConfigOption(name = "Ignore Helmet Skins", desc = "Ignore helmet Skins from the total value.")
     @ConfigEditorBoolean
-    public boolean ignoreHelmetSkins = false;
+    public Property<Boolean> ignoreHelmetSkins = Property.of(false);
 
     @Expose
     @ConfigOption(name = "Ignore Armor Dyes", desc = "Ignore Armor Dyes from the total value.")
     @ConfigEditorBoolean
-    public boolean ignoreArmorDyes = false;
+    public Property<Boolean> ignoreArmorDyes = Property.of(false);
 
     @Expose
     @ConfigOption(name = "Ignore Runes", desc = "Ignore Runes from the total value.")
     @ConfigEditorBoolean
-    public boolean ignoreRunes = false;
+    public Property<Boolean> ignoreRunes = Property.of(false);
 
     @Expose
     @ConfigOption(name = "Bazaar Price Source", desc = "Use Instant Buy or Buy Order.")
     @ConfigEditorDropdown
-    public BazaarPriceSource bazaarPriceSource = BazaarPriceSource.BUY_ORDER;
+    public Property<BazaarPriceSource> bazaarPriceSource = Property.of(BazaarPriceSource.BUY_ORDER);
 
     public enum BazaarPriceSource {
         INSTANT_BUY("Instant Buy"),
@@ -92,7 +92,7 @@ public String toString() {
             "This will drastically decrease the estimated value but might be correct when buying multiple low tier items and combining them."
     )
     @ConfigEditorBoolean
-    public boolean useAttributeComposite = false;
+    public Property<Boolean> useAttributeComposite = Property.of(false);
 
     @Expose
     @ConfigLink(owner = EstimatedItemValueConfig.class, field = "enabled")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 711b126a5fe6..21b86b6cffec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -15,7 +15,7 @@ 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.addAsSingletonList
-import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
+import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -116,8 +116,18 @@ object EstimatedItemValue {
 
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
-        config.enchantmentsCap.onToggle {
-            cache.clear()
+        with(config) {
+            ConditionalUtils.onToggle(
+                enchantmentsCap,
+                exactPrice,
+                ignoreHelmetSkins,
+                ignoreArmorDyes,
+                ignoreRunes,
+                bazaarPriceSource,
+                useAttributeComposite,
+            ) {
+                cache.clear()
+            }
         }
     }
 
@@ -206,7 +216,7 @@ object EstimatedItemValue {
 
         if (basePrice == totalPrice) return listOf()
 
-        val numberFormat = if (config.exactPrice) {
+        val numberFormat = if (config.exactPrice.get()) {
             totalPrice.roundToLong().addSeparators()
         } else {
             totalPrice.shortFormat()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 54f8f675eb55..bfc42659f90f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -51,6 +51,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasWoodSingularity
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
 import io.github.moulberry.notenoughupdates.recipes.Ingredient
+import io.github.notenoughupdates.moulconfig.observer.Property
 import net.minecraft.item.ItemStack
 import java.util.Locale
 
@@ -208,7 +209,7 @@ object EstimatedItemValueCalculator {
     private fun String.fixMending() = if (this == "MENDING") "VITALITY" else this
 
     private fun getPriceOrCompositePriceForAttribute(attributeName: String, level: Int): Double? {
-        val intRange = if (config.useAttributeComposite) 1..10 else level..level
+        val intRange = if (config.useAttributeComposite.get()) 1..10 else level..level
         return intRange.mapNotNull { lowerLevel ->
             "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()
                 ?.let { it / (1 shl lowerLevel) * (1 shl level).toDouble() }
@@ -480,18 +481,18 @@ object EstimatedItemValueCalculator {
         internalName: NEUInternalName,
         list: MutableList<String>,
         label: String,
-        shouldIgnorePrice: Boolean,
+        shouldIgnorePrice: Property<Boolean>,
     ): Double {
         val price = internalName.getPrice()
         val name = internalName.getNameOrRepoError()
         val displayName = name ?: "§c${internalName.asString()}"
-        val color = if (shouldIgnorePrice) "§7" else "§6"
+        val color = if (shouldIgnorePrice.get()) "§7" else "§6"
         list.add("§7$label: $displayName §7($color" + price.shortFormat() + "§7)")
         if (name == null) {
             list.add("   §8(Not yet in NEU Repo)")
         }
 
-        return if (shouldIgnorePrice) 0.0 else price
+        return if (shouldIgnorePrice.get()) 0.0 else price
     }
 
     private fun addEnrichment(stack: ItemStack, list: MutableList<String>): Double {
@@ -759,7 +760,7 @@ object EstimatedItemValueCalculator {
     private fun NEUInternalName.getPrice(): Double = getPriceOrNull() ?: -1.0
 
     private fun NEUInternalName.getPriceOrNull(): Double? {
-        val useSellPrice = config.bazaarPriceSource == EstimatedItemValueConfig.BazaarPriceSource.BUY_ORDER
+        val useSellPrice = config.bazaarPriceSource.get() == EstimatedItemValueConfig.BazaarPriceSource.BUY_ORDER
         return getPriceOrNull(useSellPrice)
     }
 }

From 9562d7a980b4d92d0bc8af8e2bf52cf398349d63 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 13:33:03 +0200
Subject: [PATCH 063/721] fixed stack overflow errors

---
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 3a60dd3f4441..79b57fcf7d6a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -423,13 +423,15 @@ object ItemUtils {
         return neededItems
     }
 
-    // TODO remove debugs once stack overflow is found
-    fun getRecipePrice(recipe: NeuRecipe): Double {
-        println("getRecipePrice ${recipe.title}")
-        return neededItems(recipe).map {
-            println("ingredient: ${it.key}")
-            it.key.getPrice() * it.value
+    fun getRecipePrice(recipe: NeuRecipe): Double =
+        neededItems(recipe).map {
+            // prevents stack overflow errors with ENDERMAN_MONSTER
+            if (it.key.endsWith("_MONSTER")) {
+                0.0
+            } else {
+                it.key.getPrice() * it.value
+            }
         }.sum()
-    }
+
 
 }

From 1ae710a4e6db9ee0ae3d4299e1b5967d72bb4e11 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 6 Jul 2024 13:39:31 +0200
Subject: [PATCH 064/721] Version 0.26 Beta 15

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 30 +++++++++++++++++++
 docs/FEATURES.md                              |  3 ++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 91b8f1a97a61..7e8c141bd3ce 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.14"
+version = "0.26.Beta.15"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 22be128be8c9..a0be0b30c02f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -17,6 +17,9 @@
 + Added In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
 + Added toggle for compacting Garden visitor summary messages. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2026)
++ Add Armor Stack Display. - Xupie (https://github.com/hannibal002/SkyHanni/pull/1811)
+    + Display the number of stacks on armor pieces like Crimson, Terror etc.
++ Add a line to Nukekebi Skull. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2148)
 
 #### Garden Features
 
@@ -166,6 +169,7 @@
 + Displays in /ff the fortune from bestiary and armor stats for enchantments and gemstones. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/1861)
 + Allow clicking on the Craftable! text in the shopping list to open the "view recipe" menu. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2075)
 + Rename Mushroom Tier to Mushroom Milestone in Mooshroom Cow Perk. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2159)
++ Add Fine Flour to the /ff menu. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
 
 #### Hoppity Event Improvements
 
@@ -185,6 +189,8 @@
 + Added Carnival lines to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1995)
 + Made the unclaimed eggs GUI clickable. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/1934)
 + Improve punctuation in the rabbit barn full/almost full messages. - Luna (https://github.com/hannibal002/SkyHanni/pull/2146)
++ Seperate option for Unclaimed Eggs warning while "Busy". - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2091)
+    + In the Rift, Kuudra, Dungeons, etc.
 
 #### Mining Improvements
 
@@ -225,6 +231,12 @@
 + Added Custom Wardrobe Slot Keybinds. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2105)
     + These function independently of NEU. NEU's keybinds will not work in the Custom Wardrobe.
 + Added an option to show item tooltips in the Custom Wardrobe only when holding a keybind. - Empa (https://github.com/hannibal002/SkyHanni/pull/2078)
++ Add support for Estimated Item Value to Custom Wardrobe. - Empa (https://github.com/hannibal002/SkyHanni/pull/2080)
++ Update Estimated Item Value calculation. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2180)
+    + Change attribute prices from composited to the lowest bin, and added an option to use composited prices again.
+    + Add Toxophilite.
+    + Add option to choose whether to use Bazaar buy order or instant buy prices.
+    + Calculating with tier 5 prices for Ferocious Mana, Hardened Mana, Mana Vampire and Strong Mana.
 
 #### Fishing Improvements
 
@@ -289,6 +301,7 @@
 + Fixed the order of Goblin Eggs in the Powder Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2138)
 + Fixed ore event sometimes getting stuck. - Empa (https://github.com/hannibal002/SkyHanni/pull/2115)
 + Fix incorrect powder costs and powder spent amounts being displayed for some HOTM perks. - Luna (https://github.com/hannibal002/SkyHanni/pull/2145)
++ Fix Powder Percentage Compatibility Issue with ColeWeight. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2186)
 
 #### Garden Fixes
 
@@ -306,6 +319,7 @@
 + Fixed cake buff in /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2034)
 + Fix an issue where the farming overtake ETA was being displayed as 60 times longer than it actually was. - Evhan_ (https://github.com/hannibal002/SkyHanni/pull/2158)
 + Fix overflow level up message being sent upon reaching crop milestone 46. - Luna (https://github.com/hannibal002/SkyHanni/pull/2161)
++ Fix Craftable! text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2183)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -329,6 +343,9 @@
 + Fix Time Tower "One charge will give" calculation not accounting for the player having the Mu Rabbit in their collection. - Luna (https://github.com/hannibal002/SkyHanni/pull/2165)
 + Fix typo in Chocolate Factory custom reminder config. - aphased (https://github.com/hannibal002/SkyHanni/pull/2169)
 + Fix the warning messages for the rabbit barn being full/almost full being reversed. - Luna (https://github.com/hannibal002/SkyHanni/pull/2146)
++ Allow seeing the unclaimed eggs GUI while "Busy". - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2091)
+    + In the Rift, Kuudra, Dungeons, etc.
++ Fix detection for supreme chocolate bar completion. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
 
 #### Custom Scoreboard Fixes
 
@@ -341,6 +358,9 @@
 + Fixed Unknown lines in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/2119)
 + Fixed broken event start time for upcoming events in the Custom Scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2113)
 + Fixed the New Year Event missing in the Custom Scoreboard.. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2122)
++ Fix Custom Scoreboard Error while voting. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2184)
++ Fix Custom Scoreboard Error during the Winter Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2192)
++ Fix Custom Scoreboard Error in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2176)
 
 #### Dungeon Fixes
 
@@ -390,6 +410,10 @@
 + Fixed incorrect stripping of some prefixes from non-Kuudra armor items in the estimated item value calculation. - Luna (https://github.com/hannibal002/SkyHanni/pull/2057)
     + This broke other items, like Hot Bait.
 + Fixed a Custom Wardrobe error when retrieving an item price. - j10a1n15, Empa (https://github.com/hannibal002/SkyHanni/pull/2123)
++ Double-Bit now works in reforge helper . - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2182)
++ Fix favorited pets not being detected. - Empa (https://github.com/hannibal002/SkyHanni/pull/2188)
++ Fix wrong item prices in Estimated Item Value when the craft price is higher than the NPC price and the item is soulbound. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2173)
+    + E.g. for Gillsplash (fishing equipment).
 
 #### Combat Fixes
 
@@ -400,6 +424,7 @@
 #### Chat Fixes
 
 + Fixed stash getting detected as a private message. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2060)
++ Fix Guild Rank formatting having an extra space. - Empa (https://github.com/hannibal002/SkyHanni/pull/2191)
 
 #### Misc Fixes
 
@@ -425,6 +450,8 @@
 + Fixed Hypixel detection on non-Hypixel servers. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2131)
 + Fix the skill progress ETA XP/hour being doubled. - Evhan_ (https://github.com/hannibal002/SkyHanni/pull/2163)
 + Fix launchers showing SkyHanni as LibNinePatch. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2147)
++ Fix "/worldedit right" setting the left position. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2179)
++ Fix a bug in the Hypixel detection. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2193)
 
 ### Technical Details
 
@@ -521,6 +548,9 @@
 + Add SkyblockStats. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
 + Add ReforgeAPI. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1437)
 + Switch some stuff from TabListUpdate to TabWidgetUpdate. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1240)
++ Add carnival mask to item category. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2189)
++ Fix pattern for Dragon Widget. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2190)
++ Changed the readme.md file. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2174)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index d26e272a43e3..ff97aaa77981 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -401,6 +401,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Show a line to the beacon. - hannibal2
     + Warning when enderman slayer beacon spawns - dragon99z
 + Highlight enderman slayer Nukekubi (Skulls) - dragon99z
++ Add a line to Nukekebi Skull. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2148)
 + Hide the name of the mobs you need to kill in order for the Slayer boss to spawn. Exclude mobs that are damaged,
   corrupted, runic or semi rare.
 + Cooldown when the Fire Pillar from the Blaze Slayer will kill you.
@@ -1263,6 +1264,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Click on an item to open /recipe.
     + Option to include items from inside sacks.
     + Option to include vanilla items.
++ Add Armor Stack Display. - Xupie (https://github.com/hannibal002/SkyHanni/pull/1811)
+    + Display the number of stacks on armor pieces like Crimson, Terror etc.
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 5548893f9d62..11ec22d5e556 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.14",
+    version = "0.26.Beta.15",
 )
 class SkyHanniMod {
 

From 6b76ba0b899b4a733955f9f18c8382de7d6b5b87 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:11:24 +0200
Subject: [PATCH 065/721] Internal: Bug Fix Label action (#2197)

---
 .github/workflows/label-bug-fix.yml | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/label-bug-fix.yml

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
new file mode 100644
index 000000000000..23ca3af815c8
--- /dev/null
+++ b/.github/workflows/label-bug-fix.yml
@@ -0,0 +1,40 @@
+name: "Bug Fix label"
+on:
+    pull_request:
+        types: [ opened,edited ]
+jobs:
+    assign-label:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: label
+                env:
+                    TITLE: ${{ github.event.pull_request.title }}
+                    LABEL: Bug Fix - Sooner than Very Soon
+                uses: actions/github-script@v7
+                with:
+                    script: |
+                        if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
+                            github.rest.issues.addLabels({
+                                issue_number: context.issue.number,
+                                owner: context.repo.owner,
+                                repo: context.repo.repo,
+                                labels: [process.env.LABEL]
+                            })
+                        }else{
+                            const {data} = await github.rest.issues.listLabelsOnIssue({
+                                issue_number: context.issue.number,
+                                owner: context.repo.owner,
+                                repo: context.repo.repo,
+                            })
+                            const filtered = data.filter(label => label.name == process.env.LABEL)
+                            if(filtered.length == 1){
+                                github.rest.issues.removeLabel({
+                                    issue_number: context.issue.number,
+                                    owner: context.repo.owner,
+                                    repo: context.repo.repo,
+                                    name: process.env.LABEL
+                                })
+                            }
+                        }
+            
+            

From 0cfd7cd8d9c235d96732162580529d36afd33c2e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:21:49 +0200
Subject: [PATCH 066/721] fix label bug fix

---
 .github/workflows/label-bug-fix.yml | 43 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index 23ca3af815c8..bfef0bd043a9 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -1,7 +1,7 @@
 name: "Bug Fix label"
 on:
     pull_request:
-        types: [ opened,edited ]
+        types: [ opened, edited ]
 jobs:
     assign-label:
         runs-on: ubuntu-latest
@@ -10,31 +10,30 @@ jobs:
                 env:
                     TITLE: ${{ github.event.pull_request.title }}
                     LABEL: Bug Fix - Sooner than Very Soon
+                    repoToken: "${{ secrets.GITHUB_TOKEN }}"
                 uses: actions/github-script@v7
                 with:
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
-                            github.rest.issues.addLabels({
-                                issue_number: context.issue.number,
-                                owner: context.repo.owner,
-                                repo: context.repo.repo,
-                                labels: [process.env.LABEL]
-                            })
+                          github.rest.issues.addLabels({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            labels: [process.env.LABEL]
+                          })
                         }else{
-                            const {data} = await github.rest.issues.listLabelsOnIssue({
-                                issue_number: context.issue.number,
-                                owner: context.repo.owner,
-                                repo: context.repo.repo,
+                          const {data} = await github.rest.issues.listLabelsOnIssue({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                          })
+                          const filtered = data.filter(label => label.name == process.env.LABEL)
+                          if(filtered.length == 1){
+                            github.rest.issues.removeLabel({
+                              issue_number: context.issue.number,
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              name: process.env.LABEL
                             })
-                            const filtered = data.filter(label => label.name == process.env.LABEL)
-                            if(filtered.length == 1){
-                                github.rest.issues.removeLabel({
-                                    issue_number: context.issue.number,
-                                    owner: context.repo.owner,
-                                    repo: context.repo.repo,
-                                    name: process.env.LABEL
-                                })
-                            }
+                          }
                         }
-            
-            

From 2efe94f52aa40b5bdb1f19d6a9c76a5592569fe7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:23:25 +0200
Subject: [PATCH 067/721] fix label bug fix v2

---
 .github/workflows/label-bug-fix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index bfef0bd043a9..fc5d2d154187 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -13,6 +13,7 @@ jobs:
                     repoToken: "${{ secrets.GITHUB_TOKEN }}"
                 uses: actions/github-script@v7
                 with:
+                    github-token: ${{ env.repoToken }}
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
                           github.rest.issues.addLabels({

From a9530b57b4223efbf79423d2cd918e9fb4b91f39 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:24:49 +0200
Subject: [PATCH 068/721] fix label bug fix v3

---
 .github/workflows/label-bug-fix.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index fc5d2d154187..fdee44e0894e 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -10,10 +10,9 @@ jobs:
                 env:
                     TITLE: ${{ github.event.pull_request.title }}
                     LABEL: Bug Fix - Sooner than Very Soon
-                    repoToken: "${{ secrets.GITHUB_TOKEN }}"
                 uses: actions/github-script@v7
                 with:
-                    github-token: ${{ env.repoToken }}
+                    github-token: ${{ secrets.MY_PAT }}
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
                           github.rest.issues.addLabels({

From 71bd53c97feb2b5a3278dea5dcffcbf949c70df6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:27:25 +0200
Subject: [PATCH 069/721] fix label bug fix v4

---
 .github/workflows/label-bug-fix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index fdee44e0894e..e7cce8853b88 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -12,7 +12,7 @@ jobs:
                     LABEL: Bug Fix - Sooner than Very Soon
                 uses: actions/github-script@v7
                 with:
-                    github-token: ${{ secrets.MY_PAT }}
+                    github-token: ${{ secrets.GITHUB_TOKEN }}
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
                           github.rest.issues.addLabels({

From 74e19f106e5e4e975fbed25b676c52eec9de1cb9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:28:33 +0200
Subject: [PATCH 070/721] fix label bug fix v5

---
 .github/workflows/label-bug-fix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index e7cce8853b88..20c3aec4f3d5 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -12,7 +12,7 @@ jobs:
                     LABEL: Bug Fix - Sooner than Very Soon
                 uses: actions/github-script@v7
                 with:
-                    github-token: ${{ secrets.GITHUB_TOKEN }}
+                    repoToken: "${{ secrets.GITHUB_TOKEN }}"
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
                           github.rest.issues.addLabels({

From 213baa31db08c82be7fb6f4ef7241cc9bbcf79a4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:40:15 +0200
Subject: [PATCH 071/721] fix label bug fix v6

---
 .github/workflows/label-bug-fix.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index 20c3aec4f3d5..f25633f754c6 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -1,7 +1,11 @@
 name: "Bug Fix label"
 on:
     pull_request:
-        types: [ opened, edited ]
+        types: [ opened, edited, labeled ]
+
+permissions:
+    issues: write
+
 jobs:
     assign-label:
         runs-on: ubuntu-latest
@@ -12,7 +16,7 @@ jobs:
                     LABEL: Bug Fix - Sooner than Very Soon
                 uses: actions/github-script@v7
                 with:
-                    repoToken: "${{ secrets.GITHUB_TOKEN }}"
+                    github-token: "${{ secrets.GITHUB_TOKEN }}"
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
                           github.rest.issues.addLabels({

From f945c8f37cb1a5fa2e307edf5496f67dc1b8416d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:44:56 +0200
Subject: [PATCH 072/721] fix label bug fix v7

---
 .github/workflows/label-bug-fix.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index f25633f754c6..f27fd8cf759b 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -3,8 +3,10 @@ on:
     pull_request:
         types: [ opened, edited, labeled ]
 
+
 permissions:
-    issues: write
+    contents: read
+    pull-requests: write
 
 jobs:
     assign-label:

From 061652b30c5cde5305e852958886131ef0831559 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:46:27 +0200
Subject: [PATCH 073/721] fix label bug fix v8

---
 .github/workflows/label-bug-fix.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index f27fd8cf759b..c66acb5ff7e2 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -4,13 +4,13 @@ on:
         types: [ opened, edited, labeled ]
 
 
-permissions:
-    contents: read
-    pull-requests: write
 
 jobs:
     assign-label:
         runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            pull-requests: write
         steps:
             -   name: label
                 env:

From 7ef7178b1f4c9523137cfa9ed90f5883ee6449b5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:47:25 +0200
Subject: [PATCH 074/721] fix label bug fix v9

---
 .github/workflows/label-bug-fix.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index c66acb5ff7e2..71e00d27be83 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -3,14 +3,11 @@ on:
     pull_request:
         types: [ opened, edited, labeled ]
 
-
-
 jobs:
     assign-label:
         runs-on: ubuntu-latest
         permissions:
-            contents: read
-            pull-requests: write
+            issues: write
         steps:
             -   name: label
                 env:

From 605d4c676fb126573e3267c6d45d3aee1860ba6d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:48:42 +0200
Subject: [PATCH 075/721] remove label bug fix for now

---
 .github/workflows/label-bug-fix.yml | 42 -----------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 .github/workflows/label-bug-fix.yml

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
deleted file mode 100644
index 71e00d27be83..000000000000
--- a/.github/workflows/label-bug-fix.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: "Bug Fix label"
-on:
-    pull_request:
-        types: [ opened, edited, labeled ]
-
-jobs:
-    assign-label:
-        runs-on: ubuntu-latest
-        permissions:
-            issues: write
-        steps:
-            -   name: label
-                env:
-                    TITLE: ${{ github.event.pull_request.title }}
-                    LABEL: Bug Fix - Sooner than Very Soon
-                uses: actions/github-script@v7
-                with:
-                    github-token: "${{ secrets.GITHUB_TOKEN }}"
-                    script: |
-                        if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
-                          github.rest.issues.addLabels({
-                            issue_number: context.issue.number,
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            labels: [process.env.LABEL]
-                          })
-                        }else{
-                          const {data} = await github.rest.issues.listLabelsOnIssue({
-                            issue_number: context.issue.number,
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                          })
-                          const filtered = data.filter(label => label.name == process.env.LABEL)
-                          if(filtered.length == 1){
-                            github.rest.issues.removeLabel({
-                              issue_number: context.issue.number,
-                              owner: context.repo.owner,
-                              repo: context.repo.repo,
-                              name: process.env.LABEL
-                            })
-                          }
-                        }

From bcbdf74c9563c555c767dc6ef26558152810e645 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:24:26 +0200
Subject: [PATCH 076/721] Fix: Stackoverflow for getPrice (#2199)

---
 .../java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 10 ++--------
 .../java/at/hannibal2/skyhanni/utils/NEUItems.kt  | 15 +++++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 79b57fcf7d6a..b662e10d434c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -423,15 +423,9 @@ object ItemUtils {
         return neededItems
     }
 
-    fun getRecipePrice(recipe: NeuRecipe): Double =
+    fun getRecipePrice(recipe: NeuRecipe, pastRecipes: List<NeuRecipe> = emptyList()): Double =
         neededItems(recipe).map {
-            // prevents stack overflow errors with ENDERMAN_MONSTER
-            if (it.key.endsWith("_MONSTER")) {
-                0.0
-            } else {
-                it.key.getPrice() * it.value
-            }
+            it.key.getPrice(pastRecipes = pastRecipes) * it.value
         }.sum()
 
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 75d394631fd8..3fc54009e739 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -160,7 +160,8 @@ object NEUItems {
     fun getInternalNameOrNull(nbt: NBTTagCompound): NEUInternalName? =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()?.asInternalName()
 
-    fun NEUInternalName.getPrice(useSellPrice: Boolean = false) = getPriceOrNull(useSellPrice) ?: -1.0
+    fun NEUInternalName.getPrice(useSellPrice: Boolean = false, pastRecipes: List<NeuRecipe> = emptyList()) =
+        getPriceOrNull(useSellPrice, pastRecipes) ?: -1.0
 
     fun NEUInternalName.getNpcPrice() = getNpcPriceOrNull() ?: -1.0
 
@@ -174,7 +175,7 @@ object NEUItems {
     fun transHypixelNameToInternalName(hypixelId: String): NEUInternalName =
         manager.auctionManager.transformHypixelBazaarToNEUItemId(hypixelId).asInternalName()
 
-    fun NEUInternalName.getPriceOrNull(useSellPrice: Boolean = false): Double? {
+    fun NEUInternalName.getPriceOrNull(useSellPrice: Boolean = false, pastRecipes: List<NeuRecipe> = emptyList()): Double? {
         if (this == NEUInternalName.WISP_POTION) {
             return 20_000.0
         }
@@ -194,13 +195,15 @@ object NEUItems {
             return 7.0 // NPC price
         }
 
-        return getNpcPriceOrNull() ?: getRawCraftCostOrNull()
+        return getNpcPriceOrNull() ?: getRawCraftCostOrNull(pastRecipes)
     }
 
     // If NEU fails to calculate the craft costs, we calculate it ourself.
-    fun NEUInternalName.getRawCraftCostOrNull(): Double? = manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
-        getRecipes(this).map { ItemUtils.getRecipePrice(it) }.minOrNull()
-    }
+    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
+        manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
+            getRecipes(this).filter { it !in pastRecipes }
+                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }.minOrNull()
+        }
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
         .withKnownInternalName(asString())

From 63fe8d8986954ab8c274018e069957886503e5e6 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:25:13 +0200
Subject: [PATCH 077/721] Fix: Wardrobe Keybinds (#2198)

---
 src/main/java/at/hannibal2/skyhanni/data/GuiData.kt         | 6 +++---
 .../features/inventory/wardrobe/CustomWardrobeKeybinds.kt   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
index a96574a2b53d..38ac99d1b3f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
@@ -39,9 +39,9 @@ object GuiData {
         if (preDrawEventCancelled) event.isCanceled = true
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGH)
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onGuiKeyPress(event: GuiScreenEvent.KeyboardInputEvent.Pre) {
-        val keys = Minecraft.getMinecraft().gameSettings.let {
+        val allowedKeys = Minecraft.getMinecraft().gameSettings.let {
             listOf(
                 Keyboard.KEY_ESCAPE,
                 it.keyBindInventory.keyCode,
@@ -49,7 +49,7 @@ object GuiData {
                 it.keyBindFullscreen.keyCode,
             )
         }
-        if (keys.any { it.isKeyHeld() }) return
+        if (allowedKeys.any { it.isKeyHeld() }) return
 
         if (CustomWardrobeKeybinds.allowKeyboardClick()) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
index 2e3716cb2554..502255afae93 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.GuiKeyPressEvent
 import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobe.clickSlot
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -33,8 +34,8 @@ object CustomWardrobeKeybinds {
         if (!isEnabled()) return
         val slots = WardrobeAPI.slots.filter { it.isInCurrentPage() }
 
-        for ((key, index) in keybinds.withIndex().map { it.value to it.index }) {
-            if (!key.isKeyClicked()) continue
+        for ((index, key) in keybinds.withIndex()) {
+            if (!key.isKeyHeld()) continue
             if (lastClick.passedSince() < 200.milliseconds) break
             val slot = slots.getOrNull(index) ?: continue
 

From 4c300de2cf0a33a737a4c4a8291d61bb99fc1074 Mon Sep 17 00:00:00 2001
From: Stella <stellaarnott1@gmail.com>
Date: Sun, 7 Jul 2024 02:26:23 -0700
Subject: [PATCH 078/721] Fix: Adds new mayor perks to scoreboard (#2187)

---
 .../java/at/hannibal2/skyhanni/data/Mayors.kt | 113 +++++++++++++++---
 1 file changed, 94 insertions(+), 19 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 7ff74aeda43e..b2ac98b3289f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -11,26 +11,92 @@ enum class Mayor(
     val color: String,
     vararg val perks: Perk,
 ) {
-    AATROX("Aatrox", "§3", Perk.SLASHED_PRICING, Perk.SLAYER_XP_BUFF, Perk.PATHFINDER),
-    COLE("Cole", "§e", Perk.PROSPECTION, Perk.MINING_XP_BUFF, Perk.MINING_FIESTA),
-    DIANA("Diana", "§2", Perk.LUCKY, Perk.MYTHOLOGICAL_RITUAL, Perk.PET_XP_BUFF),
-    DIAZ("Diaz", "§6", Perk.BARRIER_STREET, Perk.SHOPPING_SPREE),
-    FINNEGAN("Finnegan", "§c", Perk.FARMING_SIMULATOR, Perk.PELT_POCALYPSE, Perk.GOATED),
+    AATROX(
+        "Aatrox",
+        "§3",
+        Perk.SLASHED_PRICING,
+        Perk.SLAYER_XP_BUFF,
+        Perk.PATHFINDER
+    ),
+    COLE(
+        "Cole",
+        "§e",
+        Perk.PROSPECTION,
+        Perk.MINING_XP_BUFF,
+        Perk.MINING_FIESTA,
+        Perk.MOLTEN_FORGE
+    ),
+    DIANA(
+        "Diana",
+        "§2",
+        Perk.LUCKY,
+        Perk.MYTHOLOGICAL_RITUAL,
+        Perk.PET_XP_BUFF,
+        Perk.SHARING_IS_CARING
+    ),
+    DIAZ(
+        "Diaz",
+        "§6",
+        Perk.VOLUME_TRADING,
+        Perk.SHOPPING_SPREE,
+        Perk.STOCK_EXCHANGE,
+        Perk.LONG_TERM_INVESTMENT
+    ),
+    FINNEGAN(
+        "Finnegan",
+        "§c",
+        Perk.FARMING_SIMULATOR,
+        Perk.PELT_POCALYPSE,
+        Perk.GOATED,
+        Perk.BLOOMING_BUSINESS
+    ),
     FOXY(
         "Foxy",
         "§d",
-        Perk.SWEET_TOOTH,
-        Perk.BENEVOLENCE,
+        Perk.SWEET_BENEVOLENCE,
+        Perk.A_TIME_FOR_GIVING,
+        Perk.CHIVALROUS_CARNIVAL,
         Perk.EXTRA_EVENT_MINING,
         Perk.EXTRA_EVENT_FISHING,
-        Perk.EXTRA_EVENT_SPOOKY
+        Perk.EXTRA_EVENT_SPOOKY,
+    ),
+    MARINA(
+        "Marina",
+        "§b",
+        Perk.FISHING_XP_BUFF,
+        Perk.LUCK_OF_THE_SEA,
+        Perk.FISHING_FESTIVAL,
+        Perk.DOUBLE_TROUBLE
+    ),
+    PAUL(
+        "Paul",
+        "§c",
+        Perk.MARAUDER,
+        Perk.EZPZ,
+        Perk.BENEDICTION
     ),
-    MARINA("Marina", "§b", Perk.FISHING_XP_BUFF, Perk.LUCK_OF_THE_SEA, Perk.FISHING_FESTIVAL),
-    PAUL("Paul", "§c", Perk.MARAUDER, Perk.EZPZ, Perk.BENEDICTION),
 
-    SCORPIUS("Scorpius", "§d", Perk.BRIBE, Perk.DARKER_AUCTIONS),
-    JERRY("Jerry", "§d", Perk.PERKPOCALYPSE, Perk.STATSPOCALYPSE, Perk.JERRYPOCALYPSE),
-    DERPY("Derpy", "§d", Perk.TURBO_MINIONS, Perk.AH_CLOSED, Perk.DOUBLE_MOBS_HP, Perk.MOAR_SKILLZ),
+    SCORPIUS(
+        "Scorpius",
+        "§d",
+        Perk.BRIBE,
+        Perk.DARKER_AUCTIONS
+    ),
+    JERRY(
+        "Jerry",
+        "§d",
+        Perk.PERKPOCALYPSE,
+        Perk.STATSPOCALYPSE,
+        Perk.JERRYPOCALYPSE
+    ),
+    DERPY(
+        "Derpy",
+        "§d",
+        Perk.TURBO_MINIONS,
+        Perk.AH_TAX,
+        Perk.DOUBLE_MOBS_HP,
+        Perk.MOAR_SKILLZ
+    ),
 
     UNKNOWN("Unknown", "§c"),
     DISABLED("§cDisabled", "§7"),
@@ -62,7 +128,7 @@ enum class Mayor(
                     "mayor name not in Mayor enum",
                     "name" to name,
                     "perksJson" to perksJson,
-                    betaOnly = true
+                    betaOnly = true,
                 )
                 return null
             }
@@ -87,7 +153,7 @@ enum class Mayor(
             val foxyExtraEventPairs = mapOf(
                 "Spooky Festival" to "Extra Event (Spooky)",
                 "Mining Fiesta" to "Extra Event (Mining)",
-                "Fishing Festival" to "Extra Event (Fishing)"
+                "Fishing Festival" to "Extra Event (Fishing)",
             )
 
             foxyExtraEventPattern.matchMatcher(this.description) {
@@ -108,24 +174,30 @@ enum class Perk(val perkName: String) {
     PROSPECTION("Prospection"),
     MINING_XP_BUFF("Mining XP Buff"),
     MINING_FIESTA("Mining Fiesta"),
+    MOLTEN_FORGE("Molten Forge"),
 
     // Diana
     LUCKY("Lucky!"),
     MYTHOLOGICAL_RITUAL("Mythological Ritual"),
     PET_XP_BUFF("Pet XP Buff"),
+    SHARING_IS_CARING("Sharing is Caring"),
 
     // Diaz
-    BARRIER_STREET("Barrier Street"),
     SHOPPING_SPREE("Shopping Spree"),
+    VOLUME_TRADING("Volume Trading"),
+    STOCK_EXCHANGE("Stock Exchange"),
+    LONG_TERM_INVESTMENT("Long Term Investment"),
 
     // Finnegan
     FARMING_SIMULATOR("Farming Simulator"),
     PELT_POCALYPSE("Pelt-pocalypse"),
     GOATED("GOATed"),
+    BLOOMING_BUSINESS("Blooming Business"),
 
     // Foxy
-    SWEET_TOOTH("Sweet Tooth"),
-    BENEVOLENCE("Benevolence"),
+    SWEET_BENEVOLENCE("Sweet Benevolence"),
+    A_TIME_FOR_GIVING("A Time for Giving"),
+    CHIVALROUS_CARNIVAL("Chivalrous Carnival"),
     EXTRA_EVENT_MINING("Extra Event (Mining)"),
     EXTRA_EVENT_FISHING("Extra Event (Fishing)"),
     EXTRA_EVENT_SPOOKY("Extra Event (Spooky)"),
@@ -134,6 +206,7 @@ enum class Perk(val perkName: String) {
     FISHING_XP_BUFF("Fishing XP Buff"),
     LUCK_OF_THE_SEA("Luck of the Sea 2.0"),
     FISHING_FESTIVAL("Fishing Festival"),
+    DOUBLE_TROUBLE("Double Trouble"),
 
     // Paul
     MARAUDER("Marauder"),
@@ -151,7 +224,9 @@ enum class Perk(val perkName: String) {
 
     // Derpy
     TURBO_MINIONS("TURBO MINIONS!!!"),
-    AH_CLOSED("AH CLOSED!!!"),
+    AH_TAX("MOAR TAX!!!"),
+
+    // I don't know what the perk is actually gonna be named
     DOUBLE_MOBS_HP("DOUBLE MOBS HP!!!"),
     MOAR_SKILLZ("MOAR SKILLZ!!!"),
     ;

From 3d691842dd3a937369725a87bcf5d91546168491 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 7 Jul 2024 05:28:16 -0400
Subject: [PATCH 079/721] Improvement: Add Config option for Time Tower in
 "Best Upgrade" (#2142)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../ChocolateUpgradeWarningsConfig.java       |  6 +++++
 .../storage/ProfileSpecificStorage.java       |  1 +
 .../ChocolateFactoryDataLoader.kt             | 23 ++++++++++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateUpgradeWarningsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateUpgradeWarningsConfig.java
index 113ac73623c1..6b39f7f49107 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateUpgradeWarningsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateUpgradeWarningsConfig.java
@@ -5,6 +5,7 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
 
 public class ChocolateUpgradeWarningsConfig {
     @Expose
@@ -26,4 +27,9 @@ public class ChocolateUpgradeWarningsConfig {
     )
     @ConfigEditorSlider(minValue = 0, maxValue = 10, minStep = 0.25f)
     public float timeBetweenWarnings = 1;
+
+    @Expose
+    @ConfigOption(name = "Include Time Tower", desc = "Include Time Tower in the list of upgrades to be considered 'next best'.")
+    @ConfigEditorBoolean
+    public Property<Boolean> upgradeWarningTimeTower = Property.of(false);
 }
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 8cd2c6e3b3e3..b49a9c612fca 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -28,6 +28,7 @@
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker;
 import at.hannibal2.skyhanni.features.garden.pests.VinylType;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryUpgrade;
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
index 28447b1df980..5dd8a52d38c7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
@@ -7,7 +7,9 @@ import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI.specialRabbitTextures
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
@@ -148,6 +150,18 @@ object ChocolateFactoryDataLoader {
         ConditionalUtils.onToggle(soundProperty) {
             ChocolateFactoryAPI.warningSound = SoundUtils.createSound(soundProperty.get(), 1f)
         }
+
+        config.chocolateUpgradeWarnings.upgradeWarningTimeTower.whenChanged { _, _ ->
+            ChocolateFactoryAPI.factoryUpgrades.takeIf { it.isNotEmpty() }?.let {
+                findBestUpgrades(it)
+            } ?: run {
+                ChatUtils.clickableChat(
+                    "Could not determine your current statistics to get next upgrade. Open CF to fix this!",
+                    onClick = { HypixelCommands.chocolateFactory() },
+                    "§eClick to run /cf!"
+                )
+            }
+        }
     }
 
     private fun clearData() {
@@ -427,9 +441,12 @@ object ChocolateFactoryDataLoader {
     private fun findBestUpgrades(list: List<ChocolateFactoryUpgrade>) {
         val profileStorage = profileStorage ?: return
 
-        // removing time tower here as people like to determine when to buy it themselves
-        val notMaxed = list.filter {
-            !it.isMaxed && it.slotIndex != ChocolateFactoryAPI.timeTowerIndex && it.effectiveCost != null
+        val ttFiltered = list.filter {
+            config.chocolateUpgradeWarnings.upgradeWarningTimeTower.get() || it.slotIndex != ChocolateFactoryAPI.timeTowerIndex
+        }
+
+        val notMaxed = ttFiltered.filter {
+            !it.isMaxed && it.effectiveCost != null
         }
 
         val bestUpgrade = notMaxed.minByOrNull { it.effectiveCost ?: Double.MAX_VALUE }

From fee966a6da7be441d54f76566fe8ba517fc9b4cb Mon Sep 17 00:00:00 2001
From: sayomaki <sayomayomaki@gmail.com>
Date: Sun, 7 Jul 2024 17:30:05 +0800
Subject: [PATCH 080/721] Backend: Move hoppity rabbit chat patterns to eggs
 manager (#2144)

---
 .../features/event/hoppity/HoppityEggsManager.kt    |  6 ++++++
 .../chocolatefactory/ChocolateFactoryBarnManager.kt | 13 ++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 8a60516b3e5f..37679bdbfe17 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -70,6 +70,12 @@ object HoppityEggsManager {
         "rabbit.found.new",
         "§d§lNEW RABBIT! (?:((§6\\+(?<chocolate>.*) Chocolate §7and )?§6\\+(?<perSecond>.*)x Chocolate §7per second!)|(?<other>.*))",
     )
+
+    val duplicateRabbitFound by ChocolateFactoryAPI.patternGroup.pattern(
+        "rabbit.duplicate",
+        "§7§lDUPLICATE RABBIT! §6\\+(?<amount>[\\d,]+) Chocolate"
+    )
+
     private val noEggsLeftPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.noneleft",
         "§cThere are no hidden Chocolate Rabbit Eggs nearby! Try again later!",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 62a156ca8d52..82cd173393ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -23,15 +23,6 @@ object ChocolateFactoryBarnManager {
     private val hoppityConfig get() = HoppityEggsManager.config
     private val profileStorage get() = ChocolateFactoryAPI.profileStorage
 
-    private val newRabbitPattern by ChocolateFactoryAPI.patternGroup.pattern(
-        "rabbit.new",
-        "§d§lNEW RABBIT! §6\\+\\d+ Chocolate §7and §6\\+0.\\d+x Chocolate §7per second!"
-    )
-    private val rabbitDuplicatePattern by ChocolateFactoryAPI.patternGroup.pattern(
-        "rabbit.duplicate",
-        "§7§lDUPLICATE RABBIT! §6\\+(?<amount>[\\d,]+) Chocolate"
-    )
-
     /**
      * REGEX-TEST: §c§lBARN FULL! §fOlivette §7got §ccrushed§7! §6+290,241 Chocolate
      */
@@ -47,14 +38,14 @@ object ChocolateFactoryBarnManager {
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
-        newRabbitPattern.matchMatcher(event.message) {
+        HoppityEggsManager.newRabbitFound.matchMatcher(event.message) {
             val profileStorage = profileStorage ?: return
             profileStorage.currentRabbits += 1
             trySendBarnFullMessage()
             HoppityEggsManager.shareWaypointPrompt()
         }
 
-        rabbitDuplicatePattern.matchMatcher(event.message) {
+        HoppityEggsManager.duplicateRabbitFound.matchMatcher(event.message) {
             HoppityEggsManager.shareWaypointPrompt()
             val amount = group("amount").formatLong()
             if (config.showDuplicateTime && !hoppityConfig.compactChat) {

From c4b42412d844bb943144fd17f3a4d134c8ed5eea Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:35:03 +0200
Subject: [PATCH 081/721] Backend: Fix RepoPattern localeLoading (#2069)

---
 .../skyhanni/utils/repopatterns/RepoPatternManager.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
index 8d26cf46afc5..0bbcda9cfe94 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -78,7 +78,7 @@ object RepoPatternManager {
             }
         }
 
-    val localLoading: Boolean get() = config.forceLocal.get() || (!insideTest && PlatformUtils.isDevEnvironment)
+    val localLoading: Boolean get() = config.forceLocal.get() xor (!insideTest && PlatformUtils.isDevEnvironment)
 
     private val logger = LogManager.getLogger("SkyHanni")
 
@@ -309,7 +309,7 @@ object RepoPatternManager {
      * @return returns any pattern on the [prefix] key space (including list or any other complex structure, but as a simple pattern
      * */
     internal fun getUnusedPatterns(prefix: String): List<Pattern> {
-        if (config.forceLocal.get()) return emptyList()
+        if (localLoading) return emptyList()
         try {
             verifyKeyShape(prefix)
         } catch (e: IllegalArgumentException) {

From 6b3e2d7b0cf478deb2d8f5876a402c01508a5d43 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:39:05 +0200
Subject: [PATCH 082/721] Backend: Mobdetection First Seen Event (#2096)

---
 .../at/hannibal2/skyhanni/data/mob/MobData.kt   |  9 +++++++++
 .../hannibal2/skyhanni/data/mob/MobDetection.kt | 17 +++++++++++++++--
 .../at/hannibal2/skyhanni/events/MobEvent.kt    |  9 +++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
index 4eb79d6de971..f955384c5f4e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
@@ -28,6 +28,8 @@ object MobData {
 
     val entityToMob = mutableMapOf<EntityLivingBase, Mob>()
 
+    internal val notSeenMobs = MobSet()
+
     internal val currentEntityLiving = mutableSetOf<EntityLivingBase>()
     internal val previousEntityLiving = mutableSetOf<EntityLivingBase>()
 
@@ -91,12 +93,19 @@ object MobData {
     fun onMobEventSpawn(event: MobEvent.Spawn) {
         entityToMob.putAll(event.mob.makeEntityToMobAssociation())
         currentMobs.add(event.mob)
+        notSeenMobs.add(event.mob)
     }
 
     @SubscribeEvent
     fun onMobEventDeSpawn(event: MobEvent.DeSpawn) {
         event.mob.fullEntityList().forEach { entityToMob.remove(it) }
         currentMobs.remove(event.mob)
+        notSeenMobs.remove(event.mob)
+    }
+
+    @SubscribeEvent
+    fun onMobFirstSeen(event: MobEvent.FirstSeen) {
+        notSeenMobs.remove(event.mob)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 82aec2fc6bcc..b7cc4dfaa13a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -35,7 +35,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean
 
-
 @SkyHanniModule
 object MobDetection {
 
@@ -72,7 +71,6 @@ object MobDetection {
             shouldClear.set(false)
         }
         if (!LorenzUtils.inSkyBlock) return
-        if (event.isMod(2)) return
 
         makeEntityReferenceUpdate()
 
@@ -95,6 +93,8 @@ object MobDetection {
         (MobData.currentEntityLiving - MobData.previousEntityLiving).forEach { addRetry(it) }  // Spawn
         (MobData.previousEntityLiving - MobData.currentEntityLiving).forEach { entityDeSpawn(it) } // Despawn
 
+        MobData.notSeenMobs.removeIf(::canBeSeen)
+
         if (forceReset) {
             mobDetectionReset() // Ensure that all mobs are cleared 100%
         }
@@ -120,6 +120,19 @@ object MobDetection {
     /** @return always true */
     private fun mobDetectionError(string: String) = MobData.logger.log(string).let { true }
 
+    private fun canBeSeen(mob: Mob): Boolean {
+        val isVisible = !mob.isInvisible() && mob.canBeSeen()
+        if (isVisible) when (mob.mobType) {
+            Mob.Type.PLAYER -> MobEvent.FirstSeen.Player(mob)
+            Mob.Type.SUMMON -> MobEvent.FirstSeen.Summon(mob)
+            Mob.Type.SPECIAL -> MobEvent.FirstSeen.Special(mob)
+            Mob.Type.PROJECTILE -> MobEvent.FirstSeen.Projectile(mob)
+            Mob.Type.DISPLAY_NPC -> MobEvent.FirstSeen.DisplayNPC(mob)
+            Mob.Type.BASIC, Mob.Type.DUNGEON, Mob.Type.BOSS, Mob.Type.SLAYER -> MobEvent.FirstSeen.SkyblockMob(mob)
+        }
+        return isVisible
+    }
+
     /**@return a false means that it should try again (later)*/
     private fun entitySpawn(entity: EntityLivingBase, roughType: Mob.Type): Boolean {
         when (roughType) {
diff --git a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
index 34725c5460d4..07990ff222c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
@@ -20,4 +20,13 @@ open class MobEvent(val mob: Mob) : LorenzEvent() {
         class Special(mob: Mob) : DeSpawn(mob)
         class Projectile(mob: Mob) : DeSpawn(mob)
     }
+
+    open class FirstSeen(mob: Mob) : MobEvent(mob) {
+        class SkyblockMob(mob: Mob) : FirstSeen(mob)
+        class Summon(mob: Mob) : FirstSeen(mob)
+        class Player(mob: Mob) : FirstSeen(mob)
+        class DisplayNPC(mob: Mob) : FirstSeen(mob)
+        class Special(mob: Mob) : FirstSeen(mob)
+        class Projectile(mob: Mob) : FirstSeen(mob)
+    }
 }

From 6c1c000ba4a27e30a4c141b9988b5204d1ccad2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:44:37 +0200
Subject: [PATCH 083/721] Hoppity and Chocolate being less annoying (#2196)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../event/hoppity/HoppityEggsManager.kt       |  3 ++-
 .../features/event/hoppity/HoppityNpc.kt      |  4 ++--
 .../ChocolateFactoryBarnManager.kt            | 21 ++++++++++++-------
 .../ChocolateFactoryDataLoader.kt             |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 37679bdbfe17..5e51a7693a37 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
+import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
@@ -218,7 +219,7 @@ object HoppityEggsManager {
     private fun warn() {
         if (!config.warnUnclaimedEggs) return
         if (ReminderUtils.isBusy() && !config.warnWhileBusy) return
-        if (lastWarnTime.passedSince() < 30.seconds) return
+        if (lastWarnTime.passedSince() < 1.minutes) return
 
         lastWarnTime = now()
         val amount = HoppityEggType.entries.size
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index 2ec98ccf673b..877e161ef64f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Duration.Companion.minutes
 
 @SkyHanniModule
 object HoppityNpc {
@@ -51,7 +51,7 @@ object HoppityNpc {
         if (ReminderUtils.isBusy()) return
         if (hoppityYearOpened == SkyBlockTime.now().year) return
         if (!ChocolateFactoryAPI.isHoppityEvent()) return
-        if (lastReminderSent.passedSince() <= 30.seconds) return
+        if (lastReminderSent.passedSince() <= 2.minutes) return
 
         ChatUtils.clickableChat(
             "New rabbits are available at §aHoppity's Shop§e! §c(Click to disable this reminder)",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 82cd173393ac..31762ab2eb91 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsCompactChat
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager
@@ -10,11 +11,9 @@ import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object ChocolateFactoryBarnManager {
@@ -28,11 +27,11 @@ object ChocolateFactoryBarnManager {
      */
     private val rabbitCrashedPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.crushed",
-        "§c§lBARN FULL! §f\\D+ §7got §ccrushed§7! §6\\+(?<amount>[\\d,]+) Chocolate"
+        "§c§lBARN FULL! §f\\D+ §7got §ccrushed§7! §6\\+(?<amount>[\\d,]+) Chocolate",
     )
 
     var barnFull = false
-    private var lastBarnFullWarning = SimpleTimeMark.farPast()
+    private var sentBarnFullWarning = false
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
@@ -41,7 +40,7 @@ object ChocolateFactoryBarnManager {
         HoppityEggsManager.newRabbitFound.matchMatcher(event.message) {
             val profileStorage = profileStorage ?: return
             profileStorage.currentRabbits += 1
-            trySendBarnFullMessage()
+            trySendBarnFullMessage(inventory = false)
             HoppityEggsManager.shareWaypointPrompt()
         }
 
@@ -64,7 +63,12 @@ object ChocolateFactoryBarnManager {
         }
     }
 
-    fun trySendBarnFullMessage() {
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        sentBarnFullWarning = false
+    }
+
+    fun trySendBarnFullMessage(inventory: Boolean) {
         if (!ChocolateFactoryAPI.isEnabled()) return
 
         if (config.barnCapacityThreshold <= 0) {
@@ -79,7 +83,9 @@ object ChocolateFactoryBarnManager {
         barnFull = remainingSpace <= config.barnCapacityThreshold
         if (!barnFull) return
 
-        if (lastBarnFullWarning.passedSince() < 30.seconds) return
+        if (inventory && sentBarnFullWarning) return
+
+        sentBarnFullWarning = true
 
         if (profileStorage.maxRabbits == -1) {
             ChatUtils.clickableChat(
@@ -99,7 +105,6 @@ object ChocolateFactoryBarnManager {
             "§eClick to run /cf!",
         )
         SoundUtils.playBeepSound()
-        lastBarnFullWarning = SimpleTimeMark.now()
     }
 
     fun barnStatus(): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
index 5dd8a52d38c7..3724dbc53576 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
@@ -279,7 +279,7 @@ object ChocolateFactoryDataLoader {
         item.getLore().matchFirst(barnAmountPattern) {
             profileStorage.currentRabbits = group("rabbits").formatInt()
             profileStorage.maxRabbits = group("max").formatInt()
-            ChocolateFactoryBarnManager.trySendBarnFullMessage()
+            ChocolateFactoryBarnManager.trySendBarnFullMessage(inventory = true)
         }
     }
 

From ecb0e3e7cca8dffcdfd187499fb4beb1bdc5f0bf Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 7 Jul 2024 16:06:39 +0200
Subject: [PATCH 084/721] Version 0.26 Beta 16

---
 build.gradle.kts                                   |  2 +-
 docs/CHANGELOG.md                                  | 11 ++++++++++-
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7e8c141bd3ce..a25a71a117d6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.15"
+version = "0.26.Beta.16"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a0be0b30c02f..db47ad29ed3d 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -189,8 +189,10 @@
 + Added Carnival lines to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1995)
 + Made the unclaimed eggs GUI clickable. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/1934)
 + Improve punctuation in the rabbit barn full/almost full messages. - Luna (https://github.com/hannibal002/SkyHanni/pull/2146)
-+ Seperate option for Unclaimed Eggs warning while "Busy". - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2091)
++ Separate option for Unclaimed Eggs warning while "Busy". - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2091)
     + In the Rift, Kuudra, Dungeons, etc.
++ Hoppity and Chocolate reminders/warnings now appear less frequently and are less intrusive. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2196)
++ Add a configuration option to allow Time Tower to appear in the Chocolate Factory next upgrade list. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2142)
 
 #### Mining Improvements
 
@@ -361,6 +363,7 @@
 + Fix Custom Scoreboard Error while voting. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2184)
 + Fix Custom Scoreboard Error during the Winter Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2192)
 + Fix Custom Scoreboard Error in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2176)
++ Fix New Mayor perks not showing up on the Scoreboard. - Stella (https://github.com/hannibal002/SkyHanni/pull/2187)
 
 #### Dungeon Fixes
 
@@ -414,6 +417,7 @@
 + Fix favorited pets not being detected. - Empa (https://github.com/hannibal002/SkyHanni/pull/2188)
 + Fix wrong item prices in Estimated Item Value when the craft price is higher than the NPC price and the item is soulbound. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2173)
     + E.g. for Gillsplash (fishing equipment).
++ Fix Custom Wardrobe Keybinds not working. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2198)
 
 #### Combat Fixes
 
@@ -452,6 +456,7 @@
 + Fix launchers showing SkyHanni as LibNinePatch. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2147)
 + Fix "/worldedit right" setting the left position. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2179)
 + Fix a bug in the Hypixel detection. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2193)
++ Fix random Stack Overflow Errors. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2199)
 
 ### Technical Details
 
@@ -551,6 +556,10 @@
 + Add carnival mask to item category. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2189)
 + Fix pattern for Dragon Widget. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2190)
 + Changed the readme.md file. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2174)
++ Add Mob Detection First Seen Event. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2096)
++ Mob Detection now runs every tick instead of every other tick. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2096)
++ RepoPattern locale loading now works inversely for the development environment. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2069)
++ Move Hoppity Rabbit chat patterns to the eggs manager. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2144)
 
 ### Removed Features
 
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 11ec22d5e556..da3ff292b0f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.15",
+    version = "0.26.Beta.16",
 )
 class SkyHanniMod {
 

From 3cef369db331d956889a1382d41746e6d9a5e3e0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:10:02 +0200
Subject: [PATCH 085/721] Internal: Bug fix label (#2203)

---
 .github/workflows/label-bug-fix.yml | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .github/workflows/label-bug-fix.yml

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
new file mode 100644
index 000000000000..37e2296a9fb5
--- /dev/null
+++ b/.github/workflows/label-bug-fix.yml
@@ -0,0 +1,43 @@
+name: "Bug Fix label"
+on:
+    pull_request_target:
+        types: [ opened,edited ]
+jobs:
+    assign-label:
+        runs-on: ubuntu-latest
+        permissions:
+            issues: write
+            pull-requests: write
+            contents: read
+        steps:
+            -   name: label
+                env:
+                    TITLE: ${{ github.event.pull_request.title }}
+                    LABEL: Bug Fix - Sooner than Very Soon
+                uses: actions/github-script@v7
+                with:
+                    github-token: ${{ secrets.GITHUB_TOKEN}}
+                    script: |
+                        if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
+                            github.rest.issues.addLabels({
+                                issue_number: context.issue.number,
+                                owner: context.repo.owner,
+                                repo: context.repo.repo,
+                                labels: [process.env.LABEL]
+                            })
+                        }else{
+                            const {data} = await github.rest.issues.listLabelsOnIssue({
+                                issue_number: context.issue.number,
+                                owner: context.repo.owner,
+                                repo: context.repo.repo,
+                            })
+                            const filtered = data.filter(label => label.name == process.env.LABEL)
+                            if(filtered.length == 1){
+                                github.rest.issues.removeLabel({
+                                    issue_number: context.issue.number,
+                                    owner: context.repo.owner,
+                                    repo: context.repo.repo,
+                                    name: process.env.LABEL
+                                })
+                            }
+                        }

From 0f09409c189f682cc9f3620ed46670c787302dad Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 14 Jul 2024 00:24:38 +0200
Subject: [PATCH 086/721] no more check style (for now, until the current bug
 is gone)

---
 .github/workflows/check-style.yaml | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/check-style.yaml b/.github/workflows/check-style.yaml
index ff172208f8bc..3d7347a80f18 100644
--- a/.github/workflows/check-style.yaml
+++ b/.github/workflows/check-style.yaml
@@ -1,16 +1,16 @@
-name: check-style
-on:
-    - pull_request
-jobs:
-    ktlint:
-        name: Check Style
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v3
-              name: Checkout code
-            - name: ktlint
-              uses: ScaCap/action-ktlint@master
-              with:
-                  github_token: ${{ secrets.github_token }}
-                  reporter: github-pr-check
+#name: check-style
+#on:
+#    - pull_request
+#jobs:
+#    ktlint:
+#        name: Check Style
+#        runs-on: ubuntu-latest
+#
+#        steps:
+#            - uses: actions/checkout@v3
+#              name: Checkout code
+#            - name: ktlint
+#              uses: ScaCap/action-ktlint@master
+#              with:
+#                  github_token: ${{ secrets.github_token }}
+#                  reporter: github-pr-check

From a9d10926993e22cc0bd6b75a05ae64c7abbfc059 Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Mon, 15 Jul 2024 06:28:26 -0800
Subject: [PATCH 087/721] Fix: Typo in shcommands (#2223)

---
 .../java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
index 3500b00256cb..9bd3afce48f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
@@ -75,7 +75,7 @@ object HelpCommand {
 
         if (filtered.isEmpty()) {
             text.add(Text.EMPTY)
-            text.add("§cNo reminders found.".asComponent().center())
+            text.add("§cNo commands found.".asComponent().center())
             text.add(Text.EMPTY)
         } else {
             val start = (page - 1) * COMMANDS_PER_PAGE

From dd20c1273715e5b28df263bb896b1d35cfefa0f2 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:42:12 +0200
Subject: [PATCH 088/721] Fix: Pet Pattern for ItemCategory (#2202)

---
 src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
index 75835f054cb4..dfe57cc5cb0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
@@ -15,10 +15,11 @@ object PetAPI {
 
     /**
      * REGEX-TEST: §e⭐ §7[Lvl 200] §6Golden Dragon§d ✦
+     * REGEX-TEST: ⭐ [Lvl 100] Black Cat ✦
      */
     private val petItemName by patternGroup.pattern(
         "item.name",
-        "(?<favorite>§.⭐ )?(?:§.)*\\[Lvl (?<level>\\d+)] (?<name>.*)",
+        "(?<favorite>(?:§.)*⭐ )?(?:§.)*\\[Lvl (?<level>\\d+)] (?<name>.*)",
     )
     private val neuRepoPetItemName by patternGroup.pattern(
         "item.name.neu.format",

From a716e5d26a6ae6c79300c298c221382fb73e21a8 Mon Sep 17 00:00:00 2001
From: sayomaki <sayomayomaki@gmail.com>
Date: Mon, 15 Jul 2024 22:44:38 +0800
Subject: [PATCH 089/721] Fix: Buying items may incorrectly trigger compact
 hoppity messages (#2201)

---
 .../features/event/hoppity/HoppityEggsCompactChat.kt        | 6 ++++--
 .../skyhanni/features/event/hoppity/HoppityEggsManager.kt   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index a74338d77556..f9a25f3d596b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -87,8 +87,10 @@ object HoppityEggsCompactChat {
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
-            rabbitBought = true
-            compactChat(event)
+            if (group("rabbitname").equals(lastName)) {
+                rabbitBought = true
+                compactChat(event)
+            }
         }
 
         HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 5e51a7693a37..86213e88bf94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -49,7 +49,7 @@ object HoppityEggsManager {
      */
     val eggBoughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.bought",
-        "§aYou bought §r§.(?<rabbitname>.*?) §r§afor §r§6((\\d|,)*) Coins§r§a!",
+        "§aYou bought §r(?<rabbitname>.*?) §r§afor §r§6((\\d|,)*) Coins§r§a!",
     )
 
     /**

From ad7c6dfc824bb7d2b1405ec5f7c0a017612bbf2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:45:09 +0200
Subject: [PATCH 090/721] Fix: price source inconsistencies (bz sell/buy and
 npc price) (#2221)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/garden/SkyMartConfig.java | 22 ++----------
 .../garden/composter/ComposterConfig.java     | 33 ++----------------
 .../features/inventory/SackDisplayConfig.java | 33 ++----------------
 .../misc/EstimatedItemValueConfig.java        |  5 +--
 .../config/features/misc/TrackerConfig.java   | 34 ++-----------------
 .../at/hannibal2/skyhanni/data/SackAPI.kt     | 25 +++++---------
 .../hannibal2/skyhanni/data/TrackerManager.kt | 10 ------
 .../features/fame/CityProjectFeatures.kt      |  2 +-
 .../garden/composter/ComposterOverlay.kt      |  7 +---
 .../garden/inventory/SkyMartCopperPrice.kt    |  4 +--
 .../features/inventory/SackDisplay.kt         | 17 +++-------
 .../features/misc/items/EstimatedItemValue.kt |  2 +-
 .../items/EstimatedItemValueCalculator.kt     |  4 +--
 .../at/hannibal2/skyhanni/test/PriceSource.kt |  8 -----
 .../skyhanni/utils/ItemPriceSource.kt         | 10 ++++++
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   | 27 +++++++++------
 .../utils/tracker/SkyHanniItemTracker.kt      |  9 +++--
 .../skyhanni/utils/tracker/SkyHanniTracker.kt | 12 ++-----
 18 files changed, 65 insertions(+), 199 deletions(-)
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/test/PriceSource.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/SkyMartConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/SkyMartConfig.java
index b477d23297a6..d2a9428c7ac0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/SkyMartConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/SkyMartConfig.java
@@ -2,6 +2,7 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.utils.ItemPriceSource;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
@@ -26,24 +27,7 @@ public class SkyMartConfig {
     public Position copperPricePos = new Position(211, 132, false, true);
 
     @Expose
-    @ConfigOption(name = "Overlay Price", desc = "Toggle for Bazaar 'sell order' vs 'instant sell' price in copper price overlay.")
+    @ConfigOption(name = "Change Price Source", desc = "Change what price to use: Bazaar (Sell Offer or Buy Order) or NPC.")
     @ConfigEditorDropdown
-    public OverlayPriceTypeEntry overlayPriceType = OverlayPriceTypeEntry.INSTANT_SELL;
-
-    public enum OverlayPriceTypeEntry {
-        INSTANT_SELL("Instant Sell"),
-        SELL_ORDER("Sell Order"),
-        ;
-        private final String str;
-
-
-        OverlayPriceTypeEntry(String str) {
-            this.str = str;
-        }
-
-        @Override
-        public String toString() {
-            return str;
-        }
-    }
+    public ItemPriceSource priceSource = ItemPriceSource.BAZAAR_INSTANT_SELL;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
index 5f22aa62ba83..9712573fb728 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.HasLegacyId;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.utils.ItemPriceSource;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
@@ -21,37 +22,9 @@ public class ComposterConfig {
     public boolean overlay = true;
 
     @Expose
-    @ConfigOption(name = "Overlay Price", desc = "Toggle for Bazaar 'buy order' vs 'instant buy' price in composter overlay.")
+    @ConfigOption(name = "Change Price Source", desc = "Change what price to use: Bazaar (Sell Offer or Buy Order) or NPC.")
     @ConfigEditorDropdown
-    public OverlayPriceTypeEntry overlayPriceType = OverlayPriceTypeEntry.INSTANT_BUY;
-
-    public enum OverlayPriceTypeEntry implements HasLegacyId {
-        INSTANT_BUY("Instant Buy", 0),
-        BUY_ORDER("Buy Order", 1),
-        ;
-        private final String str;
-        private final int legacyId;
-
-        OverlayPriceTypeEntry(String str, int legacyId) {
-            this.str = str;
-            this.legacyId = legacyId;
-        }
-
-        // Constructor if new enum elements are added post-migration
-        OverlayPriceTypeEntry(String str) {
-            this(str, -1);
-        }
-
-        @Override
-        public int getLegacyId() {
-            return legacyId;
-        }
-
-        @Override
-        public String toString() {
-            return str;
-        }
-    }
+    public ItemPriceSource priceSource = ItemPriceSource.BAZAAR_INSTANT_BUY;
 
     @Expose
     @ConfigOption(name = "Retrieve From", desc = "Change where to retrieve the materials from in the composter overlay: Bazaar or Sacks.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
index 0b4fc9998e0b..88a6405fc5a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.HasLegacyId;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.utils.ItemPriceSource;
 import at.hannibal2.skyhanni.utils.RenderUtils;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
@@ -170,37 +171,9 @@ public String toString() {
     }
 
     @Expose
-    @ConfigOption(name = "Show Price From", desc = "Show price from Bazaar or NPC.")
+    @ConfigOption(name = "Change Price Source", desc = "Change what price to use: Bazaar (Sell Offer or Buy Order) or NPC.")
     @ConfigEditorDropdown
-    public PriceFrom priceFrom = PriceFrom.BAZAAR;
-
-    public enum PriceFrom implements HasLegacyId {
-        BAZAAR("Bazaar", 0),
-        NPC("NPC", 1);
-
-        private final String str;
-        private final int legacyId;
-
-        PriceFrom(String str, int legacyId) {
-            this.str = str;
-            this.legacyId = legacyId;
-        }
-
-        // Constructor if new enum elements are added post-migration
-        PriceFrom(String str) {
-            this(str, -1);
-        }
-
-        @Override
-        public int getLegacyId() {
-            return legacyId;
-        }
-
-        @Override
-        public String toString() {
-            return str;
-        }
-    }
+    public ItemPriceSource priceSource = ItemPriceSource.BAZAAR_INSTANT_BUY;
 
     @Expose
     @ConfigLink(owner = SackDisplayConfig.class, field = "enabled")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
index 10d97ebfdb0f..0963703088a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
@@ -2,6 +2,7 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.utils.ItemPriceSource;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
@@ -65,9 +66,9 @@ public class EstimatedItemValueConfig {
     public Property<Boolean> ignoreRunes = Property.of(false);
 
     @Expose
-    @ConfigOption(name = "Bazaar Price Source", desc = "Use Instant Buy or Buy Order.")
+    @ConfigOption(name = "Change Price Source", desc = "Change what price to use: Bazaar (Sell Offer or Buy Order) or NPC.")
     @ConfigEditorDropdown
-    public Property<BazaarPriceSource> bazaarPriceSource = Property.of(BazaarPriceSource.BUY_ORDER);
+    public Property<ItemPriceSource> priceSource = Property.of(ItemPriceSource.BAZAAR_INSTANT_SELL);
 
     public enum BazaarPriceSource {
         INSTANT_BUY("Instant Buy"),
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
index 5896dd38c2da..dcad728fe8bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.config.features.misc;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
-import at.hannibal2.skyhanni.config.HasLegacyId;
+import at.hannibal2.skyhanni.utils.ItemPriceSource;
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
@@ -19,37 +19,9 @@ public class TrackerConfig {
     public boolean hideInEstimatedItemValue = true;
 
     @Expose
-    @ConfigOption(name = "Show Price From", desc = "Show price from Bazaar or NPC.")
+    @ConfigOption(name = "Change Price Source", desc = "Change what price to use: Bazaar (Sell Offer or Buy Order) or NPC.")
     @ConfigEditorDropdown
-    public PriceFromEntry priceFrom = PriceFromEntry.SELL_OFFER;
-
-    public enum PriceFromEntry implements HasLegacyId {
-        INSTANT_SELL("Instant Sell", 0),
-        SELL_OFFER("Sell Offer", 1),
-        NPC("NPC", 2);
-        private final String str;
-        private final int legacyId;
-
-        PriceFromEntry(String str, int legacyId) {
-            this.str = str;
-            this.legacyId = legacyId;
-        }
-
-        // Constructor if new enum elements are added post-migration
-        PriceFromEntry(String str) {
-            this(str, -1);
-        }
-
-        @Override
-        public int getLegacyId() {
-            return legacyId;
-        }
-
-        @Override
-        public String toString() {
-            return str;
-        }
-    }
+    public ItemPriceSource priceSource = ItemPriceSource.BAZAAR_INSTANT_BUY;
 
     @Expose
     @ConfigOption(name = "Default Display Mode", desc = "Change the display mode that gets shown on default.")
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
index b5d31185aaac..e392699cdbfe 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigFileType
-import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.PriceFrom
 import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuSacksJson
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -22,7 +21,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
-import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
@@ -49,15 +47,15 @@ object SackAPI {
     private val patternGroup = RepoPattern.group("data.sacks")
     private val sackPattern by patternGroup.pattern(
         "sack",
-        "^(.* Sack|Enchanted .* Sack)\$"
+        "^(.* Sack|Enchanted .* Sack)\$",
     )
     private val numPattern by patternGroup.pattern(
         "number",
-        "(?:(?:§[0-9a-f](?<level>I{1,3})§7:)?|(?:§7Stored:)?) (?<color>§[0-9a-f])(?<stored>[0-9.,kKmMbB]+)§7/(?<total>\\d+(?:[0-9.,]+)?[kKmMbB]?)"
+        "(?:(?:§[0-9a-f](?<level>I{1,3})§7:)?|(?:§7Stored:)?) (?<color>§[0-9a-f])(?<stored>[0-9.,kKmMbB]+)§7/(?<total>\\d+(?:[0-9.,]+)?[kKmMbB]?)",
     )
     private val gemstonePattern by patternGroup.pattern(
         "gemstone",
-        " §[0-9a-f](?<gemrarity>[A-z]*): §[0-9a-f](?<stored>\\d+(?:\\.\\d+)?(?:(?:,\\d+)?)+[kKmM]?)(?: §[0-9a-f]\\(\\d+(?:\\.\\d+)?(?:(?:,\\d+)?)+[kKmM]?\\))?"
+        " §[0-9a-f](?<gemrarity>[A-z]*): §[0-9a-f](?<stored>\\d+(?:\\.\\d+)?(?:(?:,\\d+)?)+[kKmM]?)(?: §[0-9a-f]\\(\\d+(?:\\.\\d+)?(?:(?:,\\d+)?)+[kKmM]?\\))?",
     )
 
     private var isRuneSack = false
@@ -114,21 +112,14 @@ object SackAPI {
         SackDisplay.update(isNewInventory)
     }
 
-    private fun String.getTrophyRarity(): TrophyRarity? {
-        return if (this.startsWith("Bronze"))
-            TrophyRarity.BRONZE
-        else
-            if (this.startsWith("Silver"))
-                TrophyRarity.SILVER
-            else null
+    private fun String.getTrophyRarity(): TrophyRarity? = when {
+        this.startsWith("Bronze") -> TrophyRarity.BRONZE
+        this.startsWith("Silver") -> TrophyRarity.SILVER
+        else -> null
     }
 
     private fun NEUInternalName.sackPrice(stored: Int): Long {
-        return when (sackDisplayConfig.priceFrom) {
-            PriceFrom.BAZAAR -> (getPrice() * stored).toLong().coerceAtLeast(0)
-            PriceFrom.NPC -> (getNpcPriceOrNull() ?: 0.0).toLong() * stored
-            else -> 0L
-        }
+        return getPrice(sackDisplayConfig.priceSource).toLong() * stored
     }
 
     fun getSacksData(savingSacks: Boolean) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
index ab5f9cc78c69..71b60d76ea35 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
@@ -1,13 +1,10 @@
 package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.config.features.misc.TrackerConfig.PriceFromEntry
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ConditionalUtils
-import at.hannibal2.skyhanni.utils.ConfigUtils
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -39,11 +36,4 @@ object TrackerManager {
             hasChanged = false
         }
     }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.transform(17, "misc.tracker.priceFrom") { element ->
-            ConfigUtils.migrateIntToEnum(element, PriceFromEntry::class.java)
-        }
-    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
index f4f4fbac4779..4457144021aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
@@ -170,7 +170,7 @@ object CityProjectFeatures {
                 ) { inInventory && !NEUItems.neuHasFocus() }
             )
 
-            val price = internalName.getPrice(false) * amount
+            val price = internalName.getPrice() * amount
             val format = price.shortFormat()
             list.add(" §7(§6$format§7)")
             add(list)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 303fd7464dec..8ed772ea30a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.garden.composter
 
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig
-import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig.OverlayPriceTypeEntry
 import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig.RetrieveFromEntry
 import at.hannibal2.skyhanni.data.SackAPI.getAmountInSacksOrNull
 import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson
@@ -535,8 +534,7 @@ object ComposterOverlay {
     }
 
     private fun getPrice(internalName: NEUInternalName): Double {
-        val useSellPrice = config.overlayPriceType == ComposterConfig.OverlayPriceTypeEntry.BUY_ORDER
-        val price = internalName.getPrice(useSellPrice)
+        val price = internalName.getPrice(config.priceSource)
         if (internalName.equals("BIOFUEL") && price > 20_000) return 20_000.0
 
         return price
@@ -622,9 +620,6 @@ object ComposterOverlay {
         event.move(3, "garden.composterOverlayOrganicMatterPos", "garden.composters.overlayOrganicMatterPos")
         event.move(3, "garden.composterOverlayFuelExtrasPos", "garden.composters.overlayFuelExtrasPos")
         event.move(3, "garden.composterRoundDown", "garden.composters.roundDown")
-        event.transform(15, "garden.composters.overlayPriceType") { element ->
-            ConfigUtils.migrateIntToEnum(element, OverlayPriceTypeEntry::class.java)
-        }
         event.transform(15, "garden.composters.retrieveFrom") { element ->
             ConfigUtils.migrateIntToEnum(element, RetrieveFromEntry::class.java)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
index b2575c88d90f..5ef15090739a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.inventory
 
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.config.features.garden.SkyMartConfig
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -56,8 +55,7 @@ object SkyMartCopperPrice {
                 } ?: continue
 
                 val internalName = item.getInternalName()
-                val useSellPrice = config.overlayPriceType == SkyMartConfig.OverlayPriceTypeEntry.SELL_ORDER
-                val itemPrice = internalName.getPriceOrNull(useSellPrice) ?: continue
+                val itemPrice = internalName.getPriceOrNull(config.priceSource) ?: continue
                 val profit = itemPrice - (otherItemsPrice ?: 0.0)
 
                 val factor = profit / copper
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 81e277fd6498..55be1b08f973 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.inventory
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig
 import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.NumberFormatEntry
 import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.PriceFormatEntry
 import at.hannibal2.skyhanni.config.features.inventory.SackDisplayConfig.SortingTypeEntry
@@ -17,6 +16,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addSelector
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemPriceSource
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -206,11 +206,11 @@ object SackDisplay {
         )
 
         if (config.showPrice) {
-            list.addSelector<PriceFrom>(" ",
+            list.addSelector<ItemPriceSource>(" ",
                 getName = { type -> type.displayName },
-                isCurrent = { it.ordinal == config.priceFrom.ordinal }, // todo avoid ordinal
+                isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
-                    config.priceFrom = SackDisplayConfig.PriceFrom.entries[it.ordinal] // todo avoid ordinal
+                    config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal
                     update(false)
                 })
             list.addButton(
@@ -300,12 +300,6 @@ object SackDisplay {
         ;
     }
 
-    enum class PriceFrom(val displayName: String) {
-        BAZAAR("Bazaar Price"),
-        NPC("NPC Price"),
-        ;
-    }
-
     enum class PriceFormat(val displayName: String) {
         FORMATED("Formatted"),
         UNFORMATED("Unformatted"),
@@ -327,9 +321,6 @@ object SackDisplay {
         event.transform(15, "inventory.sackDisplay.priceFormat") { element ->
             ConfigUtils.migrateIntToEnum(element, PriceFormatEntry::class.java)
         }
-        event.transform(15, "inventory.sackDisplay.priceFrom") { element ->
-            ConfigUtils.migrateIntToEnum(element, SackDisplayConfig.PriceFrom::class.java)
-        }
         event.transform(15, "inventory.sackDisplay.sortingType") { element ->
             ConfigUtils.migrateIntToEnum(element, SortingTypeEntry::class.java)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 21b86b6cffec..e55916f95e32 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -123,7 +123,7 @@ object EstimatedItemValue {
                 ignoreHelmetSkins,
                 ignoreArmorDyes,
                 ignoreRunes,
-                bazaarPriceSource,
+                priceSource,
                 useAttributeComposite,
             ) {
                 cache.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index bfc42659f90f..ad00298c3449 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.misc.items
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.ReforgeAPI
-import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -760,7 +759,6 @@ object EstimatedItemValueCalculator {
     private fun NEUInternalName.getPrice(): Double = getPriceOrNull() ?: -1.0
 
     private fun NEUInternalName.getPriceOrNull(): Double? {
-        val useSellPrice = config.bazaarPriceSource.get() == EstimatedItemValueConfig.BazaarPriceSource.BUY_ORDER
-        return getPriceOrNull(useSellPrice)
+        return getPriceOrNull(config.priceSource.get())
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/PriceSource.kt b/src/main/java/at/hannibal2/skyhanni/test/PriceSource.kt
deleted file mode 100644
index 45da414eeb57..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/test/PriceSource.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package at.hannibal2.skyhanni.test
-
-enum class PriceSource(val displayName: String) {
-    BAZAAR_INSTANT_SELL("Instant Sell"),
-    BAZAAR_SELL_OFFER("Sell Offer"),
-    NPC("NPC Price"),
-    ;
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt
new file mode 100644
index 000000000000..13049a5960ff
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt
@@ -0,0 +1,10 @@
+package at.hannibal2.skyhanni.utils
+
+enum class ItemPriceSource(val displayName: String) {
+    BAZAAR_INSTANT_BUY("Instant Buy/Sell Offer"), // Sell Offer
+    BAZAAR_INSTANT_SELL("Instant Sell/Buy Order"), // Buy Order
+    NPC_SELL("NPC Sell"),
+    ;
+
+    override fun toString(): String = displayName
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 3fc54009e739..563fefb30b2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -160,8 +160,10 @@ object NEUItems {
     fun getInternalNameOrNull(nbt: NBTTagCompound): NEUInternalName? =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()?.asInternalName()
 
-    fun NEUInternalName.getPrice(useSellPrice: Boolean = false, pastRecipes: List<NeuRecipe> = emptyList()) =
-        getPriceOrNull(useSellPrice, pastRecipes) ?: -1.0
+    fun NEUInternalName.getPrice(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ) = getPriceOrNull(priceSource, pastRecipes) ?: -1.0
 
     fun NEUInternalName.getNpcPrice() = getNpcPriceOrNull() ?: -1.0
 
@@ -175,20 +177,25 @@ object NEUItems {
     fun transHypixelNameToInternalName(hypixelId: String): NEUInternalName =
         manager.auctionManager.transformHypixelBazaarToNEUItemId(hypixelId).asInternalName()
 
-    fun NEUInternalName.getPriceOrNull(useSellPrice: Boolean = false, pastRecipes: List<NeuRecipe> = emptyList()): Double? {
+    fun NEUInternalName.getPriceOrNull(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ): Double? {
         if (this == NEUInternalName.WISP_POTION) {
             return 20_000.0
         }
 
-        getBazaarData()?.let {
-            return if (useSellPrice) it.sellOfferPrice else it.instantBuyPrice
-        }
+        if (priceSource != ItemPriceSource.NPC_SELL) {
+            getBazaarData()?.let {
+                return if (priceSource == ItemPriceSource.BAZAAR_INSTANT_BUY) it.sellOfferPrice else it.instantBuyPrice
+            }
 
-        val result = manager.auctionManager.getLowestBin(asString())
-        if (result != -1L) return result.toDouble()
+            val result = manager.auctionManager.getLowestBin(asString())
+            if (result != -1L) return result.toDouble()
 
-        if (equals("JACK_O_LANTERN")) {
-            return "PUMPKIN".asInternalName().getPrice(useSellPrice) + 1
+            if (equals("JACK_O_LANTERN")) {
+                return "PUMPKIN".asInternalName().getPrice(priceSource) + 1
+            }
         }
         if (equals("GOLDEN_CARROT")) {
             // 6.8 for some players
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 21f115746d46..241d0a1e8b96 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -1,13 +1,12 @@
 package at.hannibal2.skyhanni.utils.tracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.features.misc.TrackerConfig.PriceFromEntry
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.test.PriceSource
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.ItemPriceSource
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -55,12 +54,12 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 
     fun addPriceFromButton(lists: MutableList<List<Any>>) {
         if (isInventoryOpen()) {
-            lists.addSelector<PriceSource>(
+            lists.addSelector<ItemPriceSource>(
                 "",
                 getName = { type -> type.displayName },
-                isCurrent = { it.ordinal == config.priceFrom.ordinal }, // todo avoid ordinal
+                isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
-                    config.priceFrom = PriceFromEntry.entries[it.ordinal] // todo avoid ordinal
+                    config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal
                     update()
                 }
             )
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 9d4d5ea38dbd..00431049f07c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -2,18 +2,15 @@ package at.hannibal2.skyhanni.utils.tracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.core.config.Position
-import at.hannibal2.skyhanni.config.features.misc.TrackerConfig.PriceFromEntry
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.TrackerManager
-import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
-import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -40,12 +37,7 @@ open class SkyHanniTracker<Data : TrackerData>(
         val config get() = SkyHanniMod.feature.misc.tracker
         private val storedTrackers get() = SkyHanniMod.feature.storage.trackerDisplayModes
 
-        fun getPricePer(name: NEUInternalName) = when (config.priceFrom) {
-            PriceFromEntry.INSTANT_SELL -> name.getBazaarData()?.instantBuyPrice ?: name.getPriceOrNull() ?: 0.0
-            PriceFromEntry.SELL_OFFER -> name.getBazaarData()?.sellOfferPrice ?: name.getPriceOrNull() ?: 0.0
-
-            else -> name.getNpcPriceOrNull() ?: 0.0
-        }
+        fun getPricePer(name: NEUInternalName) = name.getPrice(config.priceSource)
     }
 
     fun isInventoryOpen() = inventoryOpen

From 989b438124f647f615d1934e4b228dd0f58a8d28 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:46:04 -0400
Subject: [PATCH 091/721] Fix: Craftable! text (again) (#2219)

---
 .../skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 4 ++--
 .../skyhanni/features/inventory/craft/CraftableItemList.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 77ba00da7f51..151ec4caaf39 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -258,7 +258,7 @@ object GardenVisitorFeatures {
                 break
             }
         }
-        if (hasIngredients) {
+        if (hasIngredients && (amount - amountInSacks) > 0) {
             val leftToCraft = amount - amountInSacks
             list.add(" §7(")
             list.add(
@@ -268,7 +268,7 @@ object GardenVisitorFeatures {
                         if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
                             LorenzUtils.setTextIntoSign("$leftToCraft")
                         } else {
-                            HypixelCommands.viewRecipe(internalName.toString())
+                            HypixelCommands.viewRecipe(internalName.asString())
                         }
                     },
                 ) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() },
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
index 03e6b6656a2e..6b841f5a40d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
@@ -114,7 +114,7 @@ object CraftableItemList {
             "§8x$amountFormat ${internalName.itemName}",
             tips = tooltip,
             onClick = {
-                HypixelCommands.viewRecipe(internalName.itemName)
+                HypixelCommands.viewRecipe(internalName.asString())
             },
         )
     }

From 005e676ca57f92adfaeea1d9726f652f7bc5aceb Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 15 Jul 2024 16:48:59 +0200
Subject: [PATCH 092/721] Fix: Fine Flour exportation pattern (#2215)

---
 .../skyhanni/features/garden/fortuneguide/CarrolynTable.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
index c6b6895cffba..9b1a30c4b775 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
@@ -27,8 +27,8 @@ enum class CarrolynTable(val crop: CropType, val label: String, completeMessage:
     FINE_FLOUR(
         CropType.WHEAT,
         "Fine Flour",
-        "WHEATS EXPORTATION COMPLETE!",
-        "[NPC] Carrolyn: Thank you for the flour.", // TODO confirm this, since this is only a estimate
+        "FINE FLOURS EXPORTATION COMPLETE!",
+        "[NPC] Carrolyn: Thank you for the flour.",
     ),
     ;
 

From e848b84935291d2bf9883602a6f2b35d2aaeb9df Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:51:00 +0200
Subject: [PATCH 093/721] Fix: Hot Potato Book in Community Project (#2214)

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index b662e10d434c..5bafb370a840 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -294,11 +294,11 @@ object ItemUtils {
 
     private val itemAmountCache = mutableMapOf<String, Pair<String, Int>>()
 
+    private val bookPattern = "(?<name>.* [IVX]+) Book".toPattern()
+
     fun readItemAmount(originalInput: String): Pair<String, Int>? {
         // This workaround fixes 'Turbo Cacti I Book'
-        val input = (if (originalInput.endsWith(" Book")) {
-            originalInput.replace(" Book", "")
-        } else originalInput).removeResets()
+        val input = (bookPattern.matchMatcher(originalInput) { group("name") } ?: originalInput).removeResets()
 
         if (itemAmountCache.containsKey(input)) {
             return itemAmountCache[input]!!

From d90015322f47e083a5a304a0e6368c70d6736ba3 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 15 Jul 2024 16:51:20 +0200
Subject: [PATCH 094/721] Fix: Fragged Daedalus Axe not getting detected as
 farming tool (#2212)

---
 src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index d648acc297e5..ba8b6bb701da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -81,6 +81,7 @@ object GardenAPI {
     // TODO USE SH-REPO
     private val otherToolsList = listOf(
         "DAEDALUS_AXE",
+        "STARRED_DAEDALUS_AXE",
         "BASIC_GARDENING_HOE",
         "ADVANCED_GARDENING_AXE",
         "BASIC_GARDENING_AXE",

From 7720607824c8683cbd54c6072bcc2e9cf4eff604 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:51:48 +0200
Subject: [PATCH 095/721] Fix: Page Scrolling missing museum pattern (#2208)

---
 .../at/hannibal2/skyhanni/features/inventory/PageScrolling.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt
index f9855d0d4ff4..023fe057717f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/PageScrolling.kt
@@ -35,6 +35,7 @@ object PageScrolling {
         "§aScroll Up",
         "§aLevels 26 - 50",
         "§aNext Page →",
+        "§aScroll Right",
     )
 
     private val backwardPattern by repoGroup.list(
@@ -43,6 +44,7 @@ object PageScrolling {
         "§aScroll Down",
         "§aLevels 1 - 25",
         "§a← Previous Page",
+        "§aScroll Left",
     )
 
     private val scroll = ScrollValue()

From 6f32006525865f5344972953c1f621fbfaadaea7 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Mon, 15 Jul 2024 16:52:52 +0200
Subject: [PATCH 096/721] Fix: Powder Tracker Pattern. (#2207)

---
 .../mining/powdertracker/PowderChestReward.kt | 158 ++++++++++++------
 .../mining/powdertracker/PowderTracker.kt     |  20 +--
 2 files changed, 111 insertions(+), 67 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index 0781391eb678..8c0fbca5728c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -4,154 +4,212 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 
 enum class PowderChestReward(val displayName: String, pattern: String) {
 
-    MITHRIL_POWDER("§aMithril Powder", "§aYou received §r§b[+](?<amount>.*) §r§aMithril Powder."),
-    GEMSTONE_POWDER("§dGemstone Powder", "§aYou received §r§b[+](?<amount>.*) §r§aGemstone Powder."),
+    MITHRIL_POWDER(
+        "§aMithril Powder",
+        ".*§2Mithril Powder(?: §r§8x(?<amount>.*))?",
+    ),
+    GEMSTONE_POWDER(
+        "§dGemstone Powder",
+        ".*§dGemstone Powder(?: §r§8x(?<amount>.*))?",
+    ),
 
     ROUGH_RUBY_GEMSTONE(
         "§fRough Ruby Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f❤ Rough Ruby Gemstone§r§a."
+        ".*§f❤ Rough Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_RUBY_GEMSTONE(
         "§aFlawed Sapphire Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a❤ Flawed Ruby Gemstone§r§a."
+        ".*§a❤ Flawed Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_RUBY_GEMSTONE(
         "§9Fine Ruby Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9❤ Fine Ruby Gemstone§r§a."
+        ".*§9❤ Fine Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_RUBY_GEMSTONE(
         "§5Flawless Ruby Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9❤ Flawless Ruby Gemstone§r§a."
+        ".*§5❤ Flawless Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_SAPPHIRE_GEMSTONE(
         "§fRough Sapphire Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f✎ Rough Sapphire Gemstone§r§a."
+        ".*§f✎ Rough Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_SAPPHIRE_GEMSTONE(
         "§aFlawed Sapphire Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a✎ Flawed Sapphire Gemstone§r§a."
+        ".*§a✎ Flawed Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_SAPPHIRE_GEMSTONE(
         "§9Fine Sapphire Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9✎ Fine Sapphire Gemstone§r§a."
+        ".*§9✎ Fine Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_SAPPHIRE_GEMSTONE(
         "§5Flawless Sapphire Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9✎ Flawless Sapphire Gemstone§r§a."
+        ".*§5✎ Flawless Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_AMBER_GEMSTONE(
         "§fRough Amber Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f⸕ Rough Amber Gemstone§r§a."
+        ".*§f⸕ Rough Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_AMBER_GEMSTONE(
         "§aFlawed Amber Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a⸕ Flawed Amber Gemstone§r§a."
+        ".*§a⸕ Flawed Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_AMBER_GEMSTONE(
         "§9Fine Amber Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9⸕ Fine Amber Gemstone§r§a."
+        ".*§9⸕ Fine Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_AMBER_GEMSTONE(
         "§5Flawless Amber Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9⸕ Flawless Amber Gemstone§r§a."
+        ".*§5⸕ Flawless Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_AMETHYST_GEMSTONE(
         "§fRough Amethyst Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f❈ Rough Amethyst Gemstone§r§a."
+        ".*§f❈ Rough Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_AMETHYST_GEMSTONE(
         "§aFlawed Amethyst Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a❈ Flawed Amethyst Gemstone§r§a."
+        ".*§a❈ Flawed Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_AMETHYST_GEMSTONE(
         "§9Fine Amethyst Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9❈ Fine Amethyst Gemstone§r§a."
+        ".*§9❈ Fine Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_AMETHYST_GEMSTONE(
         "§5Flawless Amethyst Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9❈ Flawless Amethyst Gemstone§r§a."
+        ".*§5❈ Flawless Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_JADE_GEMSTONE(
         "§fRough Jade Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f☘ Rough Jade Gemstone§r§a."
+        ".*§f☘ Rough Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_JADE_GEMSTONE(
         "§aFlawed Jade Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a☘ Flawed Jade Gemstone§r§a."
+        ".*§a☘ Flawed Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_JADE_GEMSTONE(
         "§9Fine Jade Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9☘ Fine Jade Gemstone§r§a."
+        ".*§9☘ Fine Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_JADE_GEMSTONE(
         "§5Flawless Jade Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9☘ §r§5Flawless Jade Gemstone§r§a."
+        ".*§5☘ Flawless Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_TOPAZ_GEMSTONE(
         "§fRough Topaz Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§f✧ Rough Topaz Gemstone§r§a."
+        ".*§f✧ Rough Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_TOPAZ_GEMSTONE(
         "§aFlawed Topaz Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§a✧ Flawed Topaz Gemstone§r§a."
+        ".*§a✧ Flawed Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_TOPAZ_GEMSTONE(
         "§9Fine Topaz Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9✧ Fine Topaz Gemstone§r§a."
+        ".*§9✧ Fine Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_TOPAZ_GEMSTONE(
         "§5Flawless Topaz Gemstone",
-        "§aYou received §r§f(?<amount>.*) §r§9✧ Flawless Topaz Gemstone§r§a."
+        ".*§5✧ Flawless Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
-    FTX_3070("§9FTX 3070", "§aYou received §r§f(?<amount>.*) §r§9FTX 3070§r§a."),
+    FTX_3070(
+        "§9FTX 3070",
+        ".*§9FTX 3070(?: §r§8x(?<amount>.*))?",
+    ),
     ELECTRON_TRANSIMTTER(
         "§9Electron Transmitter",
-        "§aYou received §r§f(?<amount>.*) §r§9Electron Transmitter§r§a."
+        ".*§9Electron Transmitter(?: §r§8x(?<amount>.*))?",
     ),
     ROBOTRON_REFLECTOR(
         "§9Robotron Reflector",
-        "§aYou received §r§f(?<amount>.*) §r§9Robotron Reflector§r§a."
+        ".*§9Robotron Reflector(?: §r§8x(?<amount>.*))?",
+    ),
+    SUPERLITE_MOTOR(
+        "§9Superlite Motor",
+        ".*§9Superlite Motor(?: §r§8x(?<amount>.*))?",
+    ),
+    CONTROL_SWITCH(
+        "§9Control Switch",
+        ".*§9Control Switch(?: §r§8x(?<amount>.*))?",
+    ),
+    SYNTHETIC_HEART(
+        "§9Synthetic Heart",
+        ".*§9Synthetic Heart(?: §r§8x(?<amount>.*))?",
     ),
-    SUPERLITE_MOTOR("§9Superlite Motor", "§aYou received §r§f(?<amount>.*) §r§9Superlite Motor§r§a."),
-    CONTROL_SWITCH("§9Control Switch", "§aYou received §r§f(?<amount>.*) §r§9Control Switch§r§a."),
-    SYNTHETIC_HEART("§9Synthetic Heart", "§aYou received §r§f(?<amount>.*) §r§9Synthetic Heart§r§a."),
 
-    GOBLIN_EGG("§9Goblin Egg", "§aYou received §r§f(?<amount>.*) §r§9Goblin Egg§r§a."),
+    GOBLIN_EGG(
+        "§9Goblin Egg",
+        ".*§9Goblin Egg(?: §r§8x(?<amount>.*))?",
+    ),
     GREEN_GOBLIN_EGG(
         "§aGreen Goblin Egg",
-        "§aYou received §r§f(?<amount>.*) §r§a§r§aGreen Goblin Egg§r§a."
+        ".*§a§r§aGreen Goblin Egg(?: §r§8x(?<amount>.*))?",
+    ),
+    RED_GOBLIN_EGG(
+        "§cRed Goblin Egg",
+        ".*§9§r§cRed Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
-    RED_GOBLIN_EGG("§cRed Goblin Egg", "§aYou received §r§f(?<amount>.*) §r§9§r§cRed Goblin Egg§r§a."),
     YELLOW_GOBLIN_EGG(
         "§eYellow Goblin Egg",
-        "§aYou received §r§f(?<amount>.*) §r§9§r§eYellow Goblin Egg§r§a."
+        ".*§9§r§eYellow Goblin Egg(?: §r§8x(?<amount>.*))?",
+    ),
+    BLUE_GOBLIN_EGG(
+        "§3Blue Goblin Egg",
+        ".*§9§r§3Blue Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
-    BLUE_GOBLIN_EGG("§3Blue Goblin Egg", "§aYou received §r§f(?<amount>.*) §r§9§r§3Blue Goblin Egg§r§a."),
-
-    WISHING_COMPASS("§aWishing Compass", "§aYou received §r§f(?<amount>.*) §r§aWishing Compass§r§a."),
 
-    SLUDGE_JUICE("§aSludge Juice", "§aYou received §r§f(?<amount>.*) §r§aSludge Juice§r§a."),
-    ASCENSION_ROPE("§9Ascension Rope", "§aYou received §r§f(?<amount>.*) §r§9Ascension Rope§r§a."),
-    TREASURITE("§5Treasurite", "§aYou received §r§f(?<amount>.*) §r§5Treasurite§r§a."),
-    JUNGLE_HEART("§6Jungle Heart", "§aYou received §r§f(?<amount>.*) §r§6Jungle Heart§r§a."),
-    PICKONIMBUS_2000("§5Pickonimbus 2000", "§aYou received §r§f(?<amount>.*) §r§5Pickonimbus 2000§r§a."),
-    YOGGIE("§aYoggie", "§aYou received §r§f(?<amount>.*) §r§aYoggie§r§a."),
-    PREHISTORIC_EGG("§fPrehistoric Egg", "§aYou received §r§f(?<amount>.*) §r§fPrehistoric Egg§r§a."),
-    OIL_BARREL("§aOil Barrel", "§aYou received §r§f(?<amount>.*) §r§aOil Barrel§r§a."),
+    WISHING_COMPASS(
+        "§aWishing Compass",
+        ".*§aWishing Compass(?: §r§8x(?<amount>.*))?",
+    ),
+    SLUDGE_JUICE(
+        "§aSludge Juice", ".*§aSludge Juice(?: §r§8x(?<amount>.*))?",
+    ),
+    ASCENSION_ROPE(
+        "§9Ascension Rope",
+        ".*§9Ascension Rope(?: §r§8x(?<amount>.*))?",
+    ),
+    TREASURITE(
+        "§5Treasurite",
+        ".*§5Treasurite(?: §r§8x(?<amount>.*))?",
+    ),
+    JUNGLE_HEART(
+        "§6Jungle Heart",
+        ".*§6Jungle Heart(?: §r§8x(?<amount>.*))?",
+    ),
+    PICKONIMBUS_2000(
+        "§5Pickonimbus 2000",
+        ".*§5Pickonimbus 2000(?: §r§8x(?<amount>.*))?",
+    ),
+    YOGGIE(
+        "§aYoggie",
+        ".*§aYoggie(?: §r§8x(?<amount>.*))?",
+    ),
+    PREHISTORIC_EGG(
+        "§fPrehistoric Egg",
+        ".*§fPrehistoric Egg(?: §r§8x(?<amount>.*))?",
+    ),
+    OIL_BARREL(
+        "§aOil Barrel",
+        ".*§aOil Barrel(?: §r§8x(?<amount>.*))?",
+    ),
 
-    DIAMOND_ESSENCE("§bDiamond Essence", "§aYou received §r§b[+](?<amount>.*) Diamond Essence§r§a."),
-    GOLD_ESSENCE("§6Gold Essence", "§aYou received §r§6[+](?<amount>.*) Gold Essence§r§a."),
+    DIAMOND_ESSENCE(
+        "§bDiamond Essence",
+        ".*§dDiamond Essence(?: §r§8x(?<amount>.*))?",
+    ),
+    GOLD_ESSENCE(
+        "§6Gold Essence",
+        ".*§dGold Essence(?: §r§8x(?<amount>.*))?",
+    ),
     ;
 
     val chatPattern by RepoPattern.pattern(
         "mining.powder.tracker.reward." + this.patternName(),
-        pattern
+        pattern,
     )
 
     private fun patternName() = name.lowercase().replace("_", "")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index cd148db112da..d283c4f2d556 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
 import at.hannibal2.skyhanni.data.BossbarData
-import at.hannibal2.skyhanni.data.HotmData
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -19,6 +18,7 @@ import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -38,11 +38,7 @@ object PowderTracker {
     private val patternGroup = RepoPattern.group("mining.powder.tracker")
     private val pickedPattern by patternGroup.pattern(
         "picked",
-        "§6You have successfully picked the lock on this chest!",
-    )
-    private val uncoveredPattern by patternGroup.pattern(
-        "uncovered",
-        "§aYou uncovered a treasure chest!",
+        "  §r§6§lCHEST LOCKPICKED ",
     )
     private val powderStartedPattern by patternGroup.pattern(
         "powder.started",
@@ -145,16 +141,6 @@ object PowderTracker {
         if (!isEnabled()) return
         val msg = event.message
 
-        if (HotmData.GREAT_EXPLORER.let { it.enabled && it.isMaxLevel }) {
-            uncoveredPattern.matchMatcher(msg) {
-                tracker.modify {
-                    it.totalChestPicked += 1
-                }
-                isGrinding = true
-                lastChestPicked = SimpleTimeMark.now()
-            }
-        }
-
         pickedPattern.matchMatcher(msg) {
             tracker.modify {
                 it.totalChestPicked += 1
@@ -176,7 +162,7 @@ object PowderTracker {
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
-                    var amount = group("amount").formatLong()
+                    var amount = groupOrNull("amount")?.formatLong() ?: 1
                     if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder) {
                         amount *= 2
                     }

From 82f2a2c6ea8c4b552cc5e65e27c397308fcb8989 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:55:02 +0200
Subject: [PATCH 097/721] Fix: Kuudra Key Value (#2205)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 563fefb30b2f..51a07c0b39bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -181,8 +181,9 @@ object NEUItems {
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
         pastRecipes: List<NeuRecipe> = emptyList(),
     ): Double? {
-        if (this == NEUInternalName.WISP_POTION) {
-            return 20_000.0
+        when (this) {
+            NEUInternalName.WISP_POTION -> return 20_000.0
+            NEUInternalName.SKYBLOCK_COIN -> return 1.0
         }
 
         if (priceSource != ItemPriceSource.NPC_SELL) {
@@ -209,7 +210,9 @@ object NEUItems {
     fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
         manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
             getRecipes(this).filter { it !in pastRecipes }
-                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }.minOrNull()
+                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }
+                .filter { it >= 0 }
+                .minOrNull()
         }
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)

From 73f2443fc869127db948234a5fe8de277faacfba Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:57:35 +0200
Subject: [PATCH 098/721] Improvement: own inventory support for estimate chest
 value (#2218)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/ChestValueConfig.java  |   5 +
 .../skyhanni/features/inventory/ChestValue.kt | 116 ++++++++++--------
 .../skyhanni/utils/InventoryUtils.kt          |  15 ++-
 3 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java
index 5f4300865968..922d2d4012f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java
@@ -17,6 +17,11 @@ public class ChestValueConfig {
     @FeatureToggle
     public boolean enabled = false;
 
+    @Expose
+    @ConfigOption(name = "Enabled in own Inventory", desc = "Enable the feature for your own inventory.")
+    @ConfigEditorBoolean
+    public boolean enableInOwnInventory = false;
+
     @Expose
     @ConfigOption(name = "Enabled in dungeons", desc = "Enable the feature in dungeons.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
index 26f5c028b1e9..a5122fc6c85a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
@@ -31,6 +31,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.client.gui.inventory.GuiInventory
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -42,12 +43,16 @@ object ChestValue {
     private var display = emptyList<List<Any>>()
     private val chestItems = mutableMapOf<String, Item>()
     private val inInventory get() = isValidStorage()
+    private var inOwnInventory = false
+    private var compactInventory = true
 
     @SubscribeEvent
     fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!isEnabled()) return
         if (DungeonAPI.inDungeon() && !config.enableInDungeons) return
-        if (InventoryUtils.openInventoryName() == "") return
+        if (!inOwnInventory) {
+            if (InventoryUtils.openInventoryName() == "") return
+        }
 
         if (!config.showDuringEstimatedItemValue) {
             if (EstimatedItemValue.isCurrentlyShowing()) return
@@ -58,18 +63,21 @@ object ChestValue {
                 display,
                 extraSpace = -1,
                 itemScale = 0.7,
-                posLabel = "Estimated Chest Value"
+                posLabel = featureName(),
             )
         }
     }
 
+    fun featureName() = if (inOwnInventory) "Estimated Inventory Value" else "Estimated Chest Value"
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
+        if (!event.isMod(5)) return
+        val inInv = Minecraft.getMinecraft().currentScreen is GuiInventory
+        inOwnInventory = inInv && config.enableInOwnInventory
         if (!inInventory) return
-        if (event.isMod(5)) {
-            update()
-        }
+        update()
     }
 
     @SubscribeEvent
@@ -108,7 +116,7 @@ object ChestValue {
         var rendered = 0
 
         val amountShowing = if (config.itemToShow > sortedList.size) sortedList.size else config.itemToShow
-        newDisplay.addAsSingletonList("§7Estimated Chest Value: §o(Showing $amountShowing of ${sortedList.size} items)")
+        newDisplay.addAsSingletonList("§7${featureName()}: §o(Showing $amountShowing of ${sortedList.size} items)")
         for ((index, amount, stack, total, tips) in sortedList) {
             totalPrice += total
             if (rendered >= config.itemToShow) continue
@@ -121,17 +129,19 @@ object ChestValue {
                 "$name $price"
             else
                 "${stack.itemName} §7x$amount: §6${total.formatPrice()}"
-            newDisplay.add(buildList {
-                val renderable = Renderable.hoverTips(
-                    text,
-                    tips,
-                    stack = stack,
-                    highlightsOnHoverSlots = if (config.enableHighlight) index else emptyList()
-                )
-                add(" §7- ")
-                if (config.showStacks) add(stack)
-                add(renderable)
-            })
+            newDisplay.add(
+                buildList {
+                    val renderable = Renderable.hoverTips(
+                        text,
+                        tips,
+                        stack = stack,
+                        highlightsOnHoverSlots = if (config.enableHighlight) index else emptyList(),
+                    )
+                    add(" §7- ")
+                    if (config.showStacks) add(stack)
+                    add(renderable)
+                },
+            )
             rendered++
         }
         newDisplay.addAsSingletonList("§aTotal value: §6${totalPrice.formatPrice()} coins")
@@ -144,59 +154,68 @@ object ChestValue {
     }
 
     private fun addButton(newDisplay: MutableList<List<Any>>) {
-        newDisplay.addButton("§7Sorted By: ",
+        newDisplay.addButton(
+            "§7Sorted By: ",
             getName = SortType.entries[config.sortingType.ordinal].longName, // todo avoid ordinal
             onChange = {
                 // todo avoid ordinals
                 config.sortingType = SortingTypeEntry.entries[(config.sortingType.ordinal + 1) % 2]
                 update()
-            })
+            },
+        )
 
-        newDisplay.addButton("§7Value format: ",
+        newDisplay.addButton(
+            "§7Value format: ",
             getName = FormatType.entries[config.formatType.ordinal].type, // todo avoid ordinal
             onChange = {
                 // todo avoid ordinal
                 config.formatType = NumberFormatEntry.entries[(config.formatType.ordinal + 1) % 2]
                 update()
-            })
+            },
+        )
 
-        newDisplay.addButton("§7Display Type: ",
+        newDisplay.addButton(
+            "§7Display Type: ",
             getName = DisplayType.entries[if (config.alignedDisplay) 1 else 0].type,
             onChange = {
                 config.alignedDisplay = !config.alignedDisplay
                 update()
-            })
+            },
+        )
     }
 
     private fun init() {
-        if (inInventory) {
+        if (!inInventory) return
+        val slots = if (inOwnInventory) {
+            InventoryUtils.getSlotsInOwnInventory()
+        } else {
             val isMinion = InventoryUtils.openInventoryName().contains(" Minion ")
-            val slots = InventoryUtils.getItemsInOpenChest().filter {
+            InventoryUtils.getItemsInOpenChest().filter {
                 it.hasStack && it.inventory != Minecraft.getMinecraft().thePlayer.inventory && (!isMinion || it.slotNumber % 9 != 1)
             }
-            val stacks = buildMap {
-                slots.forEach {
-                    put(it.slotIndex, it.stack)
-                }
+        }
+        val stacks = buildMap {
+            slots.forEach {
+                put(it.slotIndex, it.stack)
             }
-            chestItems.clear()
-            for ((i, stack) in stacks) {
-                val internalName = stack.getInternalNameOrNull() ?: continue
-                if (internalName.getItemStackOrNull() == null) continue
-                val list = mutableListOf<String>()
-                var total = EstimatedItemValueCalculator.calculate(stack, list).first
-                val key = "$internalName+$total"
-                if (stack.item == Items.enchanted_book)
-                    total /= 2
-                list.add("§aTotal: §6§l${total.formatPrice()} coins")
-                if (total == 0.0) continue
-                val item = chestItems.getOrPut(key) {
-                    Item(mutableListOf(), 0, stack, 0.0, list)
-                }
-                item.index.add(i)
-                item.amount += stack.stackSize
-                item.total += total * stack.stackSize
+        }
+        chestItems.clear()
+        for ((i, stack) in stacks) {
+            val internalName = stack.getInternalNameOrNull() ?: continue
+            if (internalName.getItemStackOrNull() == null) continue
+            val list = mutableListOf<String>()
+            var total = EstimatedItemValueCalculator.calculate(stack, list).first
+            val key = "$internalName+$total"
+            if (stack.item == Items.enchanted_book)
+                total /= 2
+            list.add("§aTotal: §6§l${total.formatPrice()} coins")
+            if (total == 0.0) continue
+            val item = chestItems.getOrPut(key) {
+                Item(mutableListOf(), 0, stack, 0.0, list)
             }
+            item.index.add(i)
+            item.amount += stack.stackSize
+            item.total += total * stack.stackSize
         }
     }
 
@@ -212,13 +231,13 @@ object ChestValue {
 
     enum class SortType(val shortName: String, val longName: String) {
         PRICE_DESC("Price D", "Price Descending"),
-        PRICE_ASC("Price A", "Price Ascending")
+        PRICE_ASC("Price A", "Price Ascending"),
         ;
     }
 
     enum class FormatType(val type: String) {
         SHORT("Formatted"),
-        LONG("Unformatted")
+        LONG("Unformatted"),
         ;
     }
 
@@ -228,6 +247,7 @@ object ChestValue {
     }
 
     private fun isValidStorage(): Boolean {
+        if (inOwnInventory) return true
         val name = InventoryUtils.openInventoryName().removeColor()
         if (Minecraft.getMinecraft().currentScreen !is GuiChest) return false
         if (BazaarApi.inBazaarInventory) return false
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index d2c24cecae34..76f9fbfcbb6f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -6,6 +6,7 @@ import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.client.gui.inventory.GuiInventory
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.inventory.ContainerChest
 import net.minecraft.inventory.Slot
@@ -18,12 +19,16 @@ object InventoryUtils {
     var recentItemsInHand = mutableMapOf<Long, NEUInternalName>()
     var latestItemInHand: ItemStack? = null
 
-    fun getItemsInOpenChest() = buildList<Slot> {
+    fun getItemsInOpenChest(): List<Slot> {
         val guiChest = Minecraft.getMinecraft().currentScreen as? GuiChest ?: return emptyList<Slot>()
-        for (slot in guiChest.inventorySlots.inventorySlots) {
-            if (slot.inventory is InventoryPlayer) break
-            if (slot.stack != null) add(slot)
-        }
+        return guiChest.inventorySlots.inventorySlots
+            .filter { it.inventory !is InventoryPlayer && it.stack != null }
+    }
+
+    fun getSlotsInOwnInventory(): List<Slot> {
+        val guiInventory = Minecraft.getMinecraft().currentScreen as? GuiInventory ?: return emptyList<Slot>()
+        return guiInventory.inventorySlots.inventorySlots
+            .filter { it.inventory is InventoryPlayer && it.stack != null }
     }
 
     // TODO add cache that persists until the next gui/window open/close packet is sent/received

From 9e0ffecc8cbc7aadc99cbc916fca64f5e2e2c122 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 15 Jul 2024 17:04:32 +0200
Subject: [PATCH 099/721] Backend: Cleaner visitor rarity handling (#2220)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/data/jsonobjects/repo/GardenJson.kt         | 9 ++++++---
 .../features/garden/visitor/GardenVisitorColorNames.kt   | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt
index a6c7b84a27cf..8f442681edba 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt
@@ -17,10 +17,13 @@ data class GardenJson(
 )
 
 data class GardenVisitor(
-    @Expose val rarity: LorenzRarity,
-    @Expose @SerializedName("new_rarity") val newRarity: LorenzRarity?,
+    @Expose @SerializedName("rarity") private val _rarity: LorenzRarity,
+    @Expose @SerializedName("new_rarity") private val _newRarity: LorenzRarity?,
     @Expose val position: LorenzVec?,
     @Expose var skinOrType: String?,
     @Expose val mode: String,
     @Expose @SerializedName("need_items") val needItems: List<String>,
-)
+) {
+    val rarity: LorenzRarity
+        get() = _newRarity ?: _rarity
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
index 5fa0debe5c1f..fa847703fef8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
@@ -18,8 +18,7 @@ object GardenVisitorColorNames {
         visitorColours.clear()
         visitorItems.clear()
         for ((visitor, visitorData) in data.visitors) {
-            val rarity = visitorData.newRarity ?: visitorData.rarity
-            visitorColours[visitor] = rarity.color.getChatColor()
+            visitorColours[visitor] = visitorData.rarity.color.getChatColor()
             visitorItems[visitor] = visitorData.needItems
         }
     }

From 2de249337b48f5de439afd16c6793abbe3084a25 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 15 Jul 2024 19:50:12 +0200
Subject: [PATCH 100/721] Fix: Powder Tracker NPE on older versions (#2224)

---
 .../skyhanni/features/mining/powdertracker/PowderChestReward.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index 8c0fbca5728c..2f3ce9fd13fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -208,7 +208,7 @@ enum class PowderChestReward(val displayName: String, pattern: String) {
     ;
 
     val chatPattern by RepoPattern.pattern(
-        "mining.powder.tracker.reward." + this.patternName(),
+        "mining.powder.tracker.reward.${this.patternName()}.new",
         pattern,
     )
 

From ba091f8c3cfa665e83c789e1a5845d1ae0f26b6b Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 15 Jul 2024 19:54:04 +0200
Subject: [PATCH 101/721] Backend: RecalculatingValue as a ReadOnlyProperty
 (#2151)

---
 .../at/hannibal2/skyhanni/data/SlayerAPI.kt     |  8 +++-----
 .../features/event/hoppity/HoppityEggLocator.kt |  8 ++++----
 .../features/garden/AtmosphericFilterDisplay.kt |  2 +-
 .../skyhanni/features/inventory/ChestValue.kt   |  6 ++----
 .../chocolatefactory/ChocolateFactoryAPI.kt     |  2 +-
 .../skyhanni/features/misc/TimeFeatures.kt      |  4 ++--
 .../features/misc/items/GlowingDroppedItems.kt  |  6 +++---
 .../features/slayer/SlayerQuestWarning.kt       |  4 ++--
 .../features/slayer/SlayerRngMeterDisplay.kt    |  9 ++++++---
 .../hannibal2/skyhanni/utils/InventoryUtils.kt  |  2 +-
 .../at/hannibal2/skyhanni/utils/LorenzUtils.kt  |  7 +------
 .../at/hannibal2/skyhanni/utils/NEUItems.kt     |  2 +-
 .../skyhanni/utils/RecalculatingValue.kt        | 17 ++++++++++++++---
 .../hannibal2/skyhanni/utils/SkyblockSeason.kt  |  4 +---
 14 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 3c3c0d90b332..4f3b3713c770 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -62,7 +62,7 @@ object SlayerAPI {
         }
 
         event.addData {
-            add("activeSlayer: ${getActiveSlayer()}")
+            add("activeSlayer: $activeSlayer")
             add("isInCorrectArea: $isInCorrectArea")
             add("isInAnyArea: $isInAnyArea")
             add("latestSlayerProgress: $latestSlayerProgress")
@@ -82,9 +82,7 @@ object SlayerAPI {
         }
     }
 
-    fun getActiveSlayer() = activeSlayer.getValue()
-
-    private val activeSlayer = RecalculatingValue(1.seconds) {
+    val activeSlayer by RecalculatingValue(1.seconds) {
         grabActiveSlayer()
     }
 
@@ -125,7 +123,7 @@ object SlayerAPI {
             } else {
                 val slayerTypeForCurrentArea = getSlayerTypeForCurrentArea()
                 isInAnyArea = slayerTypeForCurrentArea != null
-                slayerTypeForCurrentArea == getActiveSlayer() && slayerTypeForCurrentArea != null
+                slayerTypeForCurrentArea == activeSlayer && slayerTypeForCurrentArea != null
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 419cd115c805..aa291eb92d18 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -166,7 +166,7 @@ object HoppityEggLocator {
     }
 
     private fun shouldShowAllEggs() =
-        config.showAllWaypoints && !hasLocatorInHotbar() && HoppityEggType.eggsRemaining()
+        config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
 
     fun eggFound() {
         resetData()
@@ -175,7 +175,7 @@ object HoppityEggLocator {
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
         if (!isEnabled()) return
-        if (!hasLocatorInHotbar()) return
+        if (!locatorInHotbar) return
         if (!event.isVillagerParticle() && !event.isEnchantmentParticle()) return
 
         val lastParticlePosition = lastParticlePosition ?: run {
@@ -281,9 +281,9 @@ object HoppityEggLocator {
 
     private val ItemStack.isLocatorItem get() = getInternalName() == locatorItem
 
-    private fun hasLocatorInHotbar() = RecalculatingValue(1.seconds) {
+    private val locatorInHotbar by RecalculatingValue(1.seconds) {
         LorenzUtils.inSkyBlock && InventoryUtils.getItemsInHotbar().any { it.isLocatorItem }
-    }.getValue()
+    }
 
     private fun LorenzVec.getEggLocationWeight(firstPoint: LorenzVec, secondPoint: LorenzVec): Double {
         val distToLine = this.distanceToLine(firstPoint, secondPoint)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt
index 91911e140dab..d00d277dc122 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt
@@ -21,7 +21,7 @@ object AtmosphericFilterDisplay {
     fun onSecondPassed(event: SecondPassedEvent) {
         if (!isEnabled()) return
         if (!GardenAPI.inGarden() && !config.outsideGarden) return
-        display = drawDisplay(SkyblockSeason.getCurrentSeason() ?: return)
+        display = drawDisplay(SkyblockSeason.currentSeason ?: return)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
index a5122fc6c85a..bd032fe66cda 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
@@ -54,9 +54,7 @@ object ChestValue {
             if (InventoryUtils.openInventoryName() == "") return
         }
 
-        if (!config.showDuringEstimatedItemValue) {
-            if (EstimatedItemValue.isCurrentlyShowing()) return
-        }
+        if (!config.showDuringEstimatedItemValue && EstimatedItemValue.isCurrentlyShowing()) return
 
         if (inInventory) {
             config.position.renderStringsAndItems(
@@ -256,7 +254,7 @@ object ChestValue {
 
 
         if ((name.contains("Backpack") && name.contains("Slot #") || name.startsWith("Ender Chest (")) &&
-            !InventoryUtils.isNeuStorageEnabled.getValue()
+            !InventoryUtils.isNeuStorageEnabled
         ) {
             return true
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index a6f3626b6e3d..f1cb4be0588c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -156,7 +156,7 @@ object ChocolateFactoryAPI {
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
 
     // TODO add debug toggle
-    fun isHoppityEvent() = SkyblockSeason.getCurrentSeason() == SkyblockSeason.SPRING
+    fun isHoppityEvent() = SkyblockSeason.currentSeason == SkyblockSeason.SPRING
 
     fun isMaxPrestige() = currentPrestige >= maxPrestige
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt
index 5512d69a8765..a4440295d8e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt
@@ -28,7 +28,7 @@ object TimeFeatures {
     private val timeFormat24h = SimpleDateFormat("HH:mm:ss")
     private val timeFormat12h = SimpleDateFormat("hh:mm:ss a")
 
-    private val startOfNextYear = RecalculatingValue(1.seconds) {
+    private val startOfNextYear by RecalculatingValue(1.seconds) {
         SkyBlockTime(year = SkyBlockTime.now().year + 1).asTimeMark()
     }
 
@@ -44,7 +44,7 @@ object TimeFeatures {
 
         if (winterConfig.islandCloseTime && IslandType.WINTER.isInIsland()) {
             if (WinterAPI.isDecember()) return
-            val timeTillNextYear = startOfNextYear.getValue().timeUntil()
+            val timeTillNextYear = startOfNextYear.timeUntil()
             val alreadyInNextYear = timeTillNextYear > 5.days
             val text = if (alreadyInNextYear) {
                 "§fJerry's Workshop §cis closing!"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
index 95c87e96d5d3..24cb1614e2a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
@@ -66,12 +66,12 @@ object GlowingDroppedItems {
         return rarity?.color?.toColor()?.rgb
     }
 
-    private val isShowcaseArea = RecalculatingValue(1.seconds) {
-        showcaseItemIslands.contains(LorenzUtils.skyBlockIsland) || showcaseItemLocations.contains(LorenzUtils.skyBlockArea)
+    private val isShowcaseArea by RecalculatingValue(1.seconds) {
+        LorenzUtils.skyBlockIsland in showcaseItemIslands || LorenzUtils.skyBlockArea in showcaseItemLocations
     }
 
     private fun shouldHideShowcaseItem(entity: EntityItem): Boolean {
-        if (!isShowcaseArea.getValue() || config.highlightShowcase) return false
+        if (!isShowcaseArea || config.highlightShowcase) return false
 
         for (entityArmorStand in entity.worldObj.getEntitiesWithinAABB(
             EntityArmorStand::class.java,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index 188283fbdee6..a5f8af5c79e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -102,7 +102,7 @@ object SlayerQuestWarning {
         if (DianaAPI.isDoingDiana()) return
         // prevent warnings when mobs are hit by other players
         if (lastWeaponUse.passedSince() > 500.milliseconds) return
-      
+
         lastWarning = SimpleTimeMark.now()
         ChatUtils.chat(chatMessage)
 
@@ -124,7 +124,7 @@ object SlayerQuestWarning {
     private fun isSlayerMob(entity: EntityLivingBase): Boolean {
         val slayerType = SlayerAPI.getSlayerTypeForCurrentArea() ?: return false
 
-        val activeSlayer = SlayerAPI.getActiveSlayer()
+        val activeSlayer = SlayerAPI.activeSlayer
 
         if (activeSlayer != null) {
             if (slayerType != activeSlayer) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
index 26e0822b196e..6396b287610e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -205,9 +205,12 @@ object SlayerRngMeterDisplay {
     }
 
     private fun makeLink(text: String) =
-        Renderable.clickAndHover(text, listOf("§eClick to open RNG Meter Inventory."), onClick = {
-            HypixelCommands.showRng("slayer", SlayerAPI.getActiveSlayer()?.rngName)
-        })
+        Renderable.clickAndHover(
+            text, listOf("§eClick to open RNG Meter Inventory."),
+            onClick = {
+                HypixelCommands.showRng("slayer", SlayerAPI.activeSlayer?.rngName)
+            },
+        )
 
     fun drawDisplay(): String {
         val storage = getStorage() ?: return ""
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index 76f9fbfcbb6f..c8492086ad79 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -71,7 +71,7 @@ object InventoryUtils {
     fun getLeggings(): ItemStack? = getArmor()[1]
     fun getBoots(): ItemStack? = getArmor()[0]
 
-    val isNeuStorageEnabled = RecalculatingValue(10.seconds) {
+    val isNeuStorageEnabled by RecalculatingValue(10.seconds) {
         try {
             val config = NotEnoughUpdates.INSTANCE.config
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index ea2a935a3079..3c97919fca4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -315,13 +315,8 @@ object LorenzUtils {
             this.cancel()
         }
     }
-
-    // TODO move into mayor api
-    private val recalculateDerpy =
-        RecalculatingValue(1.seconds) { Perk.DOUBLE_MOBS_HP.isActive }
-
     // TODO move into mayor api
-    val isDerpy get() = recalculateDerpy.getValue()
+    val isDerpy by RecalculatingValue(1.seconds) { Perk.DOUBLE_MOBS_HP.isActive }
 
     // TODO move into mayor api
     fun Int.derpy() = if (isDerpy) this / 2 else this
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 51a07c0b39bf..217d681c3bbb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -382,7 +382,7 @@ object NEUItems {
     fun neuHasFocus(): Boolean {
         if (AuctionSearchOverlay.shouldReplace()) return true
         if (BazaarSearchOverlay.shouldReplace()) return true
-        if (InventoryUtils.inStorage() && InventoryUtils.isNeuStorageEnabled.getValue()) return true
+        if (InventoryUtils.inStorage() && InventoryUtils.isNeuStorageEnabled) return true
         if (NEUOverlay.searchBarHasFocus) return true
 
         return false
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RecalculatingValue.kt b/src/main/java/at/hannibal2/skyhanni/utils/RecalculatingValue.kt
index 76f0c0c94005..6059ed662718 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RecalculatingValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RecalculatingValue.kt
@@ -1,17 +1,28 @@
 package at.hannibal2.skyhanni.utils
 
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
 import kotlin.time.Duration
 
-class RecalculatingValue<T>(private val expireTime: Duration, val calculation: () -> T) {
+class RecalculatingValue<T>(private val expireTime: Duration, private val calculation: () -> T) : ReadOnlyProperty<Any?, T> {
 
-    private var currentValue = calculation()
+    private var currentValue: Any? = UNINITIALIZED_VALUE
     private var lastAccessTime = SimpleTimeMark.farPast()
 
+    @Deprecated("use \"by RecalculatingValue\" instead")
     fun getValue(): T {
         if (lastAccessTime.passedSince() > expireTime) {
             currentValue = calculation()
             lastAccessTime = SimpleTimeMark.now()
         }
-        return currentValue
+        @Suppress("UNCHECKED_CAST")
+        return currentValue as T
+    }
+
+    @Suppress("DEPRECATION")
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T = getValue()
+
+    companion object {
+        private val UNINITIALIZED_VALUE = Any()
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyblockSeason.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyblockSeason.kt
index edeb706b7b11..d74b80959bcb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyblockSeason.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyblockSeason.kt
@@ -21,9 +21,7 @@ enum class SkyblockSeason(
 
     companion object {
 
-        fun getCurrentSeason(): SkyblockSeason? = currentSeason.getValue()
-
-        private val currentSeason = RecalculatingValue(1.seconds) {
+        val currentSeason by RecalculatingValue(1.seconds) {
             getSeasonByName(SkyBlockTime.now().monthName)
         }
 

From 9716ad9e545fb92918ecfab6dfe16f4179dbce09 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 15 Jul 2024 13:56:21 -0400
Subject: [PATCH 102/721] Fix: Farming ETA Duration "NaN" (#2217)

---
 .../skyhanni/features/garden/farming/FarmingWeightDisplay.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index a2ca09f15a32..60f665760045 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -372,6 +372,9 @@ object FarmingWeightDisplay {
     private fun isEtaEnabled() = config.overtakeETA
 
     fun addCrop(crop: CropType, addedCounter: Int) {
+        //Prevent div-by-0 errors
+        if (addedCounter == 0) return;
+
         val before = getExactWeight()
         localCounter[crop] = crop.getLocalCounter() + addedCounter
         val after = getExactWeight()
@@ -384,7 +387,7 @@ object FarmingWeightDisplay {
     private fun updateWeightPerSecond(crop: CropType, before: Double, after: Double, diff: Int) {
         val speed = crop.getSpeed() ?: return
         val weightDiff = (after - before) * 1000
-        weightPerSecond = weightDiff / diff * speed / 1000
+        weightPerSecond = ((weightDiff / diff) * (speed / 1000))
     }
 
     private fun getExactWeight(): Double {

From 61b8122645de0eb948a938da9d4a452265f36c08 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:00:50 +0200
Subject: [PATCH 103/721] label bug fix workflow now ignores closed pull
 requests

---
 .github/workflows/label-bug-fix.yml | 41 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index 37e2296a9fb5..dae2980de630 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -1,9 +1,10 @@
 name: "Bug Fix label"
 on:
     pull_request_target:
-        types: [ opened,edited ]
+        types: [ opened, edited ]
 jobs:
     assign-label:
+        if: github.event.pull_request.state == 'open' # Condition to check if PR is open
         runs-on: ubuntu-latest
         permissions:
             issues: write
@@ -19,25 +20,25 @@ jobs:
                     github-token: ${{ secrets.GITHUB_TOKEN}}
                     script: |
                         if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
-                            github.rest.issues.addLabels({
-                                issue_number: context.issue.number,
-                                owner: context.repo.owner,
-                                repo: context.repo.repo,
-                                labels: [process.env.LABEL]
-                            })
+                          github.rest.issues.addLabels({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            labels: [process.env.LABEL]
+                          })
                         }else{
-                            const {data} = await github.rest.issues.listLabelsOnIssue({
-                                issue_number: context.issue.number,
-                                owner: context.repo.owner,
-                                repo: context.repo.repo,
+                          const {data} = await github.rest.issues.listLabelsOnIssue({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                          })
+                          const filtered = data.filter(label => label.name == process.env.LABEL)
+                          if(filtered.length == 1){
+                            github.rest.issues.removeLabel({
+                              issue_number: context.issue.number,
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              name: process.env.LABEL
                             })
-                            const filtered = data.filter(label => label.name == process.env.LABEL)
-                            if(filtered.length == 1){
-                                github.rest.issues.removeLabel({
-                                    issue_number: context.issue.number,
-                                    owner: context.repo.owner,
-                                    repo: context.repo.repo,
-                                    name: process.env.LABEL
-                                })
-                            }
+                          }
                         }

From 3875fd1658028708e6b990c45599142df8ec7d38 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:14:42 +0200
Subject: [PATCH 104/721] Improvement: Compact Rancher Speed GUI (#2137)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../optimalspeed/OptimalSpeedConfig.java      |  5 ++
 .../features/garden/GardenOptimalSpeed.kt     | 89 ++++++++++++-------
 .../skyhanni/utils/renderables/Renderable.kt  | 12 +--
 3 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
index 07a049bf5a2a..6e44ecfec217 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
@@ -27,6 +27,11 @@ public class OptimalSpeedConfig {
     @FeatureToggle
     public boolean signEnabled = true;
 
+    @Expose
+    @ConfigOption(name = "Compact GUI", desc = "Compact the Rancher Boots GUI only showing crop icons")
+    @ConfigEditorBoolean
+    public boolean compactRancherGui = false;
+
     @Expose
     @ConfigLink(owner = OptimalSpeedConfig.class, field = "signEnabled")
     public Position signPosition = new Position(20, -195, false, true);
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
index 1af272051633..5eb89a138ef0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
@@ -8,10 +8,11 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import io.github.notenoughupdates.moulconfig.observer.Property
@@ -20,7 +21,6 @@ import net.minecraft.client.gui.inventory.GuiEditSign
 import net.minecraftforge.client.event.GuiOpenEvent
 import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
@@ -29,9 +29,10 @@ object GardenOptimalSpeed {
     private val config get() = GardenAPI.config.optimalSpeeds
 
     private val configCustomSpeed get() = config.customSpeed
+    private var sneakingSince = SimpleTimeMark.farFuture()
     private var sneakingTime = 0.seconds
     private val sneaking get() = Minecraft.getMinecraft().thePlayer.isSneaking
-    private val sneakingPersistent get() = sneakingTime > 5.seconds
+    private val sneakingPersistent get() = sneakingSince.passedSince() > 5.seconds
 
     /**
      * This speed value represents the walking speed, not the speed stat.
@@ -47,46 +48,70 @@ object GardenOptimalSpeed {
      */
     private var currentSpeed = 100
 
-    private var optimalSpeed = -1
-    private var lastWarnTime = 0L
+    private var optimalSpeed: Int? = null
+    private var lastWarnTime = SimpleTimeMark.farPast()
     private var cropInHand: CropType? = null
-    private var rancherOverlayList: List<List<Any?>> = emptyList()
+    private var lastCrop: CropType? = null
+    private var display = listOf<Renderable>()
     private var lastToolSwitch = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
+        if (!GardenAPI.inGarden()) return
         currentSpeed = (Minecraft.getMinecraft().thePlayer.capabilities.walkSpeed * 1000).toInt()
 
-        if (sneaking) {
+        if (sneaking && !sneakingSince.isInPast()) {
+            sneakingSince = SimpleTimeMark.now()
             currentSpeed = (currentSpeed * 0.3).toInt()
-            sneakingTime += 50.milliseconds
-        } else {
+        } else if (!sneaking && sneakingSince.isInPast()) {
             sneakingTime = 0.seconds
+            sneakingSince = SimpleTimeMark.farFuture()
         }
     }
 
     @SubscribeEvent
     fun onGuiOpen(event: GuiOpenEvent) {
         if (!isRancherOverlayEnabled()) return
-        val gui = event.gui
-        if (gui !is GuiEditSign) return
+        val gui = event.gui as? GuiEditSign ?: return
         if (!gui.isRancherSign()) return
-        rancherOverlayList = CropType.entries.map { crop ->
-            listOf(crop.icon, Renderable.link("${crop.cropName} - ${crop.getOptimalSpeed()}") {
-                LorenzUtils.setTextIntoSign("${crop.getOptimalSpeed()}")
-            })
+
+        val crops = CropType.entries.map { it to it.getOptimalSpeed() }
+
+        display = if (config.compactRancherGui) {
+            crops.groupBy({ it.second }, { it.first }).map { (speed, crops) ->
+                val color = if (lastCrop in crops) LorenzColor.GOLD else LorenzColor.WHITE
+                val renderable = Renderable.horizontalContainer(
+                    listOf(
+                        Renderable.horizontalContainer(crops.map { Renderable.itemStack(it.icon) }),
+                        Renderable.string("${color.getChatColor()} - $speed"),
+                    ),
+                    spacing = 2,
+                )
+                Renderable.link(renderable, underlineColor = color.toColor(), onClick = { LorenzUtils.setTextIntoSign("$speed") })
+            }
+        } else {
+            crops.map { (crop, speed) ->
+                val color = if (lastCrop == crop) LorenzColor.GOLD else LorenzColor.WHITE
+                val renderable = Renderable.horizontalContainer(
+                    listOf(
+                        Renderable.itemStack(crop.icon),
+                        Renderable.string("${color.getChatColor()}${crop.cropName} - $speed"),
+                    ),
+                    spacing = 2,
+                )
+                Renderable.link(renderable, underlineColor = color.toColor(), onClick = { LorenzUtils.setTextIntoSign("$speed") })
+            }
         }
     }
 
     @SubscribeEvent
     fun onGuiRender(event: DrawScreenEvent.Post) {
         if (!isRancherOverlayEnabled()) return
-        val gui = event.gui
-        if (gui !is GuiEditSign) return
+        val gui = event.gui as? GuiEditSign ?: return
         if (!gui.isRancherSign()) return
-        config.signPosition.renderStringsAndItems(
-            rancherOverlayList,
-            posLabel = "Optimal Speed Rancher Overlay"
+        config.signPosition.renderRenderables(
+            display,
+            posLabel = "Optimal Speed Rancher Overlay",
         )
     }
 
@@ -94,7 +119,8 @@ object GardenOptimalSpeed {
     fun onGardenToolChange(event: GardenToolChangeEvent) {
         lastToolSwitch = SimpleTimeMark.now()
         cropInHand = event.crop
-        optimalSpeed = cropInHand?.getOptimalSpeed() ?: -1
+        event.crop?.let { lastCrop = it }
+        optimalSpeed = cropInHand?.getOptimalSpeed()
     }
 
     @SubscribeEvent
@@ -129,12 +155,12 @@ object GardenOptimalSpeed {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!GardenAPI.inGarden()) return
 
-        if (optimalSpeed == -1) return
+        val speed = optimalSpeed ?: return
 
         if (GardenAPI.hideExtraGuis()) return
 
-        var text = "Optimal Speed: §f$optimalSpeed"
-        if (optimalSpeed != currentSpeed) {
+        var text = "Optimal Speed: §f$speed"
+        if (speed != currentSpeed) {
             text += " (§eCurrent: §f$currentSpeed"
             if (sneaking) text += " §7[Sneaking]"
             text += "§f)"
@@ -143,25 +169,24 @@ object GardenOptimalSpeed {
         val recentlySwitchedTool = lastToolSwitch.passedSince() < 1.5.seconds
         val recentlyStartedSneaking = sneaking && !sneakingPersistent
 
-        val colorCode =
-            if (recentlySwitchedTool || recentlyStartedSneaking) "7" else if (optimalSpeed != currentSpeed) "c" else "a"
+        val colorCode = if (recentlySwitchedTool || recentlyStartedSneaking) "7" else if (speed != currentSpeed) "c" else "a"
 
         if (config.showOnHUD) config.pos.renderString("§$colorCode$text", posLabel = "Garden Optimal Speed")
-        if (optimalSpeed != currentSpeed && !recentlySwitchedTool && !recentlyStartedSneaking) warn()
+        if (speed != currentSpeed && !recentlySwitchedTool && !recentlyStartedSneaking) warn(speed)
     }
 
-    private fun warn() {
-        if (!config.warning) return
+    private fun warn(speed: Int) {
         if (!Minecraft.getMinecraft().thePlayer.onGround) return
         if (GardenAPI.onBarnPlot) return
-        if (System.currentTimeMillis() < lastWarnTime + 20_000) return
+        if (!config.warning) return
+        if (lastWarnTime.passedSince() < 20.seconds) return
 
-        lastWarnTime = System.currentTimeMillis()
+        lastWarnTime = SimpleTimeMark.now()
         LorenzUtils.sendTitle("§cWrong speed!", 3.seconds)
         cropInHand?.let {
             var text = "Wrong speed for ${it.cropName}: §f$currentSpeed"
             if (sneaking) text += " §7[Sneaking]"
-            text += " §e(§f$optimalSpeed §eis optimal)"
+            text += " §e(§f$speed §eis optimal)"
 
             ChatUtils.chat(text)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index b12668d72b8f..4645152419d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -84,7 +84,7 @@ interface Renderable {
         }
 
         fun link(text: String, bypassChecks: Boolean = false, onClick: () -> Unit): Renderable =
-            link(string(text), onClick, bypassChecks = bypassChecks) { true }
+            link(string(text), onClick, bypassChecks = bypassChecks)
 
         fun optionalLink(
             text: String,
@@ -101,10 +101,11 @@ interface Renderable {
             bypassChecks: Boolean = false,
             highlightsOnHoverSlots: List<Int> = emptyList(),
             condition: () -> Boolean = { true },
+            underlineColor: Color = Color.WHITE,
         ): Renderable {
             return clickable(
                 hoverable(
-                    underlined(renderable), renderable, bypassChecks,
+                    underlined(renderable, underlineColor), renderable, bypassChecks,
                     condition = condition,
                     highlightsOnHoverSlots = highlightsOnHoverSlots,
                 ),
@@ -282,15 +283,16 @@ interface Renderable {
             return result
         }
 
-        fun underlined(renderable: Renderable) = object : Renderable {
+        fun underlined(renderable: Renderable, color: Color = Color.WHITE) = object : Renderable {
             override val width: Int
                 get() = renderable.width
-            override val height = 10
+            override val height: Int
+                get() = renderable.height + 1
             override val horizontalAlign = renderable.horizontalAlign
             override val verticalAlign = renderable.verticalAlign
 
             override fun render(posX: Int, posY: Int) {
-                Gui.drawRect(0, 10, width, 11, 0xFFFFFFFF.toInt())
+                Gui.drawRect(0, height, width, 11, color.rgb)
                 GlStateManager.color(1F, 1F, 1F, 1F)
                 renderable.render(posX, posY)
             }

From f9e0fbd23a8243b931a43f48818e8d76f8e0cbd7 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Mon, 15 Jul 2024 20:16:36 +0200
Subject: [PATCH 105/721] Backend: Remove redundant property from
 HotmAPI.Powder (#2128)

---
 src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt   | 6 ++----
 src/main/java/at/hannibal2/skyhanni/data/HotmData.kt | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
index 38c901c85d8b..39305a012af1 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
@@ -37,15 +37,13 @@ object HotmAPI {
 
         ;
 
-        val lowName = name.lowercase().firstLetterUppercase()
-
         val heartPattern by RepoPattern.pattern(
             "inventory.${name.lowercase()}.heart",
-            "§7$lowName Powder: §a§.(?<powder>[\\d,]+)"
+            "§7$displayName Powder: §a§.(?<powder>[\\d,]+)"
         )
         val resetPattern by RepoPattern.pattern(
             "inventory.${name.lowercase()}.reset",
-            "\\s+§8- §.(?<powder>[\\d,]+) $lowName Powder"
+            "\\s+§8- §.(?<powder>[\\d,]+) $displayName Powder"
         )
 
         fun pattern(isHeart: Boolean) = if (isHeart) heartPattern else resetPattern
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index f3a2189b0999..2d8ea945759a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -651,13 +651,13 @@ enum class HotmData(
             if (!LorenzUtils.inSkyBlock) return
 
             event.scoreboard.matchFirst(ScoreboardPattern.powderPattern) {
-                val type = HotmAPI.Powder.entries.firstOrNull { it.lowName == group("type") } ?: return
+                val type = HotmAPI.Powder.entries.firstOrNull { it.displayName == group("type") } ?: return
                 val amount = group("amount").formatLong()
                 val difference = amount - type.getCurrent()
 
                 if (difference > 0) {
                     type.gain(difference)
-                    ChatUtils.debug("Gained §a${difference.addSeparators()} §e${type.lowName} Powder")
+                    ChatUtils.debug("Gained §a${difference.addSeparators()} §e${type.displayName} Powder")
                 }
             }
         }
@@ -745,7 +745,7 @@ enum class HotmData(
             event.addIrrelevant {
                 add("Tokens : $availableTokens/$tokens")
                 HotmAPI.Powder.entries.forEach {
-                    add("${it.lowName} Powder: ${it.getCurrent()}/${it.getTotal()}")
+                    add("${it.displayName} Powder: ${it.getCurrent()}/${it.getTotal()}")
                 }
                 add("Ability: ${HotmAPI.activeMiningAbility?.printName}")
                 add("Blue Egg: ${HotmAPI.isBlueEggActive}")

From b7c7711d40a0676d530d7b8eb258ec946f8012ad Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:39:57 +0200
Subject: [PATCH 106/721] Improvement: Add Reset Buttons to Custom Scoreboard
 (#2141)

---
 .../gui/customscoreboard/CustomScoreboardConfig.java       | 7 +++++++
 .../config/features/gui/customscoreboard/EventsConfig.java | 7 +++++++
 .../features/gui/customscoreboard/ScoreboardElements.kt    | 4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
index d429261b0e64..bc3dc1fc6f95 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
@@ -6,6 +6,7 @@
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
@@ -32,6 +33,12 @@ public class CustomScoreboardConfig {
     @ConfigEditorDraggableList()
     public List<ScoreboardElement> scoreboardEntries = new ArrayList<>(ScoreboardElement.defaultOption);
 
+    @ConfigOption(name = "Reset Appearance", desc = "Reset the appearance of the advanced scoreboard.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable reset = () -> {
+        scoreboardEntries = ScoreboardElement.defaultOption;
+    };
+
     @Expose
     @ConfigOption(name = "Display Options", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
index f2fd7a85aae0..0093b8588f3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
@@ -19,6 +20,12 @@ public class EventsConfig {
     @ConfigEditorDraggableList()
     public List<ScoreboardEvent> eventEntries = new ArrayList<>(ScoreboardEvent.defaultOption);
 
+    @ConfigOption(name = "Reset Events Priority", desc = "Reset the priority of all events.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable reset = () -> {
+        eventEntries = ScoreboardEvent.defaultOption;
+    };
+
     @Expose
     @ConfigOption(name = "Show all active events", desc = "Show all active events in the scoreboard instead of the one with the highest priority.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 1a435a269b03..a3b3652b2815 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -320,6 +320,7 @@ enum class ScoreboardElement(
             MOTES,
             BITS,
             COPPER,
+            GEMS,
             NORTH_STARS,
             HEAT,
             COLD,
@@ -333,13 +334,14 @@ enum class ScoreboardElement(
             DATE,
             TIME,
             EVENTS,
-            OBJECTIVE,
             COOKIE,
             EMPTY_LINE3,
             QUIVER,
             POWER,
             TUNING,
             EMPTY_LINE4,
+            OBJECTIVE,
+            SLAYER,
             POWDER,
             MAYOR,
             PARTY,

From 88faa15a0dd554148f3fadcc8f3d2df741e87cde Mon Sep 17 00:00:00 2001
From: raaaaaven <168305416+raaaaaven@users.noreply.github.com>
Date: Mon, 15 Jul 2024 19:49:13 +0100
Subject: [PATCH 107/721] Feature: Reset Custom Wardrobe Settings (#2120)

Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: raven <raveeeennnn@hotmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../inventory/customwardrobe/ColorConfig.java |  6 +++
 .../customwardrobe/SpacingConfig.java         |  6 +++
 .../inventory/wardrobe/CustomWardrobeReset.kt | 41 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeReset.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/ColorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/ColorConfig.java
index 20f9282542b3..f088f72eaddd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/ColorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/ColorConfig.java
@@ -1,11 +1,17 @@
 package at.hannibal2.skyhanni.config.features.inventory.customwardrobe;
 
+import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobeReset;
 import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class ColorConfig {
 
+    @ConfigOption(name = "Reset to Default", desc = "Reset all custom wardrobe color settings to the default.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable resetColor = CustomWardrobeReset::resetColor;
+
     @Expose
     @ConfigOption(name = "Background", desc = "Color of the GUI background.")
     @ConfigEditorColour
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/SpacingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/SpacingConfig.java
index 13bf54207c65..4f9887348583 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/SpacingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/customwardrobe/SpacingConfig.java
@@ -1,12 +1,18 @@
 package at.hannibal2.skyhanni.config.features.inventory.customwardrobe;
 
+import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobeReset;
 import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import io.github.notenoughupdates.moulconfig.observer.Property;
 
 public class SpacingConfig {
 
+    @ConfigOption(name = "Reset to Default", desc = "Reset all custom wardrobe spacing settings to the default.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable resetSpacing = CustomWardrobeReset::resetSpacing;
+
     @Expose
     @ConfigOption(name = "Global Scale", desc = "Control the scale of the entirety of the wardrobe.")
     @ConfigEditorSlider(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeReset.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeReset.kt
new file mode 100644
index 000000000000..209bd3df7006
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeReset.kt
@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.features.inventory.wardrobe
+
+import at.hannibal2.skyhanni.SkyHanniMod
+
+object CustomWardrobeReset {
+    private val config get() = SkyHanniMod.feature.inventory.customWardrobe
+
+    @JvmStatic
+    fun resetSpacing() {
+        with(config.spacing) {
+            globalScale.set(100)
+            outlineThickness.set(5)
+            outlineBlur.set(0.5f)
+            slotWidth.set(75)
+            slotHeight.set(140)
+            playerScale.set(75)
+            maxPlayersPerRow.set(9)
+            horizontalSpacing.set(3)
+            verticalSpacing.set(3)
+            buttonSlotsVerticalSpacing.set(10)
+            buttonHorizontalSpacing.set(10)
+            buttonVerticalSpacing.set(10)
+            buttonWidth.set(50)
+            buttonHeight.set(20)
+            backgroundPadding.set(10)
+        }
+    }
+
+    @JvmStatic
+    fun resetColor() {
+        with(config.color) {
+            backgroundColor = "0:127:0:0:0"
+            equippedColor = "0:127:85:255:85"
+            favoriteColor = "0:127:255:85:85"
+            samePageColor = "0:127:94:108:255"
+            otherPageColor = "0:127:0:0:0"
+            topBorderColor = "0:255:255:200:0"
+            bottomBorderColor = "0:255:255:0:0"
+        }
+    }
+}

From 56928eeedb53e46daac3453d8890763b56894630 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:35:55 -0400
Subject: [PATCH 108/721] Fix: Fish The Rabbit Production Time in Lore (#2225)

---
 .../inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
index 0c785c7612c8..87e197a96600 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
@@ -16,10 +16,11 @@ object ChocolateFactoryTooltipStray {
      * REGEX-TEST: §7You gained §6+2,465,018 Chocolate§7!
      * REGEX-TEST: §7gained §6+30,292 Chocolate§7!
      * REGEX-TEST: §7§6+36,330 Chocolate§7!
+     * REGEX-TEST: §9Rabbit§7, so you received §655,935,257
      */
     private val chocolateGainedPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.stray",
-        "(?:§.)+(?:You )?(?:gained )?§6\\+(?<amount>[\\d,]+) Chocolate§7!"
+        "(?:§.)?+(?:Rabbit§7, so )?(?:[Yy]ou )?(?:gained |received )?§6\\+?(?<amount>[\\d,]+)(?:$| Chocolate§7!)"
     )
 
     @SubscribeEvent(priority = EventPriority.HIGH)

From 8d76767ab562ddb3a7912ac23c2b10c2c8195070 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:49:46 +0200
Subject: [PATCH 109/721] Version 0.26 Beta 17

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 22 +++++++++++++++++++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a25a71a117d6..a09c8290a5f8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.16"
+version = "0.26.Beta.17"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index db47ad29ed3d..bb031f27a64c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -170,6 +170,8 @@
 + Allow clicking on the Craftable! text in the shopping list to open the "view recipe" menu. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2075)
 + Rename Mushroom Tier to Mushroom Milestone in Mooshroom Cow Perk. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2159)
 + Add Fine Flour to the /ff menu. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
++ Added a "Compact" option to the Rancher Boots Optimal Speed GUI. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
++ The Rancher Boots Optimal Speed GUI now highlights the crop corresponding to the last held tool. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
 
 #### Hoppity Event Improvements
 
@@ -239,6 +241,8 @@
     + Add Toxophilite.
     + Add option to choose whether to use Bazaar buy order or instant buy prices.
     + Calculating with tier 5 prices for Ferocious Mana, Hardened Mana, Mana Vampire and Strong Mana.
++ Added reset buttons for colors and spacing in the Custom Wardrobe config. - raven (https://github.com/hannibal002/SkyHanni/pull/2120)
++ Added an option for the Estimated Chest Value display to also work in your own inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2218)
 
 #### Fishing Improvements
 
@@ -280,6 +284,7 @@
 + Improved phrasing of config descriptions, enhanced overall readability, fixed typos, newlines, etc. - zapteryx (https://github.com/hannibal002/SkyHanni/pull/2067)
 + Add some OneConfig mods to the quick mod switcher. - nea (https://github.com/hannibal002/SkyHanni/pull/2155)
 + Add config option to maintain "current" sound settings levels while warning sounds are played. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2129)
++ Added a reset button in the config for the appearance and event priority of the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2141)
 
 ### Fixes
 
@@ -304,6 +309,7 @@
 + Fixed ore event sometimes getting stuck. - Empa (https://github.com/hannibal002/SkyHanni/pull/2115)
 + Fix incorrect powder costs and powder spent amounts being displayed for some HOTM perks. - Luna (https://github.com/hannibal002/SkyHanni/pull/2145)
 + Fix Powder Percentage Compatibility Issue with ColeWeight. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2186)
++ Fixed Powder detection from chat messages. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2207)
 
 #### Garden Fixes
 
@@ -322,6 +328,11 @@
 + Fix an issue where the farming overtake ETA was being displayed as 60 times longer than it actually was. - Evhan_ (https://github.com/hannibal002/SkyHanni/pull/2158)
 + Fix overflow level up message being sent upon reaching crop milestone 46. - Luna (https://github.com/hannibal002/SkyHanni/pull/2161)
 + Fix Craftable! text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2183)
++ Fixed an error in the Farming ETA Duration calculation. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2217)
++ Fixed a bug where the fragged Daedalus Axe was not being detected as a farming tool. - Luna (https://github.com/hannibal002/SkyHanni/pull/2212)
++ Fixed Fine Flour exportation not getting detected from chat messages for use in FF Guide. - Luna (https://github.com/hannibal002/SkyHanni/pull/2215)
++ Fixed "Craftable!" text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2219)
++ Fixed favorite pets not being detected by FF Guide. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2202)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -348,6 +359,8 @@
 + Allow seeing the unclaimed eggs GUI while "Busy". - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2091)
     + In the Rift, Kuudra, Dungeons, etc.
 + Fix detection for supreme chocolate bar completion. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
++ Fixed the detection of production time from Fish the Rabbit. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2225)
++ Fixed buying items sometimes triggering compact Hoppity messages. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2201)
 
 #### Custom Scoreboard Fixes
 
@@ -418,6 +431,10 @@
 + Fix wrong item prices in Estimated Item Value when the craft price is higher than the NPC price and the item is soulbound. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2173)
     + E.g. for Gillsplash (fishing equipment).
 + Fix Custom Wardrobe Keybinds not working. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2198)
++ Fixed price calculation for Kuudra keys. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2205)
++ Page scrolling now works correctly in the museum. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2208)
++ Fixed detecting Hot Potato Books inside the Community Project as potatoes. - Empa (https://github.com/hannibal002/SkyHanni/pull/2214)
++ Fixed price source inconsistencies (Bazaar sell/buy and NPC prices). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2221)
 
 #### Combat Fixes
 
@@ -457,6 +474,7 @@
 + Fix "/worldedit right" setting the left position. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2179)
 + Fix a bug in the Hypixel detection. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2193)
 + Fix random Stack Overflow Errors. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2199)
++ Fixed a typo in /shcommands. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2223)
 
 ### Technical Details
 
@@ -560,6 +578,10 @@
 + Mob Detection now runs every tick instead of every other tick. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2096)
 + RepoPattern locale loading now works inversely for the development environment. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2069)
 + Move Hoppity Rabbit chat patterns to the eggs manager. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2144)
++ Removed redundant `lowName` property from HotmAPI.Powder. - Luna (https://github.com/hannibal002/SkyHanni/pull/2128)
++ Made RecalculatingValue a ReadOnlyProperty. - Empa (https://github.com/hannibal002/SkyHanni/pull/2151)
++ Visitor rarities from the repository are now exposed to the code in a cleaner way. - Luna (https://github.com/hannibal002/SkyHanni/pull/2220)
++ Added automatic PR labeling for bug fixes. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2203)
 
 ### Removed Features
 
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index da3ff292b0f9..32e6f9cccb45 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.16",
+    version = "0.26.Beta.17",
 )
 class SkyHanniMod {
 

From 23af2e0d2131b423837064065b33d75ba555d483 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:49:28 +1000
Subject: [PATCH 110/721] Remove sh limbo (#2231)

---
 .../java/at/hannibal2/skyhanni/config/commands/Commands.kt    | 4 ----
 .../java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 959f81973ed5..c08595b5bf80 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -320,10 +320,6 @@ object Commands {
             "shlimbostats",
             "Prints your Limbo Stats.\n §7This includes your Personal Best, Playtime, and §aSkyHanni User Luck§7!",
         ) { LimboTimeTracker.printStats() }
-        registerCommand(
-            "shlimbo",
-            "Warps you to Limbo.",
-        ) { MiscFeatures.goToLimbo() }
         registerCommand(
             "shlanedetection",
             "Detect a farming lane in garden",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
index 123394e9964a..c34a49a7d83a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
@@ -54,8 +54,4 @@ object MiscFeatures {
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(2, "mobs", "combat.mobs")
     }
-
-    fun goToLimbo() {
-        ChatUtils.sendMessageToServer("§")
-    }
 }

From fb7384530a123d2b6159afb0ca16db658eaa26b5 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 17 Jul 2024 04:52:59 -0400
Subject: [PATCH 111/721] Fix: Farming ETA Approaches 0 (#2230)

---
 .../skyhanni/features/garden/farming/FarmingWeightDisplay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 60f665760045..ffd778aa36bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -387,7 +387,7 @@ object FarmingWeightDisplay {
     private fun updateWeightPerSecond(crop: CropType, before: Double, after: Double, diff: Int) {
         val speed = crop.getSpeed() ?: return
         val weightDiff = (after - before) * 1000
-        weightPerSecond = ((weightDiff / diff) * (speed / 1000))
+        weightPerSecond = (((weightDiff / diff) * speed) / 1000)
     }
 
     private fun getExactWeight(): Double {

From 81358be1e6fe2ba1de02afcd2d08a969679bd14a Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:42:27 +0200
Subject: [PATCH 112/721] Feature: Crown of Avarice Counter (#2229)

---
 .../itemability/CrownOfAvariceConfig.java     | 28 ++++++++++
 .../itemability/ItemAbilityConfig.java        |  7 +++
 .../itemabilities/CrownOfAvariceCounter.kt    | 51 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  |  2 +
 4 files changed, 88 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/itemability/CrownOfAvariceConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/CrownOfAvariceConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/CrownOfAvariceConfig.java
new file mode 100644
index 000000000000..4c23afa12b7b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/CrownOfAvariceConfig.java
@@ -0,0 +1,28 @@
+package at.hannibal2.skyhanni.config.features.itemability;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CrownOfAvariceConfig {
+
+    @Expose
+    @ConfigOption(name = "Counter",
+        desc = "Shows the current coins of your crown of avarice (if worn).")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enable = false;
+
+    @Expose
+    @ConfigOption(name = "Counter format",
+        desc = "Have the crown of avarice counter as short format instead of every digit.")
+    @ConfigEditorBoolean
+    public boolean shortFormat = true;
+
+    @Expose
+    @ConfigLink(owner = CrownOfAvariceConfig.class,field = "enable")
+    public Position position = new Position(20,20);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java
index d428b591fc93..21ba39b8eccf 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java
@@ -1,9 +1,11 @@
 package at.hannibal2.skyhanni.config.features.itemability;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class ItemAbilityConfig {
@@ -36,6 +38,11 @@ public class ItemAbilityConfig {
     @Expose
     public ChickenHeadConfig chickenHead = new ChickenHeadConfig();
 
+    @ConfigOption(name = "Crown of Avarice", desc = "")
+    @Accordion
+    @Expose
+    public CrownOfAvariceConfig crownOfAvarice = new CrownOfAvariceConfig();
+
     @Expose
     @ConfigOption(name = "Depleted Bonzo's Masks",
         desc = "Highlight used Bonzo's Masks and Spirit Masks with a background.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt
new file mode 100644
index 000000000000..207e1b92b6a1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.features.itemabilities
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.extraAttributes
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object CrownOfAvariceCounter {
+
+    private val config get() = SkyHanniMod.feature.inventory.itemAbilities.crownOfAvarice
+
+    private val internalName = "CROWN_OF_AVARICE".asInternalName()
+
+    private var render: Renderable? = null
+
+    @SubscribeEvent
+    fun onOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        render?.let { config.position.renderRenderable(it, posLabel = "Crown of Avarice Counter") }
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        render = check()
+    }
+
+    fun check(): Renderable? {
+        if (!LorenzUtils.inSkyBlock) return null
+        if (!config.enable) return null
+        val item = InventoryUtils.getHelmet()
+        if (item?.getInternalNameOrNull() != internalName) return null
+        val count = item.extraAttributes.getLong("collected_coins");
+        return Renderable.horizontalContainer(
+            listOf(
+                Renderable.itemStack(internalName.getItemStack()),
+                Renderable.string("§6" + if (config.shortFormat) count.shortFormat() else count.addSeparators()),
+            ),
+        )
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 5bafb370a840..3f84416292bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -46,6 +46,8 @@ object ItemUtils {
         return list
     }
 
+    val ItemStack.extraAttributes : NBTTagCompound get() = this.tagCompound.getCompoundTag("ExtraAttributes")
+
     // TODO change else janni is sad
     fun ItemStack.isCoopSoulBound(): Boolean =
         getLore().any {

From 3e1734851ffcbc6f2fab737d67488b54c03cea24 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Sat, 20 Jul 2024 15:40:04 +0200
Subject: [PATCH 113/721] Fix: PowderTracker Pattern (#2240)

---
 .../mining/powdertracker/PowderChestReward.kt | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index 2f3ce9fd13fe..b2b449563a5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -6,204 +6,204 @@ enum class PowderChestReward(val displayName: String, pattern: String) {
 
     MITHRIL_POWDER(
         "§aMithril Powder",
-        ".*§2Mithril Powder(?: §r§8x(?<amount>.*))?",
+        " {4}§r§2Mithril Powder(?: §r§8x(?<amount>.*))?",
     ),
     GEMSTONE_POWDER(
         "§dGemstone Powder",
-        ".*§dGemstone Powder(?: §r§8x(?<amount>.*))?",
+        " {4}§r§dGemstone Powder(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_RUBY_GEMSTONE(
         "§fRough Ruby Gemstone",
-        ".*§f❤ Rough Ruby Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f❤ Rough Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_RUBY_GEMSTONE(
         "§aFlawed Sapphire Gemstone",
-        ".*§a❤ Flawed Ruby Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a❤ Flawed Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_RUBY_GEMSTONE(
         "§9Fine Ruby Gemstone",
-        ".*§9❤ Fine Ruby Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9❤ Fine Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_RUBY_GEMSTONE(
         "§5Flawless Ruby Gemstone",
-        ".*§5❤ Flawless Ruby Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5❤ Flawless Ruby Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_SAPPHIRE_GEMSTONE(
         "§fRough Sapphire Gemstone",
-        ".*§f✎ Rough Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f✎ Rough Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_SAPPHIRE_GEMSTONE(
         "§aFlawed Sapphire Gemstone",
-        ".*§a✎ Flawed Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a✎ Flawed Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_SAPPHIRE_GEMSTONE(
         "§9Fine Sapphire Gemstone",
-        ".*§9✎ Fine Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9✎ Fine Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_SAPPHIRE_GEMSTONE(
         "§5Flawless Sapphire Gemstone",
-        ".*§5✎ Flawless Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5✎ Flawless Sapphire Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_AMBER_GEMSTONE(
         "§fRough Amber Gemstone",
-        ".*§f⸕ Rough Amber Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f⸕ Rough Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_AMBER_GEMSTONE(
         "§aFlawed Amber Gemstone",
-        ".*§a⸕ Flawed Amber Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a⸕ Flawed Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_AMBER_GEMSTONE(
         "§9Fine Amber Gemstone",
-        ".*§9⸕ Fine Amber Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9⸕ Fine Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_AMBER_GEMSTONE(
         "§5Flawless Amber Gemstone",
-        ".*§5⸕ Flawless Amber Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5⸕ Flawless Amber Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_AMETHYST_GEMSTONE(
         "§fRough Amethyst Gemstone",
-        ".*§f❈ Rough Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f❈ Rough Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_AMETHYST_GEMSTONE(
         "§aFlawed Amethyst Gemstone",
-        ".*§a❈ Flawed Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a❈ Flawed Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_AMETHYST_GEMSTONE(
         "§9Fine Amethyst Gemstone",
-        ".*§9❈ Fine Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9❈ Fine Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_AMETHYST_GEMSTONE(
         "§5Flawless Amethyst Gemstone",
-        ".*§5❈ Flawless Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5❈ Flawless Amethyst Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_JADE_GEMSTONE(
         "§fRough Jade Gemstone",
-        ".*§f☘ Rough Jade Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f☘ Rough Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_JADE_GEMSTONE(
         "§aFlawed Jade Gemstone",
-        ".*§a☘ Flawed Jade Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a☘ Flawed Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_JADE_GEMSTONE(
         "§9Fine Jade Gemstone",
-        ".*§9☘ Fine Jade Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9☘ Fine Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_JADE_GEMSTONE(
         "§5Flawless Jade Gemstone",
-        ".*§5☘ Flawless Jade Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5☘ Flawless Jade Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     ROUGH_TOPAZ_GEMSTONE(
         "§fRough Topaz Gemstone",
-        ".*§f✧ Rough Topaz Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§f✧ Rough Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWED_TOPAZ_GEMSTONE(
         "§aFlawed Topaz Gemstone",
-        ".*§a✧ Flawed Topaz Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a✧ Flawed Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FINE_TOPAZ_GEMSTONE(
         "§9Fine Topaz Gemstone",
-        ".*§9✧ Fine Topaz Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9✧ Fine Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
     FLAWLESS_TOPAZ_GEMSTONE(
         "§5Flawless Topaz Gemstone",
-        ".*§5✧ Flawless Topaz Gemstone(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5✧ Flawless Topaz Gemstone(?: §r§8x(?<amount>.*))?",
     ),
 
     FTX_3070(
         "§9FTX 3070",
-        ".*§9FTX 3070(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9FTX 3070(?: §r§8x(?<amount>.*))?",
     ),
     ELECTRON_TRANSIMTTER(
         "§9Electron Transmitter",
-        ".*§9Electron Transmitter(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Electron Transmitter(?: §r§8x(?<amount>.*))?",
     ),
     ROBOTRON_REFLECTOR(
         "§9Robotron Reflector",
-        ".*§9Robotron Reflector(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Robotron Reflector(?: §r§8x(?<amount>.*))?",
     ),
     SUPERLITE_MOTOR(
         "§9Superlite Motor",
-        ".*§9Superlite Motor(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Superlite Motor(?: §r§8x(?<amount>.*))?",
     ),
     CONTROL_SWITCH(
         "§9Control Switch",
-        ".*§9Control Switch(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Control Switch(?: §r§8x(?<amount>.*))?",
     ),
     SYNTHETIC_HEART(
         "§9Synthetic Heart",
-        ".*§9Synthetic Heart(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Synthetic Heart(?: §r§8x(?<amount>.*))?",
     ),
 
     GOBLIN_EGG(
         "§9Goblin Egg",
-        ".*§9Goblin Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
     GREEN_GOBLIN_EGG(
         "§aGreen Goblin Egg",
-        ".*§a§r§aGreen Goblin Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§a§r§aGreen Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
     RED_GOBLIN_EGG(
         "§cRed Goblin Egg",
-        ".*§9§r§cRed Goblin Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9§r§cRed Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
     YELLOW_GOBLIN_EGG(
         "§eYellow Goblin Egg",
-        ".*§9§r§eYellow Goblin Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9§r§eYellow Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
     BLUE_GOBLIN_EGG(
         "§3Blue Goblin Egg",
-        ".*§9§r§3Blue Goblin Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9§r§3Blue Goblin Egg(?: §r§8x(?<amount>.*))?",
     ),
 
     WISHING_COMPASS(
         "§aWishing Compass",
-        ".*§aWishing Compass(?: §r§8x(?<amount>.*))?",
+        " {4}§r§aWishing Compass(?: §r§8x(?<amount>.*))?",
     ),
     SLUDGE_JUICE(
-        "§aSludge Juice", ".*§aSludge Juice(?: §r§8x(?<amount>.*))?",
+        "§aSludge Juice", " {4}§r§aSludge Juice(?: §r§8x(?<amount>.*))?",
     ),
     ASCENSION_ROPE(
         "§9Ascension Rope",
-        ".*§9Ascension Rope(?: §r§8x(?<amount>.*))?",
+        " {4}§r§9Ascension Rope(?: §r§8x(?<amount>.*))?",
     ),
     TREASURITE(
         "§5Treasurite",
-        ".*§5Treasurite(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5Treasurite(?: §r§8x(?<amount>.*))?",
     ),
     JUNGLE_HEART(
         "§6Jungle Heart",
-        ".*§6Jungle Heart(?: §r§8x(?<amount>.*))?",
+        " {4}§r§6Jungle Heart(?: §r§8x(?<amount>.*))?",
     ),
     PICKONIMBUS_2000(
         "§5Pickonimbus 2000",
-        ".*§5Pickonimbus 2000(?: §r§8x(?<amount>.*))?",
+        " {4}§r§5Pickonimbus 2000(?: §r§8x(?<amount>.*))?",
     ),
     YOGGIE(
         "§aYoggie",
-        ".*§aYoggie(?: §r§8x(?<amount>.*))?",
+        " {4}§r§aYoggie(?: §r§8x(?<amount>.*))?",
     ),
     PREHISTORIC_EGG(
         "§fPrehistoric Egg",
-        ".*§fPrehistoric Egg(?: §r§8x(?<amount>.*))?",
+        " {4}§r§fPrehistoric Egg(?: §r§8x(?<amount>.*))?",
     ),
     OIL_BARREL(
         "§aOil Barrel",
-        ".*§aOil Barrel(?: §r§8x(?<amount>.*))?",
+        " {4}§r§aOil Barrel(?: §r§8x(?<amount>.*))?",
     ),
 
     DIAMOND_ESSENCE(
         "§bDiamond Essence",
-        ".*§dDiamond Essence(?: §r§8x(?<amount>.*))?",
+        " {4}§r§dDiamond Essence(?: §r§8x(?<amount>.*))?",
     ),
     GOLD_ESSENCE(
         "§6Gold Essence",
-        ".*§dGold Essence(?: §r§8x(?<amount>.*))?",
+        " {4}§r§dGold Essence(?: §r§8x(?<amount>.*))?",
     ),
     ;
 

From 66ff8dafcfb82111437f50d9951532910a6d3c91 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 21 Jul 2024 10:32:01 +0200
Subject: [PATCH 114/721] Fix: Reforge Helper Carnival Mask (#2244)

---
 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index 8d70e47ba7ee..ae1eba920a78 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -83,13 +83,14 @@ object ReforgeAPI {
             ReforgeType.BOW -> itemCategory == ItemCategory.BOW || itemCategory == ItemCategory.SHORT_BOW
             ReforgeType.ARMOR -> setOf(
                 ItemCategory.HELMET,
+                ItemCategory.CARNIVAL_MASK,
                 ItemCategory.CHESTPLATE,
                 ItemCategory.LEGGINGS,
                 ItemCategory.BOOTS,
             ).contains(itemCategory)
 
             ReforgeType.CHESTPLATE -> itemCategory == ItemCategory.CHESTPLATE
-            ReforgeType.HELMET -> itemCategory == ItemCategory.HELMET
+            ReforgeType.HELMET -> itemCategory == ItemCategory.HELMET || itemCategory == ItemCategory.CARNIVAL_MASK
             ReforgeType.CLOAK -> itemCategory == ItemCategory.CLOAK
             ReforgeType.AXE -> itemCategory == ItemCategory.AXE
             ReforgeType.HOE -> itemCategory == ItemCategory.HOE

From 56da75a2b9dbeaeeab3f5a89d485b6be48affec8 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 21 Jul 2024 10:46:02 +0200
Subject: [PATCH 115/721] Fix:  Kuudra Errors (#2236)

---
 .../customscoreboard/ScoreboardElements.kt    | 22 +++++++++++--------
 .../gui/customscoreboard/ScoreboardPattern.kt |  8 +++++--
 .../customscoreboard/UnknownLinesHandler.kt   | 19 ++++++++--------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index a3b3652b2815..6562edaf3167 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -632,17 +632,21 @@ private fun getCookieShowWhen(): Boolean {
 }
 
 private fun getObjectiveDisplayPair() = buildList {
-    val objective =
-        ScoreboardData.sidebarLinesFormatted.first { ScoreboardPattern.objectivePattern.matches(it) }
+    val formattedLines = ScoreboardData.sidebarLinesFormatted
+    val objective = formattedLines.firstOrNull { ScoreboardPattern.objectivePattern.matches(it) }
+    if (objective != null) {
+        add(objective to HorizontalAlignment.LEFT)
 
-    add(objective to HorizontalAlignment.LEFT)
-    add((ScoreboardData.sidebarLinesFormatted.nextAfter(objective) ?: "<hidden>") to HorizontalAlignment.LEFT)
+        val secondLine = formattedLines.nextAfter(objective) ?: "<hidden>"
+        add(secondLine to HorizontalAlignment.LEFT)
 
-    if (ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.thirdObjectiveLinePattern.matches(it) }) {
-        add(
-            (ScoreboardData.sidebarLinesFormatted.nextAfter(objective, 2)
-                ?: "Second objective here") to HorizontalAlignment.LEFT,
-        )
+        formattedLines.nextAfter(objective, 2)?.let {
+            if (ScoreboardPattern.thirdObjectiveLinePattern.matches(it)) add(it to HorizontalAlignment.LEFT)
+        }
+
+        formattedLines.nextAfter(objective, 3)?.let {
+            if (ScoreboardPattern.thirdObjectiveLinePattern.matches(it)) add(it to HorizontalAlignment.LEFT)
+        }
     }
 }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 62b282b37cbc..d9126ef44770 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -153,10 +153,11 @@ object ScoreboardPattern {
 
     /**
      * REGEX-TEST: Submerges In: §e01m 00s
+     * REGEX-TEST: Submerges In: §e???
      */
     val submergesPattern by kuudraSb.pattern(
         "submerges",
-        "(?:§.)*Submerges In: (?:§.)*[\\w\\s]+",
+        "(?:§.)*Submerges In: (?:§.)*[\\w\\s?]+",
     )
 
     // farming
@@ -392,7 +393,10 @@ object ScoreboardPattern {
         "§d\\d+(?:st|nd|rd|th) Anniversary§f (?:\\d|:)+",
     )
 
-    // this thirdObjectiveLinePattern includes all those weird objective lines that go into a third scoreboard line
+    // this thirdObjectiveLinePattern includes all those weird objective lines that go into a third (and fourth) scoreboard line
+    /**
+     * REGEX-TEST: §eProtect Elle §7(§a98%§7)
+     */
     val thirdObjectiveLinePattern by miscSb.pattern(
         "thirdobjectiveline",
         "(\\s*§.\\(§.\\w+§./§.\\w+§.\\)|§f Mages.*|§f Barbarians.*|§edefeat Kuudra|§eand stun him)",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index a38b52d788bc..bbae099d6b7e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -142,16 +142,17 @@ object UnknownLinesHandler {
         }
 
         /**
-         * remove known text
+         * Remove Known Text
          **/
-        // remove objectives
-        val objectiveLine = sidebarLines.firstOrNull { SbPattern.objectivePattern.matches(it) }
-            ?: "Objective"
-        unknownLines = unknownLines.filter { sidebarLines.nextAfter(objectiveLine) != it }
-        // TODO create function
-        unknownLines = unknownLines.filter {
-            sidebarLines.nextAfter(objectiveLine, 2) != it &&
-                !SbPattern.thirdObjectiveLinePattern.matches(it)
+        // Remove objectives
+        val objectiveLine = sidebarLines.firstOrNull { SbPattern.objectivePattern.matches(it) } ?: "Objective"
+
+        unknownLines = unknownLines.filter { line ->
+            val nextLine = sidebarLines.nextAfter(objectiveLine)
+            val secondNextLine = sidebarLines.nextAfter(objectiveLine, 2)
+            val thirdNextLine = sidebarLines.nextAfter(objectiveLine, 3)
+
+            line != nextLine && line != secondNextLine && line != thirdNextLine && !SbPattern.thirdObjectiveLinePattern.matches(line)
         }
 
         // Remove jacobs contest

From bad8528b29b16c3b901fb17e19cb932d67fdca46 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 21 Jul 2024 11:16:12 +0200
Subject: [PATCH 116/721] Fix: Ignore Jasper/Ruby Crystal price (#2235)

---
 src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt | 4 +++-
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index b3605094a3dd..98f903468bb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -11,8 +11,10 @@ class NEUInternalName private constructor(private val internalName: String) {
         val NONE = "NONE".asInternalName()
         val MISSING_ITEM = "MISSING_ITEM".asInternalName()
 
-        val WISP_POTION = "WISP_POTION".asInternalName()
+        val JASPER_CRYSTAL = "JASPER_CRYSTAL".asInternalName()
+        val RUBY_CRYSTAL = "RUBY_CRYSTAL".asInternalName()
         val SKYBLOCK_COIN = "SKYBLOCK_COIN".asInternalName()
+        val WISP_POTION = "WISP_POTION".asInternalName()
 
         fun String.asInternalName(): NEUInternalName {
             val internalName = uppercase().replace(" ", "_")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 217d681c3bbb..35992a15e339 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -182,8 +182,10 @@ object NEUItems {
         pastRecipes: List<NeuRecipe> = emptyList(),
     ): Double? {
         when (this) {
-            NEUInternalName.WISP_POTION -> return 20_000.0
+            NEUInternalName.JASPER_CRYSTAL -> return 0.0
+            NEUInternalName.RUBY_CRYSTAL -> return 0.0
             NEUInternalName.SKYBLOCK_COIN -> return 1.0
+            NEUInternalName.WISP_POTION -> return 20_000.0
         }
 
         if (priceSource != ItemPriceSource.NPC_SELL) {

From a2266a87073622b6547b3704f7ad81de0f6cb5b2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 21 Jul 2024 11:16:24 +0200
Subject: [PATCH 117/721] Fix: Slayer detection (#2232)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/slayer/SlayerQuestWarning.kt     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index a5f8af5c79e4..52afc02562d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -61,20 +61,21 @@ object SlayerQuestWarning {
 
     private fun getSlayerData() = if (RiftAPI.inRift()) outsideRiftData else insideRiftData
 
+    private fun String.inCombat() = contains("Combat") || contains("Kills")
+    private fun String.inBoss() = this == "Slay the boss!"
+    private fun String?.bossSlain() = this == "Boss slain!"
+    private fun String.noSlayer() = this == "no slayer"
+
     private fun change(old: String, new: String) {
-        if (new.contains("Combat")) {
-            if (!old.contains("Combat")) {
-                needSlayerQuest = false
-            }
+        if (!old.inCombat() && new.inCombat()) {
+            needSlayerQuest = false
         }
-        if (new == "no slayer") {
-            if (old == "Slay the boss!") {
-                needNewQuest("The old slayer quest has failed!")
-            }
+        if (old.inBoss() && new.noSlayer()) {
+            needNewQuest("The old slayer quest has failed!")
         }
-        if (new == "Boss slain!") {
+        if (new.bossSlain()) {
             DelayedRun.runDelayed(2.seconds) {
-                if (getSlayerData().currentSlayerState == "Boss slain!") {
+                if (getSlayerData().currentSlayerState.bossSlain()) {
                     needNewQuest("You have no Auto-Slayer active!")
                 }
             }
@@ -133,7 +134,7 @@ object SlayerQuestWarning {
                 SlayerAPI.latestWrongAreaWarning = SimpleTimeMark.now()
                 warn(
                     "Wrong Slayer!",
-                    "Wrong slayer selected! You have $activeSlayerName selected and you are in an $slayerName area!"
+                    "Wrong slayer selected! You have $activeSlayerName selected and you are in an $slayerName area!",
                 )
             }
         }

From 1da1de3da35f7f98f582967368be51b50278aa5b Mon Sep 17 00:00:00 2001
From: Stella <stellaarnott1@gmail.com>
Date: Sun, 21 Jul 2024 02:24:13 -0700
Subject: [PATCH 118/721] Feature: Crash Game On Death (#2238)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/misc/MiscConfig.java      |  5 +++
 .../skyhanni/features/misc/CrashOnDeath.kt    | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/CrashOnDeath.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 4a3aa732ea45..aff9b496430b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -134,6 +134,11 @@ public class MiscConfig {
     @FeatureToggle
     public boolean brewingStandOverlay = true;
 
+    @Expose
+    @ConfigOption(name = "Crash On Death", desc = "Crashes your game every time you die in Skyblock")
+    @ConfigEditorBoolean
+    public boolean crashOnDeath = false;
+
     // TODO move into scoreboard accordion
     @Expose
     @ConfigOption(name = "Red Scoreboard Numbers", desc = "Hide the red scoreboard numbers on the right side of the screen.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CrashOnDeath.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CrashOnDeath.kt
new file mode 100644
index 000000000000..33d293e5be1a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CrashOnDeath.kt
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
+import net.minecraft.crash.CrashReport
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object CrashOnDeath {
+    private val config get() = SkyHanniMod.feature.misc
+
+    private val pattern by RepoPattern.pattern(
+        "ownplayer.death.chat",
+        "§c ☠ §r§7You (?<reason>.+)",
+    )
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        if (pattern.matches(event.message)) {
+            Minecraft.getMinecraft().crashed(CrashReport("Not Reading", Throwable("Don't toggle all the Options")))
+        }
+    }
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.crashOnDeath
+}

From 3b80141b255ab6099e8dfdd12912e76798b9df19 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:05:30 +0200
Subject: [PATCH 119/721] Improvement: Royal Pigeon Left Click (#2181)

---
 .../features/mining/TunnelMapsConfig.java     |  5 ++++
 .../skyhanni/features/mining/TunnelsMaps.kt   | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
index b6340f164c00..5ff38b346d5b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
@@ -44,6 +44,11 @@ public class TunnelMapsConfig {
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
     public int nextSpotHotkey = Keyboard.KEY_NONE;
 
+    @Expose
+    @ConfigOption(name = "Left Click Pigeon", desc = "Left click the Royal Pigeon to go to the next spot.")
+    @ConfigEditorBoolean
+    public boolean leftClickPigeon = true;
+
     @Expose
     @ConfigOption(name = "Dynamic Path Colour", desc = "Instead of the selected color use the color of the target as line colour.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 18d4c250e9e8..2f4ad54769af 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.mining
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
@@ -10,6 +11,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -24,6 +26,7 @@ import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LocationUtils
@@ -141,11 +144,13 @@ object TunnelsMaps {
 
     /** @return Errors with an empty String */
     private fun getGenericName(input: String): String = translateTable.getOrPut(input) {
-        possibleLocations.keys.firstOrNull() { it.uppercase().removeColor().contains(input.uppercase()) } ?: ""
+        possibleLocations.keys.firstOrNull { it.uppercase().removeColor().contains(input.uppercase()) } ?: ""
     }
 
     private var clickTranslate = mapOf<Int, String>()
 
+    private val ROYAL_PIGEON by lazy { "ROYAL_PIGEON".asInternalName() }
+
     @SubscribeEvent
     fun onInventoryFullyOpened(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
@@ -423,6 +428,14 @@ object TunnelsMaps {
         nextSpotKey(event)
     }
 
+    @SubscribeEvent
+    fun onItemClick(event: ItemClickEvent) {
+        if (!isEnabled() || !config.leftClickPigeon) return
+        if (event.clickType != ClickType.LEFT_CLICK) return
+        if (event.itemInHand?.getInternalNameOrNull() != ROYAL_PIGEON) return
+        nextSpot()
+    }
+
     private fun campfireKey(event: LorenzKeyPressEvent) {
         if (event.keyCode != config.campfireKey) return
         if (config.travelScroll) {
@@ -446,15 +459,16 @@ object TunnelsMaps {
 
     private fun nextSpotKey(event: LorenzKeyPressEvent) {
         if (event.keyCode != config.nextSpotHotkey) return
+        nextSpot()
+    }
+
+    private fun nextSpot() {
         if (!nextSpotDelay.isInPast()) return
         nextSpotDelay = 0.5.seconds.fromNow()
         goal = getNext()
     }
 
-    val areas = setOf(
-        "Glacite Tunnels", "Dwarven Base Camp", "Glacite Lake", "Fossil Research Center"
-    )
+    private val areas = setOf("Glacite Tunnels", "Dwarven Base Camp", "Glacite Lake", "Fossil Research Center")
 
-    private fun isEnabled() =
-        IslandType.DWARVEN_MINES.isInIsland() && config.enable && areas.contains(LorenzUtils.skyBlockArea)
+    private fun isEnabled() = IslandType.DWARVEN_MINES.isInIsland() && config.enable && LorenzUtils.skyBlockArea in areas
 }

From 34ac5b7becc5dbf308a56e49729c4aa1a780bbe8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:09:09 +0200
Subject: [PATCH 120/721] Improvement: Short Bazaar Price Source Name (#2233)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/inventory/SackDisplay.kt | 2 +-
 .../java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt     | 6 +++---
 .../hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 55be1b08f973..697947e3fef5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -207,7 +207,7 @@ object SackDisplay {
 
         if (config.showPrice) {
             list.addSelector<ItemPriceSource>(" ",
-                getName = { type -> type.displayName },
+                getName = { type -> type.sellName },
                 isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
                     config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt
index 13049a5960ff..a764bc84ee8e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceSource.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.utils
 
-enum class ItemPriceSource(val displayName: String) {
-    BAZAAR_INSTANT_BUY("Instant Buy/Sell Offer"), // Sell Offer
-    BAZAAR_INSTANT_SELL("Instant Sell/Buy Order"), // Buy Order
+enum class ItemPriceSource(val displayName: String, val sellName: String = displayName, val buyName: String = displayName) {
+    BAZAAR_INSTANT_BUY("BZ Instant Buy", buyName = "BZ Sell Offer"),
+    BAZAAR_INSTANT_SELL("BZ Instant Sell", buyName = "BZ Buy Order"),
     NPC_SELL("NPC Sell"),
     ;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 241d0a1e8b96..f249cce3ed03 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -56,7 +56,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         if (isInventoryOpen()) {
             lists.addSelector<ItemPriceSource>(
                 "",
-                getName = { type -> type.displayName },
+                getName = { type -> type.sellName },
                 isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
                     config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal

From 39f46e73324b2e8ee0d8971e60588afb143f1fdc Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:15:45 +0200
Subject: [PATCH 121/721] Backend: RegexUtils deprecation and new functions
 (#2160)

---
 .../at/hannibal2/skyhanni/data/HotmData.kt    |  6 +--
 .../at/hannibal2/skyhanni/utils/RegexUtils.kt | 45 ++++++++++++++-----
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 2d8ea945759a..c484f2ca974e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -567,7 +567,7 @@ enum class HotmData(
             }
             entry.enabled = lore.any { enabledPattern.matches(it) }
 
-            if (entry == SKY_MALL) handelSkyMall(lore)
+            if (entry == SKY_MALL) handleSkyMall(lore)
         }
 
         private fun Slot.handlePowder(): Boolean {
@@ -620,10 +620,10 @@ enum class HotmData(
             "§aYour Current Effect",
         )
 
-        private fun handelSkyMall(lore: List<String>) {
+        private fun handleSkyMall(lore: List<String>) {
             if (!SKY_MALL.enabled || !SKY_MALL.isUnlocked) HotmAPI.skymall = null
             else {
-                val index = lore.indexOfFirstMatch(skyMallCurrentEffect) ?: run {
+                val index = skyMallCurrentEffect.indexOfFirstMatch(lore) ?: run {
                     ErrorManager.logErrorStateWithData(
                         "Could not read the skymall effect from the hotm tree",
                         "skyMallCurrentEffect didn't match",
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
index 57c6c69e54a3..db19b63a2fb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
@@ -10,19 +10,28 @@ object RegexUtils {
     inline fun <T> Pattern.findMatcher(text: String, consumer: Matcher.() -> T) =
         matcher(text).let { if (it.find()) consumer(it) else null }
 
+    @Deprecated("", ReplaceWith("pattern.firstMatcher(this) { consumer() }"))
     inline fun <T> Sequence<String>.matchFirst(pattern: Pattern, consumer: Matcher.() -> T): T? =
-        toList().matchFirst(pattern, consumer)
+        pattern.firstMatcher(this, consumer)
 
-    inline fun <T> List<String>.matchFirst(pattern: Pattern, consumer: Matcher.() -> T): T? {
-        for (line in this) {
-            pattern.matcher(line).let { if (it.matches()) return consumer(it) }
+    inline fun <T> Pattern.firstMatcher(sequence: Sequence<String>, consumer: Matcher.() -> T): T? {
+        for (line in sequence) {
+            matcher(line).let { if (it.matches()) return consumer(it) }
         }
         return null
     }
 
-    inline fun <T> List<String>.matchAll(pattern: Pattern, consumer: Matcher.() -> T): T? {
-        for (line in this) {
-            pattern.matcher(line).let { if (it.find()) consumer(it) }
+    @Deprecated("", ReplaceWith("pattern.firstMatcher(this) { consumer() }"))
+    inline fun <T> List<String>.matchFirst(pattern: Pattern, consumer: Matcher.() -> T): T? = pattern.firstMatcher(this, consumer)
+
+    inline fun <T> Pattern.firstMatcher(list: List<String>, consumer: Matcher.() -> T): T? = firstMatcher(list.asSequence(), consumer)
+
+    @Deprecated("", ReplaceWith("pattern.matchAll(this) { consumer() }"))
+    inline fun <T> List<String>.matchAll(pattern: Pattern, consumer: Matcher.() -> T): T? = pattern.matchAll(this, consumer)
+
+    inline fun <T> Pattern.matchAll(list: List<String>, consumer: Matcher.() -> T): T? {
+        for (line in list) {
+            matcher(line).let { if (it.find()) consumer(it) }
         }
         return null
     }
@@ -36,23 +45,35 @@ object RegexUtils {
         return null
     }
 
+    fun List<Pattern>.allMatches(list: List<String>): List<String> = list.filter { line -> any { it.matches(line) } }
+    fun List<Pattern>.anyMatches(list: List<String>?): Boolean = list?.any { line -> any { it.matches(line) } } ?: false
+    fun List<Pattern>.anyMatches(string: String): Boolean = any { it.matches(string) }
+
     fun Pattern.matches(string: String?): Boolean = string?.let { matcher(it).matches() } ?: false
     fun Pattern.find(string: String?) = string?.let { matcher(it).find() } ?: false
 
-    fun Pattern.anyMatches(list: List<String>?): Boolean = list?.any { this.matches(it) } ?: false
+    fun Pattern.anyMatches(list: List<String>?): Boolean = list?.any { matches(it) } ?: false
     fun Pattern.anyMatches(list: Sequence<String>?): Boolean = anyMatches(list?.toList())
 
+    fun Pattern.matchGroup(text: String, groupName: String): String? = matchMatcher(text) { groupOrNull(groupName) }
+
+    fun Pattern.matchGroups(text: String, vararg groups: String): List<String?>? =
+        matchMatcher(text) { groups.toList().map { groupOrNull(it) } }
+
+    fun Pattern.firstMatches(list: List<String>): String? = list.firstOrNull { matches(it) }
+    fun Pattern.allMatches(list: List<String>): List<String> = list.filter { matches(it) }
+
     /**
      * Get the group, otherwise, return null
      * @param groupName The group name in the pattern
      */
-    fun Matcher.groupOrNull(groupName: String): String? = runCatching { this.group(groupName) }.getOrNull()
+    fun Matcher.groupOrNull(groupName: String): String? = runCatching { group(groupName) }.getOrNull()
 
     fun Matcher.hasGroup(groupName: String): Boolean = groupOrNull(groupName) != null
 
-    fun List<String>.indexOfFirstMatch(pattern: Pattern): Int? {
-        for ((index, line) in this.withIndex()) {
-            pattern.matcher(line).let { if (it.matches()) return index }
+    fun Pattern.indexOfFirstMatch(list: List<String>): Int? {
+        for ((index, line) in list.withIndex()) {
+            matcher(line).let { if (it.matches()) return index }
         }
         return null
     }

From 00831584bfa2e0e54e5f5bc65efbce10e06ee8e9 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sun, 21 Jul 2024 12:21:17 +0200
Subject: [PATCH 122/721] Improvement: Added SkyBlock Level to Item Number
 (#2172)

---
 .../features/inventory/InventoryConfig.java      |  1 +
 .../inventory/ItemDisplayOverlayFeatures.kt      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 45c0a9e98239..37201d64c4c7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -142,6 +142,7 @@ public enum ItemNumberEntry implements HasLegacyId {
         DARK_CACAO_TRUFFLE("§bDark Cacao Truffle"),
         EDITION_NUMBER("§bEdition Number", 16),
         BINGO_GOAL_RANK("§bBingo Goal Rank"),
+        SKYBLOCK_LEVEL("§bSkyblock Level")
         ;
 
         private final String str;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 324227248310..ebd793cab91d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -21,6 +21,7 @@ import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumbe
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.PET_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.RANCHERS_BOOTS_SPEED
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKILL_LEVEL
+import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKYBLOCK_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.VACUUM_GARDEN
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.RenderItemTipEvent
@@ -84,6 +85,15 @@ object ItemDisplayOverlayFeatures {
         "(§.)*You were the (§.)*(?<rank>[\\w]+)(?<ordinal>(st|nd|rd|th)) (§.)*to"
     )
 
+    /**
+     * REGEX-TEST: §7Your SkyBlock Level: §8[§a156§8]
+     * REGEX-TEST: §7Your SkyBlock Level: §8[§5399§8]
+     */
+    private val skyblockLevelPattern by patternGroup.pattern(
+        "skyblocklevel",
+        "§7Your SkyBlock Level: §8\\[(?<level>§.\\d+)§8]"
+    )
+
     @SubscribeEvent
     fun onRenderItemTip(event: RenderItemTipEvent) {
         event.stackTip = getStackTip(event.stack) ?: return
@@ -267,6 +277,12 @@ object ItemDisplayOverlayFeatures {
             }
         }
 
+        if (SKYBLOCK_LEVEL.isSelected() && chestName == "SkyBlock Menu" && itemName == "SkyBlock Leveling") {
+            lore.matchFirst(skyblockLevelPattern) {
+                return group("level")
+            }
+        }
+
         return null
     }
 

From be231f16d5cb5f0fcc1faeab99d0b294d61b716f Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:22:11 +0200
Subject: [PATCH 123/721] Fix: Custom Scoreboard Carnival Error (#2245)

---
 .../features/gui/customscoreboard/ScoreboardPattern.kt         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index d9126ef44770..fb574d3d0d1b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -500,10 +500,11 @@ object ScoreboardPattern {
 
     /**
      * REGEX-TEST: §fCarnival Tokens: §e129
+     * REGEX-TEST: §fCarnival Tokens: §e1,031
      */
     val carnivalTokensPattern by carnivalSb.pattern(
         "tokens",
-        "(?:§f)*Carnival Tokens: §e\\d+",
+        "(?:§f)*Carnival Tokens: §e[\\d,]+",
     )
 
     /**

From b43cb5ba98a4687c1dad16004946a341c56de013 Mon Sep 17 00:00:00 2001
From: Brady <thatgravyboat@gmail.com>
Date: Sun, 21 Jul 2024 07:52:42 -0230
Subject: [PATCH 124/721] Fix: Disabled style checking throwing an error
 (#2246)

---
 .github/workflows/check-style.yaml          | 16 ----------------
 .github/workflows/check-style.yaml.disabled | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 .github/workflows/check-style.yaml
 create mode 100644 .github/workflows/check-style.yaml.disabled

diff --git a/.github/workflows/check-style.yaml b/.github/workflows/check-style.yaml
deleted file mode 100644
index 3d7347a80f18..000000000000
--- a/.github/workflows/check-style.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#name: check-style
-#on:
-#    - pull_request
-#jobs:
-#    ktlint:
-#        name: Check Style
-#        runs-on: ubuntu-latest
-#
-#        steps:
-#            - uses: actions/checkout@v3
-#              name: Checkout code
-#            - name: ktlint
-#              uses: ScaCap/action-ktlint@master
-#              with:
-#                  github_token: ${{ secrets.github_token }}
-#                  reporter: github-pr-check
diff --git a/.github/workflows/check-style.yaml.disabled b/.github/workflows/check-style.yaml.disabled
new file mode 100644
index 000000000000..ff172208f8bc
--- /dev/null
+++ b/.github/workflows/check-style.yaml.disabled
@@ -0,0 +1,16 @@
+name: check-style
+on:
+    - pull_request
+jobs:
+    ktlint:
+        name: Check Style
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+              name: Checkout code
+            - name: ktlint
+              uses: ScaCap/action-ktlint@master
+              with:
+                  github_token: ${{ secrets.github_token }}
+                  reporter: github-pr-check

From c95fa483cbe759238d70dc51c29eb397d24d2191 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:25:55 +0200
Subject: [PATCH 125/721] code cleanup

---
 .../features/inventory/ItemDisplayOverlayFeatures.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index ebd793cab91d..204cf0b6d073 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -66,23 +66,23 @@ object ItemDisplayOverlayFeatures {
     private val patternGroup = RepoPattern.group("inventory.item.overlay")
     private val masterSkullPattern by patternGroup.pattern(
         "masterskull",
-        "(.*)Master Skull - Tier ."
+        "(.*)Master Skull - Tier .",
     )
     private val gardenVacuumPatterm by patternGroup.pattern(
         "vacuum",
-        "§7Vacuum Bag: §6(?<amount>\\d*) Pests?"
+        "§7Vacuum Bag: §6(?<amount>\\d*) Pests?",
     )
     private val harvestPattern by patternGroup.pattern(
         "harvest",
-        "§7§7You may harvest §6(?<amount>.).*"
+        "§7§7You may harvest §6(?<amount>.).*",
     )
     private val dungeonPotionPattern by patternGroup.pattern(
         "dungeonpotion",
-        "Dungeon (?<level>.*) Potion"
+        "Dungeon (?<level>.*) Potion",
     )
     private val bingoGoalRankPattern by patternGroup.pattern(
         "bingogoalrank",
-        "(§.)*You were the (§.)*(?<rank>[\\w]+)(?<ordinal>(st|nd|rd|th)) (§.)*to"
+        "(§.)*You were the (§.)*(?<rank>[\\w]+)(?<ordinal>(st|nd|rd|th)) (§.)*to",
     )
 
     /**
@@ -91,7 +91,7 @@ object ItemDisplayOverlayFeatures {
      */
     private val skyblockLevelPattern by patternGroup.pattern(
         "skyblocklevel",
-        "§7Your SkyBlock Level: §8\\[(?<level>§.\\d+)§8]"
+        "§7Your SkyBlock Level: §8\\[(?<level>§.\\d+)§8]",
     )
 
     @SubscribeEvent

From 30ad6049a0f84e2e7be6fe9c4e6ade9dcf159bf7 Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Sun, 21 Jul 2024 07:30:44 -0300
Subject: [PATCH 126/721] Feature: Bestiary Level as Stack Size (#1945)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java      |  3 ++-
 .../inventory/ItemDisplayOverlayFeatures.kt      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 37201d64c4c7..684e2bb7944a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -142,7 +142,8 @@ public enum ItemNumberEntry implements HasLegacyId {
         DARK_CACAO_TRUFFLE("§bDark Cacao Truffle"),
         EDITION_NUMBER("§bEdition Number", 16),
         BINGO_GOAL_RANK("§bBingo Goal Rank"),
-        SKYBLOCK_LEVEL("§bSkyblock Level")
+        SKYBLOCK_LEVEL("§bSkyblock Level"),
+        BESTIARY_LEVEL("§bBestiary Level")
         ;
 
         private final String str;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 204cf0b6d073..2cb5632f1314 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -23,6 +23,7 @@ import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumbe
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKILL_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKYBLOCK_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.VACUUM_GARDEN
+import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.BESTIARY_LEVEL
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.RenderItemTipEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
@@ -93,6 +94,10 @@ object ItemDisplayOverlayFeatures {
         "skyblocklevel",
         "§7Your SkyBlock Level: §8\\[(?<level>§.\\d+)§8]",
     )
+    private val bestiaryStackPattern by patternGroup.pattern(
+        "bestiarystack",
+        "§7Progress to Tier (?<tier>[\\dIVXC]+): §b[\\d.]+%"
+    )
 
     @SubscribeEvent
     fun onRenderItemTip(event: RenderItemTipEvent) {
@@ -283,6 +288,17 @@ object ItemDisplayOverlayFeatures {
             }
         }
 
+        if (BESTIARY_LEVEL.isSelected() && (chestName.contains("Bestiary ➜") || chestName.contains("Fishing ➜")) && lore.any { it.contains("Deaths: ") }) {
+            lore.matchFirst(bestiaryStackPattern) {
+                val tier = (group("tier").romanToDecimalIfNecessary() - 1)
+                return tier.toString()
+            } ?: run {
+                val tier = itemName.split(" ")
+
+                return tier.last().romanToDecimalIfNecessary().toString()
+            }
+        }
+
         return null
     }
 

From c4c0b5e80d506ef1f7811603dd1611da5a4b84bb Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 21 Jul 2024 06:37:23 -0400
Subject: [PATCH 127/721] Improvement: Add Toggle for Unclaimed Egg Warp
 (#2211)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/HoppityEggsConfig.java     |  2 +-
 .../event/hoppity/HoppityEggDisplayManager.kt | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
index de86e01c4cd4..52aaa8aed61d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
@@ -83,7 +83,7 @@ public class HoppityEggsConfig {
     public boolean warnUnclaimedEggs = false;
 
     @Expose
-    @ConfigOption(name = "Click to Warp", desc = "Make the eggs ready chat message clickable to warp you to an island.")
+    @ConfigOption(name = "Click to Warp", desc = "Make the eggs ready chat message & unclaimed timer display clickable to warp you to an island.")
     @ConfigEditorBoolean
     public boolean warpUnclaimedEggs = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
index 06948f27abff..f09aa4eac5da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
@@ -72,14 +72,14 @@ object HoppityEggDisplayManager {
 
     private fun updateDisplay(): List<Renderable> {
         if (!HoppityEggsManager.isActive()) return emptyList()
-        if (!HoppityEggsManager.config.showClaimedEggs) return emptyList()
-        if (ReminderUtils.isBusy() && !HoppityEggsManager.config.showWhileBusy) return emptyList()
+        if (!config.showClaimedEggs) return emptyList()
+        if (ReminderUtils.isBusy() && !config.showWhileBusy) return emptyList()
 
         val displayList =
             HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
         displayList.add(0, "§bUnclaimed Eggs:")
 
-        if (HoppityEggsManager.config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
+        if (config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
             val totalEggs = HoppityEggLocations.islandLocations.size
             if (totalEggs > 0) {
                 val collectedEggs = HoppityEggLocations.islandCollectedLocations.size
@@ -89,12 +89,13 @@ object HoppityEggDisplayManager {
         }
         if (displayList.size == 1) return emptyList()
 
+        val container = Renderable.verticalContainer(displayList.map(Renderable::string))
         return listOf(
-            Renderable.clickAndHover(
-                Renderable.verticalContainer(displayList.map(Renderable::string)),
-                tips = listOf("§eClick to ${"/warp ${HoppityEggsManager.config.warpDestination}".trim()}!"),
-                onClick = { HypixelCommands.warp(HoppityEggsManager.config.warpDestination) },
-            ),
+            if (config.warpUnclaimedEggs) Renderable.clickAndHover(
+                container,
+                tips = listOf("§eClick to ${"/warp ${config.warpDestination}".trim()}!"),
+                onClick = { HypixelCommands.warp(config.warpDestination) },
+            ) else container
         )
     }
 
@@ -102,7 +103,7 @@ object HoppityEggDisplayManager {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!HoppityEggsManager.isActive()) return
-        HoppityEggsManager.config.position.renderRenderables(display, posLabel = "Hoppity Eggs")
+        config.position.renderRenderables(display, posLabel = "Hoppity Eggs")
     }
 
     private fun formatEggsCollected(collectedEggs: Int): String =

From 53435bc6b074d526f6ad08b3d8838d5a21685228 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 21 Jul 2024 14:28:34 +0200
Subject: [PATCH 128/721] Fix: Carnival Mask Fix (#2247)

---
 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index ae1eba920a78..987a864af77e 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -90,7 +90,7 @@ object ReforgeAPI {
             ).contains(itemCategory)
 
             ReforgeType.CHESTPLATE -> itemCategory == ItemCategory.CHESTPLATE
-            ReforgeType.HELMET -> itemCategory == ItemCategory.HELMET || itemCategory == ItemCategory.CARNIVAL_MASK
+            ReforgeType.HELMET -> itemCategory == ItemCategory.HELMET
             ReforgeType.CLOAK -> itemCategory == ItemCategory.CLOAK
             ReforgeType.AXE -> itemCategory == ItemCategory.AXE
             ReforgeType.HOE -> itemCategory == ItemCategory.HOE

From 6e30afcab13ab8ff814600264aee141b25ec7af7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 21 Jul 2024 14:58:10 +0200
Subject: [PATCH 129/721] added todo

---
 .../java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 00431049f07c..1bfe6ac6f381 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -22,6 +22,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     val name: String,
     private val createNewSession: () -> Data,
     private val getStorage: (ProfileSpecificStorage) -> Data,
+    // TODO change to renderable
     private val drawDisplay: (Data) -> List<List<Any>>,
 ) {
 

From 994f770cc914a009adc9606086698cec6178822d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:22:29 +0200
Subject: [PATCH 130/721] Version 0.26 Beta 18

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 20 +++++++++++++++++++
 docs/FEATURES.md                              |  5 +++++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a09c8290a5f8..0a67f50dfa81 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.17"
+version = "0.26.Beta.18"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index bb031f27a64c..e4b9b367d6bf 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -109,6 +109,8 @@
     + Optionally show the different stat values compared to the current reforge.
 + Add reminder that the Time Tower is expired and has extra charges available. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
     + Replaces the previous Time Tower Reminder feature.
++ Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
+    + Can be enabled/disabled on the Item Number list.
 
 #### Fishing Features
 
@@ -148,6 +150,9 @@
     + Warns you when the mod has been downloaded from an untrusted source (not the official GitHub or Modrinth).
 + Added Chunked Stats as a draggable list to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1341)
     + Select and prioritize the order of the stats you want to see.
++ Added Option to crash your game when you die, for extra suffering. - Stella (https://github.com/hannibal002/SkyHanni/pull/2238)
+    + Also punishes players who don't read patch notes.
++ Added Crown of Avarice counter. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2229)
 
 ### Improvements
 
@@ -195,6 +200,7 @@
     + In the Rift, Kuudra, Dungeons, etc.
 + Hoppity and Chocolate reminders/warnings now appear less frequently and are less intrusive. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2196)
 + Add a configuration option to allow Time Tower to appear in the Chocolate Factory next upgrade list. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2142)
++ Changed click-to-warp toggle to also work for unclaimed eggs display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2211)
 
 #### Mining Improvements
 
@@ -206,6 +212,7 @@
 + Powder Tracker: Auto-detect whether Great Explorer is maxed. - Luna (https://github.com/hannibal002/SkyHanni/pull/2032)
     + The configuration option to manually specify this has been removed.
 + Added different display options for mining powder in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1442)
++ Added Left Click on Royal Pigeon for next spot in Tunnel Maps. - Empa (https://github.com/hannibal002/SkyHanni/pull/2181)
 
 #### Commands Improvements
 
@@ -243,6 +250,7 @@
     + Calculating with tier 5 prices for Ferocious Mana, Hardened Mana, Mana Vampire and Strong Mana.
 + Added reset buttons for colors and spacing in the Custom Wardrobe config. - raven (https://github.com/hannibal002/SkyHanni/pull/2120)
 + Added an option for the Estimated Chest Value display to also work in your own inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2218)
++ Added SkyBlock Level number in SB Menu to Item Number config. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2172)
 
 #### Fishing Improvements
 
@@ -285,6 +293,7 @@
 + Add some OneConfig mods to the quick mod switcher. - nea (https://github.com/hannibal002/SkyHanni/pull/2155)
 + Add config option to maintain "current" sound settings levels while warning sounds are played. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2129)
 + Added a reset button in the config for the appearance and event priority of the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2141)
++ Reverted item source names to shorter format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2233)
 
 ### Fixes
 
@@ -310,6 +319,9 @@
 + Fix incorrect powder costs and powder spent amounts being displayed for some HOTM perks. - Luna (https://github.com/hannibal002/SkyHanni/pull/2145)
 + Fix Powder Percentage Compatibility Issue with ColeWeight. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2186)
 + Fixed Powder detection from chat messages. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2207)
++ Ignore Jasper/Ruby Crystal price. - Luna (https://github.com/hannibal002/SkyHanni/pull/2235)
+    + These crystals used to have an item form and may be sold on the Auction House for overinflated prices (e.g., over 900M for a Jasper Crystal), which can inflate values like Corpse Profit.
++ Fixed PowderTracker Pattern. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2240)
 
 #### Garden Fixes
 
@@ -333,6 +345,7 @@
 + Fixed Fine Flour exportation not getting detected from chat messages for use in FF Guide. - Luna (https://github.com/hannibal002/SkyHanni/pull/2215)
 + Fixed "Craftable!" text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2219)
 + Fixed favorite pets not being detected by FF Guide. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2202)
++ Fixed farming weight estimate being much too large. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2230)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -377,6 +390,8 @@
 + Fix Custom Scoreboard Error during the Winter Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2192)
 + Fix Custom Scoreboard Error in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2176)
 + Fix New Mayor perks not showing up on the Scoreboard. - Stella (https://github.com/hannibal002/SkyHanni/pull/2187)
++ Fixed Custom Scoreboard Error during Carnival. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2245)
++ Fixed 2 Custom Scoreboard Errors while in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2236)
 
 #### Dungeon Fixes
 
@@ -435,12 +450,14 @@
 + Page scrolling now works correctly in the museum. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2208)
 + Fixed detecting Hot Potato Books inside the Community Project as potatoes. - Empa (https://github.com/hannibal002/SkyHanni/pull/2214)
 + Fixed price source inconsistencies (Bazaar sell/buy and NPC prices). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2221)
++ Fixed Carnival Masks not being detected by Reforge Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2244)
 
 #### Combat Fixes
 
 + Fixed summons not being removed from Summoning Mob Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1964)
 + Fixed area mini boss spawn durations below 1 second not displaying. - Empa (https://github.com/hannibal002/SkyHanni/pull/2110)
 + Fixed summons death messages getting blocked even when the feature is disabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2132)
++ Fixed slayer quest warning sometimes showing incorrectly. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2232)
 
 #### Chat Fixes
 
@@ -582,12 +599,15 @@
 + Made RecalculatingValue a ReadOnlyProperty. - Empa (https://github.com/hannibal002/SkyHanni/pull/2151)
 + Visitor rarities from the repository are now exposed to the code in a cleaner way. - Luna (https://github.com/hannibal002/SkyHanni/pull/2220)
 + Added automatic PR labeling for bug fixes. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2203)
++ Deprecated some methods in RegexUtils, and added some others. - Empa (https://github.com/hannibal002/SkyHanni/pull/2160)
 
 ### Removed Features
 
 + Removed Mineshaft from mining event display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2083)
 + Remove the original Time Tower Reminder feature. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
     + Hypixel now correctly calculates Time Tower offline.
++ Removed the /shlimbo command. - nopo (https://github.com/hannibal002/SkyHanni/pull/2231)
+    + Hypixel added /limbo.
 
 ## Version 0.25
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index ff97aaa77981..b075b03f2f94 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -215,6 +215,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Show a list of all possible reforges for the item, with stats.
     + The reforge list can be sorted by a specific stat.
     + Optionally show the different stat values compared to the current reforge.
++ Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
+    + Can be enabled/disabled on the Item Number list.
 
 </details>
 <details open><summary>
@@ -1266,6 +1268,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Option to include vanilla items.
 + Add Armor Stack Display. - Xupie (https://github.com/hannibal002/SkyHanni/pull/1811)
     + Display the number of stacks on armor pieces like Crimson, Terror etc.
++ Added Option to crash your game when you die, for extra suffering. - Stella (https://github.com/hannibal002/SkyHanni/pull/2238)
+    + Also punishes players who don't read patch notes.
++ Added Crown of Avarice counter. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2229)
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 32e6f9cccb45..b2d9c2623dcc 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.17",
+    version = "0.26.Beta.18",
 )
 class SkyHanniMod {
 

From 690d58ec10ffcd18a6662e075d629b12335bb1a6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 24 Jul 2024 14:29:00 +0200
Subject: [PATCH 131/721] code cleanup

---
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 3f84416292bf..580ee2a954f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -46,7 +46,7 @@ object ItemUtils {
         return list
     }
 
-    val ItemStack.extraAttributes : NBTTagCompound get() = this.tagCompound.getCompoundTag("ExtraAttributes")
+    val ItemStack.extraAttributes: NBTTagCompound get() = this.tagCompound.getCompoundTag("ExtraAttributes")
 
     // TODO change else janni is sad
     fun ItemStack.isCoopSoulBound(): Boolean =
@@ -79,20 +79,16 @@ object ItemUtils {
     }
 
     fun hasAttributes(stack: ItemStack): Boolean {
-        if (stack.hasTagCompound()) {
-            val tagCompound = stack.tagCompound
-            if (tagCompound.hasKey("ExtraAttributes")) {
-                val extraAttributes = tagCompound.getCompoundTag("ExtraAttributes")
-                try {
-                    val json = GsonBuilder().create().fromJson(extraAttributes.toString(), JsonObject::class.java)
-                    if (json.has("attributes")) {
-                        return true
-                    }
-                } catch (_: Exception) {
-                }
-            }
+        if (!stack.hasTagCompound()) return false
+        val tagCompound = stack.tagCompound
+        if (!tagCompound.hasKey("ExtraAttributes")) return false
+        val extraAttributes = tagCompound.getCompoundTag("ExtraAttributes")
+        try {
+            val json = GsonBuilder().create().fromJson(extraAttributes.toString(), JsonObject::class.java)
+            return json.has("attributes")
+        } catch (_: Exception) {
+            return false
         }
-        return false
     }
 
     fun ItemStack.getInternalName() = getInternalNameOrNull() ?: NEUInternalName.NONE

From 493695852030fabb38b8735d96535a25933ff133 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:38:31 +0200
Subject: [PATCH 132/721] fix jani for consistency

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e4b9b367d6bf..0a6589680f9a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -3901,7 +3901,7 @@
 + Fixed max kills from Ghost Counter using old bestiary data when resetting the config. - HiZe
 + Fixed part of Zealot Hideout area showing as The End. - Cad
 + Fixed many typos in the config. - schlaumeyer, oofy, CalMWolfs & hannibal2
-+ Fixed a missing bracket in the reforge apply cost display from Estimated Item Value. - jaNI
++ Fixed a missing bracket in the reforge apply cost display from Estimated Item Value. - jani
 + Fixed a rare crash while doing enderman slayer. - hannibal2
 + Fixed pet exp tooltip doesn't show in pet inventory or Hypixel profile viewer (right-click a player). - hannibal2
 + Fixed turbo books price not getting detected in visitor rewards. - hannibal2

From 59cf5c886b055c946cf649d0c703ed5a647c763d Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Fri, 26 Jul 2024 10:33:59 +0200
Subject: [PATCH 133/721] Fix: Double Powder Detection (#2157)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/powdertracker/PowderTracker.kt     | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index d283c4f2d556..69e93489f9c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
 import at.hannibal2.skyhanni.data.BossbarData
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
@@ -21,6 +22,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -28,6 +30,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonNull
 import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 
 @SkyHanniModule
@@ -53,6 +56,14 @@ object PowderTracker {
         "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?<time>.*)§r",
     )
 
+    /**
+     * REGEX-TEST: Ends in: §r§b5m 27s
+     */
+    private val tablistEventDuration by patternGroup.pattern(
+        "powder.duration",
+        "Ends in: §r§b(?<duration>.*)",
+    )
+
     /**
      * REGEX-TEST: §b§lCOMPACT! §r§fYou found an §r§aEnchanted Hard Stone§r§f!
      */
@@ -70,7 +81,8 @@ object PowderTracker {
     private val chestInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private val hardStoneInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private var doublePowder = false
-    private var powderTimer = ""
+    private var powderTimer = Duration.ZERO
+    private var eventEnded = false
     private val gemstones = listOf(
         "Ruby" to "§c",
         "Sapphire" to "§b",
@@ -94,12 +106,27 @@ object PowderTracker {
         calculateResourceHour(chestInfo)
         calculateResourceHour(hardStoneInfo)
 
-        doublePowder = powderBossBarPattern.matcher(BossbarData.getBossbar()).find()
-        powderBossBarPattern.matchMatcher(BossbarData.getBossbar()) {
-            powderTimer = group("time")
-            doublePowder = powderTimer != "00:00"
+        if (TabWidget.EVENT.isActive) {
+            for ((index, line) in TabWidget.EVENT.lines.withIndex()) {
+                if (line.contains("2x Powder")) {
+                    if (eventEnded) return
+                    doublePowder = true
+                    val durationLine = TabWidget.EVENT.lines.getOrNull(index + 1) ?: return
+                    tablistEventDuration.matchMatcher(durationLine) {
+                        val duration = group("duration")
+                        powderTimer = TimeUtils.getDuration(duration)
+                        tracker.update()
+                    }
+                }
+            }
+        } else {
+            powderBossBarPattern.matchMatcher(BossbarData.getBossbar()) {
+                val duration = group("time")
+                powderTimer = TimeUtils.getDuration(duration)
 
-            tracker.update()
+                doublePowder = powderTimer > Duration.ZERO
+                tracker.update()
+            }
         }
 
         if (lastChestPicked.passedSince() > 1.minutes) {
@@ -149,8 +176,14 @@ object PowderTracker {
             lastChestPicked = SimpleTimeMark.now()
         }
 
-        powderStartedPattern.matchMatcher(msg) { doublePowder = true }
-        powderEndedPattern.matchMatcher(msg) { doublePowder = false }
+        powderStartedPattern.matchMatcher(msg) {
+            doublePowder = true
+            eventEnded = false
+        }
+        powderEndedPattern.matchMatcher(msg) {
+            doublePowder = false
+            eventEnded = true
+        }
 
         compactedPattern.matchMatcher(msg) {
             tracker.modify {
@@ -202,6 +235,7 @@ object PowderTracker {
         hardStoneInfo.stoppedChecks = 0
         hardStoneInfo.perMin.clear()
         doublePowder = false
+        eventEnded = false
         tracker.update()
     }
 
@@ -307,7 +341,7 @@ object PowderTracker {
     }
 
     private fun MutableList<List<Any>>.addPerHour(
-        map: MutableMap<PowderChestReward, Long>,
+        map: Map<PowderChestReward, Long>,
         reward: PowderChestReward,
         info: ResourceInfo,
     ) {

From 23073945bcba5f56f343106155634a57ae3f8549 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 26 Jul 2024 04:36:15 -0400
Subject: [PATCH 134/721] Fix: Stray Rabbit Production Time Tooltip (#2239)

---
 .../chocolatefactory/ChocolateFactoryTooltipStray.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
index 87e197a96600..d5cfb989d8aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltipStray.kt
@@ -13,14 +13,14 @@ object ChocolateFactoryTooltipStray {
     private val config get() = ChocolateFactoryAPI.config
 
     /**
-     * REGEX-TEST: §7You gained §6+2,465,018 Chocolate§7!
-     * REGEX-TEST: §7gained §6+30,292 Chocolate§7!
-     * REGEX-TEST: §7§6+36,330 Chocolate§7!
-     * REGEX-TEST: §9Rabbit§7, so you received §655,935,257
+     * REGEX-TEST: §5§o§7You gained §6+2,465,018 Chocolate§7!
+     * REGEX-TEST: §5§o§7gained §6+30,292 Chocolate§7!
+     * REGEX-TEST: §5§o§7§6+36,330 Chocolate§7!
+     * REGEX-TEST: §5§o§9Rabbit§7, so you received §655,935,257
      */
     private val chocolateGainedPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.stray",
-        "(?:§.)?+(?:Rabbit§7, so )?(?:[Yy]ou )?(?:gained |received )?§6\\+?(?<amount>[\\d,]+)(?:$| Chocolate§7!)"
+        "(?:§.)*(?:Rabbit§7, so )?(?:[Yy]ou )?(?:gained |received )?§6\\+?(?<amount>[\\d,]+)(?: Chocolate§7!)?"
     )
 
     @SubscribeEvent(priority = EventPriority.HIGH)

From 6a52d3d282a52565d6993a0df56647c9ddf53caa Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:04:29 +0200
Subject: [PATCH 135/721] Fix: renderStringsAndItems y issue (#2260)

---
 .../hannibal2/skyhanni/utils/RenderUtils.kt   | 65 ++++++++++++-------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 1f389e51b766..0191b497d6f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor.Companion.toLorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils.getCorners
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderYAligned
 import at.hannibal2.skyhanni.utils.shader.ShaderManager
 import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils
@@ -642,11 +643,43 @@ object RenderUtils {
         if (addToGuiManager) GuiEditManager.add(this, posLabel, renderable.width, 0)
     }
 
+    /** This function is discouraged to be used. Please use renderRenderables with List<Renderable> instead with horizontal container.*/
+    fun Position.renderRenderablesDouble(
+        renderables: List<List<Renderable>>,
+        extraSpace: Int = 0,
+        posLabel: String,
+        addToGuiManager: Boolean = true,
+    ) {
+        if (renderables.isEmpty()) return
+        var longestY = 0
+        var longestX = 0
+        GlStateManager.pushMatrix()
+        val (x, y) = transform()
+        Renderable.withMousePosition(x, y) {
+            for (line in renderables) {
+                GlStateManager.pushMatrix()
+                GlStateManager.translate(0f, longestY.toFloat(), 0F)
+                val lineY = line.maxOf { it.height }
+                var lineX = 0
+                for (element in line) {
+                    element.renderYAligned(lineX, longestY, lineY)
+                    GlStateManager.translate(element.width.toFloat(), 0f, 0f)
+                    lineX += element.width
+                }
+                longestY += lineY + extraSpace + 2
+                longestX = max(longestX, lineX)
+                GlStateManager.popMatrix()
+            }
+        }
+        GlStateManager.popMatrix()
+        if (addToGuiManager) GuiEditManager.add(this, posLabel, longestX, longestY)
+    }
+
     /**
      * Accepts a list of lines to print.
      * Each line is a list of things to print. Can print String or ItemStack objects.
      */
-    @Deprecated("use List<Renderable>", ReplaceWith(""))
+    @Deprecated("use List<List<Renderable>>", ReplaceWith("this.renderRenderablesDouble(list,extraSpace,posLabel)"))
     fun Position.renderStringsAndItems(
         list: List<List<Any?>>,
         extraSpace: Int = 0,
@@ -655,24 +688,10 @@ object RenderUtils {
     ) {
         if (list.isEmpty()) return
 
-        var offsetY = 0
-        var longestX = 0
-        try {
-            for (line in list) {
-                val x = renderLine(line, offsetY, itemScale)
-                if (x > longestX) {
-                    longestX = x
-                }
-                offsetY += 10 + extraSpace + 2
-            }
-        } catch (e: NullPointerException) {
-            ErrorManager.logErrorWithData(
-                e,
-                "Failed to render an element",
-                "list" to list,
-            )
-        }
-        GuiEditManager.add(this, posLabel, longestX, offsetY)
+        val render =
+            list.map { it.map { Renderable.fromAny(it, itemScale = itemScale) ?: throw RuntimeException("Unknown render object: $it") } }
+
+        this.renderRenderablesDouble(render, extraSpace, posLabel, true)
     }
 
     /**
@@ -685,11 +704,9 @@ object RenderUtils {
         posLabel: String,
     ) {
         if (list.isEmpty()) return
-        renderRenderables(
-            listOf(
-                Renderable.horizontalContainer(
-                    list.mapNotNull { Renderable.fromAny(it) },
-                ),
+        renderRenderable(
+            Renderable.horizontalContainer(
+                list.mapNotNull { Renderable.fromAny(it) },
             ),
             posLabel = posLabel,
         )

From 77eb10263b65dbafac61a5e8ff0be552cd6c4617 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:06:14 +0200
Subject: [PATCH 136/721] Fix: Custom Scoreboard Reset Issue (#2252)

---
 .../features/gui/customscoreboard/CustomScoreboardConfig.java  | 3 ++-
 .../config/features/gui/customscoreboard/EventsConfig.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
index bc3dc1fc6f95..38a749f35029 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
@@ -36,7 +36,8 @@ public class CustomScoreboardConfig {
     @ConfigOption(name = "Reset Appearance", desc = "Reset the appearance of the advanced scoreboard.")
     @ConfigEditorButton(buttonText = "Reset")
     public Runnable reset = () -> {
-        scoreboardEntries = ScoreboardElement.defaultOption;
+        scoreboardEntries.clear();
+        scoreboardEntries.addAll(ScoreboardElement.defaultOption);
     };
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
index 0093b8588f3c..e2663bf55c29 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/EventsConfig.java
@@ -23,7 +23,8 @@ public class EventsConfig {
     @ConfigOption(name = "Reset Events Priority", desc = "Reset the priority of all events.")
     @ConfigEditorButton(buttonText = "Reset")
     public Runnable reset = () -> {
-        eventEntries = ScoreboardEvent.defaultOption;
+        eventEntries.clear();
+        eventEntries.addAll(ScoreboardEvent.defaultOption);
     };
 
     @Expose

From f1ebd65ecfd633f89b7481918772593daddf66ba Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:10:25 -0400
Subject: [PATCH 137/721] Fix: Fine Flour in Sprayonator (#2251)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/pests/SprayFeatures.kt    | 28 +++++++++----------
 .../features/garden/pests/SprayType.kt        |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt
index b01e6a08e5a5..a87100202ee7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.features.garden.GardenPlotAPI
 import at.hannibal2.skyhanni.features.garden.GardenPlotAPI.renderPlot
 import at.hannibal2.skyhanni.features.garden.pests.PestAPI.getPests
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -29,28 +28,29 @@ object SprayFeatures {
 
     private val changeMaterialPattern by RepoPattern.pattern(
         "garden.spray.material",
-        "§a§lSPRAYONATOR! §r§7Your selected material is now §r§a(?<spray>.*)§r§7!"
+        "§a§lSPRAYONATOR! §r§7Your selected material is now §r§a(?<spray>.*)§r§7!",
     )
 
+    private fun SprayType?.getSprayEffect(): String =
+        this?.getPests()?.takeIf { it.isNotEmpty() }?.let { pests ->
+            pests.joinToString("§7, §6") { it.displayName }
+        } ?: when (this) {
+            SprayType.FINE_FLOUR -> "§6+20☘ Farming Fortune"
+            else -> "§cUnknown Effect"
+        }
+
+
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
 
-        val type = changeMaterialPattern.matchMatcher(event.message) {
+        display = changeMaterialPattern.matchMatcher(event.message) {
             val sprayName = group("spray")
-            SprayType.getByName(sprayName) ?: run {
-                ErrorManager.logErrorStateWithData(
-                    "Error reading spray material", "SprayType is null",
-                    "sprayName" to sprayName,
-                    "event.message" to event.message,
-                )
-                return
-            }
+            val type = SprayType.getByName(sprayName)
+            val sprayEffect = type.getSprayEffect()
+            "§a${type?.displayName ?: sprayName} §7(§6$sprayEffect§7)"
         } ?: return
 
-        val pests = type.getPests().joinToString("§7, §6") { it.displayName }
-        display = "§a${type.displayName} §7(§6$pests§7)"
-
         lastChangeTime = SimpleTimeMark.now()
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayType.kt
index cb17de882171..56ff022b8028 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayType.kt
@@ -6,6 +6,7 @@ enum class SprayType(val displayName: String) {
     DUNG("Dung"),
     HONEY_JAR("Honey Jar"),
     TASTY_CHEESE("Tasty Cheese"),
+    FINE_FLOUR("Fine Flour"),
     ;
 
     companion object {

From bde6b2a2b9ca8e89c6b661fc5ef6333cd4ec9da6 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:11:38 -0400
Subject: [PATCH 138/721] Fix: Hoppity Abiphone Call Compact (#2250)

---
 .../skyhanni/features/event/hoppity/HoppityEggsManager.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 86213e88bf94..93ae797e7581 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -122,10 +122,10 @@ object HoppityEggsManager {
             return
         }
 
-        if (!ChocolateFactoryAPI.isHoppityEvent()) return
-
         HoppityEggsCompactChat.handleChat(event)
 
+        if (!ChocolateFactoryAPI.isHoppityEvent()) return
+
         eggFoundPattern.matchMatcher(event.message) {
             HoppityEggLocations.saveNearestEgg()
             HoppityEggLocator.eggFound()

From 19d4d4e1eaa06d4ff2a170cad7ebf9e6441dc048 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:02:20 +0200
Subject: [PATCH 139/721] Improvement + Fix: Barn Fishing Timer (#1960)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../features/fishing/BarnTimerConfig.java     |  25 +-
 .../skyhanni/features/fishing/FishingTimer.kt | 222 +++++++++++++-----
 2 files changed, 182 insertions(+), 65 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
index 42e36fe508ab..d62d066e590f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
@@ -8,17 +8,18 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
 import org.lwjgl.input.Keyboard;
 
 public class BarnTimerConfig {
     @Expose
     @ConfigOption(
         name = "Barn Fishing Timer",
-        desc = "Show the time and amount of sea creatures while fishing on the barn via hub."
+        desc = "Show the time and amount of own sea creatures nearby while barn fishing."
     )
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean enabled = true;
+    public Property<Boolean> enabled = Property.of(true);
 
     @Expose
     @ConfigOption(
@@ -26,7 +27,7 @@ public class BarnTimerConfig {
         desc = "Show the Barn Fishing Timer in the Crystal Hollows."
     )
     @ConfigEditorBoolean
-    public boolean crystalHollows = true;
+    public Property<Boolean> crystalHollows = Property.of(true);
 
     @Expose
     @ConfigOption(
@@ -34,7 +35,7 @@ public class BarnTimerConfig {
         desc = "Show the Barn Fishing Timer in the Crimson Isle."
     )
     @ConfigEditorBoolean
-    public boolean crimsonIsle = true;
+    public Property<Boolean> crimsonIsle = Property.of(true);
 
     @Expose
     @ConfigOption(
@@ -42,7 +43,7 @@ public class BarnTimerConfig {
         desc = "Show the Barn Fishing Timer on the Jerry's Workshop island."
     )
     @ConfigEditorBoolean
-    public boolean winterIsland = true;
+    public Property<Boolean> winterIsland = Property.of(true);
 
     @Expose
     @ConfigOption(
@@ -50,12 +51,12 @@ public class BarnTimerConfig {
         desc = "Show the Barn Fishing Timer on all the different islands that Stranded players can visit."
     )
     @ConfigEditorBoolean
-    public boolean forStranded = true;
+    public Property<Boolean> forStranded = Property.of(true);
 
     @Expose
     @ConfigOption(
         name = "Worm Cap Alert",
-        desc = "Alerts you with title and sound if you hit the Worm Sea Creature limit of 60."
+        desc = "Alerts you with title and sound if you hit the Worm Sea Creature limit of 20."
     )
     @ConfigEditorBoolean
     public boolean wormLimitAlert = true;
@@ -74,6 +75,16 @@ public class BarnTimerConfig {
     )
     public int alertTime = 330;
 
+    @Expose
+    @ConfigOption(name = "Fishing Cap Alert", desc = "Gives a warning when you reach a certain amount of mobs.")
+    @ConfigEditorBoolean
+    public boolean fishingCapAlert = true;
+
+    @Expose
+    @ConfigOption(name = "Fishing Cap Amount", desc = "Amount of mobs at which to trigger the Fishing Cap Alert.")
+    @ConfigEditorSlider(minValue = 10, maxValue = 60, minStep = 1)
+    public int fishingCapAmount = 30;
+
     @Expose
     @ConfigLink(owner = BarnTimerConfig.class, field = "enabled")
     public Position pos = new Position(10, 10, false, true);
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
index 26470fd9e5a9..74cf9294da64 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@@ -3,25 +3,32 @@ package at.hannibal2.skyhanni.features.fishing
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.mob.Mob
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.MobEvent
+import at.hannibal2.skyhanni.events.SeaCreatureFishEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.EntityUtils
-import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
-import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RecalculatingValue
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils
+import at.hannibal2.skyhanni.utils.TimeLimitedSet
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.client.Minecraft
-import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
@@ -29,100 +36,199 @@ object FishingTimer {
 
     private val config get() = SkyHanniMod.feature.fishing.barnTimer
     private val barnLocation = LorenzVec(108, 89, -252)
+    private val mobDespawnTime = mutableMapOf<Mob, SimpleTimeMark>()
+
+    private var lastSeaCreatureFished = SimpleTimeMark.farPast()
+    private var display: String? = null
+    private var lastNameFished: String? = null
+
+    private var babyMagmaSlugsToFind = 0
+    private var lastMagmaSlugLocation: LorenzVec? = null
+    private var lastMagmaSlugTime = SimpleTimeMark.farPast()
+    private var recentBabyMagmaSlugs = TimeLimitedSet<Mob>(2.seconds)
+
+    private var mobsToFind = 0
+
+    private val recentMobs = TimeLimitedSet<Mob>(2.seconds)
+    private val currentCap by RecalculatingValue(1.seconds) {
+        when (LorenzUtils.skyBlockIsland) {
+            IslandType.CRYSTAL_HOLLOWS -> 20
+            IslandType.CRIMSON_ISLE -> 5
+            else -> config.fishingCapAmount
+        }
+    }
 
     private var rightLocation = false
     private var currentCount = 0
     private var startTime = SimpleTimeMark.farPast()
-    private var inHollows = false
 
     @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!config.enabled) return
-
-        if (event.repeatSeconds(3)) {
-            rightLocation = isRightLocation()
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        updateLocation()
+        if (startTime.passedSince().inWholeSeconds - config.alertTime in 0..3) {
+            playSound()
+        }
+        if (config.wormLimitAlert && IslandType.CRYSTAL_HOLLOWS.isInIsland()) {
+            if (currentCount >= 20) {
+                playSound()
+                LorenzUtils.sendTitle("§cWORM CAP FULL!!!", 2.seconds)
+            }
+        } else if (config.fishingCapAlert && currentCount >= currentCap) {
+            playSound()
         }
+    }
 
-        if (!rightLocation) return
+    private fun playSound() = SoundUtils.repeatSound(250, 4, SoundUtils.plingSound)
 
-        if (event.isMod(5)) checkMobs()
-        if (event.isMod(7)) tryPlaySound()
-        if (config.manualResetTimer.isKeyHeld() && Minecraft.getMinecraft().currentScreen == null) {
-            startTime = SimpleTimeMark.now()
+    @SubscribeEvent
+    fun onMobSpawn(event: MobEvent.Spawn.SkyblockMob) {
+        if (!isEnabled()) return
+        val mob = event.mob
+        if (babyMagmaSlugsToFind != 0 && mob.name == "Baby Magma Slug") {
+            recentBabyMagmaSlugs += mob
+            handleBabySlugs()
+            return
         }
+        if (mob.name !in SeaCreatureManager.allFishingMobs) return
+        recentMobs += mob
+        handle()
     }
 
-    private fun tryPlaySound() {
-        if (currentCount == 0) return
-
-        val passedSince = startTime.passedSince()
-        val barnTimerAlertTime = (config.alertTime * 1_000).milliseconds
-        if (passedSince in barnTimerAlertTime..(barnTimerAlertTime + 3.seconds)) {
-            SoundUtils.playBeepSound()
+    @SubscribeEvent
+    fun onMobDeSpawn(event: MobEvent.DeSpawn.SkyblockMob) {
+        if (!isEnabled()) return
+        val mob = event.mob
+        if (mob in mobDespawnTime) {
+            mobDespawnTime -= mob
+            if (mob.name == "Magma Slug") {
+                lastMagmaSlugLocation = mob.baseEntity.getLorenzVec()
+                babyMagmaSlugsToFind += 3
+                lastMagmaSlugTime = SimpleTimeMark.now()
+                handleBabySlugs()
+            }
         }
+        recentMobs -= mob
+        updateInfo()
     }
 
-    private fun checkMobs() {
-        val newCount = countMobs()
+    @SubscribeEvent
+    fun onSeaCreatureFish(event: SeaCreatureFishEvent) {
+        if (!isEnabled()) return
+        if (!rightLocation) return
+        lastSeaCreatureFished = SimpleTimeMark.now()
+        lastNameFished = event.seaCreature.name
+        mobsToFind = if (event.doubleHook) 2 else 1
+        handle()
+    }
 
-        if (currentCount == 0 && newCount > 0) {
-            startTime = SimpleTimeMark.now()
+    private fun handle() {
+        if (lastSeaCreatureFished.passedSince() > 2.seconds) return
+        val name = lastNameFished ?: return
+        val mobs = recentMobs.filter { it.name == name && it !in mobDespawnTime }
+            .sortedBy { it.baseEntity.distanceToPlayer() }
+            .take(mobsToFind).ifEmpty { return }
+        mobsToFind -= mobs.size
+        mobs.forEach { mobDespawnTime[it] = SimpleTimeMark.now() }
+        if (mobsToFind == 0) {
+            recentMobs.clear()
+            lastNameFished = null
         }
+        updateInfo()
+    }
 
-        currentCount = newCount
-        if (newCount == 0) {
-            startTime = SimpleTimeMark.farPast()
+    private fun handleBabySlugs() {
+        if (lastMagmaSlugTime.passedSince() > 2.seconds) return
+        if (babyMagmaSlugsToFind == 0) return
+        val location = lastMagmaSlugLocation ?: return
+        val slugs = recentBabyMagmaSlugs.filter { it !in mobDespawnTime }
+            .sortedBy { it.baseEntity.distanceTo(location) }
+            .take(babyMagmaSlugsToFind).ifEmpty { return }
+        babyMagmaSlugsToFind -= slugs.size
+        slugs.forEach { mobDespawnTime[it] = SimpleTimeMark.now() }
+        if (babyMagmaSlugsToFind == 0) {
+            recentBabyMagmaSlugs.clear()
+            lastMagmaSlugLocation = null
         }
+        updateInfo()
+    }
 
-        if (inHollows && newCount >= 60 && config.wormLimitAlert) {
-            SoundUtils.playBeepSound()
-            LorenzUtils.sendTitle("§cWORM CAP FULL!!!", 2.seconds)
+    @SubscribeEvent
+    fun onKeyPress(event: LorenzKeyPressEvent) {
+        if (!isEnabled()) return
+        if (Minecraft.getMinecraft().currentScreen != null) return
+        if (config.manualResetTimer.isKeyClicked()) {
+            mobDespawnTime.replaceAll { _, _ ->
+                SimpleTimeMark.now()
+            }
         }
     }
 
-    private fun countMobs() =
-        EntityUtils.getEntities<EntityArmorStand>().map { entity -> FishingAPI.seaCreatureCount(entity) }.sum()
-
-    private fun isRightLocation(): Boolean {
-        inHollows = false
-
-        if (config.forStranded && LorenzUtils.isStrandedProfile) return true
-
-        if (config.crystalHollows && IslandType.CRYSTAL_HOLLOWS.isInIsland()) {
-            inHollows = true
-            return true
+    private fun updateInfo() {
+        currentCount = mobDespawnTime.entries.sumOf {
+            1 + it.key.extraEntities.size
         }
+        startTime = mobDespawnTime.maxByOrNull { it.value.passedSince() }?.value ?: SimpleTimeMark.farPast()
+        display = createDisplay()
+    }
 
-        if (config.crimsonIsle && IslandType.CRIMSON_ISLE.isInIsland()) return true
-
-        if (config.winterIsland && IslandType.WINTER.isInIsland()) return true
-
-        if (!IslandType.THE_FARMING_ISLANDS.isInIsland()) {
-            return LocationUtils.playerLocation().distance(barnLocation) < 50
+    private fun updateLocation() {
+        rightLocation = when (LorenzUtils.skyBlockIsland) {
+            IslandType.CRYSTAL_HOLLOWS -> config.crystalHollows.get()
+            IslandType.CRIMSON_ISLE -> config.crimsonIsle.get()
+            IslandType.WINTER -> config.winterIsland.get()
+            IslandType.HUB -> barnLocation.distanceToPlayer() < 50
+            IslandType.PRIVATE_ISLAND -> config.forStranded.get() && LorenzUtils.isStrandedProfile
+            else -> false
         }
+    }
 
-        return false
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        if (!rightLocation) return
+        if (currentCount == 0) return
+        if (!FishingAPI.isFishing()) return
+
+        display = createDisplay()
     }
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!config.enabled) return
+        if (!isEnabled()) return
         if (!rightLocation) return
         if (currentCount == 0) return
         if (!FishingAPI.isFishing()) return
 
+        val text = display ?: return
+        config.pos.renderString(text, posLabel = "BarnTimer")
+    }
+
+    private fun createDisplay(): String {
         val passedSince = startTime.passedSince()
-        val barnTimerAlertTime = (config.alertTime * 1_000).milliseconds
-        val color = if (passedSince > barnTimerAlertTime) "§c" else "§e"
+        val timeColor = if (passedSince > config.alertTime.seconds) "§c" else "§e"
         val timeFormat = passedSince.format(TimeUnit.MINUTE)
+        val countColor = if (config.fishingCapAlert && currentCount >= currentCap) "§c" else "§e"
         val name = StringUtils.pluralize(currentCount, "sea creature")
-        val text = "$color$timeFormat §8(§e$currentCount §b$name§8)"
+        return "$timeColor$timeFormat §8($countColor$currentCount §b$name§8)"
+    }
 
-        config.pos.renderString(text, posLabel = "BarnTimer")
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        mobDespawnTime.clear()
+        recentMobs.clear()
+        babyMagmaSlugsToFind = 0
+        display = null
+        lastMagmaSlugLocation = null
+        lastMagmaSlugTime = SimpleTimeMark.farPast()
+        recentBabyMagmaSlugs.clear()
+        mobsToFind = 0
+        currentCount = 0
+        startTime = SimpleTimeMark.farPast()
     }
 
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled.get()
+
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "fishing.barnTimer", "fishing.barnTimer.enabled")

From 4558f7b79dbd6097747e4742e13dcbdec623612f Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:03:35 +0200
Subject: [PATCH 140/721] Improvement: Made Hoppity Egg Waypoint Color
 customizable (#2259)

---
 .../skyhanni/config/features/event/HoppityEggsConfig.java   | 6 ++++++
 .../skyhanni/features/event/hoppity/HoppityEggLocator.kt    | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
index 52aaa8aed61d..5536d56914fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
@@ -4,6 +4,7 @@
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
@@ -26,6 +27,11 @@ public class HoppityEggsConfig {
     @ConfigEditorBoolean
     public boolean waypointsImmediately = false;
 
+    @Expose
+    @ConfigOption(name = "Color", desc = "Color of the waypoint.")
+    @ConfigEditorColour
+    public String waypointColor = "0:53:46:224:73";
+
     @Expose
     @ConfigOption(name = "Show Line", desc = "Show a line to the waypoint.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index aa291eb92d18..dcf56aac6bbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
@@ -140,7 +141,7 @@ object HoppityEggLocator {
                     if (eyeLocation.distance(it) > 2) {
                         drawWaypointFilled(
                             it,
-                            LorenzColor.GREEN.toColor(),
+                            config.waypointColor.toChromaColor(),
                             seeThroughBlocks = true,
                         )
                         drawDynamicText(it.add(y = 1), "§aGuess", 1.5)
@@ -158,7 +159,7 @@ object HoppityEggLocator {
             && HoppityEggLocations.hasCollectedEgg(location)
         val possibleDuplicateLabel = if (shouldMarkDuplicate) "$label §c(Duplicate Location)" else label
         if (!shouldMarkDuplicate) {
-            drawWaypointFilled(location, LorenzColor.GREEN.toColor(), seeThroughBlocks = true)
+            drawWaypointFilled(location, config.waypointColor.toChromaColor(), seeThroughBlocks = true)
         } else {
             drawColor(location, LorenzColor.RED.toColor(), false, 0.5f)
         }

From 3cbb6b8b640d0f78cb3c316de1af92a9a0d8fed4 Mon Sep 17 00:00:00 2001
From: Phoebe <77941535+catgirlseraid@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:04:12 +1200
Subject: [PATCH 141/721] Feature: Item Pickup Log (#1937)

Co-authored-by: SeRaid <77941535+SeRaid743@users.noreply.github.com>
Co-authored-by: blahajenjoyer7 <171753706+blahajenjoyer7@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |   5 +
 .../inventory/ItemPickupLogConfig.java        |  80 +++++
 .../features/inventory/ItemPickupLog.kt       | 340 ++++++++++++++++++
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |   2 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  18 +
 5 files changed, 444 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 684e2bb7944a..a3f88fca6473 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -58,6 +58,11 @@ public class InventoryConfig {
     @Category(name = "Chocolate Factory", desc = "Features to help you master the Chocolate Factory idle game.")
     public ChocolateFactoryConfig chocolateFactory = new ChocolateFactoryConfig();
 
+    @Expose
+    @ConfigOption(name = "Item Pickup Log", desc = "Logs all the picked up and dropped items")
+    @Accordion
+    public ItemPickupLogConfig itemPickupLogConfig = new ItemPickupLogConfig();
+
     @Expose
     @Category(name = "Craftable Item List", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
new file mode 100644
index 000000000000..24dc1dc11a5f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
@@ -0,0 +1,80 @@
+package at.hannibal2.skyhanni.config.features.inventory;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.inventory.ItemPickupLog;
+import at.hannibal2.skyhanni.utils.RenderUtils;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ItemPickupLogConfig {
+
+    @Expose
+    @ConfigOption(name = "Item Pickup Log", desc = "Show a log of what items you pick up/drop and their amounts.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Compact Lines", desc = "Combine the §a+ §7and §c- §7lines into a single line.")
+    @ConfigEditorBoolean
+    public boolean compactLines = true;
+
+    @Expose
+    @ConfigOption(name = "Compact Numbers", desc = "Compact the amounts added and removed.")
+    @ConfigEditorBoolean
+    public boolean shorten = false;
+
+    @Expose
+    @ConfigOption(name = "Sacks", desc = "Show items added and removed from stacks.")
+    @ConfigEditorBoolean
+    public boolean sack = false;
+
+    @Expose
+    @ConfigOption(name = "Coins", desc = "Show coins added and removed from purse.")
+    @ConfigEditorBoolean
+    public boolean coins = false;
+
+    @Expose
+    @ConfigOption(
+        name = "Alignment",
+        desc = "How the item pickup log should be aligned. §d:3"
+    )
+    @ConfigEditorDropdown
+    public RenderUtils.VerticalAlignment alignment = RenderUtils.VerticalAlignment.TOP;
+
+    @Expose
+    @ConfigOption(
+        name = "Layout",
+        desc = "Drag text to change the layout. List will be rendered horizontally"
+    )
+    @ConfigEditorDraggableList(requireNonEmpty = true)
+    public List<ItemPickupLog.DisplayLayout> displayLayout = new ArrayList<>(Arrays.asList(
+        ItemPickupLog.DisplayLayout.CHANGE_AMOUNT,
+        ItemPickupLog.DisplayLayout.ICON,
+        ItemPickupLog.DisplayLayout.ITEM_NAME
+    ));
+
+    @Expose
+    @ConfigOption(
+        name = "Expire After",
+        desc = "How long items show for after being picked up or dropped, in seconds."
+    )
+    @ConfigEditorSlider(minValue = 1, maxValue = 20, minStep = 1)
+    public int expireAfter = 10;
+
+    @Expose
+    @ConfigLink(owner = ItemPickupLogConfig.class, field = "enabled")
+    public Position pos = new Position(-256, 140, false, true);
+}
+
+
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
new file mode 100644
index 000000000000..1ce530a17459
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -0,0 +1,340 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.PurseChangeEvent
+import at.hannibal2.skyhanni.events.SackChangeEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addItemStack
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemNameResolver
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getExtraAttributes
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.Objects
+import kotlin.math.absoluteValue
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object ItemPickupLog {
+    enum class DisplayLayout(private val display: String) {
+        CHANGE_AMOUNT("§a+256"),
+        ICON("§e✎"),
+        ITEM_NAME("§d[:3] TransRights's Cake Soul"),
+        ;
+
+        override fun toString() = display
+    }
+
+    private data class PickupEntry(val name: String, var amount: Long, val neuInternalName: NEUInternalName?) {
+        var timeUntilExpiry = SimpleTimeMark.now()
+
+        fun updateAmount(change: Long) {
+            amount += change
+            timeUntilExpiry = SimpleTimeMark.now()
+        }
+
+        fun isExpired() = timeUntilExpiry.passedSince() > config.expireAfter.seconds
+    }
+
+    private val config get() = SkyHanniMod.feature.inventory.itemPickupLogConfig
+    private val coinIcon = "COIN_TALISMAN".asInternalName()
+
+    private var itemList = mutableMapOf<Int, Pair<ItemStack, Int>>()
+    private var itemsAddedToInventory = mutableMapOf<Int, PickupEntry>()
+    private var itemsRemovedFromInventory = mutableMapOf<Int, PickupEntry>()
+    private var display: Renderable? = null
+
+    private val patternGroup = RepoPattern.group("itempickuplog")
+    private val shopPattern by patternGroup.pattern(
+        "shoppattern",
+        "^(?<itemName>.+?)(?: x\\d+)?\$",
+    )
+
+    private val bannedItemsPattern by patternGroup.list(
+        "banneditems",
+        "SKYBLOCK_MENU",
+        "CANCEL_PARKOUR_ITEM",
+        "CANCEL_RACE_ITEM",
+    )
+    private val bannedItemsConverted = bannedItemsPattern.map { it.toString().asInternalName() }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent) {
+        if (!isEnabled()) return
+        display?.let { config.pos.renderRenderable(it, posLabel = "Item Pickup Log Display") }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        if (!isEnabled()) return
+        itemList.clear()
+        itemsAddedToInventory.clear()
+        itemsRemovedFromInventory.clear()
+    }
+
+    @SubscribeEvent
+    fun onSackChange(event: SackChangeEvent) {
+        if (!isEnabled() || !config.sack) return
+
+        event.sackChanges.forEach {
+            val itemStack = (it.internalName.getItemStack())
+            val item = PickupEntry(itemStack.dynamicName(), it.delta.absoluteValue.toLong(), it.internalName)
+
+            updateItem(itemStack.hash(), item, itemStack, it.delta < 0)
+        }
+    }
+
+    @SubscribeEvent
+    fun onPurseChange(event: PurseChangeEvent) {
+        if (!isEnabled() || !config.coins || !worldChangeCooldown()) return
+
+        updateItem(0, PickupEntry("§6Coins", event.coins.absoluteValue.toLong(), coinIcon), coinIcon.getItemStack(), event.coins < 0)
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+
+        val oldItemList = mutableMapOf<Int, Pair<ItemStack, Int>>()
+
+        oldItemList.putAll(itemList)
+
+        itemList.clear()
+
+        val inventoryItems = InventoryUtils.getItemsInOwnInventory().toMutableList()
+        val cursorItem = Minecraft.getMinecraft().thePlayer.inventory?.itemStack
+
+        if (cursorItem != null) {
+            val hash = cursorItem.hash()
+            //this prevents items inside hypixel guis counting when picked up
+            if (oldItemList.contains(hash)) {
+                inventoryItems.add(cursorItem)
+            }
+        }
+
+        for (itemStack in inventoryItems) {
+            val hash = itemStack.hash()
+            val old = itemList[hash]
+            if (old != null) {
+                itemList[hash] = old.copy(second = old.second + itemStack.stackSize)
+            } else {
+                itemList[hash] = itemStack to itemStack.stackSize
+            }
+        }
+
+        if (!worldChangeCooldown()) return
+
+        checkForDuplicateItems(itemList, oldItemList, false)
+        checkForDuplicateItems(oldItemList, itemList, true)
+
+        val itemsRemovedUpdated = itemsRemovedFromInventory.values.removeIf { it.isExpired() }
+        val itemsAddedUpdated = itemsAddedToInventory.values.removeIf { it.isExpired() }
+
+        if (itemsRemovedUpdated || itemsAddedUpdated || itemList != oldItemList) {
+            updateDisplay()
+        }
+    }
+
+    private fun updateItem(hash: Int, itemInfo: PickupEntry, item: ItemStack, removed: Boolean) {
+        if (isBannedItem(item)) return
+
+        val targetInventory = if (removed) itemsRemovedFromInventory else itemsAddedToInventory
+        val oppositeInventory = if (removed) itemsAddedToInventory else itemsRemovedFromInventory
+
+        oppositeInventory[hash]?.let { existingItem ->
+            existingItem.timeUntilExpiry = SimpleTimeMark.now()
+        }
+
+        targetInventory[hash]?.let { existingItem ->
+            existingItem.updateAmount(itemInfo.amount)
+            return
+        }
+
+        targetInventory[hash] = itemInfo
+    }
+
+    private fun renderList(prefix: String, entry: PickupEntry) = Renderable.horizontalContainer(
+        buildList {
+            val displayLayout: List<DisplayLayout> = config.displayLayout
+            for (item in displayLayout) {
+                when (item) {
+                    DisplayLayout.ICON -> {
+                        val itemIcon = entry.neuInternalName?.getItemStack()
+                        if (itemIcon != null) {
+                            addItemStack(itemIcon)
+                        } else {
+                            ItemNameResolver.getInternalNameOrNull(entry.name)?.let { addItemStack(it) }
+                        }
+                    }
+
+                    DisplayLayout.CHANGE_AMOUNT -> {
+                        val formattedAmount = if (config.shorten) entry.amount.shortFormat() else entry.amount.addSeparators()
+                        add(Renderable.string("${prefix}${formattedAmount}"))
+                    }
+
+                    DisplayLayout.ITEM_NAME -> {
+                        add(Renderable.string(entry.name))
+                    }
+                }
+            }
+        },
+    )
+
+    private fun checkForDuplicateItems(
+        list: MutableMap<Int, Pair<ItemStack, Int>>,
+        listToCheckAgainst: MutableMap<Int, Pair<ItemStack, Int>>,
+        add: Boolean,
+    ) {
+        for ((key, value) in list) {
+            val stack = value.first
+            val oldAmount = value.second
+
+            if (!listToCheckAgainst.containsKey(key)) {
+                val item = PickupEntry(stack.dynamicName(), oldAmount.toLong(), stack.getInternalNameOrNull())
+                updateItem(key, item, stack, add)
+            } else if (oldAmount > listToCheckAgainst[key]!!.second) {
+                val amount = (oldAmount - listToCheckAgainst[key]?.second!!)
+                val item = PickupEntry(stack.dynamicName(), amount.toLong(), stack.getInternalNameOrNull())
+                updateItem(key, item, stack, add)
+            }
+        }
+    }
+
+    private fun isBannedItem(item: ItemStack): Boolean {
+        if (item.getInternalNameOrNull()?.startsWith("MAP") == true) {
+            return true
+        }
+
+        if (bannedItemsConverted.contains(item.getInternalNameOrNull())) {
+            return true
+        }
+
+        if (item.getExtraAttributes()?.hasKey("quiver_arrow") == true) {
+            return true
+        }
+        return false
+    }
+
+    private fun ItemStack.dynamicName(): String {
+        val compact = when (getItemCategoryOrNull()) {
+            ItemCategory.ENCHANTED_BOOK -> true
+            ItemCategory.PET -> true
+            else -> false
+        }
+        return if (compact) getInternalName().itemName else displayName
+    }
+
+    private fun ItemStack.hash(): Int {
+        var displayName = this.displayName.removeColor()
+        val matcher = shopPattern.matcher(displayName)
+        if (matcher.matches()) {
+            displayName = matcher.group("itemName")
+        }
+        return Objects.hash(
+            this.getInternalNameOrNull(),
+            displayName.removeColor(),
+            this.getItemRarityOrNull(),
+        )
+    }
+
+    private fun updateDisplay() {
+        if (!isEnabled()) return
+
+        val display = mutableListOf<Renderable>()
+
+        val removedItemsToNoLongerShow = itemsRemovedFromInventory.toMutableMap()
+        val addedItemsToNoLongerShow = itemsAddedToInventory.toMutableMap()
+
+        if (config.compactLines) {
+            handleCompactLines(display, addedItemsToNoLongerShow, removedItemsToNoLongerShow)
+        } else {
+            handleNormalLines(display, addedItemsToNoLongerShow, removedItemsToNoLongerShow)
+        }
+
+        addRemainingRemovedItems(display, removedItemsToNoLongerShow)
+
+        if (display.isEmpty()) {
+            this.display = null
+        } else {
+            val renderable = Renderable.verticalContainer(display, verticalAlign = config.alignment)
+            this.display = Renderable.fixedSizeColumn(renderable, 30)
+        }
+    }
+
+    private fun handleCompactLines(
+        display: MutableList<Renderable>,
+        addedItems: MutableMap<Int, PickupEntry>,
+        removedItems: MutableMap<Int, PickupEntry>,
+    ) {
+        val iterator = addedItems.iterator()
+        while (iterator.hasNext()) {
+            val item = iterator.next()
+
+            if (removedItems.containsKey(item.key)) {
+                val currentTotalValue = item.value.amount - (removedItems[item.key]?.amount ?: 0)
+                val entry = PickupEntry(item.value.name, currentTotalValue, item.value.neuInternalName)
+
+                if (currentTotalValue > 0) {
+                    display.add(renderList("§a+", entry))
+                } else if (currentTotalValue < 0) {
+                    display.add(renderList("§c", entry))
+                } else {
+                    itemsAddedToInventory.remove(item.key)
+                    itemsRemovedFromInventory.remove(item.key)
+                }
+                removedItems.remove(item.key)
+                iterator.remove()
+            } else {
+                display.add(renderList("§a+", item.value))
+            }
+        }
+    }
+
+    private fun handleNormalLines(
+        display: MutableList<Renderable>,
+        addedItems: MutableMap<Int, PickupEntry>,
+        removedItems: MutableMap<Int, PickupEntry>,
+    ) {
+        for (item in addedItems) {
+            display.add(renderList("§a+", item.value))
+            removedItems[item.key]?.let {
+                display.add(renderList("§c-", it))
+                removedItems.remove(item.key)
+            }
+        }
+    }
+
+    private fun addRemainingRemovedItems(
+        display: MutableList<Renderable>,
+        removedItems: MutableMap<Int, PickupEntry>,
+    ) {
+        for (item in removedItems) {
+            display.add(renderList("§c-", item.value))
+        }
+    }
+
+    private fun worldChangeCooldown(): Boolean = LorenzUtils.lastWorldSwitch.passedSince() > 2.seconds
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 0191b497d6f0..10201375874e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -640,7 +640,7 @@ object RenderUtils {
             renderable.render(0, 0)
         }
         GlStateManager.popMatrix()
-        if (addToGuiManager) GuiEditManager.add(this, posLabel, renderable.width, 0)
+        if (addToGuiManager) GuiEditManager.add(this, posLabel, renderable.width, renderable.height)
     }
 
     /** This function is discouraged to be used. Please use renderRenderables with List<Renderable> instead with horizontal container.*/
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 4645152419d3..74efcc316f97 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -672,6 +672,24 @@ interface Renderable {
             }
         }
 
+        fun fixedSizeBox(
+            content: Renderable,
+            height: Int,
+            width: Int,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            val render = content
+
+            override val width = width
+            override val height = height
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+            override fun render(posX: Int, posY: Int) {
+                render.renderXYAligned(posX, posY, height, width)
+            }
+        }
+
         fun horizontalContainer(
             content: List<Renderable>,
             spacing: Int = 0,

From a4ba470eabdea05c3e2770ce56cd3ec9e0687efc Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:05:16 +0200
Subject: [PATCH 142/721] added todo

---
 .../at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 1ce530a17459..004ef673da26 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -156,6 +156,7 @@ object ItemPickupLog {
         }
     }
 
+    // TODO merge with ItemAddInInventoryEvent
     private fun updateItem(hash: Int, itemInfo: PickupEntry, item: ItemStack, removed: Boolean) {
         if (isBannedItem(item)) return
 

From b2082d1d6008d943ffa2269cbdddb1b4fc72b8ce Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:00:59 +0200
Subject: [PATCH 143/721] Backend: Change colour (UK) to color (US) (#2258)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 CONTRIBUTING.md                               |  1 +
 docs/CHANGELOG.md                             | 10 +++----
 docs/FEATURES.md                              |  2 +-
 .../crimsonisle/MatriarchHelperConfig.java    |  4 +--
 .../config/features/gui/TextBoxConfig.java    |  2 +-
 .../AuctionHousePriceComparisonConfig.java    | 12 ++++-----
 .../ChocolateFactoryConfig.java               |  2 +-
 .../features/mining/TunnelMapsConfig.java     |  6 +++--
 .../rift/area/dreadfarm/VoltCruxConfig.java   |  1 +
 .../area/westvillage/KloonHackingConfig.java  |  1 +
 .../features/dungeon/DungeonDeathCounter.kt   |  2 +-
 .../dungeon/DungeonMilestonesDisplay.kt       |  6 ++---
 .../features/event/hoppity/HoppityEggType.kt  |  6 ++---
 .../fishing/ThunderSparksHighlight.kt         |  4 +--
 .../features/fishing/trophy/GeyserFishing.kt  |  4 +--
 .../garden/fortuneguide/CarrolynTable.kt      |  4 +--
 .../garden/visitor/GardenVisitorColorNames.kt |  8 +++---
 .../garden/visitor/GardenVisitorFeatures.kt   |  4 +--
 .../features/inventory/ReforgeHelper.kt       |  4 +--
 .../mining/eventtracker/MiningEventType.kt    | 10 +++----
 .../features/minion/MinionFeatures.kt         |  4 +--
 .../features/misc/MarkedPlayerManager.kt      |  4 +--
 .../features/misc/PartyMemberOutlines.kt      |  4 +--
 .../features/misc/items/enchants/Enchant.kt   |  6 ++---
 .../misc/visualwords/VisualWordGui.kt         | 20 +++++++-------
 .../features/nether/SulphurSkitterBox.kt      |  4 +--
 .../nether/ashfang/AshfangGravityOrbs.kt      |  4 +--
 .../rift/area/dreadfarm/VoltHighlighter.kt    |  4 +--
 .../area/westvillage/kloon/KloonHacking.kt    | 26 +++++++++----------
 .../features/skillprogress/SkillProgress.kt   |  8 +++---
 .../at/hannibal2/skyhanni/utils/ColorUtils.kt | 10 +++----
 .../skyhanni/utils/GuiRenderUtils.kt          | 12 ++++-----
 .../hannibal2/skyhanni/utils/LorenzColor.kt   |  2 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   | 24 ++++++++---------
 .../{SpecialColour.java => SpecialColor.java} |  2 +-
 .../hannibal2/skyhanni/utils/StringUtils.kt   |  4 +--
 36 files changed, 118 insertions(+), 113 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/utils/{SpecialColour.java => SpecialColor.java} (98%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3194902b8403..62ffd979ea84 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,6 +91,7 @@ for more information and usages.
 - Do not use `fixedRateTimer` when possible and instead use `SecondPassedEvent` to safely execute the repeating event on
   the main thread.
 - When updating a config option variable, use the `ConfigUpdaterMigrator.ConfigFixEvent` with event.move() when moving a value, and event.transform() when updating a value. [For Example](https://github.com/hannibal002/SkyHanni/blob/e88f416c48f9659f89b7047d7629cd9a1d1535bc/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt#L276).
+- Use American English spelling conventions (e.g., "color" not "colour").
 
 ## Software Used in SkyHanni
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0a6589680f9a..d0d4541387cd 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -903,7 +903,7 @@
 + Chocolate Shop now updates chocolate availability every second. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1652)
 + Chocolate Shop now also shows time until affordable. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1652)
-+ Changed the colour of time to blue in Chocolate Factory displays. -
++ Changed the color of time to blue in Chocolate Factory displays. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1652)
 + Star now shows on time tower and coach jackrabbit. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1641)
 + Maxed upgrades in Chocolate Factory now show a checkmark. -
@@ -1300,7 +1300,7 @@
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1758)
 + Fixed Chocolate Factory time remaining calculations while the Time Tower is active. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1774)
-+ Fixed enchantment colours showing as white when SkyHanni chroma is not enabled. -
++ Fixed enchantment colors showing as white when SkyHanni chroma is not enabled. -
   CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1798)
 + Fixed Chocolate Factory Shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1815)
     + Profit calculations now show in sub-menus.
@@ -1667,7 +1667,7 @@
     + Show in a crafting view a shopping list of materials needed when buying from the Bazaar.
 + Added AH Show Price Comparison. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/339)
     + Highlight auctions based on the difference between their estimated value and the value they are listed for.
-    + Options to change the colours
+    + Options to change the colors
 + Added Highlight options in /tab. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1175)
     + Green for enabled
     + Red for disabled
@@ -2635,7 +2635,7 @@
 + Fixed render overlapping problem with chat, SkyHanni GUIs and title. - Thunderblade73
 + Fixed GUI positions moving into the bottom-right corner when leaving the GUI position editor while pressing the mouse
   button on next reopen. - hannibal2
-+ Fixed parts of Compact Tab List being uncoloured. - CalMWolfs
++ Fixed parts of Compact Tab List being uncolored. - CalMWolfs
 + Fixed Compact Tab List' Toggle Tab not working when using Patcher. - hannibal2
 + Fixed Skill progress display size too small when not using the progress bar. - Thunderblade73
 + Fixed the skill progress bar trying to get out of the screen. - HiZe
@@ -3182,7 +3182,7 @@
 
 ### Fixes
 
-+ Fixed the wrong colouring of hidden items in Slayer Profit Tracker. - hannibal2
++ Fixed the wrong coloring of hidden items in Slayer Profit Tracker. - hannibal2
 + Added support for NEU Heavy Pearl TO-DO fix working without nether sacks as well. - hannibal2
 + Fixed Estimated Item Value getting shown in pet rule creation wardrobe slot pick menu. - hannibal2
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index b075b03f2f94..24ee5a43c569 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -195,7 +195,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Blocks picking up the Inferno Minion or replacing the fuel inside when expensive minion fuels are in use.
 + AH Show Price Comparison. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/339)
     + Highlight auctions based on the difference between their estimated value and the value they are listed for.
-    + Options to change the colours
+    + Options to change the colors
 + Highlight options in /tab. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1175)
     + Green for enabled
     + Red for disabled
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/MatriarchHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/MatriarchHelperConfig.java
index 198ec8b82cb2..c88eea57d693 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/MatriarchHelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/MatriarchHelperConfig.java
@@ -20,7 +20,7 @@ public class MatriarchHelperConfig {
     public boolean highlight = true;
 
     @Expose
-    @ConfigOption(name = "Highlight Color", desc = "Colour the pearls are highlighted in.")
+    @ConfigOption(name = "Highlight Color", desc = "Color the pearls are highlighted in.")
     @ConfigEditorColour
     public String highlightColor = "0:114:126:255:41";
 
@@ -30,7 +30,7 @@ public class MatriarchHelperConfig {
     public boolean line = true;
 
     @Expose
-    @ConfigOption(name = "Line Color", desc = "Colour of the line.")
+    @ConfigOption(name = "Line Color", desc = "Color of the line.")
     @ConfigEditorColour
     public String lineColor = "0:230:163:38:255";
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/TextBoxConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/TextBoxConfig.java
index 808cb66f6cc0..6efd9edd9ec7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/TextBoxConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/TextBoxConfig.java
@@ -22,7 +22,7 @@ public class TextBoxConfig {
 
     @Expose
     @ConfigOption(name = "Text", desc = "Enter text you want to display here.\n" +
-        "§eUse '&' as the colour code character.\n" +
+        "§eUse '&' as the color code character.\n" +
         "§eUse '\\n' as the line break character.")
     @ConfigEditorText
     public Property<String> text = Property.of("&aYour Text Here\\n&bYour new line here");
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/AuctionHousePriceComparisonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/AuctionHousePriceComparisonConfig.java
index a9300fab998b..41c3b3b182bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/AuctionHousePriceComparisonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/AuctionHousePriceComparisonConfig.java
@@ -20,22 +20,22 @@ public class AuctionHousePriceComparisonConfig {
     public boolean enabled = false;
 
     @Expose
-    @ConfigOption(name = "Good Colour", desc = "What colour to highlight good value items with.")
+    @ConfigOption(name = "Good Color", desc = "What color to highlight good value items with.")
     @ConfigEditorColour
-    public String good = LorenzColor.GREEN.toConfigColour();
+    public String good = LorenzColor.GREEN.toConfigColor();
 
     @Expose
-    @ConfigOption(name = "Very Good Colour", desc = "What colour to highlight very good value items with.")
+    @ConfigOption(name = "Very Good Color", desc = "What color to highlight very good value items with.")
     @ConfigEditorColour
     public String veryGood = "0:255:0:139:0";
 
     @Expose
-    @ConfigOption(name = "Bad Colour", desc = "What colour to highlight bad items with.")
+    @ConfigOption(name = "Bad Color", desc = "What color to highlight bad items with.")
     @ConfigEditorColour
-    public String bad = LorenzColor.YELLOW.toConfigColour();
+    public String bad = LorenzColor.YELLOW.toConfigColor();
 
     @Expose
-    @ConfigOption(name = "Very Bad Colour", desc = "What colour to highlight very bad items with.")
+    @ConfigOption(name = "Very Bad Color", desc = "What color to highlight very bad items with.")
     @ConfigEditorColour
     public String veryBad = "0:255:225:43:30";
 }
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 39758745a9ff..c381444df5b9 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
@@ -62,7 +62,7 @@ public class ChocolateFactoryConfig {
 
     @Expose
     @ConfigOption(name = "Highlight Upgrades", desc = "Highlight any upgrades that you can afford.\n" +
-        "The upgrade with a star is the most optimal and the lightest colour of green is the most optimal you can afford.")
+        "The upgrade with a star is the most optimal and the lightest color of green is the most optimal you can afford.")
     @ConfigEditorBoolean
     public boolean highlightUpgrades = true;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
index 5ff38b346d5b..bab2f47ff9ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/TunnelMapsConfig.java
@@ -50,13 +50,15 @@ public class TunnelMapsConfig {
     public boolean leftClickPigeon = true;
 
     @Expose
-    @ConfigOption(name = "Dynamic Path Colour", desc = "Instead of the selected color use the color of the target as line colour.")
+    @ConfigOption(name = "Dynamic Path Color", desc = "Instead of the selected color use the color of the target as line color.")
     @ConfigEditorBoolean
+    // TODO rename to dynamicPathColor
     public boolean dynamicPathColour = true;
 
     @Expose
-    @ConfigOption(name = "Path Colour", desc = "The colour for the paths, if the dynamic colour option is turned off.")
+    @ConfigOption(name = "Path Color", desc = "The color for the paths, if the dynamic color option is turned off.")
     @ConfigEditorColour
+    // TODO rename to pathColor
     public String pathColour = "0:255:0:255:0";
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/VoltCruxConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/VoltCruxConfig.java
index 6a5e1a0f127f..0a1ae63e9dee 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/VoltCruxConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/VoltCruxConfig.java
@@ -23,6 +23,7 @@ public class VoltCruxConfig {
     @Expose
     @ConfigOption(name = "Volt Range Highlighter Color", desc = "In which color should the Volt range be highlighted?")
     @ConfigEditorColour
+    // TODO rename to voltColor
     public String voltColour = "0:60:0:0:255";
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/KloonHackingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/KloonHackingConfig.java
index 01a627137205..57fdad59947e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/KloonHackingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/KloonHackingConfig.java
@@ -17,6 +17,7 @@ public class KloonHackingConfig {
     @ConfigOption(name = "Color Guide", desc = "Show which color to pick.")
     @ConfigEditorBoolean
     @FeatureToggle
+    // TODO rename to color
     public boolean colour = true;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
index 4be042b4365f..7245ab8f58af 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
@@ -94,7 +94,7 @@ object DungeonDeathCounter {
         if (!isEnabled()) return
 
         config.deathCounterPos.renderString(
-            DungeonMilestonesDisplay.colour + display,
+            DungeonMilestonesDisplay.color + display,
             posLabel = "Dungeon Death Counter"
         )
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
index 3f00775d9809..ea65b2e00c2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
@@ -27,7 +27,7 @@ object DungeonMilestonesDisplay {
     private var display = ""
     private var currentMilestone = 0
     private var timeReached = SimpleTimeMark.farPast()
-    var colour = ""
+    var color = ""
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -54,7 +54,7 @@ object DungeonMilestonesDisplay {
             timeReached = SimpleTimeMark.now()
         }
 
-        colour = when (currentMilestone) {
+        color = when (currentMilestone) {
             0, 1 -> "§c"
             2 -> "§e"
             else -> "§a"
@@ -79,7 +79,7 @@ object DungeonMilestonesDisplay {
         if (!isEnabled()) return
 
         config.showMileStonesDisplayPos.renderString(
-            colour + display,
+            color + display,
             posLabel = "Dungeon Milestone"
         )
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
index 87df6c3cbaee..2846262e6153 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
@@ -6,7 +6,7 @@ import kotlin.time.Duration
 
 enum class HoppityEggType(
     val mealName: String,
-    private val mealColour: String,
+    private val mealColor: String,
     val resetsAt: Int,
     var lastResetDay: Int = -1,
     private var claimed: Boolean = false,
@@ -34,8 +34,8 @@ enum class HoppityEggType(
     }
 
     fun isClaimed() = claimed
-    val formattedName get() = "${if (isClaimed()) "§7§m" else mealColour}$mealName:$mealColour"
-    val coloredName get() = "$mealColour$mealName"
+    val formattedName get() = "${if (isClaimed()) "§7§m" else mealColor}$mealName:$mealColor"
+    val coloredName get() = "$mealColor$mealName"
 
     companion object {
         fun allFound() = entries.forEach { it.markClaimed() }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
index 91801f169ec0..d1220d7e39be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.init.Blocks
@@ -45,7 +45,7 @@ object ThunderSparksHighlight {
         if (!isEnabled()) return
 
         val special = config.color
-        val color = Color(SpecialColour.specialToChromaRGB(special), true)
+        val color = Color(SpecialColor.specialToChromaRGB(special), true)
 
         val playerLocation = LocationUtils.playerLocation()
         for (spark in sparks) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt
index 24f52e0b24e6..ee3838335c45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import net.minecraft.util.AxisAlignedBB
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.EventPriority
@@ -63,7 +63,7 @@ object GeyserFishing {
         if (!IslandType.CRIMSON_ISLE.isInIsland()) return
         if (config.onlyWithRod && !FishingAPI.holdingLavaRod) return
 
-        val color = Color(SpecialColour.specialToChromaRGB(config.boxColor), true)
+        val color = Color(SpecialColor.specialToChromaRGB(config.boxColor), true)
         event.drawFilledBoundingBox_nea(geyserBox, color)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
index 9b1a30c4b775..0759f7020f16 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt
@@ -32,12 +32,12 @@ enum class CarrolynTable(val crop: CropType, val label: String, completeMessage:
     ),
     ;
 
-    /** Pattern without colour codes */
+    /** Pattern without color codes */
     val completeMessagePattern by RepoPattern.pattern(
         "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage,
     )
 
-    /** Pattern without colour codes */
+    /** Pattern without color codes */
     val thxMessagePattern by RepoPattern.pattern(
         "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage,
     )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
index fa847703fef8..cd815edd68fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt
@@ -9,23 +9,23 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object GardenVisitorColorNames {
 
-    private var visitorColours = mutableMapOf<String, String>() // name -> color code
+    private var visitorColors = mutableMapOf<String, String>() // name -> color code
     var visitorItems = mutableMapOf<String, List<String>>()
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
         val data = event.getConstant<GardenJson>("Garden")
-        visitorColours.clear()
+        visitorColors.clear()
         visitorItems.clear()
         for ((visitor, visitorData) in data.visitors) {
-            visitorColours[visitor] = visitorData.rarity.color.getChatColor()
+            visitorColors[visitor] = visitorData.rarity.color.getChatColor()
             visitorItems[visitor] = visitorData.needItems
         }
     }
 
     fun getColoredName(name: String): String {
         val cleanName = name.removeColor()
-        val color = visitorColours[cleanName] ?: return name
+        val color = visitorColors[cleanName] ?: return name
         return color + cleanName
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 151ec4caaf39..3372c2abd0f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -234,8 +234,8 @@ object GardenVisitorFeatures {
         var amountInSacks = 0
         internalName.getAmountInSacksOrNull()?.let {
             amountInSacks = it
-            val textColour = if (it >= amount) "a" else "e"
-            list.add(" §7(§${textColour}x${it.addSeparators()} §7in sacks)")
+            val textColor = if (it >= amount) "a" else "e"
+            list.add(" §7(§${textColor}x${it.addSeparators()} §7in sacks)")
         }
 
         val ingredients = NEUItems.getRecipes(internalName)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
index d1826b481896..fcd940d02767 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
@@ -236,7 +236,7 @@ object ReforgeHelper {
         this.addAll(list)
     }
 
-    private fun getReforgeColour(reforge: ReforgeAPI.Reforge) = when {
+    private fun getReforgeColor(reforge: ReforgeAPI.Reforge) = when {
         currentReforge == reforge -> "§6"
         reforgeToSearch == reforge -> "§3"
         reforge.isReforgeStone -> "§9"
@@ -244,7 +244,7 @@ object ReforgeHelper {
     }
 
     private fun getReforgeView(itemRarity: LorenzRarity): (ReforgeAPI.Reforge) -> Renderable = { reforge ->
-        val text = getReforgeColour(reforge) + reforge.name
+        val text = getReforgeColor(reforge) + reforge.name
         val tips = getReforgeTips(reforge, itemRarity)
         val onHover = if (!isInHexReforgeMenu) {
             {}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
index 312f291de505..eb56a0dd31b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
@@ -21,7 +21,7 @@ enum class MiningEventType(
     val eventName: String,
     private val shortName: String,
     val defaultLength: Duration,
-    private val colourCode: Char,
+    private val colorCode: Char,
     val dwarvenSpecific: Boolean,
     iconInput: Renderable,
 ) {
@@ -101,18 +101,18 @@ enum class MiningEventType(
         eventName: String,
         shortName: String,
         defaultLength: Duration,
-        colourCode: Char,
+        colorCode: Char,
         dwarvenSpecific: Boolean,
         iconInput: ItemStack,
     ) : this(
-        eventName, shortName, defaultLength, colourCode, dwarvenSpecific, Renderable.itemStack(
+        eventName, shortName, defaultLength, colorCode, dwarvenSpecific, Renderable.itemStack(
             iconInput, xSpacing = 0
         )
     )
 
     val icon = Renderable.hoverTips(iconInput, listOf(eventName))
-    val compactText = Renderable.string("§$colourCode$shortName")
-    val normalText = Renderable.string("§$colourCode$eventName")
+    val compactText = Renderable.string("§$colorCode$shortName")
+    val normalText = Renderable.string("§$colorCode$eventName")
 
     val compactTextWithIcon = Renderable.horizontalContainer(listOf(icon, compactText), 0)
     val normalTextWithIcon = Renderable.horizontalContainer(listOf(icon, normalText), 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index 2ccaba2e5a09..c0a9c1212d31 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -46,7 +46,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -143,7 +143,7 @@ object MinionFeatures {
         if (!config.lastClickedMinion.display) return
 
         val special = config.lastClickedMinion.color
-        val color = Color(SpecialColour.specialToChromaRGB(special), true)
+        val color = Color(SpecialColor.specialToChromaRGB(special), true)
 
         val loc = lastMinion
         if (loc != null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index e463549bc0c9..05b1eaf35853 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -63,7 +63,7 @@ object MarkedPlayerManager {
         }
     }
 
-    private fun refreshColours() =
+    private fun refreshColors() =
         markedPlayers.forEach {
             it.value.setColor()
         }
@@ -104,7 +104,7 @@ object MarkedPlayerManager {
                 playerNamesToMark.remove(name)
             }
         }
-        config.entityColor.onToggle(::refreshColours)
+        config.entityColor.onToggle(::refreshColors)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt
index af2221a557b2..0d1f96d135a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.events.RenderEntityOutlineEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.entity.Entity
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -30,6 +30,6 @@ object PartyMemberOutlines {
     private fun getEntityOutlineColor(entity: Entity): Int? {
         if (entity !is EntityOtherPlayerMP || !PartyAPI.partyMembers.contains(entity.name)) return null
 
-        return SpecialColour.specialToChromaRGB(config.outlineColor)
+        return SpecialColor.specialToChromaRGB(config.outlineColor)
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
index d010198dd7c7..697a58ebb775 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
@@ -29,7 +29,7 @@ open class Enchant : Comparable<Enchant> {
         val config = SkyHanniMod.feature.inventory.enchantParsing
 
         // TODO change color to string (support for bold)
-        val colour = when {
+        val color = when {
             level >= maxLevel -> config.perfectEnchantColor
             level > goodLevel -> config.greatEnchantColor
             level == goodLevel -> config.goodEnchantColor
@@ -37,8 +37,8 @@ open class Enchant : Comparable<Enchant> {
         }
 
         // TODO when chroma is disabled maybe use the neu chroma style instead of gold
-        if (colour.get() == LorenzColor.CHROMA && !(ChromaManager.config.enabled.get() || EnchantParser.isSbaLoaded)) return "§6§l"
-        return colour.get().getChatColor()
+        if (color.get() == LorenzColor.CHROMA && !(ChromaManager.config.enabled.get() || EnchantParser.isSbaLoaded)) return "§6§l"
+        return color.get().getChatColor()
     }
 
     override fun toString() = "$nbtName $goodLevel $maxLevel\n"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
index 9cc4f8e34599..b8de2eca6bd9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
@@ -112,8 +112,8 @@ open class VisualWordGui : GuiScreen() {
             val y = guiTop + 170
 
             drawUnmodifiedStringCentered("§aAdd New", x, y)
-            val colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
-            drawRect(x - 30, y - 10, x + 30, y + 10, colour)
+            val color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
+            drawRect(x - 30, y - 10, x + 30, y + 10, color)
 
             if (shouldDrawImport) {
                 val importX = guiLeft + sizeX - 45
@@ -250,12 +250,12 @@ open class VisualWordGui : GuiScreen() {
             var x = guiLeft + 180
             var y = guiTop + 140
             drawUnmodifiedStringCentered("§cDelete", x, y)
-            var colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
-            drawRect(x - 30, y - 10, x + 30, y + 10, colour)
+            var color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
+            drawRect(x - 30, y - 10, x + 30, y + 10, color)
             y += 30
             drawUnmodifiedStringCentered("§eBack", x, y)
-            colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
-            drawRect(x - 30, y - 10, x + 30, y + 10, colour)
+            color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
+            drawRect(x - 30, y - 10, x + 30, y + 10, color)
 
             if (currentIndex < modifiedWords.size && currentIndex != -1) {
                 val currentPhrase = modifiedWords[currentIndex]
@@ -264,15 +264,15 @@ open class VisualWordGui : GuiScreen() {
                 drawUnmodifiedStringCentered("§bReplacement Enabled", x, y - 20)
                 var status = if (currentPhrase.enabled) "§2Enabled" else "§4Disabled"
                 drawUnmodifiedStringCentered(status, x, y)
-                colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
-                drawRect(x - 30, y - 10, x + 30, y + 10, colour)
+                color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
+                drawRect(x - 30, y - 10, x + 30, y + 10, color)
 
                 x += 200
                 drawUnmodifiedStringCentered("§bCase Sensitive", x, y - 20)
                 status = if (!currentPhrase.isCaseSensitive()) "§2True" else "§4False"
                 drawUnmodifiedStringCentered(status, x, y)
-                colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
-                drawRect(x - 30, y - 10, x + 30, y + 10, colour)
+                color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB
+                drawRect(x - 30, y - 10, x + 30, y + 10, color)
 
                 drawUnmodifiedString("§bIs replaced by:", guiLeft + 30, guiTop + 75)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
index daed44c077ed..388e6bf23c75 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.toLorenzVec
 import net.minecraft.init.Blocks
 import net.minecraft.util.AxisAlignedBB
@@ -78,7 +78,7 @@ object SulphurSkitterBox {
     }
 
     private fun drawBox(axis: AxisAlignedBB, partialTicks: Float) {
-        val color = Color(SpecialColour.specialToChromaRGB(config.boxColor), true)
+        val color = Color(SpecialColor.specialToChromaRGB(config.boxColor), true)
         when (config.boxType) {
             SulphurSkitterBoxConfig.BoxType.FULL -> {
                 RenderUtils.drawFilledBoundingBox_nea(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
index 10c58b485fa7..6a4b02416ed5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
@@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -42,7 +42,7 @@ object AshfangGravityOrbs {
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
 
-        val color = Color(SpecialColour.specialToChromaRGB(config.color), true)
+        val color = Color(SpecialColor.specialToChromaRGB(config.color), true)
         val playerLocation = LocationUtils.playerLocation()
         for (orb in orbs) {
             if (orb.isDead) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 442dcadfa81d..4ff57d73d263 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.Entity
@@ -65,7 +65,7 @@ object VoltHighlighter {
                 ) { config.voltMoodMeter }
             if (state == VoltState.DOING_LIGHTNING && config.voltRange) {
                 RenderUtils.drawCylinderInWorld(
-                    Color(SpecialColour.specialToChromaRGB(config.voltColour), true),
+                    Color(SpecialColor.specialToChromaRGB(config.voltColour), true),
                     entity.posX,
                     entity.posY - 4f,
                     entity.posZ,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt
index bc79a1b02740..637fdfd15e1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt
@@ -29,14 +29,14 @@ object KloonHacking {
 
     private val config get() = RiftAPI.config.area.westVillage.hacking
 
-    private val colourPattern by RepoPattern.pattern(
-        "rift.area.westvillage.kloon.colour",
-        "You've set the color of this terminal to (?<colour>.*)!"
+    private val colorPattern by RepoPattern.pattern(
+        "rift.area.westvillage.kloon.color",
+        "You've set the color of this terminal to (?<color>.*)!"
     )
 
     private var wearingHelmet = false
     private var inTerminalInventory = false
-    private var inColourInventory = false
+    private var inColorInventory = false
     private val correctButtons = mutableListOf<String>()
     private var nearestTerminal: KloonTerminal? = null
 
@@ -53,7 +53,7 @@ object KloonHacking {
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         inTerminalInventory = false
-        inColourInventory = false
+        inColorInventory = false
         nearestTerminal = null
         if (!RiftAPI.inRift()) return
         if (!config.solver) return
@@ -67,14 +67,14 @@ object KloonHacking {
             }
         }
         if (event.inventoryName == "Hacked Terminal Color Picker") {
-            inColourInventory = true
+            inColorInventory = true
         }
     }
 
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
         inTerminalInventory = false
-        inColourInventory = false
+        inColorInventory = false
     }
 
     @SubscribeEvent
@@ -97,11 +97,11 @@ object KloonHacking {
                 }
             }
         }
-        if (inColourInventory) {
+        if (inColorInventory) {
             if (!config.colour) return
-            val targetColour = nearestTerminal ?: getNearestTerminal()
+            val targetColor = nearestTerminal ?: getNearestTerminal()
             for (slot in InventoryUtils.getItemsInOpenChest()) {
-                if (slot.stack.getLore().any { it.contains(targetColour?.name ?: "") }) {
+                if (slot.stack.getLore().any { it.contains(targetColor?.name ?: "") }) {
                     slot highlight LorenzColor.GREEN
                 }
             }
@@ -131,10 +131,10 @@ object KloonHacking {
     fun onChat(event: LorenzChatEvent) {
         if (!RiftAPI.inRift()) return
         if (!wearingHelmet) return
-        colourPattern.matchMatcher(event.message.removeColor()) {
+        colorPattern.matchMatcher(event.message.removeColor()) {
             val storage = ProfileStorageData.profileSpecific?.rift ?: return
-            val colour = group("colour")
-            val completedTerminal = KloonTerminal.entries.firstOrNull { it.name == colour } ?: return
+            val color = group("color")
+            val completedTerminal = KloonTerminal.entries.firstOrNull { it.name == color } ?: return
             if (completedTerminal != nearestTerminal) return
             storage.completedKloonTerminals.add(completedTerminal)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index d2a98daed4d2..87228447fadc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -30,7 +30,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.SoundUtils.playSound
-import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.SpecialColor
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -112,7 +112,7 @@ object SkillProgress {
             maxWidth = 182
             Renderable.progressBar(
                 percent = factor.toDouble(),
-                startColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)),
+                startColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)),
                 texture = barConfig.texturedBar.usedTexture.get(),
                 useChroma = barConfig.useChroma.get()
             )
@@ -122,8 +122,8 @@ object SkillProgress {
             val factor = skillExpPercentage.coerceAtMost(1.0)
             Renderable.progressBar(
                 percent = factor,
-                startColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)),
-                endColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)),
+                startColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)),
+                endColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)),
                 width = maxWidth,
                 height = barConfig.regularBar.height,
                 useChroma = barConfig.useChroma.get()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
index 6a0af6cbac2b..b2057d3397c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
@@ -6,17 +6,17 @@ object ColorUtils {
 
     /** Transfer string colors from the config to [Color] */
     fun String.toChromaColor() = Color(toChromaColorInt(), true)
-    fun String.toChromaColorInt() = SpecialColour.specialToChromaRGB(this)
+    fun String.toChromaColorInt() = SpecialColor.specialToChromaRGB(this)
 
     fun String.getFirstColorCode() = this.takeIf { it.firstOrNull() == '§' }?.getOrNull(1)
 
-    fun getRed(colour: Int) = colour shr 16 and 0xFF
+    fun getRed(color: Int) = color shr 16 and 0xFF
 
-    fun getGreen(colour: Int) = colour shr 8 and 0xFF
+    fun getGreen(color: Int) = color shr 8 and 0xFF
 
-    fun getBlue(colour: Int) = colour and 0xFF
+    fun getBlue(color: Int) = color and 0xFF
 
-    fun getAlpha(colour: Int) = colour shr 24 and 0xFF
+    fun getAlpha(color: Int) = color shr 24 and 0xFF
 
     fun blendRGB(start: Color, end: Color, percent: Double) = Color(
         (start.red * (1 - percent) + end.red * percent).toInt(),
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
index 403484fcdebf..75eb5087ec7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
@@ -28,12 +28,12 @@ import kotlin.math.min
 // TODO cleanup of redundant functions
 object GuiRenderUtils {
 
-    fun drawStringCentered(str: String?, fr: FontRenderer, x: Float, y: Float, shadow: Boolean, colour: Int) {
+    fun drawStringCentered(str: String?, fr: FontRenderer, x: Float, y: Float, shadow: Boolean, color: Int) {
         val strLen = fr.getStringWidth(str)
         val x2 = x - strLen / 2f
         val y2 = y - fr.FONT_HEIGHT / 2f
         GL11.glTranslatef(x2, y2, 0f)
-        fr.drawString(str, 0f, 0f, colour, shadow)
+        fr.drawString(str, 0f, 0f, color, shadow)
         GL11.glTranslatef(-x2, -y2, 0f)
     }
 
@@ -222,19 +222,19 @@ object GuiRenderUtils {
         return Color(color.red / 5, color.green / 5, color.blue / 5).rgb
     }
 
-    fun drawScaledRec(left: Int, top: Int, right: Int, bottom: Int, colour: Int, inverseScale: Float) {
+    fun drawScaledRec(left: Int, top: Int, right: Int, bottom: Int, color: Int, inverseScale: Float) {
         GuiScreen.drawRect(
             (left * inverseScale).toInt(),
             (top * inverseScale).toInt(),
             (right * inverseScale).toInt(),
             (bottom * inverseScale).toInt(),
-            colour
+            color,
         )
     }
 
-    fun renderItemAndBackground(item: ItemStack, x: Int, y: Int, colour: Int) {
+    fun renderItemAndBackground(item: ItemStack, x: Int, y: Int, color: Int) {
         renderItemStack(item, x, y)
-        GuiScreen.drawRect(x, y, x + 16, y + 16, colour)
+        GuiScreen.drawRect(x, y, x + 16, y + 16, color)
     }
 
     // Taken and edited from NEU <- it's broken
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
index 9bb2cccd8887..9947dd715d4f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
@@ -50,7 +50,7 @@ enum class LorenzColor(val chatColorCode: Char, private val color: Color, privat
 
     override fun toString(): String = coloredLabel
 
-    fun toConfigColour(): String = "0:255:${color.red}:${color.green}:${color.blue}"
+    fun toConfigColor(): String = "0:255:${color.red}:${color.green}:${color.blue}"
 
     fun toDyeColor(): EnumDyeColor = when (this) {
         WHITE -> EnumDyeColor.WHITE
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 10201375874e..d32ff9ea947f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -75,7 +75,7 @@ object RenderUtils {
     private val beaconBeam = ResourceLocation("textures/entity/beacon_beam.png")
 
     private val matrixBuffer: FloatBuffer = GLAllocation.createDirectFloatBuffer(16)
-    private val colourBuffer: FloatBuffer = GLAllocation.createDirectFloatBuffer(16)
+    private val colorBuffer: FloatBuffer = GLAllocation.createDirectFloatBuffer(16)
     private val bezier2Buffer: FloatBuffer = GLAllocation.createDirectFloatBuffer(9)
 
     infix fun Slot.highlight(color: LorenzColor) {
@@ -1009,12 +1009,12 @@ object RenderUtils {
         y: Float,
         shadow: Boolean,
         len: Int,
-        colour: Int,
+        color: Int,
     ) {
         val strLen = fr.getStringWidth(str)
         var factor = len / strLen.toFloat()
         factor = 1f.coerceAtMost(factor)
-        TextRenderUtils.drawStringScaled(str, fr, x, y, shadow, colour, factor)
+        TextRenderUtils.drawStringScaled(str, fr, x, y, shadow, color, factor)
     }
 
     fun LorenzRenderWorldEvent.drawDynamicText(
@@ -1608,14 +1608,14 @@ object RenderUtils {
     fun LorenzRenderWorldEvent.outlineTopFace(
         boundingBox: AxisAlignedBB,
         lineWidth: Int,
-        colour: Color,
+        color: Color,
         depth: Boolean,
     ) {
         val (cornerOne, cornerTwo, cornerThree, cornerFour) = boundingBox.getCorners(boundingBox.maxY)
-        this.draw3DLine(cornerOne, cornerTwo, colour, lineWidth, depth)
-        this.draw3DLine(cornerTwo, cornerThree, colour, lineWidth, depth)
-        this.draw3DLine(cornerThree, cornerFour, colour, lineWidth, depth)
-        this.draw3DLine(cornerFour, cornerOne, colour, lineWidth, depth)
+        this.draw3DLine(cornerOne, cornerTwo, color, lineWidth, depth)
+        this.draw3DLine(cornerTwo, cornerThree, color, lineWidth, depth)
+        this.draw3DLine(cornerThree, cornerFour, color, lineWidth, depth)
+        this.draw3DLine(cornerFour, cornerOne, color, lineWidth, depth)
     }
 
     // TODO nea please merge with 'draw3DLine'
@@ -1861,9 +1861,9 @@ object RenderUtils {
     }
 
     fun getAlpha(): Float {
-        colourBuffer.clear()
-        GlStateManager.getFloat(GL11.GL_CURRENT_COLOR, colourBuffer)
-        if (colourBuffer.limit() < 4) return 1f
-        return colourBuffer.get(3)
+        colorBuffer.clear()
+        GlStateManager.getFloat(GL11.GL_CURRENT_COLOR, colorBuffer)
+        if (colorBuffer.limit() < 4) return 1f
+        return colorBuffer.get(3)
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java b/src/main/java/at/hannibal2/skyhanni/utils/SpecialColor.java
similarity index 98%
rename from src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java
rename to src/main/java/at/hannibal2/skyhanni/utils/SpecialColor.java
index 010e67e4d7c0..7fc733c2b3e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SpecialColor.java
@@ -5,7 +5,7 @@
 /**
  * Taken from NotEnoughUpdates
  */
-public class SpecialColour {
+public class SpecialColor {
 
     private static final int RADIX = 10;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index f180e6bf7d72..180959658560 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -25,7 +25,7 @@ object StringUtils {
     private val whiteSpacePattern = "^\\s*|\\s*$".toPattern()
     private val resetPattern = "(?i)§R".toPattern()
     private val sFormattingPattern = "(?i)§S".toPattern()
-    private val stringColourPattern = "§[0123456789abcdef].*".toPattern()
+    private val stringColorPattern = "§[0123456789abcdef].*".toPattern()
     private val asciiPattern = "[^\\x00-\\x7F]".toPattern()
 
     fun String.trimWhiteSpaceAndResets(): String = whiteSpaceResetPattern.matcher(this).replaceAll("")
@@ -194,7 +194,7 @@ object StringUtils {
     }
 
     fun getColor(string: String, default: Int, darker: Boolean = true): Int {
-        val matcher = stringColourPattern.matcher(string)
+        val matcher = stringColorPattern.matcher(string)
         if (matcher.matches()) {
             val colorInt = Minecraft.getMinecraft().fontRendererObj.getColorCode(string[1])
             return if (darker) {

From 40faf50e3f109d0028e67b6dd916ff79f2cb5604 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:03:57 +0200
Subject: [PATCH 144/721] Fix: Double Color in ScoreboardData (#2264)

---
 .../hannibal2/skyhanni/data/ScoreboardData.kt | 31 +++++++------------
 .../at/hannibal2/skyhanni/utils/RegexUtils.kt | 12 +++++++
 .../hannibal2/skyhanni/utils/StringUtils.kt   |  8 +++--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index b24f08b041d8..0ade6a946036 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.RawScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.lastColorCode
 import net.minecraft.client.Minecraft
 import net.minecraft.network.play.server.S3CPacketUpdateScore
 import net.minecraft.network.play.server.S3EPacketTeams
@@ -26,30 +26,21 @@ object ScoreboardData {
 
     private var dirty = false
 
-    private val minecraftColorCodesPattern = "(?i)[0-9a-fkmolnr]".toPattern()
-
-    fun formatLines(rawList: List<String>): List<String> {
-        val list = mutableListOf<String>()
+    private fun formatLines(rawList: List<String>) = buildList {
         for (line in rawList) {
             val separator = splitIcons.find { line.contains(it) } ?: continue
             val split = line.split(separator)
             val start = split[0]
-            var end = split[1]
-            // get last color code in start
-            val lastColorIndex = start.lastIndexOf('§')
-            val lastColor = if (lastColorIndex != -1
-                && lastColorIndex + 1 < start.length
-                && (minecraftColorCodesPattern.matches(start[lastColorIndex + 1].toString()))
-            ) start.substring(lastColorIndex, lastColorIndex + 2)
-            else ""
-
-            // remove first color code from end, when it is the same as the last color code in start
-            end = end.removePrefix(lastColor)
-
-            list.add(start + end)
-        }
+            var end = if (split.size > 1) split[1] else ""
+
+            val lastColor = start.lastColorCode() ?: ""
 
-        return list
+            if (end.startsWith(lastColor)) {
+                end = end.removePrefix(lastColor)
+            }
+
+            add(start + end)
+        }
     }
 
     @HandleEvent(receiveCancelled = true)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
index db19b63a2fb6..068dfce1d4f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
@@ -83,4 +83,16 @@ object RegexUtils {
         return this.any { it.matches(string) }
     }
 
+    /**
+     * Returns a list of all occurrences of a pattern within the [input] string.
+     */
+    fun Pattern.findAll(input: String): List<String> {
+        val matcher = matcher(input)
+
+        return buildList {
+            while (matcher.find()) {
+                add(matcher.group())
+            }
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 180959658560..14e4a989f472 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.hypixel.chat.event.SystemMessageEvent
 import at.hannibal2.skyhanni.mixins.transformers.AccessorChatComponentText
 import at.hannibal2.skyhanni.utils.GuiRenderUtils.darkenColor
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.RegexUtils.findAll
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiUtilRenderComponents
 import net.minecraft.event.ClickEvent
@@ -27,6 +28,7 @@ object StringUtils {
     private val sFormattingPattern = "(?i)§S".toPattern()
     private val stringColorPattern = "§[0123456789abcdef].*".toPattern()
     private val asciiPattern = "[^\\x00-\\x7F]".toPattern()
+    private val minecraftColorCodesPattern = "(?i)(§[0-9a-fklmnor])+".toPattern()
 
     fun String.trimWhiteSpaceAndResets(): String = whiteSpaceResetPattern.matcher(this).replaceAll("")
     fun String.trimWhiteSpace(): String = whiteSpacePattern.matcher(this).replaceAll("")
@@ -556,7 +558,7 @@ object StringUtils {
 
     fun IChatComponent.contains(string: String): Boolean = formattedText.contains(string)
 
-    fun String.width(): Int {
-        return Minecraft.getMinecraft().fontRendererObj.getStringWidth(this)
-    }
+    fun String.width(): Int = Minecraft.getMinecraft().fontRendererObj.getStringWidth(this)
+
+    fun String.lastColorCode(): String? = minecraftColorCodesPattern.findAll(this).lastOrNull()
 }

From ed61531680966ac49cba4cfc300575fc23f8f57d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:33:40 +0200
Subject: [PATCH 145/721] Fix: Dicer Tracker Reset Button (#2248)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../garden/farming/DicerRngDropTracker.kt     | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 90e4da6bffbf..7d9f2587e3fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -44,37 +44,37 @@ object DicerRngDropTracker {
     private val melonPatternGroup = RepoPattern.group("garden.dicer.melon")
     private val melonUncommonDropPattern by melonPatternGroup.pattern(
         "uncommon",
-        "§a§lUNCOMMON DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Melon§r§e!"
+        "§a§lUNCOMMON DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Melon§r§e!",
     )
     private val melonRareDropPattern by melonPatternGroup.pattern(
         "rare",
-        "§9§lRARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Melon§r§e!"
+        "§9§lRARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Melon§r§e!",
     )
     private val melonCrazyRareDropPattern by melonPatternGroup.pattern(
         "crazyrare",
-        "§d§lCRAZY RARE DROP! §r§eDicer dropped §r§[a|9](\\d+)x §r§[a|9]Enchanted Melon(?: Block)?§r§e!"
+        "§d§lCRAZY RARE DROP! §r§eDicer dropped §r§[a|9](\\d+)x §r§[a|9]Enchanted Melon(?: Block)?§r§e!",
     )
     private val melonRngesusDropPattern by melonPatternGroup.pattern(
         "rngesus",
-        "§5§lPRAY TO RNGESUS DROP! §r§eDicer dropped §r§9(\\d+)x §r§9Enchanted Melon Block§r§e!"
+        "§5§lPRAY TO RNGESUS DROP! §r§eDicer dropped §r§9(\\d+)x §r§9Enchanted Melon Block§r§e!",
     )
 
     private val pumpkinPatternGroup = RepoPattern.group("garden.dicer.pumpkin")
     private val pumpkinUncommonDropPattern by pumpkinPatternGroup.pattern(
         "uncommon",
-        "§a§lUNCOMMON DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!"
+        "§a§lUNCOMMON DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!",
     )
     private val pumpkinRareDropPattern by pumpkinPatternGroup.pattern(
         "rare",
-        "§9§lRARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!"
+        "§9§lRARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!",
     )
     private val pumpkinCrazyRareDropPattern by pumpkinPatternGroup.pattern(
         "crazyrare",
-        "§d§lCRAZY RARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!"
+        "§d§lCRAZY RARE DROP! §r§eDicer dropped §r§a(\\d+)x §r§aEnchanted Pumpkin§r§e!",
     )
     private val pumpkinRngesusDropPattern by pumpkinPatternGroup.pattern(
         "rngesus",
-        "§5§lPRAY TO RNGESUS DROP! §r§eDicer dropped §r§[a|9](\\d+)x §r§(aEnchanted|9Polished) Pumpkin§r§e!"
+        "§5§lPRAY TO RNGESUS DROP! §r§eDicer dropped §r§[a|9](\\d+)x §r§(aEnchanted|9Polished) Pumpkin§r§e!",
     )
 
     init {
@@ -122,20 +122,19 @@ object DicerRngDropTracker {
 
     private fun drawDisplay(data: Data) = buildList {
         val cropInHand = cropInHand ?: return@buildList
-        val items = data.drops.getOrPut(cropInHand) { mutableMapOf() }
-        val list = mutableListOf<Renderable>()
-        val topLine = mutableListOf<Renderable>()
 
+        val topLine = mutableListOf<Renderable>()
         topLine.add(Renderable.itemStack(cropInHand.icon))
         topLine.add(Renderable.string("§7Dicer Tracker:"))
         add(listOf(Renderable.horizontalContainer(topLine)))
-        if (config.compact.get()) {
 
+        val items = data.drops[cropInHand] ?: return@buildList
+        val list = mutableListOf<Renderable>()
+        if (config.compact.get()) {
             val compactLine = items.sortedDesc().map { (rarity, amount) ->
                 "§${rarity.colorCode}${amount.addSeparators()}"
             }.joinToString("§7/")
             list.add(Renderable.string(compactLine))
-            add(listOf(Renderable.verticalContainer(list)))
 
         } else {
             for ((rarity, amount) in items.sortedDesc()) {
@@ -143,9 +142,8 @@ object DicerRngDropTracker {
                 val displayName = rarity.displayName
                 list.add(Renderable.string(" §7- §e${amount.addSeparators()}x §$colorCode$displayName"))
             }
-            add(listOf(Renderable.verticalContainer(list)))
         }
-
+        add(listOf(Renderable.verticalContainer(list)))
     }
 
     private var cropInHand: CropType? = null

From c4da7e8b602e3726dbd0823c1626d4dccc19f503 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 28 Jul 2024 10:34:17 +0200
Subject: [PATCH 146/721] Fix: HotM total powder being reset (#2263)

---
 src/main/java/at/hannibal2/skyhanni/data/HotmData.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index c484f2ca974e..1775cdeeb144 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -674,6 +674,7 @@ enum class HotmData(
         fun onInventoryFullyOpen(event: InventoryFullyOpenedEvent) {
             if (!LorenzUtils.inSkyBlock) return
             inInventory = inventoryPattern.matches(event.inventoryName)
+            if (!inInventory) return
             DelayedRun.runNextTick {
                 InventoryUtils.getItemsInOpenChest().forEach { it.parse() }
                 abilities.filter { it.isUnlocked }.forEach {

From 6da505a4c83d43642ecb99c83697d140b9a66ba8 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:34:54 +0200
Subject: [PATCH 147/721] Fix: Jacob Contest FF Needed Display not showing
 (#2262)

---
 .../features/garden/contest/JacobContestFFNeededDisplay.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
index fa57dbe600d4..963193c4ba74 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
@@ -120,7 +120,7 @@ object JacobContestFFNeededDisplay {
     fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!isEnabled()) return
         if (!FarmingContestAPI.inInventory) return
-        if (lastToolTipTime.passedSince() < 200.milliseconds) return
+        if (lastToolTipTime.passedSince() > 200.milliseconds) return
         config.farmingFortuneForContestPos.renderStringsAndItems(display, posLabel = "Jacob Contest Crop Data")
     }
 

From 85804cca4174f7c00560ee4a91c2dbdab30db6d1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:35:06 +0200
Subject: [PATCH 148/721] Fix: Duration below 1s (#2261)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index 104dce34d502..dcb6dcc931be 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -16,7 +16,7 @@ object TimeUtils {
 
     fun Duration.format(
         biggestUnit: TimeUnit = TimeUnit.YEAR,
-        showMilliSeconds: Boolean = false,
+        showMilliSeconds: Boolean = this in -1.seconds..1.seconds,
         longName: Boolean = false,
         maxUnits: Int = -1,
     ): String {

From 5c7fd8edf57f02576245288c93910e95952e9835 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:28:12 +0200
Subject: [PATCH 149/721] fixed skyhanni trackers not being modifiable inside
 other menus

---
 .../skyhanni/utils/tracker/SkyHanniTracker.kt        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 1bfe6ac6f381..345767b051b5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -15,6 +15,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.gui.inventory.GuiInventory
 import kotlin.time.Duration.Companion.seconds
 
@@ -49,7 +50,7 @@ open class SkyHanniTracker<Data : TrackerData>(
             reset(DisplayMode.TOTAL, "Reset total $name!")
         },
         "§eClick to confirm.",
-        oneTimeClick = true
+        oneTimeClick = true,
     )
 
     fun modify(modifyFunction: (Data) -> Unit) {
@@ -72,7 +73,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     fun renderDisplay(position: Position) {
         if (config.hideInEstimatedItemValue && EstimatedItemValue.isCurrentlyShowing()) return
 
-        val currentlyOpen = Minecraft.getMinecraft().currentScreen is GuiInventory
+        val currentlyOpen = Minecraft.getMinecraft().currentScreen?.let { it is GuiInventory || it is GuiChest } ?: false
         if (!currentlyOpen && config.hideItemTrackersOutsideInventory && this is SkyHanniItemTracker) {
             return
         }
@@ -110,14 +111,15 @@ open class SkyHanniTracker<Data : TrackerData>(
         listOf(
             "§cThis will reset your",
             "§ccurrent session of",
-            "§c$name"
+            "§c$name",
         ),
         onClick = {
             if (sessionResetTime.passedSince() > 3.seconds) {
                 reset(DisplayMode.SESSION, "Reset this session of $name!")
                 sessionResetTime = SimpleTimeMark.now()
             }
-        })
+        },
+    )
 
     private fun buildDisplayModeView() = LorenzUtils.buildSelector<DisplayMode>(
         "§7Display Mode: ",
@@ -127,7 +129,7 @@ open class SkyHanniTracker<Data : TrackerData>(
             displayMode = it
             storedTrackers[name] = it
             update()
-        }
+        },
     )
 
     protected fun getSharedTracker() = ProfileStorageData.profileSpecific?.let {

From 238159856f6eafe44208a346c3ab67e344591d3e Mon Sep 17 00:00:00 2001
From: Max <max_bodifee@sfu.ca>
Date: Sun, 28 Jul 2024 02:31:54 -0700
Subject: [PATCH 150/721] Improvement: Add Slug pet to FF Guide (#2249)

---
 .../garden/fortuneguide/CaptureFarmingGear.kt       |  6 ++++++
 .../features/garden/fortuneguide/FFInfos.kt         |  5 +++--
 .../features/garden/fortuneguide/FFStats.kt         | 13 ++++++-------
 .../features/garden/fortuneguide/FFTypes.kt         |  3 +--
 .../features/garden/fortuneguide/FarmingItems.kt    |  3 ++-
 .../garden/fortuneguide/pages/OverviewPage.kt       |  6 +++---
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index 79d44d92d486..a3cea69a6925 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -277,6 +277,7 @@ object CaptureFarmingGear {
         var highestMooshroomRarity = (FarmingItems.MOOSHROOM_COW.getItemOrNull()?.getItemRarityOrNull()?.id ?: -1) - 1
         var highestRabbitRarity = (FarmingItems.RABBIT.getItemOrNull()?.getItemRarityOrNull()?.id ?: -1) - 1
         var highestBeeRarity = (FarmingItems.BEE.getItemOrNull()?.getItemRarityOrNull()?.id ?: -1) - 1
+        var highestSlugRarity = (FarmingItems.SLUG.getItemOrNull()?.getItemRarityOrNull()?.id ?: -1) - 1
 
         for ((_, item) in items) {
             if (item.getItemCategoryOrNull() != ItemCategory.PET) continue
@@ -301,6 +302,11 @@ object CaptureFarmingGear {
                 outdatedItems[FarmingItems.BEE] = false
                 highestBeeRarity = rarity.toInt()
             }
+            if (name == "SLUG" && rarity.toInt() > highestSlugRarity) {
+                FarmingItems.SLUG.setItem(item)
+                outdatedItems[FarmingItems.SLUG] = false
+                highestSlugRarity = rarity.toInt()
+            }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
index 1d7bfd4fe716..31c02b26f3fa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
@@ -49,7 +49,7 @@ internal enum class FFInfos(
     ENCHANT_ARMOR(
         sumTo = TOTAL_ARMOR,
         from = { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF },
-        what = FFTypes.PESTERMINATOR,
+        what = FFTypes.ENCHANT,
         x4 = { FarmingItems.currentArmor == null },
         max = 5
     ),
@@ -66,6 +66,7 @@ internal enum class FFInfos(
             FarmingItems.ELEPHANT -> 150
             FarmingItems.MOOSHROOM_COW -> 158
             FarmingItems.BEE -> 30
+            FarmingItems.SLUG -> 100
             else -> 0
         }
     }),
@@ -99,7 +100,7 @@ internal enum class FFInfos(
     ENCHANT_EQUIP(
         sumTo = TOTAL_EQUIP,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
-        what = FFTypes.GREEN_THUMB,
+        what = FFTypes.ENCHANT,
         x4 = { FarmingItems.currentEquip == null },
         max = { at.hannibal2.skyhanni.features.garden.GardenAPI.totalAmountVisitorsExisting.toDouble() / 4.0 }
     ),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
index ed450b39136b..53aca9e996e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
@@ -41,12 +41,10 @@ object FFStats {
     var totalBaseFF = mapOf<FFTypes, Double>()
 
     fun loadFFData() {
-
         equipmentTotalFF = FarmingItems.equip.getFFData()
 
         armorTotalFF = FarmingItems.armor.getFFData()
-
-        usingSpeedBoots = FarmingItems.BOOTS.getItem()?.getInternalName()?.asString() in farmingBoots
+        usingSpeedBoots = FarmingItems.BOOTS.getItem().getInternalName().asString() in farmingBoots
 
         baseFF = getGenericFF()
 
@@ -116,7 +114,7 @@ object FFStats {
         FarmingFortuneDisplay.loadFortuneLineData(item, 0.0)
         this[FFTypes.BASE] = FarmingFortuneDisplay.itemBaseFortune
         this[FFTypes.REFORGE] = FarmingFortuneDisplay.reforgeFortune
-        this[FFTypes.GREEN_THUMB] = FarmingFortuneDisplay.greenThumbFortune
+        this[FFTypes.ENCHANT] = FarmingFortuneDisplay.greenThumbFortune
         this[FFTypes.ABILITY] = FarmingFortuneDisplay.getAbilityFortune(item)
         this[FFTypes.TOTAL] = this.values.sum()
     }
@@ -126,7 +124,7 @@ object FFStats {
         this[FFTypes.BASE] = FarmingFortuneDisplay.itemBaseFortune
         this[FFTypes.REFORGE] = FarmingFortuneDisplay.reforgeFortune
         this[FFTypes.GEMSTONE] = FarmingFortuneDisplay.gemstoneFortune
-        this[FFTypes.PESTERMINATOR] = FarmingFortuneDisplay.pesterminatorFortune
+        this[FFTypes.ENCHANT] = FarmingFortuneDisplay.pesterminatorFortune
         this[FFTypes.ABILITY] = FarmingFortuneDisplay.getAbilityFortune(item)
         this[FFTypes.TOTAL] = this.values.sum()
     }
@@ -159,12 +157,12 @@ object FFStats {
     }
 
     fun getTotalFF() {
-
-        currentPetItem = FarmingItems.currentPet.getItem()?.getPetItem().toString()
+        currentPetItem = FarmingItems.currentPet.getItem().getPetItem().toString()
 
         totalBaseFF = combineFFData(
             baseFF, armorTotalFF, equipmentTotalFF, FarmingItems.currentPet.getFFData()
         )
+
         FFGuideGUI.updateDisplay()
     }
 
@@ -190,6 +188,7 @@ object FFStats {
                 rawInternalName.contains("MOOSHROOM") -> (10 + petLevel).toDouble()
                 rawInternalName.contains("BEE;2") -> 0.2 * petLevel
                 rawInternalName.contains("BEE;3") || rawInternalName.contains("BEE;4") -> 0.3 * petLevel
+                rawInternalName.contains("SLUG;4") -> 1.0 * petLevel
                 else -> 0.0
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
index 35692743b5cf..2414dc5d86bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
@@ -6,8 +6,7 @@ enum class FFTypes {
     REFORGE,
     GEMSTONE,
     ABILITY,
-    GREEN_THUMB,
-    PESTERMINATOR,
+    ENCHANT,
     FARMING_LVL,
     BESTIARY,
     PLOTS,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
index 46b5d1e0722e..9517f366ffd5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
@@ -35,6 +35,7 @@ enum class FarmingItems(
     MOOSHROOM_COW(ItemCategory.PET, FFStats::getPetFFData),
     RABBIT(ItemCategory.PET, FFStats::getPetFFData),
     BEE(ItemCategory.PET, FFStats::getPetFFData),
+    SLUG(ItemCategory.PET, FFStats::getPetFFData),
     ;
 
     var selectedState = false
@@ -136,7 +137,7 @@ enum class FarmingItems(
 
         val armor = listOf(HELMET, CHESTPLATE, LEGGINGS, BOOTS)
         val equip = listOf(NECKLACE, CLOAK, BELT, BRACELET)
-        val pets = listOf(ELEPHANT, MOOSHROOM_COW, RABBIT, BEE)
+        val pets = listOf(ELEPHANT, MOOSHROOM_COW, RABBIT, BEE, SLUG)
 
         fun getArmorDisplay(clickEnabled: Boolean = false): List<Renderable> = armor.map { it.getDisplay(clickEnabled) }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index 2bbb10b954fb..960f5c91574a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -217,7 +217,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.TOTAL_PET.bar(
                 "§2Total Pet Fortune",
                 "§7§2The total fortune from your pet and its item",
-                71
+                72
             )
         )
 
@@ -225,7 +225,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.PET_BASE.bar(
                 "§2Base Pet Fortune",
                 "§7§2The base fortune from your pet",
-                71
+                72
             )
         )
 
@@ -238,7 +238,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                     "MINOS_RELIC" -> "§cGreen Bandana is better for fortune than minos relic!"
                     else -> "No fortune boosting pet item"
                 },
-                71
+                72
             )
         )
 

From 1358d63788305f6d2692de4528c533a53e05cc49 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:34:57 +0200
Subject: [PATCH 151/721] formatting

---
 .../garden/fortuneguide/CaptureFarmingGear.kt |  24 ++--
 .../features/garden/fortuneguide/FFInfos.kt   | 126 ++++++++++--------
 .../features/garden/fortuneguide/FFStats.kt   |   2 +-
 .../garden/fortuneguide/FarmingItems.kt       |   7 +-
 .../garden/fortuneguide/pages/OverviewPage.kt | 104 ++++++++-------
 5 files changed, 143 insertions(+), 120 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index a3cea69a6925..959ab43e4b13 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -41,52 +41,52 @@ object CaptureFarmingGear {
     private val patternGroup = RepoPattern.group("garden.fortuneguide.capture")
     private val farmingLevelUpPattern by patternGroup.pattern(
         "farminglevel",
-        "SKILL LEVEL UP Farming .*➜(?<level>.*)"
+        "SKILL LEVEL UP Farming .*➜(?<level>.*)",
     )
     private val fortuneUpgradePattern by patternGroup.pattern(
         "fortuneupgrade",
-        "You claimed the Garden Farming Fortune (?<level>.*) upgrade!"
+        "You claimed the Garden Farming Fortune (?<level>.*) upgrade!",
     )
     private val bestiaryPattern by patternGroup.pattern(
         "bestiary",
-        ".*§6+(?<fortune>.*)☘ Farming Fortune.*"
+        ".*§6+(?<fortune>.*)☘ Farming Fortune.*",
     )
     private val anitaBuffPattern by patternGroup.pattern(
         "anitabuff",
-        "You tiered up the Extra Farming Drops upgrade to [+](?<level>.*)%!"
+        "You tiered up the Extra Farming Drops upgrade to [+](?<level>.*)%!",
     )
     private val anitaMenuPattern by patternGroup.pattern(
         "anitamenu",
-        "§7You have: §6\\+(?<level>.*)☘ Farming Fortune"
+        "§7You have: §6\\+(?<level>.*)☘ Farming Fortune",
     )
     private val lotusUpgradePattern by patternGroup.pattern(
         "lotusupgrade",
-        "Lotus (?<piece>.*) upgraded to [+].*☘!"
+        "Lotus (?<piece>.*) upgraded to [+].*☘!",
     )
     private val petLevelUpPattern by patternGroup.pattern(
         "petlevelup",
-        "Your (?<pet>.*) leveled up to level .*!"
+        "Your (?<pet>.*) leveled up to level .*!",
     )
     private val cakePattern by patternGroup.pattern(
         "cake",
-        "(?:Big )?Yum! You (?:gain|refresh) [+]5☘ Farming Fortune for 48 hours!"
+        "(?:Big )?Yum! You (?:gain|refresh) [+]5☘ Farming Fortune for 48 hours!",
     )
     private val strengthPattern by patternGroup.pattern(
         "strength",
-        " Strength: §r§c❁(?<strength>.*)"
+        " Strength: §r§c❁(?<strength>.*)",
     )
     private val tierPattern by patternGroup.pattern(
         "uniquevisitors.tier",
-        "§7Progress to Tier (?<nextTier>\\w+):.*"
+        "§7Progress to Tier (?<nextTier>\\w+):.*",
     )
     private val tierProgressPattern by patternGroup.pattern(
         "uniquevisitors.tierprogress",
-        ".* §e(?<having>.*)§6/(?<total>.*)"
+        ".* §e(?<having>.*)§6/(?<total>.*)",
     )
 
     private val farmingSets = arrayListOf(
         "FERMENTO", "SQUASH", "CROPIE", "MELON", "FARM",
-        "RANCHERS", "FARMER", "RABBIT"
+        "RANCHERS", "FARMER", "RABBIT",
     )
 
     init {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
index 31c02b26f3fa..084ba28e00d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
@@ -7,16 +7,19 @@ internal enum class FFInfos(
     private val currentF: () -> Number,
     private val maxF: (FFInfos) -> Number,
 ) {
-    UNIVERSAL(null, { FFStats.totalBaseFF }, FFTypes.TOTAL, {
-        val backupArmor = FarmingItems.currentArmor
-        val backupEquip = FarmingItems.currentEquip
-        FarmingItems.currentArmor = null
-        FarmingItems.currentEquip = null
-        val total = maxSumToThis(it)
-        FarmingItems.currentArmor = backupArmor
-        FarmingItems.currentEquip = backupEquip
-        total
-    }),
+    UNIVERSAL(
+        null, { FFStats.totalBaseFF }, FFTypes.TOTAL,
+        {
+            val backupArmor = FarmingItems.currentArmor
+            val backupEquip = FarmingItems.currentEquip
+            FarmingItems.currentArmor = null
+            FarmingItems.currentEquip = null
+            val total = maxSumToThis(it)
+            FarmingItems.currentArmor = backupArmor
+            FarmingItems.currentEquip = backupEquip
+            total
+        },
+    ),
     FARMING_LEVEL(UNIVERSAL, { FFStats.baseFF }, FFTypes.FARMING_LVL, 240),
     BESTIARY(UNIVERSAL, { FFStats.baseFF }, FFTypes.BESTIARY, 60),
     GARDEN_PLOTS(UNIVERSAL, { FFStats.baseFF }, FFTypes.PLOTS, 72),
@@ -24,85 +27,100 @@ internal enum class FFInfos(
     COMMUNITY_SHOP(UNIVERSAL, { FFStats.baseFF }, FFTypes.COMMUNITY_SHOP, 40),
     CAKE_BUFF(UNIVERSAL, { FFStats.baseFF }, FFTypes.CAKE, 5),
     TOTAL_ARMOR(UNIVERSAL, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.TOTAL),
-    BASE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.BASE, {
-        when (FarmingItems.currentArmor) {
-            FarmingItems.HELMET -> 30
-            FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 35
-            FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 60 else 30
-            else -> if (FFStats.usingSpeedBoots) 160 else 130
-        }
-    }),
-    ABILITY_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.ABILITY, {
-        when (FarmingItems.currentArmor) {
-            FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> if (FFStats.usingSpeedBoots) 16.667 else 18.75
-            FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 0 else 18.75
-            else -> if (FFStats.usingSpeedBoots) 50 else 75
-        }
-    }),
-    REFORGE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.REFORGE, {
-        when (FarmingItems.currentArmor) {
-            FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 30
-            FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 25 else 30
-            else -> if (FFStats.usingSpeedBoots) 115 else 120
-        }
-    }),
+    BASE_ARMOR(
+        TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.BASE,
+        {
+            when (FarmingItems.currentArmor) {
+                FarmingItems.HELMET -> 30
+                FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 35
+                FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 60 else 30
+                else -> if (FFStats.usingSpeedBoots) 160 else 130
+            }
+        },
+    ),
+    ABILITY_ARMOR(
+        TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.ABILITY,
+        {
+            when (FarmingItems.currentArmor) {
+                FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> if (FFStats.usingSpeedBoots) 16.667 else 18.75
+                FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 0 else 18.75
+                else -> if (FFStats.usingSpeedBoots) 50 else 75
+            }
+        },
+    ),
+    REFORGE_ARMOR(
+        TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.REFORGE,
+        {
+            when (FarmingItems.currentArmor) {
+                FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 30
+                FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 25 else 30
+                else -> if (FFStats.usingSpeedBoots) 115 else 120
+            }
+        },
+    ),
     ENCHANT_ARMOR(
         sumTo = TOTAL_ARMOR,
         from = { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF },
         what = FFTypes.ENCHANT,
         x4 = { FarmingItems.currentArmor == null },
-        max = 5
+        max = 5,
+    ),
+    GEMSTONE_ARMOR(
+        TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.GEMSTONE,
+        {
+            when (FarmingItems.currentArmor) {
+                FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 20
+                FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 16 else 20
+                else -> if (FFStats.usingSpeedBoots) 76 else 80
+            }
+        },
     ),
-    GEMSTONE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.GEMSTONE, {
-        when (FarmingItems.currentArmor) {
-            FarmingItems.HELMET, FarmingItems.CHESTPLATE, FarmingItems.LEGGINGS -> 20
-            FarmingItems.BOOTS -> if (FFStats.usingSpeedBoots) 16 else 20
-            else -> if (FFStats.usingSpeedBoots) 76 else 80
-        }
-    }),
     TOTAL_PET(UNIVERSAL, { FarmingItems.currentPet.getFFData() }, FFTypes.TOTAL),
-    PET_BASE(TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.BASE, {
-        when (FarmingItems.currentPet) {
-            FarmingItems.ELEPHANT -> 150
-            FarmingItems.MOOSHROOM_COW -> 158
-            FarmingItems.BEE -> 30
-            FarmingItems.SLUG -> 100
-            else -> 0
-        }
-    }),
+    PET_BASE(
+        TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.BASE,
+        {
+            when (FarmingItems.currentPet) {
+                FarmingItems.ELEPHANT -> 150
+                FarmingItems.MOOSHROOM_COW -> 158
+                FarmingItems.BEE -> 30
+                FarmingItems.SLUG -> 100
+                else -> 0
+            }
+        },
+    ),
     PET_ITEM(TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.PET_ITEM, 60),
     TOTAL_EQUIP(
         sumTo = UNIVERSAL,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
-        what = FFTypes.TOTAL
+        what = FFTypes.TOTAL,
     ),
     BASE_EQUIP(
         sumTo = TOTAL_EQUIP,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
         what = FFTypes.BASE,
         x4 = { FarmingItems.currentEquip == null },
-        max = 5.0
+        max = 5.0,
     ),
     ABILITY_EQUIP(
         sumTo = TOTAL_EQUIP,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
         what = FFTypes.ABILITY,
         x4 = { FarmingItems.currentEquip == null },
-        max = 15.0
+        max = 15.0,
     ),
     REFORGE_EQUIP(
         sumTo = TOTAL_EQUIP,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
         what = FFTypes.REFORGE,
         x4 = { FarmingItems.currentEquip == null },
-        max = 15.0
+        max = 15.0,
     ),
     ENCHANT_EQUIP(
         sumTo = TOTAL_EQUIP,
         from = { FarmingItems.currentEquip?.getFFData() ?: FFStats.equipmentTotalFF },
         what = FFTypes.ENCHANT,
         x4 = { FarmingItems.currentEquip == null },
-        max = { at.hannibal2.skyhanni.features.garden.GardenAPI.totalAmountVisitorsExisting.toDouble() / 4.0 }
+        max = { at.hannibal2.skyhanni.features.garden.GardenAPI.totalAmountVisitorsExisting.toDouble() / 4.0 },
     ),
     ;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
index 53aca9e996e8..d2740928a4ca 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
@@ -160,7 +160,7 @@ object FFStats {
         currentPetItem = FarmingItems.currentPet.getItem().getPetItem().toString()
 
         totalBaseFF = combineFFData(
-            baseFF, armorTotalFF, equipmentTotalFF, FarmingItems.currentPet.getFFData()
+            baseFF, armorTotalFF, equipmentTotalFF, FarmingItems.currentPet.getFFData(),
         )
 
         FFGuideGUI.updateDisplay()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
index 9517f366ffd5..b46d6ebe4066 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
@@ -96,10 +96,11 @@ enum class FarmingItems(
 
         val content = Renderable.clickable(
             Renderable.itemStackWithTip(
-                getItem(), 1.0, 0, 0, false
+                getItem(), 1.0, 0, 0, false,
             ),
             onClick = onClick(),
-            condition = { clickEnabled })
+            condition = { clickEnabled },
+        )
 
         override val width = content.width
         override val height = content.height
@@ -112,7 +113,7 @@ enum class FarmingItems(
                 0,
                 width,
                 height,
-                if (this@FarmingItems.selectedState) 0xFFB3FFB3.toInt() else 0xFF43464B.toInt()
+                if (selectedState) 0xFFB3FFB3.toInt() else 0xFF43464B.toInt(),
             )
             content.render(posX, posY)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index 960f5c91574a..13b74a59cf27 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.renderables.Renderable
 
 class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7, footerSpacing: Int = 6) :
     GuideTablePage(
-        sizeX, sizeY, paddingX, paddingY, footerSpacing
+        sizeX, sizeY, paddingX, paddingY, footerSpacing,
     ) {
 
     override fun onEnter() {
@@ -21,6 +21,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
         update(content, footer)
     }
 
+    //TODO split up this 240 lines function
     fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> {
         val content = mutableListOf<MutableList<Renderable>>()
         val footer = mutableListOf<Renderable>()
@@ -31,8 +32,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.UNIVERSAL.bar(
                 "§6Universal Farming Fortune",
                 "§7§2Farming fortune in that is\n§2applied to every crop\n§eNot the same as tab FF\n" +
-                    "§eSee on the grass block page"
-            )
+                    "§eSee on the grass block page",
+            ),
         )
 
         content.addTable(
@@ -40,8 +41,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.FARMING_LEVEL.bar(
                 "§2Farming Level",
                 if (FFTypes.FARMING_LVL.notSaved()) "§cFarming level not saved\n§eOpen /skills to set it!"
-                else "§7§2Fortune for levelling your farming skill\n§2You get 4☘ per farming level"
-            )
+                else "§7§2Fortune for levelling your farming skill\n§2You get 4☘ per farming level",
+            ),
         )
 
         content.addTable(
@@ -49,8 +50,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.BESTIARY.bar(
                 "§2Bestiary",
                 if (FFTypes.BESTIARY.notSaved()) "§cBestiary fortune not saved\n§eOpen /bestiary to set it!"
-                else "§7§2Fortune for killing pests\n§2You get 0.4☘ per bestiary milestone per pest"
-            )
+                else "§7§2Fortune for killing pests\n§2You get 0.4☘ per bestiary milestone per pest",
+            ),
         )
 
         content.addTable(
@@ -59,8 +60,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                 "§2Garden Plots",
                 if (FFTypes.PLOTS.notSaved()) "§cUnlocked plot count not saved\n" +
                     "§eOpen /desk and view your plots to set it!"
-                else "§7§2Fortune for unlocking garden plots\n§2You get 3☘ per plot unlocked"
-            )
+                else "§7§2Fortune for unlocking garden plots\n§2You get 3☘ per plot unlocked",
+            ),
         )
 
         content.addTable(
@@ -68,8 +69,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ANITA_BUFF.bar(
                 "§2Anita Buff",
                 if (FFTypes.ANITA.notSaved()) "§cAnita buff not saved\n§eVisit Anita to set it!"
-                else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level"
-            )
+                else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level",
+            ),
         )
 
         content.addTable(
@@ -78,23 +79,26 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                 "§2Community upgrades",
                 if (FFTypes.COMMUNITY_SHOP.notSaved()) "§cCommunity upgrade level not saved\n" +
                     "§eVisit Elizabeth to set it!"
-                else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier"
-            )
+                else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier",
+            ),
         )
 
         content.addTable(
             6,
             FFInfos.CAKE_BUFF.bar(
-                "§2Cake Buff", when {
+                "§2Cake Buff",
+                when {
                     FFStats.cakeExpireTime.isFarPast() ->
                         "§eYou have not eaten a cake since\n§edownloading this update, assuming the\n§ebuff is active!"
+
                     FFStats.cakeExpireTime.isInPast() ->
                         "§cYour cake buff has run out\nGo eat some cake!"
+
                     else ->
                         "§7§2Fortune for eating cake\n§2You get 5☘ for eating cake\n" +
                             "§2Time until cake buff runs out: $timeUntilCakes"
-                }
-            )
+                },
+            ),
         )
 
         val moreInfo = "§2Select a piece for more info"
@@ -106,8 +110,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.TOTAL_ARMOR.bar(
                 "§2Total $wordArmor Fortune",
                 if (FarmingItems.currentArmor == null) "§7§2Total fortune from your armor\n$moreInfo"
-                else "§7§2Total fortune from your\n$armorName"
-            )
+                else "§7§2Total fortune from your\n$armorName",
+            ),
         )
 
         content.addTable(
@@ -115,8 +119,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.BASE_ARMOR.bar(
                 "§2Base $wordArmor Fortune",
                 if (FarmingItems.currentArmor == null) "§7§2The base fortune from your armor\n$moreInfo"
-                else "§7§2Base fortune from your\n$armorName"
-            )
+                else "§7§2Base fortune from your\n$armorName",
+            ),
         )
 
         content.addTable(
@@ -124,8 +128,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ABILITY_ARMOR.bar(
                 "§2$wordArmor Ability",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's ability\n$moreInfo"
-                else "§7§2Ability fortune from your\n$armorName"
-            )
+                else "§7§2Ability fortune from your\n$armorName",
+            ),
         )
 
         content.addTable(
@@ -133,8 +137,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.REFORGE_ARMOR.bar(
                 "§2$wordArmor Reforge",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's reforge\n$moreInfo"
-                else "§7§2Reforge fortune from your\n$armorName}"
-            )
+                else "§7§2Reforge fortune from your\n$armorName}",
+            ),
         )
 
         content.addTable(
@@ -142,8 +146,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ENCHANT_ARMOR.bar(
                 "§2$wordArmor Enchantment",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's enchantments\n$moreInfo"
-                else "§7§2Enchantment fortune from your\n$armorName}"
-            )
+                else "§7§2Enchantment fortune from your\n$armorName}",
+            ),
         )
 
         content.addTable(
@@ -151,8 +155,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.GEMSTONE_ARMOR.bar(
                 "§2$wordArmor Gemstones",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's gemstones\n$moreInfo"
-                else "§7§2Gemstone fortune from your\n$armorName}"
-            )
+                else "§7§2Gemstone fortune from your\n$armorName}",
+            ),
         )
 
         val wordEquip = if (FarmingItems.currentEquip == null) "Equipment" else "Piece"
@@ -164,8 +168,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.TOTAL_EQUIP.bar(
                 "§2Total $wordEquip Fortune",
                 if (FarmingItems.currentEquip == null) "§7§2Total fortune from your equipment\n$moreInfo"
-                else "§7§2Total fortune from your\n$equipmentName"
-            )
+                else "§7§2Total fortune from your\n$equipmentName",
+            ),
         )
 
         content.addTable(
@@ -173,8 +177,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.BASE_EQUIP.bar(
                 "§2$wordEquip Base Fortune",
                 if (FarmingItems.currentEquip == null) "§7§2The base fortune from your equipment\n$moreInfo"
-                else "§7§2Base fortune from your\n$equipmentName"
-            )
+                else "§7§2Base fortune from your\n$equipmentName",
+            ),
         )
 
         content.addTable(
@@ -182,8 +186,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ABILITY_EQUIP.bar(
                 "§2$wordEquip Ability",
                 if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's abilities\n$moreInfo"
-                else "§7§2Ability fortune from your\n$equipmentName"
-            )
+                else "§7§2Ability fortune from your\n$equipmentName",
+            ),
         )
 
         content.addTable(
@@ -191,8 +195,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.REFORGE_EQUIP.bar(
                 "§2$wordEquip Reforge",
                 if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's reforges\n$moreInfo"
-                else "§7§2Reforge fortune from your\n$equipmentName"
-            )
+                else "§7§2Reforge fortune from your\n$equipmentName",
+            ),
         )
 
         content.addTable(
@@ -200,8 +204,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ENCHANT_EQUIP.bar(
                 "§2$wordEquip Enchantment",
                 if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's enchantments\n$moreInfo"
-                else "§7§2Enchantment fortune from your\n$equipmentName"
-            )
+                else "§7§2Enchantment fortune from your\n$equipmentName",
+            ),
         )
 
         footer.add(
@@ -209,24 +213,24 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                 FarmingItems.getPetsDisplay(true),
                 4,
                 horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
-                verticalAlign = RenderUtils.VerticalAlignment.CENTER
-            )
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            ),
         )
 
         footer.add(
             FFInfos.TOTAL_PET.bar(
                 "§2Total Pet Fortune",
                 "§7§2The total fortune from your pet and its item",
-                72
-            )
+                72,
+            ),
         )
 
         footer.add(
             FFInfos.PET_BASE.bar(
                 "§2Base Pet Fortune",
                 "§7§2The base fortune from your pet",
-                72
-            )
+                72,
+            ),
         )
 
         footer.add(
@@ -238,8 +242,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                     "MINOS_RELIC" -> "§cGreen Bandana is better for fortune than minos relic!"
                     else -> "No fortune boosting pet item"
                 },
-                72
-            )
+                72,
+            ),
         )
 
         // Displays
@@ -250,8 +254,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                 FarmingItems.getArmorDisplay(true),
                 4,
                 horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
-                verticalAlign = RenderUtils.VerticalAlignment.CENTER
-            )
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            ),
         )
         content.addTable(
             0,
@@ -259,8 +263,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
                 FarmingItems.getEquipmentDisplay(true),
                 4,
                 horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
-                verticalAlign = RenderUtils.VerticalAlignment.CENTER
-            )
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            ),
         )
 
         return content to footer

From b75c249c2b5f6a319c076b6dfbb4ae9003814fe1 Mon Sep 17 00:00:00 2001
From: Phoebe <77941535+catgirlseraid@users.noreply.github.com>
Date: Sun, 28 Jul 2024 21:43:46 +1200
Subject: [PATCH 152/721] Chocolate Factory Milestones instead of maxed
 prestige not showing (#2226)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../repo/HoppityEggLocationsJson.kt           |  1 +
 .../chocolatefactory/ChocolateFactoryAPI.kt   |  2 +
 .../chocolatefactory/ChocolateFactoryStats.kt | 61 ++++++++++++-------
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
index d83d66249d92..5e601ed32745 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
@@ -21,6 +21,7 @@ data class HoppityEggLocationsJson(
     @Expose val coachRabbitIndex: Int,
     @Expose val maxRabbits: Int,
     @Expose val maxPrestige: Int,
+    @Expose val maxMilestoneChocolate: Long,
     @Expose val apiEggLocations: Map<IslandType, Map<String, LorenzVec>>,
     @Expose val specialRabbits: List<String>,
 )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index f1cb4be0588c..36e8a206af61 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -56,6 +56,7 @@ object ChocolateFactoryAPI {
     var shrineIndex = 41
     var coachRabbitIndex = 42
     var maxRabbits = 395
+    var maxMilestoneChocolate = 700_000_000_000L
     private var maxPrestige = 5
 
     var inChocolateFactory = false
@@ -117,6 +118,7 @@ object ChocolateFactoryAPI {
         coachRabbitIndex = data.coachRabbitIndex
         maxRabbits = data.maxRabbits
         maxPrestige = data.maxPrestige
+        maxMilestoneChocolate = data.maxMilestoneChocolate
         specialRabbitTextures = data.specialRabbits
 
         ChocolateFactoryUpgrade.updateIgnoredSlots()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
index 4491a1423866..cc193f2ef533 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
@@ -73,7 +73,7 @@ object ChocolateFactoryStats {
 
         val upgradeAvailableAt = ChocolateAmount.CURRENT.formattedTimeUntilGoal(profileStorage.bestUpgradeCost)
 
-        val map = buildMap {
+        val map = buildMap<ChocolateFactoryStat, String> {
             put(ChocolateFactoryStat.HEADER, "§6§lChocolate Factory ${ChocolateFactoryAPI.currentPrestige.toRoman()}")
 
             put(ChocolateFactoryStat.CURRENT, "§eCurrent Chocolate: §6${ChocolateAmount.CURRENT.formatted}")
@@ -104,32 +104,47 @@ object ChocolateFactoryStats {
                 } else {
                     "§eFull Tower Charges: §b${timeTowerFull.timeUntil().format()}\n" +
                         "§eHappens at: §b${timeTowerFull.formattedDate("EEEE, MMM d h:mm a")}"
-                }
-
+                },
             )
             put(ChocolateFactoryStat.TIME_TO_PRESTIGE, "§eTime To Prestige: $prestigeEstimate")
             put(
                 ChocolateFactoryStat.RAW_PER_SECOND,
-                "§eRaw Per Second: §6${profileStorage.rawChocPerSecond.addSeparators()}"
-            )
-            put(
-                ChocolateFactoryStat.CHOCOLATE_UNTIL_PRESTIGE,
-                "§eChocolate To Prestige: $chocolateUntilPrestige"
+                "§eRaw Per Second: §6${profileStorage.rawChocPerSecond.addSeparators()}",
             )
+
+            if (ChocolateFactoryAPI.isMaxPrestige()) {
+                val chocolateUntilMaxMilestone = ChocolateFactoryAPI.maxMilestoneChocolate
+                val amountUntilMaxMilestone = chocolateUntilMaxMilestone - ChocolateAmount.ALL_TIME.chocolate()
+                val maxMilestoneEstimate = ChocolateAmount.ALL_TIME.formattedTimeUntilGoal(chocolateUntilMaxMilestone)
+
+                if (amountUntilMaxMilestone >= 0) {
+                    put(ChocolateFactoryStat.TIME_TO_PRESTIGE, "§eTime To Max Milestone: $maxMilestoneEstimate")
+                    put(
+                        ChocolateFactoryStat.CHOCOLATE_UNTIL_PRESTIGE,
+                        "§eChocolate To Max Milestone: §6${amountUntilMaxMilestone.addSeparators()}",
+                    )
+                }
+            } else {
+                put(ChocolateFactoryStat.TIME_TO_PRESTIGE, "§eTime To Prestige: $prestigeEstimate")
+                put(ChocolateFactoryStat.CHOCOLATE_UNTIL_PRESTIGE, "§eChocolate To Prestige: §6$chocolateUntilPrestige")
+            }
+
             put(ChocolateFactoryStat.TIME_TO_BEST_UPGRADE, "§eBest Upgrade: $upgradeAvailableAt")
         }
         val text = config.statsDisplayList.filter { it.shouldDisplay() }.flatMap { map[it]?.split("\n") ?: listOf() }
 
-        display = listOf(Renderable.clickAndHover(
-            Renderable.verticalContainer(text.map(Renderable::string)),
-            tips = listOf("§bCopy to Clipboard!"),
-            onClick = {
-                val list = text.toMutableList()
-                list.add(0, "${LorenzUtils.getPlayerName()}'s Chocolate Factory Stats")
-
-                ClipboardUtils.copyToClipboard(list.joinToString("\n") { it.removeColor() })
-            }
-        ))
+        display = listOf(
+            Renderable.clickAndHover(
+                Renderable.verticalContainer(text.map(Renderable::string)),
+                tips = listOf("§bCopy to Clipboard!"),
+                onClick = {
+                    val list = text.toMutableList()
+                    list.add(0, "${LorenzUtils.getPlayerName()}'s Chocolate Factory Stats")
+
+                    ClipboardUtils.copyToClipboard(list.joinToString("\n") { it.removeColor() })
+                },
+            ),
+        )
     }
 
     @SubscribeEvent
@@ -167,13 +182,15 @@ object ChocolateFactoryStats {
         TIME_TOWER("§eTime Tower: §62/3 Charges", { ChocolateFactoryTimeTowerManager.currentCharges() != -1 }),
         TIME_TOWER_FULL(
             "§eTime Tower Full Charges: §b5h 13m 59s\n§bHappens at: Monday, May 13 5:32 AM",
-            { ChocolateFactoryTimeTowerManager.currentCharges() != -1 || ChocolateFactoryTimeTowerManager.timeTowerFull() }),
-        TIME_TO_PRESTIGE("§eTime To Prestige: §b1d 13h 59m 4s", { !ChocolateFactoryAPI.isMaxPrestige() }),
+            { ChocolateFactoryTimeTowerManager.currentCharges() != -1 || ChocolateFactoryTimeTowerManager.timeTowerFull() },
+        ),
+        TIME_TO_PRESTIGE("§eTime To Prestige: §b1d 13h 59m 4s"),
         RAW_PER_SECOND("§eRaw Per Second: §62,136"),
-        CHOCOLATE_UNTIL_PRESTIGE("§eChocolate To Prestige: §65,851", { !ChocolateFactoryAPI.isMaxPrestige() }),
+        CHOCOLATE_UNTIL_PRESTIGE("§eChocolate To Prestige: §65,851"),
         TIME_TO_BEST_UPGRADE(
             "§eBest Upgrade: §b 59m 4s",
-            { ChocolateFactoryAPI.profileStorage?.bestUpgradeCost != 0L }),
+            { ChocolateFactoryAPI.profileStorage?.bestUpgradeCost != 0L },
+        ),
         ;
 
         override fun toString(): String {

From 32d3a6ae845475284cc5f72dac5649d732c223b5 Mon Sep 17 00:00:00 2001
From: raaaaaven <168305416+raaaaaven@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:21:27 +0100
Subject: [PATCH 153/721] Feature: Thunder Bottle Charged Notification (#2234)

Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/misc/MiscConfig.java      |  6 ++++
 .../misc/ThunderBottleNotification.kt         | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/ThunderBottleNotification.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index aff9b496430b..6843d094877e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -272,6 +272,12 @@ public class MiscConfig {
     @FeatureToggle
     public boolean replaceRomanNumerals = false;
 
+    @Expose
+    @ConfigOption(name = "Thunder Bottle", desc = "Show a notification when your Thunder Bottle is fully charged.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean thunderBottleNotification = true;
+
     @Expose
     @ConfigOption(name = "Unknown Perkpocalypse Mayor Warning", desc = "Show a warning when the Unknown Perkpocalypse Mayor is unknown.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderBottleNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderBottleNotification.kt
new file mode 100644
index 000000000000..681f1a0dde9d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderBottleNotification.kt
@@ -0,0 +1,32 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object ThunderBottleNotification {
+
+    private val config get() = SkyHanniMod.feature.misc
+
+    private val thunderBottleChargedPattern by RepoPattern.pattern(
+        "thunderbottle.charged",
+        "§e> Your bottle of thunder has fully charged!",
+    )
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        if (thunderBottleChargedPattern.matches(event.message)) {
+            LorenzUtils.sendTitle("§eThunder Bottle Charged!", 3.seconds)
+        }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.thunderBottleNotification
+}

From a41214df4d112444eca29fe60684cc051382a33c Mon Sep 17 00:00:00 2001
From: Brady <thatgravyboat@gmail.com>
Date: Sun, 28 Jul 2024 08:04:52 -0230
Subject: [PATCH 154/721] Improvement: Apply border radius to scoreboard
 texture (#2228)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../gui/customscoreboard/RenderBackground.kt  | 20 ++++-----
 ...dedRectangleShader.kt => RoundedShader.kt} | 17 ++++++--
 .../hannibal2/skyhanni/utils/RenderUtils.kt   | 43 +++++++++++++++++++
 .../skyhanni/utils/shader/ShaderManager.kt    |  2 +
 .../skyhanni/shaders/rounded_texture.fsh      | 37 ++++++++++++++++
 .../skyhanni/shaders/rounded_texture.vsh      | 10 +++++
 6 files changed, 115 insertions(+), 14 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/features/misc/{RoundedRectangleShader.kt => RoundedShader.kt} (75%)
 create mode 100644 src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
 create mode 100644 src/main/resources/assets/skyhanni/shaders/rounded_texture.vsh

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
index 3d4e6daadf76..ebbb7fa3074c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
 import at.hannibal2.skyhanni.data.GuiEditManager.getDummySize
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.RenderUtils
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
@@ -49,12 +48,13 @@ class RenderBackground {
                 val textureLocation = ResourceLocation("skyhanni", "scoreboard.png")
                 Minecraft.getMinecraft().textureManager.bindTexture(textureLocation)
 
-                Utils.drawTexturedRect(
-                    (x - border).toFloat(),
-                    (y - border).toFloat(),
-                    (elementWidth + border * 3).toFloat(),
-                    (elementHeight + border * 2).toFloat(),
-                    GL11.GL_NEAREST
+                RenderUtils.drawRoundTexturedRect(
+                    x - border,
+                    y - border,
+                    elementWidth + border * 3,
+                    elementHeight + border * 2,
+                    GL11.GL_NEAREST,
+                    backgroundConfig.roundedCornerSmoothness,
                 )
             } else {
                 RenderUtils.drawRoundRect(
@@ -63,7 +63,7 @@ class RenderBackground {
                     elementWidth + border * 3,
                     elementHeight + border * 2,
                     backgroundConfig.color.toChromaColor().rgb,
-                    backgroundConfig.roundedCornerSmoothness
+                    backgroundConfig.roundedCornerSmoothness,
                 )
             }
             if (outlineConfig.enabled) {
@@ -76,7 +76,7 @@ class RenderBackground {
                     outlineConfig.colorBottom.toChromaColor().rgb,
                     outlineConfig.thickness,
                     backgroundConfig.roundedCornerSmoothness,
-                    outlineConfig.blur
+                    outlineConfig.blur,
                 )
             }
         }
@@ -133,7 +133,7 @@ class RenderBackground {
             newX,
             newY,
             position.getScale(),
-            position.isCenter
+            position.isCenter,
         )
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleShader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedShader.kt
similarity index 75%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleShader.kt
rename to src/main/java/at/hannibal2/skyhanni/features/misc/RoundedShader.kt
index 9ce2d0ce71ca..ab4b1165c2be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleShader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedShader.kt
@@ -4,10 +4,7 @@ import at.hannibal2.skyhanni.utils.shader.Shader
 import at.hannibal2.skyhanni.utils.shader.Uniform
 import net.minecraft.client.Minecraft
 
-object RoundedRectangleShader : Shader("rounded_rect", "rounded_rect") {
-
-    val INSTANCE: RoundedRectangleShader
-        get() = this
+abstract class RoundedShader(vertex: String, fragment: String) : Shader(vertex, fragment) {
 
     var scaleFactor: Float = 0f
     var radius: Float = 0f
@@ -26,3 +23,15 @@ object RoundedRectangleShader : Shader("rounded_rect", "rounded_rect") {
         registerUniform(Uniform.UniformType.VEC2, "centerPos") { centerPos }
     }
 }
+
+object RoundedRectangleShader : RoundedShader("rounded_rect", "rounded_rect") {
+
+    val INSTANCE: RoundedRectangleShader
+        get() = this
+}
+
+object RoundedTextureShader : RoundedShader("rounded_texture", "rounded_texture") {
+
+    val INSTANCE: RoundedTextureShader
+        get() = this
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index d32ff9ea947f..9ff6053e791b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.RenderGuiItemOverlayEvent
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleOutlineShader
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleShader
+import at.hannibal2.skyhanni.features.misc.RoundedTextureShader
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.zipWithNext3
 import at.hannibal2.skyhanni.utils.ColorUtils.getFirstColorCode
@@ -1719,6 +1720,48 @@ object RenderUtils {
         GlStateManager.enableDepth()
     }
 
+
+    /**
+     * Method to draw a rounded textured rect.
+     *
+     * **NOTE:** If you are using [GlStateManager.translate] or [GlStateManager.scale]
+     * with this method, ensure they are invoked in the correct order if you use both. That is, [GlStateManager.translate]
+     * is called **BEFORE** [GlStateManager.scale], otherwise the textured rect will not be rendered correctly
+     *
+     * @param filter the texture filter to use
+     * @param radius the radius of the corners (default 10), NOTE: If you pass less than 1 it will just draw as a normal textured rect
+     * @param smoothness how smooth the corners will appear (default 1). NOTE: This does very
+     * little to the smoothness of the corners in reality due to how the final pixel color is calculated.
+     * It is best kept at its default.
+     */
+    fun drawRoundTexturedRect(x: Int, y: Int, width: Int, height: Int, filter: Int, radius: Int = 10, smoothness: Int = 1) {
+        // if radius is 0 then just draw a normal textured rect
+        if (radius <= 0) {
+            Utils.drawTexturedRect(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat(), filter)
+            return
+        }
+
+        val scaledRes = ScaledResolution(Minecraft.getMinecraft())
+        val widthIn = width * scaledRes.scaleFactor
+        val heightIn = height * scaledRes.scaleFactor
+        val xIn = x * scaledRes.scaleFactor
+        val yIn = y * scaledRes.scaleFactor
+
+        RoundedTextureShader.scaleFactor = scaledRes.scaleFactor.toFloat()
+        RoundedTextureShader.radius = radius.toFloat()
+        RoundedTextureShader.smoothness = smoothness.toFloat()
+        RoundedTextureShader.halfSize = floatArrayOf(widthIn / 2f, heightIn / 2f)
+        RoundedTextureShader.centerPos = floatArrayOf(xIn + (widthIn / 2f), yIn + (heightIn / 2f))
+
+        GlStateManager.pushMatrix()
+        ShaderManager.enableShader(ShaderManager.Shaders.ROUNDED_TEXTURE)
+
+        Utils.drawTexturedRect(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat(), filter)
+
+        ShaderManager.disableShader()
+        GlStateManager.popMatrix()
+    }
+
     /**
      * Method to draw a rounded rectangle.
      *
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
index 39a2fe302d3a..ed4dbabdfe6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.features.chroma.TexturedChromaShader
 import at.hannibal2.skyhanni.features.misc.DarkenShader
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleOutlineShader
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleShader
+import at.hannibal2.skyhanni.features.misc.RoundedTextureShader
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.Minecraft
@@ -28,6 +29,7 @@ object ShaderManager {
         TEXTURED_CHROMA(TexturedChromaShader.INSTANCE),
         ROUNDED_RECTANGLE(RoundedRectangleShader.INSTANCE),
         ROUNDED_RECT_OUTLINE(RoundedRectangleOutlineShader.INSTANCE),
+        ROUNDED_TEXTURE(RoundedTextureShader.INSTANCE),
         DARKEN(DarkenShader.INSTANCE)
         ;
 
diff --git a/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh b/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
new file mode 100644
index 000000000000..a38ebc4eac00
--- /dev/null
+++ b/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
@@ -0,0 +1,37 @@
+#version 120
+
+uniform float scaleFactor;
+uniform float radius;
+uniform float smoothness;
+uniform vec2 halfSize;
+uniform vec2 centerPos;
+
+uniform sampler2D outTexture;
+
+varying vec2 outTextureCoords;
+varying vec4 outColor;
+
+// From https://www.shadertoy.com/view/WtdSDs
+float roundedRectSDF(vec2 center, vec2 halfSize, float radius) {
+    return length(max(abs(center) - halfSize + radius, 0.0)) - radius;
+}
+
+void main() {
+    float xScale = gl_ModelViewMatrix[0][0];
+    float yScale = gl_ModelViewMatrix[1][1];
+    float xTranslation = gl_ModelViewMatrix[3][0];
+    float yTranslation = gl_ModelViewMatrix[3][1];
+
+    vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
+
+    float newCenterPosY = centerPos.y;
+    if (yScale > 1.0) {
+        newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
+    }
+
+    vec2 newCenterPos = vec2((centerPos.x * xScale) + (xTranslation * scaleFactor), newCenterPosY - (yTranslation * scaleFactor));
+
+    float distance = roundedRectSDF(gl_FragCoord.xy - newCenterPos, newHalfSize, radius);
+    float smoothed = 1.0 - smoothstep(0.0, smoothness, distance);
+    gl_FragColor = (texture2D(outTexture, outTextureCoords) * outColor) * vec4(1.0, 1.0, 1.0, smoothed);
+}
diff --git a/src/main/resources/assets/skyhanni/shaders/rounded_texture.vsh b/src/main/resources/assets/skyhanni/shaders/rounded_texture.vsh
new file mode 100644
index 000000000000..227f964a1211
--- /dev/null
+++ b/src/main/resources/assets/skyhanni/shaders/rounded_texture.vsh
@@ -0,0 +1,10 @@
+#version 120
+
+varying vec2 outTextureCoords;
+varying vec4 outColor;
+
+void main(){
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    outColor = gl_Color;
+    outTextureCoords = gl_MultiTexCoord0.st;
+}

From c6272b35f098da90beace4cea208e0f375df8251 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:03:25 +0200
Subject: [PATCH 155/721] Version 0.26 Beta 19

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 26 +++++++++++++++++++
 docs/FEATURES.md                              |  2 ++
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0a67f50dfa81..424cbf29f8d2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.18"
+version = "0.26.Beta.19"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d0d4541387cd..c576caf0bc42 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -111,6 +111,7 @@
     + Replaces the previous Time Tower Reminder feature.
 + Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
     + Can be enabled/disabled on the Item Number list.
++ Added Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
 
 #### Fishing Features
 
@@ -153,6 +154,7 @@
 + Added Option to crash your game when you die, for extra suffering. - Stella (https://github.com/hannibal002/SkyHanni/pull/2238)
     + Also punishes players who don't read patch notes.
 + Added Crown of Avarice counter. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2229)
++ Added a title notification for when the Thunder Bottle is fully charged. - raven (https://github.com/hannibal002/SkyHanni/pull/2234)
 
 ### Improvements
 
@@ -177,6 +179,7 @@
 + Add Fine Flour to the /ff menu. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
 + Added a "Compact" option to the Rancher Boots Optimal Speed GUI. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
 + The Rancher Boots Optimal Speed GUI now highlights the crop corresponding to the last held tool. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
++ Added Slug pet to the FF Guide. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/2249)
 
 #### Hoppity Event Improvements
 
@@ -201,6 +204,8 @@
 + Hoppity and Chocolate reminders/warnings now appear less frequently and are less intrusive. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2196)
 + Add a configuration option to allow Time Tower to appear in the Chocolate Factory next upgrade list. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2142)
 + Changed click-to-warp toggle to also work for unclaimed eggs display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2211)
++ When Chocolate Factory prestige is maxed, the display shows time until the next max milestone instead. - seraid (https://github.com/hannibal002/SkyHanni/pull/2226)
++ Added an option to choose the color of Hoppity Egg Waypoints. - jani (https://github.com/hannibal002/SkyHanni/pull/2259)
 
 #### Mining Improvements
 
@@ -257,6 +262,10 @@
 + Added option to show the name of the sea creature in the title notification. -
   Empa (https://github.com/hannibal002/SkyHanni/pull/1858)
 + Clarified chat prompt to load trophy fishing data from NEU PV. - Luna (https://github.com/hannibal002/SkyHanni/pull/2139)
++ Improved Barn Fishing Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1960)
+    + Modified the warning thresholds for Crimson Isle and Crystal Hollows.
+    + The timer now only takes into account the user's own sea creatures.
+    + Added a warning when reaching a certain number of sea creatures.
 
 #### Diana Improvements
 
@@ -294,6 +303,7 @@
 + Add config option to maintain "current" sound settings levels while warning sounds are played. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2129)
 + Added a reset button in the config for the appearance and event priority of the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2141)
 + Reverted item source names to shorter format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2233)
++ Rounded corner smoothness now applies to custom Scoreboard textures. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2228)
 
 ### Fixes
 
@@ -322,6 +332,9 @@
 + Ignore Jasper/Ruby Crystal price. - Luna (https://github.com/hannibal002/SkyHanni/pull/2235)
     + These crystals used to have an item form and may be sold on the Auction House for overinflated prices (e.g., over 900M for a Jasper Crystal), which can inflate values like Corpse Profit.
 + Fixed PowderTracker Pattern. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2240)
++ Fixed total powder amounts resetting when opening the SkyBlock Menu on a mining island. - Luna (https://github.com/hannibal002/SkyHanni/pull/2263)
++ Fixed detection of 2x Powder Event for Powder Tracker. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2157)
+    + Now uses the Tab Widget.
 
 #### Garden Fixes
 
@@ -346,6 +359,9 @@
 + Fixed "Craftable!" text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2219)
 + Fixed favorite pets not being detected by FF Guide. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2202)
 + Fixed farming weight estimate being much too large. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2230)
++ Fixed Jacob's Contest FF needed display not showing. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2262)
++ Fixed Dicer Tracker Reset Button misalignment. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2248)
++ Fixed errors when selecting Fine Flour with the Sprayonator. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2251)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -374,6 +390,8 @@
 + Fix detection for supreme chocolate bar completion. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
 + Fixed the detection of production time from Fish the Rabbit. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2225)
 + Fixed buying items sometimes triggering compact Hoppity messages. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2201)
++ Fixed Hoppity Chat Compact not working outside of Hoppity's event for Abiphone users who have Hoppity as a contact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2250)
++ Fixed stray rabbit production time tooltip display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2239)
 
 #### Custom Scoreboard Fixes
 
@@ -392,6 +410,7 @@
 + Fix New Mayor perks not showing up on the Scoreboard. - Stella (https://github.com/hannibal002/SkyHanni/pull/2187)
 + Fixed Custom Scoreboard Error during Carnival. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2245)
 + Fixed 2 Custom Scoreboard Errors while in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2236)
++ Fixed Scoreboard Reset not updating the draggable list. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2252)
 
 #### Dungeon Fixes
 
@@ -417,6 +436,7 @@
 + Fixed Fishing Bait warnings not working. - Empa (https://github.com/hannibal002/SkyHanni/pull/2135)
 + Fixed a rare double hook detection issue. - appable (https://github.com/hannibal002/SkyHanni/pull/2125)
 + Fixed Commission Mob Highlighter incorrectly highlighting Deep Sea Protectors as Automatons. - Luna (https://github.com/hannibal002/SkyHanni/pull/2130)
++ Fixed Squid Pet counting towards the Fishing Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1960)
 
 #### Performance Fixes
 
@@ -492,6 +512,8 @@
 + Fix a bug in the Hypixel detection. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2193)
 + Fix random Stack Overflow Errors. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2199)
 + Fixed a typo in /shcommands. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2223)
++ Fixed multiple features not showing a duration when it was less than one second. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2261)
++ Fixed some incorrect boxes in the GUI editor. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2260)
 
 ### Technical Details
 
@@ -600,6 +622,10 @@
 + Visitor rarities from the repository are now exposed to the code in a cleaner way. - Luna (https://github.com/hannibal002/SkyHanni/pull/2220)
 + Added automatic PR labeling for bug fixes. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2203)
 + Deprecated some methods in RegexUtils, and added some others. - Empa (https://github.com/hannibal002/SkyHanni/pull/2160)
++ Fixed ScoreboardData Line formatting with doubled color codes. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2264)
++ Changed "colour" to "color" internally, everywhere. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2258)
++ Added renderRenderableDouble. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2260)
+    + A direct replacement for renderStringsAndItems.
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 24ee5a43c569..2723c2be8ca3 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -217,6 +217,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Optionally show the different stat values compared to the current reforge.
 + Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
     + Can be enabled/disabled on the Item Number list.
++ Added Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
 
 </details>
 <details open><summary>
@@ -1271,6 +1272,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added Option to crash your game when you die, for extra suffering. - Stella (https://github.com/hannibal002/SkyHanni/pull/2238)
     + Also punishes players who don't read patch notes.
 + Added Crown of Avarice counter. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2229)
++ Added a title notification for when the Thunder Bottle is fully charged. - raven (https://github.com/hannibal002/SkyHanni/pull/2234)
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index b2d9c2623dcc..9d12fbdbe931 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.18",
+    version = "0.26.Beta.19",
 )
 class SkyHanniMod {
 

From e5c50a337a7064d8649e9749a9f0480d2044db67 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 28 Jul 2024 17:32:44 +0200
Subject: [PATCH 156/721] Fix: Hypixel error negative magma cubes (#2267)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/gui/customscoreboard/ScoreboardPattern.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index fb574d3d0d1b..20914000e540 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -438,9 +438,14 @@ object ScoreboardPattern {
         "wintereventwave",
         "(§.)*Wave \\d+$",
     )
+
+    /**
+     * REGEX-TEST: Magma Cubes Left: §c-4
+     * REGEX-TEST: Magma Cubes Left: §c3
+     */
     val winterMagmaLeftPattern by eventsSb.pattern(
         "wintereventmagmaleft",
-        "(§.)*Magma Cubes Left: §.\\d+$",
+        "(§.)*Magma Cubes Left: §.-?\\d+$",
     )
     val winterTotalDmgPattern by eventsSb.pattern(
         "wintereventtotaldmg",

From bdb69aa9120a2da5b23fa5d91114f6d3dfce888f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 28 Jul 2024 17:40:04 +0200
Subject: [PATCH 157/721] added regex test

---
 src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
index 51240ecd3243..88daf40b9520 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
@@ -94,6 +94,10 @@ object QuiverAPI {
     // Bows that don't use the players arrows, checked using the SkyBlock ID
     private val fakeBowsPattern by group.pattern("fakebows", "^(BOSS_SPIRIT_BOW|CRYPT_BOW)$")
     private val quiverInventoryNamePattern by group.pattern("quivername", "^Quiver$")
+
+    /**
+     * REGEX-TEST: §7Active Arrow: §fFlint Arrow §7(§e2880§7)
+     */
     private val quiverInventoryPattern by group.pattern(
         "quiver.inventory",
         "§7Active Arrow: §.(?<type>.*) §7\\(§e(?<amount>.*)§7\\)"

From bb0c06318c8434b048bc8a38b795e6770de7e874 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 28 Jul 2024 23:36:55 +0200
Subject: [PATCH 158/721] Fix: Config Typo (#2271)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/features/inventory/ItemPickupLogConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
index 24dc1dc11a5f..8a8ede78dc4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
@@ -35,7 +35,7 @@ public class ItemPickupLogConfig {
     public boolean shorten = false;
 
     @Expose
-    @ConfigOption(name = "Sacks", desc = "Show items added and removed from stacks.")
+    @ConfigOption(name = "Sacks", desc = "Show items added and removed from sacks.")
     @ConfigEditorBoolean
     public boolean sack = false;
 

From 38d2445ba87e20e2456523ea7f792631adecd10a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 28 Jul 2024 23:37:56 +0200
Subject: [PATCH 159/721] Fixed unnecessary icon

---
 .../skyhanni/config/features/inventory/ItemPickupLogConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
index 8a8ede78dc4c..5574049897d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLogConfig.java
@@ -47,7 +47,7 @@ public class ItemPickupLogConfig {
     @Expose
     @ConfigOption(
         name = "Alignment",
-        desc = "How the item pickup log should be aligned. §d:3"
+        desc = "How the item pickup log should be aligned."
     )
     @ConfigEditorDropdown
     public RenderUtils.VerticalAlignment alignment = RenderUtils.VerticalAlignment.TOP;

From db5ec7f5046ea6f531a2f560b198cd8c24b36ec5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 29 Jul 2024 19:50:40 +0200
Subject: [PATCH 160/721] Fix: Fixed small typos in FF guide. (#2273)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/fortuneguide/pages/OverviewPage.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index 13b74a59cf27..c002284ab072 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -137,7 +137,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.REFORGE_ARMOR.bar(
                 "§2$wordArmor Reforge",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's reforge\n$moreInfo"
-                else "§7§2Reforge fortune from your\n$armorName}",
+                else "§7§2Reforge fortune from your\n$armorName",
             ),
         )
 
@@ -146,7 +146,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.ENCHANT_ARMOR.bar(
                 "§2$wordArmor Enchantment",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's enchantments\n$moreInfo"
-                else "§7§2Enchantment fortune from your\n$armorName}",
+                else "§7§2Enchantment fortune from your\n$armorName",
             ),
         )
 
@@ -155,7 +155,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
             FFInfos.GEMSTONE_ARMOR.bar(
                 "§2$wordArmor Gemstones",
                 if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's gemstones\n$moreInfo"
-                else "§7§2Gemstone fortune from your\n$armorName}",
+                else "§7§2Gemstone fortune from your\n$armorName",
             ),
         )
 

From a3c940937bccd9f92acdc3ad2abe8e39e71ca847 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:28:05 +0200
Subject: [PATCH 161/721] Improvement: Fewer Tab list chat errors (#2266)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/storage/PlayerSpecificStorage.java |  3 ++
 .../at/hannibal2/skyhanni/data/HypixelData.kt |  1 +
 .../skyhanni/data/ProfileStorageData.kt       | 52 ++++++++++++-------
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/PlayerSpecificStorage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/PlayerSpecificStorage.java
index 171cb82b1b38..c3b949c79235 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/PlayerSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/PlayerSpecificStorage.java
@@ -22,6 +22,9 @@ public class PlayerSpecificStorage {
     @Expose
     public Boolean useRomanNumerals = true;
 
+    @Expose
+    public Boolean multipleProfiles = false;
+
     @Expose
     public Integer gardenCommunityUpgrade = -1;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index dbcf1276047a..bc43a807e02e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -293,6 +293,7 @@ object HypixelData {
             if (profileName == newProfile) return
             profileName = newProfile
             ProfileJoinEvent(newProfile).postAndCatch()
+            ProfileStorageData.profileJoinMessage()
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
index 18211ccd8637..ad119804baed 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.HypixelJoinEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -32,6 +33,7 @@ object ProfileStorageData {
 
     private var sackPlayers: SackData.PlayerSpecific? = null
     var sackProfiles: SackData.ProfileSpecific? = null
+    var hypixelDataLoaded = false
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onProfileJoin(event: ProfileJoinEvent) {
@@ -84,24 +86,28 @@ object ProfileStorageData {
         if (!LorenzUtils.inSkyBlock) return
         if (noTabListTime == SimpleTimeMark.farPast()) return
 
-        if (noTabListTime.passedSince() > 3.seconds) {
-            noTabListTime = SimpleTimeMark.now()
-            val foundSkyBlockTabList = TabListData.getTabList().any { it.contains("§b§lArea:") }
-            if (foundSkyBlockTabList) {
-                ChatUtils.clickableChat(
-                    "§cCan not read profile name from tab list! Open /widget and enable Profile Widget. " +
-                        "This is needed for the mod to function! And therefore this warning cannot be disabled",
-                    onClick = {
-                        HypixelCommands.widget()
-                    },
-                    "§eClick to run /widget!",
-                )
-            } else {
-                ChatUtils.chat(
-                    "§cExtra Information from Tab list not found! " +
-                        "Enable it: SkyBlock Menu ➜ Settings ➜ Personal ➜ User Interface ➜ Player List Info",
-                )
-            }
+        playerSpecific?.let {
+            // do not try to load the data when hypixel has not yet send the profile loaded message
+            if (it.multipleProfiles && !hypixelDataLoaded) return
+        }
+
+        if (noTabListTime.passedSince() < 5.seconds) return
+        noTabListTime = SimpleTimeMark.now()
+        val foundSkyBlockTabList = TabListData.getTabList().any { it.contains("§b§lArea:") }
+        if (foundSkyBlockTabList) {
+            ChatUtils.clickableChat(
+                "§cCan not read profile name from tab list! Open /widget and enable Profile Widget. " +
+                    "This is needed for the mod to function! And therefore this warning cannot be disabled",
+                onClick = {
+                    HypixelCommands.widget()
+                },
+                "§eClick to run /widget!",
+            )
+        } else {
+            ChatUtils.chat(
+                "§cExtra Information from Tab list not found! " +
+                    "Enable it: SkyBlock Menu ➜ Settings ➜ Personal ➜ User Interface ➜ Player List Info",
+            )
         }
     }
 
@@ -124,4 +130,14 @@ object ProfileStorageData {
         sackPlayers = SkyHanniMod.sackData.players.getOrPut(playerUuid) { SackData.PlayerSpecific() }
         ConfigLoadEvent().postAndCatch()
     }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        hypixelDataLoaded = false
+    }
+
+    fun profileJoinMessage() {
+        hypixelDataLoaded = true
+        playerSpecific?.multipleProfiles = true
+    }
 }

From 14adb676724cac2bdd900cb878dcc2a5a2d2d739 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:28:46 +0200
Subject: [PATCH 162/721] Fix: Hotm wrong max Powder if disabled (#2269)

---
 src/main/java/at/hannibal2/skyhanni/data/HotmData.kt  | 11 +++++++----
 .../skyhanni/features/mining/PowderPerHotmPerk.kt     | 10 +++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 1775cdeeb144..1d9ca38271e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -36,7 +36,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.ceil
 import kotlin.math.pow
 
-
 private fun calculatePeakOfTheMountainLoot(level: Int): Map<HotmReward, Double> = buildMap {
     for (i in 1..level) {
         when (i) {
@@ -52,7 +51,6 @@ private fun calculatePeakOfTheMountainLoot(level: Int): Map<HotmReward, Double>
     }
 }
 
-
 enum class HotmData(
     val guiName: String,
     val maxLevel: Int,
@@ -359,17 +357,22 @@ enum class HotmData(
 
     val printName = name.allLettersFirstUppercase()
 
+    /** Level which are actually paid with powder (does exclude [blueEgg]*/
     val rawLevel: Int
         get() = storage?.perks?.get(this.name)?.level ?: 0
 
+    /** Level for which the effect that is present (considers [enabled] and [blueEgg])*/
     var activeLevel: Int
-        get() = if (enabled) storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0 else 0
+        get() = if (enabled) effectivLevel else 0
         private set(value) {
             storage?.perks?.computeIfAbsent(this.name) { HotmTree.HotmPerk() }?.level = value.minus(blueEgg())
         }
 
+    /** Level that considering [blueEgg]*/
+    val effectivLevel: Int get() = storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0
+
     val isMaxLevel: Boolean
-        get() = activeLevel >= maxLevel // >= to account for +1 from Blue Cheese
+        get() = effectivLevel >= maxLevel // >= to account for +1 from Blue Cheese
 
     private fun blueEgg() = if (this != PEAK_OF_THE_MOUNTAIN && maxLevel != 1 && HotmAPI.isBlueEggActive) 1 else 0
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
index 4acf5f3ad804..702a24f673cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
@@ -40,19 +40,19 @@ object PowderPerHotmPerk {
         if (indexOfCost == -1) return
 
         val powderFor10Levels =
-            perk.calculateTotalCost(perk.activeLevel + 10) - perk.calculateTotalCost(perk.activeLevel)
+            perk.calculateTotalCost(perk.rawLevel + 10) - perk.calculateTotalCost(perk.rawLevel)
 
         event.toolTip.add(indexOfCost + 2, "§7Powder for 10 levels: §e${powderFor10Levels.addSeparators()}")
     }
 
     private fun handlePowderSpend(perk: HotmData): String {
-        val currentPowderSpend = perk.calculateTotalCost(perk.activeLevel)
+        val currentPowderSpend = perk.calculateTotalCost(perk.rawLevel)
         val maxPowderNeeded = perk.totalCostMaxLevel
         val percentage = (currentPowderSpend.fractionOf(maxPowderNeeded) * 100).round(2)
 
         return when (config.powderSpentDesign) {
             PowderSpentDesign.NUMBER -> {
-                if (perk.activeLevel == perk.maxLevel) {
+                if (perk.rawLevel == perk.maxLevel) {
                     "§7Powder spent: §e${maxPowderNeeded.addSeparators()} §7(§aMax level§7)"
                 } else {
                     "§7Powder spent: §e${currentPowderSpend.addSeparators()}§7 / §e${maxPowderNeeded.addSeparators()}"
@@ -60,7 +60,7 @@ object PowderPerHotmPerk {
             }
 
             PowderSpentDesign.PERCENTAGE -> {
-                if (perk.activeLevel == perk.maxLevel) {
+                if (perk.rawLevel == perk.maxLevel) {
                     "§7Powder spent: §e$percentage% §7(§aMax level§7)"
                 } else {
                     "§7Powder spent: §e$percentage%§7 of max"
@@ -68,7 +68,7 @@ object PowderPerHotmPerk {
             }
 
             PowderSpentDesign.NUMBER_AND_PERCENTAGE -> {
-                if (perk.activeLevel == perk.maxLevel) {
+                if (perk.rawLevel == perk.maxLevel) {
                     "§7Powder spent: §e${maxPowderNeeded.addSeparators()} §7(§aMax level§7)"
                 } else {
                     "§7Powder spent: §e${currentPowderSpend.addSeparators()}§7/§e${maxPowderNeeded.addSeparators()}§7 (§e$percentage%§7)"

From bacc6a3a845311e0e079957423cede7544d298b8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:29:01 +0200
Subject: [PATCH 163/721] Fix: NPE in CorpseLocator (#2268)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
index 7a93d528d830..f7fdcad4d9a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
@@ -48,7 +48,7 @@ object CorpseLocator {
                 entity.showArms && entity.hasNoBasePlate() && !entity.isInvisible
             }
             .forEach { entity ->
-                val helmetName = entity.getCurrentArmor(3).getInternalName()
+                val helmetName = entity.getCurrentArmor(3)?.getInternalName() ?: return
                 val corpseType = MineshaftWaypointType.getByHelmetOrNull(helmetName) ?: return
 
                 val canSee = entity.getLorenzVec().canBeSeen(-1..3)

From 47c059081aa202b45d84f02e0b85a3579142fdac Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 30 Jul 2024 05:06:16 -0400
Subject: [PATCH 164/721] Feature: Stray Rabbit Tracker (#2210)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |   5 +
 .../ChocolateFactoryConfig.java               |  10 +
 .../storage/ProfileSpecificStorage.java       |   4 +
 .../ChocolateFactoryStrayTracker.kt           | 315 ++++++++++++++++++
 4 files changed, 334 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index c08595b5bf80..6dd8db8ad710 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -51,6 +51,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
 import at.hannibal2.skyhanni.features.garden.pests.PestFinder
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
@@ -272,6 +273,10 @@ object Commands {
             "shresetseacreaturetracker",
             "Resets the Sea Creature Tracker",
         ) { SeaCreatureTracker.resetCommand() }
+        registerCommand(
+            "shresetstrayrabbittracker",
+            "Resets the Stray Rabbit Tracker",
+        ) { ChocolateFactoryStrayTracker.resetCommand() }
         registerCommand(
             "shfandomwiki",
             "Searches the fandom wiki with SkyHanni's own method.",
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 c381444df5b9..e35bc4d7e790 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
@@ -221,4 +221,14 @@ public class ChocolateFactoryConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean mythicRabbitRequirement = false;
+
+    @Expose
+    @ConfigOption(name = "Stray Tracker", desc = "Track stray rabbits found in the Chocolate Factory menu.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean strayRabbitTracker = true;
+
+    @Expose
+    @ConfigLink(owner = ChocolateFactoryConfig.class, field = "strayRabbitTracker")
+    public Position strayRabbitTrackerPosition = new Position(300, 300, false, true);
 }
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 b49a9c612fca..3410d9b4de08 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -28,6 +28,7 @@
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker;
 import at.hannibal2.skyhanni.features.garden.pests.VinylType;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker;
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryUpgrade;
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
@@ -151,6 +152,9 @@ public static class PositionChange {
 
         @Expose
         public Integer hoppityShopYearOpened = null;
+
+        @Expose
+        public ChocolateFactoryStrayTracker.Data strayTracker = new ChocolateFactoryStrayTracker.Data();
     }
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
new file mode 100644
index 000000000000..5dd90a82b47b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -0,0 +1,315 @@
+package at.hannibal2.skyhanni.features.inventory.chocolatefactory
+
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
+import at.hannibal2.skyhanni.utils.tracker.TrackerData
+import com.google.gson.annotations.Expose
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object ChocolateFactoryStrayTracker {
+
+    private val config get() = ChocolateFactoryAPI.config
+    private var claimedStraysSlots = mutableListOf<Int>()
+
+    /**
+     * REGEX-TEST: §9Zero §d§lCAUGHT!
+     * REGEX-TEST: §6§lGolden Rabbit §d§lCAUGHT!
+     * REGEX-TEST: §fAudi §d§lCAUGHT!
+     */
+    private val strayCaughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.caught",
+        "^§[a-f0-9].* §d§lCAUGHT!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §fMandy §7and §7gained §6+283,574 Chocolate§7!
+     * REGEX-TEST: §7You caught a stray §aSven §7and gained §7§6+397,004 Chocolate§7!'
+     */
+    private val strayLorePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.loreinfo",
+        "§7You caught a stray (?<rabbit>(?<name>§[^§]*)) .* (?:§7)?§6\\+(?<amount>[\\d,]*) Chocolate§7!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You gained §6+13,566,571 Chocolate§7!
+     */
+    private val goldenStrayJackpotMountainPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.goldenrawchoc",
+        "§7You caught a stray §6§lGolden Rabbit§7! §7You gained §6\\+(?<amount>[\\d,]*) Chocolate§7!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught a glimpse of §6El Dorado§7, §7but he escaped and left behind §7§6313,780 Chocolate§7!
+     */
+    private val goldenStrayDoradoEscape by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.goldendoradoescape",
+        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught a glimpse of §6El Dorado§7, §7but he escaped and left behind §7§6\\+(?<amount>[\\d,]*) Chocolate§7!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado §7- quite the elusive rabbit!
+     */
+    private val goldenStrayDoradoCaught by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.goldendoradocaught",
+        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado §7- quite the elusive rabbit!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado§7! Since you §7already have captured him before, §7you gained §6+324,364,585 Chocolate§7.
+     */
+    private val goldenStrayDoradoDuplicate by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.goldendoradoduplicate",
+        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado§7! Since you §7already have captured him before, §7you gained §6\\+(?<amount>[\\d,]*) Chocolate§7.",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You gained §6+5 Chocolate §7until the §7end of the SkyBlock year!
+     *
+     */
+    private val goldenStrayClick by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.goldenclick",
+        "§7You caught a stray §6§lGolden Rabbit§7! §7You gained §6\\+5 Chocolate §7until the §7end of the SkyBlock year!",
+    )
+
+    /**
+     * REGEX-TEST: §7You caught a stray §9Fish the Rabbit§7! §7You have already found §9Fish the §9Rabbit§7, so you received §655,935,257 §6Chocolate§7!
+     */
+    private val fishTheRabbitPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.fish",
+        "§7You caught a stray (?<color>§.)Fish the Rabbit§7! §7You have already found (?:§.)?Fish the (?:§.)?Rabbit§7, so you received §6(?<amount>[\\d,]*) (?:§6)?Chocolate§7!",
+    )
+
+    private val rarityFormatMap = mapOf(
+        "common" to "§f",
+        "uncommon" to "§a",
+        "rare" to "§9",
+        "epic" to "§5",
+        "legendary" to "§6",
+    )
+
+    private val tracker = SkyHanniTracker("Stray Tracker", { Data() }, { it.chocolateFactory.strayTracker })
+    { drawDisplay(it) }
+
+    class Data : TrackerData() {
+        override fun reset() {
+            straysCaught.clear()
+            straysExtraChocMs.clear()
+            goldenTypesCaught.clear()
+        }
+
+        @Expose
+        var straysCaught: MutableMap<String, Int> = mutableMapOf()
+
+        @Expose
+        var straysExtraChocMs: MutableMap<String, Long> = mutableMapOf()
+
+        @Expose
+        var goldenTypesCaught: MutableMap<String, Int> = mutableMapOf()
+    }
+
+    private fun formLoreToSingleLine(lore: List<String>): String {
+        val notEmptyLines = lore.filter { it.isNotEmpty() }
+        return notEmptyLines.joinToString(" ")
+    }
+
+    private fun incrementRarity(rarity: String, chocAmount: Long = 0) {
+        tracker.modify { it.straysCaught.addOrPut(rarity, 1) }
+        val extraTime = ChocolateFactoryAPI.timeUntilNeed(chocAmount + 1)
+        tracker.modify { it.straysExtraChocMs.addOrPut(rarity, extraTime.inWholeMilliseconds) }
+    }
+
+    private fun incrementGoldenType(typeCaught: String, amount: Int = 1) {
+        tracker.modify { it.goldenTypesCaught.addOrPut(typeCaught, amount) }
+    }
+
+    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
+        val extraChocMs = data.straysExtraChocMs.values.sum().milliseconds
+        val formattedExtraTime = extraChocMs.let { if (it == 0.milliseconds) "0s" else it.format() }
+
+        addAsSingletonList(
+            Renderable.hoverTips(
+                "§6§lStray Tracker",
+                tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"),
+            ),
+        )
+        rarityFormatMap.keys.forEach { rarity ->
+            extractHoverableOfRarity(rarity, data)?.let { addAsSingletonList(it) }
+        }
+    }
+
+    private fun extractHoverableOfRarity(rarity: String, data: Data): Renderable? {
+        val caughtOfRarity = data.straysCaught[rarity]
+        val caughtString = caughtOfRarity?.toString() ?: return null
+
+        val rarityExtraChocMs = data.straysExtraChocMs[rarity]?.milliseconds
+        val extraChocFormat = rarityExtraChocMs?.format() ?: ""
+
+        val colorCode = rarityFormatMap[rarity] ?: ""
+        val lineHeader = "$colorCode${rarity.substring(0, 1).uppercase()}${rarity.substring(1)}§7: §r$colorCode"
+        val lineFormat = "${lineHeader}${caughtString}"
+
+        return rarityExtraChocMs?.let {
+            val tip =
+                "§a+§b$extraChocFormat §afrom $colorCode$rarity strays§7${if (rarity == "legendary") extractGoldenTypesCaught(data) else ""}"
+            Renderable.hoverTips(Renderable.string(lineFormat), tips = tip.split("\n"))
+        } ?: Renderable.string(lineFormat)
+    }
+
+    private fun extractGoldenTypesCaught(data: Data): String {
+        val goldenList = mutableListOf<String>()
+        data.goldenTypesCaught["sidedish"]?.let {
+            goldenList.add("§b$it §6Side Dish" + if (it > 1) "es" else "")
+        }
+        data.goldenTypesCaught["jackpot"]?.let {
+            goldenList.add("§b$it §6Chocolate Jackpot" + if (it > 1) "s" else "")
+        }
+        data.goldenTypesCaught["mountain"]?.let {
+            goldenList.add("§b$it §6Chocolate Mountain" + if (it > 1) "s" else "")
+        }
+        data.goldenTypesCaught["dorado"]?.let {
+            goldenList.add((if (it >= 3) "§a" else "§b") + "$it§7/§a3 §6El Dorado §7Sighting" + if (it > 1) "s" else "")
+        }
+        data.goldenTypesCaught["stampede"]?.let {
+            goldenList.add("§b$it §6Stampede" + if (it > 1) "s" else "")
+        }
+        data.goldenTypesCaught["goldenclick"]?.let {
+            goldenList.add("§b$it §6Golden Click" + if (it > 1) "s" else "")
+        }
+        return if (goldenList.size == 0) "" else ("\n" + goldenList.joinToString("\n"))
+    }
+
+    @SubscribeEvent
+    fun onTick(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        InventoryUtils.getItemsInOpenChest().filter {
+            !claimedStraysSlots.contains(it.slotIndex)
+        }.forEach {
+            strayCaughtPattern.matchMatcher(it.stack.name) {
+                if (it.stack.getLore().isEmpty()) return
+                claimedStraysSlots.add(it.slotIndex)
+                val loreLine = formLoreToSingleLine(it.stack.getLore())
+
+                // "Base" strays - Common -> Epic, raw choc only reward.
+                strayLorePattern.matchMatcher(loreLine) {
+                    //Pretty sure base strays max at Epic, but...
+                    val rarity = rarityFormatMap.entries.find { e -> e.value == group("rabbit").substring(0, 2) }?.key ?: "common"
+                    incrementRarity(rarity, group("amount").formatLong())
+                }
+
+                // Fish the Rabbit
+                fishTheRabbitPattern.matchMatcher(loreLine) {
+                    //Also fairly sure that Fish maxes out at Rare, but...
+                    val rarity = rarityFormatMap.entries.find { e -> e.value == group("color").substring(0, 2) }?.key ?: "common"
+                    incrementRarity(rarity, group("amount").formatLong())
+                }
+
+                // Golden Strays, Jackpot and Mountain, raw choc only reward.
+                goldenStrayJackpotMountainPattern.matchMatcher(loreLine) {
+                    val amount = group("amount").formatLong().also { am -> incrementRarity("legendary", am) }
+                    val multiplier = amount / ChocolateFactoryAPI.chocolatePerSecond
+                    when (multiplier) {
+                        in 479.0..481.0 -> incrementGoldenType("jackpot")
+                        in 1499.0..1501.0 -> incrementGoldenType("mountain")
+                    }
+                }
+
+                // Golden Strays, "Golden Click"
+                goldenStrayClick.matchMatcher(loreLine) {
+                    incrementGoldenType("goldenclick")
+                }
+
+                // Golden Strays, hoard/stampede
+                if (loreLine == "§7You caught a stray §6§lGolden Rabbit§7! §7A hoard of §aStray Rabbits §7has appeared!") {
+                    incrementGoldenType("stampede")
+                }
+
+                // Golden Strays, El Dorado "glimpse" - 1/3 before capture
+                goldenStrayDoradoEscape.matchMatcher(loreLine) {
+                    incrementRarity("legendary", group("amount").formatLong())
+                    incrementGoldenType("dorado")
+                }
+
+                // Golden Strays, El Dorado caught - 3/3
+                if (goldenStrayDoradoCaught.matches(loreLine)) {
+                    incrementRarity("legendary")
+                    tracker.modify { t -> t.goldenTypesCaught["dorado"] = 3 }
+                }
+
+                // Golden Strays, El Dorado (duplicate catch)
+                goldenStrayDoradoDuplicate.matchMatcher(loreLine) {
+                    incrementRarity("legendary", group("amount").formatLong())
+                    tracker.modify { t ->
+                        t.goldenTypesCaught["dorado"] = t.goldenTypesCaught["dorado"]?.plus(1) ?: 4
+                    }
+                }
+            }
+        }
+        InventoryUtils.getItemsInOpenChest().filter {
+            claimedStraysSlots.contains(it.slotIndex)
+        }.forEach {
+            if (!strayCaughtPattern.matches(it.stack.name)) {
+                claimedStraysSlots.removeAt(claimedStraysSlots.indexOf(it.slotIndex))
+            }
+        }
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!isEnabled()) return
+        val index = event.slot?.slotIndex ?: return
+        if (index == -999) return
+        if (claimedStraysSlots.contains(index)) return
+
+        val clickedStack = InventoryUtils.getItemsInOpenChest()
+            .find { it.slotNumber == event.slot.slotNumber && it.hasStack }
+            ?.stack ?: return
+        val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
+        if (!nameText.equals("§6§lGolden Rabbit §8- §aSide Dish")) return
+
+        claimedStraysSlots.add(index)
+        incrementGoldenType("sidedish")
+        incrementRarity("legendary", 0)
+        DelayedRun.runDelayed(1.seconds) {
+            claimedStraysSlots.remove(claimedStraysSlots.indexOf(index))
+        }
+    }
+
+    @SubscribeEvent
+    fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        tracker.renderDisplay(config.strayRabbitTrackerPosition)
+    }
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
+        if (!isEnabled()) return
+        tracker.firstUpdate()
+    }
+
+    fun resetCommand() {
+        tracker.resetCommand()
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.strayRabbitTracker && ChocolateFactoryAPI.inChocolateFactory
+}

From 9edcf44987a1ef394d170f1980dd005fca1c1693 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:18:57 +0200
Subject: [PATCH 165/721] Backend: Updated getting active Mayor from API
 (#2227)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MayorAPI.kt    | 40 ++++++++-----------
 .../java/at/hannibal2/skyhanni/data/Mayors.kt | 24 +++++------
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index 1c759a17d6f7..c484f40714e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.Mayor.Companion.addPerks
 import at.hannibal2.skyhanni.data.Mayor.Companion.getMayorFromPerk
-import at.hannibal2.skyhanni.data.Mayor.Companion.setAssumeMayor
 import at.hannibal2.skyhanni.data.Mayor.Companion.setAssumeMayorJson
 import at.hannibal2.skyhanni.data.Perk.Companion.getPerkFromName
 import at.hannibal2.skyhanni.data.jsonobjects.other.MayorCandidate
@@ -105,13 +105,13 @@ object MayorAPI {
 
     /**
      * @param input: The name of the mayor
-     * @return: The neu color of the mayor; If no mayor was found, it will return "§c"
+     * @return: The NotEnoughUpdates color of the mayor; If no mayor was found, it will return "§c"
      */
     fun mayorNameToColorCode(input: String): String = Mayor.getMayorFromName(input)?.color ?: "§c"
 
     /**
      * @param input: The name of the mayor
-     * @return: The neu color of the mayor + the name of the mayor; If no mayor was found, it will return "§c[input]"
+     * @return: The NotEnoughUpdates color of the mayor + the name of the mayor; If no mayor was found, it will return "§c[input]"
      */
     fun mayorNameWithColorCode(input: String) = mayorNameToColorCode(input) + input
 
@@ -159,15 +159,14 @@ object MayorAPI {
 
         if (!calendarGuiPattern.matches(event.inventoryName)) return
 
-        val stack: ItemStack =
-            event.inventoryItems.values.firstOrNull { jerryHeadPattern.matches(it.displayName) } ?: return
+        val stack: ItemStack = event.inventoryItems.values.firstOrNull { jerryHeadPattern.matches(it.displayName) } ?: return
 
         val perk = stack.getLore().nextAfter({ perkpocalypsePerksPattern.matches(it) }) ?: return
-        // This is one Perk of the Perkpocalypse Mayor
+        // This is the first Perk of the Perkpocalypse Mayor
         val jerryMayor = getMayorFromPerk(getPerkFromName(perk.removeColor()) ?: return)?.addAllPerks() ?: return
 
         val lastMayorTimestamp = nextMayorTimestamp - SKYBLOCK_YEAR_MILLIS.milliseconds
-          
+
         val expireTime = (1..21)
             .map { lastMayorTimestamp + (6.hours * it) }
             .firstOrNull { it.isInFuture() }
@@ -195,20 +194,11 @@ object MayorAPI {
         nextMayorTimestamp = calculateNextMayorTime()
     }
 
-    private fun checkCurrentMayor() {
-        val nextMayorTime = calculateNextMayorTime()
-
-        // Check if it is still the mayor from the old SkyBlock year
-        currentMayor = candidates[nextMayorTime.toSkyBlockTime().year - 1]?.let {
-            if (it.name == lastMayor?.name) return
-
-            // TODO: Once Jerry is active, add the sub mayor perks in here
-            setAssumeMayorJson(it.name, it.perks)
+    private fun checkHypixelAPI(forceReload: Boolean = false) {
+        if (!forceReload) {
+            if (lastUpdate.passedSince() < 20.minutes) return
+            if (currentMayor == Mayor.UNKNOWN && lastUpdate.passedSince() < 1.minutes) return
         }
-    }
-
-    private fun checkHypixelAPI() {
-        if (lastUpdate.passedSince() < 20.minutes || (currentMayor == Mayor.UNKNOWN && lastUpdate.passedSince() < 1.minutes)) return
         lastUpdate = SimpleTimeMark.now()
 
         SkyHanniMod.coroutineScope.launch {
@@ -222,7 +212,11 @@ object MayorAPI {
                 map put data.current.getPairs()
             }
             candidates = map
-            checkCurrentMayor()
+
+            val currentMayorName = data.mayor.name
+            if (lastMayor?.name != currentMayorName) {
+                currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks)
+            }
         }
     }
 
@@ -236,9 +230,9 @@ object MayorAPI {
             val mayor = SkyHanniMod.feature.dev.debug.assumeMayor.get()
 
             if (mayor == Mayor.DISABLED) {
-                checkCurrentMayor()
+                checkHypixelAPI(forceReload = true)
             } else {
-                mayor.setAssumeMayor(mayor.perks.toList())
+                mayor.addPerks(mayor.perks.toList())
                 currentMayor = mayor
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index b2ac98b3289f..975282a3abc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -16,7 +16,7 @@ enum class Mayor(
         "§3",
         Perk.SLASHED_PRICING,
         Perk.SLAYER_XP_BUFF,
-        Perk.PATHFINDER
+        Perk.PATHFINDER,
     ),
     COLE(
         "Cole",
@@ -24,7 +24,7 @@ enum class Mayor(
         Perk.PROSPECTION,
         Perk.MINING_XP_BUFF,
         Perk.MINING_FIESTA,
-        Perk.MOLTEN_FORGE
+        Perk.MOLTEN_FORGE,
     ),
     DIANA(
         "Diana",
@@ -32,7 +32,7 @@ enum class Mayor(
         Perk.LUCKY,
         Perk.MYTHOLOGICAL_RITUAL,
         Perk.PET_XP_BUFF,
-        Perk.SHARING_IS_CARING
+        Perk.SHARING_IS_CARING,
     ),
     DIAZ(
         "Diaz",
@@ -40,7 +40,7 @@ enum class Mayor(
         Perk.VOLUME_TRADING,
         Perk.SHOPPING_SPREE,
         Perk.STOCK_EXCHANGE,
-        Perk.LONG_TERM_INVESTMENT
+        Perk.LONG_TERM_INVESTMENT,
     ),
     FINNEGAN(
         "Finnegan",
@@ -48,7 +48,7 @@ enum class Mayor(
         Perk.FARMING_SIMULATOR,
         Perk.PELT_POCALYPSE,
         Perk.GOATED,
-        Perk.BLOOMING_BUSINESS
+        Perk.BLOOMING_BUSINESS,
     ),
     FOXY(
         "Foxy",
@@ -66,28 +66,28 @@ enum class Mayor(
         Perk.FISHING_XP_BUFF,
         Perk.LUCK_OF_THE_SEA,
         Perk.FISHING_FESTIVAL,
-        Perk.DOUBLE_TROUBLE
+        Perk.DOUBLE_TROUBLE,
     ),
     PAUL(
         "Paul",
         "§c",
         Perk.MARAUDER,
         Perk.EZPZ,
-        Perk.BENEDICTION
+        Perk.BENEDICTION,
     ),
 
     SCORPIUS(
         "Scorpius",
         "§d",
         Perk.BRIBE,
-        Perk.DARKER_AUCTIONS
+        Perk.DARKER_AUCTIONS,
     ),
     JERRY(
         "Jerry",
         "§d",
         Perk.PERKPOCALYPSE,
         Perk.STATSPOCALYPSE,
-        Perk.JERRYPOCALYPSE
+        Perk.JERRYPOCALYPSE,
     ),
     DERPY(
         "Derpy",
@@ -95,7 +95,7 @@ enum class Mayor(
         Perk.TURBO_MINIONS,
         Perk.AH_TAX,
         Perk.DOUBLE_MOBS_HP,
-        Perk.MOAR_SKILLZ
+        Perk.MOAR_SKILLZ,
     ),
 
     UNKNOWN("Unknown", "§c"),
@@ -136,11 +136,11 @@ enum class Mayor(
                 Perk.entries.firstOrNull { it.perkName == perk.renameIfFoxyExtraEventPerkFound() }
             }
 
-            mayor.setAssumeMayor(perks)
+            mayor.addPerks(perks)
             return mayor
         }
 
-        fun Mayor.setAssumeMayor(perks: List<Perk>) {
+        fun Mayor.addPerks(perks: List<Perk>) {
             perks.forEach { it.isActive = false }
             activePerks.clear()
             for (perk in perks.filter { perks.contains(it) }) {

From 29682879dd0375d83e27fb07084e0822945d8e3f Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 30 Jul 2024 05:41:20 -0400
Subject: [PATCH 166/721] Improvement: Powder Mining Chat Filter V2 (#2152)

---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |   2 +-
 .../features/chat/FilterTypesConfig.java      |  13 +-
 .../chat/PowderMiningFilterConfig.java        | 116 ++++++
 .../PowderMiningGemstoneFilterConfig.java     |  62 +++
 .../skyhanni/features/chat/ChatFilter.kt      |  47 ++-
 .../features/chat/PowderMiningChatFilter.kt   | 385 ++++++++++++++++++
 6 files changed, 600 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 04ab9f69f891..d42dfbbbf670 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 51
+    const val CONFIG_VERSION = 52
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
index c87102b5b9bc..0187af82eac6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
@@ -2,11 +2,17 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class FilterTypesConfig {
 
+    @Expose
+    @ConfigOption(name = "Powder Mining", desc = "")
+    @Accordion
+    public PowderMiningFilterConfig powderMiningFilter = new PowderMiningFilterConfig();
+
     @Expose
     @ConfigOption(name = "Hypixel Lobbies", desc = "Hide announcements in Hypixel lobbies " +
         "(player joins, loot boxes, prototype lobby messages, radiating generosity, Hypixel tournaments)")
@@ -50,13 +56,6 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean winterGift = false;
 
-    @Expose
-    @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in the Crystal Hollows. " +
-        "(except powder numbers over 1k, essence numbers over 2, Prehistoric Eggs, and Automaton Parts)")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean powderMining = false;
-
     @Expose
     @ConfigOption(name = "Kill Combo", desc = "Hide messages about your Kill Combo from the Grandma Wolf pet.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
new file mode 100644
index 000000000000..7eb2f19b8a0f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
@@ -0,0 +1,116 @@
+package at.hannibal2.skyhanni.config.features.chat;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.ASCENSION_ROPE;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.JUNGLE_HEART;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.OIL_BARREL;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.SLUDGE_JUICE;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.TREASURITE;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.WISHING_COMPASS;
+import static at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.YOGGIE;
+
+public class PowderMiningFilterConfig {
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Hide messages while opening chests in the Crystal Hollows.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(
+        name = "Powder", desc = "Hide §dGemstone §7and §aMithril §7Powder rewards under a certain amount." +
+        "\n§a0§7: §aShow all\n§c60000§7: §cHide all"
+    )
+    @ConfigEditorSlider(minValue = 0, maxValue = 60000, minStep = 500)
+    public int powderFilterThreshold = 1000;
+
+    @Expose
+    @ConfigOption(
+        name = "Essence", desc = "Hide §6Gold §7and §bDiamond §7Essence rewards under a certain amount." +
+        "\n§a0§7: §aShow all\n§c20§7: §cHide all"
+    )
+    @ConfigEditorSlider(minValue = 0, maxValue = 20, minStep = 1)
+    public int essenceFilterThreshold = 5;
+
+    public enum SimplePowderMiningRewardTypes {
+
+        ASCENSION_ROPE("§9Ascension Rope"),
+        WISHING_COMPASS("§aWishing Compass"),
+        OIL_BARREL("§aOil Barrel"),
+        PREHISTORIC_EGG("§fPrehistoric Egg"),
+        PICKONIMBUS("§5Pickonimbus 2000"),
+        JUNGLE_HEART("§6Jungle Heart"),
+        SLUDGE_JUICE("§aSludge Juice"),
+        YOGGIE("§aYoggie"),
+        ROBOT_PARTS("§9Robot Parts"),
+        TREASURITE("§5Treasurite"),
+        ;
+
+        private final String name;
+
+        SimplePowderMiningRewardTypes(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+    @Expose
+    @ConfigOption(name = "Common Items", desc = "Hide reward messages for listed items.")
+    @ConfigEditorDraggableList
+    public List<SimplePowderMiningRewardTypes> simplePowderMiningTypes = new ArrayList<>(Arrays.asList(
+        ASCENSION_ROPE,
+        WISHING_COMPASS,
+        OIL_BARREL,
+        JUNGLE_HEART,
+        SLUDGE_JUICE,
+        YOGGIE,
+        TREASURITE
+    ));
+
+    @Expose
+    @ConfigOption(name = "Goblin Egg", desc = "Hide Goblin Egg rewards that are below a certain rarity.")
+    @ConfigEditorDropdown
+    public GoblinEggFilterEntry goblinEggs = GoblinEggFilterEntry.YELLOW_UP;
+
+    public enum GoblinEggFilterEntry {
+        SHOW_ALL("Show all"),
+        HIDE_ALL("Hide all"),
+        GREEN_UP("Show §aGreen §7and up"),
+        YELLOW_UP("Show §eYellow §7and up"),
+        RED_UP("Show §cRed §7and up"),
+        BLUE_ONLY("Show §3Blue §7only");
+
+        private final String name;
+
+        GoblinEggFilterEntry(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+    @Expose
+    @ConfigOption(name = "Gemstones", desc = "")
+    @Accordion
+    public PowderMiningGemstoneFilterConfig gemstoneFilterConfig = new PowderMiningGemstoneFilterConfig();
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
new file mode 100644
index 000000000000..2b4936af1ecf
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
@@ -0,0 +1,62 @@
+package at.hannibal2.skyhanni.config.features.chat;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class PowderMiningGemstoneFilterConfig {
+
+    @Expose
+    @ConfigOption(name = "Stronger Tool Messages", desc = "Hide 'You need a stronger tool..' messages.")
+    @ConfigEditorBoolean
+    public boolean strongerToolMessages = true;
+
+    @Expose
+    @ConfigOption(name = "Ruby", desc = "Hide Ruby gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry rubyGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    @Expose
+    @ConfigOption(name = "Sapphire", desc = "Hide Sapphire gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry sapphireGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    @Expose
+    @ConfigOption(name = "Amber", desc = "Hide Amber gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry amberGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    @Expose
+    @ConfigOption(name = "Amethyst", desc = "Hide Amethyst gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry amethystGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    @Expose
+    @ConfigOption(name = "Jade", desc = "Hide Jade gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry jadeGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    @Expose
+    @ConfigOption(name = "Topaz", desc = "Hide Topaz gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry topazGemstones = GemstoneFilterEntry.FINE_ONLY;
+
+    public enum GemstoneFilterEntry {
+        SHOW_ALL("Show All"),
+        HIDE_ALL("Hide all"),
+        FLAWED_UP("Show §aFlawed §7or higher"),
+        FINE_ONLY("Show §9Fine §7only");
+
+        private final String str;
+
+        GemstoneFilterEntry(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index bc14934abe2e..a4ffb7e7e4c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -4,13 +4,18 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.chat.PowderMiningChatFilter.genericMiningRewardMessage
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Pattern
 
@@ -324,20 +329,6 @@ object ChatFilter {
         "§cThis gift is for §r.*§r§c, sorry!".toPattern(),
     )
 
-    // Powder Mining
-    private val powderMiningPatterns = listOf(
-        "§cYou need a stronger tool to mine (Amethyst|Ruby|Jade|Amber|Sapphire|Topaz) Gemstone Block§r§c.".toPattern(),
-        "§aYou received §r§f\\d* §r§f[❤❈☘⸕✎✧] Rough (Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone§r§a\\.".toPattern(),
-        "§aYou received §r§f\\d §r§a[❤❈☘⸕✎✧] Flawed (Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone§r§a\\.".toPattern(),
-
-        // Jungle
-        "§aYou received §r§f\\d* §r§aSludge Juice§r§a\\.".toPattern(),
-
-        // Useful, maybe in another chat
-        "§aYou received §r§b\\+\\d{1,3} §r§a(Mithril|Gemstone) Powder.".toPattern(),
-        "§aYou received §r(§6|§b)\\+[1-2] (Diamond|Gold) Essence§r§a.".toPattern(),
-    )
-
     private val fireSalePattern by RepoPattern.pattern(
         "chat.firesale",
         "§6§k§lA§r §c§lFIRE SALE §r§6§k§lA(?:\\n|.)*",
@@ -428,7 +419,6 @@ object ChatFilter {
         "winter_island" to winterIslandPatterns,
         "annoying_spam" to annoyingSpamPatterns,
         "winter_gift" to winterGiftPatterns,
-        "powder_mining" to powderMiningPatterns,
         "fire_sale" to fireSalePatterns,
         "event" to eventPatterns,
         "factory_upgrade" to factoryUpgradePatterns,
@@ -469,7 +459,8 @@ object ChatFilter {
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
-        val blockReason = block(event.message)
+        var blockReason = block(event.message)
+        if (blockReason == "" && config.powderMiningFilter.enabled) blockReason = powderMiningBlock(event)
         if (blockReason == "") return
 
         event.blockedReason = blockReason
@@ -494,7 +485,6 @@ object ChatFilter {
         config.others && isOthers(message) -> othersMsg
 
         config.winterGift && message.isPresent("winter_gift") -> "winter_gift"
-        config.powderMining && message.isPresent("powder_mining") -> "powder_mining"
         config.eventLevelUp && (message.isPresent("event") || StringUtils.isEmpty(message)) -> "event"
         config.fireSale && (fireSalePattern.matches(message) || message.isPresent("fire_sale")) -> "fire_sale"
         config.factoryUpgrade && message.isPresent("factory_upgrade") -> "factory_upgrade"
@@ -509,6 +499,28 @@ object ChatFilter {
         else -> ""
     }
 
+    /**
+     * Checks if the message is a blocked powder mining message, as defined in PowderMiningChatFilter.
+     * Will modify un-filtered Mining rewards, or return a resultant blocking code
+     * @param event The event to check
+     * @return Block reason if applicable
+     * @see block
+     */
+    private fun powderMiningBlock(event: LorenzChatEvent): String {
+        val powderMiningMatchResult = PowderMiningChatFilter.block(event.message)
+        if (powderMiningMatchResult == "no_filter") {
+            genericMiningRewardMessage.matchMatcher(event.message) {
+                val reward = groupOrNull("reward") ?: ""
+                val amountFormat = groupOrNull("amount")?.let {
+                    "§a+ §b$it§r"
+                } ?: "§a+§r"
+                event.chatComponent = ChatComponentText("$amountFormat $reward")
+            }
+            return ""
+        }
+        return powderMiningMatchResult
+    }
+
     private var othersMsg = ""
 
     /**
@@ -565,5 +577,6 @@ object ChatFilter {
         event.move(3, "chat.killCombo", "chat.filterType.killCombo")
         event.move(3, "chat.profileJoin", "chat.filterType.profileJoin")
         event.move(3, "chat.others", "chat.filterType.others")
+        event.move(52, "chat.filterType.powderMining", "chat.filterType.powderMiningFilter.enabled")
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
new file mode 100644
index 000000000000..600a615ae954
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -0,0 +1,385 @@
+package at.hannibal2.skyhanni.features.chat
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.ASCENSION_ROPE
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.JUNGLE_HEART
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.OIL_BARREL
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.PICKONIMBUS
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.PREHISTORIC_EGG
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.ROBOT_PARTS
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.SLUDGE_JUICE
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.TREASURITE
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.WISHING_COMPASS
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.YOGGIE
+import at.hannibal2.skyhanni.config.features.chat.PowderMiningGemstoneFilterConfig.GemstoneFilterEntry
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+
+@SkyHanniModule
+object PowderMiningChatFilter {
+
+    private val config get() = SkyHanniMod.feature.chat.filterType.powderMiningFilter
+    private val gemstoneConfig get() = config.gemstoneFilterConfig
+
+    val patternGroup = RepoPattern.group("filter.powdermining")
+
+    private var unclosedRewards = false
+
+    /**
+     * REGEX-TEST: §aYou uncovered a treasure chest!
+     */
+    private val uncoverChestPattern by patternGroup.pattern(
+        "warning.chestuncover",
+        "§aYou uncovered a treasure chest!",
+    )
+
+    /**
+     * REGEX-TEST: §6You have successfully picked the lock on this chest!
+     */
+    private val successfulPickPattern by patternGroup.pattern(
+        "warning.successpick",
+        "§6You have successfully picked the lock on this chest!",
+    )
+
+    /**
+     * REGEX-TEST: §cYou need a tool with a §r§aBreaking Power §r§cof §r§66§r§c to mine Ruby Gemstone Block§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!
+     */
+    private val breakingPowerPattern by patternGroup.pattern(
+        "warning.breakingpower",
+        "§cYou need a tool with a §r§aBreaking Power §r§cof (?:§.)*\\d+§r§c to mine (Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone Block§r§c!.+",
+    )
+
+    /**
+     * REGEX-TEST: §e§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬
+     * REGEX-TEST: §d§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬
+     */
+    private val chestWrapperPattern by patternGroup.pattern(
+        "powder.chestwrapper",
+        "^§[ed]§l▬{64}\$",
+    )
+
+    /**
+     * REGEX-TEST:   §r§6§lCHEST LOCKPICKED
+     */
+    private val lockPickedPattern by patternGroup.pattern(
+        "powder.picked",
+        ".*§r§6§lCHEST LOCKPICKED.*",
+    )
+
+    /**
+     * REGEX-TEST:   §r§5§lLOOT CHEST COLLECTED
+     */
+    private val lootChestCollectedPattern by patternGroup.pattern(
+        "lootchest.collected",
+        ".*§r§5§lLOOT CHEST COLLECTED.*",
+    )
+
+    /**
+     * REGEX-TEST:   §r§a§lREWARDS
+     */
+    private val rewardHeaderPattern by patternGroup.pattern(
+        "reward.header",
+        ".*§r§[af]§lREWARDS.*",
+    )
+
+    /**
+     * REGEX-TEST:    §r§a§r§aGreen Goblin Egg
+     * REGEX-TEST:    §r§9Goblin Egg
+     * REGEX-TEST:    §r§dDiamond Essence
+     * REGEX-TEST:    §r§dGold Essence
+     * REGEX-TEST:    §r§dGold Essence §r§8x3
+     * REGEX-TEST:    §r§dGemstone Powder §r§8x537
+     * REGEX-TEST:    §r§dDiamond Essence §r§8x2
+     * REGEX-TEST:    §r§2Mithril Powder §r§8x153
+     * REGEX-TEST:    §r§5Treasurite
+     * REGEX-TEST:    §r§f⸕ Rough Amber Gemstone §r§8x24
+     * REGEX-TEST:    §r§f❤ Rough Ruby Gemstone §r§8x24
+     * REGEX-TEST:    §r§f❈ Rough Amethyst Gemstone §r§8x24
+     * REGEX-TEST:    §r§9§r§eYellow Goblin Egg
+     * REGEX-TEST:    §r§a⸕ Flawed Amber Gemstone
+     * REGEX-TEST:    §r§aWishing Compass §r§8x3
+     * REGEX-TEST:    §r§a⸕ Flawed Amber Gemstone §r§8x2
+     */
+    val genericMiningRewardMessage by patternGroup.pattern(
+        "reward.generic",
+        " {4}(?<reward>§.+?[^§]*)(?: §r§8x(?<amount>[\\d,]+))?\$",
+    )
+
+    /**
+     * REGEX-TEST: §r§2Mithril Powder §r§8x153
+     * REGEX-TEST: §r§dGemstone Powder §r§8x537
+     */
+    private val powderRewardPattern by patternGroup.pattern(
+        "reward.powder",
+        "§r§[d2](?:Gemstone|Mithril) Powder( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§dGold Essence
+     * REGEX-TEST: §r§dGold Essence §r§8x3
+     * REGEX-TEST: §r§dDiamond Essence §r§8x2
+     * REGEX-TEST: §r§dDiamond Essence
+     */
+    private val essenceRewardPattern by patternGroup.pattern(
+        "reward.essence",
+        "§r§d(?:Gold|Diamond) Essence( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§9Ascension Rope
+     */
+    private val ascensionRopeRewardPattern by patternGroup.pattern(
+        "reward.ascensionrope",
+        "§r§9Ascension Rope( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§aWishing Compass
+     */
+    private val wishingCompassRewardPattern by patternGroup.pattern(
+        "reward.wishingcompass",
+        "§r§aWishing Compass( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§aOil Barrel
+     */
+    private val oilBarrelRewardPattern by patternGroup.pattern(
+        "reward.oilbarrel",
+        "§r§aOil Barrel( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§fPrehistoric Egg
+     */
+    private val prehistoricEggPattern by patternGroup.pattern(
+        "reward.prehistoricegg",
+        "§r§fPrehistoric Egg( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§5Pickonimbus 2000
+     */
+    private val pickonimbusPattern by patternGroup.pattern(
+        "reward.pickonimbus",
+        "§r§5Pickonimbus 2000( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§6Jungle Heart
+     */
+    private val jungleHeartPattern by patternGroup.pattern(
+        "reward.jungleheart",
+        "§r§6Jungle Heart( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§aSludge Juice
+     */
+    private val sludgeJuicePattern by patternGroup.pattern(
+        "reward.sludgejuice",
+        "§r§aSludge Juice( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§aYoggie
+     */
+    private val yoggiePattern by patternGroup.pattern(
+        "reward.yoggie",
+        "§r§aYoggie( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§9FTX 3070
+     * REGEX-TEST: §r§9Synthetic Heart
+     * REGEX-TEST: §r§9Control Switch
+     * REGEX-TEST: §r§9Robotron Reflector
+     * REGEX-TEST: §r§9Electron Transmitter
+     * REGEX-TEST: §r§9Superlite Motor
+     */
+    private val robotPartsPattern by patternGroup.pattern(
+        "reward.robotparts",
+        "§r§9(?:FTX 3070|Synthetic Heart|Control Switch|Robotron Reflector|Electron Transmitter|Superlite Motor)( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§5Treasurite
+     */
+    private val treasuritePattern by patternGroup.pattern(
+        "reward.treasurite",
+        "§r§5Treasurite( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§9§r§cRed Goblin Egg
+     * REGEX-TEST: §r§9§r§3Blue Goblin Egg
+     * REGEX-TEST: §r§9Goblin Egg
+     * REGEX-TEST: §r§9Goblin Egg §r§8x2
+     * REGEX-TEST: §r§a§r§aGreen Goblin Egg
+     * REGEX-TEST: §r§9§r§eYellow Goblin Egg
+     */
+    private val goblinEggPattern by patternGroup.pattern(
+        "reward.goblineggs",
+        "(?:§.)*(?<color>[a-zA-Z]+)? ?Goblin Egg( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    /**
+     * REGEX-TEST: §r§f❈ Rough Amethyst Gemstone §r§8x24
+     * REGEX-TEST: §r§a❈ Flawed Amethyst Gemstone §r§8x4
+     * REGEX-TEST: §r§9⸕ Fine Amber Gemstone
+     */
+    private val gemstonePattern by patternGroup.pattern(
+        "reward.gemstone",
+        "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
+    )
+
+    fun block(message: String): String {
+        // Generic "you uncovered a chest" message
+        if (uncoverChestPattern.matches(message)) return "powder_mining_chest"
+        if (successfulPickPattern.matches(message)) return "powder_mining_picked"
+        // Breaking power warning
+        if (breakingPowerPattern.matches(message) && gemstoneConfig.strongerToolMessages) return "stronger_tool"
+        // Closing or opening a reward 'loop' with the spam of ▬
+        if (chestWrapperPattern.matches(message)) {
+            unclosedRewards = !unclosedRewards
+            return "reward_wrapper"
+        }
+
+        if (!unclosedRewards) return ""
+        if (lockPickedPattern.matches(message)) return "powder_chest_lockpicked"
+        if (lootChestCollectedPattern.matches(message)) return "loot_chest_opened"
+        if (rewardHeaderPattern.matches((message))) return "powder_reward_header"
+
+        // All powder and loot chest rewards start with 4 spaces
+        // To simplify regex statements, this check is done outside
+        val ssMessage = message.takeIf { it.startsWith("    ") }?.substring(4) ?: return ""
+
+        //Powder
+        powderRewardPattern.matchMatcher(ssMessage) {
+            if (config.powderFilterThreshold == 60000) return "powder_mining_powder"
+            val amountStr = groupOrNull("amount") ?: "1"
+            if (amountStr.isNotEmpty() && config.powderFilterThreshold > 0) {
+                val amountParsed = amountStr.replace(",", "").toInt()
+                return if (amountParsed < config.powderFilterThreshold) "powder_mining_powder"
+                else "no_filter"
+            }
+        }
+
+        //Essence
+        essenceRewardPattern.matchMatcher(ssMessage) {
+            if (config.essenceFilterThreshold == 20) return "powder_mining_essence"
+            val amountStr = groupOrNull("amount") ?: "1"
+            if (amountStr.isNotEmpty() && config.essenceFilterThreshold > 0) {
+                val amountParsed = amountStr.toInt()
+                return if (amountParsed < config.essenceFilterThreshold) "powder_mining_essence"
+                else "no_filter"
+            }
+        }
+
+        blockSimpleRewards(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
+        blockGoblinEggs(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
+        blockGemstones(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
+
+        //Fallback default
+        return ""
+    }
+
+    private fun blockSimpleRewards(ssMessage: String): String {
+        val rewardPatterns = mapOf(
+            ascensionRopeRewardPattern to ASCENSION_ROPE to "powder_mining_ascension_rope",
+            wishingCompassRewardPattern to WISHING_COMPASS to "powder_mining_wishing_compass",
+            oilBarrelRewardPattern to OIL_BARREL to "powder_mining_oil_barrel",
+            prehistoricEggPattern to PREHISTORIC_EGG to "powder_mining_prehistoric_egg",
+            pickonimbusPattern to PICKONIMBUS to "powder_mining_pickonimbus",
+            jungleHeartPattern to JUNGLE_HEART to "powder_mining_jungle_heart",
+            sludgeJuicePattern to SLUDGE_JUICE to "powder_mining_sludge_juice",
+            yoggiePattern to YOGGIE to "powder_mining_yoggie",
+            robotPartsPattern to ROBOT_PARTS to "powder_mining_robot_parts",
+            treasuritePattern to TREASURITE to "powder_mining_treasurite",
+        )
+        for ((patternToReward, returnReason) in rewardPatterns) {
+            if (patternToReward.first.matches(ssMessage)) {
+                return if (config.simplePowderMiningTypes.contains(patternToReward.second)) returnReason
+                else "no_filter"
+            }
+        }
+        return ""
+    }
+
+    private fun blockGoblinEggs(ssMessage: String): String {
+        goblinEggPattern.matchMatcher(ssMessage) {
+            if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.SHOW_ALL) return "no_filter"
+            if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.HIDE_ALL) return "powder_mining_goblin_eggs"
+
+            val colorStr = groupOrNull("color")?.lowercase() ?: ""
+            return when (colorStr) {
+                //'Colorless', base goblin eggs will never be shown in this code path
+                "" -> "powder_mining_goblin_eggs"
+                "green" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.GREEN_UP) {
+                    "powder_mining_goblin_eggs"
+                } else "no_filter"
+                "yellow" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.YELLOW_UP) {
+                    "powder_mining_goblin_eggs"
+                } else "no_filter"
+                "red" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.RED_UP) {
+                    "powder_mining_goblin_eggs"
+                } else "no_filter"
+                // BLUE_ONLY enum not explicitly used in comparison, as the only
+                // case that will block it is HIDE_ALL, which is covered above
+                "blue" -> "no_filter"
+                else -> {
+                    ErrorManager.logErrorWithData(
+                        NoSuchElementException(),
+                        "Unknown Goblin Egg color detected in Powder Mining Filter: '${colorStr}' - please report this in the Discord!",
+                        noStackTrace = true
+                    )
+                    "no_filter"
+                }
+            }
+        }
+        return ""
+    }
+
+    private fun blockGemstones(ssMessage: String): String {
+        gemstonePattern.matchMatcher(ssMessage) {
+            val gemStr = groupOrNull("gem")?.lowercase() ?: ""
+            val tierStr = groupOrNull("tier")?.lowercase() ?: ""
+
+            //Theoretically impossible but ?
+            if (gemStr.isEmpty() || tierStr.isEmpty()) return ""
+
+            val gemSpecificFilterEntry = when (gemStr) {
+                "ruby" -> gemstoneConfig.rubyGemstones
+                "sapphire" -> gemstoneConfig.sapphireGemstones
+                "amber" -> gemstoneConfig.amberGemstones
+                "amethyst" -> gemstoneConfig.amethystGemstones
+                "jade" -> gemstoneConfig.jadeGemstones
+                "topaz" -> gemstoneConfig.topazGemstones
+                //Failure case that should never be reached
+                else -> return "no_filter"
+            }
+
+            if (gemSpecificFilterEntry == GemstoneFilterEntry.HIDE_ALL) return "powder_mining_gemstones"
+
+            return when (tierStr) {
+                // Never allowed through, except for in SHOW_ALL,
+                // which is handled above
+                "rough" -> "powder_mining_gemstones"
+                "flawed" -> if (gemSpecificFilterEntry > GemstoneFilterEntry.FLAWED_UP) {
+                    "powder_mining_gemstones"
+                } else "no_filter"
+                // FINE_ONLY enum not explicitly used in comparison, as the only
+                // case that will block it is HIDE_ALL, which is covered above
+                "fine" -> "no_filter"
+                // This should not be reachable
+                else -> "no_filter"
+            }
+        }
+        return ""
+    }
+}

From 9a7d509cf07542ae23bda0b15ba27f22955b1e51 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:42:13 +0200
Subject: [PATCH 167/721] use null instead of empty string

---
 .../skyhanni/features/chat/ChatFilter.kt      | 20 ++++-----
 .../features/chat/PowderMiningChatFilter.kt   | 41 +++++++++----------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index a4ffb7e7e4c6..3f2897aaede0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -9,7 +9,6 @@ import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -460,10 +459,9 @@ object ChatFilter {
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         var blockReason = block(event.message)
-        if (blockReason == "" && config.powderMiningFilter.enabled) blockReason = powderMiningBlock(event)
-        if (blockReason == "") return
+        if (blockReason == null && config.powderMiningFilter.enabled) blockReason = powderMiningBlock(event)
 
-        event.blockedReason = blockReason
+        event.blockedReason = blockReason ?: return
     }
 
     /**
@@ -471,7 +469,7 @@ object ChatFilter {
      * @param message The message to check
      * @return The reason why the message was blocked, empty if not blocked
      */
-    private fun block(message: String): String = when {
+    private fun block(message: String): String? = when {
         config.hypixelHub && message.isPresent("lobby") -> "lobby"
         config.empty && StringUtils.isEmpty(message) -> "empty"
         config.warping && message.isPresent("warping") -> "warping"
@@ -496,7 +494,7 @@ object ChatFilter {
         dungeonConfig.soloStats && DungeonAPI.inDungeon() && message.isPresent("solo_stats") -> "solo_stats"
         dungeonConfig.fairy && DungeonAPI.inDungeon() && message.isPresent("fairy") -> "fairy"
 
-        else -> ""
+        else -> null
     }
 
     /**
@@ -506,7 +504,7 @@ object ChatFilter {
      * @return Block reason if applicable
      * @see block
      */
-    private fun powderMiningBlock(event: LorenzChatEvent): String {
+    private fun powderMiningBlock(event: LorenzChatEvent): String? {
         val powderMiningMatchResult = PowderMiningChatFilter.block(event.message)
         if (powderMiningMatchResult == "no_filter") {
             genericMiningRewardMessage.matchMatcher(event.message) {
@@ -516,12 +514,12 @@ object ChatFilter {
                 } ?: "§a+§r"
                 event.chatComponent = ChatComponentText("$amountFormat $reward")
             }
-            return ""
+            return null
         }
         return powderMiningMatchResult
     }
 
-    private var othersMsg = ""
+    private var othersMsg: String? = null
 
     /**
      * Checks if the message is an "other" message.
@@ -544,9 +542,9 @@ object ChatFilter {
             message.isPresent("winter_island") -> "winter_island"
             message.isPresent("useless_warning") -> "useless_warning"
             message.isPresent("annoying_spam") -> "annoying_spam"
-            else -> ""
+            else -> null
         }
-        return othersMsg != ""
+        return othersMsg != null
     }
 
     /**
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 600a615ae954..1d414cea484b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -238,7 +238,7 @@ object PowderMiningChatFilter {
         "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
     )
 
-    fun block(message: String): String {
+    fun block(message: String): String? {
         // Generic "you uncovered a chest" message
         if (uncoverChestPattern.matches(message)) return "powder_mining_chest"
         if (successfulPickPattern.matches(message)) return "powder_mining_picked"
@@ -250,14 +250,14 @@ object PowderMiningChatFilter {
             return "reward_wrapper"
         }
 
-        if (!unclosedRewards) return ""
+        if (!unclosedRewards) return null
         if (lockPickedPattern.matches(message)) return "powder_chest_lockpicked"
         if (lootChestCollectedPattern.matches(message)) return "loot_chest_opened"
         if (rewardHeaderPattern.matches((message))) return "powder_reward_header"
 
         // All powder and loot chest rewards start with 4 spaces
         // To simplify regex statements, this check is done outside
-        val ssMessage = message.takeIf { it.startsWith("    ") }?.substring(4) ?: return ""
+        val ssMessage = message.takeIf { it.startsWith("    ") }?.substring(4) ?: return null
 
         //Powder
         powderRewardPattern.matchMatcher(ssMessage) {
@@ -281,15 +281,15 @@ object PowderMiningChatFilter {
             }
         }
 
-        blockSimpleRewards(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
-        blockGoblinEggs(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
-        blockGemstones(ssMessage).takeIf { it.isNotEmpty() }?.let { return it }
+        blockSimpleRewards(ssMessage)?.let { return it }
+        blockGoblinEggs(ssMessage)?.let { return it }
+        blockGemstones(ssMessage)?.let { return it }
 
         //Fallback default
-        return ""
+        return null
     }
 
-    private fun blockSimpleRewards(ssMessage: String): String {
+    private fun blockSimpleRewards(ssMessage: String): String? {
         val rewardPatterns = mapOf(
             ascensionRopeRewardPattern to ASCENSION_ROPE to "powder_mining_ascension_rope",
             wishingCompassRewardPattern to WISHING_COMPASS to "powder_mining_wishing_compass",
@@ -308,24 +308,26 @@ object PowderMiningChatFilter {
                 else "no_filter"
             }
         }
-        return ""
+        return null
     }
 
-    private fun blockGoblinEggs(ssMessage: String): String {
+    private fun blockGoblinEggs(ssMessage: String): String? {
         goblinEggPattern.matchMatcher(ssMessage) {
             if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.SHOW_ALL) return "no_filter"
             if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.HIDE_ALL) return "powder_mining_goblin_eggs"
 
-            val colorStr = groupOrNull("color")?.lowercase() ?: ""
+            val colorStr = groupOrNull("color")?.lowercase()
             return when (colorStr) {
                 //'Colorless', base goblin eggs will never be shown in this code path
-                "" -> "powder_mining_goblin_eggs"
+                null -> "powder_mining_goblin_eggs"
                 "green" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.GREEN_UP) {
                     "powder_mining_goblin_eggs"
                 } else "no_filter"
+
                 "yellow" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.YELLOW_UP) {
                     "powder_mining_goblin_eggs"
                 } else "no_filter"
+
                 "red" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.RED_UP) {
                     "powder_mining_goblin_eggs"
                 } else "no_filter"
@@ -336,22 +338,19 @@ object PowderMiningChatFilter {
                     ErrorManager.logErrorWithData(
                         NoSuchElementException(),
                         "Unknown Goblin Egg color detected in Powder Mining Filter: '${colorStr}' - please report this in the Discord!",
-                        noStackTrace = true
+                        noStackTrace = true,
                     )
                     "no_filter"
                 }
             }
         }
-        return ""
+        return null
     }
 
-    private fun blockGemstones(ssMessage: String): String {
+    private fun blockGemstones(ssMessage: String): String? {
         gemstonePattern.matchMatcher(ssMessage) {
-            val gemStr = groupOrNull("gem")?.lowercase() ?: ""
-            val tierStr = groupOrNull("tier")?.lowercase() ?: ""
-
-            //Theoretically impossible but ?
-            if (gemStr.isEmpty() || tierStr.isEmpty()) return ""
+            val gemStr = groupOrNull("gem")?.lowercase() ?: return null
+            val tierStr = groupOrNull("tier")?.lowercase() ?: return null
 
             val gemSpecificFilterEntry = when (gemStr) {
                 "ruby" -> gemstoneConfig.rubyGemstones
@@ -380,6 +379,6 @@ object PowderMiningChatFilter {
                 else -> "no_filter"
             }
         }
-        return ""
+        return null
     }
 }

From 34649cff17d412c936eb13e27aaf0f1e939b763e Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:47:19 +0200
Subject: [PATCH 168/721] Fix: TunnelMaps values not clearing on lobby swap
 (#2275)

---
 .../skyhanni/features/mining/TunnelsMaps.kt   | 125 +++++++++++-------
 1 file changed, 80 insertions(+), 45 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 2f4ad54769af..b3e7c56c180b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -110,13 +111,13 @@ object TunnelsMaps {
     }
 
     private val oldGemstonePattern by RepoPattern.pattern(
-        "mining.tunnels.maps.gem.old", ".*(?:Ruby|Amethyst|Jade|Sapphire|Amber|Topaz).*"
+        "mining.tunnels.maps.gem.old", ".*(?:Ruby|Amethyst|Jade|Sapphire|Amber|Topaz).*",
     )
     private val newGemstonePattern by RepoPattern.pattern(
-        "mining.tunnels.maps.gem.new", ".*(?:Aquamarine|Onyx|Citrine|Peridot).*"
+        "mining.tunnels.maps.gem.new", ".*(?:Aquamarine|Onyx|Citrine|Peridot).*",
     )
     private val commissionInvPattern by RepoPattern.pattern(
-        "mining.commission.inventory", "Commissions"
+        "mining.commission.inventory", "Commissions",
     )
 
     /**
@@ -125,19 +126,19 @@ object TunnelsMaps {
      */
     private val glacitePattern by RepoPattern.pattern(
         "mining.commisson.reward.glacite",
-        "§7- §b[\\d,]+ Glacite Powder"
+        "§7- §b[\\d,]+ Glacite Powder",
     )
     private val collectorCommissionPattern by RepoPattern.pattern(
         "mining.commisson.collector",
-        "§9(?<what>\\w+(?: \\w+)?) Collector"
+        "§9(?<what>\\w+(?: \\w+)?) Collector",
     )
     private val invalidGoalPattern by RepoPattern.pattern(
         "mining.commisson.collector.invalid",
-        "Glacite|Scrap"
+        "Glacite|Scrap",
     )
     private val completedPattern by RepoPattern.pattern(
         "mining.commisson.completed",
-        "§a§lCOMPLETED"
+        "§a§lCOMPLETED",
     )
 
     private val translateTable = mutableMapOf<String, String>()
@@ -170,7 +171,7 @@ object TunnelsMaps {
                     "Unknown Collection Commission: $type", "$type can't be found in the graph.",
                     "type" to type,
                     "graphNames" to possibleLocations.keys,
-                    "lore" to lore
+                    "lore" to lore,
                 )
                 null
             } else {
@@ -234,7 +235,7 @@ object TunnelsMaps {
     fun onConfigLoad(event: ConfigLoadEvent) {
         onToggle(
             config.compactGemstone,
-            config.excludeFairy
+            config.excludeFairy,
         ) {
             locationDisplay = generateLocationsDisplay()
         }
@@ -247,21 +248,31 @@ object TunnelsMaps {
             if (active.isNotEmpty()) {
                 if (goal == campfire && active != campfire.name) {
                     add(Renderable.string("§6Override for ${campfire.name}"))
-                    add(Renderable.clickable(Renderable.string("§eMake §f$active §eactive"), onClick = {
-                        goal = getNext()
-                    }))
+                    add(
+                        Renderable.clickable(
+                            Renderable.string("§eMake §f$active §eactive"),
+                            onClick = {
+                                goal = getNext()
+                            },
+                        ),
+                    )
                 } else {
                     add(
                         Renderable.clickAndHover(
                             Renderable.string("§6Active: §f$active"),
                             listOf("§eClick to disable current Waypoint"),
-                            onClick = ::clearPath
-                        )
+                            onClick = ::clearPath,
+                        ),
                     )
                     if (hasNext()) {
-                        add(Renderable.clickable(Renderable.string("§eNext Spot"), onClick = {
-                            goal = getNext()
-                        }))
+                        add(
+                            Renderable.clickable(
+                                Renderable.string("§eNext Spot"),
+                                onClick = {
+                                    goal = getNext()
+                                },
+                            ),
+                        )
                     } else {
                         add(Renderable.string(""))
                     }
@@ -279,45 +290,61 @@ object TunnelsMaps {
         add(Renderable.string("§6Locations:"))
         add(
             Renderable.multiClickAndHover(
-                campfire.name!!, listOf(
-                    "§eLeft Click to set active", "§eRight Click for override"
-                ), click = mapOf(
-                    0 to guiSetActive(campfire.name!!), 1 to ::campfireOverride
-                )
-            )
+                campfire.name!!,
+                listOf(
+                    "§eLeft Click to set active", "§eRight Click for override",
+                ),
+                click = mapOf(
+                    0 to guiSetActive(campfire.name!!), 1 to ::campfireOverride,
+                ),
+            ),
         )
         if (!config.excludeFairy.get()) {
-            add(Renderable.hoverable(Renderable.horizontalContainer(listOf(Renderable.string("§dFairy Souls")) + fairySouls.map {
-                val name = it.key.removePrefix("§dFairy Soul ")
-                Renderable.clickable(Renderable.string("§d[${name}]"), onClick = guiSetActive(it.key))
-            }), Renderable.string("§dFairy Souls")))
+            add(
+                Renderable.hoverable(
+                    Renderable.horizontalContainer(
+                        listOf(Renderable.string("§dFairy Souls")) + fairySouls.map {
+                            val name = it.key.removePrefix("§dFairy Soul ")
+                            Renderable.clickable(Renderable.string("§d[${name}]"), onClick = guiSetActive(it.key))
+                        },
+                    ),
+                    Renderable.string("§dFairy Souls"),
+                ),
+            )
         }
         if (config.compactGemstone.get()) {
             add(
                 Renderable.table(
                     listOf(
-                        newGemstones.map(::toCompactGemstoneName), oldGemstones.map(::toCompactGemstoneName)
-                    )
-                )
+                        newGemstones.map(::toCompactGemstoneName), oldGemstones.map(::toCompactGemstoneName),
+                    ),
+                ),
             )
         } else {
-            addAll(newGemstones.map {
-                Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
-            })
-            addAll(oldGemstones.map {
-                Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
-            })
+            addAll(
+                newGemstones.map {
+                    Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
+                },
+            )
+            addAll(
+                oldGemstones.map {
+                    Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
+                },
+            )
         }
-        addAll(normalLocations.map {
-            Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
-        })
+        addAll(
+            normalLocations.map {
+                Renderable.clickable(Renderable.string(it.key), onClick = guiSetActive(it.key))
+            },
+        )
     }
 
     private fun toCompactGemstoneName(it: Map.Entry<String, List<GraphNode>>): Renderable = Renderable.clickAndHover(
-        Renderable.string((it.key.getFirstColorCode()?.let { "§$it" } ?: "") + ("ROUGH_".plus(
-            it.key.removeColor().removeSuffix("stone")
-        ).asInternalName().itemName.takeWhile { it != ' ' }.removeColor()),
-            horizontalAlign = RenderUtils.HorizontalAlignment.CENTER
+        Renderable.string(
+            (it.key.getFirstColorCode()?.let { "§$it" } ?: "") + ("ROUGH_".plus(
+                it.key.removeColor().removeSuffix("stone"),
+            ).asInternalName().itemName.takeWhile { it != ' ' }.removeColor()),
+            horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
         ),
         tips = listOf(it.key),
         onClick = guiSetActive(it.key),
@@ -400,7 +427,7 @@ object TunnelsMaps {
             config.pathWidth.toInt(),
             true,
             bezierPoint = 2.0,
-            textSize = config.textSize.toDouble()
+            textSize = config.textSize.toDouble(),
         )
         event.drawDynamicText(
             if (config.distanceFirst) {
@@ -410,7 +437,7 @@ object TunnelsMaps {
             }.position,
             "§e${path.second.roundToInt()}m",
             config.textSize.toDouble(),
-            yOff = 10f
+            yOff = 10f,
         )
     }
 
@@ -455,6 +482,14 @@ object TunnelsMaps {
         }
     }
 
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        if (closedNote == null) return // Value that must be none null if it was active
+        closedNote = null
+        clearPath()
+        cooldowns.clear()
+    }
+
     private var nextSpotDelay = SimpleTimeMark.farPast()
 
     private fun nextSpotKey(event: LorenzKeyPressEvent) {

From 2b722de68f5c17481ac4c24c03a2f952623be4a9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:34:25 +0200
Subject: [PATCH 169/721] Version 0.26 Beta 20

---
 build.gradle.kts                                   |  2 +-
 docs/CHANGELOG.md                                  | 10 ++++++++++
 docs/FEATURES.md                                   |  1 +
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 424cbf29f8d2..9081713ef050 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.19"
+version = "0.26.Beta.20"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index c576caf0bc42..35b272a88530 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -66,6 +66,7 @@
     + Warns when using the Egglocator without having a Mythic Rabbit Pet selected.
 + Flash your screen when a special stray rabbit appears. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2040)
     + Option to also flash on normal stray rabbits.
++ Added a tracker for stray rabbits caught in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2210)
 
 #### Mining Features
 
@@ -218,6 +219,7 @@
     + The configuration option to manually specify this has been removed.
 + Added different display options for mining powder in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1442)
 + Added Left Click on Royal Pigeon for next spot in Tunnel Maps. - Empa (https://github.com/hannibal002/SkyHanni/pull/2181)
++ Overhauled the Powder Mining chat filter to be much more customizable. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2152)
 
 #### Commands Improvements
 
@@ -304,6 +306,7 @@
 + Added a reset button in the config for the appearance and event priority of the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2141)
 + Reverted item source names to shorter format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2233)
 + Rounded corner smoothness now applies to custom Scoreboard textures. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2228)
++ Reduced the frequency of "tab list not found" error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2266)
 
 ### Fixes
 
@@ -335,6 +338,9 @@
 + Fixed total powder amounts resetting when opening the SkyBlock Menu on a mining island. - Luna (https://github.com/hannibal002/SkyHanni/pull/2263)
 + Fixed detection of 2x Powder Event for Powder Tracker. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2157)
     + Now uses the Tab Widget.
++ Fixed TunnelMaps not resetting on lobby swap. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2275)
++ Fixed a rare error when detecting corpses in the Mineshaft. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2268)
++ Fixed incorrect maximum Powder value on HotM perks when disabled. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2269)
 
 #### Garden Fixes
 
@@ -362,6 +368,7 @@
 + Fixed Jacob's Contest FF needed display not showing. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2262)
 + Fixed Dicer Tracker Reset Button misalignment. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2248)
 + Fixed errors when selecting Fine Flour with the Sprayonator. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2251)
++ Fixed typos in the FF guide. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2273)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -411,6 +418,7 @@
 + Fixed Custom Scoreboard Error during Carnival. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2245)
 + Fixed 2 Custom Scoreboard Errors while in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2236)
 + Fixed Scoreboard Reset not updating the draggable list. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2252)
++ Fixed a scoreboard error message when a Hypixel bug shows a negative number of magma cubes remaining in the scoreboard. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2267)
 
 #### Dungeon Fixes
 
@@ -471,6 +479,7 @@
 + Fixed detecting Hot Potato Books inside the Community Project as potatoes. - Empa (https://github.com/hannibal002/SkyHanni/pull/2214)
 + Fixed price source inconsistencies (Bazaar sell/buy and NPC prices). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2221)
 + Fixed Carnival Masks not being detected by Reforge Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2244)
++ Fixed a typo in the Item Pickup Log config. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2271)
 
 #### Combat Fixes
 
@@ -626,6 +635,7 @@
 + Changed "colour" to "color" internally, everywhere. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2258)
 + Added renderRenderableDouble. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2260)
     + A direct replacement for renderStringsAndItems.
++ Changed detecting active mayor to no longer use the number of votes. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2227)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 2723c2be8ca3..139d30b41c7e 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -956,6 +956,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added an option to block Chocolate Factory access without a mythic rabbit pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2124)
 + Add reminder that the Time Tower is expired and has extra charges available. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
     + Replaces the previous Time Tower Reminder feature.
++ Added a tracker for stray rabbits caught in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2210)
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 9d12fbdbe931..bd7f743ad3db 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.19",
+    version = "0.26.Beta.20",
 )
 class SkyHanniMod {
 

From d7e80759a90dd6c4b36a370113e2c81e78601dc6 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:32:46 +0200
Subject: [PATCH 170/721] Feature: Price per Stock of Stonks (#2195)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           |   1 +
 .../features/inventory/InventoryConfig.java   |   6 ++
 .../features/inventory/StockOfStonkFeature.kt | 100 ++++++++++++++++++
 .../skyhanni/utils/CollectionUtils.kt         |   5 +
 4 files changed, 112 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index 29903e6587fb..b166e60d38fd 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -243,6 +243,7 @@
       <w>statspocalypse</w>
       <w>stillgore</w>
       <w>stonk</w>
+      <w>stonks</w>
       <w>superboom</w>
       <w>supercraft</w>
       <w>supercrafting</w>
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index a3f88fca6473..0c7556c30719 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -257,4 +257,10 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean timeHeldInLore = false;
+
+    @Expose
+    @ConfigOption(name = "Stonk of Stonk Price", desc = "Show Price per Stonk when taking the minimum bid in Stonks Auction (Richard).")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean stonkOfStonkPrice = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt
new file mode 100644
index 000000000000..4bc8af1e3e56
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt
@@ -0,0 +1,100 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.transformAt
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object StockOfStonkFeature {
+
+    private val config get() = SkyHanniMod.feature.inventory
+
+    private val repoGroup = RepoPattern.group("inventory.stockofstonks")
+
+
+    /**
+     * REGEX-TEST: Stonks Auction
+     */
+    private val inventoryPattern by repoGroup.pattern(
+        "inventory",
+        "Stonks Auction",
+    )
+
+    /**
+     * REGEX-TEST: §dStonks Auction
+     */
+    private val itemPattern by repoGroup.pattern(
+        "item",
+        "§dStonks Auction",
+    )
+
+    /**
+     * REGEX-TEST: §5§o§7§7▶ §c§lTOP 5,000§7 - §5Stock of Stonks §8x2
+     */
+    private val topPattern by repoGroup.pattern(
+        "top",
+        "§5§o§7§7▶ §c§lTOP (?<rank>[\\d,]+)§7 - §5Stock of Stonks §8x(?<amount>\\d+)",
+    )
+
+    /**
+     * REGEX-TEST: §5§o§7   Minimum Bid: §62,400,002 Coins
+     */
+    private val bidPattern by repoGroup.pattern(
+        "bid",
+        "§5§o§7   Minimum Bid: §6(?<amount>[\\d,]+) Coins",
+    )
+
+    var inInventory = false
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryOpenEvent) {
+        if (isEnabled()) {
+            inInventory = inventoryPattern.matches(event.inventoryName)
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        inInventory = false
+    }
+
+    @SubscribeEvent
+    fun onLorenzToolTip(event: LorenzToolTipEvent) {
+        if (!isEnabled()) return
+        if (!inInventory) return
+        if (!itemPattern.matches(event.itemStack.displayName)) return
+        var stonksReward = 0
+        var index = 0
+        var bestValueIndex = 0
+        var bestRatio = Long.MAX_VALUE
+        loop@ while (index < event.toolTip.size) {
+            val line = event.toolTip[index]
+            index++
+            topPattern.matchMatcher(line) {
+                stonksReward = group("amount").toInt()
+                continue@loop
+            }
+            bidPattern.matchMatcher(line) {
+                val cost = group("amount").replace(",", "").toLong()
+                val ratio = cost / stonksReward
+                event.toolTip[index - 1] = line + " §7(§6§6${ratio.addSeparators()} §7per)" // double §6 for the replacement at the end
+                if (ratio < bestRatio) {
+                    bestValueIndex = index - 1
+                    bestRatio = ratio
+                }
+            }
+        }
+        event.toolTip.transformAt(bestValueIndex) { replace("§6§6", "§a") }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.stonkOfStonkPrice
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 80aa131b2b78..33e85e2fe019 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -143,6 +143,11 @@ object CollectionUtils {
         return newList
     }
 
+    inline fun <reified T, reified K : MutableList<T>> K.transformAt(index: Int, transform: T.() -> T): K {
+        this[index] = transform(this[index])
+        return this
+    }
+
     /**
      * This does not work inside a [buildList] block
      */

From 9329efdc7aa23e83b2c541ea30d21b7d281c040e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:33:07 +0200
Subject: [PATCH 171/721] Backend: Add cache powder chat filter (#2276)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/chat/PowderMiningChatFilter.kt        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 1d414cea484b..63d6dc11db73 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -13,12 +13,16 @@ import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.Simpl
 import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.WISHING_COMPASS
 import at.hannibal2.skyhanni.config.features.chat.PowderMiningFilterConfig.SimplePowderMiningRewardTypes.YOGGIE
 import at.hannibal2.skyhanni.config.features.chat.PowderMiningGemstoneFilterConfig.GemstoneFilterEntry
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.regex.Pattern
 
 @SkyHanniModule
 object PowderMiningChatFilter {
@@ -289,8 +293,11 @@ object PowderMiningChatFilter {
         return null
     }
 
-    private fun blockSimpleRewards(ssMessage: String): String? {
-        val rewardPatterns = mapOf(
+    var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap()
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        rewardPatterns = mapOf(
             ascensionRopeRewardPattern to ASCENSION_ROPE to "powder_mining_ascension_rope",
             wishingCompassRewardPattern to WISHING_COMPASS to "powder_mining_wishing_compass",
             oilBarrelRewardPattern to OIL_BARREL to "powder_mining_oil_barrel",
@@ -302,6 +309,9 @@ object PowderMiningChatFilter {
             robotPartsPattern to ROBOT_PARTS to "powder_mining_robot_parts",
             treasuritePattern to TREASURITE to "powder_mining_treasurite",
         )
+    }
+
+    private fun blockSimpleRewards(ssMessage: String): String? {
         for ((patternToReward, returnReason) in rewardPatterns) {
             if (patternToReward.first.matches(ssMessage)) {
                 return if (config.simplePowderMiningTypes.contains(patternToReward.second)) returnReason

From a21584aee893bab5113d96e1b27497ae749f1e12 Mon Sep 17 00:00:00 2001
From: DungeonHub <ericreeper64mc@gmail.com>
Date: Wed, 31 Jul 2024 23:40:15 +0200
Subject: [PATCH 172/721] Feature: Tactical Insertion Ability Cooldown (#2278)

Co-authored-by: ericweres <128173839+ericweres@users.noreply.github.com>
---
 .../features/itemabilities/abilitycooldown/ItemAbility.kt  | 1 +
 .../itemabilities/abilitycooldown/ItemAbilityCooldown.kt   | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index 593828a61608..de7bc8bdf77f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -49,6 +49,7 @@ enum class ItemAbility(
     SHADOW_FURY(15, "STARRED_SHADOW_FURY"),
     ROYAL_PIGEON(5),
     WAND_OF_STRENGTH(10),
+    TACTICAL_INSERTION(20),
 
     // doesn't have a sound
     ENDER_BOW("Ender Warp", 5, "Ender Bow"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index ac813c88ad6a..567adb251af5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -179,6 +179,13 @@ object ItemAbilityCooldown {
             event.soundName == "random.eat" && event.pitch == 0.4920635f && event.volume == 1.0f -> {
                 ItemAbility.WAND_OF_STRENGTH.sound()
             }
+            // Tactical Insertion
+            event.soundName == "fire.ignite" && event.pitch == 0.74603176f && event.volume == 1.0f -> {
+                ItemAbility.TACTICAL_INSERTION.activate(LorenzColor.DARK_PURPLE, 3_000)
+            }
+            event.soundName == "mob.zombie.remedy" && event.pitch == 1.8888888f && event.volume == 0.7f -> {
+                ItemAbility.TACTICAL_INSERTION.activate(null, 17_000)
+            }
         }
     }
 

From 7e2a3d9a1d5b128907a03e8066ed03d6aff1e8f8 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:40:28 +0200
Subject: [PATCH 173/721] Fix: TunnelMaps Deadlock (#2277)

---
 .../java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index b3e7c56c180b..13d8c53e709e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -488,6 +488,7 @@ object TunnelsMaps {
         closedNote = null
         clearPath()
         cooldowns.clear()
+        goalReached = false
     }
 
     private var nextSpotDelay = SimpleTimeMark.farPast()

From e6a9cc5ec82c495c4ce038e944f05bd4a8ff91db Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:41:49 +0200
Subject: [PATCH 174/721] Fix: Potm always disabled (#2282)

---
 src/main/java/at/hannibal2/skyhanni/data/HotmData.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 1d9ca38271e0..c66d2fa844a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -565,7 +565,7 @@ enum class HotmData(
             }
 
             if (entry == PEAK_OF_THE_MOUNTAIN) {
-                entry.enabled = entry.activeLevel != 0
+                entry.enabled = entry.rawLevel != 0
                 return
             }
             entry.enabled = lore.any { enabledPattern.matches(it) }

From bbe686f866f418641f6d9c27e9e5a6f7ba8f1b24 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:48:13 -0400
Subject: [PATCH 175/721] Fix: Flawless Gemstones in Powder Filter (#2281)

---
 .../skyhanni/config/ConfigUpdaterMigrator.kt      |  2 +-
 .../chat/PowderMiningGemstoneFilterConfig.java    | 15 ++++++++-------
 .../skyhanni/features/chat/ChatFilter.kt          |  7 +++++++
 .../features/chat/PowderMiningChatFilter.kt       | 13 ++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index d42dfbbbf670..f274d44f2b48 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 52
+    const val CONFIG_VERSION = 53
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
index 2b4936af1ecf..3a44738ca6e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
@@ -15,38 +15,39 @@ public class PowderMiningGemstoneFilterConfig {
     @Expose
     @ConfigOption(name = "Ruby", desc = "Hide Ruby gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry rubyGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry rubyGemstones = GemstoneFilterEntry.FINE_UP;
 
     @Expose
     @ConfigOption(name = "Sapphire", desc = "Hide Sapphire gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry sapphireGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry sapphireGemstones = GemstoneFilterEntry.FINE_UP;
 
     @Expose
     @ConfigOption(name = "Amber", desc = "Hide Amber gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry amberGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry amberGemstones = GemstoneFilterEntry.FINE_UP;
 
     @Expose
     @ConfigOption(name = "Amethyst", desc = "Hide Amethyst gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry amethystGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry amethystGemstones = GemstoneFilterEntry.FINE_UP;
 
     @Expose
     @ConfigOption(name = "Jade", desc = "Hide Jade gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry jadeGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry jadeGemstones = GemstoneFilterEntry.FINE_UP;
 
     @Expose
     @ConfigOption(name = "Topaz", desc = "Hide Topaz gemstones under a certain quality.")
     @ConfigEditorDropdown
-    public GemstoneFilterEntry topazGemstones = GemstoneFilterEntry.FINE_ONLY;
+    public GemstoneFilterEntry topazGemstones = GemstoneFilterEntry.FINE_UP;
 
     public enum GemstoneFilterEntry {
         SHOW_ALL("Show All"),
         HIDE_ALL("Hide all"),
         FLAWED_UP("Show §aFlawed §7or higher"),
-        FINE_ONLY("Show §9Fine §7only");
+        FINE_UP("Show §9Fine §7or higher"),
+        FLAWLESS_ONLY("Show §5Flawless §7only");
 
         private final String str;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 3f2897aaede0..e4e411d4c6d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -576,5 +576,12 @@ object ChatFilter {
         event.move(3, "chat.profileJoin", "chat.filterType.profileJoin")
         event.move(3, "chat.others", "chat.filterType.others")
         event.move(52, "chat.filterType.powderMining", "chat.filterType.powderMiningFilter.enabled")
+        event.transform(53, "chat.filterType.powderMiningFilter.gemstoneFilterConfig") { element ->
+            element.asJsonObject.apply {
+                entrySet().forEach { (key, value) ->
+                    if (value.asString == "FINE_ONLY") addProperty(key, "FINE_UP")
+                }
+            }
+        }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 63d6dc11db73..32ce17b8d788 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -236,10 +236,11 @@ object PowderMiningChatFilter {
      * REGEX-TEST: §r§f❈ Rough Amethyst Gemstone §r§8x24
      * REGEX-TEST: §r§a❈ Flawed Amethyst Gemstone §r§8x4
      * REGEX-TEST: §r§9⸕ Fine Amber Gemstone
+     * REGEX-TEST: §r§5⸕ Flawless Amber Gemstone
      */
     private val gemstonePattern by patternGroup.pattern(
         "reward.gemstone",
-        "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
+        "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine|Flawless) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
     )
 
     fun block(message: String): String? {
@@ -326,8 +327,7 @@ object PowderMiningChatFilter {
             if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.SHOW_ALL) return "no_filter"
             if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.HIDE_ALL) return "powder_mining_goblin_eggs"
 
-            val colorStr = groupOrNull("color")?.lowercase()
-            return when (colorStr) {
+            return when (val colorStr = groupOrNull("color")?.lowercase()) {
                 //'Colorless', base goblin eggs will never be shown in this code path
                 null -> "powder_mining_goblin_eggs"
                 "green" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.GREEN_UP) {
@@ -382,9 +382,12 @@ object PowderMiningChatFilter {
                 "flawed" -> if (gemSpecificFilterEntry > GemstoneFilterEntry.FLAWED_UP) {
                     "powder_mining_gemstones"
                 } else "no_filter"
-                // FINE_ONLY enum not explicitly used in comparison, as the only
+                "fine" -> if (gemSpecificFilterEntry > GemstoneFilterEntry.FINE_UP) {
+                    "powder_mining_gemstones"
+                } else "no_filter"
+                // FLAWLESS_ONLY enum not explicitly used in comparison, as the only
                 // case that will block it is HIDE_ALL, which is covered above
-                "fine" -> "no_filter"
+                "flawless" -> "no_filter"
                 // This should not be reachable
                 else -> "no_filter"
             }

From a69f9373e0d2311fc9a7c26d318ed168d7fce252 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:48:34 +0200
Subject: [PATCH 176/721] added todo

---
 .../skyhanni/config/features/chat/PowderMiningFilterConfig.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
index 7eb2f19b8a0f..42a53f8dd3bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
@@ -111,6 +111,7 @@ public String toString() {
     @Expose
     @ConfigOption(name = "Gemstones", desc = "")
     @Accordion
+    // TODO remove config
     public PowderMiningGemstoneFilterConfig gemstoneFilterConfig = new PowderMiningGemstoneFilterConfig();
 
 }

From 1829187fd20c43c79810688729fde4ff40f51757 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:57:43 -0400
Subject: [PATCH 177/721] Fix: Hoppity Goal Levels Off-by-One (#2280)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../chocolatefactory/ChocolateFactoryAPI.kt   | 35 +++++++++++++++++++
 .../ChocolateFactoryCustomReminder.kt         |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 36e8a206af61..57b572fe48f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -12,8 +12,12 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.DelayedRun
+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.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyblockSeason
@@ -21,6 +25,7 @@ import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.UtilsPatterns
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
@@ -42,6 +47,25 @@ object ChocolateFactoryAPI {
         "Hoppity|Chocolate Factory Milestones",
     )
 
+    /**
+     * REGEX-TEST: §a§lPROMOTE §8➜ §7[208§7] §dExecutive
+     * REGEX-TEST: §a§lUPGRADE §8➜ §aRabbit Barn CCXXI
+     */
+    private val upgradeLorePattern by patternGroup.pattern(
+        "item.lore.upgrade",
+        "§a§l(?:UPGRADE|PROMOTE) §8➜ (?:§7\\[(?<nextlevel>\\d+)§7] )?(?<upgradename>.*?) ?(?<nextlevelalt>[IVXLCDM]*)\$",
+    )
+
+    /**
+     * REGEX-TEST: §bRabbit Bro§8 - §7[220§7] §bBoard Member
+     * REGEX-TEST: §6Rabbit Dog§8 - §7[190§7] §6Director
+     * REGEX-TEST: §dRabbit Daddy§8 - §7[201§7] §dExecutive
+     */
+    private val employeeNamePattern by patternGroup.pattern(
+        "item.name.employee",
+        "(?<employee>(?:§.+)+Rabbit .*)§8 - §7\\[\\d*§7] .*",
+    )
+
     var rabbitSlots = mapOf<Int, Int>()
     var otherUpgradeSlots = setOf<Int>()
     var noPickblockSlots = setOf<Int>()
@@ -155,6 +179,17 @@ object ChocolateFactoryAPI {
         }
     }
 
+    fun getNextLevelName(stack: ItemStack): String? =
+        upgradeLorePattern.firstMatcher(stack.getLore()) {
+            val upgradeName = if (stack.getLore().any { it == "§8Employee" }) employeeNamePattern.matchMatcher(stack.name) {
+                groupOrNull("employee")
+            } else groupOrNull("upgradename")
+            val nextLevel = groupOrNull("nextlevel") ?: groupOrNull("nextlevelalt")
+            if (upgradeName == null || nextLevel == null) null
+            else "$upgradeName $nextLevel"
+        }
+
+
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
 
     // TODO add debug toggle
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
index 10c9ce24a3a5..1f7de017c73a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
@@ -67,13 +67,14 @@ object ChocolateFactoryCustomReminder {
         // TODO add support for prestige and for Chocolate Milestone
         val cost = ChocolateFactoryAPI.getChocolateBuyCost(item.getLore()) ?: return
         val duration = ChocolateAmount.CURRENT.timeUntilGoal(cost)
+        val nextLevelName = ChocolateFactoryAPI.getNextLevelName(item) ?: return
 
         // the user has enough chocolate, and just bought something
         if (duration.isNegative()) {
             reset()
             return
         }
-        setReminder(cost, item.name)
+        setReminder(cost, nextLevelName)
     }
 
     @SubscribeEvent

From fe59112091a4b18de61e3a1e8bbca8661583402d Mon Sep 17 00:00:00 2001
From: NetheriteMiner <88792142+NetheriteMiner@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:02:34 -0400
Subject: [PATCH 178/721] Fix: Discord RPC dynamic off-by-one (#2279)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/misc/discordrpc/DiscordStatus.kt | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 0944ca9ad2fa..0094787870d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -226,25 +226,30 @@ enum class DiscordStatus(private val displayMessageSupplier: (() -> String?)) {
         DiscordRPCManager.config.customText.get() // custom field in the config
     }),
 
-    AUTO({
-        var autoReturn = ""
-        for (statusID in DiscordRPCManager.config.autoPriority) { // for every dynamic that the user wants to see...
-            // TODO, change functionality to use enum rather than ordinals
-            val autoStatus = AutoStatus.entries[statusID.ordinal]
-            val result =
-                autoStatus.correspondingDiscordStatus.getDisplayString() // get what would happen if we were to display it
-            if (result != autoStatus.placeholderText) { // if that value is useful, display it
-                autoReturn = result
-                break
+    AUTO(
+        {
+            var autoReturn = ""
+            for (statusID in DiscordRPCManager.config.autoPriority) { // for every dynamic that the user wants to see...
+                // TODO, change functionality to use enum rather than ordinals
+                val autoStatus = AutoStatus.entries[statusID.ordinal]
+                val result =
+                    autoStatus.correspondingDiscordStatus.getDisplayString() // get what would happen if we were to display it
+                if (result != autoStatus.placeholderText) { // if that value is useful, display it
+                    autoReturn = result
+                    break
+                }
             }
-        }
-        if (autoReturn == "") { // if we didn't find any useful information, display the fallback
-            val statusNoAuto = DiscordStatus.entries.toMutableList()
-            statusNoAuto.remove(AUTO)
-            autoReturn = statusNoAuto[DiscordRPCManager.config.auto.get().ordinal].getDisplayString()
-        }
-        autoReturn
-    }),
+            if (autoReturn == "") { // if we didn't find any useful information, display the fallback
+                val fallbackID = DiscordRPCManager.config.auto.get().ordinal
+                autoReturn = if (fallbackID == 10) {
+                    NONE.getDisplayString() // 10 is this (DiscordStatus.AUTO); prevents an infinite loop
+                } else {
+                    DiscordStatus.entries[fallbackID].getDisplayString()
+                }
+            }
+            autoReturn
+        },
+    ),
 
     CROP_MILESTONES({ getCropMilestoneDisplay() }),
 

From 1af548afd0b1f2c36f8e9cd02a9c567a3c9070c9 Mon Sep 17 00:00:00 2001
From: ev chang <wyvestbusiness@gmail.com>
Date: Thu, 1 Aug 2024 21:38:36 +0900
Subject: [PATCH 179/721] Backend: Include PolyPatcher cactus hitbox fix info
 in Discord FAQ + Installation guide (#2274)

---
 docs/DISCORD_FAQ.md | 4 ++--
 docs/INSTALLING.md  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 9edc758672ce..6f84957d1fcd 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -26,8 +26,8 @@ _Frequently Asked Questions_
 
 > **8: How can I get bigger crop hit boxes?**
 > Use Patcher or PolyPatcher to have 1.12 hit boxes in 1.8.9.
-> - [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>)
-> - [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes)
+> - [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>) (Versions 1.8.8 and after will have broken cactus hitboxes)
+> - [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes. Fixes cactus hitboxes.)
 
 > **9: Why does my Item Tracker feature not track this item?**
 > 1. Check if the item goes directly into your sacks. 
diff --git a/docs/INSTALLING.md b/docs/INSTALLING.md
index 091b064f87ca..3dc059a428ac 100644
--- a/docs/INSTALLING.md
+++ b/docs/INSTALLING.md
@@ -122,7 +122,7 @@ select new installation, under version you need to find Forge for 1.8.9 (most li
 <summary>10. Recommended additional mods (optional)</summary>
 
 [OptiFine](https://optifine.net/adloadx?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar)
-and either [Sk1erLLC's Patcher](https://sk1er.club/mods/patcher) or [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes)
+and either [Sk1erLLC's Patcher](https://sk1er.club/mods/patcher) or [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes, including fixed cactus hitboxes)
 
 Those two mods help you get more FPS in game and let you change many more performance
 settings.

From 58f09c23327f1553e099a5cf0d263a7a89232672 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Fri, 2 Aug 2024 10:56:34 +0200
Subject: [PATCH 180/721] Fix: Allow clicking Carnival Masks in /equipment
 (#2293)

---
 .../skyhanni/features/inventory/HideNotClickableItems.kt         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index d1bb4dbda783..b7163312287d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -298,6 +298,7 @@ object HideNotClickableItems {
 
         val list = listOf(
             "HELMET",
+            "CARNIVAL MASK",
             "CHESTPLATE",
             "LEGGINGS",
             "BOOTS",

From a6b7559cec69bda9e8202de6440da784d3f8925a Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:56:49 +0200
Subject: [PATCH 181/721] Fix: HotmData Level Detection with Blue Egg (#2295)

---
 .../at/hannibal2/skyhanni/data/HotmData.kt    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index c66d2fa844a5..e82ddd4aebea 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -357,16 +357,16 @@ enum class HotmData(
 
     val printName = name.allLettersFirstUppercase()
 
-    /** Level which are actually paid with powder (does exclude [blueEgg]*/
-    val rawLevel: Int
+    /** Level which are actually paid with powder (does exclude [blueEgg])*/
+    var rawLevel: Int
         get() = storage?.perks?.get(this.name)?.level ?: 0
+        private set(value) {
+            storage?.perks?.computeIfAbsent(this.name) { HotmTree.HotmPerk() }?.level = value
+        }
 
     /** Level for which the effect that is present (considers [enabled] and [blueEgg])*/
-    var activeLevel: Int
+    val activeLevel: Int
         get() = if (enabled) effectivLevel else 0
-        private set(value) {
-            storage?.perks?.computeIfAbsent(this.name) { HotmTree.HotmPerk() }?.level = value.minus(blueEgg())
-        }
 
     /** Level that considering [blueEgg]*/
     val effectivLevel: Int get() = storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0
@@ -524,7 +524,7 @@ enum class HotmData(
         fun getPerkByNameOrNull(name: String): HotmData? = entries.find { it.guiName == name }
 
         private fun resetTree() = entries.forEach {
-            it.activeLevel = 0
+            it.rawLevel = 0
             it.enabled = false
             it.isUnlocked = false
             HotmAPI.Powder.entries.forEach { it.setCurrent(it.getTotal()) }
@@ -542,7 +542,7 @@ enum class HotmData(
             val lore = item.getLore().takeIf { it.isNotEmpty() } ?: return
 
             if (entry != PEAK_OF_THE_MOUNTAIN && notUnlockedPattern.matches(lore.last())) {
-                entry.activeLevel = 0
+                entry.rawLevel = 0
                 entry.enabled = false
                 entry.isUnlocked = false
                 return
@@ -550,7 +550,7 @@ enum class HotmData(
 
             entry.isUnlocked = true
 
-            entry.activeLevel = levelPattern.matchMatcher(lore.first()) {
+            entry.rawLevel = levelPattern.matchMatcher(lore.first()) {
                 group("level").toInt().transformIf({ group("color") == "b" }, { this.minus(1) })
             } ?: entry.maxLevel
 
@@ -681,7 +681,7 @@ enum class HotmData(
             DelayedRun.runNextTick {
                 InventoryUtils.getItemsInOpenChest().forEach { it.parse() }
                 abilities.filter { it.isUnlocked }.forEach {
-                    it.activeLevel = if (PEAK_OF_THE_MOUNTAIN.rawLevel >= 1) 2 else 1
+                    it.rawLevel = if (PEAK_OF_THE_MOUNTAIN.rawLevel >= 1) 2 else 1
                 }
             }
         }

From 2f53d615b8cf6054e96dba6a5ad45ab244b3fc33 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:57:02 +0200
Subject: [PATCH 182/721] Backend: /shdebugprice (#2289)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  3 +-
 .../skyhanni/utils/ItemPriceUtils.kt          | 66 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   | 11 +++-
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 6dd8db8ad710..89d7bb9bbeda 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -59,7 +59,6 @@ import at.hannibal2.skyhanni.features.minion.MinionFeatures
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
 import at.hannibal2.skyhanni.features.misc.LockMouseLook
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
-import at.hannibal2.skyhanni.features.misc.MiscFeatures
 import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatures
@@ -87,6 +86,7 @@ import at.hannibal2.skyhanni.test.command.TrackSoundsCommand
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ExtendedChatColor
+import at.hannibal2.skyhanni.utils.ItemPriceUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TabListData
@@ -452,6 +452,7 @@ object Commands {
             "shtestisland",
             "Sets the current skyblock island for testing purposes.",
         ) { SkyBlockIslandTest.onCommand(it) }
+        registerCommand("shdebugprice", "Debug different price sources for an item.") { ItemPriceUtils.debugItemPrice(it) }
     }
 
     private fun developersCodingHelp() {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
new file mode 100644
index 000000000000..e604c29ff522
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
@@ -0,0 +1,66 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getLowestBinOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getPrice
+import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+
+object ItemPriceUtils {
+
+    fun debugItemPrice(args: Array<String>) {
+        val internalName = getItemOrFromHand(args)
+        if (internalName == null) {
+            ChatUtils.userError("Hold an item in hand or do /shdebugprice <item name/id>")
+            return
+        }
+
+
+        val defaultPrice = internalName.getPrice().addSeparators()
+        ChatUtils.chat("${internalName.itemName}§f: §6$defaultPrice")
+
+        println("")
+        println(" Debug Item Price for $internalName ")
+        println("defaultPrice: $defaultPrice")
+
+        println(" #")
+        for (source in ItemPriceSource.values()) {
+            val price = internalName.getPrice(source)
+            println("${source.displayName} price: ${price.addSeparators()}")
+        }
+        println(" #")
+
+        println(" ")
+        println("getLowestBinOrNull: ${internalName.getLowestBinOrNull()?.addSeparators()}")
+
+        internalName.getBazaarData().let {
+            println("getBazaarData sellOfferPrice: ${it?.sellOfferPrice?.addSeparators()}")
+            println("getBazaarData instantBuyPrice: ${it?.instantBuyPrice?.addSeparators()}")
+        }
+
+        println("getNpcPriceOrNull: ${internalName.getNpcPriceOrNull()?.addSeparators()}")
+        println("getRawCraftCostOrNull: ${internalName.getRawCraftCostOrNull()?.addSeparators()}")
+        println(" ")
+    }
+
+    // TODO move either into inventory utils or new command utils
+    fun getItemOrFromHand(args: Array<String>): NEUInternalName? {
+        val name = args.joinToString(" ")
+        return if (name.isEmpty()) {
+            InventoryUtils.getItemInHand()?.getInternalName()
+        } else {
+            val internalName = name.asInternalName()
+            if (internalName.getItemStackOrNull() != null) {
+                internalName
+            } else {
+                NEUInternalName.fromItemNameOrNull(name)
+            }
+
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 35992a15e339..f3657d10eafc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -193,8 +193,9 @@ object NEUItems {
                 return if (priceSource == ItemPriceSource.BAZAAR_INSTANT_BUY) it.sellOfferPrice else it.instantBuyPrice
             }
 
-            val result = manager.auctionManager.getLowestBin(asString())
-            if (result != -1L) return result.toDouble()
+            getLowestBinOrNull()?.let {
+                return it
+            }
 
             if (equals("JACK_O_LANTERN")) {
                 return "PUMPKIN".asInternalName().getPrice(priceSource) + 1
@@ -208,6 +209,12 @@ object NEUItems {
         return getNpcPriceOrNull() ?: getRawCraftCostOrNull(pastRecipes)
     }
 
+    fun NEUInternalName.getLowestBinOrNull(): Double? {
+        val result = manager.auctionManager.getLowestBin(asString())
+        if (result == -1L) return null
+        return result.toDouble()
+    }
+
     // If NEU fails to calculate the craft costs, we calculate it ourself.
     fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
         manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {

From 5c2975024cc2fcbee159506c15acc11526044da7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:57:15 +0200
Subject: [PATCH 183/721] Improvement: Hide Beacon on bingo (#2286)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/gui/BeaconPower.kt      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
index 0eb596afceb0..76990b37ad98 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -28,19 +29,19 @@ object BeaconPower {
     // TODO add regex tests
     private val deactivatedPattern by group.pattern(
         "deactivated",
-        "§7Beacon Deactivated §8- §cNo Power Remaining"
+        "§7Beacon Deactivated §8- §cNo Power Remaining",
     )
     private val timeRemainingPattern by group.pattern(
         "time",
-        "§7Power Remaining: §e(?<time>.+)"
+        "§7Power Remaining: §e(?<time>.+)",
     )
     private val boostedStatPattern by group.pattern(
         "stat",
-        "§7Current Stat: (?<stat>.+)"
+        "§7Current Stat: (?<stat>.+)",
     )
     private val noBoostedStatPattern by group.pattern(
         "nostat",
-        "TODO"
+        "TODO",
     )
 
     private var expiryTime: SimpleTimeMark
@@ -55,7 +56,7 @@ object BeaconPower {
             storage?.boostedStat = value
         }
 
-    private var display: String? = null
+    private var display = ""
 
     private val BEACON_POWER_SLOT = 22
     private val STATS_SLOT = 23
@@ -97,8 +98,7 @@ object BeaconPower {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
-        val string = display ?: return
-        config.beaconPowerPosition.renderString(string, posLabel = "Beacon Power")
+        config.beaconPowerPosition.renderString(display, posLabel = "Beacon Power")
     }
 
     @SubscribeEvent
@@ -117,5 +117,10 @@ object BeaconPower {
         }
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.beaconPower
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        display = ""
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.beaconPower && !LorenzUtils.isBingoProfile
 }

From 80f09d2de3b32935f8b6646353d807f037ba25bb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:05 +0200
Subject: [PATCH 184/721] Fix: Reputation helper keybind activating while
 inside GUIs. (#2284)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../CrimsonIsleReputationHelper.kt            | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
index 803cedb7854f..6e1b73cd0637 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
@@ -21,10 +21,13 @@ import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.inventory.GuiInventory
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -52,7 +55,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
      */
     val tabListQuestPattern by RepoPattern.pattern(
         "crimson.reputation.tablist",
-        " §r§[cdea].*"
+        " §r§[cdea].*",
     )
 
     init {
@@ -143,16 +146,26 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
         if (!config.enabled.get()) return
         if (!IslandType.CRIMSON_ISLE.isInIsland()) return
 
-        if (config.useHotkey && !config.hotkey.isKeyHeld()) {
+        if (config.useHotkey && !isHotkeyHeld()) {
             return
         }
 
         config.position.renderStringsAndItems(
             display,
-            posLabel = "Crimson Isle Reputation Helper"
+            posLabel = "Crimson Isle Reputation Helper",
         )
     }
 
+    fun isHotkeyHeld(): Boolean {
+        val isAllowedGui = Minecraft.getMinecraft().currentScreen.let {
+            it == null || it is GuiInventory
+        }
+        if (!isAllowedGui) return false
+        if (NEUItems.neuHasFocus()) return false
+
+        return config.hotkey.isKeyHeld()
+    }
+
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(2, "misc.crimsonIsleReputationHelper", "crimsonIsle.reputationHelper.enabled")
@@ -193,7 +206,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
 
     fun showLocations() = when (config.showLocation) {
         ShowLocationEntry.ALWAYS -> true
-        ShowLocationEntry.ONLY_HOTKEY -> config.hotkey.isKeyHeld()
+        ShowLocationEntry.ONLY_HOTKEY -> isHotkeyHeld()
         else -> false
     }
 }

From 0dd320def6e7cec44e360de1f098805402fd8936 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:16 +0200
Subject: [PATCH 185/721] Fix: /shcommands empty page (#2287)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/commands/HelpCommand.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
index 9bd3afce48f9..4d4c5d34116a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.chat.Text.style
 import at.hannibal2.skyhanni.utils.chat.Text.suggest
 import net.minecraft.util.EnumChatFormatting
 import net.minecraft.util.IChatComponent
+import kotlin.math.ceil
 
 object HelpCommand {
 
@@ -50,7 +51,7 @@ object HelpCommand {
         val filtered = commands.filter {
             it.name.contains(search, ignoreCase = true) || it.description.contains(search, ignoreCase = true)
         }
-        val maxPage = filtered.size / COMMANDS_PER_PAGE + 1
+        val maxPage = ceil(filtered.size.toDouble() / COMMANDS_PER_PAGE).toInt()
         val page = page.coerceIn(1, maxPage)
         val title = if (search.isEmpty()) "§6SkyHanni Commands" else "§6SkyHanni Commands matching '$search'"
 

From db0871cfa3ac68dc60817a3c757567abf1a499ae Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:27 +0200
Subject: [PATCH 186/721] Fix: Pablo Helper Abiphone (#2288)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/nether/PabloHelper.kt   | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
index 0ada23ab4bf0..aa7cfcafc130 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
@@ -2,12 +2,11 @@ package at.hannibal2.skyhanni.features.nether
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.GetFromSackAPI
-import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatchers
@@ -22,10 +21,22 @@ object PabloHelper {
 
     private val config get() = SkyHanniMod.feature.crimsonIsle
 
+    // TODO RepoPattern.list does not work, find out why
+
+//     /**
+//      * REGEX-TEST: §e[NPC] §5Pablo§f: §b✆ §f§rBring me that §aEnchanted Dandelion §fas soon as you can!
+//      */
+//     private val patterns by RepoPattern.list(
+//         "crimson.pablo.helper",
+//         "\\[NPC] Pablo: (?:✆ )?Could you bring me an (?<flower>[\\w ]+).*",
+//         "\\[NPC] Pablo: (?:✆ )?Bring me that (?<flower>[\\w ]+) as soon as you can!",
+//     )
+
     private val patterns = listOf(
-        "\\[NPC] Pablo: Could you bring me an (?<flower>[\\w ]+).*".toPattern(),
-        "\\[NPC] Pablo: Bring me that (?<flower>[\\w ]+) as soon as you can!".toPattern()
+        "\\[NPC] Pablo: (?:✆ )?Could you bring me an (?<flower>[\\w ]+).*".toPattern(),
+        "\\[NPC] Pablo: (?:✆ )?Bring me that (?<flower>[\\w ]+) as soon as you can!".toPattern(),
     )
+
     private var lastSentMessage = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -40,11 +51,11 @@ object PabloHelper {
 
         GetFromSackAPI.getFromChatMessageSackItems(
             itemName.asInternalName().makePrimitiveStack(),
-            "Click here to grab an $itemName from sacks!"
+            "Click here to grab an $itemName from sacks!",
         )
 
         lastSentMessage = SimpleTimeMark.now()
     }
 
-    fun isEnabled() = IslandType.CRIMSON_ISLE.isInIsland() && config.pabloHelper
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.pabloHelper
 }

From 1bc224af7c15708799108ed079b4ccd9f4ef852e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:35 +0200
Subject: [PATCH 187/721] Fix: Item Pickup Wisp (#2291)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 004ef673da26..825931150040 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
@@ -181,7 +182,7 @@ object ItemPickupLog {
             for (item in displayLayout) {
                 when (item) {
                     DisplayLayout.ICON -> {
-                        val itemIcon = entry.neuInternalName?.getItemStack()
+                        val itemIcon = entry.neuInternalName?.getItemStackOrNull()
                         if (itemIcon != null) {
                             addItemStack(itemIcon)
                         } else {

From a197d3de1ccedc8a027353d61d028389fa84fc9e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:41 +0200
Subject: [PATCH 188/721] Fix: Sack Item Pickup Log delay (#2292)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/features/inventory/ItemPickupLog.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 825931150040..fd2d4623bd7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -65,6 +65,7 @@ object ItemPickupLog {
     private var itemsAddedToInventory = mutableMapOf<Int, PickupEntry>()
     private var itemsRemovedFromInventory = mutableMapOf<Int, PickupEntry>()
     private var display: Renderable? = null
+    private var dirty = false
 
     private val patternGroup = RepoPattern.group("itempickuplog")
     private val shopPattern by patternGroup.pattern(
@@ -152,7 +153,8 @@ object ItemPickupLog {
         val itemsRemovedUpdated = itemsRemovedFromInventory.values.removeIf { it.isExpired() }
         val itemsAddedUpdated = itemsAddedToInventory.values.removeIf { it.isExpired() }
 
-        if (itemsRemovedUpdated || itemsAddedUpdated || itemList != oldItemList) {
+        if (itemsRemovedUpdated || itemsAddedUpdated || itemList != oldItemList || dirty) {
+            dirty = false
             updateDisplay()
         }
     }
@@ -174,6 +176,7 @@ object ItemPickupLog {
         }
 
         targetInventory[hash] = itemInfo
+        dirty = true
     }
 
     private fun renderList(prefix: String, entry: PickupEntry) = Renderable.horizontalContainer(

From 171049f66ed122656c44e9c07eecc099fe8c6b99 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:58:50 +0200
Subject: [PATCH 189/721] Fix: Composter Overlay no data (#2294)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../garden/composter/ComposterDisplay.kt      |  3 +-
 .../garden/composter/ComposterOverlay.kt      | 58 ++++++++++++++-----
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index 7c88acfca264..a08acac9146e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -55,7 +55,7 @@ object ComposterDisplay {
 
     @SubscribeEvent
     fun onTabListUpdate(event: WidgetUpdateEvent) {
-        if (!(config.displayEnabled && GardenAPI.inGarden())) return
+        if (!GardenAPI.inGarden()) return
         if (!event.isWidget(TabWidget.COMPOSTER)) return
 
         readData(event.lines)
@@ -68,6 +68,7 @@ object ComposterDisplay {
     }
 
     private fun updateDisplay() {
+        if (!config.displayEnabled) return
         val newDisplay = mutableListOf<List<Any>>()
         newDisplay.addAsSingletonList("§bComposter")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 8ed772ea30a2..5bf03b7e3537 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.config.features.garden.composter.ComposterConfig.Re
 import at.hannibal2.skyhanni.data.SackAPI.getAmountInSacksOrNull
 import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson
 import at.hannibal2.skyhanni.data.model.ComposterUpgrade
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -174,8 +175,8 @@ object ComposterOverlay {
                 Collections.singletonList(
                     listOf(
                         "§cSkyHanni composter error:", "§cRepo data not loaded!",
-                        "§7(organicMatterFactors is empty)"
-                    )
+                        "§7(organicMatterFactors is empty)",
+                    ),
                 )
             return
         }
@@ -184,8 +185,8 @@ object ComposterOverlay {
                 Collections.singletonList(
                     listOf(
                         "§cSkyHanni composter error:", "§cRepo data not loaded!",
-                        "§7(fuelFactors is empty)"
-                    )
+                        "§7(fuelFactors is empty)",
+                    ),
                 )
             return
         }
@@ -310,7 +311,7 @@ object ComposterOverlay {
             onChange = {
                 currentTimeType = it
                 update()
-            }
+            },
         )
 
         val list = mutableListOf<Any>()
@@ -405,10 +406,12 @@ object ComposterOverlay {
 
         val first: NEUInternalName? = calculateFirst(map, testOffset, factors, missing, onClick, bigList)
         if (testOffset != 0) {
-            bigList.addAsSingletonList(Renderable.link("testOffset = $testOffset") {
-                ComposterOverlay.testOffset = 0
-                update()
-            })
+            bigList.addAsSingletonList(
+                Renderable.link("testOffset = $testOffset") {
+                    ComposterOverlay.testOffset = 0
+                    update()
+                },
+            )
         }
 
         return first ?: error("First is empty!")
@@ -475,7 +478,7 @@ object ComposterOverlay {
                     lastAttemptTime = SimpleTimeMark.now()
                     retrieveMaterials(internalName, itemName, itemsNeeded.toInt())
                 }
-            }
+            },
         )
     }
 
@@ -524,7 +527,8 @@ object ComposterOverlay {
             if (LorenzUtils.noTradeMode) {
                 ChatUtils.chat("You're out of $itemName §ein your sacks!")
             } else {
-                ChatUtils.clickableChat( // TODO Add this as a separate feature, and then don't send any msg if the feature is disabled
+                ChatUtils.clickableChat(
+                    // TODO Add this as a separate feature, and then don't send any msg if the feature is disabled
                     "You're out of $itemName §ein your sacks! Click here to buy more on the Bazaar!",
                     onClick = { HypixelCommands.bazaar(itemName.removeColor()) },
                     "§eClick find on the bazaar!",
@@ -559,7 +563,7 @@ object ComposterOverlay {
         } catch (e: Exception) {
             ErrorManager.logErrorWithData(
                 e, "Failed to calculate composter overlay data",
-                "organicMatter" to organicMatter
+                "organicMatter" to organicMatter,
             )
         }
     }
@@ -597,11 +601,11 @@ object ComposterOverlay {
         if (inInventory) {
             config.overlayOrganicMatterPos.renderStringsAndItems(
                 organicMatterDisplay,
-                posLabel = "Composter Overlay Organic Matter"
+                posLabel = "Composter Overlay Organic Matter",
             )
             config.overlayFuelExtrasPos.renderStringsAndItems(
                 fuelExtraDisplay,
-                posLabel = "Composter Overlay Fuel Extras"
+                posLabel = "Composter Overlay Fuel Extras",
             )
         }
     }
@@ -624,4 +628,30 @@ object ComposterOverlay {
             ConfigUtils.migrateIntToEnum(element, RetrieveFromEntry::class.java)
         }
     }
+
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Garden Composter")
+
+        event.addIrrelevant {
+            add("currentOrganicMatterItem: $currentOrganicMatterItem")
+            add("currentFuelItem: $currentFuelItem")
+
+            println(" ")
+            val composterUpgrades = ComposterAPI.composterUpgrades
+            if (composterUpgrades == null) {
+                println("composterUpgrades is null")
+            } else {
+                for ((a, b) in composterUpgrades) {
+                    println("upgrade $a: $b")
+                }
+            }
+
+            println(" ")
+            val tabListData = ComposterAPI.tabListData
+            for ((a, b) in tabListData) {
+                println("tabListData $a: $b")
+            }
+        }
+    }
 }

From ccdca342626e439f410f1de4bd5dc1a1790605f3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:07:37 +0200
Subject: [PATCH 190/721] Fix: Odin Truffle (#2300)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt |  2 +-
 .../skyhanni/features/inventory/HeldTimeInLore.kt      |  5 ++++-
 .../at/hannibal2/skyhanni/utils/CollectionUtils.kt     | 10 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt
index 1a987e6f9032..4f6269c81745 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt
@@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.Cancelable
 class LorenzToolTipEvent(val slot: Slot, val itemStack: ItemStack, private val toolTip0: MutableList<String>) :
     LorenzEvent() {
 
-    var toolTip
+    var toolTip: MutableList<String>
         set(value) {
             toolTip0.clear()
             toolTip0.addAll(value)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HeldTimeInLore.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HeldTimeInLore.kt
index 6b2f97fbd38b..327e38aabea5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HeldTimeInLore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HeldTimeInLore.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.inventory
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrInsert
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -28,7 +29,7 @@ object HeldTimeInLore {
         val seconds = event.itemStack.getSeconds() ?: return
         val formatted = seconds.seconds.format()
 
-        event.toolTip.add(10, "§7Time Held: §b$formatted")
+        event.toolTip.addOrInsert(10, "§7Time Held: §b$formatted")
     }
 
     private fun ItemStack.getSeconds(): Int? = when (getInternalName()) {
@@ -37,3 +38,5 @@ object HeldTimeInLore {
         else -> null
     }
 }
+
+
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 33e85e2fe019..9590ba5c1f78 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -429,4 +429,14 @@ object CollectionUtils {
     fun <K, V : Any> Map<K?, V>.filterNotNullKeys(): Map<K, V> {
         return filterKeys { it != null } as Map<K, V>
     }
+
+    /**
+     * Inserts the element at the index or appends it to the end if out of bounds of the list.
+     *
+     * @param index index to insert at, or append if >= size
+     * @param element element to insert or add
+     */
+    fun <E> MutableList<E>.addOrInsert(index: Int, element: E) {
+        if (index < size) add(index, element) else add(element)
+    }
 }

From 7739e2986b154b7ac30a4d603517d140a38e2ce3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:07:42 +0200
Subject: [PATCH 191/721] Fix: Green Zorros Thumb Cape FF lore (#2299)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/FarmingFortuneDisplay.kt  | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
index edc5f17ee137..29b92f24afd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
@@ -44,33 +44,33 @@ object FarmingFortuneDisplay {
     private val patternGroup = RepoPattern.group("garden.fortunedisplay")
     private val universalTabFortunePattern by patternGroup.pattern(
         "tablist.universal",
-        " Farming Fortune: §r§6☘(?<fortune>\\d+)"
+        " Farming Fortune: §r§6☘(?<fortune>\\d+)",
     )
     private val cropSpecificTabFortunePattern by patternGroup.pattern(
         "tablist.cropspecific",
-        " (?<crop>Wheat|Carrot|Potato|Pumpkin|Sugar Cane|Melon|Cactus|Cocoa Beans|Mushroom|Nether Wart) Fortune: §r§6☘(?<fortune>\\d+)"
+        " (?<crop>Wheat|Carrot|Potato|Pumpkin|Sugar Cane|Melon|Cactus|Cocoa Beans|Mushroom|Nether Wart) Fortune: §r§6☘(?<fortune>\\d+)",
     )
     private val collectionPattern by patternGroup.pattern(
         "collection",
-        "§7You have §6\\+(?<ff>\\d{1,3})☘ .*"
+        "§7You have §6\\+(?<ff>\\d{1,3})☘ .*",
     )
     private val tooltipFortunePattern by patternGroup.pattern(
         "tooltip.new",
-        "^§7Farming Fortune: §a\\+(?<display>[\\d.]+)(?: §2\\(\\+\\d\\))?(?: §9\\(\\+(?<reforge>\\d+)\\))?(?: §d\\(\\+(?<gemstone>\\d+)\\))?\$"
+        "^§7Farming Fortune: §a\\+(?<display>[\\d.]+)(?: §2\\(\\+\\d\\))?(?: §9\\(\\+(?<reforge>\\d+)\\))?(?: §d\\(\\+(?<gemstone>\\d+)\\))?\$",
     )
     private val armorAbilityPattern by patternGroup.pattern(
         "armorability",
-        "Tiered Bonus: .* [(](?<pieces>.*)/4[)]"
+        "Tiered Bonus: .* [(](?<pieces>.*)/4[)]",
     )
     private val lotusAbilityPattern by patternGroup.pattern(
         "lotusability",
-        "§7Piece Bonus: §6+(?<bonus>.*)☘"
+        "§7Piece Bonus: §6+(?<bonus>.*)☘",
     )
 
     // todo make pattern work on Melon and Cropie armor
     private val armorAbilityFortunePattern by patternGroup.pattern(
         "armorabilityfortune",
-        "§7.*§7Grants §6(?<bonus>.*)☘.*"
+        "§7.*§7Grants §6(?<bonus>.*)☘.*",
     )
 
     private var display = emptyList<Renderable>()
@@ -168,8 +168,8 @@ object FarmingFortuneDisplay {
             Renderable.string(
                 "§6Farming Fortune§7: §e" + if (!recentlySwitchedTool && farmingFortune != -1.0) {
                     farmingFortune.round(0).addSeparators()
-                } else "§7" + (displayCrop.getLatestTrueFarmingFortune()?.addSeparators() ?: "?")
-            )
+                } else "§7" + (displayCrop.getLatestTrueFarmingFortune()?.addSeparators() ?: "?"),
+            ),
         )
         add(Renderable.horizontalContainer(list))
 
@@ -189,27 +189,31 @@ object FarmingFortuneDisplay {
 
     private fun drawMissingFortuneDisplay(cropFortune: Boolean) = buildList {
         if (cropFortune) {
-            add(Renderable.clickAndHover(
-                "§cNo Crop Fortune Found! Enable The Stats Widget",
-                listOf(
-                    "§cEnable the Stats widget and enable",
-                    "§cshowing latest Crop Fortune."
+            add(
+                Renderable.clickAndHover(
+                    "§cNo Crop Fortune Found! Enable The Stats Widget",
+                    listOf(
+                        "§cEnable the Stats widget and enable",
+                        "§cshowing latest Crop Fortune.",
+                    ),
+                    onClick = {
+                        HypixelCommands.widget()
+                    },
                 ),
-                onClick = {
-                    HypixelCommands.widget()
-                }
-            ))
+            )
         } else {
-            add(Renderable.clickAndHover(
-                "§cNo Farming Fortune Found! Enable The Stats Widget",
-                listOf(
-                    "§cEnable the Stats widget and enable",
-                    "§cshowing the Farming Fortune stat."
+            add(
+                Renderable.clickAndHover(
+                    "§cNo Farming Fortune Found! Enable The Stats Widget",
+                    listOf(
+                        "§cEnable the Stats widget and enable",
+                        "§cshowing the Farming Fortune stat.",
+                    ),
+                    onClick = {
+                        HypixelCommands.widget()
+                    },
                 ),
-                onClick = {
-                    HypixelCommands.widget()
-                }
-            ))
+            )
         }
     }
 
@@ -300,7 +304,7 @@ object FarmingFortuneDisplay {
         val dedicationLevel = tool?.getEnchantments()?.get("dedication") ?: 0
         val dedicationMultiplier = listOf(0.0, 0.5, 0.75, 1.0, 2.0)[dedicationLevel]
         val cropMilestone = GardenCropMilestones.getTierForCropCount(
-            cropType.getCounter(), cropType
+            cropType.getCounter(), cropType,
         )
         return dedicationMultiplier * cropMilestone
     }
@@ -355,11 +359,14 @@ object FarmingFortuneDisplay {
 
             itemBaseFortune = if (tool.getInternalName().contains("LOTUS")) {
                 5.0
+            } else if (tool.getInternalName().equals("ZORROS_CAPE")) {
+                10.0
             } else {
                 val dummiesFF = (tool.getFarmingForDummiesCount() ?: 0) * 1.0
                 displayedFortune - reforgeFortune - gemstoneFortune - pesterminatorFortune - enchantmentFortune - dummiesFF
             }
-            greenThumbFortune = if (tool.getInternalName().contains("LOTUS")) {
+
+            greenThumbFortune = if (tool.getInternalName().let { it.contains("LOTUS") || it.equals("ZORROS_CAPE") }) {
                 displayedFortune - reforgeFortune - itemBaseFortune
             } else 0.0
         }

From 38505f7d513368327028e3d80213432beebd174f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:07:55 +0200
Subject: [PATCH 192/721] Fix: Visitor Shopping List AH items (#2297)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/visitor/GardenVisitorFeatures.kt       | 7 ++++++-
 .../java/at/hannibal2/skyhanni/utils/HypixelCommands.kt    | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 3372c2abd0f7..73384c9f0e43 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -23,6 +23,7 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.blockReason
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi
+import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.isBazaarItem
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
@@ -201,7 +202,11 @@ object GardenVisitorFeatures {
                         if (Minecraft.getMinecraft().currentScreen is GuiEditSign) {
                             LorenzUtils.setTextIntoSign("$amount")
                         } else {
-                            BazaarApi.searchForBazaarItem(name, amount)
+                            if (internalName.isBazaarItem()) {
+                                BazaarApi.searchForBazaarItem(name, amount)
+                            } else {
+                                HypixelCommands.auctionSearch(name.removeColor())
+                            }
                         }
                     },
                 ) { GardenAPI.inGarden() && !NEUItems.neuHasFocus() },
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
index 4df630dbe040..032b81672133 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@@ -12,6 +12,10 @@ object HypixelCommands {
         send("bz $searchTerm")
     }
 
+    fun auctionSearch(searchTerm: String) {
+        send("ahs $searchTerm")
+    }
+
     fun playtime() {
         send("playtime")
     }

From 32e7a457983a0a6050d7db8bd99dec52a5164979 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:08:09 +0200
Subject: [PATCH 193/721] Fix: Dungeon Finder item lore wrong item (#2298)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/dungeon/DungeonFinderFeatures.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index d3a3692019f7..c7a8675fcc21 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -297,7 +297,7 @@ object DungeonFinderFeatures {
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!isEnabled()) return
         if (!inInventory) return
-        val toolTip = toolTipMap[event.slot.slotIndex]
+        val toolTip = toolTipMap[event.slot.slotNumber]
         if (toolTip.isNullOrEmpty()) return
         // TODO @Thunderblade73 fix that to "event.toolTip = toolTip"
         val oldToolTip = event.toolTip

From 7a6c175ead0be52201f62d116dba953e5e112fa8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:08:16 +0200
Subject: [PATCH 194/721] Fix: Contributor nametag flicker Patcher (#2296)

Co-authored-by: nea <nea@nea.moe>
---
 .../java/at/hannibal2/skyhanni/data/EntityData.kt  | 11 +++++------
 .../events/entity/EntityDisplayNameEvent.kt        |  4 ++--
 .../skyhanni/mixins/transformers/MixinEntity.java  | 14 ++++++++------
 .../mixins/transformers/MixinEntityPlayer.java     | 13 ++++++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
index c8e90fd279f7..c4e5fd7e76db 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
@@ -23,16 +23,15 @@ import net.minecraft.entity.item.EntityItem
 import net.minecraft.entity.item.EntityItemFrame
 import net.minecraft.entity.item.EntityXPOrb
 import net.minecraft.network.play.server.S1CPacketEntityMetadata
-import net.minecraft.util.IChatComponent
+import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import kotlin.time.Duration.Companion.milliseconds
 
 @SkyHanniModule
 object EntityData {
 
     private val maxHealthMap = mutableMapOf<EntityLivingBase, Int>()
-    private val nametagCache = TimeLimitedCache<Entity, IChatComponent>(50.milliseconds)
+    private val nametagCache = TimeLimitedCache<Entity, ChatComponentText>(50.milliseconds)
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -95,11 +94,11 @@ object EntityData {
     }
 
     @JvmStatic
-    fun getDisplayName(entity: Entity, ci: CallbackInfoReturnable<IChatComponent>) {
-        ci.returnValue = postRenderNametag(entity, ci.returnValue)
+    fun getDisplayName(entity: Entity, oldValue: ChatComponentText): ChatComponentText {
+        return postRenderNametag(entity, oldValue)
     }
 
-    private fun postRenderNametag(entity: Entity, chatComponent: IChatComponent) = nametagCache.getOrPut(entity) {
+    private fun postRenderNametag(entity: Entity, chatComponent: ChatComponentText) = nametagCache.getOrPut(entity) {
         val event = EntityDisplayNameEvent(entity, chatComponent)
         event.postAndCatch()
         event.chatComponent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt
index 1a3bcfed4280..c4d24eb0a2c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt
@@ -2,6 +2,6 @@ package at.hannibal2.skyhanni.events.entity
 
 import at.hannibal2.skyhanni.events.LorenzEvent
 import net.minecraft.entity.Entity
-import net.minecraft.util.IChatComponent
+import net.minecraft.util.ChatComponentText
 
-class EntityDisplayNameEvent(val entity: Entity, var chatComponent: IChatComponent) : LorenzEvent()
+class EntityDisplayNameEvent(val entity: Entity, var chatComponent: ChatComponentText) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntity.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntity.java
index 951e65e27863..12f1cdc61f10 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntity.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntity.java
@@ -2,17 +2,19 @@
 
 import at.hannibal2.skyhanni.data.EntityData;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ChatComponentText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(Entity.class)
 public abstract class MixinEntity {
 
-    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
-    public void getDisplayName(CallbackInfoReturnable<IChatComponent> ci) {
-        EntityData.getDisplayName((Entity) (Object) this, ci);
+    @ModifyVariable(
+        method = "getDisplayName",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ChatStyle;setInsertion(Ljava/lang/String;)Lnet/minecraft/util/ChatStyle;", shift = At.Shift.AFTER)
+    )
+    public ChatComponentText getDisplayName(ChatComponentText value) {
+        return EntityData.getDisplayName((Entity) (Object) this, value);
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityPlayer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityPlayer.java
index 4a0d4d4a3564..876ea1c8b89d 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityPlayer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityPlayer.java
@@ -2,17 +2,20 @@
 
 import at.hannibal2.skyhanni.data.EntityData;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(EntityPlayer.class)
 public class MixinEntityPlayer {
 
-    @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
-    public void getDisplayName(CallbackInfoReturnable<IChatComponent> ci) {
-        EntityData.getDisplayName((EntityPlayer) (Object) this, ci);
+    @ModifyVariable(
+        method = "getDisplayName",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ChatStyle;setInsertion(Ljava/lang/String;)Lnet/minecraft/util/ChatStyle;", shift = At.Shift.AFTER)
+    )
+    public IChatComponent getDisplayName(IChatComponent value) {
+        return EntityData.getDisplayName((EntityPlayer) (Object) this, (ChatComponentText) value);
     }
 }

From 6c79e57b72b6b1dcd2cf83cbcae556e46f3127e3 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:47:30 +0200
Subject: [PATCH 195/721] it didnt like the comma (#2319)

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
---
 .../features/gui/customscoreboard/ScoreboardPattern.kt    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 20914000e540..2101409d13d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -162,9 +162,15 @@ object ScoreboardPattern {
 
     // farming
     private val farmingSb = scoreboardGroup.group("farming")
+
+    /**
+     * REGEX-TEST: §6§lGOLD §fmedals: §6111
+     * REGEX-TEST: §f§lSILVER §fmedals: §f1,154
+     * REGEX-TEST: §c§lBRONZE §fmedals: §c268
+     */
     val medalsPattern by farmingSb.pattern(
         "medals",
-        "§[6fc]§l(GOLD|SILVER|BRONZE) §fmedals: §[6fc]\\d+$",
+        "§[6fc]§l(GOLD|SILVER|BRONZE) §fmedals: §[6fc][\\d.,]+",
     )
     val lockedPattern by farmingSb.pattern(
         "locked",

From 8ef8330097d0f161b1d9506825165b99ff3baa25 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Thu, 8 Aug 2024 10:17:39 +0200
Subject: [PATCH 196/721] Fix: Added DYE to Item Category (#2315)

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
index 3c0673c648dc..4549e2be2626 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -52,6 +52,7 @@ enum class ItemCategory {
     PORTAL,
     SACK,
     CHISEL,
+    DYE,
 
     NONE,
     ;

From 66e1d1ff31a32532a301eeefa0f592c0fb3ad703 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Fri, 9 Aug 2024 00:03:22 +1000
Subject: [PATCH 197/721] fix pet regex (#2312)

---
 src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
index dfe57cc5cb0f..d79320603e76 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt
@@ -23,7 +23,7 @@ object PetAPI {
     )
     private val neuRepoPetItemName by patternGroup.pattern(
         "item.name.neu.format",
-        "(?:§f§f)?§7\\[Lvl 1➡(?:100|200)] (?<name>.*)",
+        "(?:§f§f)?§7\\[Lvl (?:1➡(?:100|200)|\\{LVL})] (?<name>.*)",
     )
 
     private val ignoredPetStrings = listOf(

From 91f9f44815fbd902a8c134cffe3c902e1f122737 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 8 Aug 2024 16:33:34 +0200
Subject: [PATCH 198/721] fixed /shcommands error when no match

---
 .../skyhanni/features/commands/HelpCommand.kt | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
index 4d4c5d34116a..1890c62930d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
@@ -37,7 +37,7 @@ object HelpCommand {
                 if (description.isNotEmpty()) description.prependIndent("  ") else null,
                 "",
                 "$color§l${category.categoryName}",
-                categoryDescription.prependIndent("  ")
+                categoryDescription.prependIndent("  "),
             )
             this.suggest = "/${command.name}"
         }
@@ -46,12 +46,15 @@ object HelpCommand {
     private fun showPage(
         page: Int,
         search: String,
-        commands: List<Commands.CommandInfo>
+        commands: List<Commands.CommandInfo>,
     ) {
         val filtered = commands.filter {
             it.name.contains(search, ignoreCase = true) || it.description.contains(search, ignoreCase = true)
         }
-        val maxPage = ceil(filtered.size.toDouble() / COMMANDS_PER_PAGE).toInt()
+
+        val maxPage = if (filtered.isNotEmpty()) {
+            ceil(filtered.size.toDouble() / COMMANDS_PER_PAGE).toInt()
+        } else 1
         val page = page.coerceIn(1, maxPage)
         val title = if (search.isEmpty()) "§6SkyHanni Commands" else "§6SkyHanni Commands matching '$search'"
 
@@ -59,19 +62,21 @@ object HelpCommand {
 
         text.add(createDivider())
         text.add(title.asComponent().center())
-        text.add(Text.join(
-            if (page > 1) "§6§l<<".asComponent {
-                this.hover = "§eClick to view page ${page - 1}".asComponent()
-                this.onClick { showPage(page - 1, search, commands) }
-            } else null,
-            " ",
-            "§6(Page $page of $maxPage)",
-            " ",
-            if (page < maxPage) "§6§l>>".asComponent {
-                this.hover = "§eClick to view page ${page + 1}".asComponent()
-                this.onClick { showPage(page + 1, search, commands) }
-            } else null
-        ).center())
+        text.add(
+            Text.join(
+                if (page > 1) "§6§l<<".asComponent {
+                    this.hover = "§eClick to view page ${page - 1}".asComponent()
+                    this.onClick { showPage(page - 1, search, commands) }
+                } else null,
+                " ",
+                "§6(Page $page of $maxPage)",
+                " ",
+                if (page < maxPage) "§6§l>>".asComponent {
+                    this.hover = "§eClick to view page ${page + 1}".asComponent()
+                    this.onClick { showPage(page + 1, search, commands) }
+                } else null,
+            ).center(),
+        )
         text.add(createDivider())
 
         if (filtered.isEmpty()) {

From 2bdf02246996a59b76e2659ac2790cb4d142dd25 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Thu, 8 Aug 2024 20:06:57 +0200
Subject: [PATCH 199/721] Fix: Jasper Gemstone Color (#2257)

---
 src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 1d1a42daf491..5b9c19556fc5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -176,7 +176,7 @@ enum class OreBlock(
         checkArea = { inCrystalHollows || inGlacite },
     ),
     JASPER(
-        checkBlock = { it.isGemstoneWithColor(EnumDyeColor.PINK) },
+        checkBlock = { it.isGemstoneWithColor(EnumDyeColor.MAGENTA) },
         checkArea = { inCrystalHollows || inGlacite },
     ),
     OPAL(

From 3acd4e1063e387414ca27075811f49ee82ef7515 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:07:58 +0200
Subject: [PATCH 200/721] Fix: Colored Month in Discord RPC (#2314)

---
 .../skyhanni/features/misc/discordrpc/DiscordStatus.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 0094787870d8..6eff315d387a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -167,9 +167,11 @@ enum class DiscordStatus(private val displayMessageSupplier: (() -> String?)) {
         } ?: "No item in hand"
     }),
 
-    TIME({
-        SkyBlockTime.now().formatted()
-    }),
+    TIME(
+        {
+            SkyBlockTime.now().formatted().removeColor()
+        },
+    ),
 
     PROFILE({
         val sbLevel = AdvancedPlayerList.tabPlayerData[LorenzUtils.getPlayerName()]?.sbLevel?.toString() ?: "?"

From adbe86cf9e446e14a51eb72b695da8809fb4dd5b Mon Sep 17 00:00:00 2001
From: not-a-cow <kly3aswd@gmail.com>
Date: Thu, 8 Aug 2024 11:08:55 -0700
Subject: [PATCH 201/721] Fix: Clicking on weight pass chat message (#2303)

Co-authored-by: Andrew Gielow <awgielow@gmail.com>
---
 .../skyhanni/features/garden/farming/FarmingWeightDisplay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index ffd778aa36bc..7133cf1fb301 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -362,7 +362,7 @@ object FarmingWeightDisplay {
                 "§eClick to open your Farming Weight",
                 "§eprofile on §celitebot.dev",
             ),
-            "shfarmingprofile ${LorenzUtils.getPlayerName()}",
+            "/shfarmingprofile ${LorenzUtils.getPlayerName()}",
         )
     }
 

From d55688322b0a79adca15d9a3bb0bf66970293874 Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:09:52 +0100
Subject: [PATCH 202/721] Fix: Chroma Preview text showing in white (#2302)

---
 .../skyhanni/mixins/hooks/FontRendererHook.kt         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
index ad6232646d4b..db9c1c07e1c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.features.chroma.ChromaFontRenderer
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption
 import net.minecraft.client.renderer.GlStateManager
 
 /**
@@ -27,9 +28,17 @@ object FontRendererHook {
 
     private var currentDrawState: ChromaFontRenderer? = null
     private var previewChroma = false
+    private var chromaPreviewText: String
 
     var cameFromChat = false
 
+    init {
+        // Get the description text from the ConfigOption annotation from the chromaPreview field to check against
+        val fields = config::class.java.declaredFields
+        val previewField = fields.first { it.name == "chromaPreview" } // Pls no one change the config field name
+        chromaPreviewText = previewField.getAnnotation(ConfigOption::class.java).desc
+    }
+
     /**
      * Setups the [ChromaFontRenderer][at.hannibal2.skyhanni.features.chroma.ChromaFontRenderer] for rendering text
      * in chroma. This should only be used when you don't have control over the color code a string uses, or it
@@ -71,7 +80,7 @@ object FontRendererHook {
             return
         }
 
-        if (text == "§fPlease star the mod on GitHub!") {
+        if (text == chromaPreviewText) {
             previewChroma = true
             setupChromaFont()
         }

From 212d0c13382de90c252c82b7ad5722750fbfe9b9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:11:30 +0200
Subject: [PATCH 203/721] formatting

---
 .../skyhanni/features/garden/fortuneguide/FarmingItems.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
index b46d6ebe4066..bdfe98abfff2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FarmingItems.kt
@@ -142,10 +142,10 @@ enum class FarmingItems(
 
         fun getArmorDisplay(clickEnabled: Boolean = false): List<Renderable> = armor.map { it.getDisplay(clickEnabled) }
 
-        fun getEquipmentDisplay(clickEnabled: Boolean = false): List<Renderable> =
-            equip.map { it.getDisplay(clickEnabled) }
+        fun getEquipmentDisplay(clickEnabled: Boolean = false): List<Renderable> = equip.map { it.getDisplay(clickEnabled) }
 
         fun getPetsDisplay(clickEnabled: Boolean = false): List<Renderable> = pets.map { it.getDisplay(clickEnabled) }
+
         fun resetClickState() {
             entries.filterNot { pets.contains(it) }.forEach { it.selectedState = false }
         }

From ed31de3b9ee04860cad66f22cc99bee8dcb41f16 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:27:15 +0200
Subject: [PATCH 204/721] Version 0.26 Beta 21

---
 build.gradle.kts                              |  2 +-
 docs/CHANGELOG.md                             | 32 +++++++++++++++++++
 docs/FEATURES.md                              |  4 ++-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9081713ef050..8aaa2d638248 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.20"
+version = "0.26.Beta.21"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 35b272a88530..06d0d263b395 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -113,6 +113,8 @@
 + Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
     + Can be enabled/disabled on the Item Number list.
 + Added Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
++ Added Tactical Insertion Ability Cooldown feature. - DungeonHub (https://github.com/hannibal002/SkyHanni/pull/2278)
++ Display the price per Stonk when taking the minimum bid in the Stonks Auction (Richard Menu). - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2195)
 
 #### Fishing Features
 
@@ -307,6 +309,7 @@
 + Reverted item source names to shorter format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2233)
 + Rounded corner smoothness now applies to custom Scoreboard textures. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2228)
 + Reduced the frequency of "tab list not found" error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2266)
++ Hide Beacon Power display while on a Bingo profile. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2286)
 
 ### Fixes
 
@@ -341,6 +344,10 @@
 + Fixed TunnelMaps not resetting on lobby swap. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2275)
 + Fixed a rare error when detecting corpses in the Mineshaft. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2268)
 + Fixed incorrect maximum Powder value on HotM perks when disabled. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2269)
++ Fixed HOTM levels being saved incorrectly if the menu was opened with a Blue Egg Cheese Drill in hand. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2295)
++ Fixed Flawless Gemstones not being formatted correctly when the Powder Mining filter is enabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2281)
++ Fixed Peak of the Mountain always being disabled. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2282)
++ Fixed an issue where TunnelMaps could stop functioning. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2277)
 
 #### Garden Fixes
 
@@ -369,6 +376,10 @@
 + Fixed Dicer Tracker Reset Button misalignment. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2248)
 + Fixed errors when selecting Fine Flour with the Sprayonator. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2251)
 + Fixed typos in the FF guide. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2273)
++ Fixed command sent in chat for Farming Weight Display. - not-a-cow (https://github.com/hannibal002/SkyHanni/pull/2303)
++ Fixed visitor shopping list with AH items. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2297)
++ Fixed Zorro's Cape not working with Green Thumb in the FF stats breakdown in item lore. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2299)
++ Fixed Composter Overlay calculating incorrectly while Composter Display is disabled. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2294)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -399,6 +410,7 @@
 + Fixed buying items sometimes triggering compact Hoppity messages. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2201)
 + Fixed Hoppity Chat Compact not working outside of Hoppity's event for Abiphone users who have Hoppity as a contact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2250)
 + Fixed stray rabbit production time tooltip display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2239)
++ Fixed Hoppity custom goals being off by one level. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2280)
 
 #### Custom Scoreboard Fixes
 
@@ -419,6 +431,7 @@
 + Fixed 2 Custom Scoreboard Errors while in Kuudra. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2236)
 + Fixed Scoreboard Reset not updating the draggable list. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2252)
 + Fixed a scoreboard error message when a Hypixel bug shows a negative number of magma cubes remaining in the scoreboard. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2267)
++ Fixed Custom Scoreboard Error when having more than 1000 medals. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2319)
 
 #### Dungeon Fixes
 
@@ -428,12 +441,14 @@
 + Fixed Dungeons in DiscordRPC not showing the elapsed time. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2089)
 + Fixed multiple empty lines appearing in Custom Scoreboard while in Dungeons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2082)
 + Fixed Livid Finder not working with Magenta Livid. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2086)
++ Fixed the dungeon finder item lore displaying on other items in the inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2298)
 
 #### Commands Fixes
 
 + Fixed typo in /shclearkismet command. - fahr-plan (https://github.com/hannibal002/SkyHanni/pull/1912)
 + Fixed 'viewrecipe' lowercase not working. - Obsidian + hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1939)
 + Fixed rare cases where queued /gfs didn't work. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1999)
++ Fixed an additional empty /shcommands page from appearing. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2287)
 
 #### Fishing Fixes
 
@@ -480,6 +495,10 @@
 + Fixed price source inconsistencies (Bazaar sell/buy and NPC prices). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2221)
 + Fixed Carnival Masks not being detected by Reforge Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2244)
 + Fixed a typo in the Item Pickup Log config. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2271)
++ Fixed a bug in SkyHanni's Time Held in Lore with Coca Truffle when using Odin. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2300)
++ Fixed sack changes appearing with a delay in the Item Pickup Log. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2292)
++ Fixed Item Pickup Log error with Wisp Potion. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2291)
++ Fixed Carnival Masks not being clickable in `/equipment`. - Luna (https://github.com/hannibal002/SkyHanni/pull/2293)
 
 #### Combat Fixes
 
@@ -493,6 +512,11 @@
 + Fixed stash getting detected as a private message. - sayomaki (https://github.com/hannibal002/SkyHanni/pull/2060)
 + Fix Guild Rank formatting having an extra space. - Empa (https://github.com/hannibal002/SkyHanni/pull/2191)
 
+#### Crimson Fixes
+
++ Fixed Pablo Helper not functioning when called via Abiphone. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2288)
++ Fixed reputation helper keybind activating while inside GUIs. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2284)
+
 #### Misc Fixes
 
 + Fixed LorenzToolTipEvent triggering when not actually hovering over an item. -
@@ -523,6 +547,10 @@
 + Fixed a typo in /shcommands. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2223)
 + Fixed multiple features not showing a duration when it was less than one second. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2261)
 + Fixed some incorrect boxes in the GUI editor. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2260)
++ Fixed chroma preview always being white. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2302)
++ Fixed Contributor name tag flickering when using Patcher. - nea (https://github.com/hannibal002/SkyHanni/pull/2296)
++ Fixed Discord Rich Presence dynamic fallback. - NetheriteMiner (https://github.com/hannibal002/SkyHanni/pull/2279)
+    + Placeholder messages that should not be visible will no longer appear.
 
 ### Technical Details
 
@@ -636,6 +664,10 @@
 + Added renderRenderableDouble. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2260)
     + A direct replacement for renderStringsAndItems.
 + Changed detecting active mayor to no longer use the number of votes. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2227)
++ Fixed wrong color for Jasper gemstone in OreBlock API. - Luna (https://github.com/hannibal002/SkyHanni/pull/2257)
++ Added DYE to Item Category. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2315)
++ Added /shdebugprice command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2289)
++ Cache rewardPatterns in the powder chat filter. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2276)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 139d30b41c7e..dc90ea4cf2da 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -217,7 +217,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Optionally show the different stat values compared to the current reforge.
 + Show Bestiary Level as Stack Size. - saga (https://github.com/hannibal002/SkyHanni/pull/1945)
     + Can be enabled/disabled on the Item Number list.
-+ Added Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
++ Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
++ Display the price per Stonk when taking the minimum bid in the Stonks Auction (Richard Menu). - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2195)
 
 </details>
 <details open><summary>
@@ -234,6 +235,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Lesser Orb of Healing Hider. - jani
 + Wand of Strength cooldown is now displayed. - saga (https://github.com/hannibal002/SkyHanni/pull/1948)
     + The cooldown displayed is for the buff, not the item usage.
++ Added Tactical Insertion Ability Cooldown feature. - DungeonHub (https://github.com/hannibal002/SkyHanni/pull/2278)
 
 </details>
 <details open><summary>
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index bd7f743ad3db..00312da7ed1e 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.20",
+    version = "0.26.Beta.21",
 )
 class SkyHanniMod {
 

From 30397bb0ac74a11c90f5dccf803361bbd49bea59 Mon Sep 17 00:00:00 2001
From: Fazfoxy <78978526+Fazfoxy@users.noreply.github.com>
Date: Fri, 9 Aug 2024 07:45:15 +0100
Subject: [PATCH 205/721] Fix: Some Dungeon Features to support changed Master
 Mode text changes in Artist's Adobe update (#2316)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/dungeon/DungeonCleanEnd.kt |  8 +++++++-
 .../features/dungeon/DungeonFinderFeatures.kt    | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index 3b9f023d2e98..eca75bc7014b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -23,9 +23,15 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 object DungeonCleanEnd {
 
     private val config get() = SkyHanniMod.feature.dungeon.cleanEnd
+
+    /**
+     * REGEX-TEST: §f                §r§cMaster Mode The Catacombs §r§8- §r§eFloor III
+     * REGEX-TEST: §f                        §r§cThe Catacombs §r§8- §r§eFloor VI
+     * REGEX-TEST: §f                §r§cMaster Mode Catacombs §r§8- §r§eFloor II
+     */
     private val catacombsPattern by RepoPattern.pattern(
         "dungeon.end.chests.spawned",
-        "(?:§f)?( *)§r§c(The|Master Mode) Catacombs §r§8- §r§eFloor (.*)"
+        "(?:§f)?( *)§r§c(Master Mode )?The Catacombs §r§8- §r§eFloor (.*)",
     )
 
     private var bossDone = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index c7a8675fcc21..93efa204fd7b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -57,9 +57,14 @@ object DungeonFinderFeatures {
         "note",
         "§7§7Note: §f(?<note>.*)"
     )
+
+    /**
+     * REGEX-TEST: The Catacombs
+     * REGEX-TEST: Master Mode The Catacombs
+     */
     private val floorTypePattern by patternGroup.pattern(
         "floor.type",
-        "(The Catacombs).*|.*(MM Catacombs).*"
+        "(The Catacombs).*|.*(Master Mode The Catacombs).*",
     )
     private val checkIfPartyPattern by patternGroup.pattern(
         "check.if.party",
@@ -87,11 +92,16 @@ object DungeonFinderFeatures {
     )
     private val anyFloorPattern by patternGroup.pattern(
         "floor.any",
-        "(Any)"
+        "(Any)",
     )
+
+    /**
+     * REGEX-TEST: Master Mode The Catacombs
+     * REGEX-TEST: The Catacombs
+     */
     private val masterModeFloorPattern by patternGroup.pattern(
         "floor.mastermode",
-        "(MM )|(.*Master Mode Catacombs)"
+        "(MM )|(.*Master Mode The Catacombs)"
     )
     private val dungeonFloorPattern by patternGroup.pattern(
         "floor.dungeon",

From df3b54e906164c349814e4e69ad97c801ef41061 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 9 Aug 2024 03:20:52 -0400
Subject: [PATCH 206/721] Fix: Remove Empty Strings in Powder Filter (#2309)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/chat/PowderMiningChatFilter.kt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 32ce17b8d788..9c100ef47ead 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -19,6 +19,7 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -50,6 +51,14 @@ object PowderMiningChatFilter {
         "§6You have successfully picked the lock on this chest!",
     )
 
+    /**
+     * REGEX-TEST: §cThis chest has already been looted.
+     */
+    private val alreadyLootedPattern by patternGroup.pattern(
+        "warning.alreadylooted",
+        "§cThis chest has already been looted\\.",
+    )
+
     /**
      * REGEX-TEST: §cYou need a tool with a §r§aBreaking Power §r§cof §r§66§r§c to mine Ruby Gemstone Block§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!
      */
@@ -247,6 +256,7 @@ object PowderMiningChatFilter {
         // Generic "you uncovered a chest" message
         if (uncoverChestPattern.matches(message)) return "powder_mining_chest"
         if (successfulPickPattern.matches(message)) return "powder_mining_picked"
+        if (alreadyLootedPattern.matches(message)) return "powder_mining_dupe"
         // Breaking power warning
         if (breakingPowerPattern.matches(message) && gemstoneConfig.strongerToolMessages) return "stronger_tool"
         // Closing or opening a reward 'loop' with the spam of ▬
@@ -256,6 +266,7 @@ object PowderMiningChatFilter {
         }
 
         if (!unclosedRewards) return null
+        if (StringUtils.isEmpty(message)) return "powder_mining_empty"
         if (lockPickedPattern.matches(message)) return "powder_chest_lockpicked"
         if (lootChestCollectedPattern.matches(message)) return "loot_chest_opened"
         if (rewardHeaderPattern.matches((message))) return "powder_reward_header"
@@ -382,6 +393,7 @@ object PowderMiningChatFilter {
                 "flawed" -> if (gemSpecificFilterEntry > GemstoneFilterEntry.FLAWED_UP) {
                     "powder_mining_gemstones"
                 } else "no_filter"
+
                 "fine" -> if (gemSpecificFilterEntry > GemstoneFilterEntry.FINE_UP) {
                     "powder_mining_gemstones"
                 } else "no_filter"

From 9ef75ce1c01beefbcd075d9c8ebc2b50ddaf727b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 9 Aug 2024 09:21:24 +0200
Subject: [PATCH 207/721] fix event filter hiding all empty lines

---
 .../java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index e4e411d4c6d7..303f8de371a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -483,7 +483,10 @@ object ChatFilter {
         config.others && isOthers(message) -> othersMsg
 
         config.winterGift && message.isPresent("winter_gift") -> "winter_gift"
-        config.eventLevelUp && (message.isPresent("event") || StringUtils.isEmpty(message)) -> "event"
+
+        // TODO need proper solution to hide empty messages in event text
+        config.eventLevelUp && (message.isPresent("event")) -> "event"
+
         config.fireSale && (fireSalePattern.matches(message) || message.isPresent("fire_sale")) -> "fire_sale"
         config.factoryUpgrade && message.isPresent("factory_upgrade") -> "factory_upgrade"
         config.sacrifice && message.isPresent("sacrifice") -> "sacrifice"

From 8e4bb1b3c3ef8d7bf9553e56d12738d290f0cb2b Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 9 Aug 2024 10:32:00 +0200
Subject: [PATCH 208/721] Fix: Ore Mined Event (#2307)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index be36bc11b61a..616b618b41c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -20,13 +20,15 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAnyIsland
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import io.netty.util.internal.ConcurrentSet
 import net.minecraft.init.Blocks
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.concurrent.ConcurrentLinkedQueue
 import kotlin.math.absoluteValue
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -37,14 +39,10 @@ object MiningAPI {
     private val group = RepoPattern.group("data.miningapi")
     private val glaciteAreaPattern by group.pattern("area.glacite", "Glacite Tunnels|Glacite Lake")
     private val dwarvenBaseCampPattern by group.pattern("area.basecamp", "Dwarven Base Camp")
-    val coldReset by group.pattern(
+    private val coldReset by group.pattern(
         "cold.reset",
         "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7.",
     )
-    private val coldResetDeath by group.pattern(
-        "cold.deathreset",
-        "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)",
-    )
 
     private data class MinedBlock(val ore: OreBlock, var confirmed: Boolean, val time: SimpleTimeMark = SimpleTimeMark.now())
 
@@ -68,8 +66,8 @@ object MiningAPI {
 
     private var lastSkyblockArea: String? = null
 
-    private var recentClickedBlocks = mutableMapOf<LorenzVec, MinedBlock>()
-    private var surroundingMinedBlocks = mutableMapOf<LorenzVec, MinedBlock>()
+    private val recentClickedBlocks = ConcurrentSet<Pair<LorenzVec, SimpleTimeMark>>()
+    private val surroundingMinedBlocks = ConcurrentLinkedQueue<Pair<MinedBlock, LorenzVec>>()
     private val allowedSoundNames = listOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
 
     var cold: Int = 0
@@ -103,7 +101,7 @@ object MiningAPI {
 
     @SubscribeEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
-        val newCold = event.scoreboard.matchFirst(ScoreboardPattern.coldPattern) {
+        val newCold = ScoreboardPattern.coldPattern.firstMatcher(event.scoreboard) {
             group("cold").toInt().absoluteValue
         } ?: return
 
@@ -116,10 +114,8 @@ object MiningAPI {
     fun onBlockClick(event: BlockClickEvent) {
         if (!inCustomMiningIsland()) return
         if (event.clickType != ClickType.LEFT_CLICK) return
-        val position = event.position
-        val blockState = event.getBlockState
-        val ore = OreBlock.getByStateOrNull(blockState) ?: return
-        recentClickedBlocks[position] = MinedBlock(ore, false)
+        if (OreBlock.getByStateOrNull(event.getBlockState) == null) return
+        recentClickedBlocks += event.position to SimpleTimeMark.now()
     }
 
     @SubscribeEvent
@@ -146,7 +142,7 @@ object MiningAPI {
         if (waitingForInitSound) {
             if (event.soundName != "random.orb" && event.pitch == 0.7936508f) {
                 val pos = event.location.roundLocationToBlock()
-                if (pos !in recentClickedBlocks) return
+                if (recentClickedBlocks.none { it.first == pos }) return
                 waitingForInitSound = false
                 waitingForInitBlock = true
                 waitingForInitBlockPos = event.location.roundLocationToBlock()
@@ -155,8 +151,7 @@ object MiningAPI {
             return
         }
         if (waitingForEffMinerSound) {
-            if (surroundingMinedBlocks.isEmpty()) return
-            val lastBlock = surroundingMinedBlocks.values.minByOrNull { it.time.passedSince() } ?: return
+            val lastBlock = surroundingMinedBlocks.lastOrNull()?.first ?: return
             if (lastBlock.confirmed) return
             waitingForEffMinerSound = false
             lastBlock.confirmed = true
@@ -169,23 +164,24 @@ object MiningAPI {
         if (!inCustomMiningIsland()) return
         if (event.newState.block != Blocks.air) return
         if (event.oldState.block == Blocks.air) return
-        if (event.location.distanceToPlayer() > 7) return
+        val pos = event.location
+        if (pos.distanceToPlayer() > 7) return
 
         if (lastInitSound.passedSince() > 100.milliseconds) return
 
         val ore = OreBlock.getByStateOrNull(event.oldState) ?: return
 
         if (waitingForInitBlock) {
-            if (waitingForInitBlockPos != event.location) return
+            if (waitingForInitBlockPos != pos) return
             waitingForInitBlock = false
-            surroundingMinedBlocks[event.location] = MinedBlock(ore, true)
+            surroundingMinedBlocks += MinedBlock(ore, true) to pos
             waitingForEffMinerBlock = true
             return
         }
         if (waitingForEffMinerBlock) {
-            if (event.location in surroundingMinedBlocks) return
+            if (surroundingMinedBlocks.any { it.second == pos }) return
             waitingForEffMinerBlock = false
-            surroundingMinedBlocks[event.location] = MinedBlock(ore, false)
+            surroundingMinedBlocks += MinedBlock(ore, false) to pos
             waitingForEffMinerSound = true
             return
         }
@@ -201,8 +197,8 @@ object MiningAPI {
         if (currentAreaOreBlocks.isEmpty()) return
 
         // if somehow you take more than 20 seconds to mine a single block, congrats
-        recentClickedBlocks = recentClickedBlocks.filter { it.value.time.passedSince() <= 20.seconds }.toMutableMap()
-        surroundingMinedBlocks = surroundingMinedBlocks.filter { it.value.time.passedSince() <= 20.seconds }.toMutableMap()
+        recentClickedBlocks.removeIf { it.second.passedSince() >= 20.seconds }
+        surroundingMinedBlocks.removeIf { it.first.time.passedSince() >= 20.seconds }
 
         if (waitingForInitSound) return
         if (lastInitSound.passedSince() < 200.milliseconds) return
@@ -211,19 +207,18 @@ object MiningAPI {
 
         if (surroundingMinedBlocks.isEmpty()) return
 
-        val originalBlock = surroundingMinedBlocks.maxByOrNull { it.value.time.passedSince() }?.takeIf { it.value.confirmed }?.value
-            ?: run {
-                surroundingMinedBlocks.clear()
-                recentClickedBlocks.clear()
-                return
-            }
+        val originalBlock = surroundingMinedBlocks.firstOrNull { it.first.confirmed }?.first ?: run {
+            surroundingMinedBlocks.clear()
+            recentClickedBlocks.clear()
+            return
+        }
 
-        val extraBlocks = surroundingMinedBlocks.values.filter { it.confirmed }.countBy { it.ore }
+        val extraBlocks = surroundingMinedBlocks.filter { it.first.confirmed }.countBy { it.first.ore }
 
         OreMinedEvent(originalBlock.ore, extraBlocks).post()
 
         surroundingMinedBlocks.clear()
-        recentClickedBlocks = recentClickedBlocks.filter { it.value.time.passedSince() < originalBlock.time.passedSince() }.toMutableMap()
+        recentClickedBlocks.removeIf { it.second.passedSince() >= originalBlock.time.passedSince() }
     }
 
     @SubscribeEvent
@@ -264,7 +259,7 @@ object MiningAPI {
             add("waitingForInitBlockPos: $waitingForInitBlockPos")
             add("waitingForEffMinerSound: $waitingForEffMinerSound")
             add("waitingForEffMinerBlock: $waitingForEffMinerBlock")
-            add("recentClickedBlocks: ${recentClickedBlocks.entries.joinToString { it.key.toCleanString() }}")
+            add("recentlyClickedBlocks: ${recentClickedBlocks.joinToString { "(${it.first.toCleanString()}" }}")
         }
     }
 

From d167b0e7f493a05c12ffc032b27641e434e49a4b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 9 Aug 2024 10:33:32 +0200
Subject: [PATCH 209/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 616b618b41c0..e97d25c52516 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -39,6 +39,8 @@ object MiningAPI {
     private val group = RepoPattern.group("data.miningapi")
     private val glaciteAreaPattern by group.pattern("area.glacite", "Glacite Tunnels|Glacite Lake")
     private val dwarvenBaseCampPattern by group.pattern("area.basecamp", "Dwarven Base Camp")
+
+    // TODO rename to include suffix "pattern", add regex test
     private val coldReset by group.pattern(
         "cold.reset",
         "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7.",

From 894334db3abe18bb7260fcaac53f7ae548cd7c42 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 10 Aug 2024 00:50:32 +0200
Subject: [PATCH 210/721] Fix: Shift Clicking Items Triggering Pickup Log
 (#2305)

---
 .../features/inventory/ItemPickupLog.kt       | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index fd2d4623bd7f..6b45d5d9ef02 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.PurseChangeEvent
 import at.hannibal2.skyhanni.events.SackChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addItemStack
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemNameResolver
@@ -38,16 +37,36 @@ import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object ItemPickupLog {
-    enum class DisplayLayout(private val display: String) {
-        CHANGE_AMOUNT("§a+256"),
-        ICON("§e✎"),
-        ITEM_NAME("§d[:3] TransRights's Cake Soul"),
+    enum class DisplayLayout(private val display: String, val renderable: (PickupEntry, String) -> Renderable) {
+        CHANGE_AMOUNT(
+            "§a+256",
+            { entry, prefix ->
+                val formattedAmount = if (config.shorten) entry.amount.shortFormat() else entry.amount.addSeparators()
+                Renderable.string("${prefix}${formattedAmount}")
+            },
+        ),
+        ICON(
+            "§e✎",
+            { entry, _ ->
+                val itemIcon = entry.neuInternalName?.getItemStackOrNull()
+                if (itemIcon != null) {
+                    Renderable.itemStack(itemIcon)
+                } else {
+                    ItemNameResolver.getInternalNameOrNull(entry.name)?.let { Renderable.itemStack(it.getItemStack()) }
+                        ?: Renderable.string("§c?")
+                }
+            },
+        ),
+        ITEM_NAME(
+            "§d[:3] TransRights's Cake Soul",
+            { entry, _ -> Renderable.string(entry.name) },
+        ),
         ;
 
         override fun toString() = display
     }
 
-    private data class PickupEntry(val name: String, var amount: Long, val neuInternalName: NEUInternalName?) {
+    data class PickupEntry(val name: String, var amount: Long, val neuInternalName: NEUInternalName?) {
         var timeUntilExpiry = SimpleTimeMark.now()
 
         fun updateAmount(change: Long) {
@@ -117,6 +136,7 @@ object ItemPickupLog {
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
+        if (InventoryUtils.inInventory()) return
 
         val oldItemList = mutableMapOf<Int, Pair<ItemStack, Int>>()
 
@@ -183,25 +203,7 @@ object ItemPickupLog {
         buildList {
             val displayLayout: List<DisplayLayout> = config.displayLayout
             for (item in displayLayout) {
-                when (item) {
-                    DisplayLayout.ICON -> {
-                        val itemIcon = entry.neuInternalName?.getItemStackOrNull()
-                        if (itemIcon != null) {
-                            addItemStack(itemIcon)
-                        } else {
-                            ItemNameResolver.getInternalNameOrNull(entry.name)?.let { addItemStack(it) }
-                        }
-                    }
-
-                    DisplayLayout.CHANGE_AMOUNT -> {
-                        val formattedAmount = if (config.shorten) entry.amount.shortFormat() else entry.amount.addSeparators()
-                        add(Renderable.string("${prefix}${formattedAmount}"))
-                    }
-
-                    DisplayLayout.ITEM_NAME -> {
-                        add(Renderable.string(entry.name))
-                    }
-                }
+                add(item.renderable(entry, prefix))
             }
         },
     )

From a2466409114bc570e8e8ab92e30be8c24794441f Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sat, 10 Aug 2024 00:54:51 +0200
Subject: [PATCH 211/721] Fix: Incorrect "This item has no attributes" message
 (#2304)

---
 .../features/inventory/HideNotClickableItems.kt   |  3 ++-
 .../java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 15 ---------------
 .../skyhanni/utils/SkyBlockItemModifierUtils.kt   |  2 ++
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index b7163312287d..2e549313ce3a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -39,6 +39,7 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawBorder
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasAttributes
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isMuseumDonated
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftExportable
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftTransferable
@@ -330,7 +331,7 @@ object HideNotClickableItems {
 
         showGreenLine = true
 
-        if (ItemUtils.hasAttributes(stack)) return false
+        if (stack.hasAttributes()) return false
 
         hideReason = "This item has no attributes!"
         return true
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 580ee2a954f8..95dad660c50b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -14,8 +14,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonObject
 import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
@@ -78,19 +76,6 @@ object ItemUtils {
         return list
     }
 
-    fun hasAttributes(stack: ItemStack): Boolean {
-        if (!stack.hasTagCompound()) return false
-        val tagCompound = stack.tagCompound
-        if (!tagCompound.hasKey("ExtraAttributes")) return false
-        val extraAttributes = tagCompound.getCompoundTag("ExtraAttributes")
-        try {
-            val json = GsonBuilder().create().fromJson(extraAttributes.toString(), JsonObject::class.java)
-            return json.has("attributes")
-        } catch (_: Exception) {
-            return false
-        }
-    }
-
     fun ItemStack.getInternalName() = getInternalNameOrNull() ?: NEUInternalName.NONE
 
     fun ItemStack.getInternalNameOrNull(): NEUInternalName? {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 2b3ece2c721e..7d38fa58b78d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -151,6 +151,8 @@ object SkyBlockItemModifierUtils {
             }.sortedBy { it.first }
         }
 
+    fun ItemStack.hasAttributes() = getAttributes() != null
+
     fun ItemStack.getReforgeName() = getAttributeString("modifier")?.let {
         when {
             it == "pitchin" -> "pitchin_koi"

From 940f557330e3696391a5fb2e59d67dddc1d288fb Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Sat, 10 Aug 2024 08:49:27 +0100
Subject: [PATCH 212/721] Fix: Lore on books with Compressed format + Regex Fix
 (#2301)

---
 .../features/misc/items/enchants/EnchantParser.kt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index 530cd48861c4..a1aacfb0cf05 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -38,7 +38,7 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants", "(?<enchant>[A-Za-z][A-Za-z -]+) (?<levelNumeral>[IVXLCDM]+)(?<stacking>, |\$| \\d{1,3}(,\\d{3})*)"
+        "enchants", "(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+)(?<stacking>, |\$| \\d{1,3}(,\\d{3})*)"
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"
@@ -315,11 +315,18 @@ object EnchantParser {
             val comma = if (commaFormat == CommaFormat.COPY_ENCHANT) ", " else "§9, "
 
             builder.append(orderedEnchant.getFormattedString())
-            if (i % 3 != 2) {
-                builder.append(comma)
-            } else {
+
+            if (itemIsBook() && maxEnchantsPerLine == 1) {
                 insertEnchants.add(builder.toString())
+                insertEnchants.addAll(orderedEnchant.getLore())
                 builder = StringBuilder()
+            } else {
+                if (i % 3 != 2) {
+                    builder.append(comma)
+                } else {
+                    insertEnchants.add(builder.toString())
+                    builder = StringBuilder()
+                }
             }
         }
 

From 35621c1e68ca0f4803a8441585dc31aa6f620daa Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 11:15:15 +0200
Subject: [PATCH 213/721] formatting

---
 .../core/config/gui/GuiPositionEditor.kt      | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index e0e8c28a5d60..db6ca3c30d79 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -40,7 +40,7 @@ import java.io.IOException
 class GuiPositionEditor(
     private val positions: List<Position>,
     private val border: Int,
-    private val oldScreen: GuiContainer? = null
+    private val oldScreen: GuiContainer? = null,
 ) : GuiScreen() {
 
     private var grabbedX = 0
@@ -86,18 +86,14 @@ class GuiPositionEditor(
         // When the mouse isn't currently hovering over a gui element
         if (displayPos == -1) {
             GuiRenderUtils.drawStringCentered(
-
                 "§eTo edit hidden GUI elements set a key in /sh edit",
                 getScaledWidth() / 2,
-                20
-
+                20,
             )
             GuiRenderUtils.drawStringCentered(
-
                 "§ethen click that key while the GUI element is visible",
                 getScaledWidth() / 2,
-                32
-
+                32,
             )
             return
         }
@@ -110,7 +106,7 @@ class GuiPositionEditor(
             GuiRenderUtils.drawStringCentered(
                 "§aRight-Click to open associated config options",
                 getScaledWidth() / 2,
-                38
+                38,
             )
     }
 
@@ -136,16 +132,13 @@ class GuiPositionEditor(
             drawRect(x - border, y - border, x + elementWidth + border * 2, y + elementHeight + border * 2, -0x7fbfbfc0)
 
             if (GuiRenderUtils.isPointInRect(
-
                     mouseX,
                     mouseY,
                     x - border,
                     y - border,
                     elementWidth + border * 2,
-                    elementHeight + border * 2
-
+                    elementHeight + border * 2,
                 )
-
             ) {
                 hoveredPos = index
             }
@@ -175,7 +168,7 @@ class GuiPositionEditor(
                 x - border,
                 y - border,
                 elementWidth + border * 2,
-                elementHeight + border * 2
+                elementHeight + border * 2,
             )
             if (!isHovered) continue
             if (mouseButton == 1) {
@@ -251,7 +244,7 @@ class GuiPositionEditor(
                 GuiRenderUtils.isPointInRect(
                     mx, my,
                     it.getAbsX() - border, it.getAbsY() - border,
-                    size.x + border * 2, size.y + border * 2
+                    size.x + border * 2, size.y + border * 2,
                 )
             } ?: return
         if (mw < 0)

From a8d4861b051298cc8a1db3c5210a32abab866b1e Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sun, 11 Aug 2024 11:28:56 +0200
Subject: [PATCH 214/721] Docs: Add fix for Patcher scoreboard flickering issue
 (#2324)

---
 docs/DISCORD_FAQ.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 6f84957d1fcd..010894e8295f 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -59,8 +59,9 @@ _Frequently Asked Questions_
 > If you are using [Sidebar Mod](https://github.com/Alexdoru/SidebarMod), please remove this mod.
 > If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.8 or newer to resolve this issue.
 > If you are using [Apec](https://github.com/BananaFructa/Apec/) and want to remove their Scoreboard, you need to remove Apec since they don't have an option to disable their Scoreboard.
+> If you are using [Patcher](https://sk1er.club/mods/patcher) or [PolyPatcher](https://modrinth.com/mod/patcher) and the vanilla scoreboard is flickering, disable the "HUD Caching" option.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.
 
 
-*This FAQ was last updated on July 1st, 2024.
+*This FAQ was last updated on August 10th, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*

From 8903d9fa783455558d20eb32a2038c87ab5913be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Sun, 11 Aug 2024 13:22:24 +0200
Subject: [PATCH 215/721] Add multi version preprocessor (#2283)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .github/workflows/build.yml                   |  97 +++---
 .github/workflows/generate-constants.yaml     |   6 +-
 .gitignore                                    |   1 +
 CONTRIBUTING.md                               | 191 ++++++++++++
 build.gradle.kts                              | 278 ++++++++++--------
 gradle.properties                             |   1 -
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 root.gradle.kts                               |  42 +++
 settings.gradle.kts                           |  24 +-
 sharedVariables/build.gradle.kts              |  25 ++
 sharedVariables/settings.gradle.kts           |   2 +
 sharedVariables/src/MappingStyle.kt           |   6 +
 sharedVariables/src/MinecraftVersion.kt       |  25 ++
 sharedVariables/src/MultiVersionStage.kt      |  43 +++
 sharedVariables/src/NoOp.kt                   |  11 +
 sharedVariables/src/ProjectTarget.kt          |  74 +++++
 sharedVariables/src/SHVersionInfo.kt          |  12 +
 sharedVariables/src/Util.kt                   |   7 +
 .../core/config/gui/GuiPositionEditor.kt      |  12 +-
 .../hannibal2/skyhanni/events/LorenzEvent.kt  |   2 +-
 .../skyhanni/features/misc/HideArmor.kt       |   4 +-
 .../transformers/MixinFontRenderer.java       |   2 +-
 .../transformers/gui/MixinGuiContainer.java   |   2 +-
 .../at/hannibal2/skyhanni/utils/ChatUtils.kt  |   3 +-
 .../hannibal2/skyhanni/utils/EntityUtils.kt   |  90 ++++--
 .../utils/compat/ArrayNormalization.kt        |   6 +
 .../skyhanni/utils/compat/GuiScreenUtils.kt   |  59 ++++
 .../skyhanni/utils/compat/Pattern.java        |   4 +
 .../skyhanni/utils/compat/Pattterns.java      |  15 +
 .../utils/compat/SkyhanniBaseScreen.kt        |  10 +
 .../hannibal2/skyhanni/utils/compat/World.kt  |  63 ++++
 versions/mainProject                          |   1 +
 versions/mapping-1.12.2-1.8.9.txt             |  20 ++
 versions/mapping-1.16.5-forge-1.12.2.txt      |  75 +++++
 34 files changed, 1027 insertions(+), 188 deletions(-)
 create mode 100644 root.gradle.kts
 create mode 100644 sharedVariables/build.gradle.kts
 create mode 100644 sharedVariables/settings.gradle.kts
 create mode 100644 sharedVariables/src/MappingStyle.kt
 create mode 100644 sharedVariables/src/MinecraftVersion.kt
 create mode 100644 sharedVariables/src/MultiVersionStage.kt
 create mode 100644 sharedVariables/src/NoOp.kt
 create mode 100644 sharedVariables/src/ProjectTarget.kt
 create mode 100644 sharedVariables/src/SHVersionInfo.kt
 create mode 100644 sharedVariables/src/Util.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/ArrayNormalization.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/Pattern.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/Pattterns.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
 create mode 100644 versions/mainProject
 create mode 100644 versions/mapping-1.12.2-1.8.9.txt
 create mode 100644 versions/mapping-1.16.5-forge-1.12.2.txt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 379f842d8e19..8275ac8b0740 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,44 +1,63 @@
 name: Build
 
 on:
-  push:
-    branches:
-      - "*"
-    paths-ignore:
-      - ".gitignore"
-  pull_request:
-    branches:
-      - "*"
-    paths-ignore:
-      - ".gitignore"
-  workflow_dispatch:
+    push:
+        branches:
+            - "*"
+        paths-ignore:
+            - ".gitignore"
+    pull_request:
+        branches:
+            - "*"
+        paths-ignore:
+            - ".gitignore"
+    workflow_dispatch:
 permissions: write-all
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: "Build and test"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-          cache: gradle
-      - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
-      - name: Build with Gradle
-        run: ./gradlew build -x test --stacktrace
-      - uses: actions/upload-artifact@v3
-        name: Upload development build
-        with:
-          name: "Development Build"
-          path: build/libs/*.jar
-      - name: Test with Gradle
-        run: ./gradlew test
-      - uses: actions/upload-artifact@v3
-        name: "Upload test report"
-        if: ${{ !cancelled() }}
-        with:
-          name: "Test Results"
-          path: build/reports/tests/test/
+    build:
+        runs-on: ubuntu-latest
+        name: "Build and test"
+        steps:
+            -   uses: actions/checkout@v3
+            -   name: Set up JDK 21
+                uses: actions/setup-java@v3
+                with:
+                    java-version: 21
+                    distribution: temurin
+                    cache: gradle
+            -   name: Setup gradle
+                uses: gradle/gradle-build-action@v2
+            -   name: Build with Gradle
+                run: ./gradlew assemble -x test --stacktrace
+            -   uses: actions/upload-artifact@v3
+                name: Upload development build
+                with:
+                    name: "Development Build"
+                    path: versions/1.8.9/build/libs/*.jar
+            -   name: Test with Gradle
+                run: ./gradlew test
+            -   uses: actions/upload-artifact@v3
+                name: "Upload test report"
+                if: ${{ !cancelled() }}
+                with:
+                    name: "Test Results"
+                    path: versions/1.8.9/build/reports/tests/test/
+    preprocess:
+        runs-on: ubuntu-latest
+        name: "Build multi version"
+        steps:
+            -   uses: actions/checkout@v3
+            -   name: Set up JDK 21
+                uses: actions/setup-java@v3
+                with:
+                    java-version: 21
+                    distribution: temurin
+                    cache: gradle
+            -   name: Setup gradle
+                uses: gradle/gradle-build-action@v2
+            -   name: Enable preprocessor
+                run: |
+                    mkdir -p .gradle
+                    echo skyhanni.multi-version=preprocess-only > .gradle/private.properties
+            -   name: Build with Gradle
+                run: ./gradlew build --stacktrace
diff --git a/.github/workflows/generate-constants.yaml b/.github/workflows/generate-constants.yaml
index 505a035b2ada..c589676d0e2f 100644
--- a/.github/workflows/generate-constants.yaml
+++ b/.github/workflows/generate-constants.yaml
@@ -18,10 +18,10 @@ jobs:
         name: "Generate regexes"
         steps:
             -   uses: actions/checkout@v3
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@v3
                 with:
-                    java-version: 17
+                    java-version: 21
                     distribution: temurin
                     cache: gradle
             -   name: Setup gradle
@@ -33,7 +33,7 @@ jobs:
                 name: Upload generated repo regexes
                 with:
                     name: Repo Regexes
-                    path: build/regexes/constants.json
+                    path: versions/1.8.9/build/regexes/constants.json
     publish-regexes:
         runs-on: ubuntu-latest
         needs: regexes
diff --git a/.gitignore b/.gitignore
index c303fd98c5bf..d77f4bd8b6f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ gradle.properties
 
 .devauth/*
 !.devauth/config.toml
+.kotlin
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 62ffd979ea84..57f22f2e2583 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -180,3 +180,194 @@ Plugin [HotSwap Agent](https://plugins.jetbrains.com/plugin/9552-hotswapagent) t
 
 Follow [this](https://forums.Minecraftforge.net/topic/82228-1152-3110-intellij-and-gradlew-forge-hotswap-and-dcevm-tutorial/)
 tutorial.
+
+## 1.21 / Modern version development
+
+You might have noticed that while the SkyHanni source code is found in `src/`, the actual tasks for compiling, building and running the mod
+are located in a subproject called `1.8.9`. This is because SkyHanni is preparing for the eventual fall of 1.8.9 (via the foraging update or
+otherwise).
+
+To do so (while not disrupting regular development) we use [preprocessor](https://github.com/Deftu/RM-Preprocessor). Preprocessor
+automatically transforms code based on mappings as well as comment directives to create multiple variants of your source code for
+different Minecraft versions.
+
+Note also that the only targets we consider are 1.8.9 and 1.21 (or whatever the latest version we may target). The other versions are only there
+to make mappings translate more easily (more on that later).
+
+### Goals
+
+It is the explicit goal of this operation to passively generate a 1.21 version of SH using preprocessor. To this end, contributors are
+encouraged to add mappings and preprocessing directives to their features to make them compile on 1.21. *However*, this is considered a very
+low priority. Due to the confusing nature (and the slower initial setup time due to decompiling four versions of Minecraft), this feature
+is disabled by default. Similarly, it is up to each contributor to decide if they want to learn how to use preprocessor mappings and
+directives. An explicit non-goal is to maintain two SH versions continuously; instead, we only want to make the eventual transition to 1.21 a task
+that can be slowly worked on over a long span of time.
+
+### Set Up
+
+The modern version variants can be set using `skyhanni.multi-version` in `.gradle/private.properties` to three levels.
+
+`off` completely disables any preprocessor action or alternative versions. There will be only one project (although still at the `:1.8.9`
+subproject path), and alternative version sources will not be generated (although old generated sources **will not be deleted**). To make
+setting up a dev environment as fast and discernible as possible, this is the default option.
+
+`preprocess-only` adds the `preprocessCode` task as well as all the version subprojects. Compiling or running newer versions is not
+possible, but the `preprocessCode` task can be run manually to inspect the generated source code. This mode is what should most often be
+used when making alterations to the mappings or modifying preprocessor directives. Note that while this setting generally ignores any failed
+renaming attempts, if something is so badly mangled that it cannot even guess a name for a function, it will still break the build. Those
+situations should be rare, however. (In the entire SH codebase prior to me introducing this system I only found <10 such cases). You can
+specifically compile 1.8.9 using `./gradlew :1.8.9:build`. This does not affect the regular execution of the client which will only compile
+1.8.9.
+
+`compile` enables compilation for the `:1.21` subproject. This means that a `build` or `assemble` task will try (and fail) to compile a
+1.21 (as well as 1.8.9) JAR. This mode may be useful for someone seeking out issues to fix, but is generally not useful in day to day
+operations since the compile will never succeed and will block things like hotswap compilations (via <kbd>CTRL+F9</kbd>) from completing.
+
+### Improving mappings
+
+The different project versions are set up in such a way that each version depends on a slightly older version from which it is then adapted.
+There are two main versions (1.8.9 and 1.21), but there are also a few bridge versions. These exist to make remapping easier since automatic
+name mappings between 1.8.9 and 1.21 do not really exist. This is the current layout for our remaps: First, we remap to 1.12. This still
+largely uses the old rendering system and has a lot of similar names to 1.8.9. As such, only very little needs to be adapted in terms of
+behaviour, and at best, a couple of names need to be updated manually. The big jump is from 1.12 to 1.16. We use 1.16 since we don't want to
+make too large of a jump (which could lead to a lot more missing names), but we still want to jump to a version with Fabric (and specifically
+with Fabric intermediary mappings). We also can't really jump to an earlier version since 1.14 and 1.15 have a really poor Fabric API and
+still have some of the old rendering code, meaning we would need to adapt to two slightly different rendering engines instead of just one
+big rendering change. Despite the preprocessor's best efforts, this version will likely have the most manual mapping changes. Note that we
+actually have two projects on 1.16. There is the Forge project, which is the one we remap to first. Then we remap to the corresponding
+Fabric/Yarn mappings. This is because remapping between Searge and Yarn is very inconsistent unless it is done on one and the same version.
+Finally, we remap from 1.16 to 1.21. This is a fairly small change, especially since Fabric intermediary mappings make different names
+between versions very rare. The only real changes that need to be done in this jump are behavioural ones.
+
+The preprocessor does some built-in remapping (changing names), based on obfuscated names, but sometimes the automatic matching fails. If it
+cannot find a new name (or the name it automatically determines was wrong), you can change the corresponding mapping. In order to make
+this as smooth as possible, it is generally recommended to find the earliest spot at which the mappings deviate. So fixing a mapping on the
+hop from 1.16 to 1.21 is generally not recommended. This is because, while we do not care about 1.12 or 1.16 compiling for its own merit,
+we do care about the automatically inferred name changes from 1.12 to 1.16 and so on, which only work if those versions already have the
+correct names available.
+
+#### A missing/incorrect name
+
+This is the easiest part. If a name for a function simply could not be automatically remapped, all you need to do is to add an entry in the
+corresponding mapping.txt file. These can be found at `versions/mapping-<newVersion>-<oldVersion>.txt`.
+
+```
+# You can use # to comment lines
+
+# You can rename a class simply by writing the two names
+# The first name is the name on the newer version (the first one in the file name); the second one is the name in the old version.
+net.minecraft.util.math.MathHelper net.minecraft.util.MathHelper
+# If you want to rename an inner class, remember to use $s
+net.minecraft.world.scores.Team$Visibility net.minecraft.scoreboard.Team$EnumVisible
+
+# You can rename a field by writing the name of the containing class in the new version, and then the new and old name of the field.
+# Again, the first field name is the one in the newer version (first in the file name).
+net.minecraft.world.entity.Entity xOld prevPosX
+
+# Finally, you can also rename methods. To do so, you need to first specify the name of the containing class in the new version, then
+# the name of the new and old method name. The first method name is the newer version name (first in the file name).
+net.minecraft.util.text.Style getHoverEvent() getChatHoverEvent()
+```
+
+Adding a mapping like this is the easiest way to fix a broken method call, field access, or class reference. It will also apply to all
+files, so you might be fixing issues in files you didn't even look at. It will even work in mixin targets, as long as they are unambiguous
+(consider using the method descriptor instead of just the method name for your mixin). However, if something aside from the name changed,
+this will not suffice.
+
+#### Conditional compilation
+
+In addition to the built-in remapping, there is also the more complicated art of preprocessor directives. Directives allow you to comment or
+uncomment sections of the code depending on the version you are on. Uncommented sections are renamed as usual, so even within those directives,
+you only need to write code for the *lowest* version that your comment is active in. As such, I once again highly recommend to target your
+directive to the lowest version in which it applies, so that other sections that call into that code as well as your code can make use of
+as many automatic renames as possible.
+
+There is only really one directive, which is `if`. Take this function, for example:
+
+```kt
+private fun WorldClient.getAllEntities(): Iterable<Entity> =
+//#if MC < 1.16
+    loadedEntityList
+//#else
+//$$    entitiesForRendering()
+//#endif
+```
+
+The first `#if` instructs the preprocessor to only uncomment the following code if the Minecraft version is less than 1.16. Then, the `#else`
+uncomments the other section on versions 1.16 and above. Finally, the `#endif` ends the else block and lets the following functions always remain
+active. To distinguish regular comments from preprocessor comments, preprocessor only works with comments that start with `//$$`. So let's
+walk through what is happening here.
+
+In 1.8.9, the code remains unchanged. **Note that this means the programmer is responsible for commenting out the unused parts.
+The preprocessor will never change the `src/` directory**.
+
+Next, the preprocessor converts the code to 1.12. 1.12 still has the `loadedEntityList` as well as the same name for the `WorldClient` and
+`Entity` classes, so nothing is changed.
+
+Next, the code gets converted to 1.16 Forge. Since 1.16 is not less than 1.16, it will comment out the first line and uncomment the second line.
+1.16 Forge also uses a different name for `WorldClient` and a different package for `Entity`, so those are also changed (the package change
+is only visible in the imports):
+
+```kt
+private fun ClientLevel.getAllEntities(): Iterable<Entity> =
+//#if MC < 1.14
+//$$         loadedEntityList
+//#else
+   entitiesForRendering()
+//#endif
+```
+
+Now the code gets converted to 1.16 Fabric. Since those two targets are on the same Minecraft version name changes almost never fail to be
+done automatically. Notice the different names for `ClientWorld` as well as `entities`. The method is called `getEntities()` on Fabric, but
+since this is Kotlin code, the preprocessor automatically cleans up `getEntities()` using
+[Kotlin property access syntax](https://kotlinlang.org/docs/java-interop.html#getters-and-setters).
+
+```kt
+private fun ClientWorld.getAllEntities(): Iterable<Entity> =
+//#if MC < 1.14
+//$$         loadedEntityList
+//#else
+   entities
+//#endif
+```
+
+Finally, the code gets converted to 1.21 using intermediary mappings. This last step does not bring any new challenges, so we end up with:
+
+```kt
+private fun ClientWorld.getAllEntities(): Iterable<Entity> =
+//#if MC < 1.14
+//$$         loadedEntityList
+//#else
+   entities
+//#endif
+```
+
+#### If expressions
+
+Let's look at the syntax of those `#if` expressions.
+
+First of all, the `#else` block is optional. If you just want code on some versions (for example for adding a method call that is implicitly
+done on newer versions, or simply because the corresponding code for newer versions has to be done in some other place), you can just omit
+the `#else` section and you will simply not compile any code at that spot.
+
+There is also an `#elseif` in case you want to switch behaviour based on multiple version brackets. Again, while we don't actually target
+1.12 or 1.16, making those versions compile will help other parts of the code to upgrade to 1.21 more cleanly and easily. So, making those
+versions work (or at least providing a stub like `error("Not implemented on this version") as List<Entity>` to make types infer correctly)
+should be something you look out for.
+
+`#if` and `#elseif` also do not support complicated expressions. The only operations supported are `!=`, `==`, `>=`, `<=`, `<` and `>`. You
+cannot join two checks using `&&` or similar, instead needing to use nested `#if`s.
+
+The actual versions being worked with here are not actually semantically compared Minecraft versions, but instead integers in the form
+`major * 10000 + minor * 100 + patch`. So, for example, `1.12` turns into `11200`. Both `11200` and `1.12` can be used in directives, but
+`1.12` style values are generally easier to understand.
+
+You can also check if you are on Forge using the `FORGE` variable. It is set to either 1 or 0. Similarly, there is also a `JAVA` variable to
+check the Java version this Minecraft version is on. For the `FORGE` variable there is an implicit `!= 0` to check added if you just check
+for the variable using `#if FORGE`.
+
+#### Helpers
+
+Sadly, `#if` expressions cannot be applied globally (unlike name changes), so it is often very helpful to create a helper method and call
+that method from various places in the codebase. This is generally already policy in SH for a lot of things. For more complex types that
+change beyond just their name (for example different generics), a `typealias` can be used in combination with `#if` expressions.
diff --git a/build.gradle.kts b/build.gradle.kts
index 8aaa2d638248..773c7ac2860b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,52 +1,39 @@
-import org.apache.commons.lang3.SystemUtils
+import at.skyhanni.sharedvariables.MinecraftVersion
+import at.skyhanni.sharedvariables.MultiVersionStage
+import at.skyhanni.sharedvariables.ProjectTarget
+import at.skyhanni.sharedvariables.SHVersionInfo
+import at.skyhanni.sharedvariables.versionString
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.ByteArrayOutputStream
 
 plugins {
     idea
     java
-    id("gg.essential.loom") version "0.10.0.+"
-    id("dev.architectury.architectury-pack200") version "0.1.3"
     id("com.github.johnrengelman.shadow") version "7.1.2"
-    kotlin("jvm") version "1.9.0"
-    id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
+    id("gg.essential.loom")
+    id("dev.deftu.gradle.preprocess")
+    kotlin("jvm")
+    id("com.google.devtools.ksp")
+    kotlin("plugin.power-assert")
     `maven-publish`
-    id("com.google.devtools.ksp") version "1.9.0-1.0.13"
     id("moe.nea.shot") version "1.0.0"
 }
 
-group = "at.hannibal2.skyhanni"
-version = "0.26.Beta.21"
-
-val gitHash by lazy {
-    val baos = ByteArrayOutputStream()
-    exec {
-        standardOutput = baos
-        commandLine("git", "rev-parse", "--short", "HEAD")
-        isIgnoreExitValue = true
-    }
-    baos.toByteArray().decodeToString().trim()
-}
-
-// Toolchains:
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
-}
-
-sourceSets.main {
-    output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
-    java.srcDir(layout.projectDirectory.dir("src/main/kotlin"))
-    kotlin.destinationDirectory.set(java.destinationDirectory)
-}
+val target = ProjectTarget.values().find { it.projectPath == project.path }!!
 
 repositories {
     mavenCentral()
     mavenLocal()
+    maven("https://maven.minecraftforge.net") {
+        metadataSources {
+            artifact() // We love missing POMs
+        }
+    }
     maven("https://repo.spongepowered.org/maven/") // mixin
     maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") // DevAuth
     maven("https://jitpack.io") { // NotEnoughUpdates (compiled against)
         content {
-            includeGroupByRegex("com\\.github\\..*")
+            includeGroupByRegex("(com|io)\\.github\\..*")
         }
     }
     maven("https://repo.nea.moe/releases") // libautoupdate
@@ -55,6 +42,53 @@ repositories {
     maven("https://maven.teamresourceful.com/repository/thatgravyboat/") // DiscordIPC
 }
 
+// Toolchains:
+java {
+    toolchain.languageVersion.set(target.minecraftVersion.javaLanguageVersion)
+    // We specifically request ADOPTIUM because if we do not restrict the vendor DCEVM is a
+    // possible candidate. Some DCEVMs are however incompatible with some things gradle is doing,
+    // causing crashes during tests. You can still manually select DCEVM in the Minecraft Client
+    // IntelliJ run configuration.
+    toolchain.vendor.set(JvmVendorSpec.ADOPTIUM)
+}
+val runDirectory = rootProject.file("run")
+runDirectory.mkdirs()
+// Minecraft configuration:
+loom {
+    if (this.isForgeLike)
+        forge {
+            pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
+            mixinConfig("mixins.skyhanni.json")
+        }
+    mixin {
+        useLegacyMixinAp.set(true)
+        defaultRefmapName.set("mixins.skyhanni.refmap.json")
+    }
+    runs {
+        named("client") {
+            if (target == ProjectTarget.MAIN) {
+                isIdeConfigGenerated = true
+                appendProjectPathToConfigName.set(false)
+            }
+            this.runDir(runDirectory.relativeTo(projectDir).toString())
+            property("mixin.debug", "true")
+            if (System.getenv("repo_action") != "true") {
+                property("devauth.configDir", rootProject.file(".devauth").absolutePath)
+            }
+            vmArgs("-Xmx4G")
+            programArgs("--tweakClass", "at.hannibal2.skyhanni.tweaker.SkyHanniTweaker")
+            programArgs("--tweakClass", "io.github.notenoughupdates.moulconfig.tweaker.DevelopmentResourceTweaker")
+        }
+        removeIf { it.name == "server" }
+    }
+}
+
+if (target == ProjectTarget.MAIN)
+    sourceSets.main {
+        resources.destinationDirectory.set(kotlin.destinationDirectory)
+        output.setResourcesDir(kotlin.destinationDirectory)
+    }
+
 val shadowImpl: Configuration by configurations.creating {
     configurations.implementation.get().extendsFrom(this)
 }
@@ -72,13 +106,22 @@ val headlessLwjgl by configurations.creating {
     isTransitive = false
     isVisible = false
 }
-
-val shot = shots.shot("minecraft", project.file("shots.txt"))
+tasks.runClient {
+    this.javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion.set(target.minecraftVersion.javaLanguageVersion)
+    })
+}
+val shot = shots.shot("minecraft", rootProject.file("shots.txt"))
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.8.9")
-    mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
-    forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
+    minecraft("com.mojang:minecraft:${target.minecraftVersion.versionName}")
+    if (target.mappingDependency == "official") {
+        mappings(loom.officialMojangMappings())
+    } else {
+        mappings(target.mappingDependency)
+    }
+    if (target.forgeDep != null)
+        "forge"(target.forgeDep!!)
 
     // Discord RPC client
     shadowImpl("com.jagrosh:DiscordIPC:0.5.3") {
@@ -93,10 +136,16 @@ dependencies {
 
     compileOnly(ksp(project(":annotation-processors"))!!)
 
-    shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
-        isTransitive = false
+    val mixinVersion = if (target.minecraftVersion >= MinecraftVersion.MC11200) "0.8.2" else "0.7.11-SNAPSHOT"
+
+    if (!target.isFabric) {
+        shadowImpl("org.spongepowered:mixin:$mixinVersion") {
+            isTransitive = false
+        }
+        annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
+        annotationProcessor("com.google.code.gson:gson:2.10.1")
+        annotationProcessor("com.google.guava:guava:17.0")
     }
-    annotationProcessor("org.spongepowered:mixin:0.8.4-SNAPSHOT")
 
     implementation(kotlin("stdlib-jdk8"))
     shadowImpl("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") {
@@ -133,14 +182,16 @@ dependencies {
     implementation("net.hypixel:mod-api:0.3.1")
 }
 
-configurations.getByName("minecraftNamed").dependencies.forEach {
-    shot.applyTo(it as HasConfigurableAttributes<*>)
+afterEvaluate {
+    loom.runs.named("client") {
+        programArgs("--mods", devenvMod.resolve().joinToString(",") { it.relativeTo(runDirectory).path })
+    }
 }
 
 tasks.withType(Test::class) {
     useJUnitPlatform()
     javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
-    workingDir(file("run"))
+    workingDir(file(runDirectory))
     systemProperty("junit.jupiter.extensions.autodetection.enabled", "true")
 }
 
@@ -151,46 +202,6 @@ kotlin {
             enableLanguageFeature("BreakContinueInInlineLambdas")
         }
     }
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
-    }
-    sourceSets.test {
-        kotlin.srcDir("build/generated/ksp/test/kotlin")
-    }
-}
-
-// Minecraft configuration:
-loom {
-    launchConfigs {
-        "client" {
-            property("mixin.debug", "true")
-            if (System.getenv("repo_action") != "true") {
-                property("devauth.configDir", rootProject.file(".devauth").absolutePath)
-            }
-            arg("--tweakClass", "at.hannibal2.skyhanni.tweaker.SkyHanniTweaker")
-            arg("--tweakClass", "io.github.notenoughupdates.moulconfig.tweaker.DevelopmentResourceTweaker")
-            arg("--mods", devenvMod.resolve().joinToString(",") { it.relativeTo(file("run")).path })
-        }
-    }
-    forge {
-        pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
-        mixinConfig("mixins.skyhanni.json")
-    }
-    @Suppress("UnstableApiUsage")
-    mixin {
-        defaultRefmapName.set("mixins.skyhanni.refmap.json")
-    }
-    runConfigs {
-        "client" {
-            if (SystemUtils.IS_OS_MAC_OSX) {
-                vmArgs.remove("-XstartOnFirstThread")
-            }
-            vmArgs.add("-Xmx4G")
-        }
-        "server" {
-            isIdeConfigGenerated = false
-        }
-    }
 }
 
 // Tasks:
@@ -199,51 +210,70 @@ tasks.processResources {
     filesMatching(listOf("mcmod.info", "fabric.mod.json")) {
         expand("version" to version)
     }
+    if (target.isFabric) {
+        exclude("mcmod.info")
+    } // else do NOT exclude fabric.mod.json. We use fabric.mod.json in order to show a logo in prism launcher.
 }
 
-val generateRepoPatterns by tasks.creating(JavaExec::class) {
-    javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
-    mainClass.set("net.fabricmc.devlaunchinjector.Main")
-    workingDir(project.file("run"))
-    classpath(sourceSets.main.map { it.runtimeClasspath }, sourceSets.main.map { it.output })
-    jvmArgs(
-        "-Dfabric.dli.config=${project.file(".gradle/loom-cache/launch.cfg").absolutePath}",
-        "-Dfabric.dli.env=client",
-        "-Dfabric.dli.main=net.minecraft.launchwrapper.Launch",
-        "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
-        "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006",
-        "-javaagent:${headlessLwjgl.singleFile.absolutePath}"
-    )
-    val outputFile = project.file("build/regexes/constants.json")
-    environment("SKYHANNI_DUMP_REGEXES", "${gitHash}:${outputFile.absolutePath}")
-    environment("SKYHANNI_DUMP_REGEXES_EXIT", "true")
+if (target == ProjectTarget.MAIN) {
+    val generateRepoPatterns by tasks.creating(JavaExec::class) {
+        javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+        mainClass.set("net.fabricmc.devlaunchinjector.Main")
+        dependsOn(tasks.configureLaunch)
+        workingDir(project.file(runDirectory))
+        classpath(sourceSets.main.map { it.runtimeClasspath }, sourceSets.main.map { it.output })
+        jvmArgs(
+            "-Dfabric.dli.config=${project.file(".gradle/loom-cache/launch.cfg").absolutePath}",
+            "-Dfabric.dli.env=client",
+            "-Dfabric.dli.main=net.minecraft.launchwrapper.Launch",
+            "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
+            "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006",
+            "-javaagent:${headlessLwjgl.singleFile.absolutePath}",
+        )
+        val outputFile = project.file("build/regexes/constants.json")
+        environment("SKYHANNI_DUMP_REGEXES", "${SHVersionInfo.gitHash}:${outputFile.absolutePath}")
+        environment("SKYHANNI_DUMP_REGEXES_EXIT", "true")
+    }
 }
 
-tasks.compileJava {
-    dependsOn(tasks.processResources)
+if (target == ProjectTarget.MAIN)
+    tasks.compileJava {
+        dependsOn(tasks.processResources)
+    }
+
+if (target.parent == ProjectTarget.MAIN) {
+    val mainRes = project(ProjectTarget.MAIN.projectPath).tasks.getAt("processResources")
+    tasks.named("processResources") {
+        dependsOn(mainRes)
+    }
+    tasks.named("preprocessCode") {
+        dependsOn(mainRes)
+    }
 }
 
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
 }
 
-tasks.withType(Jar::class) {
+tasks.withType(org.gradle.jvm.tasks.Jar::class) {
     archiveBaseName.set("SkyHanni")
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE // Why do we have this here? This only *hides* errors.
     manifest.attributes.run {
-        this["FMLCorePluginContainsFMLMod"] = "true"
-        this["ForceLoadAsMod"] = "true"
         this["Main-Class"] = "SkyHanniInstallerFrame"
-
-        this["TweakClass"] = "at.hannibal2.skyhanni.tweaker.SkyHanniTweaker"
-        this["MixinConfigs"] = "mixins.skyhanni.json"
+        if (target == ProjectTarget.MAIN) {
+            this["FMLCorePluginContainsFMLMod"] = "true"
+            this["ForceLoadAsMod"] = "true"
+            this["TweakClass"] = "at.hannibal2.skyhanni.tweaker.SkyHanniTweaker"
+            this["MixinConfigs"] = "mixins.skyhanni.json"
+        }
     }
 }
 
 val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
     archiveClassifier.set("")
-    from(tasks.shadowJar)
-    input.set(tasks.shadowJar.get().archiveFile)
+    dependsOn(tasks.shadowJar)
+    inputFile.set(tasks.shadowJar.get().archiveFile)
+    destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
 }
 
 tasks.shadowJar {
@@ -267,13 +297,31 @@ tasks.jar {
 }
 tasks.assemble.get().dependsOn(tasks.remapJar)
 
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
+tasks.withType(KotlinCompile::class) {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(target.minecraftVersion.javaLanguageVersion.versionString()))
+    }
+}
+
+if (!MultiVersionStage.activeState.shouldCompile(target)) {
+    tasks.withType<JavaCompile> {
+        onlyIf { false }
+    }
+    tasks.withType<KotlinCompile> {
+        onlyIf { false }
+    }
+    tasks.withType<AbstractArchiveTask> {
+        onlyIf { false }
+    }
+    tasks.withType<ProcessResources> {
+        onlyIf { false }
+    }
 }
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.8"
+preprocess {
+    vars.put("MC", target.minecraftVersion.versionNumber)
+    vars.put("FORGE", if (target.forgeDep != null) 1 else 0)
+    vars.put("JAVA", target.minecraftVersion.javaVersion)
+    patternAnnotation.set("at.hannibal2.skyhanni.utils.compat.Pattern")
 }
 val sourcesJar by tasks.creating(Jar::class) {
     destinationDirectory.set(layout.buildDirectory.dir("badjars"))
diff --git a/gradle.properties b/gradle.properties
index 16cc55dfa11b..f5b8c6325fed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
-loom.platform=forge
 org.gradle.jvmargs=-Xmx2g
 org.gradle.parallel=true
 org.gradle.caching=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db9a6b825d7f..19cfad969baf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/root.gradle.kts b/root.gradle.kts
new file mode 100644
index 000000000000..bc43f053d706
--- /dev/null
+++ b/root.gradle.kts
@@ -0,0 +1,42 @@
+import at.skyhanni.sharedvariables.ProjectTarget
+import com.replaymod.gradle.preprocess.Node
+
+plugins {
+    id("dev.deftu.gradle.preprocess") version "0.6.1"
+    id("gg.essential.loom") version "1.6.+" apply false
+    kotlin("jvm") version "2.0.0" apply false
+    kotlin("plugin.power-assert") version "2.0.0" apply false
+    id("com.google.devtools.ksp") version "2.0.0-1.0.24" apply false
+    id("dev.architectury.architectury-pack200") version "0.1.3"
+}
+
+allprojects {
+    group = "at.hannibal2.skyhanni"
+    version = "0.26.Beta.21"
+}
+
+preprocess {
+    val nodes = mutableMapOf<ProjectTarget, Node>()
+    ProjectTarget.activeVersions().forEach { target ->
+        nodes[target] = createNode(target.projectName, target.minecraftVersion.versionNumber, target.mappingStyle.identifier)
+        val p = project(target.projectPath)
+        if (target.isForge)
+            p.extra.set("loom.platform", "forge")
+    }
+    ProjectTarget.activeVersions().forEach { child ->
+        val parent = child.linkTo ?: return@forEach
+        val pNode = nodes[parent]
+        if (pNode == null) {
+            println("Parent target to ${child.projectName} not available in this multi version stage. Not setting parent.")
+            return@forEach
+        }
+        val mappingFile = file("versions/mapping-${parent.projectName}-${child.projectName}.txt")
+        if (mappingFile.exists()) {
+            pNode.link(nodes[child]!!, mappingFile)
+            println("Loading mappings from $mappingFile")
+        } else {
+            pNode.link(nodes[child]!!)
+            println("Skipped loading mappings from $mappingFile")
+        }
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8bd4de72fb14..2de2760b266d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,8 @@
+import at.skyhanni.sharedvariables.MultiVersionStage
+import at.skyhanni.sharedvariables.ProjectTarget
+
 pluginManagement {
+    includeBuild("sharedVariables")
     repositories {
         mavenCentral()
         gradlePluginPortal()
@@ -9,6 +13,12 @@ pluginManagement {
         maven("https://repo.spongepowered.org/maven/")
         maven("https://repo.nea.moe/releases")
         maven("https://repo.sk1er.club/repository/maven-releases/")
+        maven("https://maven.deftu.xyz/releases")
+        maven("https://jitpack.io") {
+            content {
+                includeGroupByRegex("(com|io)\\.github\\..*")
+            }
+        }
     }
     resolutionStrategy {
         eachPlugin {
@@ -20,8 +30,20 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
+    id("at.skyhanni.shared-variables")
 }
 
+MultiVersionStage.initFrom(file(".gradle/private.properties"))
+
 include("annotation-processors")
 rootProject.name = "SkyHanni"
+rootProject.buildFileName = "root.gradle.kts"
+
+ProjectTarget.activeVersions().forEach { target ->
+    include(target.projectPath)
+    val p = project(target.projectPath)
+    p.projectDir = file("versions/${target.projectName}")
+    p.buildFileName = "../../build.gradle.kts"
+}
+
diff --git a/sharedVariables/build.gradle.kts b/sharedVariables/build.gradle.kts
new file mode 100644
index 000000000000..27799fb860dc
--- /dev/null
+++ b/sharedVariables/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+    `kotlin-dsl`
+    `java-gradle-plugin`
+}
+
+repositories {
+    this.mavenCentral()
+    this.mavenLocal()
+}
+dependencies {
+    this.implementation("com.google.code.gson:gson:2.10.1")
+    this.implementation("com.google.guava:guava:33.2.1-jre")
+}
+
+sourceSets.main {
+    this.kotlin.srcDir(file("src"))
+}
+gradlePlugin {
+    this.plugins {
+        this.create("simplePlugin") {
+            this.id = "at.skyhanni.shared-variables"
+            this.implementationClass = "at.skyhanni.sharedvariables.NoOp"
+        }
+    }
+}
diff --git a/sharedVariables/settings.gradle.kts b/sharedVariables/settings.gradle.kts
new file mode 100644
index 000000000000..e3b5e48960b8
--- /dev/null
+++ b/sharedVariables/settings.gradle.kts
@@ -0,0 +1,2 @@
+// This space has been intentionally left blank
+// It serves such that this folder is a new gradle workspace rather than being a subproject
diff --git a/sharedVariables/src/MappingStyle.kt b/sharedVariables/src/MappingStyle.kt
new file mode 100644
index 000000000000..604495ce1457
--- /dev/null
+++ b/sharedVariables/src/MappingStyle.kt
@@ -0,0 +1,6 @@
+package at.skyhanni.sharedvariables
+
+enum class MappingStyle(val identifier: String) {
+    SEARGE("srg"),
+    YARN("yarn"),
+}
diff --git a/sharedVariables/src/MinecraftVersion.kt b/sharedVariables/src/MinecraftVersion.kt
new file mode 100644
index 000000000000..7384c8fbd49b
--- /dev/null
+++ b/sharedVariables/src/MinecraftVersion.kt
@@ -0,0 +1,25 @@
+package at.skyhanni.sharedvariables
+
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+
+enum class MinecraftVersion(
+    val versionName: String,
+    val javaVersion: Int,
+) {
+    MC189("1.8.9", 8),
+    MC11200("1.12", 8),
+    MC11202("1.12.2", 8),
+    MC1144("1.14.4", 8),
+    MC11605("1.16.5", 8),
+    MC121("1.21", 21),
+    ;
+
+    val javaLanguageVersion = JavaLanguageVersion.of(javaVersion)
+
+    val versionNumber = run {
+        val parts = versionName.split('.').mapTo(mutableListOf()) { it.toInt() }
+        if (parts.size == 2) parts.add(0)
+        require(parts.size == 3)
+        parts[0] * 10000 + parts[1] * 100 + parts[2]
+    }
+}
diff --git a/sharedVariables/src/MultiVersionStage.kt b/sharedVariables/src/MultiVersionStage.kt
new file mode 100644
index 000000000000..78914a91dba8
--- /dev/null
+++ b/sharedVariables/src/MultiVersionStage.kt
@@ -0,0 +1,43 @@
+package at.skyhanni.sharedvariables
+
+import java.io.File
+import java.util.Properties
+
+enum class MultiVersionStage(val label: String) {
+    OFF("off"),
+    PREPROCESS_ONLY("preprocess-only"),
+    FULL("compile")
+    ;
+
+    fun shouldCompile(projectTarget: ProjectTarget): Boolean {
+        if (projectTarget == ProjectTarget.MAIN) return true
+        return when (this) {
+            OFF -> false
+            PREPROCESS_ONLY -> false
+            FULL -> projectTarget == ProjectTarget.MODERN
+        }
+    }
+
+    fun shouldCreateProject(projectTarget: ProjectTarget): Boolean {
+        if (projectTarget == ProjectTarget.MAIN) return true
+        return when (this) {
+            OFF -> false
+            PREPROCESS_ONLY -> true
+            FULL -> true
+        }
+    }
+
+
+    companion object {
+        lateinit var activeState: MultiVersionStage
+        fun initFrom(file: File) {
+            val prop = Properties()
+            if (file.exists()) {
+                file.inputStream().use(prop::load)
+            }
+            val multiVersion = prop["skyhanni.multi-version"]
+            activeState = MultiVersionStage.values().find { it.label == multiVersion } ?: OFF
+            println("SkyHanni multi version stage loaded: $activeState")
+        }
+    }
+}
diff --git a/sharedVariables/src/NoOp.kt b/sharedVariables/src/NoOp.kt
new file mode 100644
index 000000000000..d0103a956c2f
--- /dev/null
+++ b/sharedVariables/src/NoOp.kt
@@ -0,0 +1,11 @@
+package at.skyhanni.sharedvariables
+
+import org.gradle.api.Plugin
+/**
+ * This class is a no op plugin. It can be applied to any project or gradle workspace and serves only as a marker
+ * for gradle to pull in the other classes in the sharedVariables project. We use a subproject rather than buildSrc
+ * since buildSrc is not available during settings configuration time (and also buildSrc tends to be slower).
+ */
+class NoOp : Plugin<Any> {
+    override fun apply(target: Any) {}
+}
diff --git a/sharedVariables/src/ProjectTarget.kt b/sharedVariables/src/ProjectTarget.kt
new file mode 100644
index 000000000000..9bf46c781110
--- /dev/null
+++ b/sharedVariables/src/ProjectTarget.kt
@@ -0,0 +1,74 @@
+package at.skyhanni.sharedvariables
+
+private fun yarn(version: String): String = "net.fabricmc:yarn:${version}:v2"
+
+enum class ProjectTarget(
+    val projectName: String,
+    val minecraftVersion: MinecraftVersion,
+    val mappingDependency: String,
+    val mappingStyle: MappingStyle,
+    val forgeDep: String?,
+    linkTo: String?,
+) {
+    MAIN(
+        "1.8.9",
+        MinecraftVersion.MC189,
+        "de.oceanlabs.mcp:mcp_stable:22-1.8.9@zip",
+        MappingStyle.SEARGE,
+        "net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9",
+        "BRIDGE112",
+    ),
+    BRIDGE112(
+        "1.12.2",
+        MinecraftVersion.MC11202,
+        "de.oceanlabs.mcp:mcp_stable:39-1.12@zip",
+        MappingStyle.SEARGE,
+        "net.minecraftforge:forge:1.12.2-14.23.5.2847",
+        "BRIDGE116FORGE",
+    ),
+    BRIDGE116FORGE(
+        "1.16.5-forge",
+        MinecraftVersion.MC11605,
+        "official",
+        MappingStyle.SEARGE,
+        "net.minecraftforge:forge:1.16.5-36.2.39",
+        "BRIDGE116FABRIC",
+    ),
+    BRIDGE116FABRIC(
+        "1.16.5",
+        MinecraftVersion.MC11605,
+        yarn("1.16.5+build.10"),
+        MappingStyle.YARN,
+        null,
+        "MODERN",
+    ),
+    MODERN(
+        "1.21",
+        MinecraftVersion.MC121,
+        yarn("1.21+build.9"),
+        MappingStyle.YARN,
+        null,
+        null,
+    )
+    ;
+
+    val isBridge get() = name.contains("bridge")
+
+    val linkTo by lazy {
+        if (linkTo == null) null
+        else {
+            ProjectTarget.values().find { it.name == linkTo }!!
+        }
+    }
+    val parent by lazy {
+        values().find { it.linkTo == this }
+    }
+    val isForge get() = forgeDep != null
+    val isFabric get() = forgeDep == null
+
+    val projectPath get() = ":$projectName"
+
+    companion object {
+        fun activeVersions() = values().filter { MultiVersionStage.activeState.shouldCreateProject(it) }
+    }
+}
diff --git a/sharedVariables/src/SHVersionInfo.kt b/sharedVariables/src/SHVersionInfo.kt
new file mode 100644
index 000000000000..2f948897e984
--- /dev/null
+++ b/sharedVariables/src/SHVersionInfo.kt
@@ -0,0 +1,12 @@
+package at.skyhanni.sharedvariables
+
+object SHVersionInfo {
+    val gitHash by lazy {
+        val proc = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+            .redirectOutput(ProcessBuilder.Redirect.PIPE)
+            .redirectInput(ProcessBuilder.Redirect.PIPE)
+            .start()
+        proc.waitFor()
+        proc.inputStream.readBytes().decodeToString().trim()
+    }
+}
diff --git a/sharedVariables/src/Util.kt b/sharedVariables/src/Util.kt
new file mode 100644
index 000000000000..750a73cbe978
--- /dev/null
+++ b/sharedVariables/src/Util.kt
@@ -0,0 +1,7 @@
+package at.skyhanni.sharedvariables
+
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+
+fun JavaLanguageVersion.versionString() =
+    if (asInt() < 9) "1." + asInt()
+    else asInt().toString()
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index db6ca3c30d79..817defc5fdef 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -28,6 +28,8 @@ import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils
+import at.hannibal2.skyhanni.utils.compat.SkyhanniBaseScreen
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.ScaledResolution
@@ -41,7 +43,7 @@ class GuiPositionEditor(
     private val positions: List<Position>,
     private val border: Int,
     private val oldScreen: GuiContainer? = null,
-) : GuiScreen() {
+) : SkyhanniBaseScreen() {
 
     private var grabbedX = 0
     private var grabbedY = 0
@@ -147,15 +149,15 @@ class GuiPositionEditor(
         return hoveredPos
     }
 
-    private fun getScaledHeight() = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
-    private fun getScaledWidth() = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
+    private fun getScaledHeight() = GuiScreenUtils.scaledWindowHeight
+    private fun getScaledWidth() = GuiScreenUtils.scaledWindowHeight
 
     @Throws(IOException::class)
     override fun mouseClicked(originalX: Int, priginalY: Int, mouseButton: Int) {
         super.mouseClicked(originalX, priginalY, mouseButton)
 
-        val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
-        val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
+        val mouseX = GuiScreenUtils.mouseX
+        val mouseY = GuiScreenUtils.mouseY
         for (i in positions.indices.reversed()) {
             val position = positions[i]
             val elementWidth = position.getDummySize().x
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
index f5566e278415..c895b1058d7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
@@ -13,7 +13,7 @@ import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.eventhandler.Event
 import net.minecraftforge.fml.common.eventhandler.IEventListener
 
-@Deprecated("Use SkyHanniEvent instead", ReplaceWith(""))
+@Deprecated("Use SkyHanniEvent instead")
 abstract class LorenzEvent : Event() {
 
     private val eventName by lazy {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
index 112b59213651..32365458fc25 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
@@ -10,11 +10,11 @@ import at.hannibal2.skyhanni.utils.EntityUtils.getArmorInventory
 import at.hannibal2.skyhanni.utils.EntityUtils.hasPotionEffect
 import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.compat.Effects
 import net.minecraft.client.entity.EntityPlayerSP
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.potion.Potion
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -26,7 +26,7 @@ object HideArmor {
     private fun shouldHideArmor(entity: EntityLivingBase): Boolean {
         if (!LorenzUtils.inSkyBlock) return false
         if (entity !is EntityPlayer) return false
-        if (entity.hasPotionEffect(Potion.invisibility)) return false
+        if (entity.hasPotionEffect(Effects.invisibility)) return false
         if (entity.isNPC()) return false
 
         return when (config.mode) {
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinFontRenderer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinFontRenderer.java
index 3e6d049ca841..1aa8c1daf8bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinFontRenderer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinFontRenderer.java
@@ -79,7 +79,7 @@ private String renderStringAtPos(String text) {
         return ModifyVisualWords.INSTANCE.modifyText(text);
     }
 
-    @ModifyVariable(method = "getStringWidth", at = @At("HEAD"), argsOnly = true)
+    @ModifyVariable(method = "getStringWidth(Ljava/lang/String;)I", at = @At("HEAD"), argsOnly = true)
     private String getStringWidth(String text) {
         return ModifyVisualWords.INSTANCE.modifyText(text);
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
index acec9ffac7dd..0c58469cd12e 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
@@ -71,6 +71,6 @@ private void onMouseClick(Slot slot, int slotId, int clickedButton, int clickTyp
     )
     public void drawScreen_after(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
         skyHanni$hook.onDrawScreenAfter(mouseX, mouseY, ci);
-        ToolTipData.INSTANCE.setLastSlot(theSlot);
+        ToolTipData.INSTANCE.setLastSlot(this.theSlot);
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index d0a3c199e9dc..be61fc81c4a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.onClick
 import at.hannibal2.skyhanni.utils.chat.Text.prefix
 import at.hannibal2.skyhanni.utils.chat.Text.url
+import at.hannibal2.skyhanni.utils.compat.getFormattedTextCompat
 import net.minecraft.client.Minecraft
 import net.minecraft.util.ChatComponentText
 import net.minecraft.util.ChatStyle
@@ -82,7 +83,7 @@ object ChatUtils {
     }
 
     fun chat(message: IChatComponent): Boolean {
-        val formattedMessage = message.formattedText
+        val formattedMessage = message.getFormattedTextCompat()
         log.log(formattedMessage)
 
         val minecraft = Minecraft.getMinecraft()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 430310709c42..d123fa991bd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -11,9 +11,15 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToIgnoreY
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import at.hannibal2.skyhanni.utils.LorenzUtils.derpy
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.compat.getArmorOrFullInventory
+import at.hannibal2.skyhanni.utils.compat.getLoadedPlayers
+import at.hannibal2.skyhanni.utils.compat.getNameAsString
+import at.hannibal2.skyhanni.utils.compat.isOnMainThread
+import at.hannibal2.skyhanni.utils.compat.normalizeAsArray
 import net.minecraft.block.state.IBlockState
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
+import net.minecraft.client.multiplayer.WorldClient
 import net.minecraft.client.resources.DefaultPlayerSkin
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
@@ -26,8 +32,11 @@ import net.minecraft.potion.Potion
 import net.minecraft.scoreboard.ScorePlayerTeam
 import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.client.event.RenderLivingEvent
+
+//#if FORGE
 import net.minecraftforge.fml.common.eventhandler.Event
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+//#endif
 
 @SkyHanniModule
 object EntityUtils {
@@ -44,7 +53,7 @@ object EntityUtils {
 
     fun getPlayerEntities(): MutableList<EntityOtherPlayerMP> {
         val list = mutableListOf<EntityOtherPlayerMP>()
-        for (entity in Minecraft.getMinecraft().theWorld.playerEntities) {
+        for (entity in Minecraft.getMinecraft().theWorld?.getLoadedPlayers() ?: emptyList()) {
             if (!entity.isNPC() && entity is EntityOtherPlayerMP) {
                 list.add(entity)
             }
@@ -56,7 +65,7 @@ object EntityUtils {
         contains: String,
         radius: Double = 3.0,
     ): List<EntityArmorStand> = getArmorStandsInRadius(getLorenzVec().add(y = 3), radius).filter {
-        it.name.contains(contains)
+        it.getNameAsString().contains(contains)
     }
 
     fun EntityLivingBase.getNameTagWith(
@@ -76,7 +85,7 @@ object EntityUtils {
     ): List<EntityArmorStand> {
         val center = getLorenzVec().add(y = y)
         return getArmorStandsInRadius(center, inaccuracy).filter {
-            val result = it.name.contains(contains)
+            val result = it.getNameAsString().contains(contains)
             if (debugWrongEntity && !result) {
                 LorenzUtils.consoleLog("wrong entity in aabb: '" + it.name + "'")
             }
@@ -139,31 +148,57 @@ object EntityUtils {
     fun EntityLivingBase.isAtFullHealth() = baseMaxHealth == health.toInt()
 
     fun EntityArmorStand.hasSkullTexture(skin: String): Boolean {
-        if (inventory == null) return false
+        val inventory = this.getArmorOrFullInventory() ?: return false
         return inventory.any { it != null && it.getSkullTexture() == skin }
     }
 
     fun EntityPlayer.isNPC() = !isRealPlayer()
 
-    fun EntityLivingBase.hasPotionEffect(potion: Potion) = getActivePotionEffect(potion) != null
+    fun EntityLivingBase.hasPotionEffect(
+        potion:
+        //#if MC <1.21
+        Potion,
+        //#else
+        //$$ net.minecraft.registry.entry.RegistryEntry<net.minecraft.entity.effect.StatusEffect>
+        //#endif
+    ) = getActivePotionEffect(potion) != null
 
     fun EntityLivingBase.getArmorInventory(): Array<ItemStack?>? =
-        if (this is EntityPlayer) inventory.armorInventory else null
+        if (this is EntityPlayer) inventory.armorInventory.normalizeAsArray() else null
 
     fun EntityEnderman.getBlockInHand(): IBlockState? = heldBlockState
 
     inline fun <reified R : Entity> getEntities(): Sequence<R> = getAllEntities().filterIsInstance<R>()
 
-    fun getAllEntities(): Sequence<Entity> = Minecraft.getMinecraft()?.theWorld?.loadedEntityList?.let {
-        if (Minecraft.getMinecraft().isCallingFromMinecraftThread) it else it.toMutableList()
+    private fun WorldClient.getAllEntities(): Iterable<Entity> =
+//#if MC < 1.14
+        loadedEntityList
+//#else
+//$$    entitiesForRendering()
+//#endif
+
+    fun getAllEntities(): Sequence<Entity> = Minecraft.getMinecraft().theWorld?.getAllEntities()?.let {
+        if (Minecraft.getMinecraft()
+                .isOnMainThread()
+        ) it else it.toMutableList() // TODO: while i am here, i want to point out that copying the entity list does not constitute proper synchronization, but *does* make crashes because of it rarer.
     }?.asSequence()?.filterNotNull() ?: emptySequence()
 
     fun Entity.canBeSeen(radius: Double = 150.0) = getLorenzVec().add(y = 0.5).canBeSeen(radius)
 
     fun getEntityByID(entityId: Int) = Minecraft.getMinecraft()?.thePlayer?.entityWorld?.getEntityByID(entityId)
 
+//#if FORGE
+
     @SubscribeEvent
-    fun onEntityRenderPre(event: RenderLivingEvent.Pre<*>) {
+    fun onEntityRenderPre(
+        event:
+        //#if MC < 1.14
+        RenderLivingEvent.Pre<*>,
+        //#else
+        //$$ RenderLivingEvent.Pre<*, *>
+        //#endif
+
+    ) {
         val shEvent = SkyHanniRenderEntityEvent.Pre(event.entity, event.renderer, event.x, event.y, event.z)
         if (shEvent.postAndCatch()) {
             event.cancel()
@@ -171,12 +206,24 @@ object EntityUtils {
     }
 
     @SubscribeEvent
-    fun onEntityRenderPost(event: RenderLivingEvent.Post<*>) {
+    fun onEntityRenderPost(
+        event:
+        //#if MC < 11400
+        RenderLivingEvent.Post<*>,
+        //#else
+        //$$ RenderLivingEvent.Post<*, *>
+        //#endif
+
+    ) {
         SkyHanniRenderEntityEvent.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }
 
+//#if MC < 11400
     @SubscribeEvent
-    fun onEntityRenderSpecialsPre(event: RenderLivingEvent.Specials.Pre<*>) {
+    fun onEntityRenderSpecialsPre(
+        event:
+        RenderLivingEvent.Specials.Pre<*>,
+    ) {
         val shEvent = SkyHanniRenderEntityEvent.Specials.Pre(event.entity, event.renderer, event.x, event.y, event.z)
         if (shEvent.postAndCatch()) {
             event.cancel()
@@ -184,38 +231,47 @@ object EntityUtils {
     }
 
     @SubscribeEvent
-    fun onEntityRenderSpecialsPost(event: RenderLivingEvent.Specials.Post<*>) {
+    fun onEntityRenderSpecialsPost(
+        event:
+        RenderLivingEvent.Specials.Post<*>,
+    ) {
         SkyHanniRenderEntityEvent.Specials.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }
+//#endif
+
+//#endif
 
     fun EntityLivingBase.isCorrupted() = baseMaxHealth == health.toInt().derpy() * 3 || isRunicAndCorrupt()
     fun EntityLivingBase.isRunic() = baseMaxHealth == health.toInt().derpy() * 4 || isRunicAndCorrupt()
     fun EntityLivingBase.isRunicAndCorrupt() = baseMaxHealth == health.toInt().derpy() * 3 * 4
 
-    fun Entity.cleanName() = this.name.removeColor()
+    fun Entity.cleanName() = this.getNameAsString().removeColor()
 
     /**
      * @return a fake player with the same skin as the real player
      */
     fun getFakePlayer(): EntityOtherPlayerMP {
         val mc = Minecraft.getMinecraft()
+        val player = mc.thePlayer!!
         return object : EntityOtherPlayerMP(
             mc.theWorld,
-            mc.thePlayer.gameProfile
+            player.gameProfile,
         ) {
             override fun getLocationSkin() =
-                mc.thePlayer.locationSkin ?: DefaultPlayerSkin.getDefaultSkin(mc.thePlayer.uniqueID)
+                player.getLocationSkin() ?: DefaultPlayerSkin.getDefaultSkin(player.uniqueID)
 
             override fun getTeam() = object : ScorePlayerTeam(null, null) {
                 override fun getNameTagVisibility() = EnumVisible.NEVER
             }
 
-            override fun isWearing(part: EnumPlayerModelParts?) =
-                mc.thePlayer.isWearing(part) && part != EnumPlayerModelParts.CAPE
+            override fun isWearing(part: EnumPlayerModelParts): Boolean =
+                player.isWearing(part) && part != EnumPlayerModelParts.CAPE
         }
     }
 }
 
+//#if FORGE
 private fun Event.cancel() {
     isCanceled = true
 }
+//#endif
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/ArrayNormalization.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/ArrayNormalization.kt
new file mode 100644
index 000000000000..2dde4bdc5171
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/ArrayNormalization.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.utils.compat
+
+
+inline fun <reified T> List<T>.normalizeAsArray() = this.toTypedArray()
+fun <T> Array<T>.normalizeAsArray() = this
+
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
new file mode 100644
index 000000000000..0cec5aeb22ae
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
@@ -0,0 +1,59 @@
+package at.hannibal2.skyhanni.utils.compat
+
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.ScaledResolution
+import org.lwjgl.input.Mouse
+
+object GuiScreenUtils {
+    private val mc get() = Minecraft.getMinecraft()
+    val scaledWindowHeight
+        get() =
+//#if MC < 1.16
+            ScaledResolution(mc).scaledHeight
+//#else
+//$$            mc.window.guiScaledHeight
+//#endif
+
+    val scaledWindowWidth
+        get() =
+//#if MC < 1.16
+            ScaledResolution(mc).scaledWidth
+//#else
+//$$            mc.window.guiScaledWidth
+//#endif
+
+    val displayWidth
+        get() =
+//#if MC < 1.16
+            mc.displayWidth
+//#else
+//$$            mc.window.width
+//#endif
+
+
+    val displayHeight
+        get() =
+//#if MC < 1.16
+            mc.displayHeight
+//#else
+//$$            mc.window.height
+//#endif
+
+    val globalMouseX get() = Mouse.getX()
+    val globalMouseY get() = Mouse.getY()
+
+    val mouseX
+        get() = globalMouseX * scaledWindowWidth / displayWidth
+    val mouseY: Int
+        get() {
+            val height = this.scaledWindowHeight
+            //TODO: in later versions the height - factor is removed, i think
+            val y = globalMouseY * height / displayHeight
+//#if MC < 1.16
+            return height - y - 1
+//#else
+//$$            return y
+//#endif
+        }
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattern.java b/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattern.java
new file mode 100644
index 000000000000..f1e3a5f7800d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattern.java
@@ -0,0 +1,4 @@
+package at.hannibal2.skyhanni.utils.compat;
+
+public @interface Pattern {
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattterns.java b/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattterns.java
new file mode 100644
index 000000000000..c8f6389a1edd
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/Pattterns.java
@@ -0,0 +1,15 @@
+package at.hannibal2.skyhanni.utils.compat;
+
+import net.minecraft.client.Minecraft;
+
+public class Pattterns {
+
+    @Pattern
+    private static boolean isOnMainThread(Minecraft mc) {
+        //#if MC>=11400
+        //$$ return mc.isOnThread();
+        //#else
+        return mc.isCallingFromMinecraftThread();
+        //#endif
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
new file mode 100644
index 000000000000..e9b8233eafb5
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
@@ -0,0 +1,10 @@
+package at.hannibal2.skyhanni.utils.compat
+
+import net.minecraft.client.gui.GuiScreen
+
+abstract class SkyhanniBaseScreen : GuiScreen(
+    //#if MC > 1.12
+    //$$ net.minecraft.network.chat.TextComponent.EMPTY
+    //#endif
+) {
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
new file mode 100644
index 000000000000..7916eb4e58b9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
@@ -0,0 +1,63 @@
+package at.hannibal2.skyhanni.utils.compat
+
+import net.minecraft.client.Minecraft
+import net.minecraft.client.multiplayer.WorldClient
+import net.minecraft.entity.Entity
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.potion.Potion
+import net.minecraft.util.IChatComponent
+
+fun WorldClient.getLoadedPlayers(): List<EntityPlayer> =
+//#if MC < 1.14
+    this.playerEntities
+//#else
+//$$ this.players()
+//#endif
+
+
+fun Entity.getNameAsString(): String =
+    this.name
+//#if MC >= 1.14
+//$$ .getString()
+//#endif
+
+fun EntityArmorStand.getArmorOrFullInventory() =
+//#if MC < 1.12
+    this.inventory
+//#else
+//$$ this.getArmorInventoryList()
+//#endif
+
+fun Minecraft.isOnMainThread() =
+//#if MC < 1.14
+    this.isCallingFromMinecraftThread
+//#else
+//$$ this.isSameThread
+//#endif
+
+fun IChatComponent.getFormattedTextCompat() =
+//#if MC < 1.16
+    this.formattedText
+//#else
+//$$     run {
+//$$         val sb = StringBuilder()
+//$$         for (component in iterator()) {
+//$$             sb.append(component.style.formattingCode)
+//$$             sb.append(component.unformattedComponentText)
+//$$             sb.append("§r")
+//$$         }
+//$$         sb.toString()
+//$$     }
+//#endif
+
+object Effects {
+    val invisibility =
+        //#if MC <1.12
+        Potion.invisibility
+    //#else
+    //$$    net.minecraft.init.PotionTypes.INVISIBILITY
+    //#endif
+}
+
+
diff --git a/versions/mainProject b/versions/mainProject
new file mode 100644
index 000000000000..53ed4ba51e76
--- /dev/null
+++ b/versions/mainProject
@@ -0,0 +1 @@
+1.8.9
diff --git a/versions/mapping-1.12.2-1.8.9.txt b/versions/mapping-1.12.2-1.8.9.txt
new file mode 100644
index 000000000000..9ed58485b7ca
--- /dev/null
+++ b/versions/mapping-1.12.2-1.8.9.txt
@@ -0,0 +1,20 @@
+
+net.minecraft.util.math.MathHelper net.minecraft.util.MathHelper
+net.minecraft.util.math.BlockPos net.minecraft.util.BlockPos
+net.minecraft.util.math.AxisAlignedBB net.minecraft.util.AxisAlignedBB
+net.minecraft.util.math.Vec3d net.minecraft.util.Vec3
+net.minecraft.util.math.Vec3d net.minecraft.util.Vec3
+net.minecraft.util.math.Rotations net.minecraft.util.Rotations
+net.minecraft.network.play.server.SPacketParticles net.minecraft.network.play.server.S2APacketParticles
+
+net.minecraft.util.text.TextComponentString net.minecraft.util.ChatComponentText
+net.minecraft.util.text.TextComponentTranslation net.minecraft.util.ChatComponentTranslation
+net.minecraft.util.text.Style net.minecraft.util.ChatStyle
+net.minecraft.util.text.Style getHoverEvent() getChatHoverEvent()
+net.minecraft.util.text.Style getClickEvent() getChatClickEvent()
+net.minecraft.util.text.TextFormatting net.minecraft.util.EnumChatFormatting
+net.minecraft.util.text.ITextComponent net.minecraft.util.IChatComponent
+net.minecraft.util.text.event.HoverEvent net.minecraft.event.HoverEvent
+net.minecraft.util.text.event.ClickEvent net.minecraft.event.ClickEvent
+
+
diff --git a/versions/mapping-1.16.5-forge-1.12.2.txt b/versions/mapping-1.16.5-forge-1.12.2.txt
new file mode 100644
index 000000000000..58dd451073ec
--- /dev/null
+++ b/versions/mapping-1.16.5-forge-1.12.2.txt
@@ -0,0 +1,75 @@
+net.minecraft.world.level.block.state.BlockState net.minecraft.block.state.IBlockState
+net.minecraft.client.player.RemotePlayer net.minecraft.client.entity.EntityOtherPlayerMP
+net.minecraft.world.entity.decoration.ArmorStand net.minecraft.entity.item.EntityArmorStand
+net.minecraft.world.entity.decoration.ArmorStand getArmorSlots() getArmorInventoryList()
+net.minecraft.network.chat.TextComponent net.minecraft.util.text.TextComponentString
+net.minecraft.client.gui.screens.inventory.ContainerScreen net.minecraft.client.gui.inventory.GuiContainer
+
+net.minecraft.world.entity.player.Inventory armor armorInventory
+
+net.minecraft.world.entity.monster.EnderMan net.minecraft.entity.monster.EntityEnderman
+net.minecraft.world.entity.monster.EnderMan getCarriedBlock() getHeldBlockState()
+net.minecraft.world.entity.player.PlayerModelPart net.minecraft.entity.player.EnumPlayerModelParts
+net.minecraft.world.entity.player.Player net.minecraft.entity.player.EntityPlayer
+net.minecraft.world.entity.player.Player isModelPartShown() isWearing()
+net.minecraft.world.entity.Entity net.minecraft.entity.Entity
+net.minecraft.world.entity.Entity xo posX
+net.minecraft.world.entity.Entity yo posY
+net.minecraft.world.entity.Entity zo posZ
+net.minecraft.world.entity.Entity xOld prevPosX
+net.minecraft.world.entity.Entity yOld prevPosY
+net.minecraft.world.entity.Entity zOld prevPosZ
+net.minecraft.world.entity.Entity level getEntityWorld()
+net.minecraftforge.eventbus.api.Event net.minecraftforge.fml.common.eventhandler.Event
+net.minecraftforge.eventbus.api.SubscribeEvent net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+com.mojang.blaze3d.platform.GlStateManager net.minecraft.client.renderer.GlStateManager
+com.mojang.blaze3d.platform.GlStateManager _disableRescaleNormal() disableRescaleNormal()
+com.mojang.blaze3d.platform.GlStateManager _viewport() viewport()
+com.mojang.blaze3d.platform.GlStateManager _enableCull() enableCull()
+com.mojang.blaze3d.platform.GlStateManager _disableCull() disableCull()
+com.mojang.blaze3d.platform.GlStateManager _enableBlend() enableBlend()
+com.mojang.blaze3d.platform.GlStateManager _disableBlend() disableBlend()
+com.mojang.blaze3d.platform.GlStateManager _blendFunc() blendFunc()
+com.mojang.blaze3d.platform.GlStateManager _depthFunc() depthFunc()
+com.mojang.blaze3d.platform.GlStateManager _depthMask() depthMask()
+com.mojang.blaze3d.platform.GlStateManager _enableLighting() enableLighting()
+com.mojang.blaze3d.platform.GlStateManager _enableDepthTest() enableDepth()
+com.mojang.blaze3d.platform.GlStateManager _disableDepthTest() disableDepth()
+com.mojang.blaze3d.platform.GlStateManager _disableLighting() disableLighting()
+com.mojang.blaze3d.platform.GlStateManager _pushMatrix() pushMatrix()
+com.mojang.blaze3d.platform.GlStateManager _popMatrix() popMatrix()
+com.mojang.blaze3d.platform.GlStateManager _bindTexture() bindTexture()
+com.mojang.blaze3d.platform.GlStateManager _deleteTexture() deleteTexture()
+com.mojang.blaze3d.platform.GlStateManager _clearColor() clearColor()
+com.mojang.math.Matrix4f org.lwjgl.util.vector.Matrix4f
+com.mojang.math.Matrix3f org.lwjgl.util.vector.Matrix3f
+net.minecraft.client.util.math.Vector4f org.lwjgl.util.vector.Vector4f
+
+net.minecraft.world.level.Level getEntity() getEntityByID()
+net.minecraft.world.scores.Team$Visibility net.minecraft.scoreboard.Team$EnumVisible
+
+net.minecraft.client.player.AbstractClientPlayer getSkinTextureLocation() getLocationSkin()
+
+net.minecraft.client.multiplayer.ClientLevel net.minecraft.client.multiplayer.WorldClient
+net.minecraft.client.multiplayer.ClientLevel players() getPlayers()
+net.minecraft.client.player.LocalPlayer net.minecraft.client.entity.EntityPlayerSP
+net.minecraft.client.gui.Gui net.minecraft.client.gui.GuiIngame
+net.minecraft.client.gui.components.ChatComponent net.minecraft.client.gui.GuiNewChat
+net.minecraft.client.multiplayer.ClientPacketListener net.minecraft.client.network.NetHandlerPlayClient
+net.minecraft.client.Options net.minecraft.client.settings.GameSettings
+net.minecraft.client.renderer.texture.TextureManager register() loadTexture()
+net.minecraft.client.renderer.texture.AbstractTexture load() loadTexture()
+net.minecraft.client.renderer.texture.AbstractTexture getId() getGlTextureId()
+net.minecraft.client.renderer.texture.AbstractTexture releaseId() deleteGlTexture()
+net.minecraft.server.packs.resources.ResourceManager net.minecraft.client.resources.IResourceManager
+net.minecraft.client.gui.screens.Screen net.minecraft.client.gui.GuiScreen
+net.minecraft.client.gui.screens.Screen isPauseScreen() doesGuiPauseGame()
+net.minecraft.client.Minecraft setScreen() displayGuiScreen()
+net.minecraft.world.entity.LivingEntity net.minecraft.entity.EntityLivingBase
+net.minecraft.world.entity.LivingEntity getEffect() getActivePotionEffect()
+net.minecraft.world.entity.LivingEntity getMainHandItem() getHeldItemMainhand()
+net.minecraft.world.entity.LivingEntity getOffhandItem() getHeldItemOffhand()
+net.minecraft.world.entity.LivingEntity getItemBySlot() getItemStackFromSlot()
+net.minecraft.world.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot
+net.minecraft.world.effect.MobEffect net.minecraft.potion.Potion
+

From 4482c2ac717340d6e80f24df9e4ac6cfb65a1d05 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:44:16 +0200
Subject: [PATCH 216/721] Feature: Splatter Hearts (#2318)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../StillgoreChateauConfig.java               |  6 +++
 .../area/stillgorechateau/SplatterHearts.kt   | 49 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/StillgoreChateauConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/StillgoreChateauConfig.java
index eee9e2c6933d..2ea71f610f6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/StillgoreChateauConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/StillgoreChateauConfig.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class StillgoreChateauConfig {
@@ -11,4 +12,9 @@ public class StillgoreChateauConfig {
     @Accordion
     public EffigiesConfig bloodEffigies = new EffigiesConfig();
 
+    @Expose
+    @ConfigOption(name = "Highlight Splatter Hearts", desc = "Highlight heart particles of hearts removed by Splatter Cruxes.")
+    @ConfigEditorBoolean
+    public boolean highlightSplatterHearts = true;
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt
new file mode 100644
index 000000000000..cd4059437888
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt
@@ -0,0 +1,49 @@
+package at.hannibal2.skyhanni.features.rift.area.stillgorechateau
+
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.ReceiveParticleEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import net.minecraft.util.EnumParticleTypes
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+
+@SkyHanniModule
+object SplatterHearts {
+    private val config get() = RiftAPI.config.area.stillgoreChateau
+    private var lastHearts = SimpleTimeMark.farPast()
+
+    private var shownHearts = setOf<LorenzVec>()
+    private val currentHearts = mutableSetOf<LorenzVec>()
+
+    @SubscribeEvent
+    fun onParticle(event: ReceiveParticleEvent) {
+        if (!isEnabled()) return
+        if (event.type != EnumParticleTypes.HEART) return
+        if (event.count != 3 || event.speed != 0f) return
+
+        if (lastHearts.passedSince() > 50.milliseconds) {
+            shownHearts = currentHearts
+            currentHearts.clear()
+        }
+        lastHearts = SimpleTimeMark.now()
+        currentHearts += event.location
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled()) return
+        if (lastHearts.passedSince() > 300.milliseconds) return
+        shownHearts.forEach {
+            val pos = it.add(-0.5, 0.3, -0.5)
+            val aabb = pos.axisAlignedTo(pos.add(1, 1, 1))
+            event.drawFilledBoundingBox_nea(aabb, LorenzColor.RED.addOpacity(100))
+        }
+    }
+
+    private fun isEnabled() = RiftAPI.inRift() && RiftAPI.inStillgoreChateau() && config.highlightSplatterHearts
+}

From 9b462cf711085dd0ac56131ded2e09ff2609bc45 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:56:25 +0200
Subject: [PATCH 217/721] Improvement: Add Divan's Powder Coating to Estimated
 Item Value (#2317)

---
 .../misc/items/EstimatedItemValueCalculator.kt         | 10 ++++++++++
 .../skyhanni/utils/SkyBlockItemModifierUtils.kt        |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index ad00298c3449..25fa85c03a7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -44,6 +44,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getTransmissionTune
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasArtOfPeace
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasArtOfWar
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasBookOfStats
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasDivanPowderCoating
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasEtherwarp
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasJalapenoBook
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasWoodSingularity
@@ -74,6 +75,7 @@ object EstimatedItemValueCalculator {
         ::addJalapenoBook,
         ::addStatsBook,
         ::addEnrichment,
+        ::addDivanPowderCoating,
 
         // counted
         ::addMasterStars,
@@ -305,6 +307,14 @@ object EstimatedItemValueCalculator {
         return price
     }
 
+    private fun addDivanPowderCoating(stack: ItemStack, list: MutableList<String>): Double {
+        if (!stack.hasDivanPowderCoating()) return 0.0
+
+        val price = "DIVAN_POWDER_COATING".asInternalName().getPrice()
+        list.add("§7Divan Powder Coating: §a§l✔ §7(§6" + price.shortFormat() + "§7)")
+        return price
+    }
+
     private fun addArtOfWar(stack: ItemStack, list: MutableList<String>): Double {
         if (!stack.hasArtOfWar()) return 0.0
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 7d38fa58b78d..b39493741a3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -170,6 +170,8 @@ object SkyBlockItemModifierUtils {
 
     fun ItemStack.hasWoodSingularity() = getAttributeBoolean("wood_singularity_count")
 
+    fun ItemStack.hasDivanPowderCoating() = getAttributeBoolean("divan_powder_coating")
+
     fun ItemStack.hasArtOfWar() = getAttributeBoolean("art_of_war_count")
 
     // TODO untested

From 091b939ea277d22da7fe46eba7d2834af71463e0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:59:52 +0200
Subject: [PATCH 218/721] Backend: ItemPriceUtils (#2290)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../endernodetracker/EnderNodeTracker.kt      |  2 +-
 .../garden/farming/CropMoneyDisplay.kt        |  2 +-
 .../inventory/AnitaExtraFarmingFortune.kt     |  2 +-
 .../chocolatefactory/ChocolateShopPrice.kt    | 15 ++--
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  2 +-
 .../skyhanni/utils/ItemPriceUtils.kt          | 68 ++++++++++++++++--
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   | 69 +++++--------------
 7 files changed, 92 insertions(+), 68 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 9012f0223073..12bd69658880 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -19,10 +19,10 @@ import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemCategory.Companion.containsItem
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
-import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
index bea005d76dc6..217da97359ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
@@ -24,6 +24,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.moveEntryToTop
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPrice
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -31,7 +32,6 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
-import at.hannibal2.skyhanni.utils.NEUItems.getNpcPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt
index afebbda4dc8f..af4e4b31f45a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt
@@ -9,8 +9,8 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.indexOfFirst
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
-import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
index 957685d10a45..277532aaa667 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.DisplayTableEntry
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
@@ -14,7 +15,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.loreCosts
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
-import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.NumberUtil.million
@@ -39,18 +39,19 @@ object ChocolateShopPrice {
 
     private val menuNamePattern by ChocolateFactoryAPI.patternGroup.pattern(
         "shop.title",
-        "Chocolate Shop"
+        "Chocolate Shop",
     )
     private val itemBoughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "shop.bought",
-        "§aYou bought §r§.(?<item>[\\w ]+)§r(?:§8 x(?<amount>\\d+)§r)?§a!"
+        "§aYou bought §r§.(?<item>[\\w ]+)§r(?:§8 x(?<amount>\\d+)§r)?§a!",
     )
+
     /**
      * REGEX-TEST: §7Chocolate Spent: §60
      */
     private val chocolateSpentPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "shop.spent",
-        "§7Chocolate Spent: §6(?<amount>[\\d,]+)"
+        "§7Chocolate Spent: §6(?<amount>[\\d,]+)",
     )
 
     var inInventory = false
@@ -143,8 +144,8 @@ object ChocolateShopPrice {
                     factor,
                     product.item,
                     hover,
-                    highlightsOnHoverSlots = product.slot?.let { listOf(it) } ?: emptyList()
-                )
+                    highlightsOnHoverSlots = product.slot?.let { listOf(it) } ?: emptyList(),
+                ),
             )
         }
 
@@ -171,7 +172,7 @@ object ChocolateShopPrice {
             config.position.renderRenderables(
                 display,
                 extraSpace = 5,
-                posLabel = "Chocolate Shop Price"
+                posLabel = "Chocolate Shop Price",
             )
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 2a5092f27026..3e31faef0173 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -26,6 +26,7 @@ import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
@@ -46,7 +47,6 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
index e604c29ff522..b03b47168ac6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
@@ -1,18 +1,78 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
+import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarDataHolder
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getLowestBinOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getPrice
-import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
+import at.hannibal2.skyhanni.utils.NEUItems.getRecipes
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 
 object ItemPriceUtils {
 
+    fun NEUInternalName.getPrice(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ) = getPriceOrNull(priceSource, pastRecipes) ?: -1.0
+
+    fun NEUInternalName.getPriceOrNull(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ): Double? {
+        when (this) {
+            NEUInternalName.JASPER_CRYSTAL -> return 0.0
+            NEUInternalName.RUBY_CRYSTAL -> return 0.0
+            NEUInternalName.SKYBLOCK_COIN -> return 1.0
+            NEUInternalName.WISP_POTION -> return 20_000.0
+        }
+
+        if (priceSource != ItemPriceSource.NPC_SELL) {
+            getBazaarData()?.let {
+                return if (priceSource == ItemPriceSource.BAZAAR_INSTANT_BUY) it.sellOfferPrice else it.instantBuyPrice
+            }
+
+            getLowestBinOrNull()?.let {
+                return it
+            }
+
+            if (equals("JACK_O_LANTERN")) {
+                return "PUMPKIN".asInternalName().getPrice(priceSource) + 1
+            }
+        }
+        if (equals("GOLDEN_CARROT")) {
+            // 6.8 for some players
+            return 7.0 // NPC price
+        }
+
+        return getNpcPriceOrNull() ?: getRawCraftCostOrNull(pastRecipes)
+    }
+
+    private fun NEUInternalName.getLowestBinOrNull(): Double? {
+        val result = NEUItems.manager.auctionManager.getLowestBin(asString())
+        if (result == -1L) return null
+        return result.toDouble()
+    }
+
+    // If NEU fails to calculate the craft costs, we calculate it ourself.
+    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
+        NEUItems.manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
+            getRecipes(this).filter { it !in pastRecipes }
+                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }
+                .filter { it >= 0 }
+                .minOrNull()
+        }
+
+    fun NEUInternalName.getNpcPrice(): Double = getNpcPriceOrNull() ?: -1.0
+
+    fun NEUInternalName.getNpcPriceOrNull(): Double? {
+        if (this == NEUInternalName.WISP_POTION) {
+            return 20_000.0
+        }
+        return BazaarDataHolder.getNpcPrice(this)
+    }
+
     fun debugItemPrice(args: Array<String>) {
         val internalName = getItemOrFromHand(args)
         if (internalName == null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index f3657d10eafc..ae3863410648 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -7,8 +7,6 @@ import at.hannibal2.skyhanni.data.jsonobjects.repo.MultiFilterJson
 import at.hannibal2.skyhanni.events.NeuProfileDataLoadedEvent
 import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
-import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarDataHolder
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
@@ -47,6 +45,11 @@ import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.opengl.GL11
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPrice as getNpcPriceNew
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPriceOrNull as getNpcPriceOrNullNew
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice as getPriceNew
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPriceOrNull as getPriceOrNullNew
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getRawCraftCostOrNull as getRawCraftCostOrNullNew
 
 @SkyHanniModule
 object NEUItems {
@@ -160,69 +163,29 @@ object NEUItems {
     fun getInternalNameOrNull(nbt: NBTTagCompound): NEUInternalName? =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()?.asInternalName()
 
+    @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
     fun NEUInternalName.getPrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
         pastRecipes: List<NeuRecipe> = emptyList(),
-    ) = getPriceOrNull(priceSource, pastRecipes) ?: -1.0
+    ): Double = getPriceNew(priceSource, pastRecipes)
 
-    fun NEUInternalName.getNpcPrice() = getNpcPriceOrNull() ?: -1.0
+    @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
+    fun NEUInternalName.getNpcPrice(): Double = getNpcPriceNew()
 
-    fun NEUInternalName.getNpcPriceOrNull(): Double? {
-        if (this == NEUInternalName.WISP_POTION) {
-            return 20_000.0
-        }
-        return BazaarDataHolder.getNpcPrice(this)
-    }
+    @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
+    fun NEUInternalName.getNpcPriceOrNull(): Double? = getNpcPriceOrNullNew()
 
     fun transHypixelNameToInternalName(hypixelId: String): NEUInternalName =
         manager.auctionManager.transformHypixelBazaarToNEUItemId(hypixelId).asInternalName()
 
+    @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
     fun NEUInternalName.getPriceOrNull(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
         pastRecipes: List<NeuRecipe> = emptyList(),
-    ): Double? {
-        when (this) {
-            NEUInternalName.JASPER_CRYSTAL -> return 0.0
-            NEUInternalName.RUBY_CRYSTAL -> return 0.0
-            NEUInternalName.SKYBLOCK_COIN -> return 1.0
-            NEUInternalName.WISP_POTION -> return 20_000.0
-        }
-
-        if (priceSource != ItemPriceSource.NPC_SELL) {
-            getBazaarData()?.let {
-                return if (priceSource == ItemPriceSource.BAZAAR_INSTANT_BUY) it.sellOfferPrice else it.instantBuyPrice
-            }
-
-            getLowestBinOrNull()?.let {
-                return it
-            }
-
-            if (equals("JACK_O_LANTERN")) {
-                return "PUMPKIN".asInternalName().getPrice(priceSource) + 1
-            }
-        }
-        if (equals("GOLDEN_CARROT")) {
-            // 6.8 for some players
-            return 7.0 // NPC price
-        }
-
-        return getNpcPriceOrNull() ?: getRawCraftCostOrNull(pastRecipes)
-    }
-
-    fun NEUInternalName.getLowestBinOrNull(): Double? {
-        val result = manager.auctionManager.getLowestBin(asString())
-        if (result == -1L) return null
-        return result.toDouble()
-    }
+    ): Double? = this.getPriceOrNullNew(priceSource, pastRecipes)
 
-    // If NEU fails to calculate the craft costs, we calculate it ourself.
-    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
-        manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
-            getRecipes(this).filter { it !in pastRecipes }
-                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }
-                .filter { it >= 0 }
-                .minOrNull()
-        }
+    @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
+    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? = getRawCraftCostOrNullNew(pastRecipes)
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
         .withKnownInternalName(asString())
@@ -232,7 +195,7 @@ object NEUItems {
 
     fun NEUInternalName.getItemStack(): ItemStack =
         getItemStackOrNull() ?: run {
-            getPriceOrNull() ?: return@run fallbackItem
+            getPriceOrNullNew() ?: return@run fallbackItem
             if (ignoreItemsFilter.match(this.asString())) return@run fallbackItem
             ErrorManager.logErrorWithData(
                 IllegalStateException("Something went wrong!"),

From fae0e04865eaad9111d994b7d5810c296ecae371 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:03:26 +0200
Subject: [PATCH 219/721] Backend: Add Minister to MayorAPI (#2313)

---
 .../features/gui/customscoreboard/MayorConfig.java   |  3 +--
 src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt |  5 +++++
 .../skyhanni/data/jsonobjects/other/MayorJson.kt     |  8 ++++++++
 .../gui/customscoreboard/ScoreboardElements.kt       | 12 ++++++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/MayorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/MayorConfig.java
index a704efc42e9d..5621d7571a62 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/MayorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/MayorConfig.java
@@ -16,8 +16,7 @@ public class MayorConfig {
     public boolean showTimeTillNextMayor = true;
 
     @Expose
-    // TODO: Same Toggle toggles ministers
-    @ConfigOption(name = "Show Extra Mayor", desc = "Show the Perkpocalypse Mayor without their perks.")
+    @ConfigOption(name = "Show Extra Mayor", desc = "Show the Perkpocalypse Mayor without their perks and the minister with their perk.")
     @ConfigEditorBoolean
     public boolean showExtraMayor = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index c484f40714e3..53539adb4a07 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -86,6 +86,8 @@ object MayorAPI {
 
     var currentMayor: Mayor? = null
         private set
+    var currentMinister: Mayor? = null
+        private set
     private var lastMayor: Mayor? = null
     var jerryExtraMayor: Pair<Mayor?, SimpleTimeMark> = null to SimpleTimeMark.farPast()
         private set
@@ -216,6 +218,7 @@ object MayorAPI {
             val currentMayorName = data.mayor.name
             if (lastMayor?.name != currentMayorName) {
                 currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks)
+                currentMinister = setAssumeMayorJson(data.mayor.minister.name, data.mayor.minister.perk)
             }
         }
     }
@@ -246,6 +249,8 @@ object MayorAPI {
             add("Active Perks: ${currentMayor?.activePerks}")
             add("Last Update: $lastUpdate (${lastUpdate.passedSince()} ago)")
             add("Time Till Next Mayor: ${nextMayorTimestamp.timeUntil()}")
+            add("Current Minister: ${currentMinister?.name ?: "Unknown"}")
+            add("Current Minister Perk: ${currentMinister?.activePerks}")
             if (jerryExtraMayor.first != null) {
                 add("Jerry Mayor: ${jerryExtraMayor.first?.name} expiring at: ${jerryExtraMayor.second.timeUntil()}")
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
index d8f0df279a25..f54c7daf4b73 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
@@ -11,6 +11,7 @@ data class MayorInfo(
     @Expose val key: String,
     @Expose val name: String,
     @Expose val perks: List<MayorPerk>,
+    @Expose val minister: Minister,
     @Expose val election: MayorElection,
 )
 
@@ -26,7 +27,14 @@ data class MayorCandidate(
     @Expose val votes: Int,
 )
 
+data class Minister(
+    @Expose val key: String,
+    @Expose val name: String,
+    @Expose val perk: List<MayorPerk>,
+)
+
 data class MayorPerk(
     @Expose val name: String,
     @Expose val description: String,
+    @Expose val minister: Boolean = false,
 )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 6562edaf3167..7c9757da2d0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -747,7 +747,7 @@ private fun getEventsDisplayPair(): List<ScoreboardElementType> = ScoreboardEven
 private fun getEventsShowWhen() = ScoreboardEvent.getEvent().isNotEmpty()
 
 private fun getMayorDisplayPair() = buildList {
-    val currentMayorName = MayorAPI.currentMayor?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: "<hidden>"
+    val currentMayorName = MayorAPI.currentMayor?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: return@buildList
     val timeTillNextMayor = if (mayorConfig.showTimeTillNextMayor) {
         "§7 (§e${MayorAPI.nextMayorTimestamp.timeUntil().format(maxUnits = 2)}§7)"
     } else {
@@ -763,6 +763,15 @@ private fun getMayorDisplayPair() = buildList {
     }
 
     if (!mayorConfig.showExtraMayor) return@buildList
+    val ministerName = MayorAPI.currentMinister?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: return@buildList
+    add(ministerName to HorizontalAlignment.LEFT)
+
+    if (mayorConfig.showMayorPerks) {
+        MayorAPI.currentMinister?.activePerks?.forEach { perk ->
+            add(" §7- §e${perk.perkName}" to HorizontalAlignment.LEFT)
+        }
+    }
+
     val jerryExtraMayor = MayorAPI.jerryExtraMayor
     val extraMayor = jerryExtraMayor.first ?: return@buildList
 
@@ -774,7 +783,6 @@ private fun getMayorDisplayPair() = buildList {
     }
 
     add((extraMayorName + extraTimeTillNextMayor) to HorizontalAlignment.LEFT)
-
 }
 
 private fun getMayorShowWhen() =

From 12f434e64c9dc86ccbd1d120e156eae5ec983026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Sun, 11 Aug 2024 14:57:30 +0200
Subject: [PATCH 220/721] Fix generateRepoPatterns task (#2330)

---
 build.gradle.kts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 773c7ac2860b..e8464ada27e8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,7 @@ import at.skyhanni.sharedvariables.MultiVersionStage
 import at.skyhanni.sharedvariables.ProjectTarget
 import at.skyhanni.sharedvariables.SHVersionInfo
 import at.skyhanni.sharedvariables.versionString
+import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -216,16 +217,10 @@ tasks.processResources {
 }
 
 if (target == ProjectTarget.MAIN) {
-    val generateRepoPatterns by tasks.creating(JavaExec::class) {
+    tasks.create("generateRepoPatterns", RunGameTask::class, loom.runs.named("client").get()).apply {
         javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
-        mainClass.set("net.fabricmc.devlaunchinjector.Main")
         dependsOn(tasks.configureLaunch)
-        workingDir(project.file(runDirectory))
-        classpath(sourceSets.main.map { it.runtimeClasspath }, sourceSets.main.map { it.output })
         jvmArgs(
-            "-Dfabric.dli.config=${project.file(".gradle/loom-cache/launch.cfg").absolutePath}",
-            "-Dfabric.dli.env=client",
-            "-Dfabric.dli.main=net.minecraft.launchwrapper.Launch",
             "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
             "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006",
             "-javaagent:${headlessLwjgl.singleFile.absolutePath}",

From 39566c78d07f15e57f0ea9a5fa37f22dd277c97c Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 11 Aug 2024 23:02:03 +1000
Subject: [PATCH 221/721] Add copper dye to block visitor rewards (#2329)

Co-authored-by: not-a-cow <kly3aswd@gmail.com>
---
 .../at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt | 2 +-
 .../features/garden/visitor/RewardWarningConfig.java      | 3 ++-
 .../features/garden/visitor/GardenVisitorFeatures.kt      | 8 ++++++++
 .../skyhanni/features/garden/visitor/VisitorReward.kt     | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index f274d44f2b48..25cab54fbec5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 53
+    const val CONFIG_VERSION = 54
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
index 4b70d5230439..7e464d426d18 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
@@ -53,7 +53,8 @@ public class RewardWarningConfig {
         VisitorReward.MUSIC_RUNE,
         VisitorReward.SPACE_HELMET,
         VisitorReward.CULTIVATING,
-        VisitorReward.REPLENISH
+        VisitorReward.REPLENISH,
+        VisitorReward.COPPER_DYE
     ));
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 73384c9f0e43..fef28450f719 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -729,6 +729,14 @@ object GardenVisitorFeatures {
 
             drops
         }
+        event.transform(54, "garden.visitors.rewardWarning.drops") { element ->
+            val drops = JsonArray()
+            for (entry in element.asJsonArray) {
+                drops.add(JsonPrimitive(entry.asString))
+            }
+            drops.add(JsonPrimitive(VisitorReward.COPPER_DYE.name))
+            drops
+        }
 
         event.transform(15, "garden.visitors.highlightStatus") { element ->
             ConfigUtils.migrateIntToEnum(element, HighlightMode::class.java)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
index 76ef142372c8..048876c72a45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
@@ -20,6 +20,7 @@ enum class VisitorReward(
     CULTIVATING("CULTIVATING;1", "§9Cultivating I", legacyId = 6),
     REPLENISH("REPLENISH;1", "§9Replenish I", legacyId = 7),
     DELICATE("DELICATE;5", "§9Delicate V"),
+    COPPER_DYE("DYE_COPPER", "§8Copper Dye"),
     ;
 
     private val internalName by lazy { rawInternalName.asInternalName() }

From 8f99611e9504af4398bd6ed961804c7d8668962d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:02:28 +0200
Subject: [PATCH 222/721] code cleanup

---
 .../skyhanni/features/garden/visitor/VisitorReward.kt          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
index 048876c72a45..e20102299d17 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
@@ -8,8 +8,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 enum class VisitorReward(
     private val rawInternalName: String,
     val displayName: String,
-    private val legacyId:
-    Int = -1
+    private val legacyId: Int = -1,
 ) : HasLegacyId {
     FLOWERING_BOUQUET("FLOWERING_BOUQUET", "§9Flowering Bouquet", legacyId = 0),
     OVERGROWN_GRASS("OVERGROWN_GRASS", "§9Overgrown Grass", legacyId = 1),

From 74a805103ba3fba9e43af21071165b0a2232a0ab Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:29:51 +0200
Subject: [PATCH 223/721] reverting GuiPositionEditor changes from preprocessor
 pr

---
 .../config/core/config/gui/GuiPositionEditor.kt      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index 817defc5fdef..db6ca3c30d79 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -28,8 +28,6 @@ import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
-import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils
-import at.hannibal2.skyhanni.utils.compat.SkyhanniBaseScreen
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.ScaledResolution
@@ -43,7 +41,7 @@ class GuiPositionEditor(
     private val positions: List<Position>,
     private val border: Int,
     private val oldScreen: GuiContainer? = null,
-) : SkyhanniBaseScreen() {
+) : GuiScreen() {
 
     private var grabbedX = 0
     private var grabbedY = 0
@@ -149,15 +147,15 @@ class GuiPositionEditor(
         return hoveredPos
     }
 
-    private fun getScaledHeight() = GuiScreenUtils.scaledWindowHeight
-    private fun getScaledWidth() = GuiScreenUtils.scaledWindowHeight
+    private fun getScaledHeight() = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
+    private fun getScaledWidth() = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
 
     @Throws(IOException::class)
     override fun mouseClicked(originalX: Int, priginalY: Int, mouseButton: Int) {
         super.mouseClicked(originalX, priginalY, mouseButton)
 
-        val mouseX = GuiScreenUtils.mouseX
-        val mouseY = GuiScreenUtils.mouseY
+        val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
+        val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
         for (i in positions.indices.reversed()) {
             val position = positions[i]
             val elementWidth = position.getDummySize().x

From 184afa85c57ff2bfab2819a75299b6144a7c4a1b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:57:51 +0200
Subject: [PATCH 224/721] trying to fix gradle error on github

---
 .../skyhanni/config/core/config/gui/GuiPositionEditor.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index db6ca3c30d79..ce97a326c815 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -28,8 +28,8 @@ import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.compat.SkyhanniBaseScreen
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.client.renderer.GlStateManager
@@ -41,7 +41,7 @@ class GuiPositionEditor(
     private val positions: List<Position>,
     private val border: Int,
     private val oldScreen: GuiContainer? = null,
-) : GuiScreen() {
+) : SkyhanniBaseScreen() {
 
     private var grabbedX = 0
     private var grabbedY = 0

From 78dcb458d81de56c845faad356d10f8fc6fd8826 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:06:21 +0200
Subject: [PATCH 225/721] changed /shtestmessage logic

---
 .../java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
index 5b36d18639b1..e9d8d61453cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
@@ -47,7 +47,8 @@ object TestChatCommand {
                     return
                 }
             else ChatComponentText(text.replace("&", "§"))
-        if (!isHidden) ChatUtils.chat("Testing message: §7${component.formattedText}", prefixColor = "§a")
+        // TODO add additional hide parameter
+//         if (!isHidden) ChatUtils.chat("Testing message: §7${component.formattedText}", prefixColor = "§a")
         test(component, isHidden)
     }
 

From 3f0cb03287be8898e8c7a090a43f47f3ebee2884 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:06:46 +0200
Subject: [PATCH 226/721] repo local loading is now always enabled in devenv

---
 .../hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
index 0bbcda9cfe94..abdf15b1c100 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -78,7 +78,7 @@ object RepoPatternManager {
             }
         }
 
-    val localLoading: Boolean get() = config.forceLocal.get() xor (!insideTest && PlatformUtils.isDevEnvironment)
+    val localLoading: Boolean get() = config.forceLocal.get() || (!insideTest && PlatformUtils.isDevEnvironment)
 
     private val logger = LogManager.getLogger("SkyHanni")
 

From c309218ce90d8156f5df33ba6fe7661b9e8c9f29 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:15:06 +0200
Subject: [PATCH 227/721] Version 0.26 Beta 22

---
 docs/CHANGELOG.md                                 | 15 +++++++++++++++
 docs/FEATURES.md                                  |  1 +
 root.gradle.kts                                   |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt     |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 06d0d263b395..ee00783a5c13 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -133,6 +133,7 @@
 
 + Punchcard Artifact Highlighter & Overlay. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1089)
     + Highlights unpunched players in the Rift.
++ Added Splatter Hearts Highlight for the Rift. - Empa (https://github.com/hannibal002/SkyHanni/pull/2318)
 
 #### Misc Features
 
@@ -183,6 +184,7 @@
 + Added a "Compact" option to the Rancher Boots Optimal Speed GUI. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
 + The Rancher Boots Optimal Speed GUI now highlights the crop corresponding to the last held tool. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
 + Added Slug pet to the FF Guide. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/2249)
++ Added Copper dye to the list of blocked visitor rewards. - not-a-cow (https://github.com/hannibal002/SkyHanni/pull/2329)
 
 #### Hoppity Event Improvements
 
@@ -260,6 +262,7 @@
 + Added reset buttons for colors and spacing in the Custom Wardrobe config. - raven (https://github.com/hannibal002/SkyHanni/pull/2120)
 + Added an option for the Estimated Chest Value display to also work in your own inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2218)
 + Added SkyBlock Level number in SB Menu to Item Number config. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2172)
++ Added Divan's Powder Coating to the Estimated Item Value feature. - jani (https://github.com/hannibal002/SkyHanni/pull/2317)
 
 #### Fishing Improvements
 
@@ -310,6 +313,7 @@
 + Rounded corner smoothness now applies to custom Scoreboard textures. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2228)
 + Reduced the frequency of "tab list not found" error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2266)
 + Hide Beacon Power display while on a Bingo profile. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2286)
++ Added the current Minister's name and perks to the Mayor Display on the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2313)
 
 ### Fixes
 
@@ -348,6 +352,8 @@
 + Fixed Flawless Gemstones not being formatted correctly when the Powder Mining filter is enabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2281)
 + Fixed Peak of the Mountain always being disabled. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2282)
 + Fixed an issue where TunnelMaps could stop functioning. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2277)
++ Fixed blocks mined by Efficient Miner not being detected in the Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2307)
++ Fixed empty lines not being blocked by the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2309)
 
 #### Garden Fixes
 
@@ -499,6 +505,11 @@
 + Fixed sack changes appearing with a delay in the Item Pickup Log. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2292)
 + Fixed Item Pickup Log error with Wisp Potion. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2291)
 + Fixed Carnival Masks not being clickable in `/equipment`. - Luna (https://github.com/hannibal002/SkyHanni/pull/2293)
++ Fixed Bobbin' Time not being detected correctly. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2301)
++ Fixed lore not showing on enchanted books with compressed format. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2301)
++ Fixed the incorrect "This item has no attributes" message appearing in the Attribute Fusion menu for some items. - Luna (https://github.com/hannibal002/SkyHanni/pull/2304)
++ Fixed shift-clicking items in GUIs triggering the Item Pickup Log. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2305)
++ Fixed the Master Mode Dungeon stack size display in the party finder menu. - fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2316)
 
 #### Combat Fixes
 
@@ -668,6 +679,10 @@
 + Added DYE to Item Category. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2315)
 + Added /shdebugprice command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2289)
 + Cache rewardPatterns in the powder chat filter. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2276)
++ Added Minister data to the MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2313)
++ Added ItemPriceUtils and moved all item price functions into it. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2290)
++ Added a preprocessor to prepare for 1.21. - !nea (https://github.com/hannibal002/SkyHanni/pull/2283)
+    + This will require a minor adjustment in how the Minecraft client is launched.
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index dc90ea4cf2da..84d16657df76 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -813,6 +813,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Change Highlight color.
 + Punchcard Artifact Highlighter & Overlay. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1089)
     + Highlights unpunched players in the Rift.
++ Added Splatter Hearts Highlight for the Rift. - Empa (https://github.com/hannibal002/SkyHanni/pull/2318)
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index bc43f053d706..fcdc8b5165cf 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26.Beta.21"
+    version = "0.26.Beta.22"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 00312da7ed1e..835a12ab8e0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.21",
+    version = "0.26.Beta.22",
 )
 class SkyHanniMod {
 

From 4e0ecc529f3616d9f1041392c79b6d2dbf303753 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 12 Aug 2024 09:43:52 +0200
Subject: [PATCH 228/721] Improvement: Wardrobe Keybinds in Favorite Mode
 (#2331)

---
 .../features/inventory/wardrobe/CustomWardrobeKeybinds.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
index 502255afae93..a2fdd21ff0e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
@@ -32,7 +32,7 @@ object CustomWardrobeKeybinds {
     @SubscribeEvent
     fun onGui(event: GuiKeyPressEvent) {
         if (!isEnabled()) return
-        val slots = WardrobeAPI.slots.filter { it.isInCurrentPage() }
+        val slots = WardrobeAPI.slots.filter { it.isInCurrentPage() }.filterNot { config.onlyFavorites && !it.favorite }
 
         for ((index, key) in keybinds.withIndex()) {
             if (!key.isKeyHeld()) continue

From 54101578e57ce5ca8d74c55469b2fa6c5360a08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Mon, 12 Aug 2024 22:56:41 +0200
Subject: [PATCH 229/721] Fix code preprocessing (#2335)

---
 .../skyhanni/config/core/config/gui/GuiPositionEditor.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index ce97a326c815..3e64d5f5abff 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -28,6 +28,7 @@ import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils
 import at.hannibal2.skyhanni.utils.compat.SkyhanniBaseScreen
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
@@ -147,8 +148,8 @@ class GuiPositionEditor(
         return hoveredPos
     }
 
-    private fun getScaledHeight() = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
-    private fun getScaledWidth() = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
+    private fun getScaledHeight() = GuiScreenUtils.scaledWindowHeight
+    private fun getScaledWidth() = GuiScreenUtils.scaledWindowWidth
 
     @Throws(IOException::class)
     override fun mouseClicked(originalX: Int, priginalY: Int, mouseButton: Int) {

From 9f4e281457ea73a9363cdf781351ed26be6ecbfc Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:19:11 +0200
Subject: [PATCH 230/721] Feature: Farming Personal Best FF Gain (#2332)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/garden/GardenConfig.java  |  9 ++
 .../storage/ProfileSpecificStorage.java       |  5 +-
 .../garden/contest/FarmingPersonalBestGain.kt | 95 +++++++++++++++++++
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index c4bbfacf34b0..b39f5f01ce63 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -217,6 +217,15 @@ public class GardenConfig {
     @FeatureToggle
     public boolean jacobContestSummary = true;
 
+    @Expose
+    @ConfigOption(
+        name = "Personal Best Increase FF",
+        desc = "Show in chat how much more FF you get from farming contest personal best bonus after beating the previous record."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean contestPersonalBestIncreaseFF = true;
+
     // Does not have a config element!
     @Expose
     public Position cropSpeedMeterPos = new Position(278, -236, false, true);
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 3410d9b4de08..39ce4402b1a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -29,7 +29,6 @@
 import at.hannibal2.skyhanni.features.garden.pests.VinylType;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker;
-import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryUpgrade;
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
@@ -275,6 +274,10 @@ public static class GardenStorage {
         @Expose
         public Map<CropType, Double> latestTrueFarmingFortune = new HashMap<>();
 
+        // TODO use in /ff guide
+        @Expose
+        public Map<CropType, Double> personalBestFF = new HashMap<>();
+
         @Expose
         @Nullable
         public CropAccessory savedCropAccessory = CropAccessory.NONE;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt
new file mode 100644
index 000000000000..7d009629b7c9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt
@@ -0,0 +1,95 @@
+package at.hannibal2.skyhanni.features.garden.contest
+
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.garden.CropType
+import at.hannibal2.skyhanni.features.garden.GardenAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object FarmingPersonalBestGain {
+    private val config get() = GardenAPI.config
+    private val patternGroup = RepoPattern.group("garden.contest.personal.best")
+
+    /**
+     * REGEX-TEST: §e[NPC] Jacob§f: §rYou collected §e1,400,694 §fitems! §d§lPERSONAL BEST§f!
+     */
+    private val newPattern by patternGroup.pattern(
+        "collection.new",
+        "§e\\[NPC] Jacob§f: §rYou collected §e(?<collected>.*) §fitems! §d§lPERSONAL BEST§f!",
+    )
+
+    /**
+     * REGEX-TEST: §e[NPC] Jacob§f: §rYour previous Personal Best was §e1,176,372§f.
+     */
+    private val oldPattern by patternGroup.pattern(
+        "collection.old",
+        "§e\\[NPC] Jacob§f: §rYour previous Personal Best was §e(?<collected>.*)§f.",
+    )
+
+    /**
+     * REGEX-TEST: §e[NPC] Jacob§f: §rYour §6Personal Bests §fperk is now granting you §6+46.69☘ Potato Fortune§f!
+     *
+     */
+    private val newFFPattern by patternGroup.pattern(
+        "ff.new",
+        "§e\\[NPC] Jacob§f: §rYour §6Personal Bests §fperk is now granting you §6\\+(?<ff>.*)☘ (?<crop>.*) Fortune§f!",
+    )
+
+    var newCollected: Double? = null
+    var oldCollected: Double? = null
+    var newFF: Double? = null
+    var crop: String? = null
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        newPattern.matchMatcher(event.message) {
+            newCollected = group("collected").formatDouble()
+            checkDelayed()
+        }
+        oldPattern.matchMatcher(event.message) {
+            oldCollected = group("collected").formatDouble()
+            checkDelayed()
+        }
+        newFFPattern.matchMatcher(event.message) {
+            val cropName = group("crop")
+            newFF = group("ff").formatDouble()
+            crop = cropName
+            val cropType = CropType.getByName(cropName)
+            GardenAPI.storage?.let {
+                it.personalBestFF[cropType] = newFF
+            }
+            checkDelayed()
+        }
+    }
+
+    private fun checkDelayed() = DelayedRun.runNextTick { check() }
+
+    private fun check() {
+        val newCollected = newCollected ?: return
+        val oldCollected = oldCollected ?: return
+        val newFF = newFF ?: return
+        val crop = crop ?: return
+
+        this.newCollected = null
+        this.oldCollected = null
+        this.newFF = null
+        this.crop = null
+
+        val collectionPerFF = newCollected / newFF
+        val oldFF = oldCollected / collectionPerFF
+        val ffDiff = newFF - oldFF
+
+        ChatUtils.chat("This is §6${ffDiff.round(2)}☘ $crop Fortune §emore than previously!")
+    }
+
+    fun isEnabled() = GardenAPI.inGarden() && config.contestPersonalBestIncreaseFF
+}

From 4b2935b538b4a7b7816ac581fa184340557e66e7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:19:24 +0200
Subject: [PATCH 231/721] Improvement: Click CF block message to open pets
 (#2333)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../chocolatefactory/ChocolateFactoryBlockOpen.kt | 10 +++++++---
 .../java/at/hannibal2/skyhanni/utils/ChatUtils.kt | 15 +++++++++++++++
 .../hannibal2/skyhanni/utils/HypixelCommands.kt   |  4 ++++
 3 files changed, 26 insertions(+), 3 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 625fd1d6bdff..c8a4ccd5b53e 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
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 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.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -39,10 +40,13 @@ object ChocolateFactoryBlockOpen {
 
         commandSentTimer = SimpleTimeMark.now()
         event.cancel()
-        ChatUtils.chatAndOpenConfig(
-            "Blocked opening the Chocolate Factory without a §dMythic Rabbit Pet §eequipped. Click here to disable!",
+        ChatUtils.clickToActionOrDisable(
+            "§cBlocked opening the Chocolate Factory without a §dMythic Rabbit Pet §cequipped!",
             config::mythicRabbitRequirement,
-        )
+            "open pets menu",
+        ) {
+            HypixelCommands.pet()
+        }
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.mythicRabbitRequirement
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index be61fc81c4a0..e07e16a08ed6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -257,4 +257,19 @@ object ChatUtils {
         }
         return this
     }
+
+    fun clickToActionOrDisable(message: String, option: KMutableProperty0<*>, actionName: String, action: () -> Unit) {
+        ChatUtils.clickableChat(
+            "$message\n§e[CLICK to $actionName or disable this feature]",
+            onClick = {
+                if (KeyboardManager.isShiftKeyDown() || KeyboardManager.isModifierKeyDown()) {
+                    option.jumpToEditor()
+                } else {
+                    action()
+                }
+            },
+            hover = "§eClick to $actionName!\n" +
+                "§eShift-Click to disable this feature!",
+        )
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
index 032b81672133..a7fca2ce7788 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@@ -68,6 +68,10 @@ object HypixelCommands {
         send("cf")
     }
 
+    fun pet() {
+        send("pet")
+    }
+
     fun openBaker() {
         send("openbaker")
     }

From 67dd38b9d76eab01f0359b6c9d627618111be07f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:19:40 +0200
Subject: [PATCH 232/721] Improvement + Fix: Custom CF Reminder (#2334)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../ChocolateFactoryCustomReminder.kt         | 61 +++++++++++++++++--
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
index 1f7de017c73a..109db545c1bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
@@ -11,14 +11,20 @@ import at.hannibal2.skyhanni.utils.HypixelCommands
 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.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RegexUtils.matchAll
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.TimeUtils.minutes
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -43,11 +49,36 @@ object ChocolateFactoryCustomReminder {
 
     private var lastUpgradeWarning = SimpleTimeMark.farPast()
 
+    private val patternGroup = RepoPattern.group("inventory.chocolate.factory")
+
+    /**
+     * REGEX-TEST: §cRequires 400B all-time Chocolate!
+     */
+    private val milestoneCostLorePattern by patternGroup.pattern(
+        "milestone.cost",
+        "§cRequires (?<amount>.*) all-time Chocolate!",
+    )
+
+    /**
+     * REGEX-TEST: §cYou don't have enough Chocolate!
+     */
+    private val chatMessagePattern by patternGroup.list(
+        "chat.hide",
+        "§cYou don't have enough Chocolate!",
+        "§cYou don't have the required items!",
+        "§cYou must collect (.*) all-time Chocolate!",
+    )
+
     @SubscribeEvent
     fun onChat(event: SystemMessageEvent) {
         if (!isEnabled()) return
+        if (!ChocolateFactoryAPI.inChocolateFactory) return
         if (configReminder.hideChat) {
-            if (event.message == "§cYou don't have enough Chocolate!") {
+
+            if (chatMessagePattern.matches(event.message)) {
+                //§cYou don't have the required items!
+                //§cYou must collect 300B all-time Chocolate!
+//             if (event.message == "§cYou don't have enough Chocolate!") {
                 event.blockedReason = "custom_reminder"
             }
         }
@@ -64,17 +95,37 @@ object ChocolateFactoryCustomReminder {
         if (!isEnabled()) return
         val item = event.item ?: return
         if (event.clickedButton != 0) return
-        // TODO add support for prestige and for Chocolate Milestone
-        val cost = ChocolateFactoryAPI.getChocolateBuyCost(item.getLore()) ?: return
+        val (cost, name) = getCostAndName(item) ?: return
         val duration = ChocolateAmount.CURRENT.timeUntilGoal(cost)
-        val nextLevelName = ChocolateFactoryAPI.getNextLevelName(item) ?: return
 
         // the user has enough chocolate, and just bought something
         if (duration.isNegative()) {
             reset()
             return
         }
-        setReminder(cost, nextLevelName)
+        setReminder(cost, name)
+    }
+
+    // TODO add support for prestige
+    private fun getCostAndName(item: ItemStack): Pair<Long, String>? {
+        val list = item.getLore()
+        val cost = ChocolateFactoryAPI.getChocolateBuyCost(list)
+        if (cost == null) {
+            milestoneCostLorePattern.matchAll(list) {
+                // math needed to get from "time until current chocolate" to "time until all time chocolate"
+                val amount = group("amount").formatLong()
+                val allTime = ChocolateAmount.ALL_TIME.chocolate()
+                val missingAllTime = amount - allTime
+                val current = ChocolateAmount.CURRENT.chocolate()
+                val missing = missingAllTime + current
+
+                return missing to "§6${amount.shortFormat()} Chocolate Milestone"
+            }
+            return null
+        }
+
+        val nextLevelName = ChocolateFactoryAPI.getNextLevelName(item) ?: item.name
+        return cost to nextLevelName
     }
 
     @SubscribeEvent

From 06894504573465b410758d0636238b3560bd7da8 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:35:48 +0200
Subject: [PATCH 233/721] Backend: Dependency Label Workflow (#2341)

---
 .github/scripts/checkDependencies.mjs    | 71 ++++++++++++++++++++++++
 .github/workflows/check_dependencies.yml | 26 +++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 .github/scripts/checkDependencies.mjs
 create mode 100644 .github/workflows/check_dependencies.yml

diff --git a/.github/scripts/checkDependencies.mjs b/.github/scripts/checkDependencies.mjs
new file mode 100644
index 000000000000..2e351bbe6daa
--- /dev/null
+++ b/.github/scripts/checkDependencies.mjs
@@ -0,0 +1,71 @@
+import {Octokit} from "@octokit/rest";
+import fetch from "node-fetch";
+
+const labelName = "Waiting on Dependency PR";
+
+async function run() {
+    const octokit = new Octokit({
+        auth: process.env.GITHUB_TOKEN,
+        request: {
+            fetch: fetch,
+        },
+    });
+
+    const context = JSON.parse(process.env.GITHUB_CONTEXT);
+
+    const pull_request = context.event.pull_request;
+
+    const owner = context.repository_owner;
+    const name = context.repository.split("/")[1];
+
+    const prNumber = pull_request.number;
+    const prBody = pull_request.body || "";
+
+    const dependencyRegex = /## Dependencies/;
+    const match = prBody.match(dependencyRegex);
+
+    if (match) {
+        const prLinks = prBody.match(/- https:\/\/github\.com\/[\w-]+\/[\w-]+\/pull\/\d+/g);
+
+        if (prLinks && prLinks.length > 0) {
+            let hasOpenDependencies = false;
+
+            for (const link of prLinks) {
+                const [, depOwner, depRepo, depNumber] = link.match(/github\.com\/([\w-]+)\/([\w-]+)\/pull\/(\d+)/);
+                const {data: dependencyPr} = await octokit.pulls.get({
+                    owner: depOwner,
+                    repo: depRepo,
+                    pull_number: depNumber,
+                });
+
+                if (dependencyPr.state === "open") {
+                    hasOpenDependencies = true;
+                    break;
+                }
+            }
+
+            const labels = pull_request.labels.map(label => label.name);
+
+            if (hasOpenDependencies && !labels.includes(labelName)) {
+                await octokit.issues.addLabels({
+                    owner,
+                    repo: name,
+                    issue_number: prNumber,
+                    labels: [labelName],
+                });
+            } else if (!hasOpenDependencies && labels.includes(labelName)) {
+                await octokit.issues.removeLabel({
+                    owner,
+                    repo: name,
+                    issue_number: prNumber,
+                    name: labelName,
+                });
+            }
+        }
+    }
+}
+
+run().catch(error => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
new file mode 100644
index 000000000000..5f80c46f7790
--- /dev/null
+++ b/.github/workflows/check_dependencies.yml
@@ -0,0 +1,26 @@
+name: Check PR Dependencies
+
+on:
+    pull_request_target:
+        types: [ opened, edited ]
+
+jobs:
+    check-dependencies:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Check out the repository
+                uses: actions/checkout@v3
+
+            -   name: Set up Node.js
+                uses: actions/setup-node@v3
+                with:
+                    node-version: '16'
+
+            -   name: Install dependencies
+                run: npm install @octokit/rest node-fetch
+
+            -   name: Run dependency check script
+                run: node .github/scripts/checkDependencies.mjs
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                    GITHUB_CONTEXT: ${{ toJson(github) }}

From 085240750f346d8f5e57b3f2b5bef3ec31c44763 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:56:29 +0200
Subject: [PATCH 234/721] fix check dependency workflow

---
 .github/workflows/check_dependencies.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
index 5f80c46f7790..50f3641ae03c 100644
--- a/.github/workflows/check_dependencies.yml
+++ b/.github/workflows/check_dependencies.yml
@@ -3,6 +3,9 @@ name: Check PR Dependencies
 on:
     pull_request_target:
         types: [ opened, edited ]
+    push:
+        branches:
+            - beta
 
 jobs:
     check-dependencies:

From 0a027ea5dac41002a460a2627d5c4ff3820c271d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:41:29 +0200
Subject: [PATCH 235/721] Improvement: Repo Errors (#2338)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../garden/composter/ComposterOverlay.kt      | 24 ++++-----
 .../GardenComposterInventoryFeatures.kt       |  9 +---
 .../features/misc/items/EstimatedItemValue.kt |  8 ---
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 11 ++--
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 51 ++++++++++++++++++-
 .../skyhanni/utils/NEUInternalName.kt         | 12 ++---
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   | 11 ++--
 7 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 5bf03b7e3537..aee2a93f428f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -171,23 +171,19 @@ object ComposterOverlay {
             return
         }
         if (organicMatterFactors.isEmpty()) {
-            organicMatterDisplay =
-                Collections.singletonList(
-                    listOf(
-                        "§cSkyHanni composter error:", "§cRepo data not loaded!",
-                        "§7(organicMatterFactors is empty)",
-                    ),
-                )
+            organicMatterDisplay = listOf(
+                Collections.singletonList("§cSkyHanni composter error:"),
+                Collections.singletonList("§cRepo data not loaded!"),
+                Collections.singletonList("§7(organicMatterFactors is empty)"),
+            )
             return
         }
         if (fuelFactors.isEmpty()) {
-            organicMatterDisplay =
-                Collections.singletonList(
-                    listOf(
-                        "§cSkyHanni composter error:", "§cRepo data not loaded!",
-                        "§7(fuelFactors is empty)",
-                    ),
-                )
+            organicMatterDisplay = listOf(
+                Collections.singletonList("§cSkyHanni composter error:"),
+                Collections.singletonList("§cRepo data not loaded!"),
+                Collections.singletonList("§7(fuelFactors is empty)"),
+            )
             return
         }
         if (currentOrganicMatterItem.let { it !in organicMatterFactors.keys && it != NONE }) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
index eb6dc41e04ba..a4510af8b4e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt
@@ -57,14 +57,7 @@ object GardenComposterInventoryFeatures {
                     )
                     continue
                 }
-                val internalName = NEUInternalName.fromItemNameOrNull(itemName) ?: run {
-                    ErrorManager.logErrorStateWithData(
-                        "Error reading internal name for item: $itemName",
-                        "could not find internal name for",
-                        "itemName" to itemName
-                    )
-                    continue
-                }
+                val internalName = NEUInternalName.fromItemName(itemName)
                 val lowestBin = internalName.getPrice()
                 val price = lowestBin * amount
                 fullPrice += price
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index e55916f95e32..a587443e5da8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -13,7 +13,6 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.item.ItemHoverEvent
 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.addAsSingletonList
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -25,7 +24,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
-import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
@@ -203,12 +201,6 @@ object EstimatedItemValue {
         if (internalName.contains("UNIQUE_RUNE")) return listOf()
         if (internalName.contains("WISP_POTION")) return listOf()
 
-
-        if (internalName.getItemStackOrNull() == null) {
-            ChatUtils.debug("Estimated Item Value is null for: '$internalName'")
-            return listOf()
-        }
-
         val list = mutableListOf<String>()
         list.add("§aEstimated Item Value:")
         val pair = EstimatedItemValueCalculator.calculate(stack, list)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 3e31faef0173..d3df5da3e665 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -20,7 +20,6 @@ import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorColorNames
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
 import at.hannibal2.skyhanni.features.mining.OreBlock
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.BlockUtils
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -32,7 +31,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
-import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -366,12 +364,9 @@ object SkyHanniDebugsAndTests {
             return
         }
 
-        val internalName = hand.getInternalNameOrNull()
-            ?: ErrorManager.skyHanniError("Internal name is null for item ${hand.name}")
-
-        val rawInternalName = internalName.asString()
-        OSUtils.copyToClipboard(rawInternalName)
-        ChatUtils.chat("§eCopied internal name §7$rawInternalName §eto the clipboard!")
+        val internalName = hand.getInternalName().asString()
+        OSUtils.copyToClipboard(internalName)
+        ChatUtils.chat("§eCopied internal name §7$internalName §eto the clipboard!")
     }
 
     fun toggleRender() {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 95dad660c50b..cd55107db4d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.data.PetAPI
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -14,7 +16,9 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
+import com.google.common.collect.Lists
 import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
+import io.github.moulberry.notenoughupdates.util.NotificationHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
@@ -22,14 +26,18 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.nbt.NBTTagList
 import net.minecraft.nbt.NBTTagString
 import net.minecraftforge.common.util.Constants
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.LinkedList
 import java.util.regex.Matcher
 import kotlin.time.Duration.Companion.seconds
 
+@SkyHanniModule
 object ItemUtils {
 
     private val itemNameCache = mutableMapOf<NEUInternalName, String>() // internal name -> item name
 
+    private val missingRepoItems = mutableSetOf<String>()
+
     fun ItemStack.cleanName() = this.displayName.removeColor()
 
     fun isSack(stack: ItemStack) = stack.getInternalName().endsWith("_SACK") && stack.cleanName().endsWith(" Sack")
@@ -264,7 +272,7 @@ object ItemUtils {
      */
     var ItemStack.name: String
         get() = this.displayName ?: ErrorManager.skyHanniError(
-            "Could not get name if ItemStack",
+            "Could not get name of ItemStack",
             "itemStack" to this,
             "displayName" to displayName,
             "internal name" to getInternalNameOrNull(),
@@ -360,7 +368,11 @@ object ItemUtils {
         }
 
         val itemStack = getItemStackOrNull()
-        val name = itemStack?.name ?: error("Could not find item name for $this")
+        val name = itemStack?.name ?: run {
+            val name = toString()
+            addMissingRepoItem(name, "Could not find item name for $name")
+            return "§c$name"
+        }
 
         // show enchanted book name
         if (itemStack.getItemCategoryOrNull() == ItemCategory.ENCHANTED_BOOK) {
@@ -411,4 +423,39 @@ object ItemUtils {
             it.key.getPrice(pastRecipes = pastRecipes) * it.value
         }.sum()
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Missing Repo Items")
+
+        if (missingRepoItems.isNotEmpty()) {
+            event.addData {
+                add("Detected ${missingRepoItems.size} missing items:")
+                for (itemName in missingRepoItems) {
+                    add(" - $itemName")
+                }
+            }
+        } else {
+            event.addIrrelevant("No Repo Item fails detected.")
+        }
+    }
+
+    fun addMissingRepoItem(name: String, message: String) {
+        if (!missingRepoItems.add(name)) return
+        ChatUtils.debug(message)
+//         showRepoWarning()
+    }
+
+    // Running NEU's function `Utils.showOutdatedRepoNotification()` caused a NoSuchMethodError in dev env.
+    // Therefore we run NotificationHandler.displayNotification directly
+    private fun showRepoWarning() {
+        NotificationHandler.displayNotification(
+            Lists.newArrayList(
+                "§c§lMissing repo data",
+                "§cData used for some SkyHanni features is not up to date, this should normally not be the case.",
+                "§cYou can try §l/neuresetrepo§r§c and restart your game to see if that fixes the issue.",
+                "§cIf the problem persists please join the SkyHanni Discord and message in §l#support§r§c to get support.",
+            ),
+            true, true,
+        )
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index 98f903468bb6..18568869ade9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -1,7 +1,5 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.test.command.ErrorManager
-
 class NEUInternalName private constructor(private val internalName: String) {
 
     companion object {
@@ -24,11 +22,11 @@ class NEUInternalName private constructor(private val internalName: String) {
         fun fromItemNameOrNull(itemName: String): NEUInternalName? =
             ItemNameResolver.getInternalNameOrNull(itemName.removeSuffix(" Pet"))
 
-        fun fromItemName(itemName: String): NEUInternalName =
-            fromItemNameOrNull(itemName) ?: ErrorManager.skyHanniError(
-                "NEUInternalName is null for item name: '$itemName'",
-                "inventoryName" to InventoryUtils.openInventoryName()
-            )
+        fun fromItemName(itemName: String): NEUInternalName = fromItemNameOrNull(itemName) ?: run {
+            val name = "itemName:$itemName"
+            ItemUtils.addMissingRepoItem(name, "Could not find internal name for $name")
+            return NEUInternalName.MISSING_ITEM
+        }
     }
 
     fun asString() = internalName
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index ae3863410648..b7cf23eeb795 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -197,14 +197,9 @@ object NEUItems {
         getItemStackOrNull() ?: run {
             getPriceOrNullNew() ?: return@run fallbackItem
             if (ignoreItemsFilter.match(this.asString())) return@run fallbackItem
-            ErrorManager.logErrorWithData(
-                IllegalStateException("Something went wrong!"),
-                "Encountered an error getting the item for §7$this§c. " +
-                    "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
-                    "Discord if this is the case.",
-                "Item name" to this.asString(),
-                "repo commit" to manager.latestRepoCommit,
-            )
+
+            val name = this.toString()
+            ItemUtils.addMissingRepoItem(name, "Could not create item stack for $name")
             fallbackItem
         }
 

From a1cf60ae2003cb62729089184f6d79072ca902ca Mon Sep 17 00:00:00 2001
From: notafrogo <110315743+notafrogo@users.noreply.github.com>
Date: Wed, 14 Aug 2024 03:44:44 -0700
Subject: [PATCH 236/721] Backend: Deleted duplicate function in Crop Milestone
 Display (#2339)

---
 .../garden/farming/GardenCropMilestoneDisplay.kt         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index 69e12796e75b..b52b9f62b9dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -245,15 +245,6 @@ object GardenCropMilestoneDisplay {
             }
         }
 
-        if (overflowConfig.chat) {
-            if (currentTier > 46 && currentTier == previousNext &&
-                nextRealTier == currentTier + 1 && lastWarnedLevel != currentTier
-            ) {
-                GardenCropMilestones.onOverflowLevelUp(crop, currentTier - 1, nextRealTier - 1)
-                lastWarnedLevel = currentTier
-            }
-        }
-
         if (GardenAPI.mushroomCowPet && crop != CropType.MUSHROOM) {
             addMushroomCowData()
         }

From e24a57aa63d6a0d8a108b41216eef474d5dd6cb0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:36:22 +0200
Subject: [PATCH 237/721] fix tab list not found error message getting sent too
 often

---
 src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index bc43a807e02e..14aa579cae1a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -290,10 +290,10 @@ object HypixelData {
         }
         if (message.startsWith("you are playing on profile:")) {
             val newProfile = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim()
+            ProfileStorageData.profileJoinMessage()
             if (profileName == newProfile) return
             profileName = newProfile
             ProfileJoinEvent(newProfile).postAndCatch()
-            ProfileStorageData.profileJoinMessage()
         }
     }
 

From 482b4fffd2316c1e0c7eb576a34d52ca367d76d1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:14:07 +0200
Subject: [PATCH 238/721] Version 0.26 Beta 23

---
 docs/CHANGELOG.md                                  | 14 ++++++++++++++
 docs/FEATURES.md                                   |  2 ++
 root.gradle.kts                                    |  2 +-
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index ee00783a5c13..168a72e586d1 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -27,6 +27,8 @@
   Paloys (https://github.com/hannibal002/SkyHanni/pull/1891)
 + Added crop last farmed waypoint. - appable (https://github.com/hannibal002/SkyHanni/pull/1335)
     + Accessible in the Crop Start Locations section.
++ Added Farming Personal Best FF Gain. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2332)
+    + Displays in chat how much additional FF you earn from the farming contest personal best bonus after beating your previous record.
 
 #### Dungeon Features
 
@@ -263,6 +265,9 @@
 + Added an option for the Estimated Chest Value display to also work in your own inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2218)
 + Added SkyBlock Level number in SB Menu to Item Number config. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2172)
 + Added Divan's Powder Coating to the Estimated Item Value feature. - jani (https://github.com/hannibal002/SkyHanni/pull/2317)
++ Added support for Chocolate Milestones in Custom Reminder. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2334)
++ Clicking on the chat message when you try to open /cf without a rabbit pet will now open /pets. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2333)
++ Improved Wardrobe Keybinds when using favorite mode. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2331)
 
 #### Fishing Improvements
 
@@ -314,6 +319,8 @@
 + Reduced the frequency of "tab list not found" error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2266)
 + Hide Beacon Power display while on a Bingo profile. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2286)
 + Added the current Minister's name and perks to the Mayor Display on the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2313)
++ Hide repo errors in chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2338)
+    + Errors will be displayed directly in the GUI when necessary, making them less intrusive.
 
 ### Fixes
 
@@ -417,6 +424,7 @@
 + Fixed Hoppity Chat Compact not working outside of Hoppity's event for Abiphone users who have Hoppity as a contact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2250)
 + Fixed stray rabbit production time tooltip display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2239)
 + Fixed Hoppity custom goals being off by one level. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2280)
++ Fixed Custom Reminder not working in the Chocolate Shop. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2334)
 
 #### Custom Scoreboard Fixes
 
@@ -683,6 +691,12 @@
 + Added ItemPriceUtils and moved all item price functions into it. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2290)
 + Added a preprocessor to prepare for 1.21. - !nea (https://github.com/hannibal002/SkyHanni/pull/2283)
     + This will require a minor adjustment in how the Minecraft client is launched.
++ Deleted an unnecessary function in Garden Crop Milestone. - notafrogo (https://github.com/hannibal002/SkyHanni/pull/2339)
++ Removed repository item errors. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2338)
+    + Instead of stack traces for "no item name for internal name", "no item stack for internal name", and "no internal name for item stack", we now return the internal name in red, the internal name `MISSING_ITEM`, or a barrier item instead.
+    + Command /shdebug lists all failed item names.
+    + Debug chat still logs the errors.
+    + Shows a popup (currently disabled).
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 84d16657df76..dd4e6ea41bc0 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -733,6 +733,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Overflow Garden crop milestones. - Luna & HiZe (https://github.com/hannibal002/SkyHanni/pull/997)
 + New "Craftable!" message when Visitor Items Needed are craftable. - Paloys (https://github.com/hannibal002/SkyHanni/pull/1891)
 + Added toggle for compacting Garden visitor summary messages. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2026)
++ Added Farming Personal Best FF Gain. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2332)
+    + Displays in chat how much additional FF you earn from the farming contest personal best bonus after beating your previous record.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index fcdc8b5165cf..b74af223fd85 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26.Beta.22"
+    version = "0.26.Beta.23"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 835a12ab8e0d..eb87426d4d2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.22",
+    version = "0.26.Beta.23",
 )
 class SkyHanniMod {
 

From ecd6218394475a81a2a84cb08a96fb92ffda63c7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:32:41 +0200
Subject: [PATCH 239/721] fix nea

---
 docs/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 168a72e586d1..e1ba72ca2711 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -587,7 +587,7 @@
     + Just add the @SkyHanniModule annotation to an object to auto load it.
 + Modified removeColor for visual formatting consistency. - appable (https://github.com/hannibal002/SkyHanni/pull/1824)
     + Keeps formatting consistency in the presence of color codes acting as implicit reset codes.
-+ Added RepoPattern.list. - !nea (https://github.com/hannibal002/SkyHanni/pull/1733)
++ Added RepoPattern.list. - nea (https://github.com/hannibal002/SkyHanni/pull/1733)
     + A way to store x amount of patterns.
 + Added unit test for repo pattern lists. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1733)
 + Added RepoPattern.exclusiveGroup. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1733)
@@ -689,7 +689,7 @@
 + Cache rewardPatterns in the powder chat filter. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2276)
 + Added Minister data to the MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2313)
 + Added ItemPriceUtils and moved all item price functions into it. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2290)
-+ Added a preprocessor to prepare for 1.21. - !nea (https://github.com/hannibal002/SkyHanni/pull/2283)
++ Added a preprocessor to prepare for 1.21. - nea (https://github.com/hannibal002/SkyHanni/pull/2283)
     + This will require a minor adjustment in how the Minecraft client is launched.
 + Deleted an unnecessary function in Garden Crop Milestone. - notafrogo (https://github.com/hannibal002/SkyHanni/pull/2339)
 + Removed repository item errors. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2338)

From 270359e82f9e4f94d51b0ab48b813239d03529b9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:35:04 +0200
Subject: [PATCH 240/721] fix j10a1n15

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e1ba72ca2711..b287d2b74708 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -146,7 +146,7 @@
 + Added Beacon Power Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1901)
 + Added Hide Useless Armor Stands. - Empa (https://github.com/hannibal002/SkyHanni/pull/1962)
     + Hides armor stands that briefly appear on Hypixel.
-+ Added Custom Wardrobe, a new look for the wardrobe. - j10an15, Empa (https://github.com/hannibal002/SkyHanni/pull/2039)
++ Added Custom Wardrobe, a new look for the wardrobe. - j10a1n15, Empa (https://github.com/hannibal002/SkyHanni/pull/2039)
     + Highly customizable: Colors, display sizes.
     + Estimated Price Integration.
     + Favorite slots; option to only display favorite slots.

From 8edaca534b068b3ada4b81a6d0eda13b62d226c0 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:00:09 +1000
Subject: [PATCH 241/721] Fix: Akin being "Not" again (#2347)

---
 src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
index 9d922f93d60a..cd72264f31b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
@@ -55,7 +55,7 @@ enum class TabWidget(
     ),
     PROFILE(
         // language=RegExp
-        "(?:§.)*Profile: (?:§.)*(?<profile>\\S+).*",
+        "(?:§.)+Profile: §r§a(?<profile>[\\w\\s]+[^ §]).*",
     ),
     SB_LEVEL(
         // language=RegExp

From 0077255f5b8a3c4cfd7731cb759430ae01b146c0 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Thu, 15 Aug 2024 23:12:08 +0200
Subject: [PATCH 242/721] Fix: Minister Perk (#2343)

---
 src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt            | 2 +-
 .../at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index 53539adb4a07..555fdb7f8ff0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -218,7 +218,7 @@ object MayorAPI {
             val currentMayorName = data.mayor.name
             if (lastMayor?.name != currentMayorName) {
                 currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks)
-                currentMinister = setAssumeMayorJson(data.mayor.minister.name, data.mayor.minister.perk)
+                currentMinister = setAssumeMayorJson(data.mayor.minister.name, listOf(data.mayor.minister.perk))
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
index f54c7daf4b73..912a6f8c6476 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
@@ -30,7 +30,7 @@ data class MayorCandidate(
 data class Minister(
     @Expose val key: String,
     @Expose val name: String,
-    @Expose val perk: List<MayorPerk>,
+    @Expose val perk: MayorPerk,
 )
 
 data class MayorPerk(

From 457fa4fe5264c74ab17a94cd7359c680c357a1b7 Mon Sep 17 00:00:00 2001
From: NetheriteMiner <88792142+NetheriteMiner@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:14:04 -0400
Subject: [PATCH 243/721] Fix: Visible color codes in Discord RPC (#2344)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/misc/discordrpc/DiscordStatus.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 6eff315d387a..53121e39aa74 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -56,7 +56,7 @@ var beenAfkFor = SimpleTimeMark.now()
 
 fun getPetDisplay(): String = PetAPI.currentPet?.let {
     val colorCode = it.substring(1..2).first()
-    val petName = it.substring(2)
+    val petName = it.substring(2).removeColor()
     val petLevel = getCurrentPet()?.petLevel?.currentLevel ?: "?"
 
     "[Lvl $petLevel] ${colorCodeToRarity(colorCode)} $petName"

From 6716d23a43603ddd1bb92ccc71f80e37436828ce Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:17:33 +0200
Subject: [PATCH 244/721] Improvement: copper dye drop statistics (#2346)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/visitor/DropsStatisticsConfig.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java
index 078f82c5d99d..aecedf0b07d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java
@@ -16,6 +16,7 @@
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.ACCEPTED;
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.COINS_SPENT;
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.COPPER;
+import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.COPPER_DYE;
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.DEDICATION_IV;
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.DENIED;
 import static at.hannibal2.skyhanni.config.features.garden.visitor.DropsStatisticsConfig.DropsStatisticsTextEntry.FARMING_EXP;
@@ -55,7 +56,8 @@ public class DropsStatisticsConfig {
         COINS_SPENT,
         OVERGROWN_GRASS,
         GREEN_BANDANA,
-        DEDICATION_IV
+        DEDICATION_IV,
+        COPPER_DYE
     ));
 
     /**
@@ -89,6 +91,7 @@ public enum DropsStatisticsTextEntry implements HasLegacyId {
         CULTIVATING_I("§b1 §9Cultivating I", 15),
         REPLENISH_I("§b1 §9Replenish I", 16),
         DELICATE("§b1 §9Delicate V"),
+        COPPER_DYE("§b1 §8Copper Dye"),
         ;
 
         private final String str;

From b0a8f0a0c712b606e20f0c9b36d65b4c8ce70c35 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:19:53 +0200
Subject: [PATCH 245/721] Fix: ScoreboardData and splitting (#2345)

---
 .../java/at/hannibal2/skyhanni/data/ScoreboardData.kt  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 0ade6a946036..a403db112b84 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -35,8 +35,14 @@ object ScoreboardData {
 
             val lastColor = start.lastColorCode() ?: ""
 
-            if (end.startsWith(lastColor)) {
-                end = end.removePrefix(lastColor)
+            // Determine the longest prefix of "end" that matches any suffix of "lastColor"
+            val colorSuffixes = generateSequence(lastColor) { it.dropLast(2) }
+                .takeWhile { it.isNotEmpty() }
+                .toList()
+
+            val matchingPrefix = colorSuffixes.find { end.startsWith(it) } ?: ""
+            if (matchingPrefix.isNotEmpty()) {
+                end = end.removePrefix(matchingPrefix)
             }
 
             add(start + end)

From 7dee7d8a3a5e0ae28317aea50adb6c5d27109e82 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 04:44:17 +0200
Subject: [PATCH 246/721] Fix: Tab List Friends (#2353)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
index 518ebbaf929f..6bd731cb01eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
@@ -220,7 +220,7 @@ object AdvancedPlayerList {
         LorenzUtils.getPlayerName() == name -> SocialIcon.ME
         MarkedPlayerManager.isMarkedPlayer(name) -> SocialIcon.MARKED
         PartyAPI.partyMembers.contains(name) -> SocialIcon.PARTY
-        FriendAPI.getAllFriends().any { it.name.contains(name) } -> SocialIcon.FRIEND
+        FriendAPI.getAllFriends().any { it.name.equals(name, ignoreCase = true) } -> SocialIcon.FRIEND
         GuildAPI.isInGuild(name) -> SocialIcon.GUILD
         else -> SocialIcon.OTHER
     }

From 9a886b7a771fa3356b92a9c1a5af315882dc9730 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:16:42 +0200
Subject: [PATCH 247/721] Fix: SplatterHearts ConcurrentModificationException
 (#2349)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/rift/area/stillgorechateau/SplatterHearts.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt
index cd4059437888..940fa4f9db54 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/SplatterHearts.kt
@@ -27,7 +27,7 @@ object SplatterHearts {
         if (event.count != 3 || event.speed != 0f) return
 
         if (lastHearts.passedSince() > 50.milliseconds) {
-            shownHearts = currentHearts
+            shownHearts = currentHearts.toSet()
             currentHearts.clear()
         }
         lastHearts = SimpleTimeMark.now()

From 050e3325c7ebe7b6218618262e6ed955232c870d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:16:47 +0200
Subject: [PATCH 248/721] Fix: ConcurrentModificationException in
 SeaCreatureManager (#2350)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
index 74cf9294da64..012d47f49cb9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@@ -125,7 +125,7 @@ object FishingTimer {
     private fun handle() {
         if (lastSeaCreatureFished.passedSince() > 2.seconds) return
         val name = lastNameFished ?: return
-        val mobs = recentMobs.filter { it.name == name && it !in mobDespawnTime }
+        val mobs = recentMobs.toSet().filter { it.name == name && it !in mobDespawnTime }
             .sortedBy { it.baseEntity.distanceToPlayer() }
             .take(mobsToFind).ifEmpty { return }
         mobsToFind -= mobs.size

From 571d0ed6eca959a18032509844d5237df6a9e601 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:16:54 +0200
Subject: [PATCH 249/721] Fix: Item Pickup Log null items (#2351)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/inventory/ItemPickupLog.kt       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 6b45d5d9ef02..55473a2c601a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -229,13 +229,9 @@ object ItemPickupLog {
     }
 
     private fun isBannedItem(item: ItemStack): Boolean {
-        if (item.getInternalNameOrNull()?.startsWith("MAP") == true) {
-            return true
-        }
-
-        if (bannedItemsConverted.contains(item.getInternalNameOrNull())) {
-            return true
-        }
+        val internalName = item.getInternalNameOrNull() ?: return true
+        if (internalName.startsWith("MAP") == true) return true
+        if (internalName in bannedItemsConverted) return true
 
         if (item.getExtraAttributes()?.hasKey("quiver_arrow") == true) {
             return true

From 24cbfa2faaa6cef709d42f75c3d1d51f3368e8b2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:17:02 +0200
Subject: [PATCH 250/721] Fix: Item Trackers NPC Price (#2352)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/utils/ItemPriceUtils.kt          | 20 ++++++++++---------
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 12 ++++++-----
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |  3 ++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
index b03b47168ac6..57ff972e855b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarDataHolder
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getRecipePrice
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
@@ -46,7 +47,7 @@ object ItemPriceUtils {
             return 7.0 // NPC price
         }
 
-        return getNpcPriceOrNull() ?: getRawCraftCostOrNull(pastRecipes)
+        return getNpcPriceOrNull() ?: getRawCraftCostOrNull(priceSource, pastRecipes)
     }
 
     private fun NEUInternalName.getLowestBinOrNull(): Double? {
@@ -55,14 +56,15 @@ object ItemPriceUtils {
         return result.toDouble()
     }
 
-    // If NEU fails to calculate the craft costs, we calculate it ourself.
-    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
-        NEUItems.manager.auctionManager.getCraftCost(asString())?.craftCost ?: run {
-            getRecipes(this).filter { it !in pastRecipes }
-                .map { ItemUtils.getRecipePrice(it, pastRecipes + it) }
-                .filter { it >= 0 }
-                .minOrNull()
-        }
+    // We can not use NEU craft cost, since we want to respect the price source choice
+    // NEUItems.manager.auctionManager.getCraftCost(asString())?.craftCost
+    fun NEUInternalName.getRawCraftCostOrNull(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ): Double? = getRecipes(this).filter { it !in pastRecipes }
+        .map { it.getRecipePrice(priceSource, pastRecipes + it) }
+        .filter { it >= 0 }
+        .minOrNull()
 
     fun NEUInternalName.getNpcPrice(): Double = getNpcPriceOrNull() ?: -1.0
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index cd55107db4d3..59a718d6cc12 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -5,9 +5,9 @@ import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
-import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -418,10 +418,12 @@ object ItemUtils {
         return neededItems
     }
 
-    fun getRecipePrice(recipe: NeuRecipe, pastRecipes: List<NeuRecipe> = emptyList()): Double =
-        neededItems(recipe).map {
-            it.key.getPrice(pastRecipes = pastRecipes) * it.value
-        }.sum()
+    fun NeuRecipe.getRecipePrice(
+        priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
+        pastRecipes: List<NeuRecipe> = emptyList(),
+    ): Double = neededItems(this).map {
+        it.key.getPrice(priceSource, pastRecipes) * it.value
+    }.sum()
 
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index b7cf23eeb795..296439939d50 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -185,7 +185,8 @@ object NEUItems {
     ): Double? = this.getPriceOrNullNew(priceSource, pastRecipes)
 
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
-    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? = getRawCraftCostOrNullNew(pastRecipes)
+    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
+        getRawCraftCostOrNullNew(ItemPriceSource.BAZAAR_INSTANT_BUY, pastRecipes)
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
         .withKnownInternalName(asString())

From d524fe113d707dd4c190215853bfba3a8569f18c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:17:13 +0200
Subject: [PATCH 251/721] Fix: Mining Crash workaround (#2354)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mixins/hooks/BlockRendererDispatcherHook.kt   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
index 2d15d3cb7f74..f72d56739d6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor
 import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
 import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.replaceBlocksMapCache
 import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.block.state.IBlockState
 import net.minecraft.client.renderer.BlockRendererDispatcher
@@ -25,12 +26,16 @@ fun modifyGetModelFromBlockState(
 
     if (!LorenzUtils.inSkyBlock) return
 
-    if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
-        returnState = replaceBlocksMapCache.getOrPut(state) {
-            MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
-                state.isOreType(it.oreType)
-            }?.onColor(state) ?: state
+    try {
+        if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
+            returnState = replaceBlocksMapCache.getOrPut(state) {
+                MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
+                    state.isOreType(it.oreType)
+                }?.onColor(state) ?: state
+            }
         }
+    } catch (e: Exception) {
+        ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
     }
 
     if (returnState !== state) {

From 27b8ca2f81a6f9b7f99980236209acb5985a23b3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:17:23 +0200
Subject: [PATCH 252/721] Fix: Garden Guesting (#2355)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/data/ScoreboardData.kt    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index a403db112b84..26915faf357b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -22,7 +22,13 @@ object ScoreboardData {
 
     private var sidebarLines: List<String> = emptyList() // TODO rename to raw
     var sidebarLinesRaw: List<String> = emptyList() // TODO delete
-    var objectiveTitle = ""
+    val objectiveTitle: String get() = grabObjectiveTitle()
+
+    fun grabObjectiveTitle(): String {
+        val scoreboard = Minecraft.getMinecraft().theWorld?.scoreboard ?: return ""
+        val objective = scoreboard.getObjectiveInDisplaySlot(1) ?: return ""
+        return objective.displayName
+    }
 
     private var dirty = false
 
@@ -90,7 +96,6 @@ object ScoreboardData {
     private fun fetchScoreboardLines(): List<String> {
         val scoreboard = Minecraft.getMinecraft().theWorld?.scoreboard ?: return emptyList()
         val objective = scoreboard.getObjectiveInDisplaySlot(1) ?: return emptyList()
-        objectiveTitle = objective.displayName
         var scores = scoreboard.getSortedScores(objective)
         val list = scores.filter { input: Score? ->
             input != null && input.playerName != null && !input.playerName.startsWith("#")

From a40a0f52410d2caf5901c666431851640e0ba542 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:17:31 +0200
Subject: [PATCH 253/721] Fix max barn space error (#2356)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../chocolatefactory/ChocolateFactoryBarnManager.kt        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 31762ab2eb91..20d752e35eb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionData
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsCompactChat
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -77,10 +78,14 @@ object ChocolateFactoryBarnManager {
 
         val profileStorage = profileStorage ?: return
 
+        // TODO rename maxRabbits to maxUnlockedBarnSpace
         if (profileStorage.maxRabbits >= ChocolateFactoryAPI.maxRabbits) return
 
+        // when the unlocked barn space has already surpassed the total amount of rabbits
+        val alreadyBigEnough = profileStorage.maxRabbits >= HoppityCollectionData.knownRabbitCount
+
         val remainingSpace = profileStorage.maxRabbits - profileStorage.currentRabbits
-        barnFull = remainingSpace <= config.barnCapacityThreshold
+        barnFull = remainingSpace <= config.barnCapacityThreshold && !alreadyBigEnough
         if (!barnFull) return
 
         if (inventory && sentBarnFullWarning) return

From bdbac36d82003c8789a57b8d45ea818e5a2e8079 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:17:59 +0200
Subject: [PATCH 254/721] Fix: Pet detection (#2358)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/garden/pests/PestProfitTracker.kt        | 1 +
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 5f630335b5c4..8af24175f7e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -89,6 +89,7 @@ object PestProfitTracker {
             val internalName = NEUInternalName.fromItemNameOrNull(group("item")) ?: return
 
             tracker.addItem(internalName, 1)
+            addKill()
             // pests always have guaranteed loot, therefore there's no need to add kill here
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 296439939d50..5d63993d17cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -139,8 +139,9 @@ object NEUItems {
             var name = manager.createItem(rawInternalName).displayName.lowercase()
             val internalName = rawInternalName.asInternalName()
 
-            // TODO remove one of them once neu is consistent
+            // TODO remove all except one of them once neu is consistent
             name = name.removePrefix("§f§f§7[lvl 1➡100] ")
+            name = name.removePrefix("§f§f§7[lvl {lvl}] ")
             name = name.removePrefix("§7[lvl 1➡100] ")
 
             if (name.contains("[lvl 1➡100]")) {

From 8332f313140d3e0698f690611b665f51a853caf4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:33:10 +0200
Subject: [PATCH 255/721] fixed duplicate pest count

---
 .../skyhanni/features/garden/pests/PestProfitTracker.kt          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 8af24175f7e5..5f630335b5c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -89,7 +89,6 @@ object PestProfitTracker {
             val internalName = NEUInternalName.fromItemNameOrNull(group("item")) ?: return
 
             tracker.addItem(internalName, 1)
-            addKill()
             // pests always have guaranteed loot, therefore there's no need to add kill here
         }
     }

From c0da35d356b721b90cbdceed7babda309ea0ab7f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 16 Aug 2024 12:42:13 +0200
Subject: [PATCH 256/721] Version 0.26 Beta 24

---
 docs/CHANGELOG.md                                  | 13 +++++++++++++
 root.gradle.kts                                    |  2 +-
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b287d2b74708..bc1311f37b70 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -187,6 +187,7 @@
 + The Rancher Boots Optimal Speed GUI now highlights the crop corresponding to the last held tool. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
 + Added Slug pet to the FF Guide. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/2249)
 + Added Copper dye to the list of blocked visitor rewards. - not-a-cow (https://github.com/hannibal002/SkyHanni/pull/2329)
++ Added Copper Dye to Visitor Drop Statistics. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2346)
 
 #### Hoppity Event Improvements
 
@@ -361,6 +362,7 @@
 + Fixed an issue where TunnelMaps could stop functioning. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2277)
 + Fixed blocks mined by Efficient Miner not being detected in the Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2307)
 + Fixed empty lines not being blocked by the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2309)
++ Fixed a rare crash occurring on a mining island. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2354)
 
 #### Garden Fixes
 
@@ -393,6 +395,7 @@
 + Fixed visitor shopping list with AH items. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2297)
 + Fixed Zorro's Cape not working with Green Thumb in the FF stats breakdown in item lore. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2299)
 + Fixed Composter Overlay calculating incorrectly while Composter Display is disabled. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2294)
++ Fixed own garden not being detected when swapping islands from a guesting server. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2355)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -425,6 +428,7 @@
 + Fixed stray rabbit production time tooltip display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2239)
 + Fixed Hoppity custom goals being off by one level. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2280)
 + Fixed Custom Reminder not working in the Chocolate Shop. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2334)
++ Fixed a warning about space in the Chocolate Factory appearing even when the barn was already large enough to store all rabbits. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2356)
 
 #### Custom Scoreboard Fixes
 
@@ -446,6 +450,8 @@
 + Fixed Scoreboard Reset not updating the draggable list. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2252)
 + Fixed a scoreboard error message when a Hypixel bug shows a negative number of magma cubes remaining in the scoreboard. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2267)
 + Fixed Custom Scoreboard Error when having more than 1000 medals. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2319)
++ Fixed a Custom Scoreboard error during the Winter Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2345)
++ Fixed getting mayor/minister information for Custom Scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2343)
 
 #### Dungeon Fixes
 
@@ -474,6 +480,7 @@
 + Fixed a rare double hook detection issue. - appable (https://github.com/hannibal002/SkyHanni/pull/2125)
 + Fixed Commission Mob Highlighter incorrectly highlighting Deep Sea Protectors as Automatons. - Luna (https://github.com/hannibal002/SkyHanni/pull/2130)
 + Fixed Squid Pet counting towards the Fishing Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1960)
++ Fixed an error during fishing. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2350)
 
 #### Performance Fixes
 
@@ -490,6 +497,7 @@
 
 + Fixed rift slayer warning showing while hitting Oubliette Guard. -
   hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1950)
++ Fixed an error when killing Splatter Cruxes in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2349)
 
 #### Inventory Fixes
 
@@ -518,6 +526,7 @@
 + Fixed the incorrect "This item has no attributes" message appearing in the Attribute Fusion menu for some items. - Luna (https://github.com/hannibal002/SkyHanni/pull/2304)
 + Fixed shift-clicking items in GUIs triggering the Item Pickup Log. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2305)
 + Fixed the Master Mode Dungeon stack size display in the party finder menu. - fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2316)
++ Fixed the Item Pickup Log detecting "Magical Map" in dungeons when using Skytils. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2351)
 
 #### Combat Fixes
 
@@ -570,6 +579,10 @@
 + Fixed Contributor name tag flickering when using Patcher. - nea (https://github.com/hannibal002/SkyHanni/pull/2296)
 + Fixed Discord Rich Presence dynamic fallback. - NetheriteMiner (https://github.com/hannibal002/SkyHanni/pull/2279)
     + Placeholder messages that should not be visible will no longer appear.
++ Fixed pet detection with newer NEU versions. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2358)
++ Fixed Item Trackers displaying the incorrect NPC price. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2352)
++ Fixed players with similar names to friends being incorrectly marked as friends in the tab list. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2353)
++ Fixed color codes in Discord RPC pet status. - NetheriteMiner (https://github.com/hannibal002/SkyHanni/pull/2344)
 
 ### Technical Details
 
diff --git a/root.gradle.kts b/root.gradle.kts
index b74af223fd85..9a15c2d0b555 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26.Beta.23"
+    version = "0.26.Beta.24"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index eb87426d4d2d..1e19bfcbabd4 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.23",
+    version = "0.26.Beta.24",
 )
 class SkyHanniMod {
 

From a3e49e7771a4634a3b1a1ac605c5a6339b3c96f4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:14:19 +0200
Subject: [PATCH 257/721] code cleanup

---
 .../skyhanni/features/fishing/trophy/TrophyFishManager.kt    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
index 9f3e83f4ed3c..4b91b6240243 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson
 import at.hannibal2.skyhanni.events.NeuProfileDataLoadedEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import net.minecraft.event.HoverEvent
 import net.minecraft.util.ChatComponentText
@@ -65,8 +64,8 @@ object TrophyFishManager {
     }
 
     private fun updateFromNeuPv(
-        savedFishes: MutableMap<String, MutableMap<TrophyRarity, Int>>,
-        neuData: MutableList<Triple<String, TrophyRarity, Int>>,
+        savedFishes: Map<String, MutableMap<TrophyRarity, Int>>,
+        neuData: List<Triple<String, TrophyRarity, Int>>,
     ) {
         for ((name, rarity, newValue) in neuData) {
             val saved = savedFishes[name] ?: continue

From e77eb1faf0fe6d0a80137ddd5f8282a59cc45726 Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:28:45 +0100
Subject: [PATCH 258/721] Improvement: Adds "Open Mods Folder" button to NEU
 error on startup (#2362)

---
 src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
index 0a182d53106a..ef2bf5591fbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
@@ -1,9 +1,11 @@
 package at.hannibal2.skyhanni.utils
 
+import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.FMLCommonHandler
 import java.awt.Desktop
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
+import java.io.File
 import java.net.URI
 import javax.swing.JButton
 import javax.swing.JFrame
@@ -42,6 +44,7 @@ object NEUVersionCheck {
             Pair("Join NEU Discord", "https://discord.gg/moulberry"),
             Pair("Download NEU from GitHub", "https://github.com/NotEnoughUpdates/NotEnoughUpdates/releases/latest"),
             Pair("Download NEU from Modrinth", "https://modrinth.com/mod/notenoughupdates/version/latest"),
+            Pair("Open Mods Folder", File(Minecraft.getMinecraft().mcDataDir, "mods").toURI().toString()),
         )
         closeMinecraft()
     }

From b09e62642fdc470e0ab23e870a9c5a3ce6e0c4fe Mon Sep 17 00:00:00 2001
From: ev chang <wyvestbusiness@gmail.com>
Date: Sat, 17 Aug 2024 16:29:17 +0900
Subject: [PATCH 259/721] Tell user to update to VanillaHUD 2.2.9 or higher in
 Discord FAQ (#2361)

---
 docs/DISCORD_FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 010894e8295f..75e520692b39 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -57,7 +57,7 @@ _Frequently Asked Questions_
 > **12: Why can I still see the normal Scoreboard when using Custom Scoreboard?**
 > Most of the time, this is a mod conflict.
 > If you are using [Sidebar Mod](https://github.com/Alexdoru/SidebarMod), please remove this mod.
-> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.8 or newer to resolve this issue.
+> If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.9 or newer to resolve this issue.
 > If you are using [Apec](https://github.com/BananaFructa/Apec/) and want to remove their Scoreboard, you need to remove Apec since they don't have an option to disable their Scoreboard.
 > If you are using [Patcher](https://sk1er.club/mods/patcher) or [PolyPatcher](https://modrinth.com/mod/patcher) and the vanilla scoreboard is flickering, disable the "HUD Caching" option.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.

From 46dcf1a9050deb7bab8e834e91ae39e818ac507d Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sat, 17 Aug 2024 09:29:31 +0200
Subject: [PATCH 260/721] Fix: Negative price for items with no NPC sell price
 (#2360)

---
 src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
index 57ff972e855b..b12f3640e07f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
@@ -16,7 +16,7 @@ object ItemPriceUtils {
     fun NEUInternalName.getPrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
         pastRecipes: List<NeuRecipe> = emptyList(),
-    ) = getPriceOrNull(priceSource, pastRecipes) ?: -1.0
+    ) = getPriceOrNull(priceSource, pastRecipes) ?: 0.0
 
     fun NEUInternalName.getPriceOrNull(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
@@ -66,7 +66,7 @@ object ItemPriceUtils {
         .filter { it >= 0 }
         .minOrNull()
 
-    fun NEUInternalName.getNpcPrice(): Double = getNpcPriceOrNull() ?: -1.0
+    fun NEUInternalName.getNpcPrice(): Double = getNpcPriceOrNull() ?: 0.0
 
     fun NEUInternalName.getNpcPriceOrNull(): Double? {
         if (this == NEUInternalName.WISP_POTION) {

From a4a6c98a60e9b994d953afa2c7481c2dd67d8de6 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Sat, 17 Aug 2024 09:30:23 +0200
Subject: [PATCH 261/721] Fix: Finnegan Perks (#2359)

---
 src/main/java/at/hannibal2/skyhanni/data/Mayors.kt        | 8 +++-----
 .../features/garden/farming/GardenCropMilestoneDisplay.kt | 8 +-------
 .../skyhanni/features/garden/farming/GardenCropSpeed.kt   | 2 --
 .../skyhanni/features/misc/trevor/TrevorFeatures.kt       | 4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 975282a3abc0..53ebae1dd534 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -45,10 +45,10 @@ enum class Mayor(
     FINNEGAN(
         "Finnegan",
         "§c",
-        Perk.FARMING_SIMULATOR,
         Perk.PELT_POCALYPSE,
         Perk.GOATED,
         Perk.BLOOMING_BUSINESS,
+        Perk.PEST_ERADICATOR,
     ),
     FOXY(
         "Foxy",
@@ -189,10 +189,10 @@ enum class Perk(val perkName: String) {
     LONG_TERM_INVESTMENT("Long Term Investment"),
 
     // Finnegan
-    FARMING_SIMULATOR("Farming Simulator"),
     PELT_POCALYPSE("Pelt-pocalypse"),
     GOATED("GOATed"),
     BLOOMING_BUSINESS("Blooming Business"),
+    PEST_ERADICATOR("Pest Eradicator"),
 
     // Foxy
     SWEET_BENEVOLENCE("Sweet Benevolence"),
@@ -224,9 +224,7 @@ enum class Perk(val perkName: String) {
 
     // Derpy
     TURBO_MINIONS("TURBO MINIONS!!!"),
-    AH_TAX("MOAR TAX!!!"),
-
-    // I don't know what the perk is actually gonna be named
+    AH_TAX("MOAR TAX!!!"), // TODO: Change to actual perk name when known
     DOUBLE_MOBS_HP("DOUBLE MOBS HP!!!"),
     MOAR_SKILLZ("MOAR SKILLZ!!!"),
     ;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index b52b9f62b9dd..c37eb41b7cdf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -120,13 +120,7 @@ object GardenCropMilestoneDisplay {
                 val addedCounter = (counter - old).toInt()
                 FarmingWeightDisplay.addCrop(crop, addedCounter)
                 update()
-                // Farming Simulator: There is a 25% chance for Mathematical Hoes and the Cultivating Enchantment to count twice.
-                // 0.8 = 1 / 1.25
-                crop.setCounter(
-                    crop.getCounter() + if (GardenCropSpeed.finneganPerkActive()) {
-                        (addedCounter.toDouble() * 0.8).toInt()
-                    } else addedCounter
-                )
+                crop.setCounter(crop.getCounter() + addedCounter)
             }
             cultivatingData[crop] = counter
         } catch (e: Throwable) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
index f4d9542293e4..141c93ff102c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
@@ -177,8 +177,6 @@ object GardenCropSpeed {
         secondsStopped = 0
     }
 
-    fun finneganPerkActive() = Perk.FARMING_SIMULATOR.isActive
-
     fun isEnabled() = GardenAPI.inGarden()
 
     fun CropType.getSpeed() = cropsPerSecond?.get(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index 65d4219f27a4..e2dac0f4c454 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.misc.TrevorTheTrapperConfig.TrackerEntry
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.Perk
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
@@ -144,7 +144,7 @@ object TrevorFeatures {
         }
 
         trapperPattern.matchMatcher(formattedMessage) {
-            timeUntilNextReady = if (GardenCropSpeed.finneganPerkActive()) 16 else 21
+            timeUntilNextReady = if (Perk.PELT_POCALYPSE.isActive) 16 else 21
             currentStatus = TrapperStatus.ACTIVE
             currentLabel = "§cActive Quest"
             trapperReady = false

From f34dff04ef8cb0222e06a23bca624fe68f6cb082 Mon Sep 17 00:00:00 2001
From: Not a cow <104355555+Not-a-cowfr@users.noreply.github.com>
Date: Sat, 17 Aug 2024 03:34:40 -0700
Subject: [PATCH 262/721] Improvement: Add rarity to compact hoppity messages
 (#2364)

---
 .../skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index f9a25f3d596b..91316dbfcdab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -75,7 +75,7 @@ object HoppityEggsCompactChat {
             val timeStr = if (config.showDuplicateTime) ", §a+§b$timeFormatted§7" else ""
             "$mealNameFormatted! §7Duplicate $lastName §7(§6+$format Chocolate§7$timeStr)"
         } else if (newRabbit) {
-            "$mealNameFormatted! §d§lNEW $lastName §7(${lastProfit}§7)"
+            "$mealNameFormatted! §d§lNEW $lastRarity $lastName §7(${lastProfit}§7)"
         } else "?"
     }
 

From c5c64718419b933b6c414c4088cf6a2892f36aec Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:02:16 +0200
Subject: [PATCH 263/721] Fix: Fishing Timer (#2365)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Empa <42304516+itsempa@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/fishing/FishingTimer.kt    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
index 012d47f49cb9..5be021fbb8a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@@ -165,9 +165,7 @@ object FishingTimer {
     }
 
     private fun updateInfo() {
-        currentCount = mobDespawnTime.entries.sumOf {
-            1 + it.key.extraEntities.size
-        }
+        currentCount = mobDespawnTime.size
         startTime = mobDespawnTime.maxByOrNull { it.value.passedSince() }?.value ?: SimpleTimeMark.farPast()
         display = createDisplay()
     }

From 0e0af37e523d0ece489d789e20965bab7336903a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:24:01 +0200
Subject: [PATCH 264/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 5d63993d17cf..670e07b7f144 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -351,6 +351,8 @@ object NEUItems {
     fun neuHasFocus(): Boolean {
         if (AuctionSearchOverlay.shouldReplace()) return true
         if (BazaarSearchOverlay.shouldReplace()) return true
+        // TODO add RecipeSearchOverlay via RecalculatingValue and reflection
+        // https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/src/main/java/io/github/moulberry/notenoughupdates/overlays/RecipeSearchOverlay.java
         if (InventoryUtils.inStorage() && InventoryUtils.isNeuStorageEnabled) return true
         if (NEUOverlay.searchBarHasFocus) return true
 

From ab6bb3f26b7c3c36754a3212c954b6b6733591f8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:25:02 +0200
Subject: [PATCH 265/721] Fix: Renderable links in other mods (#2374)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/utils/renderables/Renderable.kt   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 74efcc316f97..7a6fbce4b5f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -252,6 +252,9 @@ interface Renderable {
             val isInNeuPv = openGui == "io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer"
             val neuFocus = NEUItems.neuHasFocus()
             val isInSkytilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui"
+            val isInSkytilsSettings =
+                openGui.let { it.startsWith("gg.skytils.vigilance.gui.") || it.startsWith("gg.skytils.skytilsmod.gui.") }
+            val isInNeuSettings = openGui.startsWith("io.github.moulberry.notenoughupdates.")
 
             val result = isGuiScreen &&
                 isGuiPositionEditor &&
@@ -260,7 +263,9 @@ interface Renderable {
                 isConfigScreen &&
                 !isInNeuPv &&
                 !isInSkytilsPv &&
-                !neuFocus
+                !neuFocus &&
+                !isInSkytilsSettings &&
+                !isInNeuSettings
 
             if (debug) {
                 if (!result) {
@@ -274,6 +279,8 @@ interface Renderable {
                     if (isInNeuPv) logger.log("isInNeuPv")
                     if (neuFocus) logger.log("neuFocus")
                     if (isInSkytilsPv) logger.log("isInSkytilsPv")
+                    if (isInSkytilsSettings) logger.log("isInSkytilsSettings")
+                    if (isInNeuSettings) logger.log("isInNeuSettings")
                     logger.log("")
                 } else {
                     logger.log("allowed click")

From e2bfcb31445aeb706af942a0cd680baeecf66cb7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:25:08 +0200
Subject: [PATCH 266/721] Fix: Item Pickup Log icons (#2373)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 670e07b7f144..82dbb7349795 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -137,6 +137,11 @@ object NEUItems {
         val map = mutableMapOf<String, NEUInternalName>()
         for (rawInternalName in allNeuRepoItems().keys) {
             var name = manager.createItem(rawInternalName).displayName.lowercase()
+
+            // we ignore all builder blocks from the item name -> internal name cache
+            // because builder blocks can have the same display name as normal items.
+            if (rawInternalName.startsWith("BUILDER_")) continue
+
             val internalName = rawInternalName.asInternalName()
 
             // TODO remove all except one of them once neu is consistent

From da576298b3d91066f9ad60319bc7a42c0578750d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:25:20 +0200
Subject: [PATCH 267/721] Fix: Fished Item name display (#2371)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/HypixelData.kt |  2 +-
 .../features/fishing/ShowFishingItemName.kt   | 19 +++++++++++++++++--
 .../features/misc/discordrpc/DiscordStatus.kt |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 14aa579cae1a..0cd806f577c7 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -318,7 +318,7 @@ object HypixelData {
         if (LorenzUtils.onHypixel && LorenzUtils.inSkyBlock) {
             loop@ for (line in ScoreboardData.sidebarLinesFormatted) {
                 skyblockAreaPattern.matchMatcher(line) {
-                    val originalLocation = group("area")
+                    val originalLocation = group("area").removeColor()
                     skyBlockArea = LocationFixData.fixLocation(skyBlockIsland) ?: originalLocation
                     skyBlockAreaWithSymbol = line.trim()
                     break@loop
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
index f50cd9a6bb13..04b4fc7489ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.features.fishing.FishingAPI.isBait
@@ -10,6 +11,7 @@ import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -27,7 +29,7 @@ object ShowFishingItemName {
     // Taken from Skytils
     private val cheapCoins = setOf(
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTM4MDcxNzIxY2M1YjRjZDQwNmNlNDMxYTEzZjg2MDgzYTg5NzNlMTA2NGQyZjg4OTc4Njk5MzBlZTZlNTIzNyJ9fX0=",
-        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGZhMDg3ZWI3NmU3Njg3YTgxZTRlZjgxYTdlNjc3MjY0OTk5MGY2MTY3Y2ViMGY3NTBhNGM1ZGViNmM0ZmJhZCJ9fX0="
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGZhMDg3ZWI3NmU3Njg3YTgxZTRlZjgxYTdlNjc3MjY0OTk5MGY2MTY3Y2ViMGY3NTBhNGM1ZGViNmM0ZmJhZCJ9fX0=",
     )
 
     @SubscribeEvent
@@ -67,5 +69,18 @@ object ShowFishingItemName {
         }
     }
 
-    fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && FishingAPI.holdingRod
+    fun inCorrectArea(): Boolean {
+        if (IslandType.HUB.isInIsland()) {
+            LorenzUtils.skyBlockArea?.let {
+                if (it.endsWith(" Atrium")) return false
+                if (it.endsWith(" Museum")) return false
+                if (it == "Fashion Shop") return false
+                if (it == "Shen's Auction") return false
+            }
+        }
+        if (IslandType.THE_END.isInIsland()) return false
+        return true
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && FishingAPI.holdingRod && inCorrectArea()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 53121e39aa74..47472d2fec20 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -86,7 +86,7 @@ enum class DiscordStatus(private val displayMessageSupplier: (() -> String?)) {
     NONE({ null }),
 
     LOCATION({
-        var location = LorenzUtils.skyBlockArea?.removeColor() ?: "invalid"
+        var location = LorenzUtils.skyBlockArea ?: "invalid"
         val island = LorenzUtils.skyBlockIsland
 
         if (location == "Your Island") location = "Private Island"

From 79be3ba0ae38ee390a9a1c2c4968cbe1c99ff715 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:26:00 +0200
Subject: [PATCH 268/721] Fix: One hoppity page (#2368)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/hoppity/HoppityCollectionStats.kt      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 925eaadd84aa..e9a8bb687ac0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -39,9 +39,15 @@ object HoppityCollectionStats {
     private val config get() = ChocolateFactoryAPI.config
 
     private val patternGroup = ChocolateFactoryAPI.patternGroup.group("collection")
+
+    /**
+     * REGEX-TEST: (1/17) Hoppity's Collection
+     * REGEX-TEST: (12/17) Hoppity's Collection
+     * REGEX-TEST: Hoppity's Collection
+     */
     private val pagePattern by patternGroup.pattern(
         "page.current",
-        "\\((?<page>\\d+)/(?<maxPage>\\d+)\\) Hoppity's Collection",
+        "(?:\\((?<page>\\d+)\\/(?<maxPage>\\d+)\\) )?Hoppity's Collection",
     )
     private val duplicatesFoundPattern by patternGroup.pattern(
         "duplicates.found",

From 962aa7e78aeececb91ef327de5b78d56c5633b62 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:26:14 +0200
Subject: [PATCH 269/721] Fix: Wrong Slayer alert Bladesoul (#2367)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/slayer/SlayerQuestWarning.kt       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index 52afc02562d7..be7e16482765 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -125,6 +125,11 @@ object SlayerQuestWarning {
     private fun isSlayerMob(entity: EntityLivingBase): Boolean {
         val slayerType = SlayerAPI.getSlayerTypeForCurrentArea() ?: return false
 
+        // workaround for rift mob that is unrelated to slayer
+        if (entity.name == "Oubliette Guard") return false
+        // workaround for Bladesoul in  Crimson Isle
+        if (LorenzUtils.skyBlockArea == "Stronghold" && entity.name == "Skeleton") return false
+
         val activeSlayer = SlayerAPI.activeSlayer
 
         if (activeSlayer != null) {
@@ -138,8 +143,8 @@ object SlayerQuestWarning {
                 )
             }
         }
-        // workaround for rift mob that is unrelated to slayer
-        val isSlayer = slayerType.clazz.isInstance(entity) && entity.name != "Oubliette Guard"
+
+        val isSlayer = slayerType.clazz.isInstance(entity)
         return (getSlayerData().lastSlayerType == slayerType) && isSlayer
     }
 

From b2bc0f3c44192af4a20a18917c4d8cef7835723b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:26:30 +0200
Subject: [PATCH 270/721] Fix: Bazaar + Item Trackers (#2366)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/data/OwnInventoryData.kt         |  2 +-
 .../features/inventory/bazaar/BazaarApi.kt    | 32 ++++++++++++++++++-
 .../BazaarCancelledBuyOrderClipboard.kt       | 19 ++++++-----
 .../inventory/bazaar/BazaarOrderHelper.kt     | 14 +++-----
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
index 6a855a06bcf6..947fa3bf1bc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
@@ -127,7 +127,7 @@ object OwnInventoryData {
         }
     }
 
-    private fun ignoreItem(duration: Duration, condition: (NEUInternalName) -> Boolean) {
+    fun ignoreItem(duration: Duration, condition: (NEUInternalName) -> Boolean) {
         ignoredItemsUntil.add(IgnoredItem(condition, SimpleTimeMark.now() + duration))
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
index 99e38fd776fb..afd5900f7c34 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.inventory.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.data.OwnInventoryData
 import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher
 import at.hannibal2.skyhanni.events.BazaarOpenedProductEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
@@ -13,8 +14,10 @@ import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils.getAllItems
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
@@ -32,6 +35,7 @@ import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.inventory.ContainerChest
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object BazaarApi {
@@ -43,13 +47,14 @@ object BazaarApi {
     private var currentSearchedItem = ""
 
     var currentlyOpenedProduct: NEUInternalName? = null
+    var orderOptionProduct: NEUInternalName? = null
 
     fun NEUInternalName.getBazaarData(): BazaarData? = HypixelBazaarFetcher.latestProductInformation[this]
 
     fun NEUInternalName.getBazaarDataOrError(): BazaarData = getBazaarData() ?: run {
         ErrorManager.skyHanniError(
             "Can not find bazaar data for $itemName",
-            "internal name" to this
+            "internal name" to this,
         )
     }
 
@@ -81,6 +86,25 @@ object BazaarApi {
         }
     }
 
+    @SubscribeEvent
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        val item = event.item ?: return
+        val itemName = item.name
+        if (isBazaarOrderInventory(InventoryUtils.openInventoryName())) {
+            val internalName = item.getInternalNameOrNull() ?: return
+            if (itemName.contains("SELL")) {
+                orderOptionProduct = internalName
+            } else if (itemName.contains("BUY")) {
+                // pickup items from bazaar order
+                OwnInventoryData.ignoreItem(1.seconds, { it == internalName })
+            }
+        }
+        if (InventoryUtils.openInventoryName() == "Order options" && itemName == "§cCancel Order") {
+            // pickup items from own bazaar order
+            OwnInventoryData.ignoreItem(1.seconds, { it == orderOptionProduct })
+        }
+    }
+
     private fun getOpenedProduct(inventoryItems: Map<Int, ItemStack>): NEUInternalName? {
         val buyInstantly = inventoryItems[10] ?: return null
 
@@ -161,4 +185,10 @@ object BazaarApi {
         inBazaarInventory = false
         currentlyOpenedProduct = null
     }
+
+    fun isBazaarOrderInventory(inventoryName: String): Boolean = when (inventoryName) {
+        "Your Bazaar Orders" -> true
+        "Co-op Bazaar Orders" -> true
+        else -> false
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
index bd420de23db0..a177d3fe6287 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -34,15 +34,15 @@ object BazaarCancelledBuyOrderClipboard {
      */
     private val lastAmountPattern by patternGroup.pattern(
         "lastamount",
-        "(?:§6coins §7from |§6§7from |§7)§a(?<amount>.*)§7x §7missing items\\."
+        "(?:§6coins §7from |§6§7from |§7)§a(?<amount>.*)§7x §7missing items\\.",
     )
     private val cancelledMessagePattern by patternGroup.pattern(
         "cancelledmessage",
-        "§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(?<coins>.*) coins §r§7from cancelling Buy Order!"
+        "§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(?<coins>.*) coins §r§7from cancelling Buy Order!",
     )
     private val inventoryTitlePattern by patternGroup.pattern(
         "inventorytitle",
-        "Order options"
+        "Order options",
     )
 
     /**
@@ -50,7 +50,7 @@ object BazaarCancelledBuyOrderClipboard {
      */
     private val lastItemClickedPattern by patternGroup.pattern(
         "lastitemclicked",
-        "§a§lBUY (?<name>.*)"
+        "§a§lBUY (?<name>.*)",
     )
 
     private var latestAmount: Int? = null
@@ -83,7 +83,7 @@ object BazaarCancelledBuyOrderClipboard {
 
     @SubscribeEvent
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        if (!BazaarOrderHelper.isBazaarOrderInventory(InventoryUtils.openInventoryName())) return
+        if (!BazaarApi.isBazaarOrderInventory(InventoryUtils.openInventoryName())) return
         val item = event.slot?.stack ?: return
 
         val name = lastItemClickedPattern.matchMatcher(item.name) {
@@ -105,9 +105,12 @@ object BazaarCancelledBuyOrderClipboard {
 
         val message = "Bazaar buy order cancelled. Click to reorder. " +
             "(§8${latestAmount.addSeparators()}x §r${lastClicked.itemName}§e)"
-        ChatUtils.clickableChat(message, onClick = {
-            BazaarApi.searchForBazaarItem(lastClicked, latestAmount)
-        })
+        ChatUtils.clickableChat(
+            message,
+            onClick = {
+                BazaarApi.searchForBazaarItem(lastClicked, latestAmount)
+            },
+        )
         OSUtils.copyToClipboard(latestAmount.toString())
         this.latestAmount = null
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOrderHelper.kt
index 771de0001a31..ba643f7acf4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOrderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOrderHelper.kt
@@ -25,23 +25,17 @@ object BazaarOrderHelper {
     private val patternGroup = RepoPattern.group("bazaar.orderhelper")
     private val bazaarItemNamePattern by patternGroup.pattern(
         "itemname",
-        "§.§l(?<type>BUY|SELL) (?<name>.*)"
+        "§.§l(?<type>BUY|SELL) (?<name>.*)",
     )
     private val filledPattern by patternGroup.pattern(
         "filled",
-        "§7Filled: §[a6].*§7/.* §a§l100%!"
+        "§7Filled: §[a6].*§7/.* §a§l100%!",
     )
     private val pricePattern by patternGroup.pattern(
         "price",
-        "§7Price per unit: §6(?<number>.*) coins"
+        "§7Price per unit: §6(?<number>.*) coins",
     )
 
-    fun isBazaarOrderInventory(inventoryName: String): Boolean = when (inventoryName) {
-        "Your Bazaar Orders" -> true
-        "Co-op Bazaar Orders" -> true
-        else -> false
-    }
-
     @SubscribeEvent
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -51,7 +45,7 @@ object BazaarOrderHelper {
         val guiChest = event.gui
         val chest = guiChest.inventorySlots as ContainerChest
         val inventoryName = chest.getInventoryName()
-        if (!isBazaarOrderInventory(inventoryName)) return
+        if (!BazaarApi.isBazaarOrderInventory(inventoryName)) return
 
         for ((slot, stack) in chest.getUpperItems()) {
             bazaarItemNamePattern.matchMatcher(stack.name) {

From dbc70970b2e5f5a79cc2d18c8c33059e57b9b1eb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:27:08 +0200
Subject: [PATCH 271/721] Fix: Obfuscated and Shard (#2363)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../fishing/trophy/TrophyFishDisplay.kt       |  2 +-
 .../items/EstimatedItemValueCalculator.kt     | 34 +++++++++++++------
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  2 +-
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 22 +++++++++++-
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishDisplay.kt
index d54f7cf48493..ce6352c0ddbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishDisplay.kt
@@ -218,7 +218,7 @@ object TrophyFishDisplay {
 
     private fun getItemName(rawName: String): String {
         val name = getInternalName(rawName).itemName
-        return name.split(" ").dropLast(1).joinToString(" ").replace("§k", "")
+        return name.split(" ").dropLast(1).joinToString(" ")
     }
 
     private fun getInternalName(name: String): NEUInternalName {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 25fa85c03a7f..27a345a9840e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.ReforgeAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.ItemUtils.getAttributeFromShard
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -128,16 +129,8 @@ object EstimatedItemValueCalculator {
         if (isKuudraSet(internalName)) {
             genericName = kuudraSets.fold(internalName) { acc, part -> acc.replace(part, "GENERIC_KUUDRA") }
         }
-        if (internalName == "ATTRIBUTE_SHARD" && attributes.size == 1) {
-            val price = getPriceOrCompositePriceForAttribute(
-                "ATTRIBUTE_SHARD+ATTRIBUTE_" + attributes[0].first,
-                attributes[0].second,
-            )
-            if (price != null) {
-                val name = attributes[0].first.fixMending().allLettersFirstUppercase()
-                list.add("§7Attribute §9$name ${attributes[0].second}§7: (§6${price.shortFormat()}§7)")
-                return price
-            }
+        stack.getAttributeFromShard()?.let {
+            return 0.0
         }
         if (attributes.size != 2) return 0.0
         val basePrice = internalName.asInternalName().getPriceOrNull() ?: 0.0
@@ -546,6 +539,16 @@ object EstimatedItemValueCalculator {
 
     private fun addBaseItem(stack: ItemStack, list: MutableList<String>): Double {
         val internalName = removeKuudraArmorPrefix(stack.getInternalName().asString()).asInternalName()
+
+        stack.getAttributeFromShard()?.let {
+            val price = it.getAttributePrice()
+            if (price != null) {
+                val name = it.getAttributeName()
+                list.add("§7Base item: $name §7(§6" + price.shortFormat() + "§7)")
+                return price
+            }
+        }
+
         var price = internalName.getPrice()
         if (price == -1.0) {
             price = 0.0
@@ -771,4 +774,15 @@ object EstimatedItemValueCalculator {
     private fun NEUInternalName.getPriceOrNull(): Double? {
         return getPriceOrNull(config.priceSource.get())
     }
+
+    fun Pair<String, Int>.getAttributeName(): String {
+        val name = first.fixMending().allLettersFirstUppercase()
+        return "§9$name ${second}"
+    }
+
+    fun Pair<String, Int>.getAttributePrice(): Double? =
+        EstimatedItemValueCalculator.getPriceOrCompositePriceForAttribute(
+            "ATTRIBUTE_SHARD+ATTRIBUTE_" + first,
+            second,
+        )
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index d3df5da3e665..d3a5e0bceb16 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -497,7 +497,7 @@ object SkyHanniDebugsAndTests {
             event.toolTip.add("Item name: no item.")
             return
         }
-        val name = internalName.itemName
+        val name = itemStack.itemName
         event.toolTip.add("Item name: '$name§7'")
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 59a718d6cc12..09f77ebcec41 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValueCalculator.getAttributeName
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
@@ -12,6 +13,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.cachedData
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAttributes
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -343,7 +345,20 @@ object ItemUtils {
 
     // use when showing the item name to the user (in guis, chat message, etc.), not for comparing
     val ItemStack.itemName: String
-        get() = getInternalName().itemName
+        get() {
+            getAttributeFromShard()?.let {
+                return it.getAttributeName()
+            }
+            return getInternalName().itemName
+        }
+
+
+    fun ItemStack.getAttributeFromShard(): Pair<String, Int>? {
+        if (getInternalName().asString() != "ATTRIBUTE_SHARD") return null
+        val attributes = getAttributes() ?: return null
+        return attributes.firstOrNull()
+    }
+
 
     val ItemStack.itemNameWithoutColor: String get() = itemName.removeColor()
 
@@ -382,6 +397,11 @@ object ItemUtils {
             return name.replace("Enchanted Book", itemStack.getLore()[0].removeColor())
         }
 
+        // obfuscated trophy fish
+        if (name.contains("§kObfuscated")) {
+            return name.replace("§kObfuscated", "Obfuscated")
+        }
+
         // hide pet level
         PetAPI.getCleanName(name)?.let {
             return "$it Pet"

From a3879e0a6bab05f08606c16e8eaa391eba451bee Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:27:21 +0200
Subject: [PATCH 272/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
index 947fa3bf1bc0..0ce4309c7abb 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
@@ -127,6 +127,7 @@ object OwnInventoryData {
         }
     }
 
+    // TODO add ah movements
     fun ignoreItem(duration: Duration, condition: (NEUInternalName) -> Boolean) {
         ignoredItemsUntil.add(IgnoredItem(condition, SimpleTimeMark.now() + duration))
     }

From e9502e6a00cfcc72faac485bc52703c1f5bae15d Mon Sep 17 00:00:00 2001
From: aphased <152172867+aphased@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:35:50 +0200
Subject: [PATCH 273/721] Fix typo in FarmingWeightDisplay error message
 (#2376)

---
 .../skyhanni/features/garden/farming/FarmingWeightDisplay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 7133cf1fb301..222e75f4f296 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -511,7 +511,7 @@ object FarmingWeightDisplay {
             "Error loading user farming weight\n" +
                 "§eLoading the farming weight data from elitebot.dev failed!\n" +
                 "§eYou can re-enter the garden to try to fix the problem.\n" +
-                "§cIf this message repeats, please report it on Discord!\n",
+                "§cIf this message repeats, please report it on Discord",
             "url" to url,
             "apiResponse" to apiResponse,
             "localProfile" to localProfile,

From 944a97516d6ebcf3f473700f854ff8f0219385b9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:43:50 +0200
Subject: [PATCH 274/721] Fix: Time Limited Cache Lock (#2370)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/utils/TimeLimitedCache.kt        | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
index 018c858fa0a1..4c96c9b3c7c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
@@ -1,7 +1,9 @@
 package at.hannibal2.skyhanni.utils
 
 import com.google.common.cache.CacheBuilder
+import java.util.concurrent.ConcurrentMap
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.time.Duration
 
 class TimeLimitedCache<K : Any, V : Any>(
@@ -9,9 +11,18 @@ class TimeLimitedCache<K : Any, V : Any>(
     private val removalListener: (K?, V?) -> Unit = { _, _ -> },
 ) : Iterable<Map.Entry<K, V>> {
 
+    private val cacheLock = ReentrantReadWriteLock()
+
     private val cache = CacheBuilder.newBuilder()
         .expireAfterWrite(expireAfterWrite.inWholeMilliseconds, TimeUnit.MILLISECONDS)
-        .removalListener { removalListener(it.key, it.value) }
+        .removalListener {
+            cacheLock.writeLock().lock()
+            try {
+                removalListener(it.key, it.value)
+            } finally {
+                cacheLock.writeLock().unlock()
+            }
+        }
         .build<K, V>()
 
     // TODO IntelliJ cant replace this, find another way?
@@ -27,11 +38,30 @@ class TimeLimitedCache<K : Any, V : Any>(
 
     fun remove(key: K) = cache.invalidate(key)
 
-    fun entries(): Set<Map.Entry<K, V>> = cache.asMap().entries
+    fun entries(): Set<Map.Entry<K, V>> = getMap().entries
+
+    fun values(): Collection<V> = getMap().values
+
+    fun keys(): Set<K> = getMap().keys
 
-    fun values(): Collection<V> = cache.asMap().values
+    /**
+     * Modifications to the returned map are not supported and may lead to unexpected behavior.
+     * This method is intended for read-only operations such as iteration or retrieval of values.
+     *
+     * @return A read-only view of the cache's underlying map.
+     */
+    private fun getMap(): ConcurrentMap<K, V> {
+        val asMap: ConcurrentMap<K, V>
 
-    fun keys(): Set<K> = cache.asMap().keys
+        cacheLock.readLock().lock()
+        try {
+            asMap = cache.asMap()
+        } finally {
+            cacheLock.readLock().unlock()
+        }
+
+        return asMap
+    }
 
     fun containsKey(key: K): Boolean = cache.getIfPresent(key) != null
 

From 3ad89c2261814d8597c82257937e9576c983d47e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:44:26 +0200
Subject: [PATCH 275/721] better attribute name

---
 .../features/misc/items/EstimatedItemValueCalculator.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 27a345a9840e..74c772824395 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -777,7 +777,7 @@ object EstimatedItemValueCalculator {
 
     fun Pair<String, Int>.getAttributeName(): String {
         val name = first.fixMending().allLettersFirstUppercase()
-        return "§9$name ${second}"
+        return "§b$name ${second} Shard"
     }
 
     fun Pair<String, Int>.getAttributePrice(): Double? =

From 0b76561bce1a1a936c6f2413065f0e9060a7c5ef Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:58:28 +0200
Subject: [PATCH 276/721] Version 0.26 Beta 25

---
 docs/CHANGELOG.md                                | 16 ++++++++++++++++
 root.gradle.kts                                  |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index bc1311f37b70..7ac3192ecac9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -214,6 +214,7 @@
 + Changed click-to-warp toggle to also work for unclaimed eggs display. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2211)
 + When Chocolate Factory prestige is maxed, the display shows time until the next max milestone instead. - seraid (https://github.com/hannibal002/SkyHanni/pull/2226)
 + Added an option to choose the color of Hoppity Egg Waypoints. - jani (https://github.com/hannibal002/SkyHanni/pull/2259)
++ Added rabbit rarity to Compact Hoppity messages. - not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2364)
 
 #### Mining Improvements
 
@@ -322,6 +323,7 @@
 + Added the current Minister's name and perks to the Mayor Display on the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2313)
 + Hide repo errors in chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2338)
     + Errors will be displayed directly in the GUI when necessary, making them less intrusive.
++ Added a "Mods Folder" button to the NEU error message. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2362)
 
 ### Fixes
 
@@ -396,6 +398,8 @@
 + Fixed Zorro's Cape not working with Green Thumb in the FF stats breakdown in item lore. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2299)
 + Fixed Composter Overlay calculating incorrectly while Composter Display is disabled. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2294)
 + Fixed own garden not being detected when swapping islands from a guesting server. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2355)
++ Fixed a typo in the Farming Weight Display error message. - aphased (https://github.com/hannibal002/SkyHanni/pull/2376)
++ Fixed Finnegan still having the Farming Simulator perk and missing the Pest Eradicator perk. - Luna (https://github.com/hannibal002/SkyHanni/pull/2359)
 
 #### Chocolate Factory & Hoppity Hunt Fixes
 
@@ -429,6 +433,7 @@
 + Fixed Hoppity custom goals being off by one level. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2280)
 + Fixed Custom Reminder not working in the Chocolate Shop. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2334)
 + Fixed a warning about space in the Chocolate Factory appearing even when the barn was already large enough to store all rabbits. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2356)
++ Fixed the Hoppity Menu not being detected when it only had one page. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2368)
 
 #### Custom Scoreboard Fixes
 
@@ -481,6 +486,10 @@
 + Fixed Commission Mob Highlighter incorrectly highlighting Deep Sea Protectors as Automatons. - Luna (https://github.com/hannibal002/SkyHanni/pull/2130)
 + Fixed Squid Pet counting towards the Fishing Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1960)
 + Fixed an error during fishing. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2350)
++ Fixed error messages appearing while fishing. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2370)
++ Fixed obfuscated trophy fish names being unreadable in the Fishing Profit Tracker. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2363)
++ Fixed item names appearing in incorrect spots while holding a fishing rod. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2371)
++ Fixed the fishing timer being incorrect for some sea creatures. - Empa (https://github.com/hannibal002/SkyHanni/pull/2365)
 
 #### Performance Fixes
 
@@ -527,6 +536,9 @@
 + Fixed shift-clicking items in GUIs triggering the Item Pickup Log. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2305)
 + Fixed the Master Mode Dungeon stack size display in the party finder menu. - fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2316)
 + Fixed the Item Pickup Log detecting "Magical Map" in dungeons when using Skytils. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2351)
++ Fixed Attribute Shards not displaying their names in the Chest Value feature. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2363)
++ Fixed Bazaar item movement being counted towards Item Trackers. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2366)
++ Fixed the Item Pickup Log showing incorrect icons for some items when collected via sacks. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2373)
 
 #### Combat Fixes
 
@@ -534,6 +546,7 @@
 + Fixed area mini boss spawn durations below 1 second not displaying. - Empa (https://github.com/hannibal002/SkyHanni/pull/2110)
 + Fixed summons death messages getting blocked even when the feature is disabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2132)
 + Fixed slayer quest warning sometimes showing incorrectly. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2232)
++ Fixed the "wrong slayer" alert being shown when attacking Bladesoul. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2367)
 
 #### Chat Fixes
 
@@ -583,6 +596,9 @@
 + Fixed Item Trackers displaying the incorrect NPC price. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2352)
 + Fixed players with similar names to friends being incorrectly marked as friends in the tab list. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2353)
 + Fixed color codes in Discord RPC pet status. - NetheriteMiner (https://github.com/hannibal002/SkyHanni/pull/2344)
++ Disabled the SkyHanni GUI's hover function while in other mods' screens. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2374)
++ Fixed the Trapper Helper checking for the wrong Finnegan perk. - Luna (https://github.com/hannibal002/SkyHanni/pull/2359)
++ Fixed items with no NPC sell price being counted as -1 coins instead of 0 coins. - Luna (https://github.com/hannibal002/SkyHanni/pull/2360)
 
 ### Technical Details
 
diff --git a/root.gradle.kts b/root.gradle.kts
index 9a15c2d0b555..e59319ea1ab2 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26.Beta.24"
+    version = "0.26.Beta.25"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 1e19bfcbabd4..8c1d07e3d860 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.24",
+    version = "0.26.Beta.25",
 )
 class SkyHanniMod {
 

From 7fb29cf073c95ca36388f57e04b53cc18f35fe8a Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:26:41 +0200
Subject: [PATCH 277/721] Fix: Check Dependency running on beta commit (#2377)

---
 .github/workflows/check_dependencies.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
index 50f3641ae03c..0d79d26abfd2 100644
--- a/.github/workflows/check_dependencies.yml
+++ b/.github/workflows/check_dependencies.yml
@@ -1,11 +1,9 @@
 name: Check PR Dependencies
 
+# TODO: Run when other pr gets merged
 on:
     pull_request_target:
         types: [ opened, edited ]
-    push:
-        branches:
-            - beta
 
 jobs:
     check-dependencies:

From e6f59771e8a65ad0e8901141ec0b930f0e5cee87 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:29:01 +0200
Subject: [PATCH 278/721] fix wrong slayer bug again

---
 .../skyhanni/features/slayer/SlayerQuestWarning.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index be7e16482765..162675486946 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -130,11 +130,12 @@ object SlayerQuestWarning {
         // workaround for Bladesoul in  Crimson Isle
         if (LorenzUtils.skyBlockArea == "Stronghold" && entity.name == "Skeleton") return false
 
-        val activeSlayer = SlayerAPI.activeSlayer
+        val isSlayer = slayerType.clazz.isInstance(entity)
+        if (!isSlayer) return false
 
-        if (activeSlayer != null) {
-            if (slayerType != activeSlayer) {
-                val activeSlayerName = activeSlayer.displayName
+        SlayerAPI.activeSlayer?.let {
+            if (slayerType != it) {
+                val activeSlayerName = it.displayName
                 val slayerName = slayerType.displayName
                 SlayerAPI.latestWrongAreaWarning = SimpleTimeMark.now()
                 warn(
@@ -144,8 +145,7 @@ object SlayerQuestWarning {
             }
         }
 
-        val isSlayer = slayerType.clazz.isInstance(entity)
-        return (getSlayerData().lastSlayerType == slayerType) && isSlayer
+        return getSlayerData().lastSlayerType == slayerType
     }
 
     @SubscribeEvent

From 860aec3a996090ff8a294cd19cbfe129dd8e5c34 Mon Sep 17 00:00:00 2001
From: Fazfoxy <78978526+Fazfoxy@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:36:46 +0100
Subject: [PATCH 279/721] Fix Master Mode Stack Sizes in Mort #2316 (#2378)

---
 .../skyhanni/features/dungeon/DungeonFinderFeatures.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index 93efa204fd7b..fcaddf487ed9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -60,11 +60,11 @@ object DungeonFinderFeatures {
 
     /**
      * REGEX-TEST: The Catacombs
-     * REGEX-TEST: Master Mode The Catacombs
+     * REGEX-TEST: MM The Catacombs
      */
     private val floorTypePattern by patternGroup.pattern(
         "floor.type",
-        "(The Catacombs).*|.*(Master Mode The Catacombs).*",
+        "(The Catacombs).*|.*(MM The Catacombs).*",
     )
     private val checkIfPartyPattern by patternGroup.pattern(
         "check.if.party",
@@ -97,11 +97,11 @@ object DungeonFinderFeatures {
 
     /**
      * REGEX-TEST: Master Mode The Catacombs
-     * REGEX-TEST: The Catacombs
+     * REGEX-TEST: MM The Catacombs
      */
     private val masterModeFloorPattern by patternGroup.pattern(
         "floor.mastermode",
-        "(MM )|(.*Master Mode The Catacombs)"
+        "(MM|.*Master Mode) The Catacombs.*"
     )
     private val dungeonFloorPattern by patternGroup.pattern(
         "floor.dungeon",

From 1d62dca118c49157c0ffcf1cb3753ce72877b8f2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:17:06 +0200
Subject: [PATCH 280/721] Fix: Typos (#2379)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/waypoints/ChristmasPresentConfig.java  | 8 +++++---
 .../features/event/waypoints/HalloweenBasketConfig.java   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java
index 1ecb9e089fc9..cb3ac01fb785 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/ChristmasPresentConfig.java
@@ -8,18 +8,20 @@
 public class ChristmasPresentConfig {
 
     @Expose
-    @ConfigOption(name = "Present Waypoints", desc = "Show all Present waypoints")
+    @ConfigOption(name = "Present Waypoints", desc = "Show all Present waypoints.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean allWaypoints = false;
 
+    // TODO confirm if this toggle actually does anything, ar there helper waypoints at all?
     @Expose
-    @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints to .")
+    @ConfigOption(name = "Entrance Waypoints", desc = "Show helper waypoints.")
     @ConfigEditorBoolean
     public boolean allEntranceWaypoints = false;
 
+
     @Expose
-    @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint")
+    @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint.")
     @ConfigEditorBoolean
     public boolean onlyClosest = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java
index 153e55c8bacc..f0b31f6490b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/waypoints/HalloweenBasketConfig.java
@@ -21,7 +21,7 @@ public class HalloweenBasketConfig {
     public boolean allEntranceWaypoints = false;
 
     @Expose
-    @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint")
+    @ConfigOption(name = "Only Closest", desc = "Only show the closest waypoint.")
     @ConfigEditorBoolean
     public boolean onlyClosest = true;
 }

From d0b872b23e68bd6a126fc9eac707a855b71911df Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:33:10 +0200
Subject: [PATCH 281/721] Version 0.26

---
 docs/CHANGELOG.md                                  | 2 +-
 root.gradle.kts                                    | 2 +-
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 7ac3192ecac9..b31628859ee8 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,6 @@
 # SkyHanni - Change Log
 
-## Version 0.26 (In Beta)
+## Version 0.26
 
 ### New Features
 
diff --git a/root.gradle.kts b/root.gradle.kts
index e59319ea1ab2..f069d37c920f 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26.Beta.25"
+    version = "0.26"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 8c1d07e3d860..5a3bc7822131 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26.Beta.25",
+    version = "0.26",
 )
 class SkyHanniMod {
 

From 20bd1d5fe25e8455402ad1d0f94336b547e51df1 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 20 Aug 2024 09:50:50 -0400
Subject: [PATCH 282/721] N2N (#2384)

---
 docs/CHANGELOG.md | 12 ++++++------
 docs/FEATURES.md  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b31628859ee8..8fd574eaa028 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -16,7 +16,7 @@
   azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888)
 + Added In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
-+ Added toggle for compacting Garden visitor summary messages. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2026)
++ Added toggle for compacting Garden visitor summary messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2026)
 + Add Armor Stack Display. - Xupie (https://github.com/hannibal002/SkyHanni/pull/1811)
     + Display the number of stacks on armor pieces like Crimson, Terror etc.
 + Add a line to Nukekebi Skull. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2148)
@@ -150,7 +150,7 @@
     + Highly customizable: Colors, display sizes.
     + Estimated Price Integration.
     + Favorite slots; option to only display favorite slots.
-+ Added toggle for compacting Garden visitor summary messages. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2026)
++ Added toggle for compacting Garden visitor summary messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2026)
 + Added SkyHanni User Luck to the stats breakdown. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1288)
     + This can be viewed in /sbmenu, /equipment, and the Misc Stats submenu.
 + Added a source download verification checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/1914)
@@ -180,7 +180,7 @@
     + Also shortened the default display.
 + Minor GUI improvements in /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/873)
 + Displays in /ff the fortune from bestiary and armor stats for enchantments and gemstones. - maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/1861)
-+ Allow clicking on the Craftable! text in the shopping list to open the "view recipe" menu. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2075)
++ Allow clicking on the Craftable! text in the shopping list to open the "view recipe" menu. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2075)
 + Rename Mushroom Tier to Mushroom Milestone in Mooshroom Cow Perk. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2159)
 + Add Fine Flour to the /ff menu. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2194)
 + Added a "Compact" option to the Rancher Boots Optimal Speed GUI. - Empa (https://github.com/hannibal002/SkyHanni/pull/2137)
@@ -197,7 +197,7 @@
 + Hoppity Collection Stats are now persistent. - appable (https://github.com/hannibal002/SkyHanni/pull/1836)
     + No longer reset on profile swap or game restart.
 + Merged duplicate times in compacted Hoppity's messages. -
-  DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/1887)
+  Daveed (https://github.com/hannibal002/SkyHanni/pull/1887)
 + Option to show Hoppity Eggs timer outside of SkyBlock. -
   maxime-bodifee (https://github.com/hannibal002/SkyHanni/pull/1926)
 + Adjusted and added Rabbit Uncle & Dog Keybinds. - raven (https://github.com/hannibal002/SkyHanni/pull/1907)
@@ -388,7 +388,7 @@
 + Fixed Fine Flour exportation not getting detected from chat messages for use in FF Guide. - Luna (https://github.com/hannibal002/SkyHanni/pull/2215)
 + Fixed "Craftable!" text not opening the recipe. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2219)
 + Fixed favorite pets not being detected by FF Guide. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2202)
-+ Fixed farming weight estimate being much too large. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2230)
++ Fixed farming weight estimate being much too large. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2230)
 + Fixed Jacob's Contest FF needed display not showing. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2262)
 + Fixed Dicer Tracker Reset Button misalignment. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2248)
 + Fixed errors when selecting Fine Flour with the Sprayonator. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2251)
@@ -413,7 +413,7 @@
   appable (https://github.com/hannibal002/SkyHanni/pull/1925)
 + Fixed incorrect API name conversion for Fish the Rabbit. - appable (https://github.com/hannibal002/SkyHanni/pull/1975)
 + Fixed stray rabbit sound not playing for the Golden Rabbit. - HiZe (https://github.com/hannibal002/SkyHanni/pull/1913)
-+ Fixed compact chat sometimes breaking when obtaining legendary or higher tier rabbits. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2041)
++ Fixed compact chat sometimes breaking when obtaining legendary or higher tier rabbits. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2041)
 + Fixed highlight missing requirements even when Hoppity Rabbit is already found. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2101)
 + Fixed Compact Hoppity Chat not working with rabbits purchased from the Hoppity NPC. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2100)
 + Fixed a rare case where golden strays caused incorrect duplicate detection during Compact Chat for Hoppity's. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2090)
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index dd4e6ea41bc0..20c80538f482 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -732,7 +732,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Checks if you have enough materials to craft the items and depending on that shows the button or not.
 + Overflow Garden crop milestones. - Luna & HiZe (https://github.com/hannibal002/SkyHanni/pull/997)
 + New "Craftable!" message when Visitor Items Needed are craftable. - Paloys (https://github.com/hannibal002/SkyHanni/pull/1891)
-+ Added toggle for compacting Garden visitor summary messages. - DavidArthurCole (https://github.com/hannibal002/SkyHanni/pull/2026)
++ Added toggle for compacting Garden visitor summary messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2026)
 + Added Farming Personal Best FF Gain. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2332)
     + Displays in chat how much additional FF you earn from the farming contest personal best bonus after beating your previous record.
 

From 57c1220bc9084b766c554c00636cc8ca89832ee0 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 23 Aug 2024 09:45:54 +0200
Subject: [PATCH 283/721] Feature + Fix: Custom Scoreboard Souflow, Margin, and
 more (#1837)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../skyhanni/config/core/config/Position.java |   5 +
 .../gui/customscoreboard/AlignmentConfig.java |   6 +
 .../customscoreboard/BackgroundConfig.java    |  10 +-
 .../gui/customscoreboard/DisplayConfig.java   |  10 +
 .../hannibal2/skyhanni/data/GuiEditManager.kt |   4 +-
 .../gui/customscoreboard/CustomScoreboard.kt  |  32 ++--
 .../customscoreboard/CustomScoreboardUtils.kt |   2 +-
 .../gui/customscoreboard/RenderBackground.kt  | 178 +++++++-----------
 .../customscoreboard/ScoreboardElements.kt    |  86 +++++----
 .../gui/customscoreboard/ScoreboardPattern.kt |   4 +
 .../at/hannibal2/skyhanni/utils/TimeUtils.kt  |   7 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  85 +++++++++
 12 files changed, 264 insertions(+), 165 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
index 140fbf0076c7..16e134574ae2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
@@ -115,6 +115,11 @@ public int getRawY() {
         return y;
     }
 
+    public void moveTo(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
     public void setClicked(boolean state) {
         this.clicked = state;
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/AlignmentConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/AlignmentConfig.java
index 0b62bfcbcc2b..fec0847f4415 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/AlignmentConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/AlignmentConfig.java
@@ -4,6 +4,7 @@
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class AlignmentConfig {
@@ -17,4 +18,9 @@ public class AlignmentConfig {
     @ConfigOption(name = "Vertical Alignment", desc = "Alignment for the scoreboard on the vertical axis.")
     @ConfigEditorDropdown
     public VerticalAlignment verticalAlignment = VerticalAlignment.CENTER;
+
+    @Expose
+    @ConfigOption(name = "Margin", desc = "Space between the border of your screen and the scoreboard.")
+    @ConfigEditorSlider(minValue = 0, maxValue = 50, minStep = 1)
+    public int margin = 0;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/BackgroundConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/BackgroundConfig.java
index 18ffd3c5853c..be0f5f148678 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/BackgroundConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/BackgroundConfig.java
@@ -56,12 +56,20 @@ public class BackgroundConfig {
 
     @Expose
     @ConfigOption(
-        name = "Use Custom Background Image",
+        name = "Custom Background Image",
         desc = "Put that image into a resource pack, using the path \"skyhanni/scoreboard.png\"."
     )
     @ConfigEditorBoolean
     public boolean useCustomBackgroundImage = false;
 
+    @Expose
+    @ConfigOption(
+        name = "Background Image Opacity",
+        desc = "The opacity of the custom background image."
+    )
+    @ConfigEditorSlider(minValue = 0, maxValue = 100, minStep = 1)
+    public int customBackgroundImageOpacity = 100;
+
     @Expose
     @ConfigOption(
         name = "Custom Background",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
index c9e330b33952..e2c6dd6faf5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
@@ -65,6 +65,11 @@ public class DisplayConfig {
     @ConfigEditorBoolean
     public boolean displayNumbersFirst = false;
 
+    @Expose
+    @ConfigOption(name = "Hide coins earned/lost", desc = "Hide the amount of coins earned or lost.")
+    @ConfigEditorBoolean
+    public boolean hideCoinsDifference = false;
+
     @Expose
     @ConfigOption(name = "Show unclaimed bits", desc = "Show the amount of available Bits that can still be claimed.")
     @ConfigEditorBoolean
@@ -119,6 +124,11 @@ public String toString() {
         }
     }
 
+    @Expose
+    @ConfigOption(name = "SkyBlock Time 24h Format", desc = "Display the current SkyBlock time in 24hr format rather than 12h Format.")
+    @ConfigEditorBoolean
+    public boolean skyblockTime24hFormat = false;
+
     @Expose
     @ConfigOption(name = "Line Spacing", desc = "The amount of space between each line.")
     @ConfigEditorSlider(minValue = 0, maxValue = 20, minStep = 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index 0f53a3e0cea1..e6dfa7671529 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -78,14 +78,14 @@ object GuiEditManager {
     }
 
     @JvmStatic
-    fun add(position: Position, posLabel: String, x: Int, y: Int) {
+    fun add(position: Position, posLabel: String, width: Int, height: Int) {
         var name = position.internalName
         if (name == null) {
             name = if (posLabel == "none") "none " + UUID.randomUUID() else posLabel
             position.internalName = name
         }
         currentPositions[name] = position
-        currentBorderSize[posLabel] = Pair(x, y)
+        currentBorderSize[posLabel] = Pair(width, height)
     }
 
     private var lastHotkeyReminded = SimpleTimeMark.farPast()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index df8adab371e3..7c61eade8ec9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -1,20 +1,11 @@
 //
 // TODO LIST
 // V2 RELEASE
-//  - Soulflow API
 //  - Bank API (actually maybe not, I like the current design)
-//  - beacon power
-//  - skyblock level
-//  - more bg options (round, blurr, outline)
 //  - countdown events like fishing festival + fiesta when its not on tablist
-//  - CookieAPI https://discord.com/channels/997079228510117908/1162844830360146080/1195695210433351821
-//  - Rng meter display
-//  - option to hide coins earned
+//  - improve hide coin difference to also work with bits, motes, etc
 //  - color options in the purse etc lines
 //  - choose the amount of decimal places in shorten nums
-//  - more anchor points (alignment enums in renderutils)
-//  - 24h instead of 12h for skyblock time
-//  - only alert for lines that exist longer than 1s
 //
 
 package at.hannibal2.skyhanni.features.gui.customscoreboard
@@ -34,9 +25,10 @@ import at.hannibal2.skyhanni.utils.DelayedRun.runDelayed
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAlignedWidth
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.TabListData
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import com.google.gson.JsonArray
 import com.google.gson.JsonPrimitive
 import net.minecraftforge.client.GuiIngameForge
@@ -58,19 +50,25 @@ object CustomScoreboard {
         if (!isEnabled()) return
         if (display.isEmpty()) return
 
-        RenderBackground().renderBackground()
-
         val render =
             if (!TabListData.fullyLoaded && displayConfig.cacheScoreboardOnIslandSwitch && cache.isNotEmpty()) {
                 cache
             } else {
                 display
             }
-        config.position.renderStringsAlignedWidth(
-            render,
-            posLabel = guiName,
-            extraSpace = displayConfig.lineSpacing - 10,
+
+        val textRenderable = Renderable.verticalContainer(
+            render.map { Renderable.string(it.first, horizontalAlign = it.second) },
+            0,
+            horizontalAlign = HorizontalAlignment.CENTER,
+            verticalAlign = VerticalAlignment.CENTER,
         )
+
+        val finalRenderable = RenderBackground.addBackground(textRenderable)
+
+        RenderBackground.updatePosition(finalRenderable)
+
+        config.position.renderRenderable(finalRenderable, posLabel = guiName)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
index d1eaf2abd571..99fdc4f3fcf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
@@ -23,7 +23,7 @@ object CustomScoreboardUtils {
         pattern.matchMatcher(line) {
             group(group)
         }
-    } ?: "0"
+    }
 
     fun getProfileTypeSymbol() = when {
         HypixelData.ironman -> "§7♲ "
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
index ebbb7fa3074c..44e5c927c507 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
@@ -1,139 +1,97 @@
 package at.hannibal2.skyhanni.features.gui.customscoreboard
 
-import at.hannibal2.skyhanni.config.core.config.Position
 import at.hannibal2.skyhanni.data.GuiEditManager
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsX
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
-import at.hannibal2.skyhanni.data.GuiEditManager.getDummySize
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
-import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.ResourceLocation
-import org.lwjgl.opengl.GL11
 
-class RenderBackground {
+object RenderBackground {
 
-    fun renderBackground() {
-        val alignmentConfig = CustomScoreboard.alignmentConfig
+    private val textureLocation by lazy { ResourceLocation("skyhanni", "scoreboard.png") }
+
+    internal fun addBackground(renderable: Renderable): Renderable {
         val backgroundConfig = CustomScoreboard.backgroundConfig
         val outlineConfig = backgroundConfig.outline
-        val position = CustomScoreboard.config.position
-        val border = backgroundConfig.borderSize
-
-        val x = position.getAbsX()
-        val y = position.getAbsY()
-
-        val elementWidth = position.getDummySize().x
-        val elementHeight = position.getDummySize().y
-
-        // Update the position to the alignment options
-        if (
-            alignmentConfig.horizontalAlignment != RenderUtils.HorizontalAlignment.DONT_ALIGN
-            || alignmentConfig.verticalAlignment != RenderUtils.VerticalAlignment.DONT_ALIGN
-        ) {
-            position.set(updatePosition(position))
+        val padding = backgroundConfig.borderSize
+
+        if (!backgroundConfig.enabled) return renderable
+
+        val backgroundRenderable = if (backgroundConfig.useCustomBackgroundImage) {
+            Renderable.drawInsideImage(
+                renderable,
+                textureLocation,
+                (backgroundConfig.customBackgroundImageOpacity * 255) / 100,
+                padding,
+                horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+                radius = backgroundConfig.roundedCornerSmoothness,
+            )
+        } else {
+            Renderable.drawInsideRoundedRect(
+                renderable,
+                backgroundConfig.color.toChromaColor(),
+                padding,
+                backgroundConfig.roundedCornerSmoothness,
+                1,
+                horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            )
         }
 
-        if (GuiEditManager.isInGui()) return
-
-        GlStateManager.pushMatrix()
-
-        GlStateManager.color(1f, 1f, 1f, 1f)
-        GL11.glDepthMask(false)
-
-        if (backgroundConfig.enabled) {
-            if (backgroundConfig.useCustomBackgroundImage) {
-                val textureLocation = ResourceLocation("skyhanni", "scoreboard.png")
-                Minecraft.getMinecraft().textureManager.bindTexture(textureLocation)
-
-                RenderUtils.drawRoundTexturedRect(
-                    x - border,
-                    y - border,
-                    elementWidth + border * 3,
-                    elementHeight + border * 2,
-                    GL11.GL_NEAREST,
-                    backgroundConfig.roundedCornerSmoothness,
-                )
-            } else {
-                RenderUtils.drawRoundRect(
-                    x - border,
-                    y - border,
-                    elementWidth + border * 3,
-                    elementHeight + border * 2,
-                    backgroundConfig.color.toChromaColor().rgb,
-                    backgroundConfig.roundedCornerSmoothness,
-                )
-            }
-            if (outlineConfig.enabled) {
-                RenderUtils.drawRoundRectOutline(
-                    x - border,
-                    y - border,
-                    elementWidth + border * 3,
-                    elementHeight + border * 2,
-                    outlineConfig.colorTop.toChromaColor().rgb,
-                    outlineConfig.colorBottom.toChromaColor().rgb,
-                    outlineConfig.thickness,
-                    backgroundConfig.roundedCornerSmoothness,
-                    outlineConfig.blur,
-                )
-            }
-        }
-        GL11.glDepthMask(true)
-        GlStateManager.popMatrix()
+        return if (outlineConfig.enabled) {
+            Renderable.drawInsideRoundedRectOutline(
+                backgroundRenderable,
+                0,
+                backgroundConfig.roundedCornerSmoothness,
+                1,
+                outlineConfig.colorTop.toChromaColor().rgb,
+                outlineConfig.colorBottom.toChromaColor().rgb,
+                outlineConfig.thickness,
+                outlineConfig.blur,
+                horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            )
+        } else backgroundRenderable
     }
 
-    private fun updatePosition(position: Position): Position {
+    internal fun updatePosition(renderable: Renderable) {
+        if (GuiEditManager.isInGui()) return
         val alignmentConfig = CustomScoreboard.alignmentConfig
-        val backgroundConfig = CustomScoreboard.backgroundConfig
-        val outlineConfig = backgroundConfig.outline
-        val border = backgroundConfig.borderSize
 
-        val x = position.getAbsX()
-        val y = position.getAbsY()
+        with(alignmentConfig) {
+            if (horizontalAlignment == RenderUtils.HorizontalAlignment.DONT_ALIGN &&
+                verticalAlignment == RenderUtils.VerticalAlignment.DONT_ALIGN
+            ) return
+        }
 
-        val elementWidth = position.getDummySize().x
-        val elementHeight = position.getDummySize().y
+        val position = CustomScoreboard.config.position
 
         val scaledWidth = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
         val scaledHeight = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
-
-
-        var newX = when (alignmentConfig.horizontalAlignment) {
-            RenderUtils.HorizontalAlignment.LEFT -> border
-            RenderUtils.HorizontalAlignment.CENTER -> scaledWidth / 2 - (elementWidth + border * 3) / 2
-            RenderUtils.HorizontalAlignment.RIGHT -> scaledWidth - (elementWidth + border * 2)
-            else -> x
-        }
-
-        var newY = when (alignmentConfig.verticalAlignment) {
-            RenderUtils.VerticalAlignment.TOP -> border
-            RenderUtils.VerticalAlignment.CENTER -> scaledHeight / 2 - (elementHeight + border * 2) / 2
-            RenderUtils.VerticalAlignment.BOTTOM -> scaledHeight - elementHeight - border
-            else -> y
-        }
-
-        if (outlineConfig.enabled) {
-            val thickness = outlineConfig.thickness
-            if (alignmentConfig.horizontalAlignment == RenderUtils.HorizontalAlignment.RIGHT) {
-                newX -= thickness / 2
-            } else if (alignmentConfig.horizontalAlignment == RenderUtils.HorizontalAlignment.LEFT) {
-                newX += thickness / 2
+        val elementWidth = renderable.width
+        val elementHeight = renderable.height
+
+        with(alignmentConfig) {
+            val x = when (horizontalAlignment) {
+                RenderUtils.HorizontalAlignment.DONT_ALIGN -> position.getAbsX()
+                RenderUtils.HorizontalAlignment.LEFT -> 0 + margin
+                RenderUtils.HorizontalAlignment.CENTER -> scaledWidth / 2 - elementWidth / 2
+                RenderUtils.HorizontalAlignment.RIGHT -> scaledWidth - elementWidth - margin
+                else -> 0
             }
-
-            if (alignmentConfig.verticalAlignment == RenderUtils.VerticalAlignment.TOP) {
-                newY += thickness / 2
-            } else if (alignmentConfig.verticalAlignment == RenderUtils.VerticalAlignment.BOTTOM) {
-                newY -= thickness / 2
+            val y = when (verticalAlignment) {
+                RenderUtils.VerticalAlignment.DONT_ALIGN -> position.getAbsY()
+                RenderUtils.VerticalAlignment.TOP -> 0 + margin
+                RenderUtils.VerticalAlignment.CENTER -> scaledHeight / 2 - elementHeight / 2
+                RenderUtils.VerticalAlignment.BOTTOM -> scaledHeight - elementHeight - margin
+                else -> 0
             }
+            CustomScoreboard.config.position.moveTo(x, y)
         }
-
-        return Position(
-            newX,
-            newY,
-            position.getScale(),
-            position.isCenter,
-        )
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 7c9757da2d0b..57376dbbb2ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.MaxwellAPI
 import at.hannibal2.skyhanni.data.MayorAPI
 import at.hannibal2.skyhanni.data.MiningAPI
+import at.hannibal2.skyhanni.data.MiningAPI.inGlaciteArea
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.PurseAPI
 import at.hannibal2.skyhanni.data.QuiverAPI
@@ -52,6 +53,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.StringUtils.pluralize
+import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.TimeLimitedSet
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.TimeUtils.formatted
@@ -147,9 +149,15 @@ enum class ScoreboardElement(
         ::shouldShowChunkedStats,
         "§652,763,737 §7| §d64,647 §7| §6249M\n§b59,264 §7| §c23,495 §7| §a57,873\n§c♨ 0 §7| §b0❄ §7| §d756",
     ),
+    SOULFLOW(
+        ::getSoulflowDisplayPair,
+        ::getSoulflowDisplayWhen,
+        "Soulflow: §3761",
+    ),
     EMPTY_LINE(
         ::getEmptyLineDisplayPair,
-        { true }, "",
+        { true },
+        "",
     ),
     ISLAND(
         ::getIslandDisplayPair,
@@ -203,7 +211,8 @@ enum class ScoreboardElement(
     ),
     EMPTY_LINE2(
         ::getEmptyLineDisplayPair,
-        { true }, "",
+        { true },
+        "",
     ),
     OBJECTIVE(
         ::getObjectiveDisplayPair,
@@ -363,16 +372,17 @@ private fun getTitleDisplayPair(): List<ScoreboardElementType> =
         ).flatten()
     }
 
-private fun getProfileDisplayPair() =
-    listOf(CustomScoreboardUtils.getProfileTypeSymbol() + HypixelData.profileName.firstLetterUppercase() to HorizontalAlignment.LEFT)
+private fun getProfileDisplayPair() = listOf(
+    CustomScoreboardUtils.getProfileTypeSymbol() + HypixelData.profileName.firstLetterUppercase()
+        to HorizontalAlignment.LEFT,
+)
 
 private fun getPurseDisplayPair(): List<ScoreboardElementType> {
     var purse = PurseAPI.currentPurse.formatNum()
 
-    val earned = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, PurseAPI.coinsPattern, "earned")
-
-    if (earned != "0") {
-        purse += " §7(§e+$earned§7)§6"
+    if (!displayConfig.hideCoinsDifference) {
+        val earned = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, PurseAPI.coinsPattern, "earned")
+        if (earned != null) purse += " §7(§e+$earned§7)§6"
     }
 
     return listOf(
@@ -387,7 +397,7 @@ private fun getPurseDisplayPair(): List<ScoreboardElementType> {
 private fun getPurseShowWhen() = !inAnyIsland(IslandType.THE_RIFT)
 
 private fun getMotesDisplayPair(): List<ScoreboardElementType> {
-    val motes = getMotes().formatNum()
+    val motes = getMotes()?.formatNum() ?: "0"
 
     return listOf(
         when {
@@ -434,7 +444,7 @@ private fun getBitsDisplayPair(): List<ScoreboardElementType> {
 private fun getBitsShowWhen() = !HypixelData.bingo && !inAnyIsland(IslandType.CATACOMBS, IslandType.KUUDRA_ARENA)
 
 private fun getCopperDisplayPair(): List<ScoreboardElementType> {
-    val copper = getCopper().formatNum()
+    val copper = getCopper()?.formatNum() ?: "0"
 
     return listOf(
         when {
@@ -467,8 +477,8 @@ private fun getHeatDisplayPair(): List<ScoreboardElementType> {
     return listOf(
         when {
             informationFilteringConfig.hideEmptyLines && heat == "§c♨ 0" -> "<hidden>"
-            displayConfig.displayNumbersFirst/* && heat != "§6IMMUNE" */ -> if (heat == "0") "§c♨ 0 Heat" else "$heat Heat"
-            else -> if (heat == "0") "Heat: §c♨ 0" else "Heat: $heat"
+            displayConfig.displayNumbersFirst -> heat?.let { "$heat Heat" } ?: "§c♨ 0 Heat"
+            else -> heat?.let { "Heat: $heat" } ?: "§c♨ 0 Heat"
         } to HorizontalAlignment.LEFT,
     )
 }
@@ -488,11 +498,11 @@ private fun getColdDisplayPair(): List<ScoreboardElementType> {
     )
 }
 
-private fun getColdShowWhen() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT)
-    && ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.coldPattern.matches(it) }
+private fun getColdShowWhen() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT) &&
+    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.coldPattern.matches(it) }
 
 private fun getNorthStarsDisplayPair(): List<ScoreboardElementType> {
-    val northStars = getNorthStars().formatNum()
+    val northStars = getNorthStars()?.formatNum() ?: "0"
 
     return listOf(
         when {
@@ -510,6 +520,20 @@ private fun getChunkedStatsDisplayPair(): List<ScoreboardElementType> =
         .chunked(chunkedConfig.maxStatsPerLine)
         .map { it.joinToString(" §f| ") to HorizontalAlignment.LEFT }
 
+private fun getSoulflowDisplayPair(): List<ScoreboardElementType> {
+    val soulflow = getGroupFromPattern(TabListData.getTabList(), ScoreboardPattern.soulflowPattern, "soulflow")
+        ?.formatNum() ?: "0"
+    return listOf(
+        when {
+            informationFilteringConfig.hideEmptyLines && soulflow == "0" -> "<hidden>"
+            displayConfig.displayNumbersFirst -> "§3$soulflow Soulflow"
+            else -> "Soulflow: §3$soulflow"
+        } to HorizontalAlignment.LEFT,
+    )
+}
+
+private fun getSoulflowDisplayWhen() = !inAnyIsland(IslandType.THE_RIFT)
+
 private fun getEmptyLineDisplayPair() = listOf("<empty>" to HorizontalAlignment.LEFT)
 
 private fun getIslandDisplayPair() =
@@ -536,7 +560,8 @@ fun getPlayerAmountDisplayPair() = buildList {
 
 private fun getVisitDisplayPair() =
     listOf(
-        ScoreboardData.sidebarLinesFormatted.first { ScoreboardPattern.visitingPattern.matches(it) } to HorizontalAlignment.LEFT,
+        ScoreboardData.sidebarLinesFormatted.first { ScoreboardPattern.visitingPattern.matches(it) } to
+            HorizontalAlignment.LEFT,
     )
 
 private fun getVisitShowWhen() =
@@ -548,11 +573,12 @@ private fun getDateDisplayPair() =
     )
 
 private fun getTimeDisplayPair(): List<ScoreboardElementType> {
-    var symbol = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.timePattern, "symbol")
-    if (symbol == "0") symbol = ""
+    val symbol =
+        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.timePattern, "symbol") ?: ""
     return listOf(
         "§7" + SkyBlockTime.now()
-            .formatted(dayAndMonthElement = false, yearElement = false) + " $symbol" to HorizontalAlignment.LEFT,
+            .formatted(dayAndMonthElement = false, yearElement = false, timeFormat24h = config.display.skyblockTime24hFormat) +
+            " $symbol" to HorizontalAlignment.LEFT,
     )
 }
 
@@ -668,14 +694,14 @@ private fun getQuiverDisplayPair(): List<ScoreboardElementType> {
     if (QuiverAPI.currentArrow == NONE_ARROW_TYPE)
         return listOf("No Arrows selected" to HorizontalAlignment.LEFT)
 
-    val amountString = (if (arrowConfig.colorArrowAmount) {
-        percentageColor(
-            QuiverAPI.currentAmount.toLong(),
-            QuiverAPI.MAX_ARROW_AMOUNT.toLong(),
-        ).getChatColor()
-    } else {
-        ""
-    }) + if (QuiverAPI.wearingSkeletonMasterChestplate) {
+    val amountString = (
+        if (arrowConfig.colorArrowAmount) {
+            percentageColor(
+                QuiverAPI.currentAmount.toLong(),
+                QuiverAPI.MAX_ARROW_AMOUNT.toLong(),
+            ).getChatColor()
+        } else ""
+        ) + if (QuiverAPI.wearingSkeletonMasterChestplate) {
         "∞"
     } else {
         when (arrowConfig.arrowAmountDisplay) {
@@ -809,11 +835,7 @@ private fun getPartyShowWhen() = if (DungeonAPI.inDungeon()) {
     if (partyConfig.showPartyEverywhere) {
         true
     } else {
-        inAnyIsland(
-            IslandType.DUNGEON_HUB,
-            IslandType.KUUDRA_ARENA,
-            IslandType.CRIMSON_ISLE,
-        )
+        inAnyIsland(IslandType.DUNGEON_HUB, IslandType.KUUDRA_ARENA, IslandType.CRIMSON_ISLE) || inGlaciteArea()
     }
 }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 2101409d13d4..126331ff2f96 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -570,6 +570,10 @@ object ScoreboardPattern {
         "bank",
         "^\\s*Bank: §6(?<bank>[\\w.,]+(?:§7 \\/ §6(?<coop>[\\w.,]+))?)$",
     )
+    val soulflowPattern by tablistGroup.pattern(
+        "soulflow",
+        "^\\s*Soulflow: (?:§.)+(?<soulflow>[\\d,.]+)$",
+    )
     val eventNamePattern by tablistGroup.pattern(
         "event",
         "^\\s*§e§lEvent: §r(?<name>§.*)$",
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index dcb6dcc931be..4d7b7ad4dc5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -104,9 +104,12 @@ object TimeUtils {
         dayAndMonthElement: Boolean = true,
         yearElement: Boolean = true,
         hoursAndMinutesElement: Boolean = true,
+        timeFormat24h: Boolean = false,
     ): String {
-        val hour = (this.hour + 11) % 12 + 1
-        val timeOfDay = if (this.hour > 11) "pm" else "am"
+        val hour = if (timeFormat24h) this.hour else (this.hour + 11) % 12 + 1
+        val timeOfDay = if (!timeFormat24h) {
+            if (this.hour > 11) "pm" else "am"
+        } else ""
         val minute = this.minute.toString().padStart(2, '0')
         val month = SkyBlockTime.monthName(this.month)
         val day = this.day
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 7a6fbce4b5f8..29105459cea3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -28,6 +28,7 @@ import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderYAligned
 import at.hannibal2.skyhanni.utils.shader.ShaderManager
+import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.Gui
@@ -38,6 +39,7 @@ import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.util.ResourceLocation
+import org.lwjgl.opengl.GL11
 import java.awt.Color
 import java.util.Collections
 import kotlin.math.max
@@ -907,6 +909,89 @@ interface Renderable {
             }
         }
 
+        fun drawInsideRoundedRectOutline(
+            input: Renderable,
+            padding: Int = 2,
+            radius: Int = 10,
+            smoothness: Int = 2,
+            topOutlineColor: Int,
+            bottomOutlineColor: Int,
+            borderOutlineThickness: Int,
+            blur: Float = 0.7f,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            override val width = input.width + padding * 2
+            override val height = input.height + padding * 2
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            override fun render(posX: Int, posY: Int) {
+                GlStateManager.translate(padding.toFloat(), padding.toFloat(), 0f)
+                input.render(posX + padding, posY + padding)
+                GlStateManager.translate(-padding.toFloat(), -padding.toFloat(), 0f)
+
+                RenderUtils.drawRoundRectOutline(
+                    0,
+                    0,
+                    width,
+                    height,
+                    topOutlineColor,
+                    bottomOutlineColor,
+                    borderOutlineThickness,
+                    radius,
+                    blur,
+                )
+            }
+        }
+
+        fun drawInsideImage(
+            input: Renderable,
+            texture: ResourceLocation,
+            alpha: Int = 255,
+            padding: Int = 2,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+            radius: Int = 0,
+        ) = object : Renderable {
+            override val width = input.width + padding * 2
+            override val height = input.height + padding * 2
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            override fun render(posX: Int, posY: Int) {
+                Minecraft.getMinecraft().textureManager.bindTexture(texture)
+                GlStateManager.color(1f, 1f, 1f, alpha / 255f)
+                RenderUtils.drawRoundTexturedRect(0, 0, width, height, GL11.GL_NEAREST, radius)
+                GlStateManager.color(1f, 1f, 1f, 1f)
+
+                GlStateManager.translate(padding.toFloat(), padding.toFloat(), 0f)
+                input.render(posX + padding, posY + padding)
+                GlStateManager.translate(-padding.toFloat(), -padding.toFloat(), 0f)
+            }
+        }
+
+        fun image(
+            texture: ResourceLocation,
+            width: Int,
+            height: Int,
+            alpha: Int = 255,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            override val width = width
+            override val height = height
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            override fun render(posX: Int, posY: Int) {
+                Minecraft.getMinecraft().textureManager.bindTexture(texture)
+                GlStateManager.color(1f, 1f, 1f, alpha / 255f)
+                Utils.drawTexturedRect(0f, 0f, width.toFloat(), height.toFloat(), GL11.GL_NEAREST)
+                GlStateManager.color(1f, 1f, 1f, 1f)
+            }
+        }
+
         fun drawInsideRoundedRectWithOutline(
             input: Renderable,
             color: Color,

From b2a86892cc7078aa00ea68296919bfb496bb3451 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 23 Aug 2024 09:46:57 +0200
Subject: [PATCH 284/721] Fix: AH Item movements item trackers (#2380)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/data/OwnInventoryData.kt         | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
index 0ce4309c7abb..0b4abf42586f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt
@@ -15,7 +15,9 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -37,7 +39,7 @@ object OwnInventoryData {
     private var dirty = false
     private val sackToInventoryChatPattern by RepoPattern.pattern(
         "data.owninventory.chat.movedsacktoinventory",
-        "§aMoved §r§e\\d* (?<name>.*)§r§a from your Sacks to your inventory."
+        "§aMoved §r§e\\d* (?<name>.*)§r§a from your Sacks to your inventory.",
     )
 
     @HandleEvent(priority = HandleEvent.LOW, receiveCancelled = true, onlyOnSkyblock = true)
@@ -117,6 +119,46 @@ object OwnInventoryData {
     @SubscribeEvent
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
         ignoreItem(500.milliseconds) { true }
+
+        val itemName = event.item?.name ?: return
+        checkAHMovements(itemName)
+    }
+
+    private fun checkAHMovements(itemName: String) {
+        val inventoryName = InventoryUtils.openInventoryName()
+
+        // cancel own auction
+        if (inventoryName.let { it == "BIN Auction View" || it == "Auction View" }) {
+            if (itemName == "§cCancel Auction") {
+                val item = InventoryUtils.getItemAtSlotIndex(13)
+                val internalName = item?.getInternalNameOrNull() ?: return
+                OwnInventoryData.ignoreItem(5.seconds, { it == internalName })
+            }
+        }
+
+        // bought item from bin ah
+        if (inventoryName == "Confirm Purchase" && itemName == "§aConfirm") {
+            val item = InventoryUtils.getItemAtSlotIndex(13)
+            val internalName = item?.getInternalNameOrNull() ?: return
+            OwnInventoryData.ignoreItem(5.seconds, { it == internalName })
+        }
+
+        // bought item from normal ah
+        if (inventoryName == "Auction View" && itemName == "§6Collect Auction") {
+            val item = InventoryUtils.getItemAtSlotIndex(13)
+            val internalName = item?.getInternalNameOrNull() ?: return
+            OwnInventoryData.ignoreItem(5.seconds, { it == internalName })
+        }
+
+        // collected all items in "own bins"
+        if (inventoryName == "Your Bids" && itemName == "§aClaim All") {
+            for (stack in InventoryUtils.getItemsInOpenChest().map { it.stack }) {
+                if (stack.getLore().any { it == "§7Status: §aSold!" || it == "7Status: §aEnded!" }) {
+                    val internalName = stack.getInternalNameOrNull() ?: return
+                    OwnInventoryData.ignoreItem(5.seconds, { it == internalName })
+                }
+            }
+        }
     }
 
     @SubscribeEvent
@@ -127,7 +169,6 @@ object OwnInventoryData {
         }
     }
 
-    // TODO add ah movements
     fun ignoreItem(duration: Duration, condition: (NEUInternalName) -> Boolean) {
         ignoredItemsUntil.add(IgnoredItem(condition, SimpleTimeMark.now() + duration))
     }

From 7bcc247bd3f27735bbfff207ce72b3e2cffb512e Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 23 Aug 2024 09:52:47 +0200
Subject: [PATCH 285/721] Fix: Double Color in ScoreboardData Part 2 (#2382)

---
 .../hannibal2/skyhanni/data/ScoreboardData.kt | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 26915faf357b..2287ae3585d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -22,13 +22,7 @@ object ScoreboardData {
 
     private var sidebarLines: List<String> = emptyList() // TODO rename to raw
     var sidebarLinesRaw: List<String> = emptyList() // TODO delete
-    val objectiveTitle: String get() = grabObjectiveTitle()
-
-    fun grabObjectiveTitle(): String {
-        val scoreboard = Minecraft.getMinecraft().theWorld?.scoreboard ?: return ""
-        val objective = scoreboard.getObjectiveInDisplaySlot(1) ?: return ""
-        return objective.displayName
-    }
+    val objectiveTitle: String get() = Minecraft.getMinecraft().theWorld?.scoreboard?.getObjectiveInDisplaySlot(1)?.displayName ?: ""
 
     private var dirty = false
 
@@ -39,16 +33,32 @@ object ScoreboardData {
             val start = split[0]
             var end = if (split.size > 1) split[1] else ""
 
+            /**
+             * If the line is split into two parts, we need to remove the color code prefixes from the end part
+             * to prevent the color from being applied to the start of `end`, which would cause the color to be
+             * duplicated in the final output.
+             *
+             * This fucks up different Regex checks if not working correctly, like here:
+             * ```
+             * Pattern: '§8- (§.)+[\w\s]+Dragon§a [\w,.]+§.❤'
+             * Lines: - '§8- §c§aApex Dra§agon§a 486M§c❤'
+             *        - '§8- §c§6Flame Dr§6agon§a 460M§c❤'
+             * ```
+             */
             val lastColor = start.lastColorCode() ?: ""
 
-            // Determine the longest prefix of "end" that matches any suffix of "lastColor"
+            // Generate the list of color suffixes
             val colorSuffixes = generateSequence(lastColor) { it.dropLast(2) }
                 .takeWhile { it.isNotEmpty() }
-                .toList()
-
-            val matchingPrefix = colorSuffixes.find { end.startsWith(it) } ?: ""
-            if (matchingPrefix.isNotEmpty()) {
-                end = end.removePrefix(matchingPrefix)
+                .toMutableList()
+
+            // Iterate through the colorSuffixes to remove matching prefixes from 'end'
+            for (suffix in colorSuffixes.toList()) {
+                if (end.startsWith(suffix)) {
+                    end = end.removePrefix(suffix)
+                    colorSuffixes.remove(suffix)
+                    break
+                }
             }
 
             add(start + end)

From 7d45133463f375252ba3e7e269cf1d27162aa1ee Mon Sep 17 00:00:00 2001
From: Maratons4 <81237150+Maratons4@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:50:33 +0300
Subject: [PATCH 286/721] Fix: typo in corpse detection (#2386)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/glacitemineshaft/CorpseLocator.kt         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
index f7fdcad4d9a6..3ea9ee4b14ec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
@@ -36,7 +36,7 @@ object CorpseLocator {
      */
     private val mineshaftCoordsPattern by RepoPattern.pattern(
         "mineshaft.corpse.coords",
-        "x: (?<x>-?\\d+), y: (?<y>-?\\d+), z: (?<z>-?\\d+)(?:.+)?"
+        "x: (?<x>-?\\d+), y: (?<y>-?\\d+), z: (?<z>-?\\d+)(?:.+)?",
     )
 
     private val sharedWaypoints: MutableList<LorenzVec> = mutableListOf()
@@ -53,13 +53,15 @@ object CorpseLocator {
 
                 val canSee = entity.getLorenzVec().canBeSeen(-1..3)
                 if (canSee) {
-                    ChatUtils.chat("Located a ${corpseType.displayText} and marked its location with a waypoint.")
+                    val article = if (corpseType.displayText == "Umber Corpse") "an" else "a"
+                    ChatUtils.chat("Located $article ${corpseType.displayText} and marked its location with a waypoint.")
+
                     MineshaftWaypoints.waypoints.add(
                         MineshaftWaypoint(
                             waypointType = corpseType,
                             location = entity.getLorenzVec().add(y = 1),
-                            isCorpse = true
-                        )
+                            isCorpse = true,
+                        ),
                     )
                 }
             }
@@ -70,7 +72,7 @@ object CorpseLocator {
             .filterNot { corpse ->
                 sharedWaypoints.any { corpse.location.distance(it) <= 5 }
             }
-            .filter { it.location.distanceToPlayer() <= 5}
+            .filter { it.location.distanceToPlayer() <= 5 }
             .minByOrNull { it.location.distanceToPlayer() } ?: return
 
         val (x, y, z) = closestCorpse.location.toDoubleArray().map { it.toInt() }

From 795e30bcecb1f72a9eb32331867d20f29554505a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 23 Aug 2024 10:50:42 +0200
Subject: [PATCH 287/721] Fix: Patcher Breaking Lines (#2387)

Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/misc/MiscConfig.java      |  9 ++++
 .../skyhanni/features/misc/PatcherFixes.kt    | 47 +++++++++++++++++++
 .../skyhanni/utils/OtherModsSettings.kt       | 25 ++++++++++
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  2 +
 4 files changed, 83 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/OtherModsSettings.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 6843d094877e..beb7f2225840 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -216,6 +216,15 @@ public class MiscConfig {
     @FeatureToggle
     public boolean fixNeuHeavyPearls = true;
 
+    @Expose
+    @ConfigOption(
+        name = "Fix Patcher Lines",
+        desc = "Suggest in chat to disable Patcher's `parallax fix` that breaks SkyHanni's line from middle of player to somewhere else."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean fixPatcherLines = true;
+
     @Expose
     @ConfigOption(
         name = "Time In Limbo",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
new file mode 100644
index 000000000000..a7d844e4e8e8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
@@ -0,0 +1,47 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.OtherModsSettings
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+object PatcherFixes {
+    private val config get() = SkyHanniMod.feature.misc
+
+    private var lastCheck = SimpleTimeMark.farPast()
+    private var lastChatMessage = SimpleTimeMark.farPast()
+
+    fun onPlayerEyeLine() {
+        if (!isEnabled()) return
+        if (lastCheck.passedSince() < 5.seconds) return
+        lastCheck = SimpleTimeMark.now()
+
+        val patcher = OtherModsSettings.patcher()
+        if (!patcher.getBoolean("parallaxFix")) return
+
+        if (lastChatMessage.passedSince() < 3.minutes) return
+        lastChatMessage = SimpleTimeMark.now()
+
+        ChatUtils.clickToActionOrDisable(
+            "§cPatcher's Parallax Fix breaks SkyHanni's line rendering!",
+            config::fixPatcherLines,
+            "disable this option in Patcher",
+            action = { tryFix() },
+        )
+    }
+
+    private fun tryFix() {
+        val patcher = OtherModsSettings.patcher()
+        if (patcher.getBoolean("parallaxFix")) {
+            patcher.setBoolean("parallaxFix", false)
+            ChatUtils.chat("§aDisabled Patcher's Parallax Fix! SkyHanni's lines should now work correctly.")
+        } else {
+            ChatUtils.userError("Patcher's Parallax is already disabled!")
+        }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.fixPatcherLines
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/OtherModsSettings.kt b/src/main/java/at/hannibal2/skyhanni/utils/OtherModsSettings.kt
new file mode 100644
index 000000000000..2cf9c6f6d31d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/OtherModsSettings.kt
@@ -0,0 +1,25 @@
+package at.hannibal2.skyhanni.utils
+
+import java.lang.reflect.Field
+
+class OtherModsSettings(val modConfigPath: String) {
+
+    companion object {
+        fun patcher(): OtherModsSettings = getModPath("club.sk1er.patcher.config.PatcherConfig")
+
+        private fun getModPath(modConfigPath: String): OtherModsSettings = OtherModsSettings(modConfigPath)
+    }
+
+    fun getBoolean(optionPath: String): Boolean = getOption(optionPath)?.get(null) as? Boolean ?: false
+
+    fun setBoolean(optionPath: String, value: Boolean) {
+        getOption(optionPath)?.set(null, value)
+    }
+
+    private fun getOption(optionPath: String): Field? =
+        try {
+            Class.forName(modConfigPath).getField(optionPath)
+        } catch (e: Throwable) {
+            null
+        }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 9ff6053e791b..f4a57cb18985 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.RenderGuiItemOverlayEvent
+import at.hannibal2.skyhanni.features.misc.PatcherFixes
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleOutlineShader
 import at.hannibal2.skyhanni.features.misc.RoundedRectangleShader
 import at.hannibal2.skyhanni.features.misc.RoundedTextureShader
@@ -1132,6 +1133,7 @@ object RenderUtils {
     fun LorenzRenderWorldEvent.exactPlayerEyeLocation(): LorenzVec {
         val player = Minecraft.getMinecraft().thePlayer
         val add = if (player.isSneaking) LorenzVec(0.0, 1.54, 0.0) else LorenzVec(0.0, 1.62, 0.0)
+        PatcherFixes.onPlayerEyeLine()
         return exactLocation(player) + add
     }
 

From 4204d05ae643c7bcd3891fa4afcb399db6c874ec Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:00:37 +0200
Subject: [PATCH 288/721] Fix: New Alpha Ores (#2388)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/OreBlock.kt      | 30 +++++++++++++------
 .../skyhanni/features/mining/OreType.kt       | 14 ++++-----
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 5b9c19556fc5..7f5582036dfd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -25,7 +25,7 @@ enum class OreBlock(
     // MITHRIL
     LOW_TIER_MITHRIL(
         checkBlock = ::isLowTierMithril,
-        checkArea = { inGlacite },
+        checkArea = { inDwarvenMines || inCrystalHollows || inGlacite },
     ),
     MID_TIER_MITHRIL(
         checkBlock = { it.block == Blocks.prismarine },
@@ -133,21 +133,33 @@ enum class OreBlock(
     ),
 
     // DWARVEN BLOCKS
-    DWARVEN_REDSTONE(
-        checkBlock = { it.block == Blocks.redstone_block },
-        checkArea = { inCrystalHollows },
+    PURE_COAL(
+        checkBlock = { it.block == Blocks.coal_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_IRON(
+        checkBlock = { it.block == Blocks.iron_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_GOLD(
+    PURE_GOLD(
         checkBlock = { it.block == Blocks.gold_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_EMERALD(
+    PURE_LAPIS(
+        checkBlock = { it.block == Blocks.lapis_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_REDSTONE(
+        checkBlock = { it.block == Blocks.redstone_block },
+        checkArea = { inDwarvenMines || inCrystalHollows },
+    ),
+    PURE_EMERALD(
         checkBlock = { it.block == Blocks.emerald_block },
-        checkArea = { inCrystalHollows },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
-    DWARVEN_DIAMOND(
+    PURE_DIAMOND(
         checkBlock = { it.block == Blocks.diamond_block },
-        checkArea = { inCrystalHollows },
+        checkArea = { inDwarvenMines || inCrystalHollows },
     ),
 
     // GEMSTONES
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
index 6bff0262e146..1c286097edb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -30,37 +30,37 @@ enum class OreType(
     COAL(
         "Coal",
         "COAL",
-        listOf(OreBlock.COAL_ORE),
+        listOf(OreBlock.COAL_ORE, OreBlock.PURE_COAL),
     ),
     IRON(
         "Iron",
         "IRON_INGOT",
-        listOf(OreBlock.IRON_ORE),
+        listOf(OreBlock.IRON_ORE, OreBlock.PURE_IRON),
     ),
     GOLD(
         "Gold",
         "GOLD_INGOT",
-        listOf(OreBlock.GOLD_ORE, OreBlock.DWARVEN_GOLD),
+        listOf(OreBlock.GOLD_ORE, OreBlock.PURE_GOLD),
     ),
     LAPIS(
         "Lapis Lazuli",
         "INK_SACK-4",
-        listOf(OreBlock.LAPIS_ORE),
+        listOf(OreBlock.LAPIS_ORE, OreBlock.PURE_LAPIS),
     ),
     REDSTONE(
         "Redstone",
         "REDSTONE",
-        listOf(OreBlock.REDSTONE_ORE, OreBlock.DWARVEN_REDSTONE),
+        listOf(OreBlock.REDSTONE_ORE, OreBlock.PURE_REDSTONE),
     ),
     EMERALD(
         "Emerald",
         "EMERALD",
-        listOf(OreBlock.EMERALD_ORE, OreBlock.DWARVEN_EMERALD),
+        listOf(OreBlock.EMERALD_ORE, OreBlock.PURE_EMERALD),
     ),
     DIAMOND(
         "Diamond",
         "DIAMOND",
-        listOf(OreBlock.DIAMOND_ORE, OreBlock.DWARVEN_DIAMOND),
+        listOf(OreBlock.DIAMOND_ORE, OreBlock.PURE_DIAMOND),
     ),
     NETHERRACK(
         "Netherrack",

From c4e2893426a3e4ebe94d26199d1e23935fed9d73 Mon Sep 17 00:00:00 2001
From: Luna <luna@alexia.lol>
Date: Fri, 23 Aug 2024 11:09:38 +0200
Subject: [PATCH 289/721] Fix: Derpy Perk Name (#2393)

---
 src/main/java/at/hannibal2/skyhanni/data/Mayors.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 53ebae1dd534..2215f620cc69 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -93,7 +93,7 @@ enum class Mayor(
         "Derpy",
         "§d",
         Perk.TURBO_MINIONS,
-        Perk.AH_TAX,
+        Perk.QUAD_TAXES,
         Perk.DOUBLE_MOBS_HP,
         Perk.MOAR_SKILLZ,
     ),
@@ -224,7 +224,7 @@ enum class Perk(val perkName: String) {
 
     // Derpy
     TURBO_MINIONS("TURBO MINIONS!!!"),
-    AH_TAX("MOAR TAX!!!"), // TODO: Change to actual perk name when known
+    QUAD_TAXES("QUAD TAXES!!!"),
     DOUBLE_MOBS_HP("DOUBLE MOBS HP!!!"),
     MOAR_SKILLZ("MOAR SKILLZ!!!"),
     ;

From 67060aeab991ebb18c3bba19adfa66c09e1acdcd Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:12:56 +0200
Subject: [PATCH 290/721] Fix: ItemCategory error spam (#2392)

---
 .../skyhanni/test/command/ErrorManager.kt       | 16 +++++++++++-----
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt    | 17 +++++++++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index fbb163caa887..df3d85267677 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -74,10 +74,12 @@ object ErrorManager {
             errorMessages[errorId]
         }
         val name = if (fullErrorMessage) "Full error" else "Error"
-        ChatUtils.chat(errorMessage?.let {
-            OSUtils.copyToClipboard(it)
-            "$name copied into the clipboard, please report it on the SkyHanni discord!"
-        } ?: "Error id not found!")
+        ChatUtils.chat(
+            errorMessage?.let {
+                OSUtils.copyToClipboard(it)
+                "$name copied into the clipboard, please report it on the SkyHanni discord!"
+            } ?: "Error id not found!",
+        )
     }
 
     fun logErrorStateWithData(
@@ -87,6 +89,7 @@ object ErrorManager {
         ignoreErrorCache: Boolean = false,
         noStackTrace: Boolean = false,
         betaOnly: Boolean = false,
+        condition: () -> Boolean = { true },
     ) {
         logError(
             IllegalStateException(internalMessage),
@@ -95,6 +98,7 @@ object ErrorManager {
             noStackTrace,
             *extraData,
             betaOnly = betaOnly,
+            condition = condition,
         )
     }
 
@@ -116,6 +120,7 @@ object ErrorManager {
         noStackTrace: Boolean,
         vararg extraData: Pair<String, Any?>,
         betaOnly: Boolean = false,
+        condition: () -> Boolean = { true },
     ) {
         if (betaOnly && !LorenzUtils.isBetaVersion()) return
         if (!ignoreErrorCache) {
@@ -125,6 +130,7 @@ object ErrorManager {
             if (pair in cache) return
             cache.add(pair)
         }
+        if (!condition()) return
 
         Error(message, throwable).printStackTrace()
         Minecraft.getMinecraft().thePlayer ?: return
@@ -152,7 +158,7 @@ object ErrorManager {
             "§c[SkyHanni-${SkyHanniMod.version}]: $message§c. Click here to copy the error into the clipboard.",
             onClick = { copyError(randomId) },
             "§eClick to copy!",
-            prefix = false
+            prefix = false,
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 09f77ebcec41..8b6203aaa534 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import com.google.common.collect.Lists
 import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import io.github.moulberry.notenoughupdates.util.NotificationHandler
@@ -179,6 +180,15 @@ object ItemUtils {
 
     fun ItemStack.getItemRarityOrCommon() = getItemRarityOrNull() ?: LorenzRarity.COMMON
 
+    private val itemCategoryRepoCheckPattern by RepoPattern.pattern(
+        "itemcategory.repocheck",
+        ItemCategory.entries.joinToString(separator = "|") { it.name },
+    )
+    private val rarityCategoryRepoCheckPattern by RepoPattern.pattern(
+        "rarity.repocheck",
+        LorenzRarity.entries.joinToString(separator = "|") { it.name },
+    )
+
     private fun ItemStack.readItemCategoryAndRarity(): Pair<LorenzRarity?, ItemCategory?> {
         val cleanName = this.cleanName()
 
@@ -204,6 +214,8 @@ object ItemUtils {
                     "inventory name" to InventoryUtils.openInventoryName(),
                     "pattern result" to category,
                     "lore" to getLore(),
+                    betaOnly = true,
+                    condition = { !itemCategoryRepoCheckPattern.matches(category) },
                 )
             }
             if (itemRarity == null) {
@@ -213,7 +225,10 @@ object ItemUtils {
                     "internal name" to getInternalName(),
                     "item name" to name,
                     "inventory name" to InventoryUtils.openInventoryName(),
+                    "pattern result" to rarity,
                     "lore" to getLore(),
+                    betaOnly = true,
+                    condition = { !rarityCategoryRepoCheckPattern.matches(rarity) },
                 )
             }
 
@@ -352,14 +367,12 @@ object ItemUtils {
             return getInternalName().itemName
         }
 
-
     fun ItemStack.getAttributeFromShard(): Pair<String, Int>? {
         if (getInternalName().asString() != "ATTRIBUTE_SHARD") return null
         val attributes = getAttributes() ?: return null
         return attributes.firstOrNull()
     }
 
-
     val ItemStack.itemNameWithoutColor: String get() = itemName.removeColor()
 
     // use when showing the item name to the user (in guis, chat message, etc.), not for comparing

From 49a7b34b2dba63ac18dc309a5d157dba07ab4133 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:14:20 +0200
Subject: [PATCH 291/721] Fix: MayorAPI not working without Ministers (#2389)

Co-authored-by: Luna <luna@alexia.lol>
---
 src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt          | 2 +-
 .../at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index 555fdb7f8ff0..af60519f693f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -218,7 +218,7 @@ object MayorAPI {
             val currentMayorName = data.mayor.name
             if (lastMayor?.name != currentMayorName) {
                 currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks)
-                currentMinister = setAssumeMayorJson(data.mayor.minister.name, listOf(data.mayor.minister.perk))
+                currentMinister = data.mayor.minister?.let { setAssumeMayorJson(it.name, listOf(it.perk)) }
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
index 912a6f8c6476..272ed5591af3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
@@ -11,7 +11,9 @@ data class MayorInfo(
     @Expose val key: String,
     @Expose val name: String,
     @Expose val perks: List<MayorPerk>,
-    @Expose val minister: Minister,
+    // Ministers won't exist,
+    // when the current mayor is a special mayor
+    @Expose val minister: Minister?,
     @Expose val election: MayorElection,
 )
 

From baf26cd154c7ed6189994352f801055b50f57137 Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Fri, 23 Aug 2024 04:29:20 -0500
Subject: [PATCH 292/721] Backend: Cleanup IslandExceptions to improve
 readability (#1560)

Co-authored-by: Thunderblade73 <85900443+thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/data/mob/IslandExceptions.kt     | 419 +++++++++---------
 1 file changed, 210 insertions(+), 209 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
index eadfe8196854..ef0f4bff916a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.data.mob
 
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.mob.MobFilter.makeMobResult
-import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.utils.EntityUtils.cleanName
 import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
@@ -37,201 +36,226 @@ object IslandExceptions {
         baseEntity: EntityLivingBase,
         armorStand: EntityArmorStand?,
         nextEntity: EntityLivingBase?,
-    ): MobData.MobResult? {
-        return if (DungeonAPI.inDungeon()) {
-            when {
-                baseEntity is EntityZombie && armorStand != null && (armorStand.name == "§e﴾ §c§lThe Watcher§r§r §e﴿" || armorStand.name == "§3§lWatchful Eye§r") -> MobData.MobResult.found(
-                    MobFactories.special(baseEntity, armorStand.cleanName(), armorStand)
-                )
+    ): MobData.MobResult? =
+        when (LorenzUtils.skyBlockIsland) {
+            IslandType.CATACOMBS -> dungeon(baseEntity, armorStand, nextEntity)
+            IslandType.PRIVATE_ISLAND -> privateIsland(armorStand, baseEntity)
+            IslandType.THE_RIFT -> theRift(baseEntity, nextEntity, armorStand)
+            IslandType.CRIMSON_ISLE -> crimsonIsle(baseEntity, armorStand, nextEntity)
+            IslandType.DEEP_CAVERNS -> deepCaverns(baseEntity)
+            IslandType.DWARVEN_MINES -> dwarvenMines(baseEntity)
+            IslandType.CRYSTAL_HOLLOWS -> crystalHollows(baseEntity, armorStand)
+            IslandType.HUB -> hub(baseEntity, armorStand, nextEntity)
+            IslandType.GARDEN -> garden(baseEntity)
+            IslandType.KUUDRA_ARENA -> kuudraArena(baseEntity, nextEntity)
+            IslandType.WINTER -> winterIsland(baseEntity)
 
-                baseEntity is EntityCaveSpider -> MobUtils.getClosedArmorStand(baseEntity, 2.0).takeNonDefault()
-                    .makeMobResult { MobFactories.dungeon(baseEntity, it) }
+            else -> null
+        }
 
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Shadow Assassin" -> MobUtils.getClosedArmorStandWithName(
-                    baseEntity,
-                    3.0,
-                    "Shadow Assassin"
-                ).makeMobResult { MobFactories.dungeon(baseEntity, it) }
+    private fun dungeon(
+        baseEntity: EntityLivingBase,
+        armorStand: EntityArmorStand?,
+        nextEntity: EntityLivingBase?,
+    ) = when {
+        baseEntity is EntityZombie && armorStand != null &&
+            (armorStand.name == "§e﴾ §c§lThe Watcher§r§r §e﴿" || armorStand.name == "§3§lWatchful Eye§r") ->
+            MobData.MobResult.found(
+                MobFactories.special(baseEntity, armorStand.cleanName(), armorStand),
+            )
 
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "The Professor" -> MobUtils.getArmorStand(
-                    baseEntity,
-                    9
-                ).makeMobResult { MobFactories.boss(baseEntity, it) }
-
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && (nextEntity is EntityGiantZombie || nextEntity == null) && baseEntity.name.contains(
-                    "Livid"
-                ) -> MobUtils.getClosedArmorStandWithName(baseEntity, 6.0, "﴾ Livid")
-                    .makeMobResult { MobFactories.boss(baseEntity, it, overriddenName = "Real Livid") }
-
-                baseEntity is EntityIronGolem && MobFilter.wokeSleepingGolemPattern.matches(
-                    armorStand?.name ?: ""
-                ) -> MobData.MobResult.found(
-                    Mob(
-                        baseEntity,
-                        Mob.Type.DUNGEON,
-                        armorStand,
-                        "Sleeping Golem"
-                    )
-                ) // Consistency fix
-                else -> null
-            }
-        } else when (LorenzUtils.skyBlockIsland) {
-            IslandType.PRIVATE_ISLAND -> when {
-                armorStand?.isDefaultValue() != false -> if (baseEntity.getLorenzVec()
-                        .distanceChebyshevIgnoreY(LocationUtils.playerLocation()) < 15.0
-                ) MobData.MobResult.found(MobFactories.minionMob(baseEntity)) else MobData.MobResult.notYetFound // TODO fix to always include Valid Mobs on Private Island
-                else -> null
-            }
-
-            IslandType.THE_RIFT -> when {
-                baseEntity is EntitySlime && nextEntity is EntitySlime -> MobData.MobResult.illegal// Bacte Tentacle
-                baseEntity is EntitySlime && armorStand != null && armorStand.cleanName()
-                    .startsWith("﴾ [Lv10] B") -> MobData.MobResult.found(
-                    Mob(
-                        baseEntity,
-                        Mob.Type.BOSS,
-                        armorStand,
-                        name = "Bacte"
-                    )
-                )
-
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Branchstrutter " -> MobData.MobResult.found(
-                    Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Branchstrutter")
-                )
-
-                else -> null
-            }
-
-            IslandType.CRIMSON_ISLE -> when {
-                baseEntity is EntitySlime && armorStand?.name == "§f§lCOLLECT!" -> MobData.MobResult.found(
-                    MobFactories.special(
-                        baseEntity,
-                        "Heavy Pearl"
-                    )
-                )
-
-                baseEntity is EntityPig && nextEntity is EntityPig -> MobData.MobResult.illegal // Matriarch Tongue
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "BarbarianGuard " -> MobData.MobResult.found(
-                    Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Barbarian Guard")
-                )
-
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "MageGuard " -> MobData.MobResult.found(
-                    Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Mage Guard")
-                )
-
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Mage Outlaw" -> MobData.MobResult.found(
-                    Mob(baseEntity, Mob.Type.BOSS, armorStand, name = "Mage Outlaw")
-                ) // fix for wierd name
-                baseEntity is EntityPigZombie && baseEntity.inventory?.get(4)
-                    ?.getSkullTexture() == MobFilter.NPC_TURD_SKULL -> MobData.MobResult.found(
-                    Mob(
-                        baseEntity,
-                        Mob.Type.DISPLAY_NPC,
-                        name = "Turd"
-                    )
-                )
-
-                baseEntity is EntityOcelot -> if (MobFilter.createDisplayNPC(baseEntity)) MobData.MobResult.illegal else MobData.MobResult.notYetFound // Maybe a problem in the future
-                else -> null
-            }
-
-            IslandType.DEEP_CAVERNS -> when {
-                baseEntity is EntityCreeper && baseEntity.baseMaxHealth.derpy() == 120 -> MobData.MobResult.found(
-                    Mob(
-                        baseEntity,
-                        Mob.Type.BASIC,
-                        name = "Sneaky Creeper",
-                        levelOrTier = 3
-                    )
-                )
-
-                else -> null
-            }
-
-            IslandType.DWARVEN_MINES -> when {
-                baseEntity is EntityCreeper && baseEntity.baseMaxHealth.derpy() == 1_000_000 -> MobData.MobResult.found(
-                    MobFactories.basic(baseEntity, "Ghost")
-                )
-
-                else -> null
-            }
-
-            IslandType.CRYSTAL_HOLLOWS -> when {
-                baseEntity is EntityMagmaCube && armorStand != null && armorStand.cleanName() == "[Lv100] Bal ???❤" -> MobData.MobResult.found(
-                    Mob(baseEntity, Mob.Type.BOSS, armorStand, "Bal", levelOrTier = 100)
-                )
-
-                else -> null
-            }
-
-            IslandType.HUB -> when {
-                baseEntity is EntityOcelot && armorStand?.isDefaultValue() == false && armorStand.name.startsWith("§8[§7Lv155§8] §cAzrael§r") -> MobUtils.getArmorStand(
-                    baseEntity,
-                    1
-                ).makeMobResult { MobFactories.basic(baseEntity, it) }
+        baseEntity is EntityCaveSpider -> MobUtils.getClosedArmorStand(baseEntity, 2.0).takeNonDefault()
+            .makeMobResult { MobFactories.dungeon(baseEntity, it) }
 
-                baseEntity is EntityOcelot && (nextEntity is EntityOcelot || nextEntity == null) -> MobUtils.getArmorStand(
-                    baseEntity,
-                    3
-                ).makeMobResult { MobFactories.basic(baseEntity, it) }
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Shadow Assassin" ->
+            MobUtils.getClosedArmorStandWithName(baseEntity, 3.0, "Shadow Assassin")
+                .makeMobResult { MobFactories.dungeon(baseEntity, it) }
 
-                baseEntity is EntityOtherPlayerMP && (baseEntity.name == "Minos Champion" || baseEntity.name == "Minos Inquisitor" || baseEntity.name == "Minotaur ") && armorStand != null -> MobUtils.getArmorStand(
-                    baseEntity,
-                    2
-                ).makeMobResult { MobFactories.basic(baseEntity, it, listOf(armorStand)) }
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "The Professor" ->
+            MobUtils.getArmorStand(baseEntity, 9)
+                .makeMobResult { MobFactories.boss(baseEntity, it) }
 
-                baseEntity is EntityZombie && armorStand?.isDefaultValue() == true && MobUtils.getNextEntity(
-                    baseEntity,
-                    4
-                )?.name?.startsWith("§e") == true -> petCareHandler(baseEntity)
-
-                baseEntity is EntityZombie && armorStand != null && !armorStand.isDefaultValue() -> null // Impossible Rat
-                baseEntity is EntityZombie -> ratHandler(baseEntity, nextEntity) // Possible Rat
-                else -> null
-            }
-
-            IslandType.GARDEN -> when {
-                baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() -> MobData.MobResult.found(
-                    Mob(
-                        baseEntity,
-                        Mob.Type.DISPLAY_NPC,
-                        name = baseEntity.cleanName()
-                    )
-                )
-
-                else -> null
-            }
-
-            IslandType.KUUDRA_ARENA -> when {
-                baseEntity is EntityMagmaCube && nextEntity is EntityMagmaCube -> MobData.MobResult.illegal
-                baseEntity is EntityZombie && nextEntity is EntityZombie -> MobData.MobResult.illegal
-                baseEntity is EntityZombie && nextEntity is EntityGiantZombie -> MobData.MobResult.illegal
-                else -> null
-            }
-
-            IslandType.WINTER -> when {
-                baseEntity is EntityMagmaCube && MobFilter.jerryMagmaCubePattern.matches(
-                    MobUtils.getArmorStand(
-                        baseEntity,
-                        2
-                    )?.name
-                ) ->
-                    MobData.MobResult.found(
-                        Mob(
-                            baseEntity,
-                            Mob.Type.BOSS,
-                            MobUtils.getArmorStand(baseEntity, 2),
-                            "Jerry Magma Cube"
-                        )
-                    )
-
-                else -> null
-            }
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() &&
+            (nextEntity is EntityGiantZombie || nextEntity == null) &&
+            baseEntity.name.contains("Livid") -> MobUtils.getClosedArmorStandWithName(baseEntity, 6.0, "﴾ Livid")
+            .makeMobResult { MobFactories.boss(baseEntity, it, overriddenName = "Real Livid") }
+
+        baseEntity is EntityIronGolem && MobFilter.wokeSleepingGolemPattern.matches(armorStand?.name ?: "") ->
+            MobData.MobResult.found(Mob(baseEntity, Mob.Type.DUNGEON, armorStand, "Sleeping Golem")) // Consistency fix
+
+        else -> null
+    }
+
+    private fun privateIsland(
+        armorStand: EntityArmorStand?,
+        baseEntity: EntityLivingBase,
+    ) = when {
+        armorStand?.isDefaultValue() != false ->
+            if (baseEntity.getLorenzVec().distanceChebyshevIgnoreY(LocationUtils.playerLocation()) < 15.0) {
+                // TODO fix to always include Valid Mobs on Private Island
+                MobData.MobResult.found(MobFactories.minionMob(baseEntity))
+            } else MobData.MobResult.notYetFound
+
+        else -> null
+    }
+
+    private fun theRift(
+        baseEntity: EntityLivingBase,
+        nextEntity: EntityLivingBase?,
+        armorStand: EntityArmorStand?,
+    ) = when {
+        baseEntity is EntitySlime && nextEntity is EntitySlime -> MobData.MobResult.illegal// Bacte Tentacle
+        baseEntity is EntitySlime && armorStand != null && armorStand.cleanName().startsWith("﴾ [Lv10] B") ->
+            MobData.MobResult.found(Mob(baseEntity, Mob.Type.BOSS, armorStand, name = "Bacte"))
+
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Branchstrutter " ->
+            MobData.MobResult.found(
+                Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Branchstrutter"),
+            )
+
+        else -> null
+    }
+
+    private fun crimsonIsle(
+        baseEntity: EntityLivingBase,
+        armorStand: EntityArmorStand?,
+        nextEntity: EntityLivingBase?,
+    ) = when {
+        baseEntity is EntitySlime && armorStand?.name == "§f§lCOLLECT!" ->
+            MobData.MobResult.found(
+                MobFactories.special(baseEntity, "Heavy Pearl"),
+            )
+
+        baseEntity is EntityPig && nextEntity is EntityPig -> MobData.MobResult.illegal // Matriarch Tongue
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "BarbarianGuard " ->
+            MobData.MobResult.found(
+                Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Barbarian Guard"),
+            )
+
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "MageGuard " ->
+            MobData.MobResult.found(
+                Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Mage Guard"),
+            )
+
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Mage Outlaw" ->
+            // fix for wierd name
+            MobData.MobResult.found(Mob(baseEntity, Mob.Type.BOSS, armorStand, name = "Mage Outlaw"))
+
+        baseEntity is EntityPigZombie &&
+            baseEntity.inventory?.get(4)?.getSkullTexture() == MobFilter.NPC_TURD_SKULL ->
+            MobData.MobResult.found(Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = "Turd"))
+
+        baseEntity is EntityOcelot -> if (MobFilter.createDisplayNPC(baseEntity)) {
+            MobData.MobResult.illegal
+        } else {
+            MobData.MobResult.notYetFound // Maybe a problem in the future
+        }
+
+        else -> null
+    }
+
+    private fun deepCaverns(baseEntity: EntityLivingBase) = when {
+        baseEntity is EntityCreeper && baseEntity.baseMaxHealth.derpy() == 120 ->
+            MobData.MobResult.found(
+                Mob(baseEntity, Mob.Type.BASIC, name = "Sneaky Creeper", levelOrTier = 3),
+            )
+
+        else -> null
+    }
+
+    private fun dwarvenMines(baseEntity: EntityLivingBase) = when {
+        baseEntity is EntityCreeper && baseEntity.baseMaxHealth.derpy() == 1_000_000 ->
+            MobData.MobResult.found(MobFactories.basic(baseEntity, "Ghost"))
+
+        else -> null
+    }
+
+    private fun crystalHollows(
+        baseEntity: EntityLivingBase,
+        armorStand: EntityArmorStand?,
+    ) = when {
+        baseEntity is EntityMagmaCube && armorStand != null &&
+            armorStand.cleanName() == "[Lv100] Bal ???❤" ->
+            MobData.MobResult.found(
+                Mob(baseEntity, Mob.Type.BOSS, armorStand, "Bal", levelOrTier = 100),
+            )
+
+        else -> null
+    }
+
+    private fun hub(
+        baseEntity: EntityLivingBase,
+        armorStand: EntityArmorStand?,
+        nextEntity: EntityLivingBase?,
+    ) = when {
+        baseEntity is EntityOcelot && armorStand?.isDefaultValue() == false &&
+            armorStand.name.startsWith("§8[§7Lv155§8] §cAzrael§r") ->
+            MobUtils.getArmorStand(baseEntity, 1)
+                .makeMobResult { MobFactories.basic(baseEntity, it) }
+
+        baseEntity is EntityOcelot && (nextEntity is EntityOcelot || nextEntity == null) ->
+            MobUtils.getArmorStand(baseEntity, 3)
+                .makeMobResult { MobFactories.basic(baseEntity, it) }
+
+        baseEntity is EntityOtherPlayerMP &&
+            baseEntity.name.let { it == "Minos Champion" || it == "Minos Inquisitor" || it == "Minotaur " } &&
+            armorStand != null ->
+            MobUtils.getArmorStand(baseEntity, 2)
+                .makeMobResult { MobFactories.basic(baseEntity, it, listOf(armorStand)) }
+
+        baseEntity is EntityZombie && armorStand?.isDefaultValue() == true &&
+            MobUtils.getNextEntity(baseEntity, 4)?.name?.startsWith("§e") == true ->
+            petCareHandler(baseEntity)
+
+        baseEntity is EntityZombie && armorStand != null && !armorStand.isDefaultValue() -> null // Impossible Rat
+        baseEntity is EntityZombie -> ratHandler(baseEntity, nextEntity) // Possible Rat
+
+        else -> null
+    }
+
+    private fun garden(baseEntity: EntityLivingBase) = when {
+        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() ->
+            MobData.MobResult.found(Mob(baseEntity, Mob.Type.DISPLAY_NPC, name = baseEntity.cleanName()))
+
+        else -> null
+    }
+
+    private fun kuudraArena(
+        baseEntity: EntityLivingBase,
+        nextEntity: EntityLivingBase?,
+    ) = when {
+        baseEntity is EntityMagmaCube && nextEntity is EntityMagmaCube -> MobData.MobResult.illegal
+        baseEntity is EntityZombie && nextEntity is EntityZombie -> MobData.MobResult.illegal
+        baseEntity is EntityZombie && nextEntity is EntityGiantZombie -> MobData.MobResult.illegal
+
+        else -> null
+    }
+
+    private fun winterIsland(baseEntity: EntityLivingBase): MobData.MobResult? {
+        val armorStand = MobUtils.getArmorStand(baseEntity, 2)
+        return when {
+            baseEntity is EntityMagmaCube &&
+                MobFilter.jerryMagmaCubePattern.matches(armorStand?.name) ->
+                MobData.MobResult.found(Mob(baseEntity, Mob.Type.BOSS, armorStand, "Jerry Magma Cube"))
 
             else -> null
         }
     }
 
+    private const val RAT_SEARCH_START = 1
+    private const val RAT_SEARCH_UP_TO = 11
+
+    private fun ratHandler(baseEntity: EntityZombie, nextEntity: EntityLivingBase?): MobData.MobResult? =
+        generateSequence(RAT_SEARCH_START) { it + 1 }
+            .take(RAT_SEARCH_UP_TO - RAT_SEARCH_START + 1)
+            .map { i -> MobUtils.getArmorStand(baseEntity, i) }
+            .firstOrNull {
+                it != null && it.distanceTo(baseEntity) < 4.0 &&
+                    it.inventory?.get(4)?.getSkullTexture() == MobFilter.RAT_SKULL
+            }?.let {
+                MobData.MobResult.found(Mob(baseEntity, mobType = Mob.Type.BASIC, armorStand = it, name = "Rat"))
+            } ?: if (nextEntity is EntityZombie) MobData.MobResult.notYetFound else null
+
     private fun petCareHandler(baseEntity: EntityLivingBase): MobData.MobResult {
         val extraEntityList = listOf(1, 2, 3, 4).mapNotNull { MobUtils.getArmorStand(baseEntity, it) }
         if (extraEntityList.size != 4) return MobData.MobResult.notYetFound
@@ -243,32 +267,9 @@ object IslandExceptions {
                     armorStand = extraEntityList[1],
                     name = this.group("name"),
                     additionalEntities = extraEntityList,
-                    levelOrTier = this.group("level").toInt()
+                    levelOrTier = this.group("level").toInt(),
                 ),
             )
         } ?: MobData.MobResult.somethingWentWrong
     }
-
-    private const val ratSearchStart = 1
-    private const val ratSearchUpTo = 11
-
-    private fun ratHandler(baseEntity: EntityZombie, nextEntity: EntityLivingBase?): MobData.MobResult? =
-        generateSequence(ratSearchStart) { it + 1 }.take(ratSearchUpTo - ratSearchStart + 1).map { i ->
-            MobUtils.getArmorStand(
-                baseEntity, i
-            )
-        }.firstOrNull {
-            it != null && it.distanceTo(baseEntity) < 4.0 && it.inventory?.get(4)
-                ?.getSkullTexture() == MobFilter.RAT_SKULL
-        }?.let {
-            MobData.MobResult.found(
-                Mob(
-                    baseEntity = baseEntity,
-                    mobType = Mob.Type.BASIC,
-                    armorStand = it,
-                    name = "Rat"
-                )
-            )
-        }
-            ?: if (nextEntity is EntityZombie) MobData.MobResult.notYetFound else null
 }

From 99fca44331c5e45ca5795bbe75f5ad1a6bfc3372 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 23 Aug 2024 13:58:21 +0200
Subject: [PATCH 293/721] Improvement: /warp stonks (#2399)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/event/diana/IgnoredWarpsConfig.java      | 5 +++++
 .../skyhanni/features/event/diana/BurrowWarpHelper.kt        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/IgnoredWarpsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/IgnoredWarpsConfig.java
index 8b6edcb9aa66..f33820772afa 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/IgnoredWarpsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/IgnoredWarpsConfig.java
@@ -16,4 +16,9 @@ public class IgnoredWarpsConfig {
     @ConfigEditorBoolean
     public boolean wizard = false;
 
+    @Expose
+    @ConfigOption(name = "Stonks", desc = "Ignore the Stonks warp point (because it is new).")
+    @ConfigEditorBoolean
+    public boolean stonks = false;
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index bf362d918672..34dab01e6ce1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -137,6 +137,7 @@ object BurrowWarpHelper {
         DA("Dark Auction", LorenzVec(91, 74, 173), 2),
         MUSEUM("Museum", LorenzVec(-75, 76, 81), 2),
         WIZARD("Wizard", LorenzVec(42.5, 122.0, 69.0), 5, { config.ignoredWarps.wizard }),
+        STONKS("Stonks", LorenzVec(-52.5, 70.0, -49.5), 5, { config.ignoredWarps.stonks }),
         ;
 
         fun distance(other: LorenzVec): Double = other.distance(location) + extraBlocks

From 4b21b3f78f11906c5112ba3bed94aeffa129569a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:03:14 +0200
Subject: [PATCH 294/721] Version 0.27 Beta 1

---
 docs/CHANGELOG.md                             | 54 +++++++++++++++++++
 docs/FEATURES.md                              |  2 +
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8fd574eaa028..9c9de659b735 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,59 @@
 # SkyHanni - Change Log
 
+## Version 0.27 (in Beta)
+
+### New Features
+
+#### Scoreboard Features
+
++ Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
+    + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
+
+### Improvements
+
+#### Diana Improvements
+
++ Added /warp stonks to the Burrow Warp Helper. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2399)
+
+#### Scoreboard Improvements
+
++ Added an option to display the SkyBlock time in 24-hour format in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Added an option to hide coins earned/lost in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Added margin customization to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Added an opacity slider for the Custom Background Image in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
+
+### Fixes
+
+#### DIana Fixes
+
++ Added a chat option to disable a Patcher setting that breaks SkyHanni's line from the center of the player to something else. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2387)
+    + E.g. Diana guesses, Slayer Mini Bosses, etc.
+
+#### Inventory Fixes
+
++ Fixed ItemCategory errors being sent even though we already have a fix. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2392)
++ Fixed AH item movements being detected by Item Trackers as new drops. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2380)
+
+#### Mining Fixes
+
++ Added new Pure Ores support. - Empa (https://github.com/hannibal002/SkyHanni/pull/2388)
++ Fixed a typo in corpse detection. - Maratons4 (https://github.com/hannibal002/SkyHanni/pull/2386)
+
+#### Scoreboard Fixes
+
++ Fixed a Scoreboard Error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2382)
++ Fixed Custom Scoreboard Background position being updated 1 frame after the scoreboard text. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
+
+#### Misc Fixes
+
++ Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
++ Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
+
+### Technical Details
+
++ Cleaned up IslandExceptions to improve readability. - walker (https://github.com/hannibal002/SkyHanni/pull/1560)
++ Added drawInsideRoundedRectOutline, drawInsideImage, and image Renderables. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
+
 ## Version 0.26
 
 ### New Features
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 20c80538f482..cbfba9cc2f86 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -1230,6 +1230,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + A ton of settings.
     + Added Chunked Stats as a draggable list to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1341)
         + Select and prioritize the order of the stats you want to see.
+    + Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
+      + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
 + No Bits Available Warning. - Empa (https://github.com/hannibal002/SkyHanni/pull/1286)
     + Warns when you run out of available bits to generate.
 + Link from HUD elements to config options. - nea (https://github.com/hannibal002/SkyHanni/pull/1383)
diff --git a/root.gradle.kts b/root.gradle.kts
index f069d37c920f..2794893dff71 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.26"
+    version = "0.27.Beta.1"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 5a3bc7822131..7fd62c9848b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.26",
+    version = "0.27.Beta.1",
 )
 class SkyHanniMod {
 

From aa48336b2f4fa8c5bdc1fbabd6e144c475013198 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:02:10 +0200
Subject: [PATCH 295/721] Backend: Version to download source checker (#2400)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/tweaker/DownloadSourceChecker.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
index 3f4755be3e7d..5fb46592eab4 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
@@ -1,5 +1,7 @@
 package at.hannibal2.skyhanni.tweaker;
 
+import at.hannibal2.skyhanni.SkyHanniMod;
+
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -94,10 +96,11 @@ private static void openMenu(URI host) {
             }
         ));
 
+        String version = SkyHanniMod.Companion.getVersion();
         JOptionPane.showOptionDialog(
             frame,
             String.format(String.join("\n", SECURITY_POPUP), uriToSimpleString(host)),
-            "SkyHanni Security Error",
+            "SkyHanni " + version + " Security Error",
             JOptionPane.DEFAULT_OPTION,
             JOptionPane.ERROR_MESSAGE,
             null,
@@ -135,7 +138,7 @@ private static URI getDangerousHost() {
     private static URI getHost(File file) throws Exception {
         final File adsFile = new File(file.getAbsolutePath() + ":Zone.Identifier:$DATA");
         String host = null;
-        try(BufferedReader reader = new BufferedReader(new FileReader(adsFile))) {
+        try (BufferedReader reader = new BufferedReader(new FileReader(adsFile))) {
             String line = reader.readLine();
             while (line != null) {
                 if (line.startsWith("HostUrl=")) {

From 44d5f286982bfc1640a57ae5801402bd5f26c843 Mon Sep 17 00:00:00 2001
From: Azure <hello@azu.cool>
Date: Sun, 25 Aug 2024 17:49:19 -0400
Subject: [PATCH 296/721] Improvement: Make line width for 'Line to Arachne' &
 'Line to Miniboss' configurable (#2406)

---
 .../skyhanni/config/features/combat/MobsConfig.java         | 6 ++++++
 .../skyhanni/config/features/slayer/SlayerConfig.java       | 6 ++++++
 .../hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt | 2 +-
 .../skyhanni/features/slayer/SlayerMiniBossFeatures.kt      | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
index 0d9c2f6944f5..f51076360dc2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class MobsConfig {
@@ -63,6 +64,11 @@ public class MobsConfig {
     @FeatureToggle
     public boolean lineToArachne = false;
 
+    @Expose
+    @ConfigOption(name = "Line to Arachne Width", desc = "The width of the line pointing to where Arachne is at.")
+    @ConfigEditorSlider(minStep = 1, minValue = 1, maxValue = 10)
+    public int lineToArachneWidth = 5;
+
     @Expose
     @ConfigOption(
         name = "Area Boss Timer",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
index 74f61be7f9a9..fedace9995e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java
@@ -8,6 +8,7 @@
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.Category;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class SlayerConfig {
@@ -59,6 +60,11 @@ public class SlayerConfig {
     @FeatureToggle
     public boolean slayerMinibossLine = false;
 
+    @Expose
+    @ConfigOption(name = "Line to Miniboss Width", desc = "The width of the line pointing to every Slayer Mini-Boss around you.")
+    @ConfigEditorSlider(minStep = 1, minValue = 1, maxValue = 10)
+    public int slayerMinibossLineWidth = 3;
+
     @Expose
     @ConfigOption(name = "Hide Mob Names", desc = "Hide the name of the mobs you need to kill in order for the Slayer boss to spawn. Exclude mobs that are damaged, corrupted, runic or semi rare.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
index af439d767702..7c33afcdb653 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
@@ -125,7 +125,7 @@ object MobHighlight {
             event.exactPlayerEyeLocation(),
             arachne.getLorenzVec().add(y = 1),
             LorenzColor.RED.toColor(),
-            5,
+            config.lineToArachneWidth,
             true
         )
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
index 1fce5eed234a..0fd24e25c6d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
@@ -65,7 +65,7 @@ object SlayerMiniBossFeatures {
                 event.exactPlayerEyeLocation(),
                 mob.getLorenzVec().add(y = 1),
                 LorenzColor.AQUA.toColor(),
-                3,
+                config.slayerMinibossLineWidth,
                 true
             )
         }

From 6abfc744704810b3aaeffb70b85b79c99e2f31ec Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 25 Aug 2024 23:49:52 +0200
Subject: [PATCH 297/721] Fix: Mana Enchants in Estimated Chest Value (#2395)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/misc/items/EstimatedItemValueCalculator.kt       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 74c772824395..ffa92489cea4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -637,7 +637,9 @@ object EstimatedItemValueCalculator {
                     9 -> multiplier = 16
                     10 -> multiplier = 32
                 }
-                level = 5
+                if (multiplier > 1) {
+                    level = 5
+                }
             }
             if (internalName.startsWith("ENCHANTED_BOOK_BUNDLE_")) {
                 multiplier = EstimatedItemValue.bookBundleAmount.getOrDefault(rawName, 5)

From 90e6983f8589d6d2725dcc77bfdd13be92cfc131 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 25 Aug 2024 23:49:56 +0200
Subject: [PATCH 298/721] Fix: Christmas presents (#2396)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../event/lobby/waypoints/christmas/PresentWaypoints.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
index 64c4171a31b0..be54088714ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
@@ -37,15 +37,15 @@ object PresentWaypoints {
     private val patternGroup = RepoPattern.group("event.lobby.waypoint.presents")
     private val presentAlreadyFoundPattern by patternGroup.pattern(
         "foundalready",
-        "§cYou have already found this present!"
+        "§cYou have already found this present!",
     )
     private val presentFoundPattern by patternGroup.pattern(
         "found",
-        "§aYou found a.*present! §r§e\\(§r§b\\d+§r§e/§r§b\\d+§r§e\\)"
+        "§aYou found a.*present! §r§e\\(§r§b\\d+§r§e/§r§b\\d+§r§e\\)",
     )
     private val allFoundPattern by patternGroup.pattern(
         "foundall",
-        "§aCongratulations! You found all the presents in every lobby!"
+        "§aCongratulations! You found all the presents in every lobby!",
     )
 
     @SubscribeEvent
@@ -125,5 +125,5 @@ object PresentWaypoints {
     }
 
     private fun isEnabled(): Boolean =
-        LorenzUtils.inHypixelLobby && (config.allWaypoints || config.allEntranceWaypoints && WinterAPI.isDecember())
+        LorenzUtils.inHypixelLobby && (config.allWaypoints || config.allEntranceWaypoints) && WinterAPI.isDecember()
 }

From 17be307d56bab4f50006bb5487e4bf513ef8ee08 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 25 Aug 2024 23:50:04 +0200
Subject: [PATCH 299/721] Fix: Hoppity Requirement (#2398)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/hoppity/HoppityCollectionStats.kt     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index e9a8bb687ac0..f4d98e782893 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -134,11 +134,13 @@ object HoppityCollectionStats {
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
-        if (!isEnabled()) return
+        if (!(LorenzUtils.inSkyBlock)) return
         if (!pagePattern.matches(event.inventoryName)) return
 
         inInventory = true
-        display = buildDisplay(event)
+        if (config.hoppityCollectionStats) {
+            display = buildDisplay(event)
+        }
     }
 
     @SubscribeEvent
@@ -150,6 +152,7 @@ object HoppityCollectionStats {
     @SubscribeEvent
     fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!inInventory) return
+        if (!config.hoppityCollectionStats) return
 
         config.hoppityStatsPosition.renderRenderables(
             display,
@@ -367,8 +370,6 @@ object HoppityCollectionStats {
 
     fun hasFoundRabbit(rabbit: String): Boolean = loggedRabbits.containsKey(rabbit)
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.hoppityCollectionStats
-
     enum class RabbitCollectionRarity(
         val displayName: String,
         val item: NEUInternalName,

From 2fd9abda245a6e64e8246e498377cba9830fd62d Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 25 Aug 2024 23:56:08 +0200
Subject: [PATCH 300/721] Fix: Rounded Shaders not working with a scale less
 than 1 (#2404)

---
 src/main/resources/assets/skyhanni/shaders/rounded_rect.fsh     | 2 +-
 .../resources/assets/skyhanni/shaders/rounded_rect_outline.fsh  | 2 +-
 src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/assets/skyhanni/shaders/rounded_rect.fsh b/src/main/resources/assets/skyhanni/shaders/rounded_rect.fsh
index 0d91be0a571e..e728bf43d6a0 100644
--- a/src/main/resources/assets/skyhanni/shaders/rounded_rect.fsh
+++ b/src/main/resources/assets/skyhanni/shaders/rounded_rect.fsh
@@ -22,7 +22,7 @@ void main() {
     vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
 
     float newCenterPosY = centerPos.y;
-    if (yScale > 1.0) {
+    if (yScale != 1.0) {
         newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
     }
 
diff --git a/src/main/resources/assets/skyhanni/shaders/rounded_rect_outline.fsh b/src/main/resources/assets/skyhanni/shaders/rounded_rect_outline.fsh
index 278390056948..64c8a54d6bf6 100644
--- a/src/main/resources/assets/skyhanni/shaders/rounded_rect_outline.fsh
+++ b/src/main/resources/assets/skyhanni/shaders/rounded_rect_outline.fsh
@@ -26,7 +26,7 @@ void main() {
     vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
 
     float newCenterPosY = centerPos.y;
-    if (yScale > 1.0) {
+    if (yScale != 1.0) {
         newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
     }
 
diff --git a/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh b/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
index a38ebc4eac00..4e5c0e1eacdf 100644
--- a/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
+++ b/src/main/resources/assets/skyhanni/shaders/rounded_texture.fsh
@@ -25,7 +25,7 @@ void main() {
     vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
 
     float newCenterPosY = centerPos.y;
-    if (yScale > 1.0) {
+    if (yScale != 1.0) {
         newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
     }
 

From 6e5f9d154ed072ead75f5c44b9dd1988e94f88a6 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:00:43 +0200
Subject: [PATCH 301/721] Fix: UninitializedPropertyAccessException in
 UnknownLinesHandler (#2407)

---
 .../features/gui/customscoreboard/UnknownLinesHandler.kt   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index bbae099d6b7e..e77f670b78f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -27,7 +27,7 @@ object UnknownLinesHandler {
         /**
          * Remove known lines with patterns
          **/
-        val patternsToExclude = listOf(
+        val patternsToExclude = mutableListOf(
             PurseAPI.coinsPattern,
             SbPattern.motesPattern,
             BitsAPI.bitsScoreboardPattern,
@@ -134,9 +134,12 @@ object UnknownLinesHandler {
             SbPattern.carnivalCatchStreakPattern,
             SbPattern.carnivalAccuracyPattern,
             SbPattern.carnivalKillsPattern,
-            *remoteOnlyPatterns,
         )
 
+        if (::remoteOnlyPatterns.isInitialized) {
+            patternsToExclude.addAll(remoteOnlyPatterns)
+        }
+
         unknownLines = unknownLines.filterNot { line ->
             patternsToExclude.any { pattern -> pattern.matches(line) }
         }

From f1ad84c1976fc8f0aede4ec8c93f2ea289bffebd Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:23:44 +0200
Subject: [PATCH 302/721] Fix: Pickup Log display not expiring in guis (#2401)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/ItemPickupLog.kt       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 55473a2c601a..05aaeba80703 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -136,32 +136,32 @@ object ItemPickupLog {
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
-        if (InventoryUtils.inInventory()) return
-
         val oldItemList = mutableMapOf<Int, Pair<ItemStack, Int>>()
 
         oldItemList.putAll(itemList)
 
-        itemList.clear()
+        if (!InventoryUtils.inInventory()) {
+            itemList.clear()
 
-        val inventoryItems = InventoryUtils.getItemsInOwnInventory().toMutableList()
-        val cursorItem = Minecraft.getMinecraft().thePlayer.inventory?.itemStack
+            val inventoryItems = InventoryUtils.getItemsInOwnInventory().toMutableList()
+            val cursorItem = Minecraft.getMinecraft().thePlayer.inventory?.itemStack
 
-        if (cursorItem != null) {
-            val hash = cursorItem.hash()
-            //this prevents items inside hypixel guis counting when picked up
-            if (oldItemList.contains(hash)) {
-                inventoryItems.add(cursorItem)
+            if (cursorItem != null) {
+                val hash = cursorItem.hash()
+                //this prevents items inside hypixel guis counting when picked up
+                if (oldItemList.contains(hash)) {
+                    inventoryItems.add(cursorItem)
+                }
             }
-        }
 
-        for (itemStack in inventoryItems) {
-            val hash = itemStack.hash()
-            val old = itemList[hash]
-            if (old != null) {
-                itemList[hash] = old.copy(second = old.second + itemStack.stackSize)
-            } else {
-                itemList[hash] = itemStack to itemStack.stackSize
+            for (itemStack in inventoryItems) {
+                val hash = itemStack.hash()
+                val old = itemList[hash]
+                if (old != null) {
+                    itemList[hash] = old.copy(second = old.second + itemStack.stackSize)
+                } else {
+                    itemList[hash] = itemStack to itemStack.stackSize
+                }
             }
         }
 

From 560af1582429c4a0efd588820e9a273879b1e098 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 25 Aug 2024 18:30:44 -0400
Subject: [PATCH 303/721] Feature & Fix: No Rarity on Compacted Dupes (#2383)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/HoppityEggsConfig.java     | 25 +++++++++++++++++++
 .../event/hoppity/HoppityEggsCompactChat.kt   | 10 ++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
index 5536d56914fe..010434990085 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
@@ -155,6 +155,31 @@ public class HoppityEggsConfig {
     @FeatureToggle
     public boolean compactChat = false;
 
+    @Expose
+    @ConfigOption(name = "Compacted Rarity", desc = "Show rarity of found rabbit in Compacted chat messages.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public CompactRarityTypes rarityInCompact = CompactRarityTypes.NEW;
+
+    public enum CompactRarityTypes {
+        NONE("Neither"),
+        NEW("New Rabbits"),
+        DUPE("Duplicate Rabbits"),
+        BOTH("New & Duplicate Rabbits")
+        ;
+
+        private final String name;
+
+        CompactRarityTypes(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
     @Expose
     @ConfigOption(
         name = "Rabbit Pet Warning",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index 91316dbfcdab..35f87d7da43d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
+import at.hannibal2.skyhanni.config.features.event.HoppityEggsConfig
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
@@ -13,6 +14,8 @@ import at.hannibal2.skyhanni.utils.TimeUtils.format
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
+typealias RarityType = HoppityEggsConfig.CompactRarityTypes
+
 object HoppityEggsCompactChat {
 
     private var hoppityEggChat = mutableListOf<String>()
@@ -66,16 +69,19 @@ object HoppityEggsCompactChat {
         val mealName = lastChatMeal?.coloredName ?: ""
         val mealNameFormatted = if (rabbitBought) "§aBought Rabbit" else "$mealName Egg"
 
+        val rarityConfig = HoppityEggsManager.config.rarityInCompact
         return if (duplicate) {
             val format = lastDuplicateAmount?.shortFormat() ?: "?"
             val timeFormatted = lastDuplicateAmount?.let {
                 ChocolateFactoryAPI.timeUntilNeed(it).format(maxUnits = 2)
             } ?: "?"
 
+            val showDupeRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.DUPE }
             val timeStr = if (config.showDuplicateTime) ", §a+§b$timeFormatted§7" else ""
-            "$mealNameFormatted! §7Duplicate $lastName §7(§6+$format Chocolate§7$timeStr)"
+            "$mealNameFormatted! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName §7(§6+$format Chocolate§7$timeStr)"
         } else if (newRabbit) {
-            "$mealNameFormatted! §d§lNEW $lastRarity $lastName §7(${lastProfit}§7)"
+            val showNewRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.NEW }
+            "$mealNameFormatted! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)"
         } else "?"
     }
 

From fe0770027bd09c22c3399ee3abf02c530ebc49ec Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 26 Aug 2024 01:06:17 +0200
Subject: [PATCH 304/721] fix crash on startup

---
 .../skyhanni/config/features/event/HoppityEggsConfig.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
index 010434990085..386aa70215d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
@@ -5,6 +5,7 @@
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
@@ -157,15 +158,14 @@ public class HoppityEggsConfig {
 
     @Expose
     @ConfigOption(name = "Compacted Rarity", desc = "Show rarity of found rabbit in Compacted chat messages.")
-    @ConfigEditorBoolean
-    @FeatureToggle
+    @ConfigEditorDropdown
     public CompactRarityTypes rarityInCompact = CompactRarityTypes.NEW;
 
     public enum CompactRarityTypes {
         NONE("Neither"),
         NEW("New Rabbits"),
         DUPE("Duplicate Rabbits"),
-        BOTH("New & Duplicate Rabbits")
+        BOTH("New & Duplicate Rabbits"),
         ;
 
         private final String name;

From 290676ba3954d653bc1cbc0630d2cde90a3249f4 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:42:33 -0400
Subject: [PATCH 305/721] Feature + Fix: Hoppity Event Summarization (#2311)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           |   3 +-
 .../skyhanni/config/commands/Commands.kt      |   5 +
 .../config/features/dev/DebugConfig.java      |   5 +
 .../config/features/event/EventConfig.java    |   1 +
 .../{ => hoppity}/HoppityEggsConfig.java      |   8 +-
 .../hoppity/HoppityEventSummaryConfig.java    |  73 +++++
 .../storage/ProfileSpecificStorage.java       |  36 +++
 .../events/hoppity/RabbitFoundEvent.kt        |  14 +
 .../features/event/hoppity/HoppityAPI.kt      | 175 +++++++++++
 .../event/hoppity/HoppityEggDisplayManager.kt |   2 +-
 .../event/hoppity/HoppityEggLocator.kt        |   3 +-
 .../features/event/hoppity/HoppityEggType.kt  |  15 +-
 .../event/hoppity/HoppityEggsCompactChat.kt   |  33 ++-
 .../event/hoppity/HoppityEggsManager.kt       |  40 ++-
 .../event/hoppity/HoppityEventSummary.kt      | 277 ++++++++++++++++++
 .../features/event/hoppity/HoppityNpc.kt      |   4 +-
 .../chocolatefactory/ChocolateFactoryAPI.kt   |   3 -
 .../ChocolateFactoryBarnManager.kt            |   4 +-
 .../ChocolateFactoryStrayTracker.kt           |  12 +-
 .../hannibal2/skyhanni/utils/LorenzRarity.kt  |   7 +-
 .../hannibal2/skyhanni/utils/SkyBlockTime.kt  |   8 +-
 21 files changed, 689 insertions(+), 39 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/config/features/event/{ => hoppity}/HoppityEggsConfig.java (96%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/hoppity/RabbitFoundEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index b166e60d38fd..db27217cfba0 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -100,6 +100,7 @@
       <w>hideparticles</w>
       <w>hoppity</w>
       <w>hoppity's</w>
+      <w>hoppitys</w>
       <w>horsezooka</w>
       <w>hotbar</w>
       <w>hotm</w>
@@ -274,4 +275,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
+</component>
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 89d7bb9bbeda..50accf32cac9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -30,6 +30,7 @@ import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggLocations
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker
 import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker
 import at.hannibal2.skyhanni.features.fishing.tracker.SeaCreatureTracker
@@ -337,6 +338,10 @@ object Commands {
             "shtpinfested",
             "Teleports you to the nearest infested plot",
         ) { PestFinder.teleportNearestInfestedPlot() }
+        registerCommand(
+            "shhoppitystats",
+            "Look up stats for a Hoppity's Event (by SkyBlock year).\nRun standalone for a list of years that have stats."
+        ) { HoppityEventSummary.sendStatsMessage(it) }
     }
 
     private fun usersBugFix() {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
index d6a0eb0645eb..56a17dfb921b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
@@ -157,6 +157,11 @@ public class DebugConfig {
     @ConfigEditorBoolean
     public boolean neverFunnyTime = false;
 
+    @Expose
+    @ConfigOption(name = "Always Hoppity's", desc = "Always act as if Hoppity's Hunt is active.")
+    @ConfigEditorBoolean
+    public boolean alwaysHoppitys = false;
+
     // Does not have a config element!
     @Expose
     public Position trackSoundPosition = new Position(0, 0);
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
index 251ce51ba807..57d3e0699a30 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
@@ -2,6 +2,7 @@
 
 import at.hannibal2.skyhanni.config.features.event.bingo.BingoConfig;
 import at.hannibal2.skyhanni.config.features.event.diana.DianaConfig;
+import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEggsConfig;
 import at.hannibal2.skyhanni.config.features.event.waypoints.LobbyWaypointsConfig;
 import at.hannibal2.skyhanni.config.features.event.winter.WinterConfig;
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
similarity index 96%
rename from src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
rename to src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
index 386aa70215d4..50a5731a5571 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
@@ -1,8 +1,9 @@
-package at.hannibal2.skyhanni.config.features.event;
+package at.hannibal2.skyhanni.config.features.event.hoppity;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
@@ -13,6 +14,11 @@
 
 public class HoppityEggsConfig {
 
+    @Expose
+    @ConfigOption(name = "Event Summary", desc = "")
+    @Accordion
+    public HoppityEventSummaryConfig eventSummary = new HoppityEventSummaryConfig();
+
     @Expose
     @ConfigOption(name = "Hoppity Waypoints", desc = "Toggle guess waypoints for Hoppity's Hunt.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryConfig.java
new file mode 100644
index 000000000000..618b15f7fc41
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEventSummaryConfig.java
@@ -0,0 +1,73 @@
+package at.hannibal2.skyhanni.config.features.event.hoppity;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class HoppityEventSummaryConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Show a summary of your Hoppity Hunt stats when the event is over.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(
+        name = "Viewing Stats",
+        desc = "View current and past event stats at any time using §b/shhoppitystats§7."
+    )
+    @ConfigEditorInfoText
+    public String commandInfo;
+
+    @Expose
+    @ConfigOption(
+        name = "Stats List",
+        desc = "Drag text to change what displays in the summary card."
+    )
+    @ConfigEditorDraggableList
+    public List<HoppityStat> statDisplayList = new ArrayList<>(Arrays.asList(
+        HoppityStat.MEAL_EGGS_FOUND,
+        HoppityStat.HOPPITY_RABBITS_BOUGHT,
+        HoppityStat.SIDE_DISH_EGGS,
+        HoppityStat.MILESTONE_RABBITS,
+        HoppityStat.EMPTY_1,
+        HoppityStat.NEW_RABBITS,
+        HoppityStat.EMPTY_2,
+        HoppityStat.DUPLICATE_RABBITS
+    ));
+
+    public enum HoppityStat {
+        MEAL_EGGS_FOUND("§7You found §b45§7/§a47 §6Chocolate Meal Eggs§7."),
+        HOPPITY_RABBITS_BOUGHT("§7You bought §b7 §fRabbits §7from §aHoppity§7."),
+        SIDE_DISH_EGGS("§7You found §b4 §6§lSide Dish §r§6Eggs §7in the §6Chocolate Factory§7."),
+        MILESTONE_RABBITS("§7You claimed §b2 §6§lMilestone Rabbits§7."),
+        EMPTY_1(""),
+        NEW_RABBITS("§7Unique Rabbits: §b7\n §f1 §7- §a1 §7- §91 §7- §51 §7- §61 §7- §d1 §7- §b1"),
+        EMPTY_2(""),
+        DUPLICATE_RABBITS("§7Duplicate Rabbits: §c10\n §f4 §7- §a3 §7- §92 §7- §51 §7- §60 §7- §d0 §7- §b0\n §6+250,000,000 Chocolate"),
+        EMPTY_3(""),
+        STRAY_RABBITS("§7Stray Rabbits: §f20\n §f10 §7- §a6 §7- §93 §7- §51 §7- §60 §7- §d0 §7- §b0\n §6+8,000,000 Chocolate\n  §c* §c§oRequires Stray Tracker being enabled to work."),
+        EMPTY_4(""),
+        TIME_IN_CF("§7You spent §b4h 36m §7in the §6Chocolate Factory§7."),
+        ;
+
+        private final String display;
+
+        HoppityStat(String display) {
+            this.display = display;
+        }
+
+        @Override
+        public String toString() {
+            return display;
+        }
+    }
+}
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 39ce4402b1a1..51be4daf1dd6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -13,6 +13,7 @@
 import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker;
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker;
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats;
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType;
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker;
 import at.hannibal2.skyhanni.features.fame.UpgradeReminder;
 import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker;
@@ -39,6 +40,7 @@
 import at.hannibal2.skyhanni.features.skillprogress.SkillType;
 import at.hannibal2.skyhanni.features.slayer.SlayerProfitTracker;
 import at.hannibal2.skyhanni.utils.GenericWrapper;
+import at.hannibal2.skyhanni.utils.LorenzRarity;
 import at.hannibal2.skyhanni.utils.LorenzVec;
 import at.hannibal2.skyhanni.utils.NEUInternalName;
 import at.hannibal2.skyhanni.utils.SimpleTimeMark;
@@ -666,4 +668,38 @@ public static class WardrobeStorage {
 
     @Expose
     public UpgradeReminder.CommunityShopUpgrade communityShopProfileUpgrade = null;
+
+    @Expose
+    public Map<Integer, HoppityEventStats> hoppityEventStats = new HashMap<>();
+
+    public static class HoppityEventStats {
+        @Expose
+        public Map<HoppityEggType, Integer> mealsFound = new HashMap<>();
+
+        @Expose
+        public Map<LorenzRarity, RabbitData> rabbitsFound = new HashMap<>();
+
+        public static class RabbitData {
+            @Expose
+            public int uniques = 0;
+
+            @Expose
+            public int dupes = 0;
+
+            @Expose
+            public int strays = 0;
+        }
+
+        @Expose
+        public long dupeChocolateGained = 0;
+
+        @Expose
+        public long strayChocolateGained = 0;
+
+        @Expose
+        public long millisInCf = 0;
+
+        @Expose
+        public boolean summarized = false;
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/hoppity/RabbitFoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/hoppity/RabbitFoundEvent.kt
new file mode 100644
index 000000000000..865f5a69047d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/hoppity/RabbitFoundEvent.kt
@@ -0,0 +1,14 @@
+package at.hannibal2.skyhanni.events.hoppity
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType
+
+class RabbitFoundEvent(
+    val eggType: HoppityEggType,
+    val duplicate: Boolean,
+    val rabbitName: String,
+    val chocGained: Long = 0,
+) : SkyHanniEvent() {
+    override fun toString(): String =
+        "§fType§7: ${eggType.coloredName}\n§fDuplicate§7: §b$duplicate\n§fRabbit§7: $rabbitName\n§fChoc Gained§7: §6$chocGained"
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
new file mode 100644
index 000000000000..5c63fe3a800a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -0,0 +1,175 @@
+package at.hannibal2.skyhanni.features.event.hoppity
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzRarity.DIVINE
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.SkyblockSeason
+import net.minecraft.util.ChatComponentText
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object HoppityAPI {
+
+    private var hoppityEggChat = mutableListOf<String>()
+    private var duplicate = false
+    private var lastRarity = ""
+    private var lastName = ""
+    private var newRabbit = false
+    private var lastChatMeal: HoppityEggType? = null
+    private var lastDuplicateAmount: Long? = null
+    private var rabbitBought = false
+
+    val hoppityRarities by lazy { LorenzRarity.entries.filter { it <= DIVINE } }
+
+    private fun resetChatData() {
+        this.hoppityEggChat = mutableListOf()
+        this.duplicate = false
+        this.newRabbit = false
+        this.lastRarity = ""
+        this.lastName = ""
+        this.lastChatMeal = null
+        this.lastDuplicateAmount = null
+        this.rabbitBought = false
+    }
+
+    fun isHoppityEvent() = (SkyblockSeason.currentSeason == SkyblockSeason.SPRING || SkyHanniMod.feature.dev.debug.alwaysHoppitys)
+
+    fun rarityByRabbit(rabbit: String): LorenzRarity? = hoppityRarities.firstOrNull { it.chatColorCode == rabbit.substring(0, 2) }
+
+    /**
+     * REGEX-TEST: §f1st Chocolate Milestone
+     * REGEX-TEST: §915th Chocolate Milestone
+     * REGEX-TEST: §622nd Chocolate Milestone
+     */
+    private val milestoneNamePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "rabbit.milestone",
+        "(?:§.)*?(?<milestone>\\d{1,2})[a-z]{2} Chocolate Milestone",
+    )
+
+    /**
+     * REGEX-TEST: §7Reach §6300B Chocolate §7all-time to
+     * REGEX-TEST: §7Reach §61k Chocolate §7all-time to unlock
+     */
+    private val allTimeLorePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "milestone.alltime",
+        "§7Reach §6(?<amount>[\\d.MBk]*) Chocolate §7all-time.*",
+    )
+
+    /**
+     * REGEX-TEST: §7Spend §6150B Chocolate §7in the
+     * REGEX-TEST: §7Spend §62M Chocolate §7in the §6Chocolate
+     */
+    private val shopLorePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "milestone.shop",
+        "§7Spend §6(?<amount>[\\d.MBk]*) Chocolate §7in.*",
+    )
+
+    fun fireSideDishMessage() {
+        LorenzChatEvent(
+            "§d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!",
+            ChatComponentText(""),
+        ).postAndCatch()
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        val index = event.slot?.slotIndex ?: return
+        if (index == -999) return
+
+        val clickedStack = InventoryUtils.getItemsInOpenChest()
+            .find { it.slotNumber == event.slot.slotNumber && it.hasStack }
+            ?.stack ?: return
+        val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
+
+        milestoneNamePattern.matchMatcher(nameText) {
+            val itemLore = clickedStack.getLore()
+            if (!itemLore.any { it == "§eClick to claim!" }) return
+
+            // Will never match both all time and shop patterns together
+            allTimeLorePattern.firstMatcher(clickedStack.getLore()) {
+                LorenzChatEvent(
+                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lChocolate Milestone Rabbit §r§din the Chocolate Factory§r§d!",
+                    ChatComponentText(""),
+                ).postAndCatch()
+            }
+
+            shopLorePattern.firstMatcher(clickedStack.getLore()) {
+                LorenzChatEvent(
+                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lShop Milestone Rabbit §r§din the Chocolate Factory§r§d!",
+                    ChatComponentText(""),
+                ).postAndCatch()
+            }
+        }
+    }
+
+    // Dumbed down version of the Compact Chat for Hoppity's,
+    // with the additional native context of side dishes
+    fun handleChat(event: LorenzChatEvent) {
+        HoppityEggsManager.eggFoundPatterns.forEach {
+            it.matchMatcher(event.message) {
+                resetChatData()
+                lastChatMeal = getEggType(event)
+                attemptFire(event)
+            }
+        }
+
+        HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
+            if (group("rabbitname").equals(lastName)) {
+                rabbitBought = true
+                lastChatMeal = HoppityEggType.BOUGHT
+                attemptFire(event)
+            }
+        }
+
+        HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
+            // The only cases where "You found ..." will come in with more than 1 message,
+            // or empty for hoppityEggChat, is where the rabbit was purchased from hoppity,
+            // In the case of buying, we want to reset variables to a clean state during this capture,
+            // as the important capture for the purchased message is the final message in
+            // the chain; "You found [rabbit]" -> "Dupe/New Rabbit" -> "You bought [rabbit]"
+            if ((hoppityEggChat.isEmpty() || hoppityEggChat.size > 1)) {
+                resetChatData()
+            }
+
+            lastName = group("name")
+            lastRarity = group("rarity")
+            attemptFire(event)
+        }
+
+        HoppityEggsManager.newRabbitFound.matchMatcher(event.message) {
+            newRabbit = true
+            groupOrNull("other")?.let {
+                attemptFire(event)
+                return
+            }
+            attemptFire(event)
+        }
+    }
+
+    fun attemptFire(event: LorenzChatEvent, lastDuplicateAmount: Long? = null) {
+        lastDuplicateAmount?.let {
+            this.lastDuplicateAmount = it
+        }
+        hoppityEggChat.add(event.message)
+        if (lastDuplicateAmount != null) {
+            this.duplicate = true
+        }
+        val lastChatMeal = lastChatMeal ?: return
+        if (hoppityEggChat.size == 3) {
+            RabbitFoundEvent(lastChatMeal, duplicate, lastName, lastDuplicateAmount ?: 0).post()
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
index f09aa4eac5da..fe908e58f62d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggDisplayManager.kt
@@ -76,7 +76,7 @@ object HoppityEggDisplayManager {
         if (ReminderUtils.isBusy() && !config.showWhileBusy) return emptyList()
 
         val displayList =
-            HoppityEggType.entries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
+            HoppityEggType.resettingEntries.map { "§7 - ${it.formattedName} ${it.timeUntil().format()}" }.toMutableList()
         displayList.add(0, "§bUnclaimed Eggs:")
 
         if (config.showCollectedLocationCount && LorenzUtils.inSkyBlock) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index dcf56aac6bbf..d15d43d8109e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -9,7 +9,6 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.garden.GardenAPI
-import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -278,7 +277,7 @@ object HoppityEggLocator {
         type == EnumParticleTypes.ENCHANTMENT_TABLE && speed == -2.0f && count == 10
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.waypoints && !GardenAPI.inGarden() &&
-        !ReminderUtils.isBusy(true) && ChocolateFactoryAPI.isHoppityEvent()
+        !ReminderUtils.isBusy(true) && HoppityAPI.isHoppityEvent()
 
     private val ItemStack.isLocatorItem get() = getInternalName() == locatorItem
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
index 2846262e6153..23e00cf88cdb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
@@ -14,9 +14,14 @@ enum class HoppityEggType(
     BREAKFAST("Breakfast", "§6", 7),
     LUNCH("Lunch", "§9", 14),
     DINNER("Dinner", "§a", 21),
+    SIDE_DISH("Side Dish", "§6§l", -1),
+    BOUGHT("Bought", "§a", -1),
+    CHOCOLATE_SHOP_MILESTONE("Shop Milestone", "§6", -1),
+    CHOCOLATE_FACTORY_MILESTONE("Chocolate Milestone", "§6", -1)
     ;
 
     fun timeUntil(): Duration {
+        if (resetsAt == -1) return Duration.INFINITE
         val now = SkyBlockTime.now()
         if (now.hour >= resetsAt) {
             return now.copy(day = now.day + 1, hour = resetsAt, minute = 0, second = 0)
@@ -38,7 +43,9 @@ enum class HoppityEggType(
     val coloredName get() = "$mealColor$mealName"
 
     companion object {
-        fun allFound() = entries.forEach { it.markClaimed() }
+        val resettingEntries = entries.filter { it.resetsAt != -1 }
+
+        fun allFound() = resettingEntries.forEach { it.markClaimed() }
 
         fun getMealByName(mealName: String) = entries.find { it.mealName == mealName }
 
@@ -47,7 +54,7 @@ enum class HoppityEggType(
             val currentSbDay = currentSbTime.day
             val currentSbHour = currentSbTime.hour
 
-            for (eggType in entries) {
+            for (eggType in resettingEntries) {
                 if (currentSbHour < eggType.resetsAt || eggType.lastResetDay == currentSbDay) continue
                 eggType.markSpawned()
                 eggType.lastResetDay = currentSbDay
@@ -60,11 +67,11 @@ enum class HoppityEggType(
         }
 
         fun eggsRemaining(): Boolean {
-            return entries.any { !it.claimed }
+            return resettingEntries.any { !it.claimed }
         }
 
         fun allEggsRemaining(): Boolean {
-            return entries.all { !it.claimed }
+            return resettingEntries.all { !it.claimed }
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index 35f87d7da43d..6bc1c8dfc276 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -1,7 +1,11 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
-import at.hannibal2.skyhanni.config.features.event.HoppityEggsConfig
+import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEggsConfig
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPatterns
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -67,7 +71,10 @@ object HoppityEggsCompactChat {
 
     private fun createCompactMessage(): String {
         val mealName = lastChatMeal?.coloredName ?: ""
-        val mealNameFormatted = if (rabbitBought) "§aBought Rabbit" else "$mealName Egg"
+        val mealNameFormatted = if (rabbitBought) "§aBought Rabbit"
+        else if (lastChatMeal == SIDE_DISH) "§6§lSide Dish §r§6Egg"
+        else if (lastChatMeal == CHOCOLATE_SHOP_MILESTONE || lastChatMeal == CHOCOLATE_FACTORY_MILESTONE) "§6§lMilestone Rabbit"
+        else "$mealName Egg"
 
         val rarityConfig = HoppityEggsManager.config.rarityInCompact
         return if (duplicate) {
@@ -86,10 +93,12 @@ object HoppityEggsCompactChat {
     }
 
     fun handleChat(event: LorenzChatEvent) {
-        HoppityEggsManager.eggFoundPattern.matchMatcher(event.message) {
-            resetCompactData()
-            lastChatMeal = getEggType(event)
-            compactChat(event)
+        eggFoundPatterns.forEach {
+            it.matchMatcher(event.message) {
+                resetCompactData()
+                lastChatMeal = getEggType(event)
+                compactChat(event)
+            }
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
@@ -100,12 +109,12 @@ object HoppityEggsCompactChat {
         }
 
         HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
-            // The only case where "You found ..." will come in with more than 1 message,
-            // or empty for hoppityEggChat, is where the rabbit was purchased from hoppity
-            // in this case, we want to reset variables to a clean state during this capture,
+            // The only cases where "You found ..." will come in with more than 1 message,
+            // or empty for hoppityEggChat, is where the rabbit was purchased from hoppity,
+            // In the case of buying, we want to reset variables to a clean state during this capture,
             // as the important capture for the purchased message is the final message in
             // the chain; "You found [rabbit]" -> "Dupe/New Rabbit" -> "You bought [rabbit]"
-            if (hoppityEggChat.isEmpty() || hoppityEggChat.size > 1) {
+            if ((hoppityEggChat.isEmpty() || hoppityEggChat.size > 1)) {
                 resetCompactData()
             }
 
@@ -130,7 +139,9 @@ object HoppityEggsCompactChat {
         }
     }
 
-    fun clickableCompact(onClick: () -> Unit): Boolean = if (hoppityEggChat.isNotEmpty()) {
+    fun clickableCompact(onClick: () -> Unit): Boolean = if (hoppityEggChat.isNotEmpty() && !rabbitBought && lastChatMeal != null &&
+        HoppityEggType.resettingEntries.contains(lastChatMeal)
+    ) {
         val hover = hoppityEggChat.joinToString("\n") + " \n§eClick here to share the location of this chocolate egg with the server!"
         hoppityEggChat.clear()
         ChatUtils.clickableChat(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 93ae797e7581..fcf4b17f00b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
+import java.util.regex.Pattern
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
@@ -37,12 +38,36 @@ object HoppityEggsManager {
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§9Chocolate Lunch Egg §r§don a ledge next to the stairs up§r§d!
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§aChocolate Dinner Egg §r§dbehind Emissary Sisko§r§d!
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§9Chocolate Lunch Egg §r§dnear the Diamond Essence Shop§r§d!
+     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!
      */
-    val eggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
+    private val eggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.found",
         "§d§lHOPPITY'S HUNT §r§dYou found a §r§.Chocolate (?<meal>\\w+) Egg §r§d(?<note>.*)§r§d!",
     )
 
+    /**
+     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!
+     */
+    private val sideDishEggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "sidedish.found",
+        "§d§lHOPPITY'S HUNT §r§dYou found a §r§6§l(?<meal>.*) §r§6Egg §r§din the Chocolate Factory§r§d!",
+    )
+
+    /**
+     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lShop Milestone Rabbit §r§din the Chocolate Factory§r§d!
+     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lChocolate Milestone Rabbit §r§din the Chocolate Factory§r§d!
+     */
+    private val milestoneRabbitFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "milestone.claimed",
+        "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§l(?<meal>[\\w ]+) Rabbit §r§din the Chocolate Factory§r§d!",
+    )
+
+    val eggFoundPatterns: List<Pattern> = listOf(
+        eggFoundPattern,
+        sideDishEggFoundPattern,
+        milestoneRabbitFoundPattern,
+    )
+
     /**
      * REGEX-TEST: §aYou bought §r§9Casanova §r§afor §r§6970,000 Coins§r§a!
      * REGEX-TEST: §aYou bought §r§fHeidie §r§afor §r§6194,000 Coins§r§a!
@@ -74,7 +99,7 @@ object HoppityEggsManager {
 
     val duplicateRabbitFound by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.duplicate",
-        "§7§lDUPLICATE RABBIT! §6\\+(?<amount>[\\d,]+) Chocolate"
+        "§7§lDUPLICATE RABBIT! §6\\+(?<amount>[\\d,]+) Chocolate",
     )
 
     private val noEggsLeftPattern by ChocolateFactoryAPI.patternGroup.pattern(
@@ -123,8 +148,9 @@ object HoppityEggsManager {
         }
 
         HoppityEggsCompactChat.handleChat(event)
+        HoppityAPI.handleChat(event)
 
-        if (!ChocolateFactoryAPI.isHoppityEvent()) return
+        if (!HoppityAPI.isHoppityEvent()) return
 
         eggFoundPattern.matchMatcher(event.message) {
             HoppityEggLocations.saveNearestEgg()
@@ -141,7 +167,7 @@ object HoppityEggsManager {
             HoppityEggType.allFound()
 
             if (config.timeInChat) {
-                val nextEgg = HoppityEggType.entries.minByOrNull { it.timeUntil() } ?: return
+                val nextEgg = HoppityEggType.resettingEntries.minByOrNull { it.timeUntil() } ?: return
                 ChatUtils.chat("§eNext egg available in §b${nextEgg.timeUntil().format()}§e.")
                 event.blockedReason = "hoppity_egg"
             }
@@ -151,7 +177,7 @@ object HoppityEggsManager {
         eggAlreadyCollectedPattern.matchMatcher(event.message) {
             getEggType(event).markClaimed()
             if (config.timeInChat) {
-                val nextEgg = HoppityEggType.entries.minByOrNull { it.timeUntil() } ?: return
+                val nextEgg = HoppityEggType.resettingEntries.minByOrNull { it.timeUntil() } ?: return
                 ChatUtils.chat("§eNext egg available in §b${nextEgg.timeUntil().format()}§e.")
                 event.blockedReason = "hoppity_egg"
             }
@@ -222,7 +248,7 @@ object HoppityEggsManager {
         if (lastWarnTime.passedSince() < 1.minutes) return
 
         lastWarnTime = now()
-        val amount = HoppityEggType.entries.size
+        val amount = HoppityEggType.resettingEntries.size
         val message = "All $amount Hoppity Eggs are ready to be found!"
         if (config.warpUnclaimedEggs) {
             if (LorenzUtils.inSkyBlock) {
@@ -255,5 +281,5 @@ object HoppityEggsManager {
     }
 
     fun isActive() = (LorenzUtils.inSkyBlock || (LorenzUtils.onHypixel && config.showOutsideSkyblock)) &&
-        ChocolateFactoryAPI.isHoppityEvent()
+        HoppityAPI.isHoppityEvent()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
new file mode 100644
index 000000000000..f334e407e2d9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
@@ -0,0 +1,277 @@
+package at.hannibal2.skyhanni.features.event.hoppity
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEventSummaryConfig.HoppityStat
+import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage.HoppityEventStats
+import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage.HoppityEventStats.RabbitData
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+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.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
+import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.SkyBlockTime
+import at.hannibal2.skyhanni.utils.SkyBlockTime.Companion.SKYBLOCK_DAY_MILLIS
+import at.hannibal2.skyhanni.utils.SkyBlockTime.Companion.SKYBLOCK_HOUR_MILLIS
+import at.hannibal2.skyhanni.utils.SkyblockSeason
+import at.hannibal2.skyhanni.utils.StringUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+
+@SkyHanniModule
+object HoppityEventSummary {
+    private val config get() = SkyHanniMod.feature.event.hoppityEggs
+    private val lineHeader = " ".repeat(4)
+
+    private var firstInCf = 0L
+    private var inCfNow = false
+
+    @HandleEvent
+    fun onRabbitFound(event: RabbitFoundEvent) {
+        if (!HoppityAPI.isHoppityEvent()) return
+        val stats = getYearStats().first ?: return
+
+        stats.mealsFound.addOrPut(event.eggType, 1)
+        val rarity = HoppityAPI.rarityByRabbit(event.rabbitName) ?: return
+        val rarityMap = stats.rabbitsFound.getOrPut(rarity) { RabbitData() }
+        if (event.duplicate) rarityMap.dupes++
+        else rarityMap.uniques++
+        if (event.chocGained > 0) stats.dupeChocolateGained += event.chocGained
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        checkEnded()
+        if (!HoppityAPI.isHoppityEvent()) return
+        checkInit()
+        checkAddCfTime()
+    }
+
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        checkEnded()
+    }
+
+    private fun checkInit() {
+        val statStorage = ProfileStorageData.profileSpecific?.hoppityEventStats ?: return
+        val currentYear = SkyBlockTime.now().year
+        if (statStorage.containsKey(currentYear)) return
+        statStorage[currentYear] = HoppityEventStats()
+    }
+
+    private fun getYearStats(year: Int? = null): Pair<HoppityEventStats?, Int> {
+        val queryYear = year ?: SkyBlockTime.now().year
+        val storage = ProfileStorageData.profileSpecific?.hoppityEventStats ?: return Pair(null, queryYear)
+        if (!storage.containsKey(queryYear)) return Pair(null, queryYear)
+        return Pair(storage[queryYear], queryYear)
+    }
+
+    private fun checkAddCfTime() {
+        if (ChocolateFactoryAPI.inChocolateFactory && !this.inCfNow) {
+            this.inCfNow = true
+            firstInCf = SkyBlockTime.now().toMillis()
+        } else if (!ChocolateFactoryAPI.inChocolateFactory && this.inCfNow) {
+            val stats = getYearStats().first ?: return
+            stats.millisInCf += (SkyBlockTime.now().toMillis() - firstInCf)
+            this.inCfNow = false
+            firstInCf = 0
+        }
+    }
+
+    private fun checkEnded() {
+        val (stats, year) = getYearStats()
+        if (stats == null || stats.summarized) return
+
+        val currentYear = SkyBlockTime.now().year
+        val currentSeason = SkyblockSeason.currentSeason
+        val isSpring = currentSeason == SkyblockSeason.SPRING
+
+        if (year < currentYear || (year == currentYear && !isSpring) && config.eventSummary.enabled) {
+            sendStatsMessage(stats, year)
+            (ProfileStorageData.profileSpecific?.hoppityEventStats?.get(year)?.also { it.summarized = true }
+                ?: ErrorManager.skyHanniError("Could not save summarization state in Hoppity Event Summarization."))
+        }
+    }
+
+    // First event was year 346 -> #1, 20th event was year 365, etc.
+    private fun getHoppityEventNumber(skyblockYear: Int): Int = (skyblockYear - 345)
+
+    fun addStrayCaught(rarity: LorenzRarity, chocGained: Long) {
+        if (!HoppityAPI.isHoppityEvent()) return
+        val stats = getYearStats().first ?: return
+        val rarityMap = stats.rabbitsFound.getOrPut(rarity) { RabbitData() }
+        rarityMap.strays++
+        stats.strayChocolateGained += chocGained
+    }
+
+    private fun StringBuilder.appendHeadedLine(line: String) {
+        appendLine("$lineHeader$line")
+    }
+
+    private fun StringBuilder.addExtraChocFormatLine(chocGained: Long) {
+        if (chocGained <= 0) return
+        appendHeadedLine(
+            buildString {
+                append(" §6+${chocGained.addSeparators()} Chocolate")
+                if (SkyHanniMod.feature.inventory.chocolateFactory.showDuplicateTime) {
+                    val timeFormatted = ChocolateFactoryAPI.timeUntilNeed(chocGained).format(maxUnits = 2)
+                    append(" §7(§a+§b$timeFormatted§7)")
+                }
+            },
+        )
+    }
+
+    private val summaryOperationList by lazy {
+        buildMap<HoppityStat, (sb: StringBuilder, stats: HoppityEventStats, year: Int) -> Unit> {
+            put(HoppityStat.MEAL_EGGS_FOUND) { sb, stats, year ->
+                stats.getEggsFoundFormat(year).takeIf { it != null }?.let {
+                    sb.appendHeadedLine(it)
+                }
+            }
+
+            put(HoppityStat.HOPPITY_RABBITS_BOUGHT) { sb, stats, _ ->
+                stats.mealsFound[HoppityEggType.BOUGHT]?.let {
+                    sb.appendHeadedLine("§7You bought §b$it §f${StringUtils.pluralize(it, "Rabbit")} §7from §aHoppity§7.")
+                }
+            }
+
+            put(HoppityStat.SIDE_DISH_EGGS) { sb, stats, _ ->
+                stats.mealsFound[HoppityEggType.SIDE_DISH]?.let {
+                    sb.appendHeadedLine(
+                        "§7You found §b$it §6§lSide Dish §r§6${StringUtils.pluralize(it, "Egg")}§7 " +
+                            "§7in the §6Chocolate Factory§7.",
+                    )
+                }
+            }
+
+            put(HoppityStat.MILESTONE_RABBITS) { sb, stats, _ ->
+                ((stats.mealsFound[HoppityEggType.CHOCOLATE_FACTORY_MILESTONE] ?: 0) +
+                    (stats.mealsFound[HoppityEggType.CHOCOLATE_SHOP_MILESTONE] ?: 0)).takeIf { it > 0 }?.let {
+                    sb.appendHeadedLine("§7You claimed §b$it §6§lMilestone §r§6${StringUtils.pluralize(it, "Rabbit")}§7.")
+                }
+            }
+
+            put(HoppityStat.NEW_RABBITS) { sb, stats, _ ->
+                getRabbitsFormat(stats.rabbitsFound.mapValues { m -> m.value.uniques }, "Unique").forEach {
+                    sb.appendHeadedLine(it)
+                }
+            }
+
+            put(HoppityStat.DUPLICATE_RABBITS) { sb, stats, _ ->
+                getRabbitsFormat(stats.rabbitsFound.mapValues { m -> m.value.dupes }, "Duplicate").forEach {
+                    sb.appendHeadedLine(it)
+                }
+                sb.addExtraChocFormatLine(stats.dupeChocolateGained)
+            }
+
+            put(HoppityStat.STRAY_RABBITS) { sb, stats, _ ->
+                getRabbitsFormat(stats.rabbitsFound.mapValues { m -> m.value.strays }, "Stray").forEach {
+                    sb.appendHeadedLine(it)
+                }
+                sb.addExtraChocFormatLine(stats.strayChocolateGained)
+            }
+
+            put(HoppityStat.TIME_IN_CF) { sb, stats, _ ->
+                sb.appendHeadedLine("§7You spent §b${stats.millisInCf.milliseconds.format(maxUnits = 2)} §7in the §6Chocolate Factory§7.")
+            }
+
+            put(HoppityStat.EMPTY_1) { sb, _, _ -> sb.appendLine() }
+            put(HoppityStat.EMPTY_2) { sb, _, _ -> sb.appendLine() }
+            put(HoppityStat.EMPTY_3) { sb, _, _ -> sb.appendLine() }
+            put(HoppityStat.EMPTY_4) { sb, _, _ -> sb.appendLine() }
+        }
+    }
+
+    fun sendStatsMessage(it: Array<String>) {
+        val statsStorage = ProfileStorageData.profileSpecific?.hoppityEventStats ?: return
+        val currentYear = SkyBlockTime.now().year
+        val statsYearList = statsStorage.keys.takeIf { it.isNotEmpty() } ?: mutableListOf()
+        val statsYearFormatList = statsStorage.keys.takeIf { it.isNotEmpty() }?.map {
+            "§b$it${if (it == currentYear) " §a(Current)§r" else ""}"
+        }?.toMutableList() ?: mutableListOf()
+
+        val parsedInt: Int? = if (it.size == 1) it[0].toIntOrNull() else null
+
+        val availableYearsFormat = "§eStats are available for the following years:§af\n${statsYearFormatList.joinToString("§e,") { it }}"
+
+        if (parsedInt == null) {
+            if (HoppityAPI.isHoppityEvent()) {
+                val stats = getYearStats(currentYear).first ?: return
+                sendStatsMessage(stats, currentYear)
+            } else ChatUtils.chat(availableYearsFormat)
+        } else if (!statsYearList.contains(parsedInt)) {
+            ChatUtils.chat("Could not find stats for year §b$parsedInt§e.\n$availableYearsFormat")
+        } else {
+            val stats = getYearStats(parsedInt).first ?: return
+            sendStatsMessage(stats, parsedInt)
+        }
+    }
+
+    private fun sendStatsMessage(stats: HoppityEventStats, eventYear: Int?) {
+        if (eventYear == null) return
+        val summaryBuilder: StringBuilder = StringBuilder()
+        summaryBuilder.appendLine("§d§l${"▬".repeat(64)}")
+
+        // Header
+        summaryBuilder.appendLine("${" ".repeat(26)}§d§lHoppity's Hunt #${getHoppityEventNumber(eventYear)} Stats")
+        summaryBuilder.appendLine()
+
+        // Various stats from config
+        val statsBuilder: StringBuilder = StringBuilder()
+        config.eventSummary.statDisplayList.forEach {
+            summaryOperationList[it]?.invoke(statsBuilder, stats, eventYear)
+        }
+        if (statsBuilder.toString().replace("\n", "").isEmpty()) {
+            statsBuilder.appendHeadedLine("§c§lNothing to show!\n§c§oGo find some eggs!")
+        }
+
+        // Append stats
+        summaryBuilder.append(statsBuilder)
+
+        // Footer
+        summaryBuilder.append("§d§l${"▬".repeat(64)}")
+
+        ChatUtils.chat(summaryBuilder.toString(), prefix = false)
+    }
+
+    private fun HoppityEventStats.getEggsFoundFormat(year: Int): String? =
+        mealsFound.filterKeys { it in HoppityEggType.resettingEntries }.sumAllValues().toInt().takeIf { it > 0 }?.let {
+            val milliDifference = SkyBlockTime.now().toMillis() - SkyBlockTime.fromSbYear(year).toMillis()
+            val pastEvent = milliDifference > SkyBlockTime.SKYBLOCK_SEASON_MILLIS
+            // Calculate total eggs from complete days and incomplete day periods
+            val previousEggs = if (pastEvent) 279 else (milliDifference / SKYBLOCK_DAY_MILLIS).toInt() * 3
+            val currentEggs = when {
+                pastEvent -> 0
+                // Add eggs for the current day based on time of day
+                milliDifference % SKYBLOCK_DAY_MILLIS >= SKYBLOCK_HOUR_MILLIS * 21 -> 3 // Dinner egg, 9 PM
+                milliDifference % SKYBLOCK_DAY_MILLIS >= SKYBLOCK_HOUR_MILLIS * 14 -> 2 // Lunch egg, 2 PM
+                milliDifference % SKYBLOCK_DAY_MILLIS >= SKYBLOCK_HOUR_MILLIS * 7 -> 1 // Breakfast egg, 7 AM
+                else -> 0
+            }
+            val spawnedMealsEggs = previousEggs + currentEggs
+            "§7You found §b$it§7/§a$spawnedMealsEggs §6Chocolate Meal ${StringUtils.pluralize(it, "Egg")}§7."
+        }
+
+
+    private fun getRabbitsFormat(rarityMap: Map<LorenzRarity, Int>, name: String): List<String> {
+        val rabbitsSum = rarityMap.values.sum()
+        if (rabbitsSum == 0) return emptyList()
+
+        return mutableListOf(
+            "§7$name Rabbits: §f$rabbitsSum",
+            HoppityAPI.hoppityRarities.joinToString(" §7-") {
+                " ${it.chatColorCode}${rarityMap[it] ?: 0}"
+            },
+        )
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index 877e161ef64f..217e93bb4832 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -50,7 +50,7 @@ object HoppityNpc {
         if (!isReminderEnabled()) return
         if (ReminderUtils.isBusy()) return
         if (hoppityYearOpened == SkyBlockTime.now().year) return
-        if (!ChocolateFactoryAPI.isHoppityEvent()) return
+        if (!HoppityAPI.isHoppityEvent()) return
         if (lastReminderSent.passedSince() <= 2.minutes) return
 
         ChatUtils.clickableChat(
@@ -59,7 +59,7 @@ object HoppityNpc {
                 disableReminder()
                 ChatUtils.chat("§eHoppity's Shop reminder disabled.")
             },
-            oneTimeClick = true
+            oneTimeClick = true,
         )
 
         lastReminderSent = SimpleTimeMark.now()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 57b572fe48f0..59a119bf5470 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -192,9 +192,6 @@ object ChocolateFactoryAPI {
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
 
-    // TODO add debug toggle
-    fun isHoppityEvent() = SkyblockSeason.currentSeason == SkyblockSeason.SPRING
-
     fun isMaxPrestige() = currentPrestige >= maxPrestige
 
     fun timeTowerChargeDuration() =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 20d752e35eb4..bd1fc87174e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityAPI
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionData
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsCompactChat
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager
@@ -56,6 +57,7 @@ object ChocolateFactoryBarnManager {
             }
             ChocolateAmount.addToAll(amount)
             HoppityEggsCompactChat.compactChat(event, lastDuplicateAmount = amount)
+            HoppityAPI.attemptFire(event, lastDuplicateAmount = amount)
         }
 
         rabbitCrashedPattern.matchMatcher(event.message) {
@@ -101,7 +103,7 @@ object ChocolateFactoryBarnManager {
             return
         }
 
-        if (config.rabbitCrushOnlyDuringHoppity && !ChocolateFactoryAPI.isHoppityEvent()) return
+        if (config.rabbitCrushOnlyDuringHoppity && !HoppityAPI.isHoppityEvent()) return
 
         val fullLevel = if (profileStorage.currentRabbits == profileStorage.maxRabbits) "full" else "almost full"
         ChatUtils.clickableChat(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 5dd90a82b47b..e8ad465cdf6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -4,6 +4,8 @@ import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityAPI
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
@@ -12,6 +14,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -137,6 +140,11 @@ object ChocolateFactoryStrayTracker {
         tracker.modify { it.straysCaught.addOrPut(rarity, 1) }
         val extraTime = ChocolateFactoryAPI.timeUntilNeed(chocAmount + 1)
         tracker.modify { it.straysExtraChocMs.addOrPut(rarity, extraTime.inWholeMilliseconds) }
+        if (HoppityAPI.isHoppityEvent()) {
+            LorenzRarity.getByName(rarity)?.let {
+                HoppityEventSummary.addStrayCaught(it, chocAmount)
+            }
+        }
     }
 
     private fun incrementGoldenType(typeCaught: String, amount: Int = 1) {
@@ -276,7 +284,6 @@ object ChocolateFactoryStrayTracker {
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        if (!isEnabled()) return
         val index = event.slot?.slotIndex ?: return
         if (index == -999) return
         if (claimedStraysSlots.contains(index)) return
@@ -287,6 +294,9 @@ object ChocolateFactoryStrayTracker {
         val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
         if (!nameText.equals("§6§lGolden Rabbit §8- §aSide Dish")) return
 
+        HoppityAPI.fireSideDishMessage()
+        if (!isEnabled()) return
+
         claimedStraysSlots.add(index)
         incrementGoldenType("sidedish")
         incrementRarity("legendary", 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
index 100d93b19cc9..cc0e20efef98 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
@@ -27,7 +27,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
             ErrorManager.logErrorStateWithData(
                 "Problem with item rarity detected.",
                 "Trying to get an item rarity below common",
-                "ordinal" to ordinal
+                "ordinal" to ordinal,
             )
         }
         return rarityBelow
@@ -39,7 +39,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
             ErrorManager.logErrorStateWithData(
                 "Problem with item rarity detected.",
                 "Trying to get an item rarity above special",
-                "ordinal" to ordinal
+                "ordinal" to ordinal,
             )
         }
         return rarityBelow
@@ -50,6 +50,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
     companion object {
 
         fun getById(id: Int) = if (entries.size > id) entries[id] else null
-        fun getByName(name: String) = entries.firstOrNull { it.name == name }
+
+        fun getByName(name: String): LorenzRarity? = entries.find { it.name.equals(name, ignoreCase = true) }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockTime.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockTime.kt
index 1fc21df52b8c..6d52de55cb34 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockTime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockTime.kt
@@ -28,15 +28,19 @@ data class SkyBlockTime(
     companion object {
         private const val SKYBLOCK_EPOCH_START_MILLIS = 1559829300000L // Day 1, Year 1
         const val SKYBLOCK_YEAR_MILLIS = 124 * 60 * 60 * 1000L
+        const val SKYBLOCK_SEASON_MILLIS = SKYBLOCK_YEAR_MILLIS / 4
         private const val SKYBLOCK_MONTH_MILLIS = SKYBLOCK_YEAR_MILLIS / 12
-        private const val SKYBLOCK_DAY_MILLIS = SKYBLOCK_MONTH_MILLIS / 31
-        private const val SKYBLOCK_HOUR_MILLIS = SKYBLOCK_DAY_MILLIS / 24
+        const val SKYBLOCK_DAY_MILLIS = SKYBLOCK_MONTH_MILLIS / 31
+        const val SKYBLOCK_HOUR_MILLIS = SKYBLOCK_DAY_MILLIS / 24
         private const val SKYBLOCK_MINUTE_MILLIS = SKYBLOCK_HOUR_MILLIS / 60
         private const val SKYBLOCK_SECOND_MILLIS = SKYBLOCK_MINUTE_MILLIS / 60
 
         fun fromInstant(instant: Instant): SkyBlockTime =
             calculateSkyBlockTime(instant.toEpochMilli() - SKYBLOCK_EPOCH_START_MILLIS)
 
+        fun fromSbYear(year: Int): SkyBlockTime =
+            fromInstant(Instant.ofEpochMilli(SKYBLOCK_EPOCH_START_MILLIS + (SKYBLOCK_YEAR_MILLIS * year)))
+
         fun now(): SkyBlockTime = fromInstant(Instant.now())
 
         private fun calculateSkyBlockTime(realMillis: Long): SkyBlockTime {

From a658f0f272c25d50ce3c572c388e07895735bd48 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 26 Aug 2024 02:46:10 +0200
Subject: [PATCH 306/721] Improvement: Multiple Languages (#2403)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |  2 +-
 .../skyhanni/config/commands/Commands.kt      |  2 +-
 .../config/features/chat/ChatConfig.java      | 12 +---
 .../features/chat/TranslatorConfig.java       | 37 +++++++++++
 .../chat/translation/TranslatableLanguage.kt  | 45 +++++++++++++
 .../chat/{ => translation}/Translator.kt      | 65 +++++++++++++++++--
 6 files changed, 146 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
 rename src/main/java/at/hannibal2/skyhanni/features/chat/{ => translation}/Translator.kt (71%)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 25cab54fbec5..6d045d56ad2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 54
+    const val CONFIG_VERSION = 55
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 50accf32cac9..fbd93a4d840f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.data.TitleManager
 import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher
 import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay
 import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper
-import at.hannibal2.skyhanni.features.chat.Translator
+import at.hannibal2.skyhanni.features.chat.translation.Translator
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil
 import at.hannibal2.skyhanni.features.commands.HelpCommand
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
index f9e64f1e07d4..6a1d129a27fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.Category;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
@@ -104,16 +105,9 @@ public String toString() {
     @FeatureToggle
     public boolean hideSacksChange = false;
 
+    @Category(name = "Translator", desc = "Chat translator settings.")
     @Expose
-    @ConfigOption(
-        name = "Translator",
-        desc = "Click on a message to translate it to English.\n" +
-            "Use §e/shcopytranslation§7 to translate from English.\n" +
-            "§cTranslation is not guaranteed to be 100% accurate."
-    )
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean translator = false;
+    public TranslatorConfig translator = new TranslatorConfig();
 
     @Expose
     @ConfigOption(name = "SkyBlock XP in Chat", desc = "Send the SkyBlock XP messages into the chat.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
new file mode 100644
index 000000000000..648afbd8739c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
@@ -0,0 +1,37 @@
+package at.hannibal2.skyhanni.config.features.chat;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.features.chat.translation.TranslatableLanguage;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+
+public class TranslatorConfig {
+
+    @Expose
+    @ConfigOption(
+        name = "Translate On Click",
+        desc = "Click on a message to translate it to English.\n" +
+            "Use §e/shcopytranslation§7 to translate from English.\n" +
+            "§cTranslation is not guaranteed to be 100% accurate."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean translateOnClick = false;
+
+    @ConfigOption(name = "Language Name", desc = "The name of the language selected below. Note that languages marked as unknown might still be supported.")
+    @Expose
+    @ConfigEditorDropdown
+    public Property<TranslatableLanguage> languageName = Property.of(TranslatableLanguage.ENGLISH);
+
+    @Expose
+    @ConfigOption(
+        name = "Language Code",
+        desc = "Enter a language code here to translate on chat click into another language. " +
+            "E.g. `es` for spanish or 'de' for german. Empty for english.")
+    @ConfigEditorText
+    public Property<String> languageCode = Property.of("en");
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
new file mode 100644
index 000000000000..13a19a1dcbc8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
@@ -0,0 +1,45 @@
+package at.hannibal2.skyhanni.features.chat.translation
+
+enum class TranslatableLanguage(private val englishName: String, private val nativeName: String, val languageCode: String) {
+
+    // 1. First Language - The primary language of the application.
+    ENGLISH("English", "", "en"),
+
+    // 2. Well Supported - Major languages commonly used in Europe and North America.
+    SPANISH("Spanish", "Español", "es"), // Major language in Spain and Latin America
+    GERMAN("German", "Deutsch", "de"), // Important language in Germany, Austria, and Switzerland
+    FRENCH("French", "Français", "fr"), // Significant language in France, Canada, and parts of Africa
+    DUTCH("Dutch", "Nederlands", "nl"), // Spoken in the Netherlands and Belgium
+    RUSSIAN("Russian", "Русский", "ru"), // Major language in Russia and other parts of Eastern Europe and Central Asia
+    POLISH("Polish", "Polski", "pl"), // Spoken primarily in Poland
+    ITALIAN("Italian", "Italiano", "it"), // Important language in Italy and parts of Switzerland
+    UKRAINIAN("Ukrainian", "Українська", "uk"), // Spoken in Ukraine
+    PORTUGUESE("Portuguese", "Português", "pt"), // Spoken in Portugal and Brazil
+    TURKISH("Turkish", "Türkçe", "tr"), // Significant in Turkey and Central Asia
+    SWEDISH("Swedish", "Svenska", "sv"), // Relevant in Northern Europe
+
+    // 3. Global Languages - Widely spoken languages with significant global presence.
+    CHINESE("Chinese", "中文", "zh"), // Major language in China and other parts of East Asia
+    ARABIC("Arabic", "العربية", "ar"), // Significant language in the Middle East and North Africa
+    JAPANESE("Japanese", "日本語", "ja"), // Major language in Japan
+    HINDI("Hindi", "हिन्दी", "hi"), // Major language in India
+    BENGALI("Bengali", "বাংলা", "bn"), // Widely spoken in India and Bangladesh
+    KOREAN("Korean", "한국어", "ko"), // Important for East Asia
+    VIETNAMESE("Vietnamese", "Tiếng Việt", "vi"), // Major language in Vietnam
+    INDONESIAN("Indonesian", "Bahasa Indonesia", "id"), // Key language in Southeast Asia
+    THAI("Thai", "ภาษาไทย", "th"), // Important in Thailand
+
+    // 4. Other Supported Languages
+    PERSIAN("Persian", "فارسی", "fa"), // Spoken in Iran and other parts of the Middle East
+    TAGALOG("Tagalog", "Tagalog", "tl"), // Major language in the Philippines
+    PUNJABI("Punjabi", "ਪੰਜਾਬੀ", "pa"), // Significant in India and Pakistan
+
+    // 5. need better name
+    UNKNOWN("Unknown Language", "", ""),
+    ;
+
+    // Limit to 20 characters so that the text is not too small in the config
+    private val displayName: String = if (nativeName.isBlank()) englishName else "$englishName/$nativeName".take(20)
+
+    override fun toString(): String = displayName
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
similarity index 71%
rename from src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
rename to src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
index 2d3f3aa85bdc..389b57fb0fc7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
@@ -1,13 +1,17 @@
-package at.hannibal2.skyhanni.features.chat
+package at.hannibal2.skyhanni.features.chat.translation
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.SkyHanniMod.Companion.coroutineScope
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.ConditionalUtils.transformIf
 import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.getPlayerNameFromChatMessage
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.JsonArray
@@ -20,6 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.net.URLDecoder
 import java.net.URLEncoder
+import kotlin.time.Duration.Companion.milliseconds
 
 // TODO split into two classes: TranslatorCommand and GoogleTranslator. only communicates via getTranslationFromEnglish and getTranslationToEnglish
 @SkyHanniModule
@@ -44,6 +49,41 @@ object Translator {
         editedComponent.setChatStyle(clickStyle)
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(55, "chat.translator", "chat.translator.translateOnClick")
+    }
+
+    var lastUserChange = SimpleTimeMark.farPast()
+
+    @SubscribeEvent
+    fun onConfigReload(event: ConfigLoadEvent) {
+        config.languageCode.onToggle {
+            if (lastUserChange.passedSince() < 50.milliseconds) return@onToggle
+            lastUserChange = SimpleTimeMark.now()
+
+            val text = config.languageCode.get()
+            if (text.isEmpty()) {
+                config.languageName.set(TranslatableLanguage.ENGLISH)
+            } else {
+                for (language in TranslatableLanguage.values()) {
+                    if (language.languageCode.equals(text, ignoreCase = true)) {
+                        config.languageName.set(language)
+                        return@onToggle
+                    }
+                }
+                config.languageName.set(TranslatableLanguage.UNKNOWN)
+            }
+        }
+
+        config.languageName.onToggle {
+            if (lastUserChange.passedSince() < 50.milliseconds) return@onToggle
+            lastUserChange = SimpleTimeMark.now()
+
+            config.languageCode.set(config.languageName.get().languageCode)
+        }
+    }
+
     private fun createClickStyle(message: String, style: ChatStyle): ChatStyle {
         val text = messageContentRegex.find(message)!!.groupValues[1].removeColor()
         style.setChatClickEvent(ClickEvent(ClickEvent.Action.RUN_COMMAND, "/shtranslate $text"))
@@ -51,7 +91,7 @@ object Translator {
         return style
     }
 
-    private val config get() = SkyHanniMod.feature.chat
+    private val config get() = SkyHanniMod.feature.chat.translator
 
     /*
      * Simplified version of the JSON response:
@@ -130,9 +170,22 @@ object Translator {
         val message = args.joinToString(" ").removeColor()
 
         coroutineScope.launch {
-            val translation = getTranslationToEnglish(message)
-            if (translation == "Unable to translate!") ChatUtils.userError("Unable to translate message :( (is it in English?)")
-            else ChatUtils.chat("Found translation: §f$translation")
+            var lang = config.languageCode.get()
+            val translation = if (lang.isEmpty()) {
+                getTranslationToEnglish(message)
+            } else {
+                getTranslationFromEnglish(message, lang)
+            }
+            if (message == translation) {
+                ChatUtils.userError("Translation is the same as the original message!")
+                return@launch
+            }
+
+            if (translation == "Unable to translate!") {
+                ChatUtils.userError("Unable to translate message :( (is it in English?)")
+                return@launch
+            }
+            ChatUtils.chat("Found translation: §f$translation")
         }
     }
 
@@ -151,5 +204,5 @@ object Translator {
         }
     }
 
-    fun isEnabled() = config.translator
+    fun isEnabled() = config.translateOnClick
 }

From 03a1d0eeaca98c004dee6e8eacf3be0c73090be1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 26 Aug 2024 02:46:23 +0200
Subject: [PATCH 307/721] Improvement: Wording in config, dev options (#2397)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../combat/damageindicator/DamageIndicatorConfig.java         | 3 ++-
 .../at/hannibal2/skyhanni/config/features/dev/DevConfig.java  | 4 ++++
 .../skyhanni/config/features/event/bingo/BingoCardConfig.java | 2 +-
 .../skyhanni/config/features/event/diana/DianaConfig.java     | 3 ++-
 .../config/features/fishing/TotemOfCorruptionConfig.java      | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
index 7e44df7f9e11..7010c7d35ff0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
@@ -171,7 +171,8 @@ public String toString() {
     public boolean hideVanillaNametag = false;
 
     @Expose
-    @ConfigOption(name = "Time to Kill", desc = "Show the time it takes to kill the slayer boss.")
+    @ConfigOption(name = "Time to Kill", desc = "Show the time it takes to kill the slayer boss.\n" +
+        "§eRequires Damage Indicator to be active.")
     @ConfigEditorBoolean
     public boolean timeToKillSlayer = true;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
index a42da18c1d4d..b62c88efc61f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features.dev;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import at.hannibal2.skyhanni.config.features.dev.minecraftconsole.MinecraftConsoleConfig;
 import com.google.gson.annotations.Expose;
@@ -72,6 +73,7 @@ public class DevConfig {
             "§eThose are the folks that coded the mod for you for free :)"
     )
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean fancyContributors = true;
 
     @Expose
@@ -80,6 +82,7 @@ public class DevConfig {
         desc = "Makes SkyHanni contributors' nametags fancy too. "
     )
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean contributorNametags = true;
 
     @Expose
@@ -87,6 +90,7 @@ public class DevConfig {
         name = "Flip Contributors",
         desc = "Make SkyHanni contributors appear upside down in the world.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean flipContributors = true;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java
index b317f979a9de..cd7a4155842b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java
@@ -16,7 +16,7 @@ public class BingoCardConfig {
     public boolean enabled = true;
 
     @Expose
-    @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the Bingo Card or the step helper by sneaking with SkyBlock Menu in hand.")
+    @ConfigOption(name = "Quick Toggle", desc = "Quickly show/hide the Bingo Card (when enabled above) or the step helper by sneaking with SkyBlock Menu in hand.")
     @ConfigEditorBoolean
     public boolean quickToggle = true;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
index 132c0d827127..3e2c6724dd64 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java
@@ -36,7 +36,8 @@ public class DianaConfig {
     public boolean burrowsNearbyDetection = false;
 
     @Expose
-    @ConfigOption(name = "Line To Next", desc = "Show a line to the closest burrow or guess location.")
+    @ConfigOption(name = "Line To Next", desc = "Show a line to the closest burrow or guess location.\n" +
+        "§eRequires Burrow particle detection.")
     @ConfigEditorBoolean
     public boolean lineToNext = true;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/TotemOfCorruptionConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/TotemOfCorruptionConfig.java
index c1454b8f1897..783f6474c224 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/TotemOfCorruptionConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/TotemOfCorruptionConfig.java
@@ -29,7 +29,8 @@ public class TotemOfCorruptionConfig {
     public int distanceThreshold = 16;
 
     @Expose
-    @ConfigOption(name = "Hide Particles", desc = "Hide the particles of the Totem of Corruption.")
+    @ConfigOption(name = "Hide Particles", desc = "Hide the particles of the Totem of Corruption.\n" +
+        "§eRequires the Overlay to be active.")
     @ConfigEditorBoolean
     public boolean hideParticles = true;
 

From 2b43ecc2a03c0e03fd51674cbd2b3cff3e9ba711 Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Mon, 26 Aug 2024 01:57:15 +0100
Subject: [PATCH 308/721] Improvement: Add toggle to UserLuck Breakdown (#2357)

---
 .../hannibal2/skyhanni/config/features/misc/MiscConfig.java | 6 ++++++
 .../hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index beb7f2225840..95d3281ec51f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -303,4 +303,10 @@ public class MiscConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean maintainGameVolume = false;
+
+    @Expose
+    @ConfigOption(name = "SkyHanni User Luck", desc = "Shows SkyHanni User Luck in the SkyBlock Stats.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean userluckEnabled = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
index 8592a0d7259c..d4532a77527a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.misc
 
+import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
@@ -33,6 +34,7 @@ object UserLuckBreakdown {
     private var skillCalcCoolDown = SimpleTimeMark.farPast()
 
     private val storage get() = ProfileStorageData.playerSpecific
+    private val config get() = SkyHanniMod.feature.misc
 
     private lateinit var mainLuckItem: ItemStack
     private val mainLuckID = "ENDER_PEARL".asInternalName()
@@ -71,6 +73,7 @@ object UserLuckBreakdown {
 
     @SubscribeEvent
     fun replaceItem(event: ReplaceItemEvent) {
+        if (!config.userluckEnabled) return
         if (event.inventory !is ContainerLocalMenu) return
         if (!inMiscStats) return
 
@@ -151,6 +154,7 @@ object UserLuckBreakdown {
 
     @SubscribeEvent
     fun onHoverItem(event: LorenzToolTipEvent) {
+        if (!config.userluckEnabled) return
         if (!LorenzUtils.inSkyBlock) return
         if (skillCalcCoolDown.passedSince() > 3.seconds) {
             skillCalcCoolDown = SimpleTimeMark.now()
@@ -212,6 +216,7 @@ object UserLuckBreakdown {
 
     @SubscribeEvent
     fun onStackClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!config.userluckEnabled) return
         if (!inMiscStats) return
         val limboUserLuck = storage?.limbo?.userLuck ?: 0.0f
         if (limboUserLuck == 0.0f && !showAllStats) return

From 0c98d82a100c97f3b0042a75edd87bed57341fa2 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 26 Aug 2024 03:29:32 +0200
Subject: [PATCH 309/721] Fix: Custom Scoreboard Issues (#2402)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../gui/customscoreboard/CustomScoreboard.kt  | 19 ++++-
 .../gui/customscoreboard/RenderBackground.kt  | 73 ++++++++++++-------
 .../customscoreboard/ScoreboardElements.kt    |  2 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   | 53 +-------------
 4 files changed, 64 insertions(+), 83 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index 7c61eade8ec9..f74253d36827 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -59,7 +59,7 @@ object CustomScoreboard {
 
         val textRenderable = Renderable.verticalContainer(
             render.map { Renderable.string(it.first, horizontalAlign = it.second) },
-            0,
+            displayConfig.lineSpacing - 10,
             horizontalAlign = HorizontalAlignment.CENTER,
             verticalAlign = VerticalAlignment.CENTER,
         )
@@ -75,12 +75,23 @@ object CustomScoreboard {
     fun onGuiPositionMoved(event: GuiPositionMovedEvent) {
         if (event.guiName == guiName) {
             with(alignmentConfig) {
-                if (horizontalAlignment != HorizontalAlignment.DONT_ALIGN
-                    || verticalAlignment != VerticalAlignment.DONT_ALIGN
+                if (horizontalAlignment != HorizontalAlignment.DONT_ALIGN ||
+                    verticalAlignment != VerticalAlignment.DONT_ALIGN
                 ) {
+                    val tempHori = horizontalAlignment
+                    val tempVert = verticalAlignment
+
                     horizontalAlignment = HorizontalAlignment.DONT_ALIGN
                     verticalAlignment = VerticalAlignment.DONT_ALIGN
-                    ChatUtils.chat("Disabled Custom Scoreboard auto-alignment.")
+                    ChatUtils.clickableChat(
+                        "Disabled Custom Scoreboard auto-alignment. Click here to undo this action!",
+                        oneTimeClick = true,
+                        onClick = {
+                            horizontalAlignment = tempHori
+                            verticalAlignment = tempVert
+                            ChatUtils.chat("Enabled Custom Scoreboard auto-alignment.")
+                        },
+                    )
                 }
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
index 44e5c927c507..14d29d6ac015 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt
@@ -1,8 +1,10 @@
 package at.hannibal2.skyhanni.features.gui.customscoreboard
 
+import at.hannibal2.skyhanni.config.features.gui.customscoreboard.BackgroundConfig
 import at.hannibal2.skyhanni.data.GuiEditManager
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsX
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
+import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.backgroundConfig
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -15,18 +17,35 @@ object RenderBackground {
     private val textureLocation by lazy { ResourceLocation("skyhanni", "scoreboard.png") }
 
     internal fun addBackground(renderable: Renderable): Renderable {
-        val backgroundConfig = CustomScoreboard.backgroundConfig
-        val outlineConfig = backgroundConfig.outline
-        val padding = backgroundConfig.borderSize
+        with(backgroundConfig) {
+            if (!backgroundConfig.enabled) return renderable
 
-        if (!backgroundConfig.enabled) return renderable
+            val backgroundRenderable = createBackground(renderable)
 
-        val backgroundRenderable = if (backgroundConfig.useCustomBackgroundImage) {
+            if (!outline.enabled) return backgroundRenderable
+
+            return Renderable.drawInsideRoundedRectOutline(
+                backgroundRenderable,
+                0,
+                backgroundConfig.roundedCornerSmoothness,
+                1,
+                outline.colorTop.toChromaColor().rgb,
+                outline.colorBottom.toChromaColor().rgb,
+                outline.thickness,
+                outline.blur,
+                horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            )
+        }
+    }
+
+    private fun BackgroundConfig.createBackground(renderable: Renderable): Renderable =
+        if (backgroundConfig.useCustomBackgroundImage) {
             Renderable.drawInsideImage(
                 renderable,
                 textureLocation,
                 (backgroundConfig.customBackgroundImageOpacity * 255) / 100,
-                padding,
+                borderSize,
                 horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
                 verticalAlign = RenderUtils.VerticalAlignment.CENTER,
                 radius = backgroundConfig.roundedCornerSmoothness,
@@ -35,7 +54,7 @@ object RenderBackground {
             Renderable.drawInsideRoundedRect(
                 renderable,
                 backgroundConfig.color.toChromaColor(),
-                padding,
+                borderSize,
                 backgroundConfig.roundedCornerSmoothness,
                 1,
                 horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
@@ -43,21 +62,6 @@ object RenderBackground {
             )
         }
 
-        return if (outlineConfig.enabled) {
-            Renderable.drawInsideRoundedRectOutline(
-                backgroundRenderable,
-                0,
-                backgroundConfig.roundedCornerSmoothness,
-                1,
-                outlineConfig.colorTop.toChromaColor().rgb,
-                outlineConfig.colorBottom.toChromaColor().rgb,
-                outlineConfig.thickness,
-                outlineConfig.blur,
-                horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
-                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
-            )
-        } else backgroundRenderable
-    }
 
     internal fun updatePosition(renderable: Renderable) {
         if (GuiEditManager.isInGui()) return
@@ -73,24 +77,41 @@ object RenderBackground {
 
         val scaledWidth = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
         val scaledHeight = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
-        val elementWidth = renderable.width
-        val elementHeight = renderable.height
+        val elementWidth = (renderable.width * position.effectiveScale).toInt()
+        val elementHeight = (renderable.height * position.effectiveScale).toInt()
 
         with(alignmentConfig) {
-            val x = when (horizontalAlignment) {
+            var x = when (horizontalAlignment) {
                 RenderUtils.HorizontalAlignment.DONT_ALIGN -> position.getAbsX()
                 RenderUtils.HorizontalAlignment.LEFT -> 0 + margin
                 RenderUtils.HorizontalAlignment.CENTER -> scaledWidth / 2 - elementWidth / 2
                 RenderUtils.HorizontalAlignment.RIGHT -> scaledWidth - elementWidth - margin
                 else -> 0
             }
-            val y = when (verticalAlignment) {
+            var y = when (verticalAlignment) {
                 RenderUtils.VerticalAlignment.DONT_ALIGN -> position.getAbsY()
                 RenderUtils.VerticalAlignment.TOP -> 0 + margin
                 RenderUtils.VerticalAlignment.CENTER -> scaledHeight / 2 - elementHeight / 2
                 RenderUtils.VerticalAlignment.BOTTOM -> scaledHeight - elementHeight - margin
                 else -> 0
             }
+
+            val outlineConfig = backgroundConfig.outline
+            if (outlineConfig.enabled) {
+                val thickness = outlineConfig.thickness
+
+                when (horizontalAlignment) {
+                    RenderUtils.HorizontalAlignment.RIGHT -> x -= thickness / 2
+                    RenderUtils.HorizontalAlignment.LEFT -> x += thickness / 2
+                    else -> x
+                }
+
+                when (verticalAlignment) {
+                    RenderUtils.VerticalAlignment.TOP -> y += thickness / 2
+                    RenderUtils.VerticalAlignment.BOTTOM -> y -= thickness / 2
+                    else -> y
+                }
+            }
             CustomScoreboard.config.position.moveTo(x, y)
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 57376dbbb2ad..88072abc1236 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -411,7 +411,7 @@ private fun getMotesDisplayPair(): List<ScoreboardElementType> {
 private fun getMotesShowWhen() = inAnyIsland(IslandType.THE_RIFT)
 
 private fun getBankDisplayPair(): List<ScoreboardElementType> {
-    val bank = getBank()
+    val bank = getBank() ?: "0"
 
     return listOf(
         when {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index f4a57cb18985..0d6417688c3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.config.core.config.Position
 import at.hannibal2.skyhanni.data.GuiEditManager
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsX
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
-import at.hannibal2.skyhanni.data.GuiEditManager.getDummySize
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.toPositionsList
 import at.hannibal2.skyhanni.events.GuiContainerEvent
@@ -542,37 +541,6 @@ object RenderUtils {
         return renderer.getStringWidth(display)
     }
 
-    // Aligns using the width of element to render
-    private fun Position.renderString0(
-        string: String?,
-        offsetX: Int = 0,
-        offsetY: Int = 0,
-        alignmentEnum: HorizontalAlignment,
-    ): Int {
-        val display = "§f$string"
-        GlStateManager.pushMatrix()
-        transform()
-        val minecraft = Minecraft.getMinecraft()
-        val renderer = minecraft.renderManager.fontRenderer
-        val width = this.getDummySize().x / this.scale
-
-        GlStateManager.translate(offsetX + 1.0, offsetY + 1.0, 0.0)
-
-        val strLen: Int = renderer.getStringWidth(string)
-        val x2 = when (alignmentEnum) {
-            HorizontalAlignment.LEFT -> offsetX.toFloat()
-            HorizontalAlignment.CENTER -> offsetX + width / 2f - strLen / 2f
-            HorizontalAlignment.RIGHT -> offsetX + width - strLen.toFloat()
-            else -> offsetX.toFloat()
-        }
-        GL11.glTranslatef(x2, 0f, 0f)
-        renderer.drawStringWithShadow(display, 0f, 0f, 0)
-
-        GlStateManager.popMatrix()
-
-        return renderer.getStringWidth(display)
-    }
-
     fun Position.renderStrings(list: List<String>, extraSpace: Int = 0, posLabel: String) {
         if (list.isEmpty()) return
 
@@ -588,25 +556,6 @@ object RenderUtils {
         GuiEditManager.add(this, posLabel, longestX, offsetY)
     }
 
-    fun Position.renderStringsAlignedWidth(
-        list: List<Pair<String, HorizontalAlignment>>,
-        extraSpace: Int = 0,
-        posLabel: String,
-    ) {
-        if (list.isEmpty()) return
-
-        var offsetY = 0
-        var longestX = 0
-        for (pair in list) {
-            val x = renderString0(pair.first, offsetY = offsetY, alignmentEnum = pair.second)
-            if (x > longestX) {
-                longestX = x
-            }
-            offsetY += 10 + extraSpace
-        }
-        GuiEditManager.add(this, posLabel, longestX, offsetY)
-    }
-
     fun Position.renderRenderables(
         renderables: List<Renderable>,
         extraSpace: Int = 0,
@@ -698,7 +647,7 @@ object RenderUtils {
 
     /**
      * Accepts a single line to print.
-     * This  line is a list of things to print. Can print String or ItemStack objects.
+     * This line is a list of things to print. Can print String or ItemStack objects.
      */
     @Deprecated("use List<Renderable>", ReplaceWith(""))
     fun Position.renderSingleLineWithItems(

From 9ac4617c505750427a9cea9b4e4586f6cac257b8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 26 Aug 2024 04:16:40 +0200
Subject: [PATCH 310/721] Version 0.27 Beta 2

---
 docs/CHANGELOG.md                             | 50 +++++++++++++++++++
 docs/FEATURES.md                              |  2 +
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 9c9de659b735..668621107529 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,6 +9,11 @@
 + Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
     + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
 
+#### Hoppity Features
+
++ Added Hoppity Hunt event summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
+    + Use /shhoppitystats for live stats.
+
 ### Improvements
 
 #### Diana Improvements
@@ -21,6 +26,29 @@
 + Added an option to hide coins earned/lost in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
 + Added margin customization to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
 + Added an opacity slider for the Custom Background Image in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Added an Undo message when auto alignment inCustom Scoreboard gets disabled. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2402)
+
+#### Inventory Improvements
+
++ Added a toggle for displaying SkyHanni User Luck in Skyblock Stats. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2357)
+
+#### Chat Improvements
+
++ Added support for changing the translation language when clicking on a chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2403)
+
+#### Hoppity Improvements
+
++ Added config option to disable rarity in Compact Hoppity messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
+
+#### Combat Improvements
+
++ Made the "Line to Arachne" width configurable. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/2406)
++ Made the "Line to Miniboss" width configurable. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/2406)
+
+#### Config Improvements
+
++ Improved the description of several config options. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2397)
++ Enabled more Dev Options to be changed via /shdefaultoptions. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2397)
 
 ### Fixes
 
@@ -33,6 +61,8 @@
 
 + Fixed ItemCategory errors being sent even though we already have a fix. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2392)
 + Fixed AH item movements being detected by Item Trackers as new drops. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2380)
++ Fixed Pickup Log Display Entries not expiring while in GUIs. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2401)
++ Fixed the price of mana enchantments tiers 1-4 in Estimated Chest value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2395)
 
 #### Mining Fixes
 
@@ -43,16 +73,36 @@
 
 + Fixed a Scoreboard Error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2382)
 + Fixed Custom Scoreboard Background position being updated 1 frame after the scoreboard text. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Fixed various Custom Scoreboard issues. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2402)
+    + Bank showing "null" during Island Switch.
+    + Alignment not being affected by outline thickness.
+    + Alignment with scales that are not 1.
+    + Line Spacing not working.
++ Fixed Custom Scoreboard Error when no repository exists. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2407)
++ Fixed rounded rectangles not working with a scale less than 1. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2404)
+    + E.g. Custom Scoreboard Background.
+
+#### Hoppity Fixes
+
++ Fixed "Side Dish" and Milestone rabbits not sending a message when Compact Hoppity is enabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
++ Fixed rabbit rarity not appearing on compacted Duplicate rabbit messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
++ Fixed "Highlight Requirement Rabbits" requiring "Hoppity Collection Stats" to function. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2398)
 
 #### Misc Fixes
 
 + Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
 + Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
++ Fixed Christmas presents in the Hypixel lobby being visible outside of December. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2396)
 
 ### Technical Details
 
 + Cleaned up IslandExceptions to improve readability. - walker (https://github.com/hannibal002/SkyHanni/pull/1560)
 + Added drawInsideRoundedRectOutline, drawInsideImage, and image Renderables. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
++ Added `HoppityAPI`, which should house event-specific features rather than `ChocolateFactoryAPI`. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
+    + Added an `Always Hoppity` dev config option, which will override `isHoppityEvent`.
++ Added `RabbitFoundEvent`, which will be fired when a chocolate rabbit is found from an egg, bought from Hoppity, or claimed from a milestone. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
++ Added `SIDE_DISH`, `CHOCOLATE_SHOP_MILESTONE`, `CHOCOLATE_FACTORY_MILESTONE`, and `BOUGHT` as `HoppityEggType` options. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
++ Added version to download source checker popup message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2400)
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index cbfba9cc2f86..e56f21bf8773 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -962,6 +962,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Add reminder that the Time Tower is expired and has extra charges available. - appable (https://github.com/hannibal002/SkyHanni/pull/2133)
     + Replaces the previous Time Tower Reminder feature.
 + Added a tracker for stray rabbits caught in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2210)
++ Added Hoppity Hunt event summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
+    + Use /shhoppitystats for live stats.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 2794893dff71..70e814ea2905 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.1"
+    version = "0.27.Beta.2"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 7fd62c9848b1..c1ecf3ffb74f 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.1",
+    version = "0.27.Beta.2",
 )
 class SkyHanniMod {
 

From 8852ced19ce4c3b3150dd622d9b36cf7b4d6cab6 Mon Sep 17 00:00:00 2001
From: Brady <thatgravyboat@gmail.com>
Date: Mon, 26 Aug 2024 05:19:44 -0230
Subject: [PATCH 311/721] Feature: Remind Command (#1708)

Co-authored-by: Zickles <zicklesistaken@gmail.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |   2 +
 .../config/features/misc/MiscConfig.java      |   5 +
 .../config/features/misc/RemindersConfig.java |  21 ++
 .../skyhanni/config/storage/Storage.java      |   4 +
 .../features/misc/reminders/Reminder.kt       |  37 +++
 .../misc/reminders/ReminderManager.kt         | 249 ++++++++++++++++++
 6 files changed, 318 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/RemindersConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/reminders/Reminder.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index fbd93a4d840f..f021fe326d3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -63,6 +63,7 @@ import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
 import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatures
+import at.hannibal2.skyhanni.features.misc.reminders.ReminderManager
 import at.hannibal2.skyhanni.features.misc.update.UpdateManager
 import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui
 import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker
@@ -170,6 +171,7 @@ object Commands {
             { DefaultConfigFeatures.onCommand(it) },
             DefaultConfigFeatures::onComplete,
         )
+        registerCommand("shremind", "Set a reminder for yourself") { ReminderManager.command(it) }
         registerCommand("shwords", "Opens the config list for modifying visual words") { openVisualWords() }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 95d3281ec51f..54f0c7c50afd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -107,6 +107,11 @@ public class MiscConfig {
     @Accordion
     public PatcherCoordsWaypointConfig patcherCoordsWaypoint = new PatcherCoordsWaypointConfig();
 
+    @Expose
+    @ConfigOption(name = "Reminders", desc = "")
+    @Accordion
+    public RemindersConfig reminders = new RemindersConfig();
+
     @Expose
     @ConfigOption(name = "Show Outside SkyBlock", desc = "Show these features outside of SkyBlock.")
     @ConfigEditorDraggableList
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/RemindersConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/RemindersConfig.java
new file mode 100644
index 000000000000..fb7a9b785db8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/RemindersConfig.java
@@ -0,0 +1,21 @@
+package at.hannibal2.skyhanni.config.features.misc;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class RemindersConfig {
+    @Expose
+    @ConfigOption(name = "Auto Delete Reminders", desc = "Automatically deletes reminders after they have been shown once.")
+    @ConfigEditorBoolean
+    public boolean autoDeleteReminders = false;
+
+    @Expose
+    @ConfigOption(
+        name = "Reminder Interval",
+        desc = "The interval in minutes in which reminders are shown again, after they have been shown once."
+    )
+    @ConfigEditorSlider(minValue = 0f, maxValue = 60f, minStep = 1f)
+    public float interval = 5f;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
index c37ba1dd0993..252c9d8bb53e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.storage;
 
+import at.hannibal2.skyhanni.features.misc.reminders.Reminder;
 import at.hannibal2.skyhanni.features.misc.visualwords.VisualWord;
 import at.hannibal2.skyhanni.utils.LorenzVec;
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker;
@@ -50,4 +51,7 @@ public class Storage {
 
     @Expose
     public List<String> blacklistedUsers = new ArrayList<>();
+
+    @Expose
+    public Map<String, Reminder> reminders = new HashMap<>();
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/Reminder.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/Reminder.kt
new file mode 100644
index 000000000000..4dd08eafd33a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/Reminder.kt
@@ -0,0 +1,37 @@
+package at.hannibal2.skyhanni.features.misc.reminders
+
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import com.google.gson.annotations.Expose
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+import kotlin.time.Duration
+
+data class Reminder(
+    @Expose var reason: String,
+    @Expose var remindAt: SimpleTimeMark,
+    @Expose var lastReminder: SimpleTimeMark = SimpleTimeMark.farPast(),
+) {
+
+    fun formatShort(): String {
+        val time = getRemindTime()
+        val date = time.toLocalDate()
+        if (date.isEqual(LocalDate.now())) {
+            return time.format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withDefaultLocale())
+        }
+        return date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).withDefaultLocale())
+    }
+
+    fun formatFull(): String = getRemindTime().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).withDefaultLocale())
+
+    fun shouldRemind(interval: Duration) = remindAt.isInPast() && lastReminder.passedSince() >= interval
+
+    private fun getRemindTime(): ZonedDateTime = Instant.ofEpochMilli(remindAt.toMillis()).atZone(ZoneId.systemDefault())
+
+    private fun DateTimeFormatter.withDefaultLocale(): DateTimeFormatter = withLocale(Locale.getDefault())
+}
+
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
new file mode 100644
index 000000000000..472aac2de6be
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
@@ -0,0 +1,249 @@
+package at.hannibal2.skyhanni.features.misc.reminders
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.StringUtils
+import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.TimeUtils.minutes
+import at.hannibal2.skyhanni.utils.chat.Text
+import at.hannibal2.skyhanni.utils.chat.Text.asComponent
+import at.hannibal2.skyhanni.utils.chat.Text.center
+import at.hannibal2.skyhanni.utils.chat.Text.command
+import at.hannibal2.skyhanni.utils.chat.Text.fitToChat
+import at.hannibal2.skyhanni.utils.chat.Text.hover
+import at.hannibal2.skyhanni.utils.chat.Text.send
+import at.hannibal2.skyhanni.utils.chat.Text.style
+import at.hannibal2.skyhanni.utils.chat.Text.suggest
+import at.hannibal2.skyhanni.utils.chat.Text.wrap
+import net.minecraft.util.EnumChatFormatting
+import net.minecraft.util.IChatComponent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object ReminderManager {
+
+    private const val REMINDERS_PER_PAGE = 10
+
+    // Random numbers chosen, this will be used to delete the old list and action messages
+    private const val REMINDERS_LIST_ID = -546745
+    private const val REMINDERS_ACTION_ID = -546746
+    private const val REMINDERS_MESSAGE_ID = -546747
+
+    private val storage get() = SkyHanniMod.feature.storage.reminders
+    private val config get() = SkyHanniMod.feature.misc.reminders
+
+    private var listPage = 1
+
+    private fun getSortedReminders() = storage.entries.sortedBy { it.value.remindAt }
+
+    private fun sendMessage(message: String) = Text.join("§e[Reminder]", " ", message).send(REMINDERS_ACTION_ID)
+
+    private fun createDivider() = Text.HYPHEN.fitToChat().style {
+        strikethrough = true
+        color = EnumChatFormatting.BLUE
+    }
+
+    private fun parseDuration(text: String): Duration? = try {
+        val duration = TimeUtils.getDuration(text)
+        if (duration <= 1.seconds) null else duration
+    } catch (e: Exception) {
+        null
+    }
+
+    private fun listReminders(page: Int) {
+        val reminders = getSortedReminders()
+        val maxPage = (reminders.size + REMINDERS_PER_PAGE - 1) / REMINDERS_PER_PAGE
+
+        listPage = page.coerceIn(0, maxPage)
+
+        val text: MutableList<IChatComponent> = mutableListOf()
+
+        text.add(createDivider())
+
+        text.add(
+            Text.join(
+                if (listPage > 1) "§6§l<<".asComponent {
+                    hover = "§eClick to view page ${listPage - 1}".asComponent()
+                    command = "/shremind list ${listPage - 1}"
+                } else null,
+                " ",
+                "§6Reminders (Page $listPage of $maxPage)",
+                " ",
+                if (listPage < maxPage) "§6§l>>".asComponent {
+                    hover = "§eClick to view page ${listPage + 1}".asComponent()
+                    command = "/shremind list ${listPage + 1}"
+                } else null,
+            ).center(),
+        )
+
+        if (reminders.isNotEmpty()) {
+            for (i in (listPage - 1) * REMINDERS_PER_PAGE until listPage * REMINDERS_PER_PAGE) {
+                if (i >= reminders.size) break
+                val (id, reminder) = reminders[i]
+
+                text.add(
+                    Text.join(
+                        "§c✕".asComponent {
+                            hover = "§7Click to remove".asComponent()
+                            command = "/shremind remove -l $id"
+                        }.wrap("§8[", "§8]"),
+                        " ",
+                        "§e✎".asComponent {
+                            hover = "§7Click to start editing".asComponent()
+                            suggest = "/shremind edit -l $id ${reminder.reason} "
+                        }.wrap("§8[", "§8]"),
+                        " ",
+                        "§6${reminder.formatShort()}".asComponent {
+                            hover = "§7${reminder.formatFull()}".asComponent()
+                        }.wrap("§8[", "§8]"),
+                        " ",
+                        "§7${reminder.reason}",
+                    ),
+                )
+            }
+        } else {
+            text.add(Text.EMPTY)
+            text.add("§cNo reminders found.".asComponent().center())
+            text.add(Text.EMPTY)
+        }
+
+        text.add(createDivider())
+
+        Text.join(*text.toTypedArray(), separator = Text.NEWLINE).send(REMINDERS_LIST_ID)
+    }
+
+    private fun createReminder(args: Array<String>) {
+        if (args.size < 2) return help()
+
+        val time = parseDuration(args.first()) ?: return ChatUtils.userError("Invalid time format")
+        val reminder = args.drop(1).joinToString(" ")
+        val remindAt = SimpleTimeMark.now().plus(time)
+
+        storage[StringUtils.generateRandomId()] = Reminder(reminder, remindAt)
+        sendMessage("§6Reminder set for ${time.format()}")
+    }
+
+    private fun actionReminder(
+        args: List<String>,
+        command: String,
+        vararg arguments: String,
+        action: (List<String>, Reminder) -> String,
+    ) {
+        val argumentText = arguments.joinToString(" ")
+        if (args.size < arguments.size) return ChatUtils.userError("/shremind $command $argumentText")
+
+        if (args.first() == "-l") {
+            if (args.size < arguments.size + 1) return ChatUtils.userError("/shremind $command -l $argumentText")
+            if (storage[args.drop(1).first()] == null) return ChatUtils.userError("Reminder not found!")
+            action(args.drop(2), storage[args.drop(1).first()]!!).apply {
+                listReminders(listPage)
+                sendMessage(this)
+            }
+        } else if (storage[args.first()] == null) {
+            return ChatUtils.userError("Reminder not found!")
+        } else {
+            sendMessage(action(args.drop(1), storage[args.first()]!!))
+        }
+    }
+
+    private fun removeReminder(args: List<String>) = actionReminder(
+        args,
+        "remove",
+        "[id]",
+    ) { _, reminder ->
+        storage.values.remove(reminder)
+        "§cReminder deleted."
+    }
+
+    private fun editReminder(args: List<String>) = actionReminder(
+        args,
+        "edit",
+        "[id]",
+        "[reminder]",
+    ) { arguments, reminder ->
+        reminder.reason = arguments.joinToString(" ")
+        "§6Reminder edited."
+    }
+
+    private fun moveReminder(args: List<String>) = actionReminder(
+        args,
+        "move",
+        "[id]",
+        "[time]",
+    ) { arguments, reminder ->
+        val time = parseDuration(arguments.first()) ?: return@actionReminder "§cInvalid time format!"
+        reminder.remindAt = SimpleTimeMark.now().plus(time)
+        "§6Reminder moved to ${time.format()}"
+    }
+
+    private fun help() {
+        createDivider().send()
+        "§6SkyHanni Reminder Commands:".asComponent().send()
+        "§e/shremind <time> <reminder> - §bCreates a new reminder".asComponent().send()
+        "§e/shremind list <page> - §bLists all reminders".asComponent().send()
+        "§e/shremind remove <id> - §bRemoves a reminder".asComponent().send()
+        "§e/shremind edit <id> <reminder> - §bEdits a reminder".asComponent().send()
+        "§e/shremind move <id> <time> - §bMoves a reminder".asComponent().send()
+        "§e/shremind help - §bShows this help message".asComponent().send()
+        createDivider().send()
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        val remindersToSend = mutableListOf<IChatComponent>()
+
+        for ((id, reminder) in getSortedReminders()) {
+            if (!reminder.shouldRemind(config.interval.minutes)) continue
+            reminder.lastReminder = SimpleTimeMark.now()
+            var actionsComponent: IChatComponent? = null
+
+            if (!config.autoDeleteReminders) {
+                actionsComponent = Text.join(
+                    " ",
+                    "§a✔".asComponent {
+                        hover = "§7Click to dismiss".asComponent()
+                        command = "/shremind remove $id"
+                    }.wrap("§8[", "§8]"),
+                    " ",
+                    "§e§l⟳".asComponent {
+                        hover = "§7Click to move".asComponent()
+                        suggest = "/shremind move $id 1m"
+                    }.wrap("§8[", "§8]"),
+                )
+            } else {
+                storage.remove(id)
+            }
+
+            remindersToSend.add(
+                Text.join(
+                    "§e[Reminder]".asComponent {
+                        hover = "§7Reminders by SkyHanni".asComponent()
+                    },
+                    actionsComponent,
+                    " ",
+                    "§6${reminder.reason}",
+                ),
+            )
+        }
+
+        if (remindersToSend.isNotEmpty()) {
+            val id = if (config.autoDeleteReminders) 0 else REMINDERS_MESSAGE_ID
+            Text.join(remindersToSend, separator = Text.NEWLINE).send(id)
+        }
+    }
+
+    fun command(args: Array<String>) = when (args.firstOrNull()) {
+        "list" -> listReminders(args.drop(1).firstOrNull()?.toIntOrNull() ?: 1)
+        "remove", "delete" -> removeReminder(args.drop(1))
+        "edit", "update" -> editReminder(args.drop(1))
+        "move" -> moveReminder(args.drop(1))
+        "help" -> help()
+        else -> createReminder(args)
+    }
+}

From 6ef76d1001c8f33a8529e5304977da0fc9dad647 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:52:22 +0200
Subject: [PATCH 312/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
index 252c9d8bb53e..3b75a64eebbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/Storage.java
@@ -46,6 +46,7 @@ public class Storage {
     @Expose
     public Map<UUID, PlayerSpecificStorage> players = new HashMap<>();
 
+    // TODO this should get moved into player specific
     @Expose
     public String currentFameRank = "New player";
 

From ec94de0ed0af86e63f1528b7efa171f1cc2e9af4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:57:06 +0200
Subject: [PATCH 313/721] Fix: Rare Scoreboard Errors (#2411)

Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../gui/customscoreboard/CustomScoreboard.kt  | 27 ++++++++++++++++++-
 .../customscoreboard/CustomScoreboardUtils.kt | 11 ++++----
 .../customscoreboard/ScoreboardElements.kt    | 20 +++++++-------
 .../gui/customscoreboard/ScoreboardEvent.kt   |  5 +---
 .../customscoreboard/UnknownLinesHandler.kt   |  3 +--
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index f74253d36827..93a5b2a13ac0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.events.GuiPositionMovedEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
@@ -26,6 +27,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -34,6 +36,7 @@ import com.google.gson.JsonPrimitive
 import net.minecraftforge.client.GuiIngameForge
 import net.minecraftforge.client.event.RenderGameOverlayEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 typealias ScoreboardElementType = Pair<String, HorizontalAlignment>
@@ -45,6 +48,13 @@ object CustomScoreboard {
     private var cache = emptyList<ScoreboardElementType>()
     private val guiName = "Custom Scoreboard"
 
+    // Cached scoreboard data, only update after no change for 300ms
+    var activeLines = emptyList<String>()
+
+    // Most recent scoreboard state, not in use until cached
+    private var mostRecentLines = emptyList<String>()
+    private var lastScoreboardUpdate = SimpleTimeMark.farFuture()
+
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
@@ -101,8 +111,16 @@ object CustomScoreboard {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
 
+        // We want to update the scoreboard as soon as we have new data, not 5 ticks delayed
+        var dirty = false
+        if (lastScoreboardUpdate.passedSince() > 300.milliseconds) {
+            activeLines = mostRecentLines
+            lastScoreboardUpdate = SimpleTimeMark.farFuture()
+            dirty = true
+        }
+
         // Creating the lines
-        if (event.isMod(5)) {
+        if (event.isMod(5) || dirty) {
             display = createLines().removeEmptyLinesFromEdges()
             if (TabListData.fullyLoaded) {
                 cache = display.toList()
@@ -113,6 +131,13 @@ object CustomScoreboard {
         UnknownLinesHandler.handleUnknownLines()
     }
 
+    @SubscribeEvent
+    fun onScoreboardChange(event: ScoreboardUpdateEvent) {
+        mostRecentLines = event.scoreboard
+        lastScoreboardUpdate = SimpleTimeMark.now()
+    }
+
+
     internal val config get() = SkyHanniMod.feature.gui.customScoreboard
     internal val displayConfig get() = config.display
     internal val alignmentConfig get() = displayConfig.alignment
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
index 99fdc4f3fcf6..4cfc403c421f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
@@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 import at.hannibal2.skyhanni.config.features.gui.customscoreboard.DisplayConfig
 import at.hannibal2.skyhanni.data.BitsAPI
 import at.hannibal2.skyhanni.data.HypixelData
-import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.bingo.BingoAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.displayConfig
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -28,7 +27,7 @@ object CustomScoreboardUtils {
     fun getProfileTypeSymbol() = when {
         HypixelData.ironman -> "§7♲ "
         HypixelData.stranded -> "§a☀ "
-        HypixelData.bingo -> ScoreboardData.sidebarLinesFormatted.firstNotNullOfOrNull {
+        HypixelData.bingo -> CustomScoreboard.activeLines.firstNotNullOfOrNull {
             BingoAPI.getIconFromScoreboard(it)?.plus(" ")
         } ?: "§e❤ "
 
@@ -44,7 +43,7 @@ object CustomScoreboardUtils {
 
     internal fun String.formatNum() = this.formatDouble().formatNum()
 
-    internal fun getMotes() = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.motesPattern, "motes")
+    internal fun getMotes() = getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.motesPattern, "motes")
     internal fun getBank() = getGroupFromPattern(TabListData.getTabList(), ScoreboardPattern.bankPattern, "bank")
 
     internal fun getBits() = BitsAPI.bits.coerceAtLeast(0).formatNum()
@@ -58,15 +57,15 @@ object CustomScoreboardUtils {
     }
 
     internal fun getCopper() =
-        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.copperPattern, "copper")
+        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.copperPattern, "copper")
 
     internal fun getGems() = getGroupFromPattern(TabListData.getTabList(), ScoreboardPattern.gemsPattern, "gems")
 
     internal fun getHeat() =
-        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.heatPattern, "heat")
+        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.heatPattern, "heat")
 
     internal fun getNorthStars() =
-        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.northstarsPattern, "northstars")
+        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.northstarsPattern, "northstars")
 
 
     class UndetectedScoreboardLines(message: String) : Exception(message)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 88072abc1236..5753a6fd6637 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -76,7 +76,7 @@ private fun onRemoval(line: String) {
         "Unknown Lines" to confirmedUnknownLines,
         "Island" to LorenzUtils.skyBlockIsland,
         "Area" to HypixelData.skyBlockArea,
-        "Full Scoreboard" to ScoreboardData.sidebarLinesFormatted,
+        "Full Scoreboard" to CustomScoreboard.activeLines,
         noStackTrace = true,
         betaOnly = true,
     )
@@ -381,7 +381,7 @@ private fun getPurseDisplayPair(): List<ScoreboardElementType> {
     var purse = PurseAPI.currentPurse.formatNum()
 
     if (!displayConfig.hideCoinsDifference) {
-        val earned = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, PurseAPI.coinsPattern, "earned")
+        val earned = getGroupFromPattern(CustomScoreboard.activeLines, PurseAPI.coinsPattern, "earned")
         if (earned != null) purse += " §7(§e+$earned§7)§6"
     }
 
@@ -484,7 +484,7 @@ private fun getHeatDisplayPair(): List<ScoreboardElementType> {
 }
 
 private fun getHeatShowWhen() = inAnyIsland(IslandType.CRYSTAL_HOLLOWS)
-    && ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.heatPattern.matches(it) }
+    && CustomScoreboard.activeLines.any { ScoreboardPattern.heatPattern.matches(it) }
 
 private fun getColdDisplayPair(): List<ScoreboardElementType> {
     val cold = -MiningAPI.cold
@@ -499,7 +499,7 @@ private fun getColdDisplayPair(): List<ScoreboardElementType> {
 }
 
 private fun getColdShowWhen() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT) &&
-    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.coldPattern.matches(it) }
+    CustomScoreboard.activeLines.any { ScoreboardPattern.coldPattern.matches(it) }
 
 private fun getNorthStarsDisplayPair(): List<ScoreboardElementType> {
     val northStars = getNorthStars()?.formatNum() ?: "0"
@@ -542,7 +542,7 @@ private fun getIslandDisplayPair() =
 private fun getLocationDisplayPair() = buildList {
     HypixelData.skyBlockAreaWithSymbol?.let { add(it to HorizontalAlignment.LEFT) }
 
-    ScoreboardData.sidebarLinesFormatted.firstOrNull { ScoreboardPattern.plotPattern.matches(it) }
+    CustomScoreboard.activeLines.firstOrNull { ScoreboardPattern.plotPattern.matches(it) }
         ?.let { add(it to HorizontalAlignment.LEFT) }
 }
 
@@ -560,12 +560,12 @@ fun getPlayerAmountDisplayPair() = buildList {
 
 private fun getVisitDisplayPair() =
     listOf(
-        ScoreboardData.sidebarLinesFormatted.first { ScoreboardPattern.visitingPattern.matches(it) } to
+        CustomScoreboard.activeLines.first { ScoreboardPattern.visitingPattern.matches(it) } to
             HorizontalAlignment.LEFT,
     )
 
 private fun getVisitShowWhen() =
-    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.visitingPattern.matches(it) }
+    CustomScoreboard.activeLines.any { ScoreboardPattern.visitingPattern.matches(it) }
 
 private fun getDateDisplayPair() =
     listOf(
@@ -574,7 +574,7 @@ private fun getDateDisplayPair() =
 
 private fun getTimeDisplayPair(): List<ScoreboardElementType> {
     val symbol =
-        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.timePattern, "symbol") ?: ""
+        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.timePattern, "symbol") ?: ""
     return listOf(
         "§7" + SkyBlockTime.now()
             .formatted(dayAndMonthElement = false, yearElement = false, timeFormat24h = config.display.skyblockTime24hFormat) +
@@ -658,7 +658,7 @@ private fun getCookieShowWhen(): Boolean {
 }
 
 private fun getObjectiveDisplayPair() = buildList {
-    val formattedLines = ScoreboardData.sidebarLinesFormatted
+    val formattedLines = CustomScoreboard.activeLines
     val objective = formattedLines.firstOrNull { ScoreboardPattern.objectivePattern.matches(it) }
     if (objective != null) {
         add(objective to HorizontalAlignment.LEFT)
@@ -677,7 +677,7 @@ private fun getObjectiveDisplayPair() = buildList {
 }
 
 private fun getObjectiveShowWhen(): Boolean =
-    ScoreboardPattern.objectivePattern.anyMatches(ScoreboardData.sidebarLinesFormatted)
+    ScoreboardPattern.objectivePattern.anyMatches(CustomScoreboard.activeLines)
 
 private fun getSlayerDisplayPair(): List<ScoreboardElementType> = buildList {
     add((if (SlayerAPI.hasActiveSlayerQuest()) "Slayer Quest" else "<hidden>") to HorizontalAlignment.LEFT)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 7279079ef700..4e89f89a479d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
-import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.VOTING
@@ -28,9 +27,7 @@ import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern as
  * because they are visible for a maximum of like 1 minute every 5 days and ~12 hours.
  */
 
-private fun getSbLines(): List<String> {
-    return ScoreboardData.sidebarLinesFormatted
-}
+private fun getSbLines(): List<String> = CustomScoreboard.activeLines
 
 enum class ScoreboardEvent(
     private val displayLine: () -> List<String>,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index e77f670b78f3..625c91159c37 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.BitsAPI
 import at.hannibal2.skyhanni.data.PurseAPI
-import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.misc.ServerRestartTitle
 import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigies
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -17,7 +16,7 @@ object UnknownLinesHandler {
     internal lateinit var remoteOnlyPatterns: Array<Pattern>
 
     fun handleUnknownLines() {
-        val sidebarLines = ScoreboardData.sidebarLinesFormatted
+        val sidebarLines = CustomScoreboard.activeLines
 
         var unknownLines = sidebarLines
             .map { it.removeResets() }

From 57224a6c4c4dac2eba2892f29ab4f41cee435995 Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:08:48 +0100
Subject: [PATCH 314/721] Improvement: Enchant Parsing SBA Convert Roman
 Numerals and NEU Inventories compat (#1717)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../misc/items/enchants/EnchantParser.kt      | 32 +++++++++++--------
 .../misc/items/enchants/FormattedEnchant.kt   |  3 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index a1aacfb0cf05..dbd8a3a1b2eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -1,12 +1,13 @@
 package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig.CommaFormat
 import at.hannibal2.skyhanni.events.ChatHoverEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
-import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.events.item.ItemHoverEvent
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
 import at.hannibal2.skyhanni.mixins.hooks.GuiChatHook
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -38,7 +39,7 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants", "(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+)(?<stacking>, |\$| \\d{1,3}(,\\d{3})*)"
+        "enchants", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>§9, |\$| §8\\d{1,3}(,\\d{3})*)"
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"
@@ -91,10 +92,10 @@ object EnchantParser {
         }
     }
 
-    @SubscribeEvent
-    fun onTooltipEvent(event: LorenzToolTipEvent) {
+    @HandleEvent(onlyOnSkyblock = true)
+    fun onTooltipEvent(event: ItemHoverEvent) {
         // If enchants doesn't have any enchant data then we have no data to parse enchants correctly
-        if (!isEnabled() || !this.enchants.hasEnchantData()) return
+        if (!this.enchants.hasEnchantData()) return
 
         currentItem = event.itemStack
 
@@ -220,7 +221,7 @@ object EnchantParser {
             val strippedLine = loreList[i].removeColor()
 
             if (startEnchant == -1) {
-                if (this.enchants.containsEnchantment(enchants, strippedLine)) startEnchant = i
+                if (this.enchants.containsEnchantment(enchants, loreList[i])) startEnchant = i
             } else if (strippedLine.trim().isEmpty() && endEnchant == -1) endEnchant = i - 1
         }
 
@@ -232,22 +233,27 @@ object EnchantParser {
         var lastEnchant: FormattedEnchant? = null
 
         for (i in startEnchant..endEnchant) {
-            val unformattedLine = loreList[i].removeColor()
-            val matcher = enchantmentPattern.matcher(unformattedLine)
+            val matcher = enchantmentPattern.matcher(loreList[i])
             var containsEnchant = false
             var enchantsOnThisLine = 0
+            var isRoman = true
 
             while (matcher.find()) {
                 // Pull enchant, enchant level and stacking amount if applicable
                 val enchant = this.enchants.getFromLore(matcher.group("enchant"))
-                val level = matcher.group("levelNumeral").romanToDecimal()
-                val stacking = if (matcher.group("stacking").trimStart().matches("[\\d,]+\$".toRegex())) {
+                val level = try {
+                    // If one enchant is not a roman numeral we assume all are not roman numerals (idk a situation where this wouldn't be the case)
+                    matcher.group("levelNumeral").toInt().also { isRoman = false }
+                } catch (e: NumberFormatException) {
+                    matcher.group("levelNumeral").romanToDecimal()
+                }
+                val stacking = if (matcher.group("stacking").trimStart().removeColor().matches("[\\d,]+\$".toRegex())) {
                     shouldBeSingleColumn = true
                     matcher.group("stacking")
                 } else "empty"
 
                 // Last found enchant
-                lastEnchant = FormattedEnchant(enchant, level, stacking)
+                lastEnchant = FormattedEnchant(enchant, level, stacking, isRoman)
 
                 if (!orderedEnchants.add(lastEnchant)) {
                     for (e: FormattedEnchant in orderedEnchants) {
@@ -275,10 +281,10 @@ object EnchantParser {
         // Normal is leaving the formatting as Hypixel provides it
         if (config.format.get() == EnchantParsingConfig.EnchantFormat.NORMAL) {
             normalFormatting(insertEnchants)
-            // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
+        // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
         } else if (config.format.get() == EnchantParsingConfig.EnchantFormat.COMPRESSED && !shouldBeSingleColumn) {
             compressedFormatting(insertEnchants)
-            // Stacked is always forcing 1 enchant per line
+        // Stacked is always forcing 1 enchant per line
         } else {
             stackedFormatting(insertEnchants)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
index 5044152966cf..73cf57e7acb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
@@ -6,6 +6,7 @@ class FormattedEnchant(
     private val enchant: Enchant,
     private val level: Int,
     stacking: String,
+    private val isRoman: Boolean
 ) : Comparable<FormattedEnchant> {
     private val stacking: String = stacking
         get() = "§8$field"
@@ -19,7 +20,7 @@ class FormattedEnchant(
 
     fun getFormattedString(): String {
         val builder = StringBuilder()
-        builder.append(enchant.getFormattedName(level)).append(" ").append(level.toRoman())
+        builder.append(enchant.getFormattedName(level)).append(" ").append(if (isRoman) level.toRoman() else level)
 
         return if (!stacking.contains("empty")) builder.append(stacking).toString() else builder.toString()
     }

From d13954de4de5d9a04380bb4105c13d7ae564255e Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 26 Aug 2024 10:27:32 +0200
Subject: [PATCH 315/721] Feature: Starred Mob Highlight + Fels Highlight/Line
 (#1558)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           |   1 +
 .../features/dungeon/DungeonConfig.java       |   5 +
 .../dungeon/ObjectHighlighterConfig.java      |  72 +++++++++
 .../at/hannibal2/skyhanni/data/mob/Mob.kt     |  21 ++-
 .../features/dungeon/DungeonMobManager.kt     | 149 ++++++++++++++++++
 5 files changed, 242 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMobManager.kt

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index db27217cfba0..b94b0c94a02c 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -81,6 +81,7 @@
       <w>explosivity</w>
       <w>ezpz</w>
       <w>fairylosopher</w>
+      <w>fels</w>
       <w>fermento</w>
       <w>firedust</w>
       <w>firesale</w>
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
index b76039da1036..1729623d264d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
@@ -67,6 +67,11 @@ public class DungeonConfig {
     @FeatureToggle
     public boolean architectNotifier = true;
 
+    @Expose
+    @ConfigOption(name = "Object Highlighter", desc = "Highlights various things in Dungeons.")
+    @Accordion
+    public ObjectHighlighterConfig objectHighlighter = new ObjectHighlighterConfig();
+
     @Expose
     @ConfigOption(name = "Object Hider", desc = "Hide various things in Dungeons.")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
new file mode 100644
index 000000000000..385c162c6623
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
@@ -0,0 +1,72 @@
+package at.hannibal2.skyhanni.config.features.dungeon;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+
+public class ObjectHighlighterConfig {
+
+    // TODO move some stuff from DungeonConfig into this
+
+    @Expose
+    @ConfigOption(name = "Stared", desc = "")
+    @Accordion
+    public StarredConfig starred = new StarredConfig();
+
+    public static class StarredConfig {
+        @Expose
+        @ConfigOption(name = "Highlight Starred", desc = "Highlights all starred mobs in one colour.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public Property<Boolean> highlight = Property.of(true);
+
+        /*
+        TODO for someone who has time
+        @Expose
+        @ConfigOption(name = "Show Outline", desc = "Shows only a outline instead of a full highlight.")
+        @ConfigEditorBoolean
+        public Property<Boolean> showOutline = Property.of(true); */
+
+        @ConfigOption(
+            name = "No Chroma",
+            desc = "§cThe chroma setting for the color is currently not working!"
+        )
+        @ConfigEditorInfoText
+        public String info;
+
+        @Expose
+        @ConfigOption(name = "Colour", desc = "Color in which the stared mobs are highlighted.")
+        @ConfigEditorColour
+        public Property<String> colour = Property.of("0:60:255:255:0");
+    }
+
+    @Expose
+    @ConfigOption(name = "Fels Skull", desc = "")
+    @Accordion
+    public FelConfig fel = new FelConfig();
+
+    public static class FelConfig {
+
+        @Expose
+        @ConfigOption(name = "Highlight Fels Skull", desc = "Highlights fels that are not yet active.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public Property<Boolean> highlight = Property.of(true);
+
+        @Expose
+        @ConfigOption(name = "Draw Line", desc = "Draws a line to fels skulls. Works only if the highlight is enabled.")
+        @ConfigEditorBoolean
+        public Boolean line = false;
+
+        @Expose
+        @ConfigOption(name = "Colour", desc = "Color for the fel skull and line.")
+        @ConfigEditorColour
+        public Property<String> colour = Property.of("0:200:255:0:255");
+    }
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
index 1d5827490f54..7e7e9f96cdc8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
@@ -115,10 +115,17 @@ class Mob(
 
     private var highlightColor: Color? = null
 
-    /** If no alpha is set or alpha is set to 255 it will set the alpha to 127 */
-    fun highlight(color: Color) {
-        highlightColor = color.takeIf { it.alpha == 255 }?.addAlpha(127) ?: color
-        internalHighlight()
+    /** If [color] has no alpha or alpha is set to 255 it will set the alpha to 127
+     * If [color] is set to null it removes a highlight*/
+    fun highlight(color: Color?) {
+        if (color == highlightColor) return
+        if (color == null) {
+            internalRemoveColor()
+            highlightColor = null
+        } else {
+            highlightColor = color.takeIf { it.alpha == 255 }?.addAlpha(127) ?: color
+            internalHighlight()
+        }
     }
 
     private fun internalHighlight() {
@@ -162,8 +169,10 @@ class Mob(
     }
 
     private fun makeRelativeBoundingBox() =
-        (baseEntity.entityBoundingBox.union(extraEntities.filter { it !is EntityArmorStand }
-            .mapNotNull { it.entityBoundingBox }))?.offset(-baseEntity.posX, -baseEntity.posY, -baseEntity.posZ)
+        (baseEntity.entityBoundingBox.union(
+            extraEntities.filter { it !is EntityArmorStand }
+                .mapNotNull { it.entityBoundingBox },
+        ))?.offset(-baseEntity.posX, -baseEntity.posY, -baseEntity.posZ)
 
     fun fullEntityList() =
         baseEntity.toSingletonListOrEmpty() +
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMobManager.kt
new file mode 100644
index 000000000000..46450a5645d5
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMobManager.kt
@@ -0,0 +1,149 @@
+package at.hannibal2.skyhanni.features.dungeon
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.mob.Mob
+import at.hannibal2.skyhanni.data.mob.MobData
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.MobEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.getLorenzVec
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+
+@SkyHanniModule
+object DungeonMobManager {
+
+    private val config get() = SkyHanniMod.feature.dungeon.objectHighlighter
+    private val starredConfig get() = config.starred
+    private val fel get() = config.fel
+
+    private val staredInvisible = mutableSetOf<Mob>()
+    private val felOnTheGround = mutableSetOf<Mob>()
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        onToggle(
+            starredConfig.highlight,
+            starredConfig.colour,
+        ) {
+            val color = if (starredConfig.highlight.get()) getStarColor() else null
+            MobData.skyblockMobs.filter { it.hasStar }.forEach {
+                handleStar0(it, color)
+            }
+            if (!starredConfig.highlight.get()) {
+                staredInvisible.clear()
+            }
+        }
+        onToggle(
+            fel.highlight,
+            fel.colour,
+        ) {
+            if (fel.highlight.get()) {
+                if (felOnTheGround.isEmpty()) {
+                    MobData.skyblockMobs.forEach(::handleFel)
+                }
+            } else {
+                felOnTheGround.clear()
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onMobSpawn(event: MobEvent.Spawn.SkyblockMob) {
+        if (event.mob.mobType != Mob.Type.DUNGEON) return
+        handleStar(event.mob)
+        handleFel(event.mob)
+    }
+
+    @SubscribeEvent
+    fun onMobDeSpawn(event: MobEvent.DeSpawn.SkyblockMob) {
+        if (event.mob.mobType != Mob.Type.DUNGEON) return
+        if (starredConfig.highlight.get()) {
+            staredInvisible.remove(event.mob)
+        }
+        handleFelDespawn(event.mob)
+    }
+
+    @SubscribeEvent
+    fun onLorenzTick(event: LorenzTickEvent) {
+        if (!IslandType.CATACOMBS.isInIsland()) return
+        handleInvisibleStar()
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!fel.highlight.get()) return
+        if (fel.line) {
+            felOnTheGround.filter { it.canBeSeen() }.forEach {
+                event.draw3DLine(
+                    it.baseEntity.getLorenzVec().add(y = 0.15),
+                    event.exactPlayerEyeLocation(),
+                    fel.colour.get().toChromaColor(),
+                    3,
+                    true,
+                )
+            }
+        }
+
+        felOnTheGround.removeIf { mob ->
+            event.drawWaypointFilled(
+                mob.baseEntity.getLorenzVec().add(-0.5, -0.23, -0.5),
+                fel.colour.get().toChromaColor(),
+                seeThroughBlocks = false,
+                beacon = false,
+                extraSize = -0.2,
+                minimumAlpha = 0.8f,
+                inverseAlphaScale = true,
+            )
+            !mob.isInvisible()
+        }
+    }
+
+    private fun handleStar(mob: Mob) {
+        if (!starredConfig.highlight.get()) return
+        if (!mob.hasStar) return
+        handleStar0(mob, getStarColor())
+    }
+
+    private fun handleInvisibleStar() {
+        if (!starredConfig.highlight.get()) return
+        staredInvisible.removeIf {
+            val visible = !it.isInvisible()
+            if (visible) {
+                it.highlight(getStarColor())
+            }
+            visible
+        }
+    }
+
+    private fun getStarColor(): Color = starredConfig.colour.get().toChromaColor()
+
+    private fun handleStar0(mob: Mob, colour: Color?) {
+        if (mob.isInvisible()) {
+            staredInvisible.add(mob)
+            return
+        }
+        mob.highlight(colour)
+    }
+
+    private fun handleFel(mob: Mob) {
+        if (!fel.highlight.get()) return
+        if (mob.name != "Fels") return
+        if (!mob.isInvisible()) return
+        felOnTheGround.add(mob)
+    }
+
+    private fun handleFelDespawn(mob: Mob) {
+        if (!fel.highlight.get()) return
+        felOnTheGround.remove(mob)
+    }
+}

From 35b1a6a1b83a1504605bd5b5d3e4f6fd6e545c8e Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Mon, 26 Aug 2024 06:08:12 -0300
Subject: [PATCH 316/721] Feature: "Not any pests" chat filter and "No pests!"
 title (#1957)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/chat/FilterTypesConfig.java      |  6 +++
 .../garden/pests/PestFinderConfig.java        |  5 +++
 .../skyhanni/features/chat/ChatFilter.kt      |  2 +
 .../features/garden/pests/PestFinder.kt       | 40 ++++++++++++++-----
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
index 0187af82eac6..8898ab68a957 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
@@ -105,6 +105,12 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean sacrifice = false;
 
+    @Expose
+    @ConfigOption(name = "Garden Pest", desc = "Hide the message of no pests on garden.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean gardenNoPest = false;
+
     @Expose
     @ConfigOption(name = "Block Alpha Achievements", desc = "Hide achievement messages while on the Alpha network.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestFinderConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestFinderConfig.java
index 20f840084e54..587bfa73fd27 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestFinderConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestFinderConfig.java
@@ -78,6 +78,11 @@ public String toString() {
     @ConfigLink(owner = PestFinderConfig.class, field = "showDisplay")
     public Position position = new Position(-350, 200, 1.3f);
 
+    @Expose
+    @ConfigOption(name = "No Pests Title", desc = "Show a Title in case of No pests. Useful if you are using the §eGarden Pest Chat Filter")
+    @ConfigEditorBoolean
+    public boolean noPestTitle = false;
+
     @Expose
     @ConfigOption(name = "Teleport Hotkey", desc = "Press this key to warp to the nearest plot with pests on it.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 303f8de371a7..ada41bab44a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.chat.PowderMiningChatFilter.genericMiningRewardMessage
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenAPI
+import at.hannibal2.skyhanni.features.garden.pests.PestFinder
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
@@ -496,6 +497,7 @@ object ChatFilter {
         dungeonConfig.soloClass && DungeonAPI.inDungeon() && message.isPresent("solo_class") -> "solo_class"
         dungeonConfig.soloStats && DungeonAPI.inDungeon() && message.isPresent("solo_stats") -> "solo_stats"
         dungeonConfig.fairy && DungeonAPI.inDungeon() && message.isPresent("fairy") -> "fairy"
+        config.gardenNoPest && GardenAPI.inGarden() && PestFinder.noPestsChatPattern.matches(message) -> "garden_pest"
 
         else -> null
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
index c508e08a50eb..d8754fd81e70 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.garden.pests.PestFinderConfig.VisibilityType
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.garden.pests.PestUpdateEvent
@@ -19,8 +20,10 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
@@ -28,6 +31,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -39,6 +43,10 @@ object PestFinder {
     private val config get() = PestAPI.config.pestFinder
 
     private var display = emptyList<Renderable>()
+    val noPestsChatPattern by RepoPattern.pattern(
+        "chat.garden.no.pest",
+        "§cThere are not any Pests on your Garden right now! Keep farming!",
+    )
 
     @HandleEvent
     fun onPestUpdate(event: PestUpdateEvent) {
@@ -68,26 +76,28 @@ object PestFinder {
                     "§7Pests Found: §e" + if (isInaccurate) "Unknown" else pests,
                     "§7In plot §b$plotName",
                     "",
-                    "§eClick here to warp!"
+                    "§eClick here to warp!",
                 ),
                 onClick = {
                     plot.sendTeleportTo()
-                }
+                },
             )
             add(renderable)
         }
 
         if (PestAPI.getInfestedPlots().isEmpty() && PestAPI.scoreboardPests != 0) {
             add(Renderable.string("§e${PestAPI.scoreboardPests} §6Bugged pests!"))
-            add(Renderable.clickAndHover(
-                "§cTry opening your plots menu.",
-                listOf(
-                    "Runs /desk."
+            add(
+                Renderable.clickAndHover(
+                    "§cTry opening your plots menu.",
+                    listOf(
+                        "Runs /desk.",
+                    ),
+                    onClick = {
+                        HypixelCommands.gardenDesk()
+                    },
                 ),
-                onClick = {
-                    HypixelCommands.gardenDesk()
-                }
-            ))
+            )
         }
     }
 
@@ -151,12 +161,20 @@ object PestFinder {
             pests
             ) + " §c$pestsName §7in §b$plotName"
         event.drawDynamicText(
-            location, text, 1.5
+            location, text, 1.5,
         )
     }
 
     private var lastKeyPress = SimpleTimeMark.farPast()
 
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!GardenAPI.inGarden()) return
+        if (!config.noPestTitle) return
+
+        if (noPestsChatPattern.matches(event.message)) LorenzUtils.sendTitle("§eNo pests!", 2.seconds)
+    }
+
     @SubscribeEvent
     fun onKeyClick(event: LorenzKeyPressEvent) {
         if (!GardenAPI.inGarden()) return

From 81e8c4c0a62e1ad899a6fee612d8987814bb2c30 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:27:58 +0200
Subject: [PATCH 317/721] Feature: Motes in Session (#2323)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/rift/RiftConfig.java      |  2 +-
 .../features/rift/motes/MotesConfig.java      |  6 ++
 .../rift/everywhere/motes/MotesSession.kt     | 80 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/TimeUtils.kt  |  5 ++
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/MotesSession.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java
index 147709752f8a..9c24e810fc4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java
@@ -31,7 +31,7 @@ public class RiftConfig {
     public RiftAreasConfig area = new RiftAreasConfig();
 
     @Expose
-    @Category(name = "Motes", desc = "Motes Sell Price")
+    @Category(name = "Motes", desc = "")
     public MotesConfig motes = new MotesConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/MotesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/MotesConfig.java
index d9e45f8fec4d..e02b7e589362 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/MotesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/MotesConfig.java
@@ -20,6 +20,12 @@ public class MotesConfig {
     @ConfigEditorSlider(minStep = 1, minValue = 0, maxValue = 5)
     public int burgerStacks = 0;
 
+    @Expose
+    @ConfigOption(name = "Motes per Session", desc = "Show how many motes you got this session when leaving the rift.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean motesPerSession = true;
+
     @Expose
     @ConfigOption(name = "Inventory Value", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/MotesSession.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/MotesSession.kt
new file mode 100644
index 000000000000..b62b61bb2956
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/MotesSession.kt
@@ -0,0 +1,80 @@
+package at.hannibal2.skyhanni.features.rift.everywhere.motes
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.inPartialHours
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object MotesSession {
+
+    private val config get() = SkyHanniMod.feature.rift.motes.motesPerSession
+
+    private var initialMotes: Long? = null
+    private var currentMotes: Long? = null
+    private var enterRiftTime = SimpleTimeMark.farPast()
+
+    private val repoGroup = RepoPattern.group("rift.everywhere.motes")
+
+    /**
+     * REGEX-TEST:  Lifetime Motes: §r§d593,922
+     */
+    private val lifetimeMotesPattern by repoGroup.pattern(
+        "lifetime",
+        "\\s+Lifetime Motes: §r§d(?<motes>[\\d,.]+)",
+    )
+
+    @SubscribeEvent
+    fun onWidgetUpdate(event: WidgetUpdateEvent) {
+        if (!event.isWidget(TabWidget.RIFT_INFO)) return
+        lifetimeMotesPattern.firstMatcher(event.widget.lines) {
+            val amount = group("motes").formatLong()
+            if (initialMotes == null) {
+                initialMotes = amount
+                enterRiftTime = SimpleTimeMark.now()
+            }
+            // TODO move into RiftAPI, rename to lifetimeMotes, reuse in custom scoreboard maybe?
+            currentMotes = amount
+        }
+    }
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        if (event.oldIsland == IslandType.THE_RIFT) {
+            sendMotesInfo()
+            initialMotes = null
+            currentMotes = null
+        }
+    }
+
+    private fun sendMotesInfo() {
+        if (!config) return
+        val initial = initialMotes ?: return
+        val current = currentMotes ?: return
+        val gained = current - initial
+        if (gained == 0L) return
+        val timeInRift = enterRiftTime.passedSince()
+        val motesPerHour = (gained / timeInRift.inPartialHours).toLong()
+        val hover = buildList {
+            add("§7Gained: §d${gained.addSeparators()} motes")
+            add("§7Time spent: §d${timeInRift.format()}")
+            add("§7Motes/h: §d${motesPerHour.addSeparators()}")
+        }
+        ChatUtils.hoverableChat(
+            "Gained §d${gained.addSeparators()} motes §ethis Rift session! (§d${motesPerHour.shortFormat()}/h§e)",
+            hover,
+        )
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index 4d7b7ad4dc5e..201c294e5865 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -163,3 +163,8 @@ enum class TimeUnit(val factor: Long, val shortName: String, val longName: Strin
 
     fun format(value: Int, longFormat: Boolean = false) = value.addSeparators() + getName(value, longFormat)
 }
+
+val Duration.inPartialSeconds: Double get() = inWholeMilliseconds.toDouble() / 1000
+val Duration.inPartialMinutes: Double get() = inPartialSeconds / 60
+val Duration.inPartialHours: Double get() = inPartialSeconds / 3600
+val Duration.inPartialDays: Double get() = inPartialSeconds / 86_400

From 085fdbe16121954c44d30501f9a4fe4852e6e998 Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Mon, 26 Aug 2024 06:38:55 -0300
Subject: [PATCH 318/721] Feature: Exp in Superpairs as Stack Size. (#1988)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |  3 ++-
 .../inventory/ItemDisplayOverlayFeatures.kt   | 21 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 0c7556c30719..e7609135eeb0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -146,9 +146,10 @@ public enum ItemNumberEntry implements HasLegacyId {
         BOTTLE_OF_JYRRE("§bBottle Of Jyrre", 15),
         DARK_CACAO_TRUFFLE("§bDark Cacao Truffle"),
         EDITION_NUMBER("§bEdition Number", 16),
+        ENCHANTING_EXP("§bEnchanting EXP (Superpairs)"),
         BINGO_GOAL_RANK("§bBingo Goal Rank"),
         SKYBLOCK_LEVEL("§bSkyblock Level"),
-        BESTIARY_LEVEL("§bBestiary Level")
+        BESTIARY_LEVEL("§bBestiary Level"),
         ;
 
         private final String str;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 2cb5632f1314..43448f8d8a76 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.api.CollectionAPI
 import at.hannibal2.skyhanni.api.SkillAPI
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry
+import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.BESTIARY_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.BINGO_GOAL_RANK
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.BOTTLE_OF_JYRRE
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.COLLECTION_LEVEL
@@ -12,6 +13,7 @@ import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumbe
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.DUNGEON_HEAD_FLOOR_NUMBER
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.DUNGEON_POTION_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.EDITION_NUMBER
+import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.ENCHANTING_EXP
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.KUUDRA_KEY
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.LARVA_HOOK
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.MASTER_SKULL_TIER
@@ -23,7 +25,6 @@ import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumbe
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKILL_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKYBLOCK_LEVEL
 import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.VACUUM_GARDEN
-import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.BESTIARY_LEVEL
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.RenderItemTipEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
@@ -96,7 +97,16 @@ object ItemDisplayOverlayFeatures {
     )
     private val bestiaryStackPattern by patternGroup.pattern(
         "bestiarystack",
-        "§7Progress to Tier (?<tier>[\\dIVXC]+): §b[\\d.]+%"
+        "§7Progress to Tier (?<tier>[\\dIVXC]+): §b[\\d.]+%",
+    )
+
+    /**
+     * REGEX-TEST: 5k Enchanting Exp
+     * REGEX-TEST: 5.5k Enchanting Exp
+     */
+    private val enchantingExpPattern by patternGroup.pattern(
+        "enchantingexp",
+        "(?<exp>.*)k Enchanting Exp",
     )
 
     @SubscribeEvent
@@ -299,6 +309,13 @@ object ItemDisplayOverlayFeatures {
             }
         }
 
+        if (ENCHANTING_EXP.isSelected() && chestName.startsWith("Superpairs")) {
+            enchantingExpPattern.matchMatcher(item.cleanName()) {
+                val exp = group("exp").formatLong()
+                return "§b${exp.shortFormat()}"
+            }
+        }
+
         return null
     }
 

From 04fcd6c50b4d6716d5fbe5d78fc21b8143a62a5f Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:00:04 +0200
Subject: [PATCH 319/721] Improvement: Mineshaft Count (#2310)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           |  3 +-
 .../features/mining/MineshaftPityDisplay.kt   | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index b94b0c94a02c..cb91301718f0 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -147,6 +147,7 @@
       <w>millenia</w>
       <w>minecart</w>
       <w>mineman</w>
+      <w>mineshafts</w>
       <w>miniboss</w>
       <w>mirrorverse</w>
       <w>misclick</w>
@@ -276,4 +277,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
\ No newline at end of file
+</component>
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 2df9777370ec..e67341f4491a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -73,6 +73,8 @@ object MineshaftPityDisplay {
             profileStorage?.mineshaftTotalCount = value
         }
 
+    private var sessionMineshafts = 0
+
     var lastMineshaftSpawn = SimpleTimeMark.farPast()
 
     private var display = listOf<Renderable>()
@@ -104,6 +106,7 @@ object MineshaftPityDisplay {
 
             mineshaftTotalBlocks += totalBlocks
             mineshaftTotalCount++
+            sessionMineshafts++
 
             val message = event.message + " §e($counterUntilPity)"
 
@@ -201,27 +204,24 @@ object MineshaftPityDisplay {
             ),
         )
 
-        val map = buildMap {
-            put(MineshaftPityLine.TITLE, Renderable.string("§9§lMineshaft Pity Counter"))
-            put(MineshaftPityLine.COUNTER, Renderable.string("§3Pity Counter: §e$counterUntilPity§6/§e$MAX_COUNTER"))
-            put(
-                MineshaftPityLine.CHANCE,
-                Renderable.string(
-                    "§3Chance: §e1§6/§e${chance.round(1).addSeparators()} §7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
-                ),
-            )
-            put(MineshaftPityLine.NEEDED_TO_PITY, neededToPityRenderable)
-            put(
-                MineshaftPityLine.TIME_SINCE_MINESHAFT,
+        val map = mapOf(
+            MineshaftPityLine.TITLE to Renderable.string("§9§lMineshaft Pity Counter"),
+            MineshaftPityLine.COUNTER to Renderable.string("§3Pity Counter: §e$counterUntilPity§6/§e$MAX_COUNTER"),
+            MineshaftPityLine.CHANCE to Renderable.string(
+                "§3Chance: §e1§6/§e${
+                    chance.round(1).addSeparators()
+                } §7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
+            ),
+            MineshaftPityLine.NEEDED_TO_PITY to neededToPityRenderable,
+            MineshaftPityLine.TIME_SINCE_MINESHAFT to
                 Renderable.string("§3Last Mineshaft: §e${lastMineshaftSpawn.passedSince().format()}"),
-            )
-            put(
-                MineshaftPityLine.AVERAGE_BLOCKS_MINESHAFT,
+            MineshaftPityLine.AVERAGE_BLOCKS_MINESHAFT to
                 Renderable.string(
                     "§3Average Blocks/Mineshaft: §e${(mineshaftTotalBlocks / mineshaftTotalCount.toDouble()).addSeparators()}",
                 ),
-            )
-        }
+            MineshaftPityLine.MINESHAFTS_TOTAL to Renderable.string("§3Mineshafts total: §e${mineshaftTotalCount.addSeparators()}"),
+            MineshaftPityLine.MINESHAFTS_SESSION to Renderable.string("§3Mineshafts this session: §e${sessionMineshafts.addSeparators()}"),
+        )
 
         display = config.mineshaftPityLines.filter { it.shouldDisplay() }.mapNotNull { map[it] }
     }
@@ -247,6 +247,7 @@ object MineshaftPityDisplay {
         resetCounter()
         mineshaftTotalBlocks = 0
         mineshaftTotalCount = 0
+        sessionMineshafts = 0
         lastMineshaftSpawn = SimpleTimeMark.farPast()
         update()
     }
@@ -268,7 +269,9 @@ object MineshaftPityDisplay {
         CHANCE("§3Chance: §e1§6/§e1439 §7(§b0.069%§7)"),
         NEEDED_TO_PITY("§3Needed to pity:\n§7   <blocks>"),
         TIME_SINCE_MINESHAFT("§3Last Mineshaft: §e21m 5s", { !lastMineshaftSpawn.isFarPast() }),
-        AVERAGE_BLOCKS_MINESHAFT("§3Average Blocks/Mineshaft: §e361.5", { mineshaftTotalCount != 0 })
+        AVERAGE_BLOCKS_MINESHAFT("§3Average Blocks/Mineshaft: §e361.5", { mineshaftTotalCount != 0 }),
+        MINESHAFTS_TOTAL("§3Mineshafts total: §e23", { mineshaftTotalCount != 0 }),
+        MINESHAFTS_SESSION("§3Mineshafts this session: §e3", { sessionMineshafts != 0 }),
         ;
 
         override fun toString() = display

From f9f271831ba80631e73d5f5c2e44c297552af9cc Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Mon, 26 Aug 2024 07:09:49 -0300
Subject: [PATCH 320/721] Improvement: Default amount for /gfs (#1927)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/api/GetFromSackAPI.kt  | 21 ++++++++++++-------
 .../features/inventory/GetFromSackConfig.java | 11 ++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
index 54517905a5cc..7407dd66053a 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
@@ -148,7 +148,7 @@ object GetFromSackAPI {
 
         when (result) {
             CommandResult.VALID -> getFromSack(stack ?: return)
-            CommandResult.WRONG_ARGUMENT -> ChatUtils.userError("Missing arguments! Usage: /getfromsacks <name/id> <amount>")
+            CommandResult.WRONG_ARGUMENT -> ChatUtils.userError("Missing arguments! Usage: /getfromsacks <name/id> [amount]")
             CommandResult.WRONG_IDENTIFIER -> ChatUtils.userError("Couldn't find an item with this name or identifier!")
             CommandResult.WRONG_AMOUNT -> ChatUtils.userError("Invalid amount!")
             CommandResult.INTERNAL_ERROR -> {}
@@ -168,20 +168,27 @@ object GetFromSackAPI {
     )
 
     private fun commandValidator(args: List<String>): Pair<CommandResult, PrimitiveItemStack?> {
-        if (args.size <= 1) {
-            return CommandResult.WRONG_ARGUMENT to null
-        }
+        if (args.isEmpty()) return CommandResult.WRONG_ARGUMENT to null
+
+        // The last parameter could be "2*3". This does not support ending with ")", but it is good enough
+        val argsNull = !args.last().last().isDigit()
+        val arguments = if (argsNull) {
+            if (!config.defaultGFS) return CommandResult.WRONG_ARGUMENT to null
+
+            args + config.defaultAmountGFS.toString()
+        } else args
 
-        var amountString = args.last()
+        var amountString = arguments.last()
         amountString = NEUCalculator.calculateOrNull(amountString)?.toString() ?: amountString
 
         if (!amountString.isDouble()) return CommandResult.WRONG_AMOUNT to null
 
-        val itemString = args.dropLast(1).joinToString(" ").uppercase().replace(':', '-')
+        val itemString = arguments.dropLast(1).joinToString(" ").uppercase().replace(':', '-')
+        val replacedString = itemString.replace("_"," ")
 
         val item = when {
             SackAPI.sackListInternalNames.contains(itemString) -> itemString.asInternalName()
-            SackAPI.sackListNames.contains(itemString) -> NEUInternalName.fromItemNameOrNull(itemString) ?: run {
+            SackAPI.sackListNames.contains(replacedString) -> NEUInternalName.fromItemNameOrNull(replacedString) ?: run {
                 ErrorManager.logErrorStateWithData(
                     "Couldn't resolve item name",
                     "Query failed",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
index 03990536fd1f..ee77d6664317 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class GetFromSackConfig {
@@ -23,4 +24,14 @@ public class GetFromSackConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean superCraftGFS = true;
+
+    @Expose
+    @ConfigOption(name = "Default GfS", desc = "If you don't provide an amount, a default one will be used instead. Queued GfS needs to be on in order for this to work.")
+    @ConfigEditorBoolean
+    public boolean defaultGFS = false;
+
+    @Expose
+    @ConfigOption(name = "Default Amount GfS", desc = "The default amount of items used when an amount isn't provided.")
+    @ConfigEditorSlider(minValue = 1, maxValue = 64, minStep = 1)
+    public int defaultAmountGFS = 1;
 }

From 78e5046355d1047e1988b19eaadf155caae159f1 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:11:32 +1000
Subject: [PATCH 321/721] Feature: Made dye hex code show actual colour (#2321)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../features/inventory/InventoryConfig.java   |  6 ++
 .../skyhanni/features/misc/ColorHexInLore.kt  | 63 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/ColorUtils.kt |  2 +
 .../hannibal2/skyhanni/utils/ItemCategory.kt  |  2 +
 4 files changed, 73 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/ColorHexInLore.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index e7609135eeb0..f66f784c22ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -264,4 +264,10 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean stonkOfStonkPrice = true;
+
+    @Expose
+    @ConfigOption(name = "Show hex as actual color", desc = "Changes the color of hex codes to the actual color.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hexAsColorInLore = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ColorHexInLore.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ColorHexInLore.kt
new file mode 100644
index 000000000000..8767b3d2df82
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ColorHexInLore.kt
@@ -0,0 +1,63 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.events.item.ItemHoverEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils
+import at.hannibal2.skyhanni.utils.ExtendedChatColor
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+
+@SkyHanniModule
+object ColorHexInLore {
+
+    private val patternGroup = RepoPattern.group("color.item.hex.lore")
+
+    /**
+     * REGEX-TEST: §5§o§7to §4#960018§7!
+     * REGEX-TEST: §8Hex #F56FA1
+     * REGEX-TEST: Color: #1793C4
+     */
+    private val hexPattern by patternGroup.pattern(
+        "code",
+        ".*(?:Color:|Hex|to) (?:§.)?(?<hex>#[0-9a-fA-F]{1,6}).*",
+    )
+
+    /**
+     * REGEX-TEST: §5§o§7between §9#034150§7 and §9#009295§7!
+     */
+    private val doubleHexPattern by patternGroup.pattern(
+        "code.animated",
+        ".*(?<hexfirst>#[0-9a-fA-F]{6})§. and §.(?<hexsecond>#[0-9a-fA-F]{6})§.!",
+    )
+
+    @HandleEvent(onlyOnSkyblock = true)
+    fun onTooltip(event: ItemHoverEvent) {
+        if (!isEnabled()) return
+        val itemCategory = event.itemStack.getItemCategoryOrNull()
+        if (itemCategory != ItemCategory.DYE &&
+            itemCategory !in ItemCategory.armor &&
+            !InventoryUtils.openInventoryName().startsWith("Dye")
+        ) return
+
+        event.toolTip = event.toolTip.map {
+            doubleHexPattern.matchMatcher(it) {
+                it.replaceColor(group("hexfirst")).replaceColor(group("hexsecond"))
+            } ?: hexPattern.matchMatcher(it) {
+                it.replaceColor(group("hex"))
+            } ?: it
+
+        }.toMutableList()
+    }
+
+    private fun String.replaceColor(hexCode: String) = replace(hexCode, addColor(hexCode))
+
+    private fun addColor(hexFirst: String): String = ExtendedChatColor(ColorUtils.getColorFromHex(hexFirst), false).toString() + hexFirst
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.inventory.hexAsColorInLore
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
index b2057d3397c6..7b941aebedc3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
@@ -37,4 +37,6 @@ object ColorUtils {
     fun Color.withAlpha(alpha: Int): Int = (alpha.coerceIn(0, 255) shl 24) or (this.rgb and 0x00ffffff)
 
     fun Color.addAlpha(alpha: Int): Color = Color(red, green, blue, alpha)
+
+    fun getColorFromHex(hex: String): Int = runCatching { Color(Integer.decode(hex)) }.getOrNull()?.rgb ?: 0
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
index 4549e2be2626..8fa41978e70c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -63,5 +63,7 @@ enum class ItemCategory {
             stack?.getItemCategoryOrNull()?.let { this.contains(it) } ?: false
 
         val miningTools = listOf(PICKAXE, DRILL, GAUNTLET)
+
+        val armor = setOf(HELMET, CHESTPLATE, LEGGINGS, BOOTS)
     }
 }

From 70e6d63411a48ee6eb8ea398cb9ab0538455d942 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:11:59 +0200
Subject: [PATCH 322/721] Improvement: Fossil Excavator Reset Command (#2408)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  5 +++
 .../fossilexcavator/ExcavatorProfitTracker.kt | 36 +++++++++++--------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index f021fe326d3b..a1549aacf649 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -55,6 +55,7 @@ import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
+import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
@@ -280,6 +281,10 @@ object Commands {
             "shresetstrayrabbittracker",
             "Resets the Stray Rabbit Tracker",
         ) { ChocolateFactoryStrayTracker.resetCommand() }
+        registerCommand(
+            "shresetexcavatortracker",
+            "Resets the Fossil Excavator Profit Tracker",
+        ) { ExcavatorProfitTracker.resetCommand() }
         registerCommand(
             "shfandomwiki",
             "Searches the fandom wiki with SkyHanni's own method.",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
index 4477f509d903..dcf9b8c4db47 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
@@ -32,7 +32,8 @@ object ExcavatorProfitTracker {
     private val tracker = SkyHanniItemTracker(
         "Fossil Excavation Profit Tracker",
         { Data() },
-        { it.mining.fossilExcavatorProfitTracker }) { drawDisplay(it) }
+        { it.mining.fossilExcavatorProfitTracker },
+    ) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
         override fun resetItems() {
@@ -46,7 +47,7 @@ object ExcavatorProfitTracker {
             val dropRate = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0))
             return listOf(
                 "§7Dropped §e${timesGained.addSeparators()} §7times.",
-                "§7Your drop rate: §c$dropRate."
+                "§7Your drop rate: §c$dropRate.",
             )
         }
 
@@ -54,7 +55,7 @@ object ExcavatorProfitTracker {
 
         override fun getCoinDescription(item: TrackedItem): List<String> {
             return listOf(
-                "<no coins>"
+                "<no coins>",
             )
         }
 
@@ -78,8 +79,8 @@ object ExcavatorProfitTracker {
         addAsSingletonList(
             Renderable.hoverTips(
                 "§7Times excavated: §e${timesExcavated.addSeparators()}",
-                listOf("§7You excavated §e${timesExcavated.addSeparators()} §7times.")
-            )
+                listOf("§7You excavated §e${timesExcavated.addSeparators()} §7times."),
+            ),
         )
 
         profit = addScrap(timesExcavated, profit)
@@ -111,9 +112,9 @@ object ExcavatorProfitTracker {
                     "§7for all §e$fossilDustGained §fFossil Dust",
                     "§7you have collected.",
                     "",
-                    "§7Price Per Fossil Dust: §6${pricePer.shortFormat()}"
-                )
-            )
+                    "§7Price Per Fossil Dust: §6${pricePer.shortFormat()}",
+                ),
+            ),
         )
         return profit + fossilDustPrice
     }
@@ -127,8 +128,8 @@ object ExcavatorProfitTracker {
                 listOf(
                     "§7No real profit,",
                     "§7but still nice to see! Right?",
-                )
-            )
+                ),
+            ),
         )
     }
 
@@ -146,9 +147,9 @@ object ExcavatorProfitTracker {
                 listOf(
                     "§7You paid §c${scrapPrice.shortFormat()} coins §7in total",
                     "§7for all §e$timesExcavated $name",
-                    "§7you have used."
-                )
-            )
+                    "§7you have used.",
+                ),
+            ),
         )
         return profit - scrapPrice
     }
@@ -212,6 +213,11 @@ object ExcavatorProfitTracker {
         }
     }
 
-    fun isEnabled() = IslandType.DWARVEN_MINES.isInIsland() && config.enabled
-        && LorenzUtils.skyBlockArea == "Fossil Research Center"
+    fun isEnabled() = IslandType.DWARVEN_MINES.isInIsland() && config.enabled &&
+        LorenzUtils.skyBlockArea == "Fossil Research Center"
+
+    fun resetCommand() {
+        tracker.resetCommand()
+    }
+
 }

From 396ba68990b5719a5f65678da0fd27926028f033 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:12:44 +0200
Subject: [PATCH 323/721] Docs: Add Odinclient to FAQ 12 (#2414)

---
 docs/DISCORD_FAQ.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index 75e520692b39..e937ca4030a0 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -59,9 +59,10 @@ _Frequently Asked Questions_
 > If you are using [Sidebar Mod](https://github.com/Alexdoru/SidebarMod), please remove this mod.
 > If you are using [VanillaHUD](https://modrinth.com/mod/vanillahud), please update to 2.2.9 or newer to resolve this issue.
 > If you are using [Apec](https://github.com/BananaFructa/Apec/) and want to remove their Scoreboard, you need to remove Apec since they don't have an option to disable their Scoreboard.
+> If you are using [Odin](https://github.com/odtheking/Odin), disable their "Sidebar".
 > If you are using [Patcher](https://sk1er.club/mods/patcher) or [PolyPatcher](https://modrinth.com/mod/patcher) and the vanilla scoreboard is flickering, disable the "HUD Caching" option.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.
 
 
-*This FAQ was last updated on August 10th, 2024.
+*This FAQ was last updated on August 26th, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*

From 8db1b0a2394a9a804af0df87f10f12b91906ec74 Mon Sep 17 00:00:00 2001
From: Vahvl <74665243+Vahvl@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:34:28 +0300
Subject: [PATCH 324/721] Improvement: Clicked blocks highlight (#2166)

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/dungeon/DungeonConfig.java       |  5 +-
 .../dungeon/HighlightClickedBlocksConfig.java | 61 ++++++++++++
 .../dungeon/DungeonHighlightClickedBlocks.kt  | 96 +++++++++++++------
 3 files changed, 130 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
index 1729623d264d..60809f44f00b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
@@ -12,9 +12,8 @@ public class DungeonConfig {
 
     @Expose
     @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and Wither Essence when clicked in Dungeons.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean highlightClickedBlocks = false;
+    @Accordion
+    public HighlightClickedBlocksConfig clickedBlocks = new HighlightClickedBlocksConfig();
 
     @Expose
     @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in Dungeons.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java
new file mode 100644
index 000000000000..6ba7232b0dd7
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/HighlightClickedBlocksConfig.java
@@ -0,0 +1,61 @@
+package at.hannibal2.skyhanni.config.features.dungeon;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class HighlightClickedBlocksConfig {
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Highlight levers, chests, and wither essence when clicked in Dungeons.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Chest Color", desc = "Color of clicked chests.")
+    @ConfigEditorColour
+    public String chestColor = "0:178:85:255:85";
+
+    @Expose
+    @ConfigOption(name = "Trapped Chest Color", desc = "Color of clicked trapped chests.")
+    @ConfigEditorColour
+    public String trappedChestColor = "0:178:0:170:0";
+
+    @Expose
+    @ConfigOption(name = "Locked Chest Color", desc = "Color of clicked locked chests.")
+    @ConfigEditorColour
+    public String lockedChestColor = "0:178:255:85:85";
+
+    @Expose
+    @ConfigOption(name = "Wither Essence Color", desc = "Color of clicked wither essence.")
+    @ConfigEditorColour
+    public String witherEssenceColor = "0:178:255:85:255";
+
+    @Expose
+    @ConfigOption(name = "Lever Color", desc = "Color of clicked levers.")
+    @ConfigEditorColour
+    public String leverColor = "0:178:255:255:85";
+
+    @Expose
+    @ConfigOption(name = "Show Text", desc = "Shows a text saying what you clicked with the highlight.")
+    @ConfigEditorBoolean
+    public boolean showText = true;
+
+    @Expose
+    @ConfigOption(name = "Random Color", desc = "If enabled makes the colors random.")
+    @ConfigEditorBoolean
+    public boolean randomColor = false;
+
+    @ConfigOption(name = "Reset Colors", desc = "Resets the colors of the highlights to default ones.")
+    @ConfigEditorButton(buttonText = "Reset")
+    public Runnable reset = () -> {
+        chestColor = "0:178:85:255:85";
+        trappedChestColor = "0:178:0:170:0";
+        lockedChestColor = "0:178:255:85:85";
+        witherEssenceColor = "0:178:255:85:255";
+        leverColor = "0:178:255:255:85";
+    };
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index 16b5cb5f666a..64bdc90da069 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -8,49 +9,77 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.BlockUtils
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.ExtendedChatColor
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
+import at.hannibal2.skyhanni.utils.TimeLimitedCache
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.init.Blocks
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object DungeonHighlightClickedBlocks {
 
-    private val blocks = mutableListOf<ClickedBlock>()
-    private var colorIndex = 0
-    private val colors = listOf(LorenzColor.YELLOW, LorenzColor.AQUA, LorenzColor.GREEN, LorenzColor.LIGHT_PURPLE)
+    private val config get() = SkyHanniMod.feature.dungeon.clickedBlocks
+
+    private val patternGroup = RepoPattern.group("dungeons.highlightclickedblock")
+    private val leverPattern by patternGroup.pattern(
+        "lever",
+        "§cYou hear the sound of something opening...",
+    )
+    private val lockedPattern by patternGroup.pattern(
+        "locked",
+        "§cThat chest is locked!",
+    )
 
-    private fun getNextColor(): LorenzColor {
+    private val blocks = TimeLimitedCache<LorenzVec, ClickedBlock>(3.seconds)
+    private var colorIndex = 0
+    val undesirableColors = listOf(
+        LorenzColor.BLACK,
+        LorenzColor.WHITE,
+        LorenzColor.CHROMA,
+        LorenzColor.GRAY,
+        LorenzColor.DARK_GRAY,
+    )
+    private val randomColors = LorenzColor.entries.filter { it !in undesirableColors }
+
+    private fun getRandomColor(): LorenzColor {
         var id = colorIndex + 1
-        if (id == colors.size) id = 0
+        if (id == randomColors.size) id = 0
         colorIndex = id
-        return colors[colorIndex]
+        return randomColors[colorIndex]
     }
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
-        if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return
-        if (!DungeonAPI.inDungeon()) return
+        if (!isEnabled()) return
 
-        if (event.message == "§cYou hear the sound of something opening...") {
+        if (leverPattern.matches(event.message)) {
             event.blockedReason = "dungeon_highlight_clicked_block"
         }
+
+        if (lockedPattern.matches(event.message)) {
+            blocks.lastOrNull { it.value.displayText.contains("Chest") }?.value?.color = config.lockedChestColor.toChromaColor()
+        }
     }
 
     @SubscribeEvent
     fun onBlockClick(event: BlockClickEvent) {
-        if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return
-        if (!DungeonAPI.inDungeon()) return
-        if (DungeonAPI.inBossRoom) return
+        if (!isEnabled()) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
 
         val position = event.position
-        if (blocks.any { it.position == position }) return
+        if (blocks.containsKey(position)) return
 
         val type: ClickedBlockType = when (position.getBlockAt()) {
-            Blocks.chest, Blocks.trapped_chest -> ClickedBlockType.CHEST
+            Blocks.chest -> ClickedBlockType.CHEST
+            Blocks.trapped_chest -> ClickedBlockType.TRAPPED_CHEST
             Blocks.lever -> ClickedBlockType.LEVER
             Blocks.skull -> ClickedBlockType.WITHER_ESSENCE
             else -> return
@@ -69,28 +98,37 @@ object DungeonHighlightClickedBlocks {
         val inWaterRoom = DungeonAPI.getRoomID() == "-60,-60"
         if (inWaterRoom && type == ClickedBlockType.LEVER) return
 
-        val color = getNextColor()
-        val displayText = color.getChatColor() + "Clicked " + type.display
-        blocks.add(ClickedBlock(position, displayText, color, System.currentTimeMillis()))
+        val color = if (config.randomColor) getRandomColor().toColor() else type.color().toChromaColor()
+        val displayText = ExtendedChatColor(color.rgb, false).toString() + "Clicked " + type.display
+        blocks[position] = ClickedBlock(displayText, color)
+    }
+
+    enum class ClickedBlockType(val display: String, val color: () -> String) {
+        LEVER("Lever", { config.leverColor }),
+        CHEST("Chest", { config.chestColor }),
+        TRAPPED_CHEST("Trapped Chest", { config.trappedChestColor }),
+        WITHER_ESSENCE("Wither Essence", { config.witherEssenceColor }),
     }
 
     @SubscribeEvent
     fun onWorldRender(event: LorenzRenderWorldEvent) {
-        if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return
-        if (!DungeonAPI.inDungeon()) return
+        if (!isEnabled()) return
 
-        blocks.removeAll { System.currentTimeMillis() > it.time + 3000 }
-        blocks.forEach {
-            event.drawColor(it.position, it.color)
-            event.drawString(it.position.add(0.5, 0.5, 0.5), it.displayText, true)
+        blocks.forEach { (position, block) ->
+            event.drawColor(position, block.color)
+            if (config.showText) {
+                event.drawString(position.add(0.5, 0.5, 0.5), block.displayText, true)
+            }
         }
     }
 
-    class ClickedBlock(val position: LorenzVec, val displayText: String, val color: LorenzColor, val time: Long)
-
-    enum class ClickedBlockType(val display: String) {
-        LEVER("Lever"),
-        CHEST("Chest"),
-        WITHER_ESSENCE("Wither Essence"),
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(52, "dungeon.highlightClickedBlocks", "dungeon.clickedBlocks.enabled")
     }
+
+    class ClickedBlock(val displayText: String, var color: Color)
+
+    fun isEnabled() = !DungeonAPI.inBossRoom && DungeonAPI.inDungeon() && config.enabled
+
 }

From ef804948e0c6f66634926765d301f19ce6d9aee7 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:54:08 +0200
Subject: [PATCH 325/721] Improvement: Mineshaft Message (#2308)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../features/mining/MineshaftPityDisplay.kt   | 70 ++++++++++---------
 .../skyhanni/features/mining/OreType.kt       | 19 +++--
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index e67341f4491a..fd034d9b9cd4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -15,6 +15,7 @@ import at.hannibal2.skyhanni.events.mining.OreMinedEvent
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.PityBlock.Companion.getPity
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.PityBlock.Companion.getPityBlock
 import at.hannibal2.skyhanni.features.mining.OreType.Companion.getOreType
+import at.hannibal2.skyhanni.features.mining.OreType.Companion.isGemstone
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
@@ -83,13 +84,13 @@ object MineshaftPityDisplay {
 
     @HandleEvent(onlyOnSkyblock = true)
     fun onOreMined(event: OreMinedEvent) {
-        if (!isEnabled()) return
+        if (!MiningAPI.inGlacialTunnels()) return
 
-        event.originalOre.getOreType()?.getPityBlock()?.let { it.blocksBroken++ }
+        event.originalOre.getPityBlock()?.let { it.blocksBroken++ }
         event.extraBlocks.toMutableMap()
             .apply { addOrPut(event.originalOre, -1) }
             .map { (block, amount) ->
-                block.getOreType()?.getPityBlock()?.let { it.efficientMiner += amount }
+                block.getPityBlock()?.let { it.efficientMiner += amount }
             }
 
         update()
@@ -97,7 +98,7 @@ object MineshaftPityDisplay {
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
-        if (!isEnabled()) return
+        if (!MiningAPI.inGlacialTunnels()) return
         if (MiningNotifications.mineshaftSpawn.matches(event.message)) {
             val pityCounter = calculateCounter()
             val chance = calculateChance(pityCounter)
@@ -110,36 +111,37 @@ object MineshaftPityDisplay {
 
             val message = event.message + " §e($counterUntilPity)"
 
-            val hover = mutableListOf<String>()
-            hover.add("§7Blocks mined: §e$totalBlocks")
-            hover.add("§7Pity Counter: §e$pityCounter")
-            hover.add(
-                "§7Chance: " +
-                    "§e1§6/§e${chance.round(1)} " +
-                    "§7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
-            )
-            minedBlocks.forEach {
-                hover.add(
-                    "    §7${it.pityBlock.displayName} mined: " +
-                        "§e${it.blocksBroken.addSeparators()} [+${it.efficientMiner.addSeparators()} efficient miner]" +
-                        " §6(${it.pityBlock.getPity().addSeparators()}/${counterUntilPity.addSeparators()})",
+            val hoverText = buildList {
+                add("§7Blocks mined: §e$totalBlocks")
+                add("§7Pity Counter: §e$pityCounter")
+                add(
+                    "§7Chance: " +
+                        "§e1§6/§e${chance.round(1)} " +
+                        "§7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
                 )
-            }
-            hover.add("")
-            hover.add(
-                "§7Average Blocks/Mineshaft: " +
-                    "§e${(mineshaftTotalBlocks / mineshaftTotalCount.toDouble()).addSeparators()}",
-            )
-
-            if (!lastMineshaftSpawn.isFarPast()) {
-                hover.add("")
-                hover.add("§7Time since Last Mineshaft: §b${lastMineshaftSpawn.passedSince().format()}")
+                minedBlocks.forEach {
+                    add(
+                        "    §7${it.pityBlock.displayName} mined: " +
+                            "§e${it.blocksBroken.addSeparators()} [+${it.efficientMiner.addSeparators()} efficient miner]" +
+                            " §6(${it.pityBlock.getPity().addSeparators()}/${counterUntilPity.addSeparators()})",
+                    )
+                }
+                add("")
+                add(
+                    "§7Average Blocks/Mineshaft: " +
+                        "§e${(mineshaftTotalBlocks / mineshaftTotalCount.toDouble()).addSeparators()}",
+                )
+
+                if (!lastMineshaftSpawn.isFarPast()) {
+                    add("")
+                    add("§7Time since Last Mineshaft: §b${lastMineshaftSpawn.passedSince().format()}")
+                }
             }
 
             resetCounter()
 
             val newComponent = Text.text(message) {
-                this.hover = Text.multiline(hover)
+                hover = Text.multiline(hoverText)
             }
 
             if (config.modifyChatMessage) event.chatComponent = newComponent
@@ -259,8 +261,6 @@ object MineshaftPityDisplay {
         }
     }
 
-    fun isEnabled() = MiningAPI.inGlacialTunnels() && config.enabled
-
     private fun isDisplayEnabled() = (MiningAPI.inGlacialTunnels() || MiningAPI.inDwarvenBaseCamp()) && config.enabled
 
     enum class MineshaftPityLine(private val display: String, val shouldDisplay: () -> Boolean = { true }) {
@@ -298,11 +298,12 @@ object MineshaftPityDisplay {
 
         GEMSTONE(
             "Gemstone",
-            listOf(
+            /*listOf(
                 OreType.RUBY, OreType.AMBER, OreType.AMETHYST, OreType.JADE,
                 OreType.SAPPHIRE, OreType.TOPAZ, OreType.JASPER, OreType.OPAL,
                 OreType.AQUAMARINE, OreType.CITRINE, OreType.ONYX, OreType.PERIDOT,
-            ),
+            ),*/
+            OreType.entries.filter { it.isGemstone() },
             4,
             ItemStack(Blocks.stained_glass, 1, EnumDyeColor.BLUE.metadata),
         ),
@@ -335,7 +336,10 @@ object MineshaftPityDisplay {
 
         companion object {
 
-            fun OreType.getPityBlock() = entries.firstOrNull { this in it.oreTypes }
+            fun OreBlock.getPityBlock(): PityBlock? {
+                val oreType = getOreType() ?: return null
+                return entries.firstOrNull { oreType in it.oreTypes }
+            }
 
             fun PityBlock.getPity() = (blocksBroken + efficientMiner / 2.0) * multiplier
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
index 1c286097edb3..5f9743b68a0e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.mining
 
 import at.hannibal2.skyhanni.data.MiningAPI
-import at.hannibal2.skyhanni.utils.CollectionUtils.equalsOneOf
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import net.minecraft.block.state.IBlockState
@@ -191,23 +190,21 @@ enum class OreType(
 
     companion object {
 
+        private val gemstones = setOf(
+            RUBY, AMBER, AMETHYST, JADE,
+            SAPPHIRE, TOPAZ, JASPER, OPAL,
+            AQUAMARINE, CITRINE, ONYX, PERIDOT,
+        )
+
         fun IBlockState.isOreType(oreType: OreType): Boolean {
             return oreType.oreBlocks.intersect(MiningAPI.currentAreaOreBlocks)
                 .any { it.checkBlock.invoke(this) }
         }
 
-        fun OreType.isGemstone(): Boolean {
-            return this.equalsOneOf(
-                RUBY, AMBER, AMETHYST, JADE,
-                SAPPHIRE, TOPAZ, JASPER, OPAL,
-                AQUAMARINE, CITRINE, ONYX, PERIDOT,
-            )
-        }
+        fun OreType.isGemstone(): Boolean = this in gemstones
 
         fun OreBlock.getOreType(): OreType? {
-            return OreType.entries.firstOrNull {
-                it.oreBlocks.contains(this)
-            }
+            return OreType.entries.firstOrNull { this in it.oreBlocks }
         }
     }
 }

From 79173dbb7ca817148d1a923342b56fb1cf00a707 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:54:32 +0200
Subject: [PATCH 326/721] added todo

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index fd034d9b9cd4..77d580a0b194 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -169,6 +169,7 @@ object MineshaftPityDisplay {
         return chance
     }
 
+    // TODO extract into multiple smaller functions
     private fun update() {
         val pityCounter = calculateCounter()
         val chance = calculateChance(pityCounter)

From acaaa66cf6c789282f9a4eac581b85d8de26b1e3 Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:05:07 +0200
Subject: [PATCH 327/721] Feature: Forge recipe Get from Sack (#2106)

---
 .../config/features/mining/MiningConfig.java  |   6 +
 .../skyhanni/features/mining/ForgeGfs.kt      | 104 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 08c8ec894a71..5f242ecd5f47 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -96,4 +96,10 @@ public class MiningConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean highlightYourGoldenGoblin = true;
+
+    @Expose
+    @ConfigOption(name = "Forge GfS", desc = "Get Forge ingredients of a recipe.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean forgeGfs = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
new file mode 100644
index 000000000000..4971aaf3b248
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
@@ -0,0 +1,104 @@
+package at.hannibal2.skyhanni.features.mining
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.GetFromSackAPI
+import at.hannibal2.skyhanni.data.SackAPI
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ItemUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.player.inventory.ContainerLocalMenu
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ForgeGfs {
+
+    private val patternGroup = RepoPattern.group("mining.forge")
+
+    private val confirmScreenPattern by patternGroup.pattern(
+        "recipe.confirm",
+        "Confirm Process\$"
+    )
+
+    private val config get() = SkyHanniMod.feature.mining.forgeGfs
+
+    private val gfsFakeItem by lazy {
+        ItemUtils.createSkull(
+            displayName = "§aGet items from sacks",
+            uuid = "75ea8094-5152-4457-8c23-1ad9b3c176c0",
+            value = "ewogICJ0aW1lc3RhbXAiIDogMTU5MTMxMDU4NTYwOSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsC" +
+                "iAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogI" +
+                "CJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3" +
+                "RleHR1cmUvODBhMDc3ZTI0OGQxNDI3NzJlYTgwMDg2NGY4YzU3OGI5ZDM2ODg1YjI5ZGFmODM2YjY0YTcwNjg4MmI2ZWMxMCIKICAgIH0KICB9Cn0=",
+            "§8(from SkyHanni)",
+            "§7Click here to try to get all of this",
+            "§7recipe's ingredients from sacks."
+        )
+    }
+
+    private var showFakeItem = false
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryUpdatedEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config) return
+        if (!confirmScreenPattern.matches(event.inventoryName)) return
+
+        showFakeItem = true
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        showFakeItem = false
+    }
+
+    @SubscribeEvent
+    fun replaceItem(event: ReplaceItemEvent) {
+        if (event.inventory is ContainerLocalMenu && showFakeItem && event.slot == 53) {
+            event.replace(gfsFakeItem)
+        }
+    }
+
+    @SubscribeEvent
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!config) return
+        if (!showFakeItem || event.slotId != 53) return
+
+        event.cancel()
+
+        val itemMap: MutableMap<NEUInternalName, Int> = LinkedHashMap()
+        // Search for the first 4 columns only
+        // Normally would be 3, but the gemstone mixture is the only one that overflows to 4
+
+        for (i in 0..53) {
+            if (i % 9 <= 3) {
+                val currentItem = event.container.getSlot(i).stack
+                val amount = currentItem.stackSize
+                val currItemInternalName = currentItem.getInternalNameOrNull() ?: continue
+                if (SackAPI.sackListInternalNames.contains(currItemInternalName.asString())) {
+                    itemMap.addAndFold(currItemInternalName, amount)
+                }
+            }
+        }
+
+        for ((internalName, amount) in itemMap) {
+            val getItYet = GetFromSackAPI.getFromSack(internalName, amount)
+            if (!getItYet) {
+                ChatUtils.chat("§cFailed to get $amount ${internalName.itemNameWithoutColor} from sacks.")
+            }
+        }
+    }
+
+    private fun MutableMap<NEUInternalName, Int>.addAndFold(key: NEUInternalName, value: Int) {
+        this[key] = this.getOrDefault(key, 0) + value
+    }
+}

From 0de989153f2d1ae39506a6f24394118d8045ae11 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:05:38 +0200
Subject: [PATCH 328/721] code cleanup

---
 .../hannibal2/skyhanni/features/mining/ForgeGfs.kt  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
index 4971aaf3b248..28f117832f5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
@@ -26,10 +26,10 @@ object ForgeGfs {
 
     private val confirmScreenPattern by patternGroup.pattern(
         "recipe.confirm",
-        "Confirm Process\$"
+        "Confirm Process",
     )
 
-    private val config get() = SkyHanniMod.feature.mining.forgeGfs
+    private val config get() = SkyHanniMod.feature.mining
 
     private val gfsFakeItem by lazy {
         ItemUtils.createSkull(
@@ -41,7 +41,7 @@ object ForgeGfs {
                 "RleHR1cmUvODBhMDc3ZTI0OGQxNDI3NzJlYTgwMDg2NGY4YzU3OGI5ZDM2ODg1YjI5ZGFmODM2YjY0YTcwNjg4MmI2ZWMxMCIKICAgIH0KICB9Cn0=",
             "§8(from SkyHanni)",
             "§7Click here to try to get all of this",
-            "§7recipe's ingredients from sacks."
+            "§7recipe's ingredients from sacks.",
         )
     }
 
@@ -49,8 +49,7 @@ object ForgeGfs {
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryUpdatedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!config) return
+        if (!isEnabled()) return
         if (!confirmScreenPattern.matches(event.inventoryName)) return
 
         showFakeItem = true
@@ -70,7 +69,7 @@ object ForgeGfs {
 
     @SubscribeEvent
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        if (!config) return
+        if (!isEnabled()) return
         if (!showFakeItem || event.slotId != 53) return
 
         event.cancel()
@@ -101,4 +100,6 @@ object ForgeGfs {
     private fun MutableMap<NEUInternalName, Int>.addAndFold(key: NEUInternalName, value: Int) {
         this[key] = this.getOrDefault(key, 0) + value
     }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.forgeGfs
 }

From e7a4ba8bee43ccdcaee5192f4d2a0034db9f488f Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:27:24 +0100
Subject: [PATCH 329/721] Feature: Experimentation Table Guardian warning
 (#2127)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../inventory/helper/HelperConfig.java        |  6 ++
 .../inventory/experiments/GuardianReminder.kt | 92 +++++++++++++++++++
 .../{ => experiments}/UltraRareBookAlert.kt   |  2 +-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
 rename src/main/java/at/hannibal2/skyhanni/features/inventory/{ => experiments}/UltraRareBookAlert.kt (98%)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
index f6818d2c8969..5f54e707d010 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
@@ -74,6 +74,12 @@ public static class EnchantingConfig {
         @ConfigEditorBoolean
         @FeatureToggle
         public boolean ultraRareBookAlert = false;
+
+        @Expose
+        @ConfigOption(name = "Guardian Reminder", desc = "Sends a warning when opening the Experimentation Table without a §9§lGuardian Pet §7equipped.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean guardianReminder = false;
     }
 
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
new file mode 100644
index 000000000000..20c0438c91ce
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
@@ -0,0 +1,92 @@
+package at.hannibal2.skyhanni.features.inventory.experiments
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.PetAPI
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object GuardianReminder {
+
+    private val config get() = SkyHanniMod.feature.inventory.helper.enchanting
+    private var lastInventoryOpen = SimpleTimeMark.farPast()
+    private var lastErrorSound = SimpleTimeMark.farPast()
+
+    private val patternGroup = RepoPattern.group("data.enchanting.inventory.experimentstable")
+    private val inventoryNamePattern by patternGroup.pattern(
+        "mainmenu",
+        "Experimentation Table",
+    )
+    private val petNamePattern by patternGroup.pattern(
+        "guardianpet",
+        "§[956d]Guardian",
+    )
+
+    @SubscribeEvent
+    fun onInventory(event: InventoryFullyOpenedEvent) {
+        if (!isEnabled()) return
+        if (!inventoryNamePattern.matches(event.inventoryName)) return
+        if (petNamePattern.matches(PetAPI.currentPet)) return
+
+        lastInventoryOpen = SimpleTimeMark.now()
+        ChatUtils.clickToActionOrDisable(
+            "Use a §9§lGuardian Pet §efor more Exp in the Experimentation Table.",
+            option = config::guardianReminder,
+            actionName = "open pets menu",
+            action = {
+                HypixelCommands.pet()
+            },
+        )
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (!inventoryNamePattern.matches(InventoryUtils.openInventoryName())) return
+        if (lastInventoryOpen.passedSince() > 2.seconds) return
+        val gui = Minecraft.getMinecraft().currentScreen as? GuiContainer ?: return
+
+        sendTitle(gui.width, gui.height)
+        if (lastErrorSound.passedSince() > 200.milliseconds) {
+            lastErrorSound = SimpleTimeMark.now()
+            SoundUtils.playPlingSound()
+        }
+    }
+
+    // TODO rename to "send title in inventory", move to utils
+    private fun sendTitle(width: Int, height: Int) {
+        GlStateManager.pushMatrix()
+        GlStateManager.translate(0f, -150f, 500f)
+        Renderable.drawInsideRoundedRect(
+            Renderable.string("§cWrong Pet equipped!", 1.5),
+            Color(Color.DARK_GRAY.withAlpha(0), true),
+            horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
+            verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+        ).renderXYAligned(0, 125, width, height)
+
+        GlStateManager.translate(0f, 150f, -500f)
+        GlStateManager.popMatrix()
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.guardianReminder
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/UltraRareBookAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt
similarity index 98%
rename from src/main/java/at/hannibal2/skyhanni/features/inventory/UltraRareBookAlert.kt
rename to src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt
index 32f6ebb7e888..1cc849cad60a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/UltraRareBookAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.inventory
+package at.hannibal2.skyhanni.features.inventory.experiments
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderEvent

From faadba9341743843c999057e5413b8aedbd49e3f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:29:55 +0200
Subject: [PATCH 330/721] Fix: Fossil Solver texture pack (#2409)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/fossilexcavator/solver/FossilSolverDisplay.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
index ababbf3e1739..82fc73030a45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
@@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.FossilExcavatorAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.addAlpha
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -34,11 +35,11 @@ object FossilSolverDisplay {
     private val patternGroup = RepoPattern.group("mining.fossilexcavator")
     private val chargesRemainingPattern by patternGroup.pattern(
         "chargesremaining",
-        "Chisel Charges Remaining: (?<charges>\\d+)"
+        "Chisel Charges Remaining: (?<charges>\\d+)",
     )
     private val fossilProgressPattern by patternGroup.pattern(
         "fossilprogress",
-        "Fossil Excavation Progress: (?<progress>[\\d.]+%)"
+        "Fossil Excavation Progress: (?<progress>[\\d.]+%)",
     )
 
     private val inExcavatorMenu get() = FossilExcavatorAPI.inExcavatorMenu
@@ -156,14 +157,14 @@ object FossilSolverDisplay {
     }
 
     @SubscribeEvent
-    fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+    fun onBackgroundDrawn(event: GuiContainerEvent.ForegroundDrawnEvent) {
         if (!isEnabled()) return
         if (inExcavatorMenu) return
         if (slotToClick == null) return
 
         for (slot in InventoryUtils.getItemsInOpenChest()) {
             if (slot.slotIndex == slotToClick) {
-                slot highlight LorenzColor.GREEN
+                slot highlight LorenzColor.GREEN.toColor().addAlpha(90)
             }
         }
     }

From 416a767ac27c4ebf9d60c933037b7f94623e7ecf Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:49:47 +0200
Subject: [PATCH 331/721] Feature: Colors and formatting helper in chat (#2216)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  7 ++-
 .../features/chat/ColorFormattingHelper.kt    | 60 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index a1549aacf649..a8b3deb6bede 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.data.TitleManager
 import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher
 import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay
 import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper
+import at.hannibal2.skyhanni.features.chat.ColorFormattingHelper
 import at.hannibal2.skyhanni.features.chat.translation.Translator
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil
@@ -347,8 +348,12 @@ object Commands {
         ) { PestFinder.teleportNearestInfestedPlot() }
         registerCommand(
             "shhoppitystats",
-            "Look up stats for a Hoppity's Event (by SkyBlock year).\nRun standalone for a list of years that have stats."
+            "Look up stats for a Hoppity's Event (by SkyBlock year).\nRun standalone for a list of years that have stats.",
         ) { HoppityEventSummary.sendStatsMessage(it) }
+        registerCommand(
+            "shcolors",
+            "Prints a list of all Minecraft color & formatting codes in chat.",
+        ) { ColorFormattingHelper.printColorCodeList() }
     }
 
     private fun usersBugFix() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt
new file mode 100644
index 000000000000..9c7c0380614b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt
@@ -0,0 +1,60 @@
+package at.hannibal2.skyhanni.features.chat
+
+import at.hannibal2.skyhanni.utils.ChatUtils
+import net.minecraft.util.ChatComponentText
+
+object ColorFormattingHelper {
+    fun printColorCodeList() {
+        ChatUtils.chat(
+            ChatComponentText(
+                "§c=================== General Colors ===================\n" +
+                    "§f&0 = §0Black              §f&1 = §1Dark Blue\n" +
+                    "§f&2 = §2Dark Green      §f&3 = §3Dark Aqua\n" +
+                    "§f&4 = §4Dark Red         §f&5 = §5Dark Purple\n" +
+                    "§f&6 = §6Gold               §f&7 = §7Gray\n" +
+                    "§f&8 = §8Dark Gray       §f&9 = §9Blue\n" +
+                    "§f&a = §aGreen            §f&b = §bAqua\n" +
+                    "§f&c = §cRed               §f&d = §dLight Purple\n" +
+                    "§f&e = §eYellow            §f&f = §fWhite\n" +
+                    "§f&Z = §zChroma §r(needs to enable chroma setting)\n" +
+                    "§c================= Formatting Codes ==================\n" +
+                    "§f&k = Obfuscated (like this: §khellspawn§r)\n" +
+                    "§f&l = §lBold           §r&m = §mStrikethrough \n" +
+                    "§f&o = §oItalic            §r&n = §nUnderline\n" +
+                    "§f&r = Reset\n"+
+                    "§c==================================================="
+            )
+        )
+        ChatUtils.clickableChat(
+            "§eClick to view extra info about colors and formatting.",
+            onClick = { printColorCodesExtra() },
+            "§eClick to see more!",
+            prefix = false,
+        )
+    }
+
+    private fun printColorCodesExtra() {
+        ChatUtils.chat("§c================= Formatting Extra ==================", false)
+        ChatUtils.clickableLinkChat(
+            "§#§6§a§e§e§4§8§/[Click here to view codes on minecraft.wiki]",
+            "https://minecraft.wiki/w/Formatting_codes#Color_codes",
+            "§eOpen §cminecraft.wiki§e!",
+            false,
+            false,
+        )
+        ChatUtils.chat(
+            "§eYou can also uses SkyHanni's system for any colors. " +
+                "This is different from chroma. " +
+                "Simply type §6&#&f&f&9&a&2&e&/ §efor color §#§f§f§9§a§2§e§/#ff9a2e§e " +
+                "(adds §6& §ebefore every characters including §6#§e, ends with '§6&/§e').",
+            false,
+        )
+        ChatUtils.clickableLinkChat(
+            "§z[Click here to open color picker color-hex.com]",
+            url = "https://www.color-hex.com",
+            "§eOpen §ccolor-hex.com§e!",
+            prefix = false,
+        )
+        ChatUtils.chat("§c===================================================", false)
+    }
+}

From 4247a5c2f1d62ebd2a84c74a3a34287905084278 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:50:57 +0200
Subject: [PATCH 332/721] Fix: Clicked Blocks Highlight Migrator (#2415)

---
 .../java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt  | 2 +-
 .../skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 6d045d56ad2f..b677134358a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 55
+    const val CONFIG_VERSION = 56
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index 64bdc90da069..e5867273453c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -124,7 +124,7 @@ object DungeonHighlightClickedBlocks {
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(52, "dungeon.highlightClickedBlocks", "dungeon.clickedBlocks.enabled")
+        event.move(56, "dungeon.highlightClickedBlocks", "dungeon.clickedBlocks.enabled")
     }
 
     class ClickedBlock(val displayText: String, var color: Color)

From 46bc7830c80ccb068a4cef62458dc5751dac07d3 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:15:06 +0200
Subject: [PATCH 333/721] Feature: Editable Xp Bar (#1944)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/gui/GUIConfig.java        |  5 +++
 .../config/features/gui/XPBarConfig.java      | 31 +++++++++++++
 .../skyhanni/features/gui/MovableXpBar.kt     | 43 +++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/XPBarConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/gui/MovableXpBar.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
index 1c3f92b4748c..6355857f5b89 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
@@ -66,6 +66,11 @@ public class GUIConfig {
     @Accordion
     public HotbarConfig hotbar = new HotbarConfig();
 
+    @Expose
+    @ConfigOption(name = "Xp Bar", desc = "Settings for adjusting the xp bar")
+    @Accordion
+    public XPBarConfig xpBar = new XPBarConfig();
+
     @Expose
     @ConfigOption(name = "Marked Players", desc = "Players that got marked with §e/shmarkplayer§7.")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/XPBarConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/XPBarConfig.java
new file mode 100644
index 000000000000..bd2f2cac90ad
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/XPBarConfig.java
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.config.features.gui;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class XPBarConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Allows for moving and scaling the Xp bar in the SkyHanni GUI Editor.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @ConfigOption(name = "§cNotice", desc = "This option will be §c§lincompatible §r§7with mods that change the xp bar. Eg: §eApec§7.")
+    @ConfigEditorInfoText
+    public String notice = "";
+
+    @Expose
+    @ConfigLink(owner = XPBarConfig.class, field = "enabled")
+    public Position position = new Position(20, 20);
+
+    @Expose
+    @ConfigOption(name = "Show Outside Skyblock", desc = "Shows the XP bar outside of SkyBlock.")
+    @ConfigEditorBoolean
+    public boolean showOutsideSkyblock = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/MovableXpBar.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/MovableXpBar.kt
new file mode 100644
index 000000000000..4c9f59e12eda
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/MovableXpBar.kt
@@ -0,0 +1,43 @@
+package at.hannibal2.skyhanni.features.gui
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.GuiEditManager
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.transform
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraftforge.client.event.RenderGameOverlayEvent
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object MovableXpBar {
+
+    private val config get() = SkyHanniMod.feature.gui.xpBar
+
+    private var post = false
+
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onRenderXpBar(event: RenderGameOverlayEvent.Pre) {
+        if (event.type != RenderGameOverlayEvent.ElementType.EXPERIENCE || !isEnabled()) return
+        post = true
+        GlStateManager.pushMatrix()
+        val scaled = event.resolution
+        val x = scaled.scaledWidth / 2 - 91
+        val y = scaled.scaledHeight - 29
+        config.position.transform()
+        GlStateManager.translate(-x.toFloat(), -y.toFloat(), 0f) // Must be after transform to work with scaling
+        GuiEditManager.add(config.position, "Xp Bar", 182 - 1, 5 - 1) // -1 since the editor for some reason add +1
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    fun onRenderXpBar(event: RenderGameOverlayEvent.Post) {
+        if (event.type != RenderGameOverlayEvent.ElementType.EXPERIENCE || !post) return
+        GlStateManager.popMatrix()
+        post = false
+    }
+
+    private fun isEnabled() = (LorenzUtils.inSkyBlock || (Minecraft.getMinecraft().thePlayer != null && config.showOutsideSkyblock)) &&
+        config.enabled
+}

From d15d82ce6706c78265486a5114828ff5f1d02317 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:16:14 -0400
Subject: [PATCH 334/721] Fix: Minor Typos/Formatting in Hoppity's (#2416)

---
 .../skyhanni/features/event/hoppity/HoppityEventSummary.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
index f334e407e2d9..0d4e09b9c518 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
@@ -197,12 +197,12 @@ object HoppityEventSummary {
         val currentYear = SkyBlockTime.now().year
         val statsYearList = statsStorage.keys.takeIf { it.isNotEmpty() } ?: mutableListOf()
         val statsYearFormatList = statsStorage.keys.takeIf { it.isNotEmpty() }?.map {
-            "§b$it${if (it == currentYear) " §a(Current)§r" else ""}"
+            "§b$it${if (it == currentYear && HoppityAPI.isHoppityEvent()) " §a(Current)§r" else ""}"
         }?.toMutableList() ?: mutableListOf()
 
         val parsedInt: Int? = if (it.size == 1) it[0].toIntOrNull() else null
 
-        val availableYearsFormat = "§eStats are available for the following years:§af\n${statsYearFormatList.joinToString("§e,") { it }}"
+        val availableYearsFormat = "§eHoppity Event Stats are available for the following years:§r\n${statsYearFormatList.joinToString("§e, ") { it }}"
 
         if (parsedInt == null) {
             if (HoppityAPI.isHoppityEvent()) {
@@ -210,7 +210,7 @@ object HoppityEventSummary {
                 sendStatsMessage(stats, currentYear)
             } else ChatUtils.chat(availableYearsFormat)
         } else if (!statsYearList.contains(parsedInt)) {
-            ChatUtils.chat("Could not find stats for year §b$parsedInt§e.\n$availableYearsFormat")
+            ChatUtils.chat("Could not find data for year §b$parsedInt§e.\n$availableYearsFormat")
         } else {
             val stats = getYearStats(parsedInt).first ?: return
             sendStatsMessage(stats, parsedInt)

From 13e8fe4d44a8b8ca3568265ca2cd6e11bacc470e Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:47:50 +0100
Subject: [PATCH 335/721] Revert "Improvement: Enchant Parsing SBA Convert
 Roman Numerals and NEU Inventories compat" (#2417)

---
 .../misc/items/enchants/EnchantParser.kt      | 32 ++++++++-----------
 .../misc/items/enchants/FormattedEnchant.kt   |  3 +-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index dbd8a3a1b2eb..a1aacfb0cf05 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -1,13 +1,12 @@
 package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig.CommaFormat
 import at.hannibal2.skyhanni.events.ChatHoverEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.events.item.ItemHoverEvent
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
 import at.hannibal2.skyhanni.mixins.hooks.GuiChatHook
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -39,7 +38,7 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>§9, |\$| §8\\d{1,3}(,\\d{3})*)"
+        "enchants", "(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+)(?<stacking>, |\$| \\d{1,3}(,\\d{3})*)"
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"
@@ -92,10 +91,10 @@ object EnchantParser {
         }
     }
 
-    @HandleEvent(onlyOnSkyblock = true)
-    fun onTooltipEvent(event: ItemHoverEvent) {
+    @SubscribeEvent
+    fun onTooltipEvent(event: LorenzToolTipEvent) {
         // If enchants doesn't have any enchant data then we have no data to parse enchants correctly
-        if (!this.enchants.hasEnchantData()) return
+        if (!isEnabled() || !this.enchants.hasEnchantData()) return
 
         currentItem = event.itemStack
 
@@ -221,7 +220,7 @@ object EnchantParser {
             val strippedLine = loreList[i].removeColor()
 
             if (startEnchant == -1) {
-                if (this.enchants.containsEnchantment(enchants, loreList[i])) startEnchant = i
+                if (this.enchants.containsEnchantment(enchants, strippedLine)) startEnchant = i
             } else if (strippedLine.trim().isEmpty() && endEnchant == -1) endEnchant = i - 1
         }
 
@@ -233,27 +232,22 @@ object EnchantParser {
         var lastEnchant: FormattedEnchant? = null
 
         for (i in startEnchant..endEnchant) {
-            val matcher = enchantmentPattern.matcher(loreList[i])
+            val unformattedLine = loreList[i].removeColor()
+            val matcher = enchantmentPattern.matcher(unformattedLine)
             var containsEnchant = false
             var enchantsOnThisLine = 0
-            var isRoman = true
 
             while (matcher.find()) {
                 // Pull enchant, enchant level and stacking amount if applicable
                 val enchant = this.enchants.getFromLore(matcher.group("enchant"))
-                val level = try {
-                    // If one enchant is not a roman numeral we assume all are not roman numerals (idk a situation where this wouldn't be the case)
-                    matcher.group("levelNumeral").toInt().also { isRoman = false }
-                } catch (e: NumberFormatException) {
-                    matcher.group("levelNumeral").romanToDecimal()
-                }
-                val stacking = if (matcher.group("stacking").trimStart().removeColor().matches("[\\d,]+\$".toRegex())) {
+                val level = matcher.group("levelNumeral").romanToDecimal()
+                val stacking = if (matcher.group("stacking").trimStart().matches("[\\d,]+\$".toRegex())) {
                     shouldBeSingleColumn = true
                     matcher.group("stacking")
                 } else "empty"
 
                 // Last found enchant
-                lastEnchant = FormattedEnchant(enchant, level, stacking, isRoman)
+                lastEnchant = FormattedEnchant(enchant, level, stacking)
 
                 if (!orderedEnchants.add(lastEnchant)) {
                     for (e: FormattedEnchant in orderedEnchants) {
@@ -281,10 +275,10 @@ object EnchantParser {
         // Normal is leaving the formatting as Hypixel provides it
         if (config.format.get() == EnchantParsingConfig.EnchantFormat.NORMAL) {
             normalFormatting(insertEnchants)
-        // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
+            // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
         } else if (config.format.get() == EnchantParsingConfig.EnchantFormat.COMPRESSED && !shouldBeSingleColumn) {
             compressedFormatting(insertEnchants)
-        // Stacked is always forcing 1 enchant per line
+            // Stacked is always forcing 1 enchant per line
         } else {
             stackedFormatting(insertEnchants)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
index 73cf57e7acb1..5044152966cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
@@ -6,7 +6,6 @@ class FormattedEnchant(
     private val enchant: Enchant,
     private val level: Int,
     stacking: String,
-    private val isRoman: Boolean
 ) : Comparable<FormattedEnchant> {
     private val stacking: String = stacking
         get() = "§8$field"
@@ -20,7 +19,7 @@ class FormattedEnchant(
 
     fun getFormattedString(): String {
         val builder = StringBuilder()
-        builder.append(enchant.getFormattedName(level)).append(" ").append(if (isRoman) level.toRoman() else level)
+        builder.append(enchant.getFormattedName(level)).append(" ").append(level.toRoman())
 
         return if (!stacking.contains("empty")) builder.append(stacking).toString() else builder.toString()
     }

From cc02fee5bd910eb10a6eaea4098471e39aef5b4d Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:00:28 +0100
Subject: [PATCH 336/721] Improvement: Enchant Parsing SBA Convert Roman
 Numerals and NEU Inventories compat (#2418)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../misc/items/enchants/EnchantParser.kt      | 32 +++++++++++--------
 .../misc/items/enchants/FormattedEnchant.kt   |  3 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index a1aacfb0cf05..f5126d954fda 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -1,12 +1,13 @@
 package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig
 import at.hannibal2.skyhanni.config.features.inventory.EnchantParsingConfig.CommaFormat
 import at.hannibal2.skyhanni.events.ChatHoverEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
-import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.events.item.ItemHoverEvent
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
 import at.hannibal2.skyhanni.mixins.hooks.GuiChatHook
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -38,7 +39,7 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants", "(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+)(?<stacking>, |\$| \\d{1,3}(,\\d{3})*)"
+        "enchants.new", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>§9, |\$| §8\\d{1,3}(,\\d{3})*)"
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"
@@ -91,10 +92,10 @@ object EnchantParser {
         }
     }
 
-    @SubscribeEvent
-    fun onTooltipEvent(event: LorenzToolTipEvent) {
+    @HandleEvent(onlyOnSkyblock = true)
+    fun onTooltipEvent(event: ItemHoverEvent) {
         // If enchants doesn't have any enchant data then we have no data to parse enchants correctly
-        if (!isEnabled() || !this.enchants.hasEnchantData()) return
+        if (!this.enchants.hasEnchantData()) return
 
         currentItem = event.itemStack
 
@@ -220,7 +221,7 @@ object EnchantParser {
             val strippedLine = loreList[i].removeColor()
 
             if (startEnchant == -1) {
-                if (this.enchants.containsEnchantment(enchants, strippedLine)) startEnchant = i
+                if (this.enchants.containsEnchantment(enchants, loreList[i])) startEnchant = i
             } else if (strippedLine.trim().isEmpty() && endEnchant == -1) endEnchant = i - 1
         }
 
@@ -232,22 +233,27 @@ object EnchantParser {
         var lastEnchant: FormattedEnchant? = null
 
         for (i in startEnchant..endEnchant) {
-            val unformattedLine = loreList[i].removeColor()
-            val matcher = enchantmentPattern.matcher(unformattedLine)
+            val matcher = enchantmentPattern.matcher(loreList[i])
             var containsEnchant = false
             var enchantsOnThisLine = 0
+            var isRoman = true
 
             while (matcher.find()) {
                 // Pull enchant, enchant level and stacking amount if applicable
                 val enchant = this.enchants.getFromLore(matcher.group("enchant"))
-                val level = matcher.group("levelNumeral").romanToDecimal()
-                val stacking = if (matcher.group("stacking").trimStart().matches("[\\d,]+\$".toRegex())) {
+                val level = try {
+                    // If one enchant is not a roman numeral we assume all are not roman numerals (idk a situation where this wouldn't be the case)
+                    matcher.group("levelNumeral").toInt().also { isRoman = false }
+                } catch (e: NumberFormatException) {
+                    matcher.group("levelNumeral").romanToDecimal()
+                }
+                val stacking = if (matcher.group("stacking").trimStart().removeColor().matches("[\\d,]+\$".toRegex())) {
                     shouldBeSingleColumn = true
                     matcher.group("stacking")
                 } else "empty"
 
                 // Last found enchant
-                lastEnchant = FormattedEnchant(enchant, level, stacking)
+                lastEnchant = FormattedEnchant(enchant, level, stacking, isRoman)
 
                 if (!orderedEnchants.add(lastEnchant)) {
                     for (e: FormattedEnchant in orderedEnchants) {
@@ -275,10 +281,10 @@ object EnchantParser {
         // Normal is leaving the formatting as Hypixel provides it
         if (config.format.get() == EnchantParsingConfig.EnchantFormat.NORMAL) {
             normalFormatting(insertEnchants)
-            // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
+        // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
         } else if (config.format.get() == EnchantParsingConfig.EnchantFormat.COMPRESSED && !shouldBeSingleColumn) {
             compressedFormatting(insertEnchants)
-            // Stacked is always forcing 1 enchant per line
+        // Stacked is always forcing 1 enchant per line
         } else {
             stackedFormatting(insertEnchants)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
index 5044152966cf..73cf57e7acb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
@@ -6,6 +6,7 @@ class FormattedEnchant(
     private val enchant: Enchant,
     private val level: Int,
     stacking: String,
+    private val isRoman: Boolean
 ) : Comparable<FormattedEnchant> {
     private val stacking: String = stacking
         get() = "§8$field"
@@ -19,7 +20,7 @@ class FormattedEnchant(
 
     fun getFormattedString(): String {
         val builder = StringBuilder()
-        builder.append(enchant.getFormattedName(level)).append(" ").append(level.toRoman())
+        builder.append(enchant.getFormattedName(level)).append(" ").append(if (isRoman) level.toRoman() else level)
 
         return if (!stacking.contains("empty")) builder.append(stacking).toString() else builder.toString()
     }

From 877dcd159a2c58444fecd720648d910aafa371ce Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:06:41 +0200
Subject: [PATCH 337/721] fix typo

---
 .../hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
index 0a0b6b238181..62f4c46561c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
@@ -103,7 +103,7 @@ object LimboTimeTracker {
             return
         }
         val duration = limboJoinTime.passedSince().format()
-        config.showTimeInLimboPosition.renderString("§eIn limbo since §b$duration", posLabel = "Limbo Time Tracker")
+        config.showTimeInLimboPosition.renderString("§eIn Limbo since §b$duration", posLabel = "Limbo Time Tracker")
     }
 
     private fun leaveLimbo() {

From 37e1cd336d8f32913b99969941b8fc7a836d77e4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 27 Aug 2024 14:52:39 +0200
Subject: [PATCH 338/721] Version 0.27 Beta 3

---
 docs/CHANGELOG.md                             | 57 +++++++++++++++++++
 docs/FEATURES.md                              | 19 +++++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 668621107529..2249f35be328 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,27 @@
 
 ### New Features
 
+#### Garden Features
+
++ Added No Pests Chat Filter. - saga (https://github.com/hannibal002/SkyHanni/pull/1957)
+    + Removed the chat message "There are no Pests on your Garden!".
++ Added No Pests Title. - saga (https://github.com/hannibal002/SkyHanni/pull/1957)
+    + Shows a title when you use the Pest Tracker without any pests to clear.
+
+#### Mining Features
+
++ Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
+
+#### Rift Features
+
++ Added Motes per Session. - Empa (https://github.com/hannibal002/SkyHanni/pull/2323)
+
+#### Dungeon Features
+
++ Added highlight for starred dungeon mobs. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
++ Added highlight for Fel skulls. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
+    + Optionally draws a line to them as well.
+
 #### Scoreboard Features
 
 + Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
@@ -14,8 +35,33 @@
 + Added Hoppity Hunt event summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
     + Use /shhoppitystats for live stats.
 
+#### GUI Features
+
++ Added Editable XP Bar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1944)
+    + Enabled moving and scaling of the XP bar in the SkyHanni GUI Editor.
+
+#### Inventory Features
+
++ Added a warning when opening the Experimentation Table without a Guardian pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2127)
++ Added Enchanting Experience as Stack Size in Experimentation Table. - saga (https://github.com/hannibal002/SkyHanni/pull/1988)
+    + Added to the Item Number list.
++ Show dye hex code as the actual color in the item lore. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
+
+#### Chat Features
+
++ Added `/shcolors` command. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2216)
+    + Prints a list of all Minecraft color and formatting codes in chat.
++ Added Remind command. - ThatGravyBoat & Zickles (https://github.com/hannibal002/SkyHanni/pull/1708)
+    + Use `/shremind <time> <note>` to set reminders for your future self.
+
 ### Improvements
 
+#### Mining Improvements
+
++ Now allows modifying the Mineshaft spawn message without requiring the Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2308)
++ Added reset command for Fossil Excavator Profit Tracker. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2408)
++ Added current session and total Mineshaft count to the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2310)
+
 #### Diana Improvements
 
 + Added /warp stonks to the Burrow Warp Helper. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2399)
@@ -31,10 +77,17 @@
 #### Inventory Improvements
 
 + Added a toggle for displaying SkyHanni User Luck in Skyblock Stats. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2357)
++ Improved the clicked block highlight feature. - Vahvl & j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2166)
+    + Added extensive customization options for colors, locked chest detection, and more.
++ Improved Enchant Parsing compatibility with other mods. - Vixid (https://github.com/hannibal002/SkyHanni/pull/1717)
+    + Now works with SBA's Convert Roman Numerals feature.
+    + Now works with NEU's inventories, such as `/pv` and storage overlay.
 
 #### Chat Improvements
 
 + Added support for changing the translation language when clicking on a chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2403)
++ Added support for using the "/gfs <item>" command without specifying an amount. - saga (https://github.com/hannibal002/SkyHanni/pull/1927)
+    + The default value can be modified in the config.
 
 #### Hoppity Improvements
 
@@ -68,6 +121,7 @@
 
 + Added new Pure Ores support. - Empa (https://github.com/hannibal002/SkyHanni/pull/2388)
 + Fixed a typo in corpse detection. - Maratons4 (https://github.com/hannibal002/SkyHanni/pull/2386)
++ Fixed a compatibility issue in Fossil Solver with resource packs like Hypixel+. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2409)
 
 #### Scoreboard Fixes
 
@@ -81,12 +135,14 @@
 + Fixed Custom Scoreboard Error when no repository exists. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2407)
 + Fixed rounded rectangles not working with a scale less than 1. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2404)
     + E.g. Custom Scoreboard Background.
++ Fixed rare Custom Scoreboard errors. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2411)
 
 #### Hoppity Fixes
 
 + Fixed "Side Dish" and Milestone rabbits not sending a message when Compact Hoppity is enabled. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
 + Fixed rabbit rarity not appearing on compacted Duplicate rabbit messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
 + Fixed "Highlight Requirement Rabbits" requiring "Hoppity Collection Stats" to function. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2398)
++ Fixed minor formatting issues with Hoppity Event Summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2416)
 
 #### Misc Fixes
 
@@ -103,6 +159,7 @@
 + Added `RabbitFoundEvent`, which will be fired when a chocolate rabbit is found from an egg, bought from Hoppity, or claimed from a milestone. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
 + Added `SIDE_DISH`, `CHOCOLATE_SHOP_MILESTONE`, `CHOCOLATE_FACTORY_MILESTONE`, and `BOUGHT` as `HoppityEggType` options. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
 + Added version to download source checker popup message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2400)
++ Added "hex string to color int" method in ColorUtils. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index e56f21bf8773..6c34b584f6be 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -110,6 +110,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Dungeon hub race waypoints. - seraid (https://github.com/hannibal002/SkyHanni/pull/1471)
     + Only works for Nothing; No return races.
 + Added the ability to hide solo class, solo class stats and fairy dialogue chat messages in Dungeons. - raven (https://github.com/hannibal002/SkyHanni/pull/1702)
++ Added highlight for starred dungeon mobs. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
++ Added highlight for Fel skulls. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
+    + Optionally draws a line to them as well.
 
 </details>
 <details open><summary>
@@ -735,6 +738,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added toggle for compacting Garden visitor summary messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2026)
 + Added Farming Personal Best FF Gain. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2332)
     + Displays in chat how much additional FF you earn from the farming contest personal best bonus after beating your previous record.
++ Added No Pests Chat Filter. - saga (https://github.com/hannibal002/SkyHanni/pull/1957)
+    + Removed the chat message "There are no Pests on your Garden!".
++ Added No Pests Title. - saga (https://github.com/hannibal002/SkyHanni/pull/1957)
+    + Shows a title when you use the Pest Tracker without any pests to clear.
 
 </details>
 <details open><summary>
@@ -816,6 +823,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Punchcard Artifact Highlighter & Overlay. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1089)
     + Highlights unpunched players in the Rift.
 + Added Splatter Hearts Highlight for the Rift. - Empa (https://github.com/hannibal002/SkyHanni/pull/2318)
++ Added Motes per Session. - Empa (https://github.com/hannibal002/SkyHanni/pull/2323)
 
 </details>
 <details open><summary>
@@ -876,6 +884,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Added powder cost for 10 levels.
 + Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655)
     + Displays information about Mineshaft spawns, your progress towards a Pity Mineshaft, and more.
++ Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
 
 </details>
 <details open><summary>
@@ -995,6 +1004,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Can be used like `/shupdate <beta/full>` to download updates from a specific update stream.
 + /shignore. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1469)
     + This lets you block users from running party commands.
++ Added `/shcolors` command. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2216)
+    + Prints a list of all Minecraft color and formatting codes in chat.
++ Added Remind command. - ThatGravyBoat & Zickles (https://github.com/hannibal002/SkyHanni/pull/1708)
+    + Use `/shremind <time> <note>` to set reminders for your future self.
 
 </details>
 <details open><summary>
@@ -1261,6 +1274,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Editable Hotbar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1903)
     + Allows for moving and scaling in the SkyHanni GUI editor.
 + ULTRA RARE Book Notification when doing the Experiment Table. - raven (https://github.com/hannibal002/SkyHanni/pull/1738)
++ Added a warning when opening the Experimentation Table without a Guardian pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2127)
++ Added Enchanting Experience as Stack Size in Experimentation Table. - saga (https://github.com/hannibal002/SkyHanni/pull/1988)
+    + Added to the Item Number list.
 + In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
 + Added Beacon Power Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1901)
@@ -1283,6 +1299,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Also punishes players who don't read patch notes.
 + Added Crown of Avarice counter. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2229)
 + Added a title notification for when the Thunder Bottle is fully charged. - raven (https://github.com/hannibal002/SkyHanni/pull/2234)
++ Added Editable XP Bar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1944)
+    + Enabled moving and scaling of the XP bar in the SkyHanni GUI Editor.
++ Show dye hex code as the actual color in the item lore. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 70e814ea2905..20c81cc18ad0 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.2"
+    version = "0.27.Beta.3"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index c1ecf3ffb74f..595d42ad3f68 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.2",
+    version = "0.27.Beta.3",
 )
 class SkyHanniMod {
 

From a956fe9546b746bbd171f5e33d3c1089112f86b2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:34:58 +0200
Subject: [PATCH 339/721] deprecate old entity detection logic

---
 .../java/at/hannibal2/skyhanni/utils/EntityUtils.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index d123fa991bd8..c3d3d248f115 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -41,15 +41,14 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object EntityUtils {
 
+    @Deprecated("Old. Instead use entity detection feature instead.")
     fun EntityLivingBase.hasNameTagWith(
         y: Int,
         contains: String,
         debugRightEntity: Boolean = false,
         inaccuracy: Double = 1.6,
         debugWrongEntity: Boolean = false,
-    ): Boolean {
-        return getNameTagWith(y, contains, debugRightEntity, inaccuracy, debugWrongEntity) != null
-    }
+    ): Boolean = getNameTagWith(y, contains, debugRightEntity, inaccuracy, debugWrongEntity) != null
 
     fun getPlayerEntities(): MutableList<EntityOtherPlayerMP> {
         val list = mutableListOf<EntityOtherPlayerMP>()
@@ -68,6 +67,7 @@ object EntityUtils {
         it.getNameAsString().contains(contains)
     }
 
+    @Deprecated("Old. Instead use entity detection feature instead.")
     fun EntityLivingBase.getNameTagWith(
         y: Int,
         contains: String,
@@ -76,6 +76,7 @@ object EntityUtils {
         debugWrongEntity: Boolean = false,
     ): EntityArmorStand? = getAllNameTagsWith(y, contains, debugRightEntity, inaccuracy, debugWrongEntity).firstOrNull()
 
+    @Deprecated("Old. Instead use entity detection feature instead.")
     fun EntityLivingBase.getAllNameTagsWith(
         y: Int,
         contains: String,
@@ -107,9 +108,10 @@ object EntityUtils {
         return worldObj.getEntitiesWithinAABB(clazz, alignedBB)
     }
 
+    @Deprecated("Old. Instead use entity detection feature instead.")
     fun EntityLivingBase.hasBossHealth(health: Int): Boolean = this.hasMaxHealth(health, true)
 
-    // TODO remove baseMaxHealth
+    @Deprecated("Old. Instead use entity detection feature instead.")
     fun EntityLivingBase.hasMaxHealth(health: Int, boss: Boolean = false, maxHealth: Int = baseMaxHealth): Boolean {
         val derpyMultiplier = if (LorenzUtils.isDerpy) 2 else 1
         if (maxHealth == health * derpyMultiplier) return true

From 2af0fd1e7b39b433ff7a98dff08a1cd55b285c0b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 28 Aug 2024 09:23:42 +0200
Subject: [PATCH 340/721] Fix: Patcher coordinates chat detection (#2410)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/misc/PatcherSendCoordinates.kt          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
index 9953199c8695..98232a428d3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
@@ -30,10 +30,12 @@ object PatcherSendCoordinates {
 
     /**
      * REGEX-TEST: hannibal2: x: 2, y: 3, z: 4
+     * REGEX-TEST: hannibal2: x: 2, y: 3, z: 4broken
+     * REGEX-TEST: hannibal2: x: 2, y: 3, z: 4 extra text
      */
     private val coordinatePattern by RepoPattern.pattern(
         "misc.patchercoords.coords",
-        "(?<playerName>.*): [xX]: (?<x>[0-9.-]+),? [yY]: (?<y>[0-9.-]+),? [zZ]: (?<z>.*)"
+        "(?<playerName>.*): [xX]: (?<x>[0-9.-]+),? [yY]: (?<y>[0-9.-]+),? [zZ]: (?<z>[0-9.-]+(?: .*)?)"
     )
 
     @SubscribeEvent

From c9fbe18b61bfb40e4b0b56bc9aadc56ca54c5d75 Mon Sep 17 00:00:00 2001
From: Shrey Jain <143933598+shreyjain14@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:55:00 +0530
Subject: [PATCH 341/721] FIX optimal speed for cactus (#2424)

---
 .../features/garden/optimalspeed/CustomSpeedConfig.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java
index 16416372ae5e..ffe493fc926c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java
@@ -65,11 +65,9 @@ public class CustomSpeedConfig {
 
     @Expose
     @ConfigOption(name = "Cactus", desc = "Suggested farm speed:\n" +
-        "§eNormal§7: §f✦ 400 speed\n" +
-        "§eRacing Helmet§7: §f✦ 464 speed\n" +
-        "§eBlack Cat§7: §f✦ 464 speed")
+        "§eYaw 90§7: §f✦ 464 speed")
     @ConfigEditorSlider(minValue = 1, maxValue = 500, minStep = 1)
-    public Property<Float> cactus = Property.of(400f);
+    public Property<Float> cactus = Property.of(464f);
 
     // TODO does other speed settings exist?
     @Expose

From e41d4e8e025a7f98aa1798d6698be2849dd91050 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 30 Aug 2024 11:57:00 +0200
Subject: [PATCH 342/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
index a7709e5ed547..483bb6d047ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
@@ -185,6 +185,7 @@ object APIUtil {
         return BufferedReader(InputStreamReader(FileInputStream(file), StandardCharsets.UTF_8))
     }
 
+    // TODO remove command, use clickable chat message instead
     fun toggleApiErrorMessages() {
         showApiErrors = !showApiErrors
         ChatUtils.chat("Hypixel API error messages " + if (showApiErrors) "§chidden" else "§ashown")

From 46f167d2c0a583b6c6c68fc4edd8aff73a282a56 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 30 Aug 2024 12:43:48 +0200
Subject: [PATCH 343/721] Fix: Github Actions Artifact path (#2429)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8275ac8b0740..7c75f0eef805 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
                 name: Upload development build
                 with:
                     name: "Development Build"
-                    path: versions/1.8.9/build/libs/*.jar
+                    path: build/libs/*.jar
             -   name: Test with Gradle
                 run: ./gradlew test
             -   uses: actions/upload-artifact@v3

From 01923d311bcb32594209db0ad024611d569361c0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 30 Aug 2024 23:25:21 +0200
Subject: [PATCH 344/721] Improvment: Mining Event Display Icons nbt id (#2425)

---
 .../mining/eventtracker/MiningEventType.kt    | 150 ++++++++++--------
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  |  12 +-
 2 files changed, 96 insertions(+), 66 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
index eb56a0dd31b2..15d46c0466a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.mining.eventtracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.utils.ItemUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.overrideId
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -24,77 +25,94 @@ enum class MiningEventType(
     private val colorCode: Char,
     val dwarvenSpecific: Boolean,
     iconInput: Renderable,
+    val itemStack: ItemStack? = null,
 ) {
-    GONE_WITH_THE_WIND("GONE WITH THE WIND", "Wind", 18.minutes, '9', false, object : Renderable {
-        override val width = 10
-        override val height = 10
-        override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
-        override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
-
-        val compass = Renderable.itemStack(Items.compass.toItemStack(), 0.45)
-        val wind = Renderable.string("§9≈", scale = 0.75)
-
-        override fun render(posX: Int, posY: Int) {
-            GlStateManager.translate(1f, 1f, -2f)
-            compass.render(posX, posY)
-            GlStateManager.translate(-1f, -2f, 2f)
-            wind.render(posX, posY)
-            GlStateManager.translate(0f, 1f, 0f)
-        }
-    }),
-    DOUBLE_POWDER("2X POWDER", "2x", 15.minutes, 'b', false, object : Renderable {
-        override val width = 10
-        override val height = 10
-        override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
-        override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
-
-        val dyeGreen = Renderable.itemStack(Items.dye.toItemStack(10), 0.45)
-        val dyePink = Renderable.itemStack(Items.dye.toItemStack(9), 0.45)
-
-        override fun render(posX: Int, posY: Int) {
-            GlStateManager.translate(1f, 0f, 0f)
-            dyePink.render(posX + 1, posY - 1)
-            GlStateManager.translate(-2f, 1.5f, 0f)
-            dyeGreen.render(posX, posY)
-            GlStateManager.translate(1f, -1.5f, 0f)
-        }
+    GONE_WITH_THE_WIND(
+        "GONE WITH THE WIND", "Wind", 18.minutes, '9', false,
+        object : Renderable {
+            override val width = 10
+            override val height = 10
+            override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
+            override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
+
+            val compass = Renderable.itemStack(Items.compass.toItemStack(), 0.45)
+            val wind = Renderable.string("§9≈", scale = 0.75)
+
+            override fun render(posX: Int, posY: Int) {
+                GlStateManager.translate(1f, 1f, -2f)
+                compass.render(posX, posY)
+                GlStateManager.translate(-1f, -2f, 2f)
+                wind.render(posX, posY)
+                GlStateManager.translate(0f, 1f, 0f)
+            }
+        },
+    ),
+    DOUBLE_POWDER(
+        "2X POWDER", "2x", 15.minutes, 'b', false,
+        object : Renderable {
+            override val width = 10
+            override val height = 10
+            override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
+            override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
+
+            val dyeGreen = Renderable.itemStack(Items.dye.toItemStack(10), 0.45)
+            val dyePink = Renderable.itemStack(Items.dye.toItemStack(9), 0.45)
+
+            override fun render(posX: Int, posY: Int) {
+                GlStateManager.translate(1f, 0f, 0f)
+                dyePink.render(posX + 1, posY - 1)
+                GlStateManager.translate(-2f, 1.5f, 0f)
+                dyeGreen.render(posX, posY)
+                GlStateManager.translate(1f, -1.5f, 0f)
+            }
 
-    }),
+        },
+    ),
     GOBLIN_RAID(
-        "GOBLIN RAID", "Raid", 5.minutes, 'c', true, ItemUtils.createSkull(
+        "GOBLIN RAID", "Raid", 5.minutes, 'c', true,
+        ItemUtils.createSkull(
             "Goblin",
             "32518c29-6127-3c71-b2a7-be4c3251e76f",
-            "ewogICJ0aW1lc3RhbXAiIDogMTYwNzQ2NDg4MTMwOCwKICAicHJvZmlsZUlkIiA6ICJhMmY4MzQ1OTVjODk0YTI3YWRkMzA0OTcxNmNhOTEwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJiUHVuY2giLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcyODUwOTA2YjdmMGQ5NTJjMGU1MDgwNzNjYzQzOWZkMzM3NGNjZjViODg5YzA2ZjdlOGQ5MGNjMGNjMjU1YyIKICAgIH0KICB9Cn0="
-        )
+            "ewogICJ0aW1lc3RhbXAiIDogMTYwNzQ2NDg4MTMwOCwKICAicHJvZmlsZUlkIiA6ICJhMmY4MzQ1OTVjODk0YTI3YWRkMzA0OTcxNmNhOTEwYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJiUHVuY2giLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcyODUwOTA2YjdmMGQ5NTJjMGU1MDgwNzNjYzQzOWZkMzM3NGNjZjViODg5YzA2ZjdlOGQ5MGNjMGNjMjU1YyIKICAgIH0KICB9Cn0=",
+        ),
     ),
-    BETTER_TOGETHER("BETTER TOGETHER", "Better", 18.minutes, 'd', false, object : Renderable {
-        override val width = 10
-        override val height = 10
-        override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
-        override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
-
-        val steveHead = Renderable.itemStack(Items.skull.toItemStack(3), 0.36)
-        val alexHead = Renderable.itemStack(
-            ItemUtils.createSkull(
-                "Alex",
-                "6ab43178-89fd-4905-97f6-0f67d9d76fd9",
-                "fRBfVNlIWW6cL478st/8NsNEHVxjvwQDp4+MbKbFj1tPZvxXgpIXRaQsLeDl/0+E4tipPKNANAbmqj9EKAVx3b3gDqLLrTTk/NfuH2RD3I5ppzio8w5oYk1022SopaayGBP4+kuwktDHzlR8IgAUb1RiavldKp+TGRdCbqw8vHHBm9pnuOePzTOOADQgdanRj98bOcfIXe69tSS/VHxDe9tkpYFPkQR8zsJcjUxf+nS83iFU9CW9lKtQlyoU6/BPbHFILvcR1KDR5Imj7GJe2OJefghI6OqtHNZP2tzkia2IDU0Yc4ikwC+7yN3i6I3Do4G3gTtCZVfNXiSdFyU9nCMyBxggTaG9zaljZpN0BynG4FzYMujIVgeNa6FLqwoaFT0iELW2w9JgJFgyVlaDKEqMSGyxgqtcQMPBuvCwMFFjeFd2EhtfTjQ4hcpva+NXXoYPP7yfTk/0DErNZV2dUTasekar8lH6U58B7ECNxDUwcon4z7sSO5mdlPJoiT7zllgpwQn5NUPaxZxaKkGdUIFEGzjmBfnCmk6MOqzi05Rr18wnkdic9hz/fIzzTMhn9mbMG6VF9eBkE4mNu1K5jai6II5Mz9BV49U0ZcA874N1VHpJpQE6762TYv+u7ICTRIOf2LD9wEgu3py/nX+IHma5j22ClUtXH3hYdZmHg+s=\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTcxMTY1OTI2NDg1NSwKICAicHJvZmlsZUlkIiA6ICI2YWI0MzE3ODg5ZmQ0OTA1OTdmNjBmNjdkOWQ3NmZkOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfQWxleCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84M2NlZTVjYTZhZmNkYjE3MTI4NWFhMDBlODA0OWMyOTdiMmRiZWJhMGVmYjhmZjk3MGE1Njc3YTFiNjQ0MDMyIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="
-            ), 0.36
-        )
-
-        override fun render(posX: Int, posY: Int) {
-            GlStateManager.translate(-1f, 0f, 0f)
-            alexHead.render(posX, posY)
-            GlStateManager.translate(+4f, +3f, 0f)
-            steveHead.render(posX, posY)
-            GlStateManager.translate(-3f, -3f, 0f)
-        }
+    BETTER_TOGETHER(
+        "BETTER TOGETHER", "Better", 18.minutes, 'd', false,
+        object : Renderable {
+            override val width = 10
+            override val height = 10
+            override val horizontalAlign = RenderUtils.HorizontalAlignment.LEFT
+            override val verticalAlign = RenderUtils.VerticalAlignment.CENTER
+
+            val steveHead = Renderable.itemStack(Items.skull.toItemStack(3), 0.36)
+            val alexHead = Renderable.itemStack(
+                ItemUtils.createSkull(
+                    "Alex",
+                    "6ab43178-89fd-4905-97f6-0f67d9d76fd9",
+                    "fRBfVNlIWW6cL478st/8NsNEHVxjvwQDp4+MbKbFj1tPZvxXgpIXRaQsLeDl/0+E4tipPKNANAbmqj9EKAVx3b3gDqLLrTTk/NfuH2RD3I5ppzio8w5oYk1022SopaayGBP4+kuwktDHzlR8IgAUb1RiavldKp+TGRdCbqw8vHHBm9pnuOePzTOOADQgdanRj98bOcfIXe69tSS/VHxDe9tkpYFPkQR8zsJcjUxf+nS83iFU9CW9lKtQlyoU6/BPbHFILvcR1KDR5Imj7GJe2OJefghI6OqtHNZP2tzkia2IDU0Yc4ikwC+7yN3i6I3Do4G3gTtCZVfNXiSdFyU9nCMyBxggTaG9zaljZpN0BynG4FzYMujIVgeNa6FLqwoaFT0iELW2w9JgJFgyVlaDKEqMSGyxgqtcQMPBuvCwMFFjeFd2EhtfTjQ4hcpva+NXXoYPP7yfTk/0DErNZV2dUTasekar8lH6U58B7ECNxDUwcon4z7sSO5mdlPJoiT7zllgpwQn5NUPaxZxaKkGdUIFEGzjmBfnCmk6MOqzi05Rr18wnkdic9hz/fIzzTMhn9mbMG6VF9eBkE4mNu1K5jai6II5Mz9BV49U0ZcA874N1VHpJpQE6762TYv+u7ICTRIOf2LD9wEgu3py/nX+IHma5j22ClUtXH3hYdZmHg+s=\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTcxMTY1OTI2NDg1NSwKICAicHJvZmlsZUlkIiA6ICI2YWI0MzE3ODg5ZmQ0OTA1OTdmNjBmNjdkOWQ3NmZkOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJNSEZfQWxleCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84M2NlZTVjYTZhZmNkYjE3MTI4NWFhMDBlODA0OWMyOTdiMmRiZWJhMGVmYjhmZjk3MGE1Njc3YTFiNjQ0MDMyIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=",
+                ),
+                0.36,
+            )
+
+            override fun render(posX: Int, posY: Int) {
+                GlStateManager.translate(-1f, 0f, 0f)
+                alexHead.render(posX, posY)
+                GlStateManager.translate(+4f, +3f, 0f)
+                steveHead.render(posX, posY)
+                GlStateManager.translate(-3f, -3f, 0f)
+            }
 
-    }),
+        },
+    ),
     RAFFLE(
-        "RAFFLE", "Raffle", 160.seconds, '6', true, Items.name_tag.toItemStack()
+        "RAFFLE",
+        "Raffle",
+        160.seconds,
+        '6',
+        true,
+        Items.name_tag.toItemStack().overrideId("MINING_RAFFLE_TICKET"),
     ),
-    MITHRIL_GOURMAND("MITHRIL GOURMAND", "Gourmand", 10.minutes, 'b', true, Items.dye.toItemStack(6)),
+    MITHRIL_GOURMAND("MITHRIL GOURMAND", "Gourmand", 10.minutes, 'b', true, Items.dye.toItemStack(6).overrideId("MITHRIL_GOURMAND")),
     ;
 
     constructor(
@@ -105,9 +123,11 @@ enum class MiningEventType(
         dwarvenSpecific: Boolean,
         iconInput: ItemStack,
     ) : this(
-        eventName, shortName, defaultLength, colorCode, dwarvenSpecific, Renderable.itemStack(
-            iconInput, xSpacing = 0
-        )
+        eventName, shortName, defaultLength, colorCode, dwarvenSpecific,
+        Renderable.itemStack(
+            iconInput, xSpacing = 0,
+        ),
+        iconInput,
     )
 
     val icon = Renderable.hoverTips(iconInput, listOf(eventName))
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 8b6203aaa534..612f048ded49 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -55,7 +55,17 @@ object ItemUtils {
         return list
     }
 
-    val ItemStack.extraAttributes: NBTTagCompound get() = this.tagCompound.getCompoundTag("ExtraAttributes")
+    var ItemStack.extraAttributes: NBTTagCompound
+        get() = this.tagCompound?.getCompoundTag("ExtraAttributes") ?: NBTTagCompound()
+        set(value) {
+            val tag = this.tagCompound ?: NBTTagCompound().also { tagCompound = it }
+            tag.setTag("ExtraAttributes", value)
+        }
+
+    fun ItemStack.overrideId(id: String): ItemStack {
+        extraAttributes = extraAttributes.apply { setString("id", id) }
+        return this
+    }
 
     // TODO change else janni is sad
     fun ItemStack.isCoopSoulBound(): Boolean =

From d298d2a04fa4d0cbcb4f03fae84cc2f498e06a63 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 00:35:14 +0200
Subject: [PATCH 345/721] Fix: Tunnel Maps commission (#2432)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/TunnelsMaps.kt        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 13d8c53e709e..d2d351878840 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -152,6 +152,8 @@ object TunnelsMaps {
 
     private val ROYAL_PIGEON by lazy { "ROYAL_PIGEON".asInternalName() }
 
+    private var isCommission = false
+
     @SubscribeEvent
     fun onInventoryFullyOpened(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
@@ -180,7 +182,14 @@ object TunnelsMaps {
         }.toMap()
         if (config.autoCommission) {
             clickTranslate.values.firstOrNull()?.let {
+                isCommission = true
                 setActiveAndGoal(it)
+            } ?: run {
+                if (isCommission) {
+                    active = ""
+                    clearPath()
+                    isCommission = false
+                }
             }
         }
     }
@@ -198,6 +207,7 @@ object TunnelsMaps {
         if (!isEnabled()) return
         if (event.clickedButton != 1) return
         clickTranslate[event.slotId]?.let {
+            isCommission = true
             setActiveAndGoal(it)
         }
     }
@@ -283,7 +293,8 @@ object TunnelsMaps {
             }
             addAll(locationDisplay)
         }
-        config.position.renderRenderables(display, posLabel = "TunnelsMaps")
+        config.position.renderRenderables(display, posLabel = "Tunnels Maps")
+
     }
 
     private fun generateLocationsDisplay() = buildList {
@@ -361,6 +372,7 @@ object TunnelsMaps {
     }
 
     private fun guiSetActive(it: String): () -> Unit = {
+        isCommission = false
         setActiveAndGoal(it)
     }
 

From 96423e4b788e2dd96001dc3bf788b1d542d73ba0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 10:20:42 +0200
Subject: [PATCH 346/721] Backend: /shdebugscoreboard (#2412)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  5 +++
 .../hannibal2/skyhanni/data/ScoreboardData.kt | 32 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index a8b3deb6bede..e9dcb2525e6b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.data.GardenCropMilestonesCommunityFix
 import at.hannibal2.skyhanni.data.GuiEditManager
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.SackAPI
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.data.TitleManager
 import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher
 import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay
@@ -470,6 +471,10 @@ object Commands {
             "Sets the current skyblock island for testing purposes.",
         ) { SkyBlockIslandTest.onCommand(it) }
         registerCommand("shdebugprice", "Debug different price sources for an item.") { ItemPriceUtils.debugItemPrice(it) }
+        registerCommand(
+            "shdebugscoreboard",
+            "Monitors the scoreboard changes: Prints the raw scoreboard lines in the console after each update, with time since last update.",
+        ) { ScoreboardData.toggleMonitor() }
     }
 
     private fun developersCodingHelp() {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 2287ae3585d8..378fe03c6953 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -6,7 +6,10 @@ import at.hannibal2.skyhanni.events.RawScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.lastColorCode
+import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraft.client.Minecraft
 import net.minecraft.network.play.server.S3CPacketUpdateScore
 import net.minecraft.network.play.server.S3EPacketTeams
@@ -70,19 +73,41 @@ object ScoreboardData {
         if (event.packet is S3CPacketUpdateScore) {
             if (event.packet.objectiveName == "update") {
                 dirty = true
+                monitor()
             }
         }
         if (event.packet is S3EPacketTeams) {
             if (event.packet.name.startsWith("team_")) {
                 dirty = true
+                monitor()
             }
         }
     }
 
+    private var monitor = false
+    private var lastMonitorState = emptyList<String>()
+    private var lastChangeTime = SimpleTimeMark.farPast()
+
+    private fun monitor() {
+        if (!monitor) return
+        val currentList = fetchScoreboardLines()
+        if (lastMonitorState != currentList) {
+            val time = lastChangeTime.passedSince()
+            lastChangeTime = SimpleTimeMark.now()
+            println("Scoreboard Monitor: (new change after ${time.format(showMilliSeconds = true)})")
+            for (s in currentList) {
+                println("'$s'")
+            }
+        }
+        lastMonitorState = currentList
+        println(" ")
+    }
+
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onTick(event: LorenzTickEvent) {
         if (!dirty) return
         dirty = false
+        monitor()
 
         val list = fetchScoreboardLines().reversed()
         val semiFormatted = list.map { cleanSB(it) }
@@ -99,6 +124,13 @@ object ScoreboardData {
         }
     }
 
+    fun toggleMonitor() {
+        monitor = !monitor
+        val action = if (monitor) "Enabled" else "Disabled"
+        ChatUtils.chat("$action scoreboard monitoring in the console.")
+
+    }
+
     private fun cleanSB(scoreboard: String): String {
         return scoreboard.toCharArray().filter { it.code in 21..126 || it.code == 167 }.joinToString(separator = "")
     }

From a953646ee7fa58e7535b75d2bd47697b87b2744b Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Sat, 31 Aug 2024 15:15:43 +0100
Subject: [PATCH 347/721] Fix: /show not showing all enchants (#2435)

---
 .../skyhanni/features/misc/items/enchants/EnchantParser.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index f5126d954fda..83822cf4d641 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -39,7 +39,7 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants.new", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>§9, |\$| §8\\d{1,3}(,\\d{3})*)"
+        "enchants.new", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>(§r)?§9, |\$| §8\\d{1,3}(,\\d{3})*)"
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"

From 33790178a21363c8efb07a068f9d2ad095d2f9ef Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:45:52 +0200
Subject: [PATCH 348/721] Fix: Global Scale affecting Custom Wardrobe (#2420)

---
 .../hannibal2/skyhanni/config/core/config/Position.java  | 9 +++++++++
 .../features/inventory/wardrobe/CustomWardrobe.kt        | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
index 16e134574ae2..d0112766a47e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
@@ -48,6 +48,9 @@ public class Position {
     @Expose
     private boolean centerY;
 
+    @Expose
+    private boolean ignoreCustomScale = false;
+
     public transient Field linkField;
 
     private boolean clicked = false;
@@ -90,7 +93,13 @@ public void set(Position other) {
         this.center = other.isCenter();
     }
 
+    public Position setIgnoreCustomScale(boolean ignoreCustomScale) {
+        this.ignoreCustomScale = ignoreCustomScale;
+        return this;
+    }
+
     public float getEffectiveScale() {
+        if (ignoreCustomScale) return 1F;
         return Math.max(Math.min(getScale() * SkyHanniMod.feature.gui.globalScale, 10F), 0.1F);
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
index d12e61d35657..02494184d13f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
@@ -78,14 +78,14 @@ object CustomWardrobe {
         }
 
         val (width, height) = renderable.width to renderable.height
-        val pos = Position((gui.width - width) / 2, (gui.height - height) / 2)
+        val pos = Position((gui.width - width) / 2, (gui.height - height) / 2).setIgnoreCustomScale(true)
         if (waitingForInventoryUpdate && config.loadingText) {
             val loadingRenderable = Renderable.string(
                 "§cLoading...",
                 scale = activeScale / 100.0,
             )
             val loadingPos =
-                Position(pos.rawX + (width - loadingRenderable.width) / 2, pos.rawY - loadingRenderable.height)
+                Position(pos.rawX + (width - loadingRenderable.width) / 2, pos.rawY - loadingRenderable.height).setIgnoreCustomScale(true)
             loadingPos.renderRenderable(loadingRenderable, posLabel = guiName, addToGuiManager = false)
         }
 
@@ -112,7 +112,7 @@ object CustomWardrobe {
         val accessorGui = gui as AccessorGuiContainer
         val posX = accessorGui.guiLeft + (1.05 * accessorGui.width).toInt()
         val posY = accessorGui.guiTop + (accessorGui.height - renderable.height) / 2
-        Position(posX, posY).renderRenderable(renderable, posLabel = guiName, addToGuiManager = false)
+        Position(posX, posY).setIgnoreCustomScale(true).renderRenderable(renderable, posLabel = guiName, addToGuiManager = false)
     }
 
     @SubscribeEvent

From 025073ba4d380d696530c28536a0667478c3ebb6 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:46:57 +0200
Subject: [PATCH 349/721] Fix: Powder for 10 Level (#2422)

---
 .../hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
index 702a24f673cd..58fa83753fe9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
@@ -40,7 +40,7 @@ object PowderPerHotmPerk {
         if (indexOfCost == -1) return
 
         val powderFor10Levels =
-            perk.calculateTotalCost(perk.rawLevel + 10) - perk.calculateTotalCost(perk.rawLevel)
+            perk.calculateTotalCost((perk.rawLevel + 10).coerceAtMost(perk.maxLevel)) - perk.calculateTotalCost(perk.rawLevel)
 
         event.toolTip.add(indexOfCost + 2, "§7Powder for 10 levels: §e${powderFor10Levels.addSeparators()}")
     }
@@ -85,6 +85,5 @@ object PowderPerHotmPerk {
         override fun toString() = str
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && HotmData.inInventory &&
-        (config.powderSpent || config.powderFor10Levels)
+    private fun isEnabled() = LorenzUtils.inSkyBlock && HotmData.inInventory && (config.powderSpent || config.powderFor10Levels)
 }

From 2507d18717f0477b9641fbd8c6ec163720022e6a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:55:30 +0200
Subject: [PATCH 350/721] Improvement: Click on chat (#2428)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  2 +-
 .../garden/composter/ComposterConfig.java     |  1 +
 .../event/hoppity/HoppityEggsManager.kt       | 20 ++++-----
 .../features/event/hoppity/HoppityNpc.kt      | 17 +++-----
 .../event/winter/NewYearCakeReminder.kt       | 10 ++---
 .../features/fame/CityProjectFeatures.kt      | 24 +++++------
 .../skyhanni/features/fame/UpgradeReminder.kt | 43 ++++++++++---------
 .../garden/composter/ComposterDisplay.kt      |  9 ++--
 .../ChocolateFactoryBlockOpen.kt              |  7 ++-
 .../ChocolateFactoryCustomReminder.kt         |  9 ++--
 .../ChocolateFactoryTimeTowerManager.kt       | 10 ++---
 .../ChocolateFactoryUpgradeWarning.kt         |  7 +--
 .../inventory/experiments/GuardianReminder.kt |  6 +--
 .../skyhanni/features/misc/PatcherFixes.kt    |  2 +-
 .../at/hannibal2/skyhanni/utils/ChatUtils.kt  |  3 +-
 15 files changed, 79 insertions(+), 91 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index e9dcb2525e6b..f132df81b592 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -337,7 +337,7 @@ object Commands {
         ) { LimboTimeTracker.printStats() }
         registerCommand(
             "shlanedetection",
-            "Detect a farming lane in garden",
+            "Detect a farming lane in the Garden",
         ) { FarmingLaneCreator.commandLaneDetection() }
         registerCommand(
             "shignore",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
index 9712573fb728..c91ffbbca371 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java
@@ -91,6 +91,7 @@ public String toString() {
         desc = "Warn when the Composter gets close to empty, even outside Garden."
     )
     @ConfigEditorBoolean
+    // TODO rename to warnAlmostEmpty
     public boolean warnAlmostClose = false;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index fcf4b17f00b1..bec966128dd3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -251,19 +251,17 @@ object HoppityEggsManager {
         val amount = HoppityEggType.resettingEntries.size
         val message = "All $amount Hoppity Eggs are ready to be found!"
         if (config.warpUnclaimedEggs) {
-            if (LorenzUtils.inSkyBlock) {
-                ChatUtils.clickableChat(
-                    message,
-                    onClick = { HypixelCommands.warp(config.warpDestination) },
-                    "§eClick to ${"/warp ${config.warpDestination}".trim()}!",
-                )
+            val (action, actionName) = if (LorenzUtils.inSkyBlock) {
+                { HypixelCommands.warp(config.warpDestination) } to "${"warp to ${config.warpDestination}".trim()}"
             } else {
-                ChatUtils.clickableChat(
-                    message,
-                    onClick = { HypixelCommands.skyblock() },
-                    "§eClick to join /skyblock!",
-                )
+                { HypixelCommands.skyblock() } to "join /skyblock!"
             }
+            ChatUtils.clickToActionOrDisable(
+                message,
+                config::warpUnclaimedEggs,
+                actionName = actionName,
+                action = action,
+            )
         } else ChatUtils.chat(message)
         LorenzUtils.sendTitle("§e$amount Hoppity Eggs!", 5.seconds)
         SoundUtils.repeatSound(100, 10, SoundUtils.plingSound)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index 217e93bb4832..70e148aa9732 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -53,13 +54,11 @@ object HoppityNpc {
         if (!HoppityAPI.isHoppityEvent()) return
         if (lastReminderSent.passedSince() <= 2.minutes) return
 
-        ChatUtils.clickableChat(
-            "New rabbits are available at §aHoppity's Shop§e! §c(Click to disable this reminder)",
-            onClick = {
-                disableReminder()
-                ChatUtils.chat("§eHoppity's Shop reminder disabled.")
-            },
-            oneTimeClick = true,
+        ChatUtils.clickToActionOrDisable(
+            "New rabbits are available at §aHoppity's Shop§e!",
+            config::hoppityShopReminder,
+            actionName = "warp to hub",
+            action = { HypixelCommands.warp("hub") },
         )
 
         lastReminderSent = SimpleTimeMark.now()
@@ -104,8 +103,4 @@ object HoppityNpc {
         inShop = false
         slotsToHighlight.clear()
     }
-
-    private fun disableReminder() {
-        config.hoppityShopReminder = false
-    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt
index f64204536957..785c2c358dcc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt
@@ -24,7 +24,7 @@ object NewYearCakeReminder {
     private val config get() = SkyHanniMod.feature.event.winter
     private val sidebarDetectionPattern by RepoPattern.pattern(
         "event.winter.newyearcake.reminder.sidebar",
-        "§dNew Year Event!§f (?<time>.*)"
+        "§dNew Year Event!§f (?<time>.*)",
     )
     private var lastReminderSend = SimpleTimeMark.farPast()
 
@@ -63,11 +63,11 @@ object NewYearCakeReminder {
 
         if (lastReminderSend.passedSince() < 30.seconds) return
         lastReminderSend = SimpleTimeMark.now()
-
-        ChatUtils.clickableChat(
+        ChatUtils.clickToActionOrDisable(
             "Reminding you to grab the free New Year Cake. Click here to open the baker menu!",
-            onClick = { HypixelCommands.openBaker() },
-            "§eClick to run /openbaker!",
+            config::newYearCakeReminder,
+            actionName = "open the baker menu",
+            action = { HypixelCommands.openBaker() },
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
index 4457144021aa..5a1e1361a784 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
@@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils.getUpperItems
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -53,18 +54,13 @@ object CityProjectFeatures {
     private val patternGroup = RepoPattern.group("fame.projects")
     private val contributeAgainPattern by patternGroup.pattern(
         "contribute",
-        "§7Contribute again: §e(?<time>.*)"
+        "§7Contribute again: §e(?<time>.*)",
     )
     private val completedPattern by patternGroup.pattern(
         "completed",
-        "§aProject is (?:being built|released)!"
+        "§aProject is (?:being built|released)!",
     )
 
-    fun disable() {
-        config.dailyReminder = false
-        ChatUtils.chat("Disabled city project reminder messages!")
-    }
-
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
         if (!config.dailyReminder) return
@@ -79,11 +75,11 @@ object CityProjectFeatures {
         if (lastReminderSend.passedSince() < 30.seconds) return
         lastReminderSend = SimpleTimeMark.now()
 
-        ChatUtils.clickableChat(
-            "Daily City Project Reminder! (Click here to disable this reminder)",
-            onClick = { disable() },
-            "§eClick to disable!",
-            oneTimeClick = true
+        ChatUtils.clickToActionOrDisable(
+            "Daily City Project Reminder!",
+            config::dailyReminder,
+            actionName = "warp to Hub",
+            action = { HypixelCommands.warp("hub") },
         )
     }
 
@@ -166,8 +162,8 @@ object CityProjectFeatures {
                         } else {
                             BazaarApi.searchForBazaarItem(name, amount)
                         }
-                    }
-                ) { inInventory && !NEUItems.neuHasFocus() }
+                    },
+                ) { inInventory && !NEUItems.neuHasFocus() },
             )
 
             val price = internalName.getPrice() * amount
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
index 22171ed3bf53..d5f33204ce25 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 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.RegexUtils.anyMatches
@@ -27,31 +28,33 @@ import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object UpgradeReminder {
+    private val config get() = SkyHanniMod.feature.misc
+
     private val patternGroup = RepoPattern.group("fame.upgrades")
 
     private val accountUpgradePattern by patternGroup.pattern(
         "account",
-        "§8Account Upgrade"
+        "§8Account Upgrade",
     )
     private val profileUpgradePattern by patternGroup.pattern(
         "profile",
-        "§8Profile Upgrade"
+        "§8Profile Upgrade",
     )
     private val upgradeDurationPattern by patternGroup.pattern(
         "duration",
-        "§8Duration: (?<duration>.+)"
+        "§8Duration: (?<duration>.+)",
     )
     private val upgradeStartedPattern by patternGroup.pattern(
         "started",
-        "§eYou started the §r§a(?<upgrade>.+) §r§eupgrade!"
+        "§eYou started the §r§a(?<upgrade>.+) §r§eupgrade!",
     )
     private val upgradeClaimedPattern by patternGroup.pattern(
         "claimed",
-        "§eYou claimed the §r§a(?<upgrade>.+) §r§eupgrade!"
+        "§eYou claimed the §r§a(?<upgrade>.+) §r§eupgrade!",
     )
     private val upgradePattern by patternGroup.pattern(
         "upgrade",
-        "§eClick to start upgrade!"
+        "§eClick to start upgrade!",
     )
 
     private var currentProfileUpgrade: CommunityShopUpgrade?
@@ -74,7 +77,6 @@ object UpgradeReminder {
     // TODO: (for 0.27) merge this logic with reminder manager
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
         if (!isEnabled()) return
         if (ReminderUtils.isBusy()) return
         if (inInventory || LorenzUtils.skyBlockArea == "Community Center") return
@@ -127,28 +129,26 @@ object UpgradeReminder {
         }
     }
 
-    private fun isEnabled() = SkyHanniMod.feature.misc.accountUpgradeReminder
-
-    fun disable() {
-        SkyHanniMod.feature.misc.accountUpgradeReminder = false
-    }
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.accountUpgradeReminder
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(49,
+        event.move(
+            49,
             "#player.currentAccountUpgrade",
-            "#player.communityShopAccountUpgrade.name"
+            "#player.communityShopAccountUpgrade.name",
         )
 
-        event.move(49,
+        event.move(
+            49,
             "#player.nextAccountUpgradeCompletionTime",
-            "#player.communityShopAccountUpgrade.completionTime"
+            "#player.communityShopAccountUpgrade.completionTime",
         )
     }
 
     class CommunityShopUpgrade(
         @Expose val name: String?,
-        @Expose var completionTime: SimpleTimeMark = SimpleTimeMark.farFuture()
+        @Expose var completionTime: SimpleTimeMark = SimpleTimeMark.farFuture(),
     ) {
         private var duration: Duration = Duration.ZERO
 
@@ -158,10 +158,11 @@ object UpgradeReminder {
 
         fun sendReminderIfClaimable() {
             if (this.name == null || this.completionTime.isInFuture()) return
-            ChatUtils.clickableChat(
-                "The §a$name §eupgrade has completed! §c(Click to disable these reminders)", onClick = {
-                    disable()
-                }, oneTimeClick = true
+            ChatUtils.clickToActionOrDisable(
+                "The §a$name §eupgrade has completed!",
+                config::accountUpgradeReminder,
+                actionName = "warp to Hub",
+                action = { HypixelCommands.warp("hub") },
             )
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index a08acac9146e..cebbeef08a71 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -195,12 +195,11 @@ object ComposterDisplay {
         if (IslandType.GARDEN.isInIsland()) {
             ChatUtils.chat(warningMessage)
         } else {
-            ChatUtils.clickableChat(
+            ChatUtils.clickToActionOrDisable(
                 warningMessage,
-                onClick = {
-                    HypixelCommands.warp("garden")
-                },
-                "§eClick to warp to the garden!",
+                config::warnAlmostClose,
+                actionName = "warp to the Garden",
+                action = { HypixelCommands.warp("garden") },
             )
         }
         LorenzUtils.sendTitle("§eComposter Warning!", 3.seconds)
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 c8a4ccd5b53e..a797ca2d6715 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
@@ -43,10 +43,9 @@ object ChocolateFactoryBlockOpen {
         ChatUtils.clickToActionOrDisable(
             "§cBlocked opening the Chocolate Factory without a §dMythic Rabbit Pet §cequipped!",
             config::mythicRabbitRequirement,
-            "open pets menu",
-        ) {
-            HypixelCommands.pet()
-        }
+            actionName = "open pets menu",
+            action = { HypixelCommands.pet() },
+        )
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.mythicRabbitRequirement
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
index 109db545c1bb..b96dc02992fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
@@ -196,12 +196,11 @@ object ChocolateFactoryCustomReminder {
         if (configUpgradeWarnings.upgradeWarningSound) {
             SoundUtils.playBeepSound()
         }
-        ChatUtils.clickableChat(
+        ChatUtils.clickToActionOrDisable(
             "You can now purchase §f$targetName §ein Chocolate factory!",
-            onClick = {
-                HypixelCommands.chocolateFactory()
-            },
-            "§eClick to run /cf!",
+            configReminder::enabled,
+            actionName = "open Chocolate Factory",
+            action = { HypixelCommands.chocolateFactory() },
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
index 9df1be965832..30af77ac8b8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
@@ -92,11 +92,11 @@ object ChocolateFactoryTimeTowerManager {
         val warningSeparation = if (inInventory) 30.seconds else 5.minutes
         if (lastTimeTowerWarning.passedSince() < warningSeparation) return
 
-        ChatUtils.clickableChat(
-            "§cYour Time Tower is full §7(${timeTowerCharges()})§c, " +
-                "Use one to avoid wasting time tower usages!",
-            onClick = { HypixelCommands.chocolateFactory() },
-            HOVER_TEXT,
+        ChatUtils.clickToActionOrDisable(
+            "§cYour Time Tower is full §7(${timeTowerCharges()})§c, Use one to avoid wasting time tower usages!",
+            config::timeTowerWarning,
+            actionName = "open Chocolate Factory",
+            action = { HypixelCommands.chocolateFactory() },
         )
         SoundUtils.playBeepSound()
         lastTimeTowerWarning = SimpleTimeMark.now()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryUpgradeWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryUpgradeWarning.kt
index 5ad40005033a..0ec9554495a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryUpgradeWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryUpgradeWarning.kt
@@ -44,10 +44,11 @@ object ChocolateFactoryUpgradeWarning {
             SoundUtils.playBeepSound()
         }
         if (ChocolateFactoryAPI.inChocolateFactory) return
-        ChatUtils.clickableChat(
+        ChatUtils.clickToActionOrDisable(
             "You have a Chocolate factory upgrade available to purchase!",
-            onClick = { HypixelCommands.chocolateFactory() },
-            "§eClick to run /cf!"
+            config::upgradeWarning,
+            actionName = "open Chocolate Factory",
+            action = { HypixelCommands.chocolateFactory() },
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
index 20c0438c91ce..d6005776f79b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
@@ -51,11 +51,9 @@ object GuardianReminder {
         lastInventoryOpen = SimpleTimeMark.now()
         ChatUtils.clickToActionOrDisable(
             "Use a §9§lGuardian Pet §efor more Exp in the Experimentation Table.",
-            option = config::guardianReminder,
+            config::guardianReminder,
             actionName = "open pets menu",
-            action = {
-                HypixelCommands.pet()
-            },
+            action = { HypixelCommands.pet() },
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
index a7d844e4e8e8..348a47e435c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherFixes.kt
@@ -28,7 +28,7 @@ object PatcherFixes {
         ChatUtils.clickToActionOrDisable(
             "§cPatcher's Parallax Fix breaks SkyHanni's line rendering!",
             config::fixPatcherLines,
-            "disable this option in Patcher",
+            actionName = "disable this option in Patcher",
             action = { tryFix() },
         )
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index e07e16a08ed6..18519a364b1e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -258,6 +258,7 @@ object ChatUtils {
         return this
     }
 
+
     fun clickToActionOrDisable(message: String, option: KMutableProperty0<*>, actionName: String, action: () -> Unit) {
         ChatUtils.clickableChat(
             "$message\n§e[CLICK to $actionName or disable this feature]",
@@ -269,7 +270,7 @@ object ChatUtils {
                 }
             },
             hover = "§eClick to $actionName!\n" +
-                "§eShift-Click to disable this feature!",
+                "§eShift-Click or Control-Click to disable this feature!",
         )
     }
 }

From a8bd35b975d8739816785918961d8d553a19771f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:56:24 +0200
Subject: [PATCH 351/721] Improvement: Help finding Rift Guide (#2433)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/rift/EnigmaSoulConfig.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
index 5bd3ec8fa4ba..96c721539c1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
@@ -4,16 +4,25 @@
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class EnigmaSoulConfig {
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.")
+    @ConfigOption(name = "Enabled", desc = "Click on an Enigma Soul in §eRift Guide -> Area -> Enigma Souls §7to highlight their location.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean enabled = true;
 
+    @ConfigOption(
+        name = "§aRift Guide",
+        desc = "Type §e/riftguide §7in chat or navigate through the SkyBlock Menu to open the §aRift Guide§7. " +
+            "Complete the first quest in the Rift to unlock this Hypixel feature."
+    )
+    @ConfigEditorInfoText
+    public String tutorialHowToOpenRiftGuide = "";
+
     @Expose
     @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.")
     @ConfigEditorColour

From bf8722e892f9669bdf316d483da538d212398b23 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:56:42 +0200
Subject: [PATCH 352/721] Backend: Stop sound errors in console (#2431)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: David Cole <40234707+davidarthurcole@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
index 70e6242c621c..79e320949067 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
@@ -20,6 +20,7 @@ object SoundUtils {
 
     fun ISound.playSound() {
         Minecraft.getMinecraft().addScheduledTask {
+            if (Minecraft.getMinecraft().soundHandler.isSoundPlaying(this)) return@addScheduledTask
             val gameSettings = Minecraft.getMinecraft().gameSettings
             val oldLevel = gameSettings.getSoundLevel(SoundCategory.PLAYERS)
             if (!SkyHanniMod.feature.misc.maintainGameVolume) {
@@ -38,7 +39,7 @@ object SoundUtils {
                 }
                 ErrorManager.logErrorWithData(
                     e, "Failed to play a sound",
-                    "soundLocation" to this.soundLocation
+                    "soundLocation" to this.soundLocation,
                 )
             } finally {
                 if (!SkyHanniMod.feature.misc.maintainGameVolume) {

From 79602bf7761cb51efcff4ccb1c1d13bed5742fd1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:57:26 +0200
Subject: [PATCH 353/721] Fix: ! Crash (#2427)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/mixins/init/SkyhanniMixinPlugin.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/init/SkyhanniMixinPlugin.java b/src/main/java/at/hannibal2/skyhanni/mixins/init/SkyhanniMixinPlugin.java
index 9dd4cc6f84d4..4032f647af49 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/init/SkyhanniMixinPlugin.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/init/SkyhanniMixinPlugin.java
@@ -44,7 +44,7 @@ public URL baseUrl(URL classUrl) {
         String string = classUrl.toString();
         if (classUrl.getProtocol().equals("jar")) {
             try {
-                return new URL(string.substring(4).split("!")[0]);
+                return new URL(string.substring(4, string.lastIndexOf('!')));
             } catch (MalformedURLException e) {
                 throw new RuntimeException(e);
             }

From 8ac1f15304f50dc5c2e973dbae5bd7b1a0a31bd1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:05:12 +0200
Subject: [PATCH 354/721] Improvement: Warning rancher chat command (#2413)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../optimalspeed/OptimalSpeedConfig.java      |  2 +-
 .../features/garden/GardenOptimalSpeed.kt     | 26 +++++++++++++------
 .../skyhanni/utils/HypixelCommands.kt         |  5 ++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
index 6e44ecfec217..e7a11de1f957 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
@@ -17,7 +17,7 @@ public class OptimalSpeedConfig {
     public boolean showOnHUD = false;
 
     @Expose
-    @ConfigOption(name = "Warning Title", desc = "Warn via title when you don't have the optimal speed.")
+    @ConfigOption(name = "Wrong Speed Warning", desc = "Warn via title and chat message when you don't have the optimal speed.")
     @ConfigEditorBoolean
     public boolean warning = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
index 5eb89a138ef0..337f64675b66 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
@@ -8,9 +8,13 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -33,6 +37,7 @@ object GardenOptimalSpeed {
     private var sneakingTime = 0.seconds
     private val sneaking get() = Minecraft.getMinecraft().thePlayer.isSneaking
     private val sneakingPersistent get() = sneakingSince.passedSince() > 5.seconds
+    private val rancherBoots = "RANCHERS_BOOTS".asInternalName()
 
     /**
      * This speed value represents the walking speed, not the speed stat.
@@ -175,21 +180,26 @@ object GardenOptimalSpeed {
         if (speed != currentSpeed && !recentlySwitchedTool && !recentlyStartedSneaking) warn(speed)
     }
 
-    private fun warn(speed: Int) {
+    private fun warn(optimalSpeed: Int) {
         if (!Minecraft.getMinecraft().thePlayer.onGround) return
         if (GardenAPI.onBarnPlot) return
         if (!config.warning) return
+        if (!GardenAPI.isCurrentlyFarming()) return
+        if (InventoryUtils.getBoots()?.getInternalNameOrNull() != rancherBoots) return
         if (lastWarnTime.passedSince() < 20.seconds) return
 
         lastWarnTime = SimpleTimeMark.now()
         LorenzUtils.sendTitle("§cWrong speed!", 3.seconds)
-        cropInHand?.let {
-            var text = "Wrong speed for ${it.cropName}: §f$currentSpeed"
-            if (sneaking) text += " §7[Sneaking]"
-            text += " §e(§f$speed §eis optimal)"
-
-            ChatUtils.chat(text)
-        }
+        val cropInHand = cropInHand ?: return
+
+        var text = "§cWrong speed while farming ${cropInHand.cropName} detected!"
+        text += "\n§eCurrent Speed: §f$currentSpeed§e, Optimal Speed: §f$optimalSpeed"
+        ChatUtils.clickToActionOrDisable(
+            text,
+            config::warning,
+            actionName = "change the speed",
+            action = { HypixelCommands.setMaxSpeed() },
+        )
     }
 
     private fun isRancherOverlayEnabled() = GardenAPI.inGarden() && config.signEnabled
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
index a7fca2ce7788..c788d019a8b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@@ -136,6 +136,11 @@ object HypixelCommands {
         send("pq $quality")
     }
 
+    // Changes the speed of rancher boots in garden
+    fun setMaxSpeed() {
+        send("setmaxspeed")
+    }
+
     fun showRng(major: String? = null, minor: String? = null) = when {
         major == null || minor == null -> send("rng")
         else -> send("rng $major $minor")

From c1c3fcc963bbf79f75e33a9383431784f36bdf36 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:07:55 +0200
Subject: [PATCH 355/721] Fix: Autopet Rule Detection (#2430)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/experiments/GuardianReminder.kt     | 7 ++++++-
 .../hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
index d6005776f79b..70638619b4d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
@@ -37,9 +37,14 @@ object GuardianReminder {
         "mainmenu",
         "Experimentation Table",
     )
+
+    /**
+     * REGEX-TEST: §dGuardian
+     * REGEX-TEST: §9Guardian§e
+     */
     private val petNamePattern by patternGroup.pattern(
         "guardianpet",
-        "§[956d]Guardian",
+        "§[956d]Guardian.*",
     )
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
index f0fef91def53..1c93d6b3c82a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
@@ -35,9 +35,14 @@ object CurrentPetDisplay {
         "chat.despawn",
         "§aYou despawned your §r.*§r§a!"
     )
+
+    /**
+     * REGEX-TEST: §cAutopet §eequipped your §7[Lvl 100] §6Griffin§4 ✦§e! §a§lVIEW RULE
+     * REGEX-TEST: §cAutopet §eequipped your §7[Lvl 100] §6Elephant§e! §a§lVIEW RULE
+     */
     private val chatPetRulePattern by patternGroup.pattern(
         "chat.rule",
-        "§cAutopet §eequipped your §7\\[Lvl .*] (?<pet>.*)! §a§lVIEW RULE"
+        "§cAutopet §eequipped your §7\\[Lvl .*] (?<pet>.*)§e! §a§lVIEW RULE"
     )
 
     @SubscribeEvent

From 31f9e29c0aa055b615d1eaaf7bca9d8d10b0ba7e Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:17:56 +0200
Subject: [PATCH 356/721] Feature: Last server (#2046)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/misc/LastServersConfig.java      | 21 +++++++++++
 .../config/features/misc/MiscConfig.java      |  5 +++
 .../skyhanni/features/misc/LastServers.kt     | 36 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
new file mode 100644
index 000000000000..8c566cfa86e3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
@@ -0,0 +1,21 @@
+package at.hannibal2.skyhanni.config.features.misc;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class LastServersConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Receive notifications when you rejoin a server you have previously joined.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Notification Time", desc = "Get notified if you rejoin a server within the specified number of seconds.")
+    @ConfigEditorSlider(minValue = 5, maxValue = 300, minStep = 1)
+    public Integer warnTime = 60;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 54f0c7c50afd..d27d3a0e39f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -112,6 +112,11 @@ public class MiscConfig {
     @Accordion
     public RemindersConfig reminders = new RemindersConfig();
 
+    @Expose
+    @ConfigOption(name = "Last Servers", desc = "")
+    @Accordion
+    public LastServersConfig lastServers = new LastServersConfig();
+
     @Expose
     @ConfigOption(name = "Show Outside SkyBlock", desc = "Show these features outside of SkyBlock.")
     @ConfigEditorDraggableList
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
new file mode 100644
index 000000000000..8a40233142e3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
@@ -0,0 +1,36 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object LastServers {
+
+    private val config get() = SkyHanniMod.feature.misc.lastServers
+    private var lastServerId: String? = null
+    private val lastServers = mutableMapOf<String, SimpleTimeMark>()
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isEnabled() || HypixelData.serverId == lastServerId) return
+
+        val id = HypixelData.serverId ?: return
+        lastServers.entries.removeIf { it.value.passedSince() > config.warnTime.seconds }
+        lastServers[id]?.passedSince()?.let {
+            ChatUtils.chat("§7You already joined this server §b${it.format()}§7 ago.")
+        }
+        ChatUtils.debug("Adding $id to last servers.")
+        lastServers[id] = SimpleTimeMark.now()
+        lastServerId = id
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}

From c834fbbb6a535b0c0c27d02c893433e687332268 Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:26:47 -0300
Subject: [PATCH 357/721] Feature: /shtps command (#1961)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/config/commands/Commands.kt | 10 +++++++++-
 .../at/hannibal2/skyhanni/features/misc/TpsCounter.kt | 11 ++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index f132df81b592..c14023dba9b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -63,6 +63,7 @@ import at.hannibal2.skyhanni.features.minion.MinionFeatures
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
 import at.hannibal2.skyhanni.features.misc.LockMouseLook
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
+import at.hannibal2.skyhanni.features.misc.TpsCounter
 import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatures
@@ -355,6 +356,10 @@ object Commands {
             "shcolors",
             "Prints a list of all Minecraft color & formatting codes in chat.",
         ) { ColorFormattingHelper.printColorCodeList() }
+        registerCommand(
+            "shtps",
+            "Informs in chat about the server ticks per second (TPS)."
+        ) { TpsCounter.tpsCommand() }
     }
 
     private fun usersBugFix() {
@@ -470,7 +475,10 @@ object Commands {
             "shtestisland",
             "Sets the current skyblock island for testing purposes.",
         ) { SkyBlockIslandTest.onCommand(it) }
-        registerCommand("shdebugprice", "Debug different price sources for an item.") { ItemPriceUtils.debugItemPrice(it) }
+        registerCommand(
+            "shdebugprice",
+            "Debug different price sources for an item."
+        ) { ItemPriceUtils.debugItemPrice(it) }
         registerCommand(
             "shdebugscoreboard",
             "Monitors the scoreboard changes: Prints the raw scoreboard lines in the console after each update, with time since last update.",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
index 0c6521e9c16d..ed6d3f63c502 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
@@ -32,7 +33,7 @@ object TpsCounter {
     init {
         // TODO use SecondPassedEvent + passedSince
         fixedRateTimer(name = "skyhanni-tps-counter-seconds", period = 1000L) {
-            if (!isEnabled()) return@fixedRateTimer
+            if (!LorenzUtils.inSkyBlock) return@fixedRateTimer
             if (packetsFromLastSecond == 0) return@fixedRateTimer
 
             if (ignoreFirstTicks > 0) {
@@ -62,7 +63,7 @@ object TpsCounter {
         }
         // TODO use DelayedRun
         fixedRateTimer(name = "skyhanni-tps-counter-ticks", period = 50L) {
-            if (!isEnabled()) return@fixedRateTimer
+            if (!LorenzUtils.inSkyBlock) return@fixedRateTimer
 
             if (hasPacketReceived) {
                 hasPacketReceived = false
@@ -71,6 +72,10 @@ object TpsCounter {
         }
     }
 
+    fun tpsCommand() {
+        ChatUtils.chat(display)
+    }
+
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         tpsList.clear()
@@ -81,7 +86,7 @@ object TpsCounter {
 
     @HandleEvent(priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {
-        if (!config.tpsDisplay) return
+        if (!LorenzUtils.inSkyBlock) return
         hasPacketReceived = true
     }
 

From 79d891d5a3e1bffd31491a921757ccf7ab66b5fe Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:31:55 +0200
Subject: [PATCH 358/721] Feature: Bits on Cookie (#2265)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/misc/BitsConfig.java      | 19 +++++
 .../at/hannibal2/skyhanni/data/BitsAPI.kt     | 40 +++++-----
 .../features/inventory/BitsPerCookieVisual.kt | 80 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/RegexUtils.kt | 10 +++
 4 files changed, 130 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/BitsPerCookieVisual.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/BitsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/BitsConfig.java
index 9b3cc32e821d..7179a2aabdcc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/BitsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/BitsConfig.java
@@ -7,6 +7,25 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class BitsConfig {
+
+    @Expose
+    @ConfigOption(name = "Bulk Buy Cookie Time", desc = "Corrects the time for cookies if bought in bulk on the buy item.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean bulkBuyCookieTime = true;
+
+    @Expose
+    @ConfigOption(name = "Bits on Cookie", desc = "Show the bits you would gain on a cookies.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean showBitsOnCookie = true;
+
+    @Expose
+    @ConfigOption(name = "Bits on Cookie Change", desc = "Show the change in available bits on cookies.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean showBitsChangeOnCookie = false;
+
     @Expose
     @ConfigOption(name = "Enable No Bits Warning", desc = "Alerts you when you have no bits available.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
index 72928fd25cd2..e9e58fa463d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt
@@ -60,7 +60,7 @@ object BitsAPI {
     // Scoreboard patterns
     val bitsScoreboardPattern by bitsDataGroup.pattern(
         "scoreboard",
-        "^Bits: §b(?<amount>[\\d,.]+).*$"
+        "^Bits: §b(?<amount>[\\d,.]+).*$",
     )
 
     // Chat patterns
@@ -68,17 +68,17 @@ object BitsAPI {
 
     private val bitsFromFameRankUpChatPattern by bitsChatGroup.pattern(
         "rankup.bits",
-        "§eYou gained §3(?<amount>.*) Bits Available §ecompounded from all your §epreviously eaten §6cookies§e! Click here to open §6cookie menu§e!"
+        "§eYou gained §3(?<amount>.*) Bits Available §ecompounded from all your §epreviously eaten §6cookies§e! Click here to open §6cookie menu§e!",
     )
 
     private val fameRankUpPattern by bitsChatGroup.pattern(
         "rankup.rank",
-        "[§\\w\\s]+FAME RANK UP (?:§.)+(?<rank>.*)"
+        "[§\\w\\s]+FAME RANK UP (?:§.)+(?<rank>.*)",
     )
 
     private val boosterCookieAte by bitsChatGroup.pattern(
         "boostercookieate",
-        "§eYou consumed a §6Booster Cookie§e!.*"
+        "§eYou consumed a §6Booster Cookie§e!.*",
     )
 
     // GUI patterns
@@ -86,12 +86,12 @@ object BitsAPI {
 
     private val bitsAvailableMenuPattern by bitsGuiGroup.pattern(
         "availablemenu",
-        "§7Bits Available: §b(?<toClaim>[\\d,]+)(§3.+)?"
+        "§7Bits Available: §b(?<toClaim>[\\d,]+)(§3.+)?",
     )
 
     private val fameRankSbMenuPattern by bitsGuiGroup.pattern(
         "sbmenufamerank",
-        "§7Your rank: §e(?<rank>.*)"
+        "§7Your rank: §e(?<rank>.*)",
     )
 
     /**
@@ -99,47 +99,47 @@ object BitsAPI {
      */
     private val cookieDurationPattern by bitsGuiGroup.pattern(
         "cookieduration",
-        "\\s*§7Duration: §a(?<time>.*)"
+        "\\s*§7Duration: §a(?<time>.*)",
     )
 
     private val noCookieActiveSBMenuPattern by bitsGuiGroup.pattern(
         "sbmenunocookieactive",
-        " §7Status: §cNot active!"
+        " §7Status: §cNot active!",
     )
 
     private val noCookieActiveCookieMenuPattern by bitsGuiGroup.pattern(
         "cookiemenucookieactive",
-        "(§7§cYou do not currently have a|§cBooster Cookie active!)"
+        "(§7§cYou do not currently have a|§cBooster Cookie active!)",
     )
 
     private val fameRankCommunityShopPattern by bitsGuiGroup.pattern(
         "communityshopfamerank",
-        "§7Fame Rank: §e(?<rank>.*)"
+        "§7Fame Rank: §e(?<rank>.*)",
     )
 
     private val bitsGuiNamePattern by bitsGuiGroup.pattern(
         "mainmenuname",
-        "^SkyBlock Menu$"
+        "^SkyBlock Menu$",
     )
 
     private val cookieGuiStackPattern by bitsGuiGroup.pattern(
         "mainmenustack",
-        "^§6Booster Cookie$"
+        "^§6Booster Cookie$",
     )
 
     private val bitsStackPattern by bitsGuiGroup.pattern(
         "bitsstack",
-        "§bBits"
+        "§bBits",
     )
 
     private val fameRankGuiNamePattern by bitsGuiGroup.pattern(
         "famerankmenuname",
-        "^(Community Shop|Booster Cookie)$"
+        "^(Community Shop|Booster Cookie)$",
     )
 
     private val fameRankGuiStackPattern by bitsGuiGroup.pattern(
         "famerankmenustack",
-        "^(§aCommunity Shop|§eFame Rank)$"
+        "^(§aCommunity Shop|§eFame Rank)$",
     )
 
     @SubscribeEvent
@@ -187,14 +187,14 @@ object BitsAPI {
                     "FameRank $rank not found",
                     "Rank" to rank,
                     "Message" to message,
-                    "FameRanks" to FameRanks.fameRanks
+                    "FameRanks" to FameRanks.fameRanks,
                 )
 
             return
         }
 
         boosterCookieAte.matchMatcher(message) {
-            bitsAvailable += (defaultCookieBits * (currentFameRank?.bitsMultiplier ?: return)).toInt()
+            bitsAvailable += bitsPerCookie()
             val cookieTime = cookieBuffTime
             cookieBuffTime = if (cookieTime == null) SimpleTimeMark.now() + 4.days else cookieTime + 4.days
             sendBitsAvailableGainedEvent()
@@ -203,6 +203,8 @@ object BitsAPI {
         }
     }
 
+    fun bitsPerCookie(): Int = (defaultCookieBits * (currentFameRank?.bitsMultiplier ?: 1.0)).toInt()
+
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
@@ -258,7 +260,7 @@ object BitsAPI {
                             "FameRank $rank not found",
                             "Rank" to rank,
                             "Lore" to fameRankStack.getLore(),
-                            "FameRanks" to FameRanks.fameRanks
+                            "FameRanks" to FameRanks.fameRanks,
                         )
 
                     continue@line
@@ -273,7 +275,7 @@ object BitsAPI {
                             "FameRank $rank not found",
                             "Rank" to rank,
                             "Lore" to fameRankStack.getLore(),
-                            "FameRanks" to FameRanks.fameRanks
+                            "FameRanks" to FameRanks.fameRanks,
                         )
 
                     continue@line
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/BitsPerCookieVisual.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/BitsPerCookieVisual.kt
new file mode 100644
index 000000000000..8b38238adfdb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/BitsPerCookieVisual.kt
@@ -0,0 +1,80 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.BitsAPI
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcherWithIndex
+import at.hannibal2.skyhanni.utils.RegexUtils.indexOfFirstMatch
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object BitsPerCookieVisual {
+
+    private val config get() = SkyHanniMod.feature.misc.bits
+
+    private val boosterCookie = "BOOSTER_COOKIE".asInternalName()
+
+    private val patternGroup = RepoPattern.group("cookie.bits")
+
+    private val wrongCookiePattern by patternGroup.pattern("wrong", "§[de]Booster Cookie")
+
+    /**
+     * REGEX-TEST: §5§o§7Amount: §a1§7x
+     * REGEX-TEST: §5§o§6Booster Cookie §8x6
+     */
+    private val amountPattern by patternGroup.pattern("amount", "§5§o(?:§6Booster Cookie §8x|§7Amount: §a)(?<amount>\\d+).*")
+
+    /** REGEX-TEST: §5§o§7§b4 §7days:
+     * */
+    private val timePattern by patternGroup.pattern("time", "§5§o§7§b4 §7days:")
+
+    @SubscribeEvent
+    fun onTooltip(event: LorenzToolTipEvent) {
+        if (!isEnabled()) return
+        if (event.itemStack.getInternalNameOrNull() != boosterCookie) return
+        if (wrongCookiePattern.matches(event.itemStack.name)) return
+        var timeReplaced = false
+
+        val toolTip = event.toolTip
+        val (cookieAmount, loreIndex) = amountPattern.firstMatcherWithIndex(toolTip) {
+            group("amount").toInt() to it
+        } ?: (1 to 0)
+        val positionIndex = timePattern.indexOfFirstMatch(toolTip)?.also {
+            timeReplaced = true
+            if (config.bulkBuyCookieTime) {
+                toolTip.removeAt(it)
+            }
+        } ?: (loreIndex + 1)
+
+        val gain = BitsAPI.bitsPerCookie() * cookieAmount
+        val newAvailable = BitsAPI.bitsAvailable + gain
+        val duration = 4 * cookieAmount
+
+        var index = positionIndex
+
+        if (timeReplaced) {
+            if (config.bulkBuyCookieTime) toolTip.add(index++, "§7§b$duration §7days")
+            toolTip.add(index++, "")
+        } else {
+            toolTip.add(index++, "")
+            if (config.bulkBuyCookieTime) toolTip.add(index++, "§8‣ §7Cookie Buff for §b$duration §7days")
+        }
+
+        if (config.showBitsOnCookie) toolTip.add(index++, "§8‣ §7Gain §b${gain.addSeparators()} Bits")
+        if (config.showBitsChangeOnCookie) toolTip.add(
+            index++,
+            "§8‣ §7Available Bits: §3${BitsAPI.bitsAvailable.addSeparators()} §6→ §3${newAvailable.addSeparators()}",
+        )
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock &&
+        config.let { it.bulkBuyCookieTime || it.showBitsOnCookie || it.showBitsChangeOnCookie }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
index 068dfce1d4f8..4faa9969c6bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RegexUtils.kt
@@ -21,11 +21,21 @@ object RegexUtils {
         return null
     }
 
+    inline fun <T> Pattern.firstMatcherWithIndex(sequence: Sequence<String>, consumer: Matcher.(Int) -> T): T? {
+        for ((index, line) in sequence.withIndex()) {
+            matcher(line).let { if (it.matches()) return consumer(it, index) }
+        }
+        return null
+    }
+
     @Deprecated("", ReplaceWith("pattern.firstMatcher(this) { consumer() }"))
     inline fun <T> List<String>.matchFirst(pattern: Pattern, consumer: Matcher.() -> T): T? = pattern.firstMatcher(this, consumer)
 
     inline fun <T> Pattern.firstMatcher(list: List<String>, consumer: Matcher.() -> T): T? = firstMatcher(list.asSequence(), consumer)
 
+    inline fun <T> Pattern.firstMatcherWithIndex(list: List<String>, consumer: Matcher.(Int) -> T): T? =
+        firstMatcherWithIndex(list.asSequence(), consumer)
+
     @Deprecated("", ReplaceWith("pattern.matchAll(this) { consumer() }"))
     inline fun <T> List<String>.matchAll(pattern: Pattern, consumer: Matcher.() -> T): T? = pattern.matchAll(this, consumer)
 

From 755a36d801e29a3c517e9c7abbf4ef6b016b026a Mon Sep 17 00:00:00 2001
From: Jordan <77755681+Jordyrat@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:50:16 +0100
Subject: [PATCH 359/721] Feature: Reverse Party Transfer (#1712)

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  1 +
 .../features/commands/CommandsConfig.java     |  5 ++
 .../commands/ReversePartyTransferConfig.java  | 27 +++++++++++
 .../at/hannibal2/skyhanni/data/PartyAPI.kt    | 48 +++++++++++--------
 .../features/commands/PartyCommands.kt        | 48 +++++++++++++++++--
 5 files changed, 106 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/commands/ReversePartyTransferConfig.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index c14023dba9b7..f7101cd4b141 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -612,6 +612,7 @@ object Commands {
         registerCommand("pt", "Transfer the party to another party member") { PartyCommands.transfer(it) }
         registerCommand("pp", "Promote a specific party member") { PartyCommands.promote(it) }
         registerCommand("pd", "Disbands the party") { PartyCommands.disband() }
+        registerCommand("rpt", "Reverse transfer party to the previous leader") { PartyCommands.reverseTransfer() }
     }
 
     @JvmStatic
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
index 783d43d7486b..1747baee6348 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
@@ -18,6 +18,11 @@ public class CommandsConfig {
     @Expose
     public BetterWikiCommandConfig betterWiki = new BetterWikiCommandConfig();
 
+    @ConfigOption(name = "Reverse Party Transfer", desc = "")
+    @Accordion
+    @Expose
+    public ReversePartyTransferConfig reversePT = new ReversePartyTransferConfig();
+
     @ConfigOption(name = "Party Commands", desc = "Shortens party commands and allows tab-completing for them. " +
         "\n§eCommands: /pt, /pp, /pko, /pk, /pd §7(SkyBlock command §e/pt §7to check your play time will still work)")
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/ReversePartyTransferConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/ReversePartyTransferConfig.java
new file mode 100644
index 000000000000..555733667bd9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/ReversePartyTransferConfig.java
@@ -0,0 +1,27 @@
+package at.hannibal2.skyhanni.config.features.commands;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ReversePartyTransferConfig {
+
+    @Expose
+    @ConfigOption(name = "Command", desc = "Adds §e/rpt §7to transfer a party back to its previous leader.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean command = true;
+
+    @Expose
+    @ConfigOption(name = "Clickable Message", desc = "Allows transfer message to be clicked to transfer a party back to its previous leader if it has been transferred to you.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean clickable = false;
+
+    @Expose
+    @ConfigOption(name = "Response Message", desc = "Sends a custom message to party chat when the party is reverse transferred.")
+    @ConfigEditorText
+    public String message = "Nuh Uh";
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
index f066191699f2..2ee30c27e55a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt
@@ -21,68 +21,69 @@ object PartyAPI {
     private val patternGroup = RepoPattern.group("data.party")
     private val youJoinedPartyPattern by patternGroup.pattern(
         "you.joined",
-        "§eYou have joined (?<name>.*)'s? §eparty!"
+        "§eYou have joined (?<name>.*)'s? §eparty!",
     )
     private val othersJoinedPartyPattern by patternGroup.pattern(
         "others.joined",
-        "(?<name>.*) §ejoined the party\\."
+        "(?<name>.*) §ejoined the party\\.",
     )
     private val othersInThePartyPattern by patternGroup.pattern(
         "others.inparty",
-        "§eYou'll be partying with: (?<names>.*)"
+        "§eYou'll be partying with: (?<names>.*)",
     )
     private val otherLeftPattern by patternGroup.pattern(
         "others.left",
-        "(?<name>.*) §ehas left the party\\."
+        "(?<name>.*) §ehas left the party\\.",
     )
     private val otherKickedPattern by patternGroup.pattern(
         "others.kicked",
-        "(?<name>.*) §ehas been removed from the party\\."
+        "(?<name>.*) §ehas been removed from the party\\.",
     )
     private val otherOfflineKickedPattern by patternGroup.pattern(
         "others.offline",
-        "§eKicked (?<name>.*) because they were offline\\."
+        "§eKicked (?<name>.*) because they were offline\\.",
     )
     private val otherDisconnectedPattern by patternGroup.pattern(
         "others.disconnect",
-        "(?<name>.*) §ewas removed from your party because they disconnected\\."
+        "(?<name>.*) §ewas removed from your party because they disconnected\\.",
     )
     private val transferOnLeavePattern by patternGroup.pattern(
         "others.transfer.leave",
-        "The party was transferred to (?<newowner>.*) because (?<name>.*) left"
+        "The party was transferred to (?<newowner>.*) because (?<name>.*) left",
     )
-    private val transferVoluntaryPattern by patternGroup.pattern(
+    val transferVoluntaryPattern by patternGroup.pattern(
         "others.transfer.voluntary",
-        "The party was transferred to (?<newowner>.*) by .*"
+        "The party was transferred to (?<newowner>.*) by (?<name>.*)",
     )
     private val disbandedPattern by patternGroup.pattern(
         "others.disband",
-        ".* §ehas disbanded the party!"
+        ".* §ehas disbanded the party!",
     )
     private val kickedPattern by patternGroup.pattern(
         "you.kicked",
-        "§eYou have been kicked from the party by .* §e"
+        "§eYou have been kicked from the party by .* §e",
     )
     private val partyMembersStartPattern by patternGroup.pattern(
         "members.start",
-        "§6Party Members \\(\\d+\\)"
+        "§6Party Members \\(\\d+\\)",
     )
     private val partyMemberListPattern by patternGroup.pattern(
         "members.list.withkind",
-        "Party (?<kind>Leader|Moderators|Members): (?<names>.*)"
+        "Party (?<kind>Leader|Moderators|Members): (?<names>.*)",
     )
     private val kuudraFinderJoinPattern by patternGroup.pattern(
         "kuudrafinder.join",
-        "§dParty Finder §f> (?<name>.*?) §ejoined the group! \\(§[a-fA-F0-9]+Combat Level \\d+§e\\)"
+        "§dParty Finder §f> (?<name>.*?) §ejoined the group! \\(§[a-fA-F0-9]+Combat Level \\d+§e\\)",
     )
     private val dungeonFinderJoinPattern by patternGroup.pattern(
         "dungeonfinder.join",
-        "§dParty Finder §f> (?<name>.*?) §ejoined the dungeon group! \\(§[a-fA-F0-9].* Level \\d+§[a-fA-F0-9]\\)"
+        "§dParty Finder §f> (?<name>.*?) §ejoined the dungeon group! \\(§[a-fA-F0-9].* Level \\d+§[a-fA-F0-9]\\)",
     )
 
     val partyMembers = mutableListOf<String>()
 
     var partyLeader: String? = null
+    var prevPartyLeader: String? = null
 
     fun listMembers() {
         val size = partyMembers.size
@@ -145,15 +146,15 @@ object PartyAPI {
         // one member got removed
         otherLeftPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
-            partyMembers.remove(name)
+            removeWithLeader(name)
         }
         otherKickedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
-            partyMembers.remove(name)
+            removeWithLeader(name)
         }
         otherOfflineKickedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
-            partyMembers.remove(name)
+            removeWithLeader(name)
         }
         otherDisconnectedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
@@ -166,6 +167,7 @@ object PartyAPI {
         }
         transferVoluntaryPattern.matchMatcher(message.removeColor()) {
             partyLeader = group("newowner").cleanPlayerName()
+            prevPartyLeader = group("name").cleanPlayerName()
         }
 
         // party disbanded
@@ -201,6 +203,13 @@ object PartyAPI {
         }
     }
 
+    private fun removeWithLeader(name: String) {
+        partyMembers.remove(name)
+        if (name == prevPartyLeader) {
+            prevPartyLeader = null
+        }
+    }
+
     private fun addPlayer(playerName: String) {
         if (partyMembers.contains(playerName)) return
         if (playerName == LorenzUtils.getPlayerName()) return
@@ -210,5 +219,6 @@ object PartyAPI {
     private fun partyLeft() {
         partyMembers.clear()
         partyLeader = null
+        prevPartyLeader = null
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
index c60c84ae5bf5..e7b3333dd7eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
@@ -4,11 +4,20 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.FriendAPI
 import at.hannibal2.skyhanni.data.PartyAPI
+import at.hannibal2.skyhanni.data.PartyAPI.partyLeader
+import at.hannibal2.skyhanni.data.PartyAPI.transferVoluntaryPattern
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace
+import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -67,14 +76,29 @@ object PartyCommands {
         HypixelCommands.partyPromote(args[0])
     }
 
+    fun reverseTransfer() {
+        if (!config.reversePT.command) return
+        if (PartyAPI.partyMembers.isEmpty()) return
+        val prevPartyLeader = PartyAPI.prevPartyLeader ?: return
+
+        autoPartyTransfer(prevPartyLeader)
+    }
+
+    private fun autoPartyTransfer(prevPartyLeader: String) {
+        HypixelCommands.partyTransfer(prevPartyLeader)
+        config.reversePT.message?.let {
+            if (it.isNotBlank()) {
+                HypixelCommands.partyChat(it)
+            }
+        }
+    }
+
     @SubscribeEvent
     fun onMessageSendToServer(event: MessageSendToServerEvent) {
         if (!config.partyKickReason) {
             return
         }
-        if (!event.message.startsWith("/party kick ", ignoreCase = true)
-            && !event.message.startsWith("/p kick ", ignoreCase = true)
-        ) {
+        if (!event.message.startsWith("/party kick ", ignoreCase = true) && !event.message.startsWith("/p kick ", ignoreCase = true)) {
             return
         }
         val args = event.message.substringAfter("kick").trim().split(" ")
@@ -116,6 +140,22 @@ object PartyCommands {
 
         event.move(31, "commands", "misc.commands")
     }
+
+    @SubscribeEvent(priority = EventPriority.LOW)
+    fun onChat(event: LorenzChatEvent) {
+        if (!config.reversePT.clickable) return
+        if (!transferVoluntaryPattern.matches(event.message.trimWhiteSpace().removeColor())) return
+        if (partyLeader != LorenzUtils.getPlayerName()) return
+
+        val prevPartyLeader = PartyAPI.prevPartyLeader ?: return
+        event.blockedReason = "replacing"
+
+        ChatUtils.clickableChat(
+            event.message,
+            onClick = { autoPartyTransfer(prevPartyLeader) },
+            prefix = false,
+        )
+    }
 }
 
 private val otherPartyCommands = listOf(
@@ -126,5 +166,5 @@ private val otherPartyCommands = listOf(
     "Mute",
     "Private",
     "Warp",
-    "Settings"
+    "Settings",
 )

From 096a4628d9f1baba475a25b3db8a50930b28d8b2 Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:12:21 +0100
Subject: [PATCH 360/721] Improvement: Enchant Parsing Exceptions (#2254)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/misc/items/enchants/Enchant.kt   | 48 +++++++++++++++++--
 .../misc/items/enchants/EnchantParser.kt      | 19 ++++----
 .../misc/items/enchants/FormattedEnchant.kt   |  7 +--
 3 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
index 697a58ebb775..8058fc223fc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
@@ -2,8 +2,13 @@ package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
+import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
 import at.hannibal2.skyhanni.utils.LorenzColor
 import com.google.gson.annotations.Expose
+import io.github.notenoughupdates.moulconfig.observer.Property
+import net.minecraft.item.ItemStack
 import java.util.TreeSet
 
 open class Enchant : Comparable<Enchant> {
@@ -23,24 +28,57 @@ open class Enchant : Comparable<Enchant> {
     private fun isUltimate() = this is Ultimate
     private fun isStacking() = this is Stacking
 
-    open fun getFormattedName(level: Int) = getFormat(level) + loreName
+    open fun getFormattedName(level: Int, itemStack: ItemStack?) = getFormat(level, itemStack) + loreName
 
-    open fun getFormat(level: Int): String {
+    open fun getFormat(level: Int, itemStack: ItemStack? = null): String {
         val config = SkyHanniMod.feature.inventory.enchantParsing
 
         // TODO change color to string (support for bold)
-        val color = when {
+        var color = when {
             level >= maxLevel -> config.perfectEnchantColor
             level > goodLevel -> config.greatEnchantColor
             level == goodLevel -> config.goodEnchantColor
             else -> config.poorEnchantColor
         }
 
+        // Exceptions
+        color = checkExceptions(color, level, itemStack)
+
         // TODO when chroma is disabled maybe use the neu chroma style instead of gold
         if (color.get() == LorenzColor.CHROMA && !(ChromaManager.config.enabled.get() || EnchantParser.isSbaLoaded)) return "§6§l"
         return color.get().getChatColor()
     }
 
+    /**
+     * Method to check for certain or unique exceptions that need to be handled explicitly.
+     *
+     * *(There isn't much of a convention to adding exceptions, except try to include relevant exceptions under
+     * a corresponding enchantment conditional, unless the exception is not specific to a certain enchant. i.e.
+     * Efficiency exceptions should be within the `if (this.nbtName == "efficiency")` conditional)*
+     *
+     * @param color The original coloring based on default behaviour, for when no exception is met
+     * @param level The level of the enchant currently being parsed
+     * @param itemStack The ItemStack of the hovered item. Can be null, e.g. when hovering over `/show` items
+     */
+    private fun checkExceptions(color: Property<LorenzColor>, level: Int, itemStack: ItemStack?): Property<LorenzColor> {
+        val config = SkyHanniMod.feature.inventory.enchantParsing
+
+        val itemCategory = itemStack?.getItemCategoryOrNull()
+        val itemName = itemStack?.itemNameWithoutColor
+
+        if (this.nbtName == "efficiency") {
+            // If the item is a Stonk, or a non-mining tool with Efficiency 5 (whilst not being a Promising Shovel),
+            // color the enchant as max
+            if (itemName == "Stonk" ||
+                (itemCategory != null && !ItemCategory.miningTools.contains(itemCategory) && level == 5 && itemName != "Promising Shovel")
+            ) {
+                return config.perfectEnchantColor
+            }
+        }
+
+        return color
+    }
+
     override fun toString() = "$nbtName $goodLevel $maxLevel\n"
 
     override fun compareTo(other: Enchant): Int {
@@ -57,7 +95,7 @@ open class Enchant : Comparable<Enchant> {
     }
 
     class Ultimate : Enchant() {
-        override fun getFormat(level: Int) = "§d§l"
+        override fun getFormat(level: Int, itemStack: ItemStack?) = "§d§l"
     }
 
     class Stacking : Enchant() {
@@ -81,6 +119,6 @@ open class Enchant : Comparable<Enchant> {
 
         // Ensures enchants not yet in repo stay as vanilla formatting
         // (instead of that stupid dark red lowercase formatting *cough* sba *cough*)
-        override fun getFormattedName(level: Int) = "§9$loreName"
+        override fun getFormattedName(level: Int, itemStack: ItemStack?): String = "§9$loreName"
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index 83822cf4d641..bf7ef24c452e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -39,10 +39,11 @@ object EnchantParser {
 
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
-        "enchants.new", "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>(§r)?§9, |\$| §8\\d{1,3}(,\\d{3})*)"
+        "enchants.new",
+        "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>(§r)?§9, |\$| §8\\d{1,3}(,\\d{3})*)",
     )
     private val grayEnchantPattern by patternGroup.pattern(
-        "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*"
+        "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*",
     )
 
     private var currentItem: ItemStack? = null
@@ -116,6 +117,8 @@ object EnchantParser {
         if (event.getHoverEvent().action != HoverEvent.Action.SHOW_TEXT) return
         if (!isEnabled() || !this.enchants.hasEnchantData()) return
 
+        currentItem = null
+
         val lore = event.getHoverEvent().value.formattedText.split("\n").toMutableList()
 
         // Check for any vanilla gray enchants at the top of the tooltip
@@ -281,10 +284,10 @@ object EnchantParser {
         // Normal is leaving the formatting as Hypixel provides it
         if (config.format.get() == EnchantParsingConfig.EnchantFormat.NORMAL) {
             normalFormatting(insertEnchants)
-        // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
+            // Compressed is always forcing 3 enchants per line, except when there is stacking enchant progress visible
         } else if (config.format.get() == EnchantParsingConfig.EnchantFormat.COMPRESSED && !shouldBeSingleColumn) {
             compressedFormatting(insertEnchants)
-        // Stacked is always forcing 1 enchant per line
+            // Stacked is always forcing 1 enchant per line
         } else {
             stackedFormatting(insertEnchants)
         }
@@ -297,7 +300,7 @@ object EnchantParser {
         for ((i, orderedEnchant: FormattedEnchant) in orderedEnchants.withIndex()) {
             val comma = if (commaFormat == CommaFormat.COPY_ENCHANT) ", " else "§9, "
 
-            builder.append(orderedEnchant.getFormattedString())
+            builder.append(orderedEnchant.getFormattedString(currentItem))
             if (i % maxEnchantsPerLine != maxEnchantsPerLine - 1) {
                 builder.append(comma)
             } else {
@@ -320,7 +323,7 @@ object EnchantParser {
         for ((i, orderedEnchant: FormattedEnchant) in orderedEnchants.withIndex()) {
             val comma = if (commaFormat == CommaFormat.COPY_ENCHANT) ", " else "§9, "
 
-            builder.append(orderedEnchant.getFormattedString())
+            builder.append(orderedEnchant.getFormattedString(currentItem))
 
             if (itemIsBook() && maxEnchantsPerLine == 1) {
                 insertEnchants.add(builder.toString())
@@ -342,12 +345,12 @@ object EnchantParser {
     private fun stackedFormatting(insertEnchants: MutableList<String>) {
         if (!config.hideEnchantDescriptions.get() || itemIsBook()) {
             for (enchant: FormattedEnchant in orderedEnchants) {
-                insertEnchants.add(enchant.getFormattedString())
+                insertEnchants.add(enchant.getFormattedString(currentItem))
                 insertEnchants.addAll(enchant.getLore())
             }
         } else {
             for (enchant: FormattedEnchant in orderedEnchants) {
-                insertEnchants.add(enchant.getFormattedString())
+                insertEnchants.add(enchant.getFormattedString(currentItem))
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
index 73cf57e7acb1..834959fbba85 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/FormattedEnchant.kt
@@ -1,12 +1,13 @@
 package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.utils.NumberUtil.toRoman
+import net.minecraft.item.ItemStack
 
 class FormattedEnchant(
     private val enchant: Enchant,
     private val level: Int,
     stacking: String,
-    private val isRoman: Boolean
+    private val isRoman: Boolean,
 ) : Comparable<FormattedEnchant> {
     private val stacking: String = stacking
         get() = "§8$field"
@@ -18,9 +19,9 @@ class FormattedEnchant(
 
     override fun compareTo(other: FormattedEnchant) = this.enchant.compareTo(other.enchant)
 
-    fun getFormattedString(): String {
+    fun getFormattedString(itemStack: ItemStack?): String {
         val builder = StringBuilder()
-        builder.append(enchant.getFormattedName(level)).append(" ").append(if (isRoman) level.toRoman() else level)
+        builder.append(enchant.getFormattedName(level, itemStack)).append(" ").append(if (isRoman) level.toRoman() else level)
 
         return if (!stacking.contains("empty")) builder.append(stacking).toString() else builder.toString()
     }

From 8fabb05e1677174570ff88e9b2a5f9dda6667cdd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 1 Sep 2024 09:04:58 +0200
Subject: [PATCH 361/721] Version 0.27 Beta 4

---
 docs/CHANGELOG.md                             | 48 +++++++++++++++++++
 docs/FEATURES.md                              | 10 ++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 2249f35be328..d968fc3ddcb8 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -46,6 +46,10 @@
 + Added Enchanting Experience as Stack Size in Experimentation Table. - saga (https://github.com/hannibal002/SkyHanni/pull/1988)
     + Added to the Item Number list.
 + Show dye hex code as the actual color in the item lore. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
++ Added Display for Bits on Cookie buy. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2265)
+    + Shows the Bits you would gain.
+    + Can show the change for the available Bits.
+    + Also shows the time more clearly (or adds it if not present).
 
 #### Chat Features
 
@@ -54,6 +58,18 @@
 + Added Remind command. - ThatGravyBoat & Zickles (https://github.com/hannibal002/SkyHanni/pull/1708)
     + Use `/shremind <time> <note>` to set reminders for your future self.
 
+#### Command Features
+
++ Added Reverse Party Leader. - Jordyrat (https://github.com/hannibal002/SkyHanni/pull/1712)
+    + Reverse party transfer via clickable chat message or via the `/rpt` command.
+    + Configurable party chat message after transferring.
++ Added /shtps command. - saga (https://github.com/hannibal002/SkyHanni/pull/1961)
+    + Informs in chat about the server's ticks per second (TPS).
+
+#### Misc Features
+
++ Added a notification when you join a server you have joined previously. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2046)
+
 ### Improvements
 
 #### Mining Improvements
@@ -61,6 +77,8 @@
 + Now allows modifying the Mineshaft spawn message without requiring the Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2308)
 + Added reset command for Fossil Excavator Profit Tracker. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2408)
 + Added current session and total Mineshaft count to the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2310)
++ Some icons in the Mining Event Display now use the texture of the item they represent. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2425)
+    + E.g., Raffle Event -> Raffle Ticket.
 
 #### Diana Improvements
 
@@ -82,12 +100,17 @@
 + Improved Enchant Parsing compatibility with other mods. - Vixid (https://github.com/hannibal002/SkyHanni/pull/1717)
     + Now works with SBA's Convert Roman Numerals feature.
     + Now works with NEU's inventories, such as `/pv` and storage overlay.
++ Added exceptions to the enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2254)
+    + Stonk and non-mining tools with Efficiency 5 use the maximum enchant color.
 
 #### Chat Improvements
 
 + Added support for changing the translation language when clicking on a chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2403)
 + Added support for using the "/gfs <item>" command without specifying an amount. - saga (https://github.com/hannibal002/SkyHanni/pull/1927)
     + The default value can be modified in the config.
++ Reworked the chat formatting for reminders and warnings across multiple features. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2428)
+    + They now all allow performing an action on click (e.g., warping you somewhere or opening a menu) and can be disabled in the config via shift-click or control-click on the chat message.
+    + Changed chat messages: Account/Profile Upgrade reminder, Hoppity Cake reminder, New Year Hoppity NPC reminder, New Year Cake reminder, City Project reminder, Garden Composter empty warning, CF Custom Goal reached message, Time Tower warning, CF upgrade warning.
 
 #### Hoppity Improvements
 
@@ -103,6 +126,18 @@
 + Improved the description of several config options. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2397)
 + Enabled more Dev Options to be changed via /shdefaultoptions. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2397)
 
+#### Garden Improvements
+
++ Improved incorrect Rancher Boots speed warning. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2413)
+    + Also allows clicking on the message to open the edit sign directly.
+    + Now warns only when actually farming and wearing Rancher Boots.
++ Changed suggested cactus speed to 464 again. - DarkDash (https://github.com/hannibal002/SkyHanni/pull/2424)
+    + Since the cactus knife now allows 500 max speed.
+
+#### Rift Improvements
+
++ Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
+
 ### Fixes
 
 #### DIana Fixes
@@ -116,12 +151,17 @@
 + Fixed AH item movements being detected by Item Trackers as new drops. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2380)
 + Fixed Pickup Log Display Entries not expiring while in GUIs. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2401)
 + Fixed the price of mana enchantments tiers 1-4 in Estimated Chest value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2395)
++ Fixed Guardian Reminder Experimentation Table not working with autopet rules. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2430)
++ Fixed SkyHanni Global Scale affecting Custom Wardrobe. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2420)
++ Fixed /show displaying an incorrect number of enchants. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2435)
 
 #### Mining Fixes
 
 + Added new Pure Ores support. - Empa (https://github.com/hannibal002/SkyHanni/pull/2388)
 + Fixed a typo in corpse detection. - Maratons4 (https://github.com/hannibal002/SkyHanni/pull/2386)
 + Fixed a compatibility issue in Fossil Solver with resource packs like Hypixel+. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2409)
++ Fixed Powder for 10 Levels overflowing over the max level. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2422)
++ Fixed Glacite Tunnel Maps repeatedly showing the last commission goal even when there is no new commission. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2432)
 
 #### Scoreboard Fixes
 
@@ -149,6 +189,11 @@
 + Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
 + Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
 + Fixed Christmas presents in the Hypixel lobby being visible outside of December. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2396)
++ Fixed the mod crashing on startup when the game directory path contains a "!". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2427)
+
+#### Chat Fixes
+
++ Fixed an error with Patcher Coordinate Detection from chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2410)
 
 ### Technical Details
 
@@ -160,6 +205,9 @@
 + Added `SIDE_DISH`, `CHOCOLATE_SHOP_MILESTONE`, `CHOCOLATE_FACTORY_MILESTONE`, and `BOUGHT` as `HoppityEggType` options. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
 + Added version to download source checker popup message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2400)
 + Added "hex string to color int" method in ColorUtils. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
++ Fixed Sound Errors in the console. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2431)
++ Added /shdebugscoreboard to monitor scoreboard changes. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2412)
+    + Prints the raw scoreboard lines in the console after each update, with the time since the last update.
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 6c34b584f6be..4c59d50fb38d 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -1008,6 +1008,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Prints a list of all Minecraft color and formatting codes in chat.
 + Added Remind command. - ThatGravyBoat & Zickles (https://github.com/hannibal002/SkyHanni/pull/1708)
     + Use `/shremind <time> <note>` to set reminders for your future self.
++ Added /shtps command. - saga (https://github.com/hannibal002/SkyHanni/pull/1961)
+    + Informs in chat about the server's ticks per second (TPS).
 
 </details>
 <details open><summary>
@@ -1249,6 +1251,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
       + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
 + No Bits Available Warning. - Empa (https://github.com/hannibal002/SkyHanni/pull/1286)
     + Warns when you run out of available bits to generate.
++ Added Display for Bits on Cookie buy. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2265)
+    + Shows the Bits you would gain.
+    + Can show the change for the available Bits.
+    + Also shows the time more clearly (or adds it if not present).
 + Link from HUD elements to config options. - nea (https://github.com/hannibal002/SkyHanni/pull/1383)
     + Simply right-click a HUD element in the HUD editor to jump to its associated options.
     + Does not yet work on every GUI element. Wait for the missing elements in the following betas.
@@ -1261,6 +1267,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Option to highlight Zealots holding Chests in a different color. - Luna (https://github.com/hannibal002/SkyHanni/pull/1347)
 + Allow party members to request allinvite to be turned on. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1464)
     + Say !allinv in party chat for them to enable all invite.
++ Added Reverse Party Leader. - Jordyrat (https://github.com/hannibal002/SkyHanni/pull/1712)
+    + Reverse party transfer via clickable chat message or via the `/rpt` command.
+    + Configurable party chat message after transferring.
 + Added Hide Far Entities. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1064)
     + Can perhaps increase FPS for some users by 5% to 150%.
     + Options to change the distance and number of mobs to always show.
@@ -1302,6 +1311,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added Editable XP Bar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1944)
     + Enabled moving and scaling of the XP bar in the SkyHanni GUI Editor.
 + Show dye hex code as the actual color in the item lore. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
++ Added a notification when you join a server you have joined previously. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2046)
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 20c81cc18ad0..5f050d25c3c8 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.3"
+    version = "0.27.Beta.4"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 595d42ad3f68..76739a03c63f 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.3",
+    version = "0.27.Beta.4",
 )
 class SkyHanniMod {
 

From 1ba3116df7de192df384c16b4ba02cb922fcc735 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 1 Sep 2024 12:45:50 +0200
Subject: [PATCH 362/721] Fix: Last Server Slider (#2440)

---
 .../skyhanni/config/features/misc/LastServersConfig.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
index 8c566cfa86e3..a488b52e9071 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
@@ -17,5 +17,5 @@ public class LastServersConfig {
     @Expose
     @ConfigOption(name = "Notification Time", desc = "Get notified if you rejoin a server within the specified number of seconds.")
     @ConfigEditorSlider(minValue = 5, maxValue = 300, minStep = 1)
-    public Integer warnTime = 60;
+    public int warnTime = 60;
 }

From e4f56d693a4c6cebb43006bfa507444d614072ca Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:34:00 +0200
Subject: [PATCH 363/721] Fix: Pity Counter (#2436)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index e97d25c52516..ecf90172dc79 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -164,7 +164,8 @@ object MiningAPI {
     @SubscribeEvent
     fun onBlockChange(event: ServerBlockChangeEvent) {
         if (!inCustomMiningIsland()) return
-        if (event.newState.block != Blocks.air) return
+        if (event.newState.block.let { it != Blocks.air && it != Blocks.bedrock }) return
+        if (event.oldState.block.let { it == Blocks.air || it == Blocks.bedrock }) return
         if (event.oldState.block == Blocks.air) return
         val pos = event.location
         if (pos.distanceToPlayer() > 7) return

From f5099a2b6d29099433e66781a8b26ab11e1902c8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:48:02 +0200
Subject: [PATCH 364/721] Backend: Graph Node Editor improvements (#2451)

Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/GardenYawAndPitch.kt      |  6 ++--
 .../at/hannibal2/skyhanni/test/GraphEditor.kt | 36 +++++++++++--------
 .../hannibal2/skyhanni/utils/LocationUtils.kt | 20 +++++++++++
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
index ebc266692430..cdbb07963d8d 100755
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.enums.OutsideSbFeature
 import at.hannibal2.skyhanni.events.GardenToolChangeEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
@@ -29,10 +30,7 @@ object GardenYawAndPitch {
         if (GardenAPI.toolInHand == null && !config.showWithoutTool) return
 
         val player = Minecraft.getMinecraft().thePlayer
-
-        var yaw = player.rotationYaw % 360
-        if (yaw < 0) yaw += 360
-        if (yaw > 180) yaw -= 360
+        var yaw = LocationUtils.calculatePlayerYaw()
         val pitch = player.rotationPitch
 
         if (yaw != lastYaw || pitch != lastPitch) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index 00fa25459dc7..ababb9b6569f 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -367,17 +367,19 @@ object GraphEditor {
     }
 
     private fun editModeClicks() {
-        KeyboardManager.WasdInputMatrix.w.handleEditClicks(x = 1)
-        KeyboardManager.WasdInputMatrix.s.handleEditClicks(x = -1)
-        KeyboardManager.WasdInputMatrix.a.handleEditClicks(z = 1)
-        KeyboardManager.WasdInputMatrix.d.handleEditClicks(z = -1)
-        KeyboardManager.WasdInputMatrix.up.handleEditClicks(y = 1)
-        KeyboardManager.WasdInputMatrix.down.handleEditClicks(y = -1)
+        var vector = LocationUtils.calculatePlayerFacingDirection()
+        KeyboardManager.WasdInputMatrix.w.handleEditClicks(vector)
+        KeyboardManager.WasdInputMatrix.a.handleEditClicks(vector.rotateXZ(Math.toRadians(90.0)))
+        KeyboardManager.WasdInputMatrix.s.handleEditClicks(vector.rotateXZ(Math.toRadians(180.0)))
+        KeyboardManager.WasdInputMatrix.d.handleEditClicks(vector.rotateXZ(Math.toRadians(270.0)))
+
+        KeyboardManager.WasdInputMatrix.up.handleEditClicks(LorenzVec(0, 1, 0))
+        KeyboardManager.WasdInputMatrix.down.handleEditClicks(LorenzVec(0, -1, 0))
     }
 
-    private fun KeyBinding.handleEditClicks(x: Int = 0, y: Int = 0, z: Int = 0) {
+    private fun KeyBinding.handleEditClicks(vector: LorenzVec) {
         if (this.keyCode.isKeyClicked()) {
-            activeNode?.position = activeNode?.position?.add(x, y, z) ?: return
+            activeNode?.position = activeNode?.position?.plus(vector) ?: return
         }
     }
 
@@ -391,14 +393,20 @@ object GraphEditor {
     private fun addNode() {
         val closedNode = closedNode
         if (closedNode != null && closedNode.position.distanceSqToPlayer() < 9.0) {
-            feedBackInTutorial("Removed node, since you where closer than 3 blocks from a node.")
-            nodes.remove(closedNode)
-            edges.removeIf { it.isInEdge(closedNode) }
-            if (closedNode == activeNode) activeNode = null
-            this.closedNode = null
-            return
+            if (closedNode == activeNode) {
+                feedBackInTutorial("Removed node, since you where closer than 3 blocks from a the active node.")
+                nodes.remove(closedNode)
+                edges.removeIf { it.isInEdge(closedNode) }
+                if (closedNode == activeNode) activeNode = null
+                this.closedNode = null
+                return
+            }
         }
         val position = LocationUtils.playerEyeLocation().roundLocationToBlock()
+        if (nodes.any { it.position == position }) {
+            feedBackInTutorial("Can't create node, here is already another one.")
+            return
+        }
         val node = GraphingNode(id++, position)
         nodes.add(node)
         feedBackInTutorial("Added graph node.")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
index b9a790d31a9f..ba82321f2dd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
@@ -106,4 +106,24 @@ object LocationUtils {
         val maxZ = min(this.maxZ, other.maxZ)
         return AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ)
     }
+
+    fun calculatePlayerYaw(): Float {
+        val player = Minecraft.getMinecraft().thePlayer
+        var yaw = player.rotationYaw % 360
+        if (yaw < 0) yaw += 360
+        if (yaw > 180) yaw -= 360
+
+        return yaw
+    }
+
+    fun calculatePlayerFacingDirection(): LorenzVec {
+        var yaw = LocationUtils.calculatePlayerYaw() + 180
+        return when {
+            yaw < 45 -> LorenzVec(0, 0, -1)
+            yaw < 135 -> LorenzVec(1, 0, 0)
+            yaw < 225 -> LorenzVec(0, 0, 1)
+            yaw < 315 -> LorenzVec(-1, 0, 0)
+            else -> LorenzVec(0, 0, -1)
+        }
+    }
 }

From c6fd094ab8023588fd9369fe8e959b223d2ec312 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 3 Sep 2024 03:52:51 -0400
Subject: [PATCH 365/721] Fix: El Dorado and Stray Rabbit Horde patterns
 (#2450)

---
 .../ChocolateFactoryStrayTracker.kt           | 49 +++++++------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index e8ad465cdf6e..89b8355be153 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -17,8 +17,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
@@ -64,26 +66,21 @@ object ChocolateFactoryStrayTracker {
 
     /**
      * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught a glimpse of §6El Dorado§7, §7but he escaped and left behind §7§6313,780 Chocolate§7!
-     */
-    private val goldenStrayDoradoEscape by ChocolateFactoryAPI.patternGroup.pattern(
-        "stray.goldendoradoescape",
-        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught a glimpse of §6El Dorado§7, §7but he escaped and left behind §7§6\\+(?<amount>[\\d,]*) Chocolate§7!",
-    )
-
-    /**
      * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado §7- quite the elusive rabbit!
+     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado§7! Since you §7already have captured him before, §7you gained §6+324,364,585 Chocolate§7.
      */
-    private val goldenStrayDoradoCaught by ChocolateFactoryAPI.patternGroup.pattern(
-        "stray.goldendoradocaught",
-        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado §7- quite the elusive rabbit!",
+    private val strayDoradoPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.dorado",
+        ".*§6El Dorado(?:.*?§6\\+?(?<amount>[\\d,]+) Chocolate)?.*",
     )
 
     /**
-     * REGEX-TEST: §7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado§7! Since you §7already have captured him before, §7you gained §6+324,364,585 Chocolate§7.
+     * REGEX-TEST: §7A hoard of §aStray Rabbits §7has appeared!
+     * REGEX-TEST: §r§7A hoard of §r§aStray Rabbits §r§7has appeared!
      */
-    private val goldenStrayDoradoDuplicate by ChocolateFactoryAPI.patternGroup.pattern(
-        "stray.goldendoradoduplicate",
-        "§7You caught a stray §6§lGolden Rabbit§7! §7You caught §6El Dorado§7! Since you §7already have captured him before, §7you gained §6\\+(?<amount>[\\d,]*) Chocolate§7.",
+    private val strayHoardPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.hoard",
+        ".*(?:§r)?§7A hoard of (?:§r)?§aStray Rabbits (?:§r)?§7has.*",
     )
 
     /**
@@ -248,28 +245,16 @@ object ChocolateFactoryStrayTracker {
                 }
 
                 // Golden Strays, hoard/stampede
-                if (loreLine == "§7You caught a stray §6§lGolden Rabbit§7! §7A hoard of §aStray Rabbits §7has appeared!") {
+                strayHoardPattern.matchMatcher(loreLine.removeResets()) {
                     incrementGoldenType("stampede")
                 }
 
-                // Golden Strays, El Dorado "glimpse" - 1/3 before capture
-                goldenStrayDoradoEscape.matchMatcher(loreLine) {
-                    incrementRarity("legendary", group("amount").formatLong())
-                    incrementGoldenType("dorado")
-                }
-
-                // Golden Strays, El Dorado caught - 3/3
-                if (goldenStrayDoradoCaught.matches(loreLine)) {
-                    incrementRarity("legendary")
-                    tracker.modify { t -> t.goldenTypesCaught["dorado"] = 3 }
-                }
-
-                // Golden Strays, El Dorado (duplicate catch)
-                goldenStrayDoradoDuplicate.matchMatcher(loreLine) {
-                    incrementRarity("legendary", group("amount").formatLong())
-                    tracker.modify { t ->
-                        t.goldenTypesCaught["dorado"] = t.goldenTypesCaught["dorado"]?.plus(1) ?: 4
+                // El Dorado - all catches
+                strayDoradoPattern.matchMatcher(loreLine) {
+                    groupOrNull("amount")?.let { amount ->
+                        incrementRarity("legendary", amount.formatLong())
                     }
+                    incrementGoldenType("dorado")
                 }
             }
         }

From 2b92f20b8a080be611447635b6f27a7651d49ca0 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:59:27 +0200
Subject: [PATCH 366/721] Fix: Armor Hider in Custom Wardrobe (#2449)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../inventory/wardrobe/CustomWardrobe.kt      |  4 +--
 .../skyhanni/features/misc/HideArmor.kt       |  2 ++
 .../MixinContributorRendererEntityLiving.java |  4 ++-
 .../hannibal2/skyhanni/utils/EntityUtils.kt   | 25 -------------------
 .../at/hannibal2/skyhanni/utils/FakePlayer.kt | 20 +++++++++++++++
 5 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/FakePlayer.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
index 02494184d13f..32f0c6d0efcb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
@@ -24,7 +24,7 @@ import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils.transformIf
 import at.hannibal2.skyhanni.utils.ConfigUtils.jumpToEditor
 import at.hannibal2.skyhanni.utils.DelayedRun
-import at.hannibal2.skyhanni.utils.EntityUtils.getFakePlayer
+import at.hannibal2.skyhanni.utils.FakePlayer
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.removeEnchants
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
@@ -267,7 +267,7 @@ object CustomWardrobe {
         containerHeight: Int,
         containerWidth: Int,
     ): Renderable {
-        val fakePlayer = getFakePlayer()
+        val fakePlayer = FakePlayer()
         var scale = playerWidth
 
         fakePlayer.inventory.armorInventory =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
index 32365458fc25..edc4474cbfa0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.getArmorInventory
 import at.hannibal2.skyhanni.utils.EntityUtils.hasPotionEffect
 import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
+import at.hannibal2.skyhanni.utils.FakePlayer
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.compat.Effects
 import net.minecraft.client.entity.EntityPlayerSP
@@ -26,6 +27,7 @@ object HideArmor {
     private fun shouldHideArmor(entity: EntityLivingBase): Boolean {
         if (!LorenzUtils.inSkyBlock) return false
         if (entity !is EntityPlayer) return false
+        if (entity is FakePlayer) return false
         if (entity.hasPotionEffect(Effects.invisibility)) return false
         if (entity.isNPC()) return false
 
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
index 6fb71ccc0a4f..b64fb9d829d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.mixins.transformers.renderer;
 
 import at.hannibal2.skyhanni.mixins.hooks.RendererLivingEntityHook;
+import at.hannibal2.skyhanni.utils.FakePlayer;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,8 +34,9 @@ private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelPar
         return true;
     }
 
-    @Inject(method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/EnumChatFormatting;getTextWithoutFormattingCodes(Ljava/lang/String;)Ljava/lang/String;", shift = At.Shift.AFTER))
+    @Inject(method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/EnumChatFormatting;getTextWithoutFormattingCodes(Ljava/lang/String;)Ljava/lang/String;", shift = At.Shift.AFTER), cancellable = true)
     private void rotateThePlayer(T bat, float p_77043_2_, float p_77043_3_, float partialTicks, CallbackInfo ci) {
+        if (bat instanceof FakePlayer) ci.cancel();
         if (bat instanceof EntityPlayer) {
             RendererLivingEntityHook.rotatePlayer((EntityPlayer) bat);
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index c3d3d248f115..5e85bb64fd5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -20,16 +20,13 @@ import net.minecraft.block.state.IBlockState
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.client.multiplayer.WorldClient
-import net.minecraft.client.resources.DefaultPlayerSkin
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.monster.EntityEnderman
 import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.entity.player.EnumPlayerModelParts
 import net.minecraft.item.ItemStack
 import net.minecraft.potion.Potion
-import net.minecraft.scoreboard.ScorePlayerTeam
 import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.client.event.RenderLivingEvent
 
@@ -248,28 +245,6 @@ object EntityUtils {
     fun EntityLivingBase.isRunicAndCorrupt() = baseMaxHealth == health.toInt().derpy() * 3 * 4
 
     fun Entity.cleanName() = this.getNameAsString().removeColor()
-
-    /**
-     * @return a fake player with the same skin as the real player
-     */
-    fun getFakePlayer(): EntityOtherPlayerMP {
-        val mc = Minecraft.getMinecraft()
-        val player = mc.thePlayer!!
-        return object : EntityOtherPlayerMP(
-            mc.theWorld,
-            player.gameProfile,
-        ) {
-            override fun getLocationSkin() =
-                player.getLocationSkin() ?: DefaultPlayerSkin.getDefaultSkin(player.uniqueID)
-
-            override fun getTeam() = object : ScorePlayerTeam(null, null) {
-                override fun getNameTagVisibility() = EnumVisible.NEVER
-            }
-
-            override fun isWearing(part: EnumPlayerModelParts): Boolean =
-                player.isWearing(part) && part != EnumPlayerModelParts.CAPE
-        }
-    }
 }
 
 //#if FORGE
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/FakePlayer.kt b/src/main/java/at/hannibal2/skyhanni/utils/FakePlayer.kt
new file mode 100644
index 000000000000..1cfa2f0c5266
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/FakePlayer.kt
@@ -0,0 +1,20 @@
+package at.hannibal2.skyhanni.utils
+
+import net.minecraft.client.Minecraft
+import net.minecraft.client.entity.EntityOtherPlayerMP
+import net.minecraft.client.resources.DefaultPlayerSkin
+import net.minecraft.entity.player.EnumPlayerModelParts
+import net.minecraft.scoreboard.ScorePlayerTeam
+
+class FakePlayer : EntityOtherPlayerMP(Minecraft.getMinecraft().theWorld, Minecraft.getMinecraft().thePlayer.gameProfile) {
+
+    override fun getLocationSkin() =
+        Minecraft.getMinecraft().thePlayer.locationSkin ?: DefaultPlayerSkin.getDefaultSkin(Minecraft.getMinecraft().thePlayer.uniqueID)
+
+    override fun getTeam() = object : ScorePlayerTeam(null, null) {
+        override fun getNameTagVisibility() = EnumVisible.NEVER
+    }
+
+    override fun isWearing(part: EnumPlayerModelParts): Boolean =
+        Minecraft.getMinecraft().thePlayer.isWearing(part) && part != EnumPlayerModelParts.CAPE
+}

From 602aab42e82bbab32fc00c0ee6e36f49d964a3d7 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 3 Sep 2024 18:02:48 +1000
Subject: [PATCH 367/721] Fix: showBingoRankNumber option not working (#2445)

---
 .../features/misc/compacttablist/AdvancedPlayerList.kt      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
index 6bd731cb01eb..63a41f3fe2c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
@@ -36,7 +36,7 @@ object AdvancedPlayerList {
 
     private val levelPattern by RepoPattern.pattern(
         "misc.compacttablist.advanced.level",
-        ".*\\[(?<level>.*)] §r(?<name>.*)"
+        ".*\\[(?<level>.*)] §r(?<name>.*)",
     )
 
     private var playerData = mutableMapOf<String, PlayerData>()
@@ -193,7 +193,9 @@ object AdvancedPlayerList {
         } else ""
 
         var suffix = if (config.hideEmblem) {
-            if (data.ironman) "§7♲" else data.bingoLevel?.let { BingoAPI.getBingoIcon(it) } ?: ""
+            if (data.ironman) "§7♲" else data.bingoLevel?.let {
+                BingoAPI.getBingoIcon(if (config.showBingoRankNumber) it else -1)
+            } ?: ""
         } else data.nameSuffix
 
         if (config.markSpecialPersons) {

From 141d2f3c5798b97487ccb733b65c288150cf6d3d Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:04:33 +0200
Subject: [PATCH 368/721] Fix: Custom Scoreboard Error in Dungeon Queue (#2441)

---
 .../features/gui/customscoreboard/ScoreboardEvent.kt      | 1 +
 .../features/gui/customscoreboard/ScoreboardPattern.kt    | 8 ++++++++
 .../features/gui/customscoreboard/UnknownLinesHandler.kt  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 4e89f89a479d..d35952cb3d5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -558,6 +558,7 @@ private fun getEssenceShowWhen(): Boolean = SbPattern.essencePattern.anyMatches(
 
 private fun getQueueLines(): List<String> =
     listOf(getSbLines().first { SbPattern.queuePattern.matches(it) }) +
+        (getSbLines().first { SbPattern.queueTierPattern.matches(it) }) +
         (getSbLines().first { SbPattern.queuePositionPattern.matches(it) })
 
 private fun getQueueShowWhen(): Boolean = SbPattern.queuePattern.anyMatches(getSbLines())
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 126331ff2f96..7195bc8967a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -386,6 +386,14 @@ object ScoreboardPattern {
         "queued",
         "Queued:.*",
     )
+
+    /**
+     * REGEX-TEST: Tier: §eFloor VI
+     */
+    val queueTierPattern by miscSb.pattern(
+        "queuetier",
+        "Tier: §e.*",
+    )
     val queuePositionPattern by miscSb.pattern(
         "queueposition",
         "Position: (?:§.)*#\\d+ (?:§.)*Since: (?:§.)*.*",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index 625c91159c37..2c0ba2c86da0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -119,6 +119,7 @@ object UnknownLinesHandler {
             SbPattern.riftHotdogEatenPattern,
             SbPattern.mineshaftNotStartedPattern,
             SbPattern.queuePattern,
+            SbPattern.queueTierPattern,
             SbPattern.queuePositionPattern,
             SbPattern.fortunateFreezingBonusPattern,
             SbPattern.riftAveikxPattern,

From 73a2b5155db2bdac4746e681d5d770bd7f0c3aaf Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 4 Sep 2024 08:53:10 +0200
Subject: [PATCH 369/721] Fix: Profit Tracker coin formatting (#2444)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt     | 8 ++++++--
 .../skyhanni/utils/tracker/SkyHanniItemTracker.kt         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 4f3b3713c770..0d91c7f62856 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -47,9 +47,13 @@ object SlayerAPI {
             val totalPrice = maxPrice * amount
 
             val format = totalPrice.shortFormat()
-            val priceFormat = " §7(§6$format coins§7)"
 
-            "$amountFormat$displayName$priceFormat" to totalPrice
+            if (internalName == NEUInternalName.SKYBLOCK_COIN) {
+                "§6$format coins" to totalPrice
+            } else {
+                val priceFormat = " §7(§6$format coins§7)"
+                "$amountFormat$displayName$priceFormat" to totalPrice
+            }
         }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index f249cce3ed03..684a7eb00201 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -43,6 +43,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
             it.get(DisplayMode.SESSION).items[internalName]!!.hidden = hidden
         }
 
+        // TODO move the function to common
         val (itemName, price) = SlayerAPI.getItemNameAndPrice(internalName, amount)
         if (config.warnings.chat && price >= config.warnings.minimumChat) {
             ChatUtils.chat("§a+Tracker Drop§7: §r$itemName")

From 3cd39585d96e8e87c2e3c98e9a095a5e1c4c1fb7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:04:07 +0200
Subject: [PATCH 370/721] added todo and deprecation

---
 src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
index 07990ff222c5..10172cb5fcd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
@@ -21,6 +21,8 @@ open class MobEvent(val mob: Mob) : LorenzEvent() {
         class Projectile(mob: Mob) : DeSpawn(mob)
     }
 
+    // TODO replace with "isFirstTime" parameter in the Spawn event. Also create an actual "player sees the mob for the first time" event
+    @Deprecated("Old. Will get replaced soon.")
     open class FirstSeen(mob: Mob) : MobEvent(mob) {
         class SkyblockMob(mob: Mob) : FirstSeen(mob)
         class Summon(mob: Mob) : FirstSeen(mob)

From f6d6749284e998eafd1daa886aca136825fdecd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Wed, 4 Sep 2024 11:12:32 +0200
Subject: [PATCH 371/721] Add IntelliJ setup documentation (#2442)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 CONTRIBUTING.md                      |  50 +++++++++++++++++++++++++--
 docs/gradle-settings.png             | Bin 0 -> 80204 bytes
 docs/gradle-tab.jpg                  | Bin 0 -> 18835 bytes
 docs/minecraft-client.webp           | Bin 0 -> 17846 bytes
 docs/run-configuration-settings.avif | Bin 0 -> 122581 bytes
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 docs/gradle-settings.png
 create mode 100644 docs/gradle-tab.jpg
 create mode 100644 docs/minecraft-client.webp
 create mode 100644 docs/run-configuration-settings.avif

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 57f22f2e2583..fc0f2d5c4f90 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,8 +30,54 @@ We use [IntelliJ](https://www.jetbrains.com/idea/) as an example.
 
 ### Setting up IntelliJ
 
-SkyHanni's Gradle configuration is very similar to the one used in **NotEnoughUpdates**, just
-follow [their guide](https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/CONTRIBUTING.md).
+Once your project is imported into IntelliJ from the previous step, all dependencies like Minecraft, NEU, and so on should be automatically
+downloaded. If not, you might need to link the Gradle project in the Gradle tab (little elephant) on the right.
+
+<details>
+<summary>🖼️Show Gradle tab image</summary>
+
+![Gradle tab with Link Project and Gradle Settings highlighted](docs/gradle-tab.jpg)
+
+</details>
+
+If importing fails, make sure the Gradle JVM (found in the settings wheel in the Gradle tab, or by searching <kbd>Ctrl + Shift + A</kbd>
+for "Gradle JVM") is set to a Java 21 JDK. While this is not the version of Java Minecraft 1.8.9 uses, we need this version for some of our
+build tools.
+
+<details>
+<summary>🖼️Show Gradle JVM image</summary>
+
+![Gradle settings showing Java 21 being selected as JVM](docs/gradle-settings.png)
+
+</details>
+
+After all importing is done (which might take a few minutes the first time you download the project), you should find a new IntelliJ run
+configuration.
+
+<details>
+<summary>🖼️Show run configuration selection image</summary>
+
+![Where to select the run configuration](docs/minecraft-client.webp)
+
+</details>
+
+That task might work out of the box, but very likely it will not. We will need to adjust the used Java version. Since Minecraft 1.8.9 uses
+Java 1.8, we will need to adjust the used JDK for running our Mod, as well as potentially changing the argument passing style.
+
+So select an appropriate Java 1.8 JDK (preferably [DCEVM](#hot-swap), but any Java 1.8 JDK or even JRE will do) and select None as the
+argument passing style.
+
+<details>
+<summary>🖼️Show run configuration image</summary>
+
+![Run configuration settings](docs/run-configuration-settings.avif)
+
+</details>
+
+Now that we are done with that, you should be able to launch your game from your IDE with that run configuration.
+
+SkyHanni's Gradle configuration is very similar to the one used in **NotEnoughUpdates**, so if you want to look at another guide, check
+out [their guide](https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/CONTRIBUTING.md).
 
 ## Creating a Pull Request
 
diff --git a/docs/gradle-settings.png b/docs/gradle-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..62b1382cd13c02475599f43da9355da24742b537
GIT binary patch
literal 80204
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
X{NL-eOuDS2>YypfsmfNoF$w+;M+|%@

literal 0
HcmV?d00001

diff --git a/docs/gradle-tab.jpg b/docs/gradle-tab.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4667cdaa987f4ef9391ffabc63e60e934e964f8c
GIT binary patch
literal 18835
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
RW1)sP72^;xiqic5CIC=1vMm4r

literal 0
HcmV?d00001

diff --git a/docs/minecraft-client.webp b/docs/minecraft-client.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a243632cbe68678c3db09c45767f188693b7bb7d
GIT binary patch
literal 17846
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

literal 0
HcmV?d00001

diff --git a/docs/run-configuration-settings.avif b/docs/run-configuration-settings.avif
new file mode 100644
index 0000000000000000000000000000000000000000..4c25607aeb745b3c0f16320d9b88fecb0ef6a685
GIT binary patch
literal 122581
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%0D<JPq?M~&%#M@5sV
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%0DnXM+Y;)bQ?RR|U}jrodv^$uG0#4|
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
aipAGW_V6J7+!>uSnAC2Ka34YAMBpAo#ZDLi

literal 0
HcmV?d00001


From c13744021e4ba9ddcba42a5635bde8a5d2617292 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:14:12 +0200
Subject: [PATCH 372/721] Fix: Reputation helper sack update (#2439)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../nether/reputationhelper/CrimsonIsleReputationHelper.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
index 6e1b73cd0637..cbb9edd867ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.events.SackChangeEvent
 import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.DailyQuestHelper
 import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.QuestLoader
 import at.hannibal2.skyhanni.features.nether.reputationhelper.kuudra.DailyKuudraBossHelper
@@ -88,6 +89,11 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
         }
     }
 
+    @SubscribeEvent
+    fun onSackChange(event: SackChangeEvent) {
+        dirty = true
+    }
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!IslandType.CRIMSON_ISLE.isInIsland()) return

From 461fa9c4ece3a85b9cac7f7247fcc0c71a4a31e3 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Wed, 4 Sep 2024 11:19:12 +0200
Subject: [PATCH 373/721] Improvement: Allow turning off exact minutes on
 custom scoreboard (#2443)

---
 .../features/gui/customscoreboard/DisplayConfig.java       | 5 +++++
 .../features/gui/customscoreboard/ScoreboardElements.kt    | 7 ++++++-
 src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt     | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
index e2c6dd6faf5a..0d61401eefb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
@@ -129,6 +129,11 @@ public String toString() {
     @ConfigEditorBoolean
     public boolean skyblockTime24hFormat = false;
 
+    @Expose
+    @ConfigOption(name = "SkyBlock Time Exact Minutes", desc = "Display the exact minutes in the SkyBlock time, rather than only 10 minute increments.")
+    @ConfigEditorBoolean
+    public boolean skyblockTimeExactMinutes = true;
+
     @Expose
     @ConfigOption(name = "Line Spacing", desc = "The amount of space between each line.")
     @ConfigEditorSlider(minValue = 0, maxValue = 20, minStep = 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 5753a6fd6637..a58a7efc4a6a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -577,7 +577,12 @@ private fun getTimeDisplayPair(): List<ScoreboardElementType> {
         getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.timePattern, "symbol") ?: ""
     return listOf(
         "§7" + SkyBlockTime.now()
-            .formatted(dayAndMonthElement = false, yearElement = false, timeFormat24h = config.display.skyblockTime24hFormat) +
+            .formatted(
+                dayAndMonthElement = false,
+                yearElement = false,
+                timeFormat24h = config.display.skyblockTime24hFormat,
+                exactMinutes = config.display.skyblockTimeExactMinutes,
+            ) +
             " $symbol" to HorizontalAlignment.LEFT,
     )
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index 201c294e5865..b31bb828b147 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -105,12 +105,15 @@ object TimeUtils {
         yearElement: Boolean = true,
         hoursAndMinutesElement: Boolean = true,
         timeFormat24h: Boolean = false,
+        exactMinutes: Boolean = true,
     ): String {
         val hour = if (timeFormat24h) this.hour else (this.hour + 11) % 12 + 1
         val timeOfDay = if (!timeFormat24h) {
             if (this.hour > 11) "pm" else "am"
         } else ""
-        val minute = this.minute.toString().padStart(2, '0')
+        val minute = this.minute.let {
+            if (exactMinutes) it else it - (it % 10)
+        }.toString().padStart(2, '0')
         val month = SkyBlockTime.monthName(this.month)
         val day = this.day
         val daySuffix = SkyBlockTime.daySuffix(day)

From 63a78f593b27f0d4787c509b9c88d62de3331d01 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:22:00 +0200
Subject: [PATCH 374/721] Fix: Dungeon Complete Event (#2456)

---
 .../at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index f8d432613084..50a3ff8f61d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -68,9 +68,13 @@ object DungeonAPI {
         "Time Elapsed: §.(?:(?<minutes>\\d+)m )?(?<seconds>\\d+)s",
     )
 
+    /**
+     * REGEX-TEST: §f                §r§cMaster Mode The Catacombs §r§8- §r§eFloor VII
+     * REGEX-TEST: §f                         §r§cThe Catacombs §r§8- §r§eFloor V
+     */
     private val dungeonComplete by patternGroup.pattern(
         "complete",
-        "§.\\s+§.§.(?:The|Master Mode) Catacombs §.§.- §.§.(?:Floor )?(?<floor>M?[IV]{1,3}|Entrance)",
+        "§.\\s+§.§.(?:Master Mode )?The Catacombs §.§.- §.§.(?:Floor )?(?<floor>M?[IV]{1,3}|Entrance)",
     )
     private val dungeonRoomPattern by patternGroup.pattern(
         "room",
@@ -145,7 +149,6 @@ object DungeonAPI {
         group("roomId")
     }
 
-
     fun getColor(level: Int): String = when {
         level >= 50 -> "§c§l"
         level >= 45 -> "§c"

From bf152b4376c453f9eee76a6521377cc4062e9838 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:26:16 +0200
Subject: [PATCH 375/721] Fix: Carnival Scoreboard Patterns (#2455)

---
 .../features/gui/customscoreboard/ScoreboardPattern.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 7195bc8967a3..390d34e59872 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -509,12 +509,12 @@ object ScoreboardPattern {
 
     /**
      * REGEX-TEST: §3§lCatch a Fish
-     * REGEX-TEST: §6§lFruit Diggin§6§lg
-     * REGEX-TEST: §c§lZombie Shoot§c§lout
+     * REGEX-TEST: §6§lFruit Digging
+     * REGEX-TEST: §c§lZombie Shootout
      */
     val carnivalTasksPattern by carnivalSb.pattern(
         "tasks",
-        "§.§l(?:Catch a Fish|Fruit Diggin|Zombie Shoot)(?:§.§l(?:g|out))?",
+        "§.§l(?:Catch a Fish|Fruit Digging|Zombie Shootout)",
     )
 
     /**

From 59eef491fef0d7dd7f4018febe4d91de01369cbe Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:51:21 +0200
Subject: [PATCH 376/721] Backend: Added Tags to Graph Editor (#2464)

Co-authored-by: Thunderblade73 <85900443+thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/model/Graph.kt |  35 +++-
 .../skyhanni/data/model/GraphNodeTag.kt       |  41 +++++
 .../skyhanni/data/model/TextInput.kt          |   7 +-
 .../event/hoppity/HoppityCollectionStats.kt   |   3 +-
 .../skyhanni/features/mining/TunnelsMaps.kt   |   7 +-
 .../at/hannibal2/skyhanni/test/GraphEditor.kt | 164 +++++++++++++++---
 6 files changed, 221 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index ab5d1ca2d851..89fd413f5004 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -42,17 +42,30 @@ value class Graph(
                 out.beginObject()
                 value.forEach {
                     out.name(it.id.toString()).beginObject()
+
                     out.name("Position").value(with(it.position) { "$x:$y:$z" })
-                    if (it.name != null) {
-                        out.name("Name").value(it.name)
+
+                    it.name?.let {
+                        out.name("Name").value(it)
+                    }
+
+                    it.tagNames?.takeIf { it.isNotEmpty() }?.let {
+                        out.name("Tags")
+                        out.beginArray()
+                        for (tagName in it) {
+                            out.value(tagName)
+                        }
+                        out.endArray()
                     }
+
                     out.name("Neighbours")
                     out.beginObject()
-                    it.neighbours.forEach { (node, weight) ->
+                    for ((node, weight) in it.neighbours) {
                         val id = node.id.toString()
                         out.name(id).value(weight.round(2))
                     }
                     out.endObject()
+
                     out.endObject()
                 }
                 out.endObject()
@@ -66,6 +79,7 @@ value class Graph(
                     reader.beginObject()
                     var position: LorenzVec? = null
                     var name: String? = null
+                    var tags: List<String>? = null
                     var neighbors = mutableListOf<Pair<Int, Double>>()
                     while (reader.hasNext()) {
                         when (reader.nextName()) {
@@ -89,9 +103,19 @@ value class Graph(
                                 name = reader.nextString()
                             }
 
+                            "Tags" -> {
+                                tags = mutableListOf()
+                                reader.beginArray()
+                                while (reader.hasNext()) {
+                                    val tagName = reader.nextString()
+                                    tags.add(tagName)
+                                }
+                                reader.endArray()
+                            }
+
                         }
                     }
-                    val node = GraphNode(id, position!!, name)
+                    val node = GraphNode(id, position!!, name, tags)
                     list.add(node)
                     neighbourMap[node] = neighbors
                     reader.endObject()
@@ -111,7 +135,8 @@ value class Graph(
     }
 }
 
-class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null) {
+// The node object that gets parsed from/to json
+class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null, val tagNames: List<String>? = null) {
 
     /** Keys are the neighbours and value the edge weight (e.g. Distance) */
     lateinit var neighbours: Map<GraphNode, Double>
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
new file mode 100644
index 000000000000..6cfac664b5f9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.data.model
+
+enum class GraphNodeTag(val internalName: String?, val displayName: String, val description: String) {
+    DEV("dev", "Dev", "Intentionally marked as dev."), // E.g. Spawn points, todos, etc
+
+    // Everywhere
+    NPC("npc", "§eNPC", "A NPC entity."), // also take from neu repo
+    AREA("area", "§aArea", "A SkyBlock Area."),
+    POI("poi", "PoI", "Point of interest."),
+    LAUNCH_PAD("launch", "Launch Pad", "Slime blocks sending you to another server."),
+
+    // on multiple islands
+    ROMEO("romeo", "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
+    RACE("race", "Race Start/Stop", "A race start or stop point."),
+    SLAYER("slayer", "Slayer", "A Slayer area"),
+    // hoppity
+
+    // Hub
+    HUB_12_STARTER("starter_npc", "Starter NPC", "One of the 12 starter NPC's you need to talk to."),
+    // diana
+
+    // Farming Islands: Pelts
+    FARMING_CROP("farming_crop", "Farming Crop", "A spot where you can break crops on farming islands."),
+
+    // Rift
+    RIFT_ENIGMA("rift_enigma", "§5Enigma Soul", "Enigma Souls in the rift."),
+    RIFT_EYE("rift_eye", "§4Eye", "An Eye in the rift to teleport to."),
+
+    // Spider's Den
+    SPIDER_RELIC("SPIDER_RELIC", "§5Relic", "An relic in the Spider's Den."),
+
+    // Dwarven Mines
+    MINES_EMISSARY("mines_emissary", "§6Emissary", "A Emissary from the king."),
+    // commission areas
+
+    ;
+
+    companion object {
+        fun byId(internalName: String?): GraphNodeTag? = values().firstOrNull { it.internalName == internalName }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index f1a5001ad67c..d7e6ff8e1e85 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data.model
 
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
+import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils.insert
 import kotlinx.coroutines.runBlocking
@@ -14,12 +15,12 @@ class TextInput {
     var textBox: String = ""
     private var carriage: Int? = null
 
-    fun editText() = textBox.let {
+    fun editText(textColor: LorenzColor = LorenzColor.WHITE, carriageColor: LorenzColor = LorenzColor.GREEN) = textBox.let {
         with(carriage) {
             if (this == null) it
-            else it.insert(this, '|')
+            else it.insert(this, "${carriageColor.getChatColor()}|${textColor.getChatColor()}")
         }
-    }.replace("§", "&&")
+    }.replace("(?<!§.\\|)§(?!.\\|§.)".toRegex(), "&&")
 
     fun finalText() = textBox.replace("&&", "§")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index f4d98e782893..a06b3dcbc202 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.collectWhile
 import at.hannibal2.skyhanni.utils.CollectionUtils.consumeWhile
 import at.hannibal2.skyhanni.utils.DisplayTableEntry
@@ -220,7 +221,7 @@ object HoppityCollectionStats {
         val foundRabbitCount = getFoundRabbitsFromHypixel(event)
 
         if (loggedRabbitCount < foundRabbitCount) {
-            newList.add(Renderable.string(""))
+            newList.addString("")
             newList.add(
                 Renderable.wrappedString(
                     "§cPlease Scroll through \n" + "§call pages!",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index d2d351878840..b6c1c81d01c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -21,6 +21,7 @@ import at.hannibal2.skyhanni.events.LorenzWarpEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.filterNotNullKeys
 import at.hannibal2.skyhanni.utils.ColorUtils.getFirstColorCode
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
@@ -284,12 +285,12 @@ object TunnelsMaps {
                             ),
                         )
                     } else {
-                        add(Renderable.string(""))
+                        addString("")
                     }
                 }
             } else {
-                add(Renderable.string(""))
-                add(Renderable.string(""))
+                addString("")
+                addString("")
             }
             addAll(locationDisplay)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index ababb9b6569f..ece6d16cb26b 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.test
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.TextInput
 import at.hannibal2.skyhanni.data.model.findShortestPathAsGraph
 import at.hannibal2.skyhanni.data.model.toJson
@@ -38,6 +39,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import kotlin.math.sqrt
 import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object GraphEditor {
@@ -84,7 +86,7 @@ object GraphEditor {
     private val edgeDijkstraColor = LorenzColor.DARK_BLUE.addOpacity(150)
 
     val scrollValue = ScrollValue()
-    var namedNodeList: List<Renderable> = emptyList()
+    var nodesDisplay = emptyList<Renderable>()
     var lastUpdate = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -128,7 +130,7 @@ object GraphEditor {
         }
         if (inTextMode) {
             add("§eFormat: ${textBox.finalText()}")
-            add("§eRaw:     ${textBox.editText()}")
+            add("§eRaw:     ${textBox.editText(textColor = LorenzColor.YELLOW)}")
         }
     }
 
@@ -137,7 +139,7 @@ object GraphEditor {
         if (!isEnabled()) return
         config.namedNodesList.renderRenderables(
             buildList {
-                val list = getNamedNodes()
+                val list = getNodeNames()
                 val size = list.size
                 addString("§eGraph Nodes: $size")
                 val height = (size * 10).coerceAtMost(150)
@@ -149,34 +151,117 @@ object GraphEditor {
         )
     }
 
-    private fun getNamedNodes(): List<Renderable> {
+    private fun getNodeNames(): List<Renderable> {
         if (lastUpdate.passedSince() > 250.milliseconds) {
-            lastUpdate = SimpleTimeMark.now()
-            namedNodeList = calculateNamedNodes()
+            updateNodeNames()
         }
-        return namedNodeList
+        return nodesDisplay
     }
 
+    private fun updateNodeNames() {
+        lastUpdate = SimpleTimeMark.now()
+        nodesDisplay = drawNodeNames()
+    }
+
+    private fun updateTagView(node: GraphingNode) {
+        lastUpdate = SimpleTimeMark.now() + 60.seconds
+        nodesDisplay = drawTagNames(node)
+    }
+
+    private fun drawTagNames(node: GraphingNode): List<Renderable> = buildList {
+        addString("§eChange tag for node '${node.name}§e'")
+        addString("")
+
+        for (tag in GraphNodeTag.entries) {
+            val state = if (tag in node.tags) "§aYES" else "§cNO"
+            val name = state + " §r" + tag.displayName
+            add(createTagName(name, tag, node))
+        }
+        addString("")
+        add(
+            Renderable.clickAndHover(
+                "§cGo Back!",
+                tips = listOf("§eClick to go back to the node list!"),
+                onClick = {
+                    updateNodeNames()
+                },
+            ),
+        )
+    }
+
+    private fun createTagName(
+        name: String,
+        tag: GraphNodeTag,
+        node: GraphingNode,
+    ) = Renderable.clickAndHover(
+        name,
+        tips = listOf(
+            "Tag ${tag.name}",
+            "§7${tag.description}",
+            "",
+            "§eClick to set tag for ${node.name} to ${tag.name}!",
+        ),
+        onClick = {
+            if (tag in node.tags) {
+                node.tags.remove(tag)
+            } else {
+                node.tags.add(tag)
+            }
+            updateTagView(node)
+        },
+    )
 
-    private fun calculateNamedNodes(): List<Renderable> = buildList {
+    private fun drawNodeNames(): List<Renderable> = buildList {
         for ((node, distance: Double) in nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
             val name = node.name?.takeIf { !it.isBlank() } ?: continue
             val color = if (node == activeNode) "§a" else "§7"
             val distanceFormat = sqrt(distance).toInt().addSeparators()
-            val text = "${color}Node §r$name §f($distanceFormat)"
-            add(
-                Renderable.clickAndHover(
-                    text,
-                    emptyList(),
-                    onClick = {
-                        activeNode = node
-                        lastUpdate = SimpleTimeMark.farPast()
-                    },
-                ),
-            )
+            val tagText = node.tags.let {
+                if (it.isEmpty()) {
+                    " §cNo tag§r"
+                } else {
+                    val text = node.tags.map { it.internalName }.joinToString(", ")
+                    " §f($text)"
+                }
+            }
+
+            val text = "${color}Node §r$name$tagText §7[$distanceFormat]"
+            add(createNodeTextLine(text, name, node))
         }
     }
 
+    private fun MutableList<Renderable>.createNodeTextLine(
+        text: String,
+        name: String,
+        node: GraphingNode,
+    ): Renderable = Renderable.clickAndHover(
+        text,
+        tips = buildList {
+            add("Node '$name'")
+            add("")
+
+            if (node.tags.isNotEmpty()) {
+                add("Tags: ")
+                for (tag in node.tags) {
+                    add(" §8- §r${tag.displayName}")
+                }
+                add("")
+            }
+
+            add("§eClick to select/deselect this node!")
+            add("§eControl-Click to edit the tags for this node!")
+
+        },
+        onClick = {
+            if (KeyboardManager.isModifierKeyDown()) {
+                updateTagView(node)
+            } else {
+                activeNode = node
+                updateNodeNames()
+            }
+        },
+    )
+
     private fun feedBackInTutorial(text: String) {
         if (inTutorialMode) {
             ChatUtils.chat(text)
@@ -199,10 +284,11 @@ object GraphEditor {
             minimumAlpha = 0.2f,
             inverseAlphaScale = true,
         )
-        if (node.name == null) return
+
+        val nodeName = node.name ?: return
         this.drawDynamicText(
             node.position,
-            node.name!!,
+            nodeName,
             0.8,
             ignoreBlocks = seeThroughBlocks || node.position.distanceSqToPlayer() < 100,
             smallestDistanceVew = 12.0,
@@ -210,6 +296,20 @@ object GraphEditor {
             yOff = -15f,
             maxDistance = 80,
         )
+
+        val tags = node.tags
+        if (tags.isEmpty()) return
+        val tagText = tags.map { it.displayName }.joinToString(" §f+ ")
+        this.drawDynamicText(
+            node.position,
+            tagText,
+            0.8,
+            ignoreBlocks = seeThroughBlocks || node.position.distanceSqToPlayer() < 100,
+            smallestDistanceVew = 12.0,
+            ignoreY = true,
+            yOff = 0f,
+            maxDistance = 80,
+        )
     }
 
     private fun LorenzRenderWorldEvent.drawEdge(edge: GraphingEdge) = this.draw3DLine_nea(
@@ -359,6 +459,7 @@ object GraphEditor {
             val length = edges.sumOf { it.node1.position.distance(it.node2.position) }.toInt().addSeparators()
             ChatUtils.chat(
                 "§lStats\n" +
+                    "§eNamed Nodes: ${nodes.count { it.name != null }.addSeparators()}\n" +
                     "§eNodes: ${nodes.size.addSeparators()}\n" +
                     "§eEdges: ${edges.size.addSeparators()}\n" +
                     "§eLength: $length",
@@ -428,7 +529,7 @@ object GraphEditor {
     private fun compileGraph(): Graph {
         prune()
         val indexedTable = nodes.mapIndexed { index, node -> node.id to index }.toMap()
-        val nodes = nodes.mapIndexed { index, it -> GraphNode(index, it.position, it.name) }
+        val nodes = nodes.mapIndexed { index, it -> GraphNode(index, it.position, it.name, it.tags.mapNotNull { it.internalName }) }
         val neighbours = this.nodes.map { node ->
             edges.filter { it.isInEdge(node) }.map { edge ->
                 val otherNode = if (node == edge.node1) edge.node2 else edge.node1
@@ -441,7 +542,16 @@ object GraphEditor {
 
     fun import(graph: Graph) {
         clear()
-        nodes.addAll(graph.map { GraphingNode(it.id, it.position, it.name) })
+        nodes.addAll(
+            graph.map {
+                GraphingNode(
+                    it.id,
+                    it.position,
+                    it.name,
+                    it.tagNames?.mapNotNull { GraphNodeTag.byId(it) }?.toMutableList() ?: mutableListOf(),
+                )
+            },
+        )
         val translation = graph.mapIndexed { index, it -> it to nodes[index] }.toMap()
         edges.addAll(
             graph.map { node ->
@@ -494,7 +604,13 @@ object GraphEditor {
     }
 }
 
-private class GraphingNode(val id: Int, var position: LorenzVec, var name: String? = null) {
+// The node object the graph editor is working with
+private class GraphingNode(
+    val id: Int,
+    var position: LorenzVec,
+    var name: String? = null,
+    var tags: MutableList<GraphNodeTag> = mutableListOf(),
+) {
 
     override fun hashCode(): Int {
         return id

From 6dae2df502995679bbd7742ac919d9ee467db9d8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:53:27 +0200
Subject: [PATCH 377/721] Backend: Ghost Mode Graph Editor (#2461)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/dev/GraphConfig.java      |  7 ++-
 .../at/hannibal2/skyhanni/test/GraphEditor.kt | 57 ++++++++++++++++---
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
index 8dd606cd3f0c..bbc6caf7d7b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
@@ -21,6 +21,11 @@ public class GraphConfig {
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_F)
     public int placeKey = Keyboard.KEY_F;
 
+    @Expose
+    @ConfigOption(name = "Toggle Ghost Position", desc = "Creates or removes the Ghost Position. This helps editing nodes tht are in the air.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_F)
+    public int toggleGhostPosition = Keyboard.KEY_NONE;
+
     @Expose
     @ConfigOption(name = "Select Key", desc = "Select the nearest node to be active. Double press to unselect.")
     @ConfigEditorKeybind(defaultKey = -98) // Middle Mouse
@@ -37,7 +42,7 @@ public class GraphConfig {
     public int exitKey = Keyboard.KEY_HOME;
 
     @Expose
-    @ConfigOption(name = "Edit Key", desc = "While holding the Key, edit the position of the active node with the minecraft movement controls.")
+    @ConfigOption(name = "Edit Key", desc = "While holding the Key, edit the position of the active node or the selection block with the minecraft movement controls.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_TAB)
     public int editKey = Keyboard.KEY_TAB;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index ece6d16cb26b..f5acf90fb72d 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -19,7 +19,7 @@ import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LocationUtils
-import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
+import at.hannibal2.skyhanni.utils.LocationUtils.playerLocation
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
@@ -37,6 +37,7 @@ import kotlinx.coroutines.runBlocking
 import net.minecraft.client.settings.KeyBinding
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
+import java.awt.Color
 import kotlin.math.sqrt
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -55,6 +56,7 @@ object GraphEditor {
 
     private var activeNode: GraphingNode? = null
     private var closedNode: GraphingNode? = null
+    private var ghostPosition: LorenzVec? = null
 
     private var seeThroughBlocks = true
 
@@ -94,6 +96,15 @@ object GraphEditor {
         if (!isEnabled()) return
         nodes.forEach { event.drawNode(it) }
         edges.forEach { event.drawEdge(it) }
+        ghostPosition?.let {
+            event.drawWaypointFilled(
+                it,
+                if (activeNode == null) Color.RED else Color.GRAY,
+                seeThroughBlocks = seeThroughBlocks,
+                minimumAlpha = 0.2f,
+                inverseAlphaScale = true,
+            )
+        }
     }
 
     @SubscribeEvent
@@ -114,12 +125,19 @@ object GraphEditor {
             add("§eLoad: §6${KeyboardManager.getKeyName(config.loadKey)}")
             add("§eClear: §6${KeyboardManager.getKeyName(config.clearKey)}")
             add("§eTutorial: §6${KeyboardManager.getKeyName(config.tutorialKey)}")
+            add("§eToggle Ghost Position: §6${KeyboardManager.getKeyName(config.toggleGhostPosition)}")
             add(" ")
             if (activeNode != null) add("§eText: §6${KeyboardManager.getKeyName(config.textKey)}")
         }
-        if (!inTextMode && activeNode != null) {
-            add("§eEdit: §6${KeyboardManager.getKeyName(config.editKey)}")
+
+        if (!inTextMode) {
+            if (activeNode != null) {
+                add("§eEdit active node: §6${KeyboardManager.getKeyName(config.editKey)}")
+            } else if (ghostPosition != null) {
+                add("Edit Ghost Position: §6${KeyboardManager.getKeyName(config.editKey)}")
+            }
         }
+
         if (inEditMode) {
             add("§ex+ §6${KeyboardManager.getKeyName(KeyboardManager.WasdInputMatrix.w.keyCode)}")
             add("§ex- §6${KeyboardManager.getKeyName(KeyboardManager.WasdInputMatrix.s.keyCode)}")
@@ -374,7 +392,7 @@ object GraphEditor {
             editModeClicks()
             inEditMode = false
         }
-        if (activeNode != null && config.editKey.isKeyHeld()) {
+        if ((activeNode != null || ghostPosition != null) && config.editKey.isKeyHeld()) {
             inEditMode = true
             return
         }
@@ -412,9 +430,12 @@ object GraphEditor {
         if (config.placeKey.isKeyClicked()) {
             addNode()
         }
+        if (config.toggleGhostPosition.isKeyClicked()) {
+            toggleGhostPosition()
+        }
         if (config.selectKey.isKeyClicked()) {
             activeNode = if (activeNode == closedNode) {
-                feedBackInTutorial("De selected active node.")
+                feedBackInTutorial("De-selected active node.")
                 null
             } else {
                 feedBackInTutorial("Selected new active node.")
@@ -480,7 +501,13 @@ object GraphEditor {
 
     private fun KeyBinding.handleEditClicks(vector: LorenzVec) {
         if (this.keyCode.isKeyClicked()) {
-            activeNode?.position = activeNode?.position?.plus(vector) ?: return
+            activeNode?.let {
+                it.position = it.position + vector
+            } ?: run {
+                ghostPosition?.let {
+                    ghostPosition = it + vector
+                }
+            }
         }
     }
 
@@ -503,7 +530,8 @@ object GraphEditor {
                 return
             }
         }
-        val position = LocationUtils.playerEyeLocation().roundLocationToBlock()
+
+        val position = ghostPosition ?: LocationUtils.playerEyeLocation().roundLocationToBlock()
         if (nodes.any { it.position == position }) {
             feedBackInTutorial("Can't create node, here is already another one.")
             return
@@ -515,6 +543,16 @@ object GraphEditor {
         addEdge(activeNode, node)
     }
 
+    fun toggleGhostPosition() {
+        if (ghostPosition != null) {
+            ghostPosition = null
+            feedBackInTutorial("Disabled Ghost Position.")
+        } else {
+            ghostPosition = LocationUtils.playerEyeLocation().roundLocationToBlock()
+            feedBackInTutorial("Enabled Ghost Position.")
+        }
+    }
+
     private fun getEdgeIndex(node1: GraphingNode?, node2: GraphingNode?) =
         if (node1 != null && node2 != null && node1 != node2) GraphingEdge(
             node1,
@@ -592,6 +630,7 @@ object GraphEditor {
         edges.clear()
         activeNode = null
         closedNode = null
+        ghostPosition = null
     }
 
     private fun prune() { //TODO fix
@@ -602,6 +641,8 @@ object GraphEditor {
         }
         nodes.removeIf { hasNeighbours[it] == false }
     }
+
+    fun LorenzVec.distanceSqToPlayer(): Double = ghostPosition?.let { distanceSq(it) } ?: distanceSq(playerLocation())
 }
 
 // The node object the graph editor is working with
@@ -656,6 +697,4 @@ private class GraphingEdge(val node1: GraphingNode, val node2: GraphingNode) {
         }
         return result
     }
-
 }
-

From 81aebf952893555a48441c4ac5516ac869741bb0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:34:44 +0200
Subject: [PATCH 378/721] Backend: Graph Editor Split & Dissolve (#2466)

---
 .../config/features/dev/GraphConfig.java      | 10 +++
 .../at/hannibal2/skyhanni/data/model/Graph.kt | 17 ++--
 .../at/hannibal2/skyhanni/test/GraphEditor.kt | 77 +++++++++++++++++--
 .../at/hannibal2/skyhanni/utils/LorenzVec.kt  |  4 +
 4 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
index bbc6caf7d7b1..9a2806f64e01 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
@@ -81,6 +81,16 @@ public class GraphConfig {
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_K)
     public int tutorialKey = Keyboard.KEY_K;
 
+    @Expose
+    @ConfigOption(name = "Split Key", desc = "Key for splitting an edge that is between the active and the closed node.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int splitKey = Keyboard.KEY_NONE;
+
+    @Expose
+    @ConfigOption(name = "Dissolve Key", desc = "Dissolve the active node into one edge if it only has two edges.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int dissolveKey = Keyboard.KEY_NONE;
+
     @Expose
     @ConfigLink(owner = GraphConfig.class, field = "enabled")
     public Position infoDisplay = new Position(20, 20);
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index 89fd413f5004..21440197d8b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -7,12 +7,12 @@ import at.hannibal2.skyhanni.utils.json.fromJson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonElement
 import com.google.gson.annotations.Expose
+import com.google.gson.stream.JsonToken
 import java.util.PriorityQueue
 
 @JvmInline
 value class Graph(
-    @Expose
-    val graph: List<GraphNode>,
+    @Expose val graph: List<GraphNode>,
 ) : List<GraphNode> {
     override val size
         get() = graph.size
@@ -82,6 +82,10 @@ value class Graph(
                     var tags: List<String>? = null
                     var neighbors = mutableListOf<Pair<Int, Double>>()
                     while (reader.hasNext()) {
+                        if (reader.peek() != JsonToken.NAME) {
+                            reader.skipValue()
+                            continue
+                        }
                         when (reader.nextName()) {
                             "Position" -> {
                                 position = reader.nextString().split(":").let { parts ->
@@ -157,8 +161,7 @@ class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null,
     }
 }
 
-fun Graph.findShortestPathAsGraph(start: GraphNode, end: GraphNode): Graph =
-    this.findShortestPathAsGraphWithDistance(start, end).first
+fun Graph.findShortestPathAsGraph(start: GraphNode, end: GraphNode): Graph = this.findShortestPathAsGraphWithDistance(start, end).first
 
 fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode): Pair<Graph, Double> {
     val distances = mutableMapOf<GraphNode, Double>()
@@ -199,11 +202,9 @@ fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode):
     ) to distances[end]!!
 }
 
-fun Graph.findShortestPath(start: GraphNode, end: GraphNode): List<LorenzVec> =
-    this.findShortestPathAsGraph(start, end).toPositionsList()
+fun Graph.findShortestPath(start: GraphNode, end: GraphNode): List<LorenzVec> = this.findShortestPathAsGraph(start, end).toPositionsList()
 
-fun Graph.findShortestDistance(start: GraphNode, end: GraphNode): Double =
-    this.findShortestPathAsGraphWithDistance(start, end).second
+fun Graph.findShortestDistance(start: GraphNode, end: GraphNode): Double = this.findShortestPathAsGraphWithDistance(start, end).second
 
 fun Graph.toPositionsList() = this.map { it.position }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index f5acf90fb72d..8757f19bf963 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -55,7 +55,18 @@ object GraphEditor {
     private val edges = mutableListOf<GraphingEdge>()
 
     private var activeNode: GraphingNode? = null
+        set(value) {
+            field = value
+            selectedEdge = findEdgeBetweenActiveAndClosed()
+            checkDissolve()
+        }
     private var closedNode: GraphingNode? = null
+        set(value) {
+            field = value
+            selectedEdge = findEdgeBetweenActiveAndClosed()
+        }
+
+    private var selectedEdge: GraphingEdge? = null
     private var ghostPosition: LorenzVec? = null
 
     private var seeThroughBlocks = true
@@ -86,6 +97,7 @@ object GraphEditor {
 
     private val edgeColor = LorenzColor.GOLD.addOpacity(150)
     private val edgeDijkstraColor = LorenzColor.DARK_BLUE.addOpacity(150)
+    private val edgeSelectedColor = LorenzColor.DARK_RED.addOpacity(150)
 
     val scrollValue = ScrollValue()
     var nodesDisplay = emptyList<Renderable>()
@@ -127,7 +139,11 @@ object GraphEditor {
             add("§eTutorial: §6${KeyboardManager.getKeyName(config.tutorialKey)}")
             add("§eToggle Ghost Position: §6${KeyboardManager.getKeyName(config.toggleGhostPosition)}")
             add(" ")
-            if (activeNode != null) add("§eText: §6${KeyboardManager.getKeyName(config.textKey)}")
+            if (activeNode != null) {
+                add("§eText: §6${KeyboardManager.getKeyName(config.textKey)}")
+                if (dissolvePossible) add("§eDissolve: §6${KeyboardManager.getKeyName(config.dissolveKey)}")
+                if (selectedEdge != null) add("§eSplit: §6${KeyboardManager.getKeyName(config.splitKey)}")
+            }
         }
 
         if (!inTextMode) {
@@ -152,6 +168,18 @@ object GraphEditor {
         }
     }
 
+    private var dissolvePossible = false
+
+    private fun findEdgeBetweenActiveAndClosed(): GraphingEdge? = getEdgeIndex(activeNode, closedNode)?.let { edges[it] }
+
+    private fun checkDissolve() {
+        if (activeNode == null) {
+            dissolvePossible = false
+            return
+        }
+        dissolvePossible = edges.count { it.isInEdge(activeNode) } == 2
+    }
+
     @SubscribeEvent
     fun onGuiRender(event: GuiRenderEvent) {
         if (!isEnabled()) return
@@ -207,7 +235,7 @@ object GraphEditor {
         )
     }
 
-    private fun createTagName(
+private fun createTagName(
         name: String,
         tag: GraphNodeTag,
         node: GraphingNode,
@@ -333,7 +361,11 @@ object GraphEditor {
     private fun LorenzRenderWorldEvent.drawEdge(edge: GraphingEdge) = this.draw3DLine_nea(
         edge.node1.position.add(0.5, 0.5, 0.5),
         edge.node2.position.add(0.5, 0.5, 0.5),
-        if (edge !in highlightedEdges) edgeColor else edgeDijkstraColor,
+        when {
+            selectedEdge == edge -> edgeSelectedColor
+            edge in highlightedEdges -> edgeDijkstraColor
+            else -> edgeColor
+        },
         7,
         !seeThroughBlocks,
     )
@@ -449,6 +481,8 @@ object GraphEditor {
                 feedBackInTutorial("Added new edge.")
             } else {
                 this.edges.removeAt(edge)
+                checkDissolve()
+                selectedEdge = findEdgeBetweenActiveAndClosed()
                 feedBackInTutorial("Removed edge.")
             }
         }
@@ -466,6 +500,29 @@ object GraphEditor {
             inTutorialMode = !inTutorialMode
             ChatUtils.chat("Tutorial mode is now ${if (inTutorialMode) "active" else "inactive"}.")
         }
+        if (selectedEdge != null && config.splitKey.isKeyClicked()) {
+            val edge = selectedEdge ?: return
+            feedBackInTutorial("Split Edge into a Node and two edges.")
+            val middle = edge.node1.position.middle(edge.node2.position).roundLocationToBlock()
+            val node = GraphingNode(id++, middle)
+            nodes.add(node)
+            edges.remove(edge)
+            addEdge(node, edge.node1)
+            addEdge(node, edge.node2)
+            activeNode = node
+        }
+        if (dissolvePossible && config.dissolveKey.isKeyClicked()) {
+            feedBackInTutorial("Dissolved the node, now it is gone.")
+            val edgePair = edges.filter { it.isInEdge(activeNode) }
+            val edge1 = edgePair[0]
+            val edge2 = edgePair[1]
+            val neighbors1 = if (edge1.node1 == activeNode) edge1.node2 else edge1.node1
+            val neighbors2 = if (edge2.node1 == activeNode) edge2.node2 else edge2.node1
+            edges.removeAll(edgePair)
+            nodes.remove(activeNode)
+            activeNode = null
+            addEdge(neighbors1, neighbors2)
+        }
     }
 
     private fun save() {
@@ -561,7 +618,14 @@ object GraphEditor {
         else null
 
     private fun addEdge(node1: GraphingNode?, node2: GraphingNode?) =
-        if (node1 != null && node2 != null && node1 != node2) edges.add(GraphingEdge(node1, node2)) else false
+        if (node1 != null && node2 != null && node1 != node2) {
+            val edge = GraphingEdge(node1, node2)
+            if (edge.isInEdge(activeNode)) {
+                checkDissolve()
+                selectedEdge = findEdgeBetweenActiveAndClosed()
+            }
+            edges.add(edge)
+        } else false
 
     /** Has a side effect on the graphing graph, since it runs [prune] on the graphing graph*/
     private fun compileGraph(): Graph {
@@ -597,6 +661,8 @@ object GraphEditor {
             }.flatten().distinct(),
         )
         id = nodes.lastOrNull()?.id?.plus(1) ?: 0
+        checkDissolve()
+        selectedEdge = findEdgeBetweenActiveAndClosed()
     }
 
     private val highlightedNodes = mutableSetOf<GraphingNode>()
@@ -630,6 +696,7 @@ object GraphEditor {
         edges.clear()
         activeNode = null
         closedNode = null
+        dissolvePossible = false
         ghostPosition = null
     }
 
@@ -671,7 +738,7 @@ private class GraphingNode(
 
 private class GraphingEdge(val node1: GraphingNode, val node2: GraphingNode) {
 
-    fun isInEdge(node: GraphingNode) = node1 == node || node2 == node
+    fun isInEdge(node: GraphingNode?) = node1 == node || node2 == node
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 474d6dee58a7..4a50d79f3af0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -215,6 +215,10 @@ data class LorenzVec(
         return (nearestPointOnLine(startPos, endPos) - this).lengthSquared()
     }
 
+    fun middle(other: LorenzVec): LorenzVec = this.plus(other.minus(this) / 2)
+
+    private operator fun div(i: Number): LorenzVec = LorenzVec(x / i.toDouble(), y / i.toDouble(), z / i.toDouble())
+
     companion object {
 
         fun getFromYawPitch(yaw: Double, pitch: Double): LorenzVec {

From 77582eb87f9dd094995feee516ef193ca3e176e7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:08:39 +0200
Subject: [PATCH 379/721] added support for small_area

---
 .../skyhanni/data/model/GraphNodeTag.kt       | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index 6cfac664b5f9..a7349801324a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -1,40 +1,45 @@
 package at.hannibal2.skyhanni.data.model
 
-enum class GraphNodeTag(val internalName: String?, val displayName: String, val description: String) {
-    DEV("dev", "Dev", "Intentionally marked as dev."), // E.g. Spawn points, todos, etc
+import at.hannibal2.skyhanni.utils.LorenzColor
+
+enum class GraphNodeTag(val internalName: String?, val color: LorenzColor, val cleanName: String, val description: String) {
+    DEV("dev", LorenzColor.WHITE, "Dev", "Intentionally marked as dev."), // E.g. Spawn points, todos, etc
 
     // Everywhere
-    NPC("npc", "§eNPC", "A NPC entity."), // also take from neu repo
-    AREA("area", "§aArea", "A SkyBlock Area."),
-    POI("poi", "PoI", "Point of interest."),
-    LAUNCH_PAD("launch", "Launch Pad", "Slime blocks sending you to another server."),
+    NPC("npc", LorenzColor.YELLOW, "NPC", "A NPC entity."), // also take from neu repo
+    AREA("area", LorenzColor.DARK_GREEN, "Area", "A big SkyBlock area."),
+    SMALL_AREA("small_area", LorenzColor.GREEN, "Small Area", "A small SkyBlock area, e.g. a house."),
+    POI("poi", LorenzColor.WHITE, "PoI", "Point of interest."),
+    LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
 
     // on multiple islands
-    ROMEO("romeo", "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
-    RACE("race", "Race Start/Stop", "A race start or stop point."),
-    SLAYER("slayer", "Slayer", "A Slayer area"),
+    ROMEO("romeo", LorenzColor.WHITE, "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
+    RACE("race", LorenzColor.WHITE, "Race Start/Stop", "A race start or stop point."),
+    SLAYER("slayer", LorenzColor.WHITE, "Slayer", "A Slayer area"),
     // hoppity
 
     // Hub
-    HUB_12_STARTER("starter_npc", "Starter NPC", "One of the 12 starter NPC's you need to talk to."),
+    HUB_12_STARTER("starter_npc", LorenzColor.WHITE, "Starter NPC", "One of the 12 starter NPC's you need to talk to."),
     // diana
 
     // Farming Islands: Pelts
-    FARMING_CROP("farming_crop", "Farming Crop", "A spot where you can break crops on farming islands."),
+    FARMING_CROP("farming_crop", LorenzColor.WHITE, "Farming Crop", "A spot where you can break crops on farming islands."),
 
     // Rift
-    RIFT_ENIGMA("rift_enigma", "§5Enigma Soul", "Enigma Souls in the rift."),
-    RIFT_EYE("rift_eye", "§4Eye", "An Eye in the rift to teleport to."),
+    RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the rift."),
+    RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Eye", "An Eye in the rift to teleport to."),
 
     // Spider's Den
-    SPIDER_RELIC("SPIDER_RELIC", "§5Relic", "An relic in the Spider's Den."),
+    SPIDER_RELIC("SPIDER_RELIC", LorenzColor.DARK_PURPLE, "Relic", "An relic in the Spider's Den."),
 
     // Dwarven Mines
-    MINES_EMISSARY("mines_emissary", "§6Emissary", "A Emissary from the king."),
+    MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Emissary", "A Emissary from the king."),
     // commission areas
 
     ;
 
+    val displayName: String = color.getChatColor() + cleanName
+
     companion object {
         fun byId(internalName: String?): GraphNodeTag? = values().firstOrNull { it.internalName == internalName }
     }

From eb21cf130d57de5f2169fba3e27a2e747c32552e Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 7 Sep 2024 06:30:38 +0200
Subject: [PATCH 380/721] Fix: Minister not resetting (#2467)

---
 src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index af60519f693f..a8024ea3687a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -152,6 +152,7 @@ object MayorAPI {
         if (electionOverPattern.matches(event.message)) {
             lastMayor = currentMayor
             currentMayor = Mayor.UNKNOWN
+            currentMinister = null
         }
     }
 

From 987fc85d379a6dee461778ebd75ff0fba3a3e8b8 Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Sat, 7 Sep 2024 05:42:23 +0100
Subject: [PATCH 381/721] Fix: Ultimate enchants not showing in /show (#2465)

---
 .../skyhanni/features/misc/items/enchants/EnchantParser.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index bf7ef24c452e..f3d7e8017a24 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -40,7 +40,7 @@ object EnchantParser {
     val patternGroup = RepoPattern.group("misc.items.enchantparsing")
     val enchantmentPattern by patternGroup.pattern(
         "enchants.new",
-        "(§9§d§l|§d§l§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>(§r)?§9, |\$| §8\\d{1,3}(,\\d{3})*)",
+        "(§d§l|§9)(?<enchant>[A-Za-z][A-Za-z '-]+) (?<levelNumeral>[IVXLCDM]+|[0-9]+)(?<stacking>(§r)?§9, |\$| §8\\d{1,3}(,\\d{3})*)",
     )
     private val grayEnchantPattern by patternGroup.pattern(
         "grayenchants", "^(Respiration|Aqua Affinity|Depth Strider|Efficiency).*",

From a4fde679f7a980a2ab86180e475e2ebc76bdd9f0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 06:53:48 +0200
Subject: [PATCH 382/721] Docs: Readme updates (#2458)

---
 README.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a7c00b495c57..07bf336a172c 100644
--- a/README.md
+++ b/README.md
@@ -14,19 +14,19 @@
 
 ## What it does
 
-SkyHanni is a Forge mod for Minecraft 1.8.9 that adds many useful features to Hypixel SkyBlock. With SkyHanni, you'll get:
+SkyHanni is a Forge mod for Minecraft 1.8.9 that adds many useful features to [Hypixel SkyBlock](https://wiki.hypixel.net/Main_Page). With SkyHanni you have access to:
 
-* **Helpful GUIs:** Access important information at a glance.
-* **Extra Chat Messages:** Receive reminders and helpful tips.
-* **Message Hiders:** Control which messages you see in chat.
-* **Entity/Item Highlighters:** Focus on important mobs or items in the world/your inventory.
-* **[And much more!](docs/FEATURES.md)**
+* **Helpful GUIs:** View important information at a glance.
+* **Extra Chat Messages:** Receive reminders and tips at the right moment.
+* **Object Highlighters:** Focus on important items in inventories or highlight mobs in the world.
+* **Highly Customizeable Displays:** Personalise your Scoreboard, Tab List or chat format.
+* [And **much** more!](docs/FEATURES.md)
 
-SkyHanni is especially helpful when doing activities like farming, slayers, Bingo, Diana, fishing, or Rift.
+SkyHanni is especially useful when doing farming, slayers, Bingo, Diana, fishing, Rift or mining.
 
 ## Getting Started
 
-1. **Install:**  Check out the [installation guide](docs/INSTALLING.md).
+1. **Install:**  Follow the [installation guide](docs/INSTALLING.md).
 2. **Set Up:** Type `/sh` or `/skyhanni` in-game to configure your settings.
 3. **Explore:** See all the features [here](docs/FEATURES.md).
 
@@ -34,17 +34,17 @@ SkyHanni is especially helpful when doing activities like farming, slayers, Bing
 
 Give feedback or just chat with others on our community Discord!
 
-* **Bug Reports:** Use the `#bug-reports` channel.
-* **Feature Suggestions:** Use the `#suggestions` channel.
-* **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel.
+* **Bug Reports:** Use the `#bug-reports` channel when you find broken features (please check out `#faq` and `#known-bugs`).
+* **Quick Help** Ask in `#support` for questions and problems with the the mod or Minecraft in general.
+* **Feature Suggestions:** Feel fre to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
+* **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel about the game.
 
-[Join the Discord](https://discord.gg/skyhanni-997079228510117908)
+**[Join the Discord!](https://discord.gg/skyhanni-997079228510117908)**
 
 ## Contributing
 
-Interested in writing your own SkyHanni feature or fixing that one annoying bug yourself? Check out our [contributing guide](CONTRIBUTING.md) for more information.
+Are you interested in writing your own SkyHanni feature? Do you want to fix that one annoying bug yourself? Check out our [contributing guide](CONTRIBUTING.md) for more information!
 
 ---
 
-**SkyHanni is part of an active modding community. Explore other useful mods [here](https://sbmw.ca/mod-lists/skyblock-mod-list/) to
-complete your SkyBlock setup!**
+**SkyHanni is part of an active modding community. Explore other useful mods [here](https://sbmw.ca/mod-lists/skyblock-mod-list/) for even more SkyBlock features!**

From a2c7ebe2115f6606414baf84aff7d040bf1182bd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 06:54:00 +0200
Subject: [PATCH 383/721] Improvement: Guardian Pet Experimentation Table
 (#2459)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/experiments/GuardianReminder.kt        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
index 70638619b4d9..9ae93f22717f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
@@ -30,6 +30,7 @@ object GuardianReminder {
 
     private val config get() = SkyHanniMod.feature.inventory.helper.enchanting
     private var lastInventoryOpen = SimpleTimeMark.farPast()
+    private var lastWarn = SimpleTimeMark.farPast()
     private var lastErrorSound = SimpleTimeMark.farPast()
 
     private val patternGroup = RepoPattern.group("data.enchanting.inventory.experimentstable")
@@ -54,6 +55,9 @@ object GuardianReminder {
         if (petNamePattern.matches(PetAPI.currentPet)) return
 
         lastInventoryOpen = SimpleTimeMark.now()
+
+        if (lastWarn.passedSince() < 5.seconds) return
+        lastWarn = SimpleTimeMark.now()
         ChatUtils.clickToActionOrDisable(
             "Use a §9§lGuardian Pet §efor more Exp in the Experimentation Table.",
             config::guardianReminder,

From 78ce109b8fe6291340067771217b6965d82d76c2 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 7 Sep 2024 14:56:14 +1000
Subject: [PATCH 384/721] Fix: shtps command printing nothing (#2446)

---
 .../java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
index ed6d3f63c502..0a3a60295371 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
@@ -73,6 +73,10 @@ object TpsCounter {
     }
 
     fun tpsCommand() {
+        if (display.isEmpty()) {
+            ChatUtils.chat("§cNo tps data available, make sure you have the setting on.")
+            return
+        }
         ChatUtils.chat(display)
     }
 

From 02c9ce15e053d5d0751c32ea3ef481c9eef7a904 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 07:05:45 +0200
Subject: [PATCH 385/721] Feature: /shedittracker (#2448)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/api/CollectionAPI.kt   |  2 +
 .../skyhanni/config/commands/Commands.kt      |  5 +++
 .../hannibal2/skyhanni/data/ItemAddManager.kt |  1 +
 .../hannibal2/skyhanni/data/TrackerManager.kt | 31 +++++++++++++++
 .../event/diana/DianaProfitTracker.kt         | 24 +++++++-----
 .../fishing/tracker/FishingProfitTracker.kt   | 32 ++++++++++------
 .../garden/pests/PestProfitTracker.kt         | 35 ++++++++++++-----
 .../fossilexcavator/ExcavatorProfitTracker.kt | 20 +++++++++-
 .../features/slayer/SlayerProfitTracker.kt    | 32 ++++++++--------
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 23 ++++++-----
 .../skyhanni/utils/NEUInternalName.kt         | 24 +++++++++++-
 .../skyhanni/utils/tracker/ItemTrackerData.kt | 11 ++++--
 .../utils/tracker/SkyHanniItemTracker.kt      | 38 +++++++++++++------
 13 files changed, 202 insertions(+), 76 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
index 3e7e1f7bf964..1f5adacf70ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.api
 
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.events.CollectionUpdateEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
@@ -88,6 +89,7 @@ object CollectionAPI {
 
     @SubscribeEvent
     fun onItemAdd(event: ItemAddEvent) {
+        if (event.source == ItemAddManager.Source.COMMAND) return
         val internalName = event.internalName
         val amount = NEUItems.getPrimitiveMultiplier(internalName).amount
         if (amount > 1) return
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index f7101cd4b141..edfdb2d7a235 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.SackAPI
 import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.data.TitleManager
+import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher
 import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay
 import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper
@@ -438,6 +439,10 @@ object Commands {
             "shresetpunchcard",
             "Resets the Rift Punchcard Artifact player list.",
         ) { PunchcardHighlight.clearList() }
+        registerCommand(
+            "shedittracker",
+            "Changes the tracked item amount for Diana, Fishing, Pest, Excavator, and Slayer Item Trackers.",
+        ) { TrackerManager.commandEditTracker(it) }
     }
 
     private fun developersDebugFeatures() {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt
index 26658eee7cc9..4906f5f80623 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt
@@ -25,6 +25,7 @@ object ItemAddManager {
     enum class Source {
         ITEM_ADD,
         SACKS,
+        COMMAND,
     }
 
     private val ARCHFIEND_DICE = "ARCHFIEND_DICE".asInternalName()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
index 71b60d76ea35..c1a7a60c3f49 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt
@@ -3,8 +3,12 @@ package at.hannibal2.skyhanni.data
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -13,6 +17,7 @@ object TrackerManager {
 
     private var hasChanged = false
     var dirty = false
+    var commandEditTrackerSuccess = false
 
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
@@ -36,4 +41,30 @@ object TrackerManager {
             hasChanged = false
         }
     }
+
+    fun commandEditTracker(args: Array<String>) {
+        if (args.size < 2) {
+            ChatUtils.userError("Usage: /shedittracker <item name> <amount>")
+            return
+        }
+
+        val amount = args.last().formatIntOrUserError() ?: return
+        if (amount == 0) {
+            ChatUtils.userError("Amount can not be zero!")
+            return
+        }
+
+        val rawName = args.dropLast(1).joinToString(" ")
+        val internalName = NEUInternalName.fromItemNameOrInternalName(rawName)
+        if (!internalName.isKnownItem()) {
+            ChatUtils.chat("No item found for '$rawName'!")
+            return
+        }
+
+        commandEditTrackerSuccess = false
+        ItemAddEvent(internalName, amount, ItemAddManager.Source.COMMAND).postAndCatch()
+        if (!commandEditTrackerSuccess) {
+            ChatUtils.userError("Could not edit the Item Tracker! Does this item belong to this tracker? Is the tracker active right now?")
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index 1ba2724c3669..01d2c1d2ed65 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDropsJson
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
@@ -33,17 +34,18 @@ object DianaProfitTracker {
     private val patternGroup = RepoPattern.group("diana.chat")
     private val chatDugOutPattern by patternGroup.pattern(
         "burrow.dug",
-        "(§eYou dug out a Griffin Burrow!|§eYou finished the Griffin burrow chain!) .*"
+        "(§eYou dug out a Griffin Burrow!|§eYou finished the Griffin burrow chain!) .*",
     )
     private val chatDugOutCoinsPattern by patternGroup.pattern(
         "coins",
-        "§6§lWow! §r§eYou dug out §r§6(?<coins>.*) coins§r§e!"
+        "§6§lWow! §r§eYou dug out §r§6(?<coins>.*) coins§r§e!",
     )
 
     private val tracker = SkyHanniItemTracker(
         "Diana Profit Tracker",
         { Data() },
-        { it.diana.dianaProfitTracker }) { drawDisplay(it) }
+        { it.diana.dianaProfitTracker },
+    ) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
 
@@ -70,7 +72,7 @@ object DianaProfitTracker {
             val burrowDugCoinsFormat = item.totalAmount.shortFormat()
             return listOf(
                 "§7Digging treasures gave you",
-                "§6$burrowDugCoinsFormat coins §7in total."
+                "§6$burrowDugCoinsFormat coins §7in total.",
             )
         }
     }
@@ -84,8 +86,8 @@ object DianaProfitTracker {
         addAsSingletonList(
             Renderable.hoverTips(
                 "§7Burrows dug: §e${treasureCoins.addSeparators()}",
-                listOf("§7You dug out griffin burrows §e${treasureCoins.addSeparators()} §7times.")
-            )
+                listOf("§7You dug out griffin burrows §e${treasureCoins.addSeparators()} §7times."),
+            ),
         )
 
         addAsSingletonList(tracker.addTotalProfit(profit, data.burrowsDug, "burrow"))
@@ -97,14 +99,16 @@ object DianaProfitTracker {
     fun onItemAdd(event: ItemAddEvent) {
         if (!isEnabled()) return
 
-        val internalName = event.internalName
+        tryAddItem(event.internalName, event.amount, event.source == ItemAddManager.Source.COMMAND)
+    }
 
-        if (!isAllowedItem(internalName)) {
+    private fun tryAddItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
+        if (!isAllowedItem(internalName) && internalName != NEUInternalName.SKYBLOCK_COIN) {
             ChatUtils.debug("Ignored non-diana item pickup: '$internalName'")
             return
         }
 
-        tracker.addItem(internalName, event.amount)
+        tracker.addItem(internalName, amount, command)
     }
 
     @SubscribeEvent
@@ -119,7 +123,7 @@ object DianaProfitTracker {
         }
         chatDugOutCoinsPattern.matchMatcher(message) {
             BurrowAPI.lastBurrowRelatedChatMessage = SimpleTimeMark.now()
-            tracker.addCoins(group("coins").formatInt())
+            tryAddItem(NEUInternalName.SKYBLOCK_COIN, group("coins").formatInt(), command = false)
             tryHide(event)
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index b99c03ff57a3..a0590816efbd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.fishing.tracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.data.jsonobjects.repo.FishingProfitItemsJson
 import at.hannibal2.skyhanni.events.FishingBobberCastEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -43,14 +44,15 @@ object FishingProfitTracker {
 
     private val coinsChatPattern by RepoPattern.pattern(
         "fishing.tracker.chat.coins",
-        ".* CATCH! §r§bYou found §r§6(?<coins>.*) Coins§r§b\\."
+        ".* CATCH! §r§bYou found §r§6(?<coins>.*) Coins§r§b\\.",
     )
 
     private var lastCatchTime = SimpleTimeMark.farPast()
     private val tracker = SkyHanniItemTracker(
         "Fishing Profit Tracker",
         { Data() },
-        { it.fishing.fishingProfitTracker }) { drawDisplay(it) }
+        { it.fishing.fishingProfitTracker },
+    ) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
 
@@ -64,7 +66,7 @@ object FishingProfitTracker {
 
             return listOf(
                 "§7Caught §e${timesCaught.addSeparators()} §7times.",
-                "§7Your catch rate: §c$catchRate"
+                "§7Your catch rate: §c$catchRate",
             )
         }
 
@@ -73,7 +75,7 @@ object FishingProfitTracker {
         override fun getCoinDescription(item: TrackedItem): List<String> {
             val mobKillCoinsFormat = item.totalAmount.shortFormat()
             return listOf(
-                "§7You fished up §6$mobKillCoinsFormat coins §7already."
+                "§7You fished up §6$mobKillCoinsFormat coins §7already.",
             )
         }
 
@@ -127,8 +129,8 @@ object FishingProfitTracker {
         addAsSingletonList(
             Renderable.hoverTips(
                 "§7Times fished: §e${fishedCount.addSeparators()}",
-                listOf("§7You've reeled in §e${fishedCount.addSeparators()} §7catches.")
-            )
+                listOf("§7You've reeled in §e${fishedCount.addSeparators()} §7catches."),
+            ),
         )
 
         addAsSingletonList(tracker.addTotalProfit(profit, data.totalCatchAmount, "catch"))
@@ -152,7 +154,7 @@ object FishingProfitTracker {
                     val id = list.indexOf(currentCategory)
                     currentCategory = list[(id + 1) % list.size]
                     tracker.update()
-                }
+                },
             )
         }
 
@@ -178,7 +180,7 @@ object FishingProfitTracker {
                 "Loaded $label not in a fishing category",
                 "Found items missing in itemCategories",
                 "missingItems" to missingItems,
-                noStackTrace = true
+                noStackTrace = true,
             )
         }
     }
@@ -186,15 +188,21 @@ object FishingProfitTracker {
     @SubscribeEvent
     fun onItemAdd(event: ItemAddEvent) {
         if (!isEnabled()) return
+
+        if (event.source == ItemAddManager.Source.COMMAND) {
+            tryAddItem(event.internalName, event.amount, command = true)
+            return
+        }
+
         DelayedRun.runDelayed(500.milliseconds) {
-            maybeAddItem(event.internalName, event.amount)
+            tryAddItem(event.internalName, event.amount, command = false)
         }
     }
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         coinsChatPattern.matchMatcher(event.message) {
-            tracker.addCoins(group("coins").formatInt())
+            tryAddItem(NEUInternalName.SKYBLOCK_COIN, group("coins").formatInt(), command = false)
             addCatch()
         }
     }
@@ -221,14 +229,14 @@ object FishingProfitTracker {
         lastCatchTime = SimpleTimeMark.farPast()
     }
 
-    private fun maybeAddItem(internalName: NEUInternalName, amount: Int) {
+    private fun tryAddItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
         if (!FishingAPI.isFishing(checkRodInHand = false)) return
         if (!isAllowedItem(internalName)) {
             ChatUtils.debug("Ignored non-fishing item pickup: $internalName'")
             return
         }
 
-        tracker.addItem(internalName, amount)
+        tracker.addItem(internalName, amount, command)
         addCatch()
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 5f630335b5c4..1d2710c7c129 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -2,8 +2,10 @@ package at.hannibal2.skyhanni.features.garden.pests
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PurseChangeCause
 import at.hannibal2.skyhanni.events.PurseChangeEvent
@@ -37,14 +39,15 @@ object PestProfitTracker {
      */
     private val pestRareDropPattern by patternGroup.pattern(
         "raredrop",
-        "§6§l(?:RARE|PET) DROP! (?:§r)?(?<item>.+) §6\\(§6\\+.*☘\\)"
+        "§6§l(?:RARE|PET) DROP! (?:§r)?(?<item>.+) §6\\(§6\\+.*☘\\)",
     )
 
     private var lastPestKillTime = SimpleTimeMark.farPast()
     private val tracker = SkyHanniItemTracker(
         "Pest Profit Tracker",
         { Data() },
-        { it.garden.pestProfitTracker }) { drawDisplay(it) }
+        { it.garden.pestProfitTracker },
+    ) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
         override fun resetItems() {
@@ -56,7 +59,7 @@ object PestProfitTracker {
             val dropRate = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0))
             return listOf(
                 "§7Dropped §e${timesGained.addSeparators()} §7times.",
-                "§7Your drop rate: §c$dropRate."
+                "§7Your drop rate: §c$dropRate.",
             )
         }
 
@@ -66,7 +69,7 @@ object PestProfitTracker {
             val pestsCoinsFormat = item.totalAmount.shortFormat()
             return listOf(
                 "§7Killing pests gives you coins.",
-                "§7You got §6$pestsCoinsFormat coins §7that way."
+                "§7You got §6$pestsCoinsFormat coins §7that way.",
             )
         }
 
@@ -74,6 +77,16 @@ object PestProfitTracker {
         var totalPestsKills = 0L
     }
 
+    @SubscribeEvent
+    fun onItemAdd(event: ItemAddEvent) {
+        if (!isEnabled()) return
+
+        val internalName = event.internalName
+        if (event.source == ItemAddManager.Source.COMMAND) {
+            tryAddItem(internalName, event.amount, command = true)
+        }
+    }
+
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
@@ -81,18 +94,22 @@ object PestProfitTracker {
             val amount = group("amount").toInt()
             val internalName = NEUInternalName.fromItemNameOrNull(group("item")) ?: return
 
-            tracker.addItem(internalName, amount)
+            tryAddItem(internalName, amount, command = false)
             addKill()
             if (config.hideChat) event.blockedReason = "pest_drop"
         }
         pestRareDropPattern.matchMatcher(event.message) {
             val internalName = NEUInternalName.fromItemNameOrNull(group("item")) ?: return
 
-            tracker.addItem(internalName, 1)
+            tryAddItem(internalName, 1, command = false)
             // pests always have guaranteed loot, therefore there's no need to add kill here
         }
     }
 
+    private fun tryAddItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
+        tracker.addItem(internalName, amount, command)
+    }
+
     private fun addKill() {
         tracker.modify {
             it.totalPestsKills++
@@ -108,8 +125,8 @@ object PestProfitTracker {
         addAsSingletonList(
             Renderable.hoverTips(
                 "§7Pests killed: §e${pestsKilled.addSeparators()}",
-                listOf("§7You killed pests §e${pestsKilled.addSeparators()} §7times.")
-            )
+                listOf("§7You killed pests §e${pestsKilled.addSeparators()} §7times."),
+            ),
         )
         addAsSingletonList(tracker.addTotalProfit(profit, data.totalPestsKills, "kill"))
 
@@ -131,7 +148,7 @@ object PestProfitTracker {
         val coins = event.coins
         if (coins > 1000) return
         if (event.reason == PurseChangeCause.GAIN_MOB_KILL && lastPestKillTime.passedSince() < 2.seconds) {
-            tracker.addCoins(coins.toInt())
+            tryAddItem(NEUInternalName.SKYBLOCK_COIN, coins.toInt(), command = false)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
index dcf9b8c4db47..ef3b780b7038 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
@@ -2,8 +2,10 @@ package at.hannibal2.skyhanni.features.mining.fossilexcavator
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.mining.FossilExcavationEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -154,6 +156,20 @@ object ExcavatorProfitTracker {
         return profit - scrapPrice
     }
 
+    @SubscribeEvent
+    fun onItemAdd(event: ItemAddEvent) {
+        if (!isEnabled()) return
+
+        val internalName = event.internalName
+        if (event.source == ItemAddManager.Source.COMMAND) {
+            tryAddItem(internalName, event.amount, command = true)
+        }
+    }
+
+    private fun tryAddItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
+        tracker.addItem(internalName, amount, command)
+    }
+
     @SubscribeEvent
     fun onFossilExcavation(event: FossilExcavationEvent) {
         if (!isEnabled()) return
@@ -185,11 +201,11 @@ object ExcavatorProfitTracker {
 
         val internalName = NEUInternalName.fromItemNameOrNull(name)
         if (internalName == null) {
-            ChatUtils.debug("no price for exavator profit: '$name'")
+            ChatUtils.debug("no price for excavator profit: '$name'")
             return
         }
         // TODO use primitive item stacks in trackers
-        tracker.addItem(internalName, amount)
+        tryAddItem(internalName, amount, command = false)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
index 372c7daa9f6b..d2f50358d216 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.slayer
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
+import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.data.jsonobjects.repo.SlayerProfitTrackerItemsJson
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -46,7 +47,7 @@ object SlayerProfitTracker {
      */
     private val autoSlayerBankPattern by RepoPattern.pattern(
         "slayer.autoslayer.bank.chat",
-        "§7Took (?<coins>.+) coins from your bank for auto-slayer\\.\\.\\."
+        "§7Took (?<coins>.+) coins from your bank for auto-slayer\\.\\.\\.",
     )
 
     class Data : ItemTrackerData() {
@@ -78,7 +79,7 @@ object SlayerProfitTracker {
             val mobKillCoinsFormat = item.totalAmount.shortFormat()
             return listOf(
                 "§7Killing mobs gives you coins (more with scavenger).",
-                "§7You got §6$mobKillCoinsFormat coins §7that way."
+                "§7You got §6$mobKillCoinsFormat coins §7that way.",
             )
         }
     }
@@ -104,7 +105,7 @@ object SlayerProfitTracker {
         if (!isEnabled()) return
         val coins = event.coins
         if (event.reason == PurseChangeCause.GAIN_MOB_KILL && SlayerAPI.isInCorrectArea) {
-            getTracker()?.addCoins(coins.toInt())
+            tryAddItem(NEUInternalName.SKYBLOCK_COIN, coins.toInt(), command = false)
         }
         if (event.reason == PurseChangeCause.LOSE_SLAYER_QUEST_STARTED) {
             addSlayerCosts(coins)
@@ -133,7 +134,7 @@ object SlayerProfitTracker {
         return trackers.getOrPut(itemLogCategory) {
             val getStorage: (ProfileSpecificStorage) -> Data = {
                 it.slayerProfitData.getOrPut(
-                    itemLogCategory
+                    itemLogCategory,
                 ) { Data() }
             }
             SkyHanniItemTracker("$itemLogCategory Profit Tracker", { Data() }, getStorage) { drawDisplay(it) }
@@ -153,15 +154,16 @@ object SlayerProfitTracker {
         if (!SlayerAPI.isInCorrectArea) return
         if (!SlayerAPI.hasActiveSlayerQuest()) return
 
-        val internalName = event.internalName
-        val amount = event.amount
+        tryAddItem(event.internalName, event.amount, event.source == ItemAddManager.Source.COMMAND)
+    }
 
-        if (!isAllowedItem(internalName)) {
+    private fun tryAddItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
+        if (!isAllowedItem(internalName) && internalName != NEUInternalName.SKYBLOCK_COIN) {
             ChatUtils.debug("Ignored non-slayer item pickup: '$internalName' '$itemLogCategory'")
             return
         }
 
-        getTracker()?.addItem(internalName, amount)
+        getTracker()?.addItem(internalName, amount, command)
     }
 
     private fun isAllowedItem(internalName: NEUInternalName): Boolean {
@@ -176,12 +178,12 @@ object SlayerProfitTracker {
         var profit = tracker.drawItems(data, { true }, this)
         val slayerSpawnCost = data.slayerSpawnCost
         if (slayerSpawnCost != 0L) {
-            val mobKillCoinsFormat = slayerSpawnCost.shortFormat()
+            val slayerSpawnCostFormat = slayerSpawnCost.shortFormat()
             addAsSingletonList(
                 Renderable.hoverTips(
-                    " §7Slayer Spawn Costs: §c$mobKillCoinsFormat",
-                    listOf("§7You paid §c$mobKillCoinsFormat §7in total", "§7for starting the slayer quests.")
-                )
+                    " §7Slayer Spawn Costs: §c$slayerSpawnCostFormat",
+                    listOf("§7You paid §c$slayerSpawnCostFormat §7in total", "§7for starting the slayer quests."),
+                ),
             )
             profit += slayerSpawnCost
         }
@@ -190,8 +192,8 @@ object SlayerProfitTracker {
         addAsSingletonList(
             Renderable.hoverTips(
                 "§7Bosses killed: §e${slayerCompletedCount.addSeparators()}",
-                listOf("§7You killed the $itemLogCategory boss", "§e${slayerCompletedCount.addSeparators()} §7times.")
-            )
+                listOf("§7You killed the $itemLogCategory boss", "§e${slayerCompletedCount.addSeparators()} §7times."),
+            ),
         )
 
         addAsSingletonList(tracker.addTotalProfit(profit, data.slayerCompletedCount, "boss"))
@@ -204,7 +206,7 @@ object SlayerProfitTracker {
         val text = " §6Mob kill coins§7: §6$mobKillCoinsFormat"
         val lore = listOf(
             "§7Killing mobs gives you coins (more with scavenger)",
-            "§7You got §e$mobKillCoinsFormat §7coins in total this way"
+            "§7You got §e$mobKillCoinsFormat §7coins in total this way",
         )
 
         text to lore
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 612f048ded49..1a75b4cbcff1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -68,10 +68,9 @@ object ItemUtils {
     }
 
     // TODO change else janni is sad
-    fun ItemStack.isCoopSoulBound(): Boolean =
-        getLore().any {
-            it == "§8§l* §8Co-op Soulbound §8§l*" || it == "§8§l* §8Soulbound §8§l*"
-        }
+    fun ItemStack.isCoopSoulBound(): Boolean = getLore().any {
+        it == "§8§l* §8Co-op Soulbound §8§l*" || it == "§8§l* §8Soulbound §8§l*"
+    }
 
     // TODO change else janni is sad
     fun ItemStack.isSoulBound(): Boolean = getLore().any { it == "§8§l* §8Soulbound §8§l*" }
@@ -82,8 +81,7 @@ object ItemUtils {
 
     fun getItemsInInventory(withCursorItem: Boolean = false): List<ItemStack> {
         val list: LinkedList<ItemStack> = LinkedList()
-        val player = Minecraft.getMinecraft().thePlayer
-            ?: ErrorManager.skyHanniError("getItemsInInventoryWithSlots: player is null!")
+        val player = Minecraft.getMinecraft().thePlayer ?: ErrorManager.skyHanniError("getItemsInInventoryWithSlots: player is null!")
 
         for (slot in player.openContainer.inventorySlots) {
             if (slot.hasStack) {
@@ -138,8 +136,8 @@ object ItemUtils {
         if (tagCompound == null) return null
         val nbt = tagCompound
         if (!nbt.hasKey("SkullOwner")) return null
-        return nbt.getCompoundTag("SkullOwner").getCompoundTag("Properties")
-            .getTagList("textures", Constants.NBT.TAG_COMPOUND).getCompoundTagAt(0).getString("Value")
+        return nbt.getCompoundTag("SkullOwner").getCompoundTag("Properties").getTagList("textures", Constants.NBT.TAG_COMPOUND)
+            .getCompoundTagAt(0).getString("Value")
     }
 
     fun ItemStack.getSkullOwner(): String? {
@@ -208,8 +206,7 @@ object ItemUtils {
 
         for (line in this.getLore().reversed()) {
             val (category, rarity) = UtilsPatterns.rarityLoreLinePattern.matchMatcher(line) {
-                group("itemCategory").replace(" ", "_") to
-                    group("rarity").replace(" ", "_")
+                group("itemCategory").replace(" ", "_") to group("rarity").replace(" ", "_")
             } ?: continue
 
             val itemCategory = getItemCategory(category, name, cleanName)
@@ -290,8 +287,7 @@ object ItemUtils {
         return data.itemRarity
     }
 
-    private fun itemRarityLastCheck(data: CachedItemData) =
-        data.itemRarityLastCheck.passedSince() > 10.seconds
+    private fun itemRarityLastCheck(data: CachedItemData) = data.itemRarityLastCheck.passedSince() > 10.seconds
 
     /**
      * Use when comparing the name (e.g. regex), not for showing to the user
@@ -391,6 +387,9 @@ object ItemUtils {
 
     val NEUInternalName.itemNameWithoutColor: String get() = itemName.removeColor()
 
+    val NEUInternalName.readableInternalName: String
+        get() = asString().replace("_", " ").lowercase()
+
     private fun NEUInternalName.grabItemName(): String {
         if (this == NEUInternalName.WISP_POTION) {
             return "§fWisp's Ice-Flavored Water"
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index 18568869ade9..6d0eb33e51fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -1,5 +1,7 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+
 class NEUInternalName private constructor(private val internalName: String) {
 
     companion object {
@@ -20,7 +22,25 @@ class NEUInternalName private constructor(private val internalName: String) {
         }
 
         fun fromItemNameOrNull(itemName: String): NEUInternalName? =
-            ItemNameResolver.getInternalNameOrNull(itemName.removeSuffix(" Pet"))
+            ItemNameResolver.getInternalNameOrNull(itemName.removeSuffix(" Pet")) ?: getCoins(itemName)
+
+        fun fromItemNameOrInternalName(itemName: String): NEUInternalName =
+            fromItemNameOrNull(itemName) ?: itemName.asInternalName()
+
+        private fun getCoins(itemName: String): NEUInternalName? = if (isCoins(itemName)) SKYBLOCK_COIN else null
+
+        private fun isCoins(itemName: String): Boolean =
+            itemName.lowercase().let {
+                when (it) {
+                    "coin", "coins",
+                    "skyblock coin", "skyblock coins",
+                    "skyblock_coin", "skyblock_coins",
+                    -> true
+
+                    else -> false
+                }
+            }
+
 
         fun fromItemName(itemName: String): NEUInternalName = fromItemNameOrNull(itemName) ?: run {
             val name = "itemName:$itemName"
@@ -52,4 +72,6 @@ class NEUInternalName private constructor(private val internalName: String) {
 
     fun replace(oldValue: String, newValue: String) =
         internalName.replace(oldValue.uppercase(), newValue.uppercase()).asInternalName()
+
+    fun isKnownItem(): Boolean = getItemStackOrNull() != null || this == SKYBLOCK_COIN
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
index 4b871377bdd3..bce63e2d17be 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
@@ -24,12 +24,17 @@ abstract class ItemTrackerData : TrackerData() {
         resetItems()
     }
 
-    fun addItem(internalName: NEUInternalName, stackSize: Int) {
+    fun addItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
         val item = items.getOrPut(internalName) { TrackedItem() }
 
-        item.timesGained++
-        item.totalAmount += stackSize
+        if (!command) {
+            item.timesGained++
+        }
+        item.totalAmount += amount
         item.lastTimeUpdated = SimpleTimeMark.now()
+        if (command && item.totalAmount <= 0) {
+            items.remove(internalName)
+        }
     }
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 684a7eb00201..e7af81cea685 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -3,11 +3,13 @@ package at.hannibal2.skyhanni.utils.tracker
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.SlayerAPI
+import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemPriceSource
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.ItemUtils.readableInternalName
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
@@ -26,23 +28,29 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 ) : SkyHanniTracker<Data>(name, createNewSession, getStorage, drawDisplay) {
 
     companion object {
-
         val SKYBLOCK_COIN = NEUInternalName.SKYBLOCK_COIN
     }
 
-    fun addCoins(coins: Int) {
-        addItem(SKYBLOCK_COIN, coins)
-    }
-
-    fun addItem(internalName: NEUInternalName, amount: Int) {
+    fun addItem(internalName: NEUInternalName, amount: Int, command: Boolean) {
         modify {
-            it.addItem(internalName, amount)
+            it.addItem(internalName, amount, command)
         }
-        getSharedTracker()?.let {
-            val hidden = it.get(DisplayMode.TOTAL).items[internalName]!!.hidden
-            it.get(DisplayMode.SESSION).items[internalName]!!.hidden = hidden
+        getSharedTracker()?.let { sharedData ->
+            sharedData.get(DisplayMode.TOTAL).items[internalName]?.let { data ->
+                sharedData.get(DisplayMode.SESSION).items[internalName]!!.hidden = data.hidden
+            }
         }
 
+        if (command) {
+            TrackerManager.commandEditTrackerSuccess = true
+            val displayName = internalName.itemName
+            if (amount > 0) {
+                ChatUtils.chat("Manually added to $name: §r$displayName §7(${amount}x§7)")
+            } else {
+                ChatUtils.chat("Manually removed from $name: §r$displayName §7(${-amount}x§7)")
+            }
+            return
+        }
         // TODO move the function to common
         val (itemName, price) = SlayerAPI.getItemNameAndPrice(internalName, amount)
         if (config.warnings.chat && price >= config.warnings.minimumChat) {
@@ -62,7 +70,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                 onChange = {
                     config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal
                     update()
-                }
+                },
             )
         }
     }
@@ -140,7 +148,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                     }
                     update()
 
-                }
+                },
             ) else Renderable.string(displayName)
 
             lists.addAsSingletonList(renderable)
@@ -172,6 +180,12 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         }
         add("§eClick to " + (if (hidden) "show" else "hide") + "!")
         add("§eControl + Click to remove this item!")
+
+        add("")
+        add("§7Use §e/shedittracker ${internalName.readableInternalName} <amount>")
+        add("§7to edit the number.")
+        add("§7Use negative numbers to remove items.")
+
         if (SkyHanniMod.feature.dev.debug.enabled) {
             add("")
             add("§7${internalName}")

From 36325afea7f476b18f18b19ef70d742f57c88cc6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 07:29:48 +0200
Subject: [PATCH 386/721] Fix: Mod Compatilibty issues in Party Finder (#2470)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/dungeon/DungeonFinderFeatures.kt | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index fcaddf487ed9..508296d4974c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -31,31 +31,31 @@ object DungeonFinderFeatures {
     private val patternGroup = RepoPattern.group("dungeon.finder")
     private val pricePattern by patternGroup.pattern(
         "price",
-        "(?i).*([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?MIL).*"
+        "(?i).*([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?MIL).*",
     )
     private val carryPattern by patternGroup.pattern(
         "carry",
-        "(?i).*(CARRY|CARY|CARRIES|CARIES|COMP|TO CATA [0-9]{2}).*"
+        "(?i).*(CARRY|CARY|CARRIES|CARIES|COMP|TO CATA [0-9]{2}).*",
     )
     private val nonPugPattern by patternGroup.pattern(
         "nonpug",
-        "(?i).*(PERM|VC|DISCORD).*"
+        "(?i).*(PERM|VC|DISCORD).*",
     )
     private val memberPattern by patternGroup.pattern(
         "member",
-        ".*§.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)"
+        ".*§.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)",
     )
     private val ineligiblePattern by patternGroup.pattern(
         "ineligible",
-        "§c(Requires .*$|You don't meet the requirement!|Complete previous floor first!$)"
+        "§c(Requires .*$|You don't meet the requirement!|Complete previous floor first!$)",
     )
     private val classLevelPattern by patternGroup.pattern(
         "class.level",
-        " §.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)"
+        " §.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)",
     )
     private val notePattern by patternGroup.pattern(
         "note",
-        "§7§7Note: §f(?<note>.*)"
+        "§7§7Note: §f(?<note>.*)",
     )
 
     /**
@@ -68,27 +68,27 @@ object DungeonFinderFeatures {
     )
     private val checkIfPartyPattern by patternGroup.pattern(
         "check.if.party",
-        ".*('s Party)"
+        ".*('s Party)",
     )
     private val partyFinderTitlePattern by patternGroup.pattern(
         "party.finder.title",
-        "(Party Finder)"
+        "(Party Finder)",
     )
     private val catacombsGatePattern by patternGroup.pattern(
         "catacombs.gate",
-        "(Catacombs Gate)"
+        "(Catacombs Gate)",
     )
     private val selectFloorPattern by patternGroup.pattern(
         "select.floor",
-        "(Select Floor)"
+        "(Select Floor)",
     )
     private val entranceFloorPattern by patternGroup.pattern(
         "entrance",
-        "(.*Entrance)"
+        "(.*Entrance)",
     )
     private val floorPattern by patternGroup.pattern(
         "floor",
-        "(Floor .*)"
+        "(Floor .*)",
     )
     private val anyFloorPattern by patternGroup.pattern(
         "floor.any",
@@ -101,27 +101,27 @@ object DungeonFinderFeatures {
      */
     private val masterModeFloorPattern by patternGroup.pattern(
         "floor.mastermode",
-        "(MM|.*Master Mode) The Catacombs.*"
+        "(MM|.*Master Mode) The Catacombs.*",
     )
     private val dungeonFloorPattern by patternGroup.pattern(
         "floor.dungeon",
-        "(Dungeon: .*)"
+        "(Dungeon: .*)",
     )
     private val floorFloorPattern by patternGroup.pattern(
         "floor.pattern",
-        "(Floor: .*)"
+        "(Floor: .*)",
     )
     private val floorNumberPattern by patternGroup.pattern(
         "floor.number",
-        ".* (?<floorNum>[IV\\d]+)"
+        ".* (?<floorNum>[IV\\d]+)",
     )
     private val getDungeonClassPattern by patternGroup.pattern(
         "get.dungeon.class",
-        ".* (?<class>.*)"
+        ".* (?<class>.*)",
     )
     private val detectDungeonClassPattern by patternGroup.pattern(
         "detect.dungeon.class",
-        "§7View and select a dungeon class."
+        "§7View and select a dungeon class.",
     )
 
     private val allowedSlots = (10..34).filter { it !in listOf(17, 18, 26, 27) }
@@ -205,14 +205,13 @@ object DungeonFinderFeatures {
         }
     }
 
-    private fun getFloorName(floor: String, dungeon: String, floorNum: Int?): String =
-        if (entranceFloorPattern.matches(floor)) {
-            "E"
-        } else if (masterModeFloorPattern.matches(dungeon)) {
-            "M$floorNum"
-        } else {
-            "F$floorNum"
-        }
+    private fun getFloorName(floor: String, dungeon: String, floorNum: Int?): String = if (entranceFloorPattern.matches(floor)) {
+        "E"
+    } else if (masterModeFloorPattern.matches(dungeon)) {
+        "M$floorNum"
+    } else {
+        "F$floorNum"
+    }
 
     private fun highlightingHandler(event: InventoryOpenEvent): Map<Int, LorenzColor> {
         val map = mutableMapOf<Int, LorenzColor>()
@@ -307,6 +306,10 @@ object DungeonFinderFeatures {
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!isEnabled()) return
         if (!inInventory) return
+
+        val featureActive = config.let { it.coloredClassLevel || it.showMissingClasses }
+        if (!featureActive) return
+
         val toolTip = toolTipMap[event.slot.slotNumber]
         if (toolTip.isNullOrEmpty()) return
         // TODO @Thunderblade73 fix that to "event.toolTip = toolTip"
@@ -326,8 +329,7 @@ object DungeonFinderFeatures {
         if (!config.floorAsStackSize) return
         val slot = event.slot
         if (slot.slotNumber != slot.slotIndex) return
-        event.stackTip = (floorStackSize[slot.slotIndex]
-            ?.takeIf { it.isNotEmpty() } ?: return)
+        event.stackTip = (floorStackSize[slot.slotIndex]?.takeIf { it.isNotEmpty() } ?: return)
     }
 
     @SubscribeEvent
@@ -335,11 +337,9 @@ object DungeonFinderFeatures {
         if (!isEnabled()) return
         if (!inInventory) return
 
-        event.gui.inventorySlots.inventorySlots
-            .associateWith { highlightParty[it.slotNumber] }
-            .forEach { (slot, color) ->
-                color?.let { slot.highlight(it) }
-            }
+        event.gui.inventorySlots.inventorySlots.associateWith { highlightParty[it.slotNumber] }.forEach { (slot, color) ->
+            color?.let { slot.highlight(it) }
+        }
     }
 
     @SubscribeEvent

From af5eda8e4189e3617ac0e9344cec946fdf5d0833 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 7 Sep 2024 11:42:29 +0200
Subject: [PATCH 387/721] Version 0.27 Beta 5

---
 docs/CHANGELOG.md                             | 39 +++++++++++++++++++
 docs/FEATURES.md                              |  3 ++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d968fc3ddcb8..c6742b5112a0 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -65,6 +65,9 @@
     + Configurable party chat message after transferring.
 + Added /shtps command. - saga (https://github.com/hannibal002/SkyHanni/pull/1961)
     + Informs in chat about the server's ticks per second (TPS).
++ Added command `/shedittracker <item name> <amount>`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2448)
+    + Changes the tracked item amount for Diana, Fishing, Pest, Excavator, and Slayer Item Trackers.
+    + Use a negative amount to remove items.
 
 #### Misc Features
 
@@ -91,6 +94,7 @@
 + Added margin customization to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
 + Added an opacity slider for the Custom Background Image in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
 + Added an Undo message when auto alignment inCustom Scoreboard gets disabled. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2402)
++ Added an option to show SkyBlock time on the custom scoreboard rounded to 10 minutes, similar to the vanilla scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2443)
 
 #### Inventory Improvements
 
@@ -102,6 +106,7 @@
     + Now works with NEU's inventories, such as `/pv` and storage overlay.
 + Added exceptions to the enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2254)
     + Stonk and non-mining tools with Efficiency 5 use the maximum enchant color.
++ Added a short cooldown between Experimentation Table Guardian Pet chat warnings. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2459)
 
 #### Chat Improvements
 
@@ -145,6 +150,10 @@
 + Added a chat option to disable a Patcher setting that breaks SkyHanni's line from the center of the player to something else. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2387)
     + E.g. Diana guesses, Slayer Mini Bosses, etc.
 
+#### Bingo Fixes
+
++ Fixed "show bingo rank number" feature toggle not functioning. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2445)
+
 #### Inventory Fixes
 
 + Fixed ItemCategory errors being sent even though we already have a fix. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2392)
@@ -154,6 +163,8 @@
 + Fixed Guardian Reminder Experimentation Table not working with autopet rules. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2430)
 + Fixed SkyHanni Global Scale affecting Custom Wardrobe. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2420)
 + Fixed /show displaying an incorrect number of enchants. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2435)
++ Fixed Armor Hider hiding armor inside the Custom Wardrobe. - Empa (https://github.com/hannibal002/SkyHanni/pull/2449)
++ Fixed detection of El Dorado and Stray Hordes in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2450)
 
 #### Mining Fixes
 
@@ -162,6 +173,7 @@
 + Fixed a compatibility issue in Fossil Solver with resource packs like Hypixel+. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2409)
 + Fixed Powder for 10 Levels overflowing over the max level. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2422)
 + Fixed Glacite Tunnel Maps repeatedly showing the last commission goal even when there is no new commission. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2432)
++ Fixed Mineshaft Pity Counter not working with some ore types. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2436)
 
 #### Scoreboard Fixes
 
@@ -176,6 +188,9 @@
 + Fixed rounded rectangles not working with a scale less than 1. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2404)
     + E.g. Custom Scoreboard Background.
 + Fixed rare Custom Scoreboard errors. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2411)
++ Fixed Minister not resetting after the election closed. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2467)
++ Fixed Custom Scoreboard errors while doing Carnival activities. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2455)
++ Fixed Custom Scoreboard error while in a Dungeon Queue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2441)
 
 #### Hoppity Fixes
 
@@ -190,10 +205,27 @@
 + Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
 + Fixed Christmas presents in the Hypixel lobby being visible outside of December. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2396)
 + Fixed the mod crashing on startup when the game directory path contains a "!". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2427)
++ Fixed chat formatting for coin drops in profit trackers (Diana, Slayer, Fishing, Pest). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2444)
++ Fixed Last Server Time Slider not functioning. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2440)
 
 #### Chat Fixes
 
 + Fixed an error with Patcher Coordinate Detection from chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2410)
++ Fixed ultimate enchants not showing in `/show`. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2465)
+
+####  Commands Fixes
+
++ Fixed the command `/shtps` printing nothing if the TPS display was currently showing nothing. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2446)
+
+#### Dungeon Fixes
+
++ Fixed disabled SkyHanni features causing compatibility issues with other Dungeon Party Finder mods. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2470)
++ Fixed dungeon completion detection. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2456)
+    + This also fixes the Croesus reroll detection breaking.
+
+#### Crimson Isle Fixes
+
++ Fixed the reputation helper not updating after a sack update. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2439)
 
 ### Technical Details
 
@@ -208,6 +240,13 @@
 + Fixed Sound Errors in the console. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2431)
 + Added /shdebugscoreboard to monitor scoreboard changes. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2412)
     + Prints the raw scoreboard lines in the console after each update, with the time since the last update.
++ Added split and dissolve features for the graph editor. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2466)
++ Added ghost position feature to the graph editor, useful for editing nodes that are in the air. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2461)
++ Added tags to the graph editor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2464)
++ Changed graph node editor behavior. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2451)
+    + WASD node movement now reflects the player's look direction.
+    + Nodes are only deleted when they are selected/active.
+    + Allows creating nodes much closer to each other.
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 4c59d50fb38d..5b2c0a0c35cc 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -1010,6 +1010,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Use `/shremind <time> <note>` to set reminders for your future self.
 + Added /shtps command. - saga (https://github.com/hannibal002/SkyHanni/pull/1961)
     + Informs in chat about the server's ticks per second (TPS).
++ Added command `/shedittracker <item name> <amount>`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2448)
+    + Changes the tracked item amount for Diana, Fishing, Pest, Excavator, and Slayer Item Trackers.
+    + Use a negative amount to remove items.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 5f050d25c3c8..112dda37068a 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.4"
+    version = "0.27.Beta.5"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 76739a03c63f..832c3ab93972 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.4",
+    version = "0.27.Beta.5",
 )
 class SkyHanniMod {
 

From a7573830fb7aa472612e1e2fbc3b1cd042a3b4e0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 7 Sep 2024 11:57:41 +0200
Subject: [PATCH 388/721] added todo and deprecated annotation

---
 .../features/misc/trevor/TrevorFeatures.kt    | 27 +++++++++----------
 .../hannibal2/skyhanni/utils/TabListData.kt   |  1 +
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index e2dac0f4c454..9d1a1dca24a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -52,15 +52,15 @@ object TrevorFeatures {
     private val patternGroup = RepoPattern.group("misc.trevor")
     private val trapperPattern by patternGroup.pattern(
         "trapper",
-        "\\[NPC] Trevor: You can find your (?<rarity>.*) animal near the (?<location>.*)."
+        "\\[NPC] Trevor: You can find your (?<rarity>.*) animal near the (?<location>.*).",
     )
     private val talbotPatternAbove by patternGroup.pattern(
         "above",
-        "The target is around (?<height>.*) blocks above, at a (?<angle>.*) degrees angle!"
+        "The target is around (?<height>.*) blocks above, at a (?<angle>.*) degrees angle!",
     )
     private val talbotPatternBelow by patternGroup.pattern(
         "below",
-        "The target is around (?<height>.*) blocks below, at a (?<angle>.*) degrees angle!"
+        "The target is around (?<height>.*) blocks below, at a (?<angle>.*) degrees angle!",
     )
     private val talbotPatternAt by patternGroup.pattern(
         "at",
@@ -68,27 +68,27 @@ object TrevorFeatures {
     )
     private val locationPattern by patternGroup.pattern(
         "zone",
-        "Location: (?<zone>.*)"
+        "Location: (?<zone>.*)",
     )
     private val mobDiedPattern by patternGroup.pattern(
         "mob.died",
-        "§aReturn to the Trapper soon to get a new animal to hunt!"
+        "§aReturn to the Trapper soon to get a new animal to hunt!",
     )
     private val startDialoguePattern by patternGroup.pattern(
         "start.dialogue",
-        "[NPC] Trevor: You will have 10 minutes to find the mob from when you accept the task."
+        "[NPC] Trevor: You will have 10 minutes to find the mob from when you accept the task.",
     )
     private val outOfTimePattern by patternGroup.pattern(
         "outoftime",
-        "You ran out of time and the animal disappeared!"
+        "You ran out of time and the animal disappeared!",
     )
     private val clickOptionPattern by patternGroup.pattern(
         "clickoption",
-        "Click an option: §r§a§l\\[YES]§r§7 - §r§c§l\\[NO]"
+        "Click an option: §r§a§l\\[YES]§r§7 - §r§c§l\\[NO]",
     )
     private val areaTrappersDenPattern by patternGroup.pattern(
         "area.trappersden",
-        "Trapper's Den"
+        "Trapper's Den",
     )
 
     private var timeUntilNextReady = 0
@@ -193,7 +193,7 @@ object TrevorFeatures {
 
         config.trapperCooldownPos.renderString(
             "${currentStatus.colorCode}Trapper Cooldown: $cooldownMessage",
-            posLabel = "Trapper Cooldown GUI"
+            posLabel = "Trapper Cooldown GUI",
         )
     }
 
@@ -216,6 +216,7 @@ object TrevorFeatures {
         var found = false
         var active = false
         val previousLocation = TrevorSolver.mobLocation
+        // TODO work wioth trapper widget, widget api, repo patterns, when not found, warn in chat and dont update
         for (line in TabListData.getTabList()) {
             val formattedLine = line.removeColor().drop(1)
             if (formattedLine.startsWith("Time Left: ")) {
@@ -231,8 +232,7 @@ object TrevorFeatures {
             }
             locationPattern.matchMatcher(formattedLine) {
                 val zone = group("zone")
-                TrevorSolver.mobLocation = TrapperMobArea.entries.firstOrNull { it.location == zone }
-                    ?: TrapperMobArea.NONE
+                TrevorSolver.mobLocation = TrapperMobArea.entries.firstOrNull { it.location == zone } ?: TrapperMobArea.NONE
                 found = true
             }
         }
@@ -254,8 +254,7 @@ object TrevorFeatures {
         var entityTrapper = EntityUtils.getEntityByID(trapperID)
         if (entityTrapper !is EntityLivingBase) entityTrapper = EntityUtils.getEntityByID(backupTrapperID)
         if (entityTrapper is EntityLivingBase && config.trapperTalkCooldown) {
-            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color)
-            { config.trapperTalkCooldown }
+            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color) { config.trapperTalkCooldown }
             entityTrapper.getLorenzVec().let {
                 if (it.distanceToPlayer() < 15) {
                     event.drawString(it.add(y = 2.23), currentLabel)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
index eb9a2fc11eac..270b52038ce2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
@@ -36,6 +36,7 @@ object TabListData {
     var fullyLoaded = false
 
     // TODO replace with TabListUpdateEvent
+    @Deprecated("replace with TabListUpdateEvent")
     fun getTabList() = debugCache ?: tablistCache
     fun getHeader() = header
     fun getFooter() = footer

From 53b85119ef0961f7088357107e335c308168e4e2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 12:21:03 +0200
Subject: [PATCH 389/721] Fix: Typo in mob detection config (#2472)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/config/features/dev/DebugMobConfig.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java
index c14c036980e2..1376c8b6cc52 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java
@@ -74,7 +74,7 @@ public static class MobDetection {
         public HowToShow special = HowToShow.OFF;
 
         @Expose
-        @ConfigOption(name = "Show Invisible", desc = "Shows the mob even though they are invisible (do to invisibility effect) if looked at directly.")
+        @ConfigOption(name = "Show Invisible", desc = "Shows invisible mobs (due to invisibility effect) if looked at directly.")
         @ConfigEditorBoolean
         public boolean showInvisible = false;
     }

From 9d326f9c6bcbb62b120a33930a23f223667cd040 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 7 Sep 2024 16:14:23 +0200
Subject: [PATCH 390/721] Backend: Renderable searchbox (#2475)

---
 .../skyhanni/data/model/TextInput.kt          |  41 ++++++-
 .../transformers/gui/MixinGuiScreen.java      |   6 +
 .../skyhanni/utils/renderables/Renderable.kt  | 106 ++++++++++++++++--
 .../utils/renderables/RenderableUtils.kt      |  12 ++
 4 files changed, 156 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index d7e6ff8e1e85..6ae2342b6909 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.insert
 import kotlinx.coroutines.runBlocking
 import net.minecraft.client.settings.KeyBinding
 import org.lwjgl.input.Keyboard
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 
 class TextInput {
@@ -22,16 +23,35 @@ class TextInput {
         }
     }.replace("(?<!§.\\|)§(?!.\\|§.)".toRegex(), "&&")
 
+    fun editTextWithAlwaysCarriage() = textBox.let {
+        with(carriage) {
+            if (this == null) it.plus('|')
+            else it.insert(this, '|')
+        }
+    }.replace("§", "&&")
+
     fun finalText() = textBox.replace("&&", "§")
 
-    fun makeActive() = Companion.activate(this)
-    fun disable() = Companion.disable()
+    fun makeActive() = if (!isActive) Companion.activate(this) else Unit
+    fun disable() = if (isActive) Companion.disable() else Unit
     fun handle() = Companion.handleTextInput()
     fun clear() {
         textBox = ""
         carriage = null
     }
 
+    val isActive get() = Companion.activeInstance == this
+
+    private val updateEvents = mutableMapOf<Int, (TextInput) -> Unit>()
+
+    fun registerToEvent(key: Int, event: (TextInput) -> Unit) {
+        updateEvents[key] = event
+    }
+
+    fun removeFromEvent(key: Int) {
+        updateEvents.remove(key)
+    }
+
     companion object {
         private var activeInstance: TextInput? = null
 
@@ -51,6 +71,13 @@ class TextInput {
             }
         }
 
+        fun onGuiInput(ci: CallbackInfo) {
+            if (activeInstance != null) {
+                ci.cancel()
+                return
+            }
+        }
+
         private var timeSinceKeyEvent = 0L
 
         private var carriage
@@ -65,6 +92,13 @@ class TextInput {
                 activeInstance?.textBox = value
             }
 
+        private fun updated() {
+            with(activeInstance) {
+                if (this == null) return
+                this.updateEvents.forEach { (_, it) -> it(this) }
+            }
+        }
+
         private fun handleTextInput() {
             if (KeyboardManager.isCopyingKeysDown()) {
                 OSUtils.copyToClipboard(textBox)
@@ -73,6 +107,7 @@ class TextInput {
             if (KeyboardManager.isPastingKeysDown()) {
                 runBlocking {
                     textBox = OSUtils.readFromClipboard() ?: return@runBlocking
+                    updated()
                 }
                 return
             }
@@ -96,6 +131,7 @@ class TextInput {
                 } else {
                     textBox.dropLast(1)
                 }
+                updated()
                 return
             }
 
@@ -122,6 +158,7 @@ class TextInput {
                     textBox + char
                 }
             }
+            updated()
         }
 
         private fun moveCarriageRight(carriage: Int) = carriage + 1
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
index b14d225cf180..b3338acf5032 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.mixins.transformers.gui;
 
 import at.hannibal2.skyhanni.data.ToolTipData;
+import at.hannibal2.skyhanni.data.model.TextInput;
 import at.hannibal2.skyhanni.mixins.hooks.GuiScreenHookKt;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
@@ -27,4 +28,9 @@ public void getTooltip(ItemStack stack, int x, int y, CallbackInfo ci, List<Stri
             ci.cancel();
         }
     }
+
+    @Inject(method = "handleKeyboardInput", at = @At("HEAD"), cancellable = true)
+    public void handleKeyboardInput(CallbackInfo ci) {
+        TextInput.Companion.onGuiInput(ci);
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 29105459cea3..a49f58b00db9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.features.skillprogress.SkillProgressBarConfi
 import at.hannibal2.skyhanni.data.GuiData
 import at.hannibal2.skyhanni.data.HighlightOnHoverSlot
 import at.hannibal2.skyhanni.data.ToolTipData
+import at.hannibal2.skyhanni.data.model.TextInput
 import at.hannibal2.skyhanni.features.chroma.ChromaShaderManager
 import at.hannibal2.skyhanni.features.chroma.ChromaType
 import at.hannibal2.skyhanni.features.misc.DarkenShader
@@ -52,7 +53,11 @@ interface Renderable {
     val horizontalAlign: HorizontalAlignment
     val verticalAlign: VerticalAlignment
     fun isHovered(posX: Int, posY: Int) = currentRenderPassMousePosition?.let { (x, y) ->
-        x in (posX..posX + width) && y in (posY..posY + height) // TODO: adjust for variable height?
+        x in (posX..posX + width) && y in (posY..posY + height)
+    } ?: false
+
+    fun isBoxHovered(posX: Int, width: Int, posY: Int, height: Int) = currentRenderPassMousePosition?.let { (x, y) ->
+        x in (posX..posX + width) && y in (posY..posY + height)
     } ?: false
 
     /**
@@ -435,12 +440,7 @@ interface Renderable {
             val inverseScale = 1 / scale
 
             override fun render(posX: Int, posY: Int) {
-                val fontRenderer = Minecraft.getMinecraft().fontRendererObj
-                GlStateManager.translate(1.0, 1.0, 0.0)
-                GlStateManager.scale(scale, scale, 1.0)
-                fontRenderer.drawStringWithShadow(text, 0f, 0f, color.rgb)
-                GlStateManager.scale(inverseScale, inverseScale, 1.0)
-                GlStateManager.translate(-1.0, -1.0, 0.0)
+                RenderableUtils.renderString(text, scale, color, inverseScale)
             }
         }
 
@@ -534,6 +534,98 @@ interface Renderable {
             }
         }
 
+        /**
+         * @param searchPrefix text that is static in front of the textbox
+         * @param onUpdateSize function that is called if the size changes (since the search text can get bigger than [content])
+         * @param textInput The text input, can be external or internal
+         * @param shouldRenderTopElseBottom true == Renders on top, false == Renders at the Bottom
+         * @param hideIfNoText hides text box if no input is given
+         * @param ySpacing space between the search and [content]
+         * @param onHover is triggered if [content] or the text box is hovered
+         * @param bypassChecks bypass the [shouldAllowLink] logic
+         * @param condition condition to being able to input / [onHover] to trigger
+         * @param scale text scale of the textbox
+         * @param color color of the textbox
+         * @param key event key for the [textInput] to register the event, needs clearing if [textInput] is external, default = 0
+         */
+        fun searchBox(
+            content: Renderable,
+            searchPrefix: String,
+            onUpdateSize: (Renderable) -> Unit,
+            textInput: TextInput = TextInput(),
+            shouldRenderTopElseBottom: Boolean = true,
+            hideIfNoText: Boolean = true,
+            ySpacing: Int = 0,
+            onHover: (TextInput) -> Unit = {},
+            bypassChecks: Boolean = false,
+            condition: () -> Boolean = { true },
+            scale: Double = 1.0,
+            color: Color = Color.WHITE,
+            key: Int = 0,
+        ) = object : Renderable {
+
+            val textBoxHeight = (9 * scale).toInt() + 1
+
+            override var width: Int = content.width
+            override val height: Int = content.height + ySpacing + textBoxHeight
+            override val horizontalAlign = content.horizontalAlign
+            override val verticalAlign = content.verticalAlign
+
+            val searchWidth get() = (Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchPrefix + textInput.editTextWithAlwaysCarriage()) * scale).toInt() + 1
+
+            init {
+                textInput.registerToEvent(key) {
+                    val searchWidth = searchWidth
+                    if (searchWidth > width) {
+                        width = searchWidth
+                        onUpdateSize(this)
+                    } else {
+                        if (width > content.width) {
+                            width = maxOf(content.width, searchWidth)
+                            onUpdateSize(this)
+                        }
+                    }
+                }
+            }
+
+            override fun render(posX: Int, posY: Int) {
+                if (shouldRenderTopElseBottom) {
+                    if (!(hideIfNoText && textInput.textBox.isEmpty())) {
+                        RenderableUtils.renderString(searchPrefix + textInput.editText(), scale, color)
+                    }
+                    GlStateManager.translate(0f, (ySpacing + textBoxHeight).toFloat(), 0f)
+                }
+                if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks)) {
+                    onHover(textInput)
+                    textInput.makeActive()
+                    textInput.handle()
+                    val yOff: Int
+                    if (shouldRenderTopElseBottom) {
+                        yOff = 0
+                    } else {
+                        yOff = content.height + ySpacing
+                    }
+                    if (isBoxHovered(posX, width, posY + yOff, textBoxHeight) && (-99).isKeyClicked()) {
+                        textInput.clear()
+                    }
+                } else {
+                    textInput.disable()
+                }
+                if (!shouldRenderTopElseBottom) {
+                    content.render(posX, posY)
+                    GlStateManager.translate(0f, (ySpacing).toFloat(), 0f)
+                    if (!(hideIfNoText && textInput.textBox.isEmpty())) {
+                        RenderableUtils.renderString(searchPrefix + textInput.editText(), scale, color)
+                    }
+                    GlStateManager.translate(0f, -(ySpacing).toFloat(), 0f)
+                } else {
+                    content.render(posX, posY + textBoxHeight + ySpacing)
+                    GlStateManager.translate(0f, -(ySpacing + textBoxHeight).toFloat(), 0f)
+                }
+            }
+
+        }
+
         fun progressBar(
             percent: Double,
             startColor: Color = Color(255, 0, 0),
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
index a78044d72790..4a8f28c8e620 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -2,7 +2,9 @@ package at.hannibal2.skyhanni.utils.renderables
 
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
+import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
+import java.awt.Color
 
 internal object RenderableUtils {
 
@@ -72,6 +74,16 @@ internal object RenderableUtils {
         GlStateManager.translate(0f, -yOffset.toFloat(), 0f)
         return yOffset
     }
+
+    @Suppress("NOTHING_TO_INLINE")
+    inline fun renderString(text: String, scale: Double = 1.0, color: Color = Color.WHITE, inverseScale: Double = 1 / scale) {
+        val fontRenderer = Minecraft.getMinecraft().fontRendererObj
+        GlStateManager.translate(1.0, 1.0, 0.0)
+        GlStateManager.scale(scale, scale, 1.0)
+        fontRenderer.drawStringWithShadow(text, 0f, 0f, color.rgb)
+        GlStateManager.scale(inverseScale, inverseScale, 1.0)
+        GlStateManager.translate(-1.0, -1.0, 0.0)
+    }
 }
 
 internal abstract class RenderableWrapper internal constructor(protected val content: Renderable) : Renderable {

From 1ccbd9cf3c443c35b6c51d171b5b20388f9337b0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 7 Sep 2024 18:14:44 +0200
Subject: [PATCH 391/721] Fix: Stuck in text box forever (#2476)

---
 .../java/at/hannibal2/skyhanni/data/model/TextInput.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index 6ae2342b6909..0646b884cdec 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data.model
 
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils.insert
@@ -73,7 +74,11 @@ class TextInput {
 
         fun onGuiInput(ci: CallbackInfo) {
             if (activeInstance != null) {
-                ci.cancel()
+                if (Keyboard.KEY_ESCAPE.isKeyHeld()) {
+                    disable()
+                } else {
+                    ci.cancel()
+                }
                 return
             }
         }

From 3ea40ab88cbe2d32007f89d920a6231a86ea8502 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 18:52:51 +0200
Subject: [PATCH 392/721] Fix: grab item name none (#2471)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 1a75b4cbcff1..774638c5d66f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -370,7 +370,7 @@ object ItemUtils {
             getAttributeFromShard()?.let {
                 return it.getAttributeName()
             }
-            return getInternalName().itemName
+            return getInternalNameOrNull()?.itemName ?: "<null>"
         }
 
     fun ItemStack.getAttributeFromShard(): Pair<String, Int>? {

From b6593fcd09be501ededdd795fbdf5a78c1967c8e Mon Sep 17 00:00:00 2001
From: Vixid <52578495+VixidDev@users.noreply.github.com>
Date: Sat, 7 Sep 2024 17:53:42 +0100
Subject: [PATCH 393/721] Fix: Merged enchant books tooltip being overwritten
 (+ backend) (#2454)

---
 .../features/misc/items/enchants/Enchant.kt   |  9 +++++---
 .../misc/items/enchants/EnchantParser.kt      | 23 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
index 8058fc223fc0..286560c73fea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
@@ -3,13 +3,15 @@ package at.hannibal2.skyhanni.features.misc.items.enchants
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.features.chroma.ChromaManager
 import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
-import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.annotations.Expose
 import io.github.notenoughupdates.moulconfig.observer.Property
-import net.minecraft.item.ItemStack
 import java.util.TreeSet
+import net.minecraft.item.ItemStack
 
 open class Enchant : Comparable<Enchant> {
     @Expose
@@ -64,7 +66,8 @@ open class Enchant : Comparable<Enchant> {
         val config = SkyHanniMod.feature.inventory.enchantParsing
 
         val itemCategory = itemStack?.getItemCategoryOrNull()
-        val itemName = itemStack?.itemNameWithoutColor
+        val internalName = itemStack?.getInternalNameOrNull()
+        val itemName = internalName?.itemName?.removeColor()
 
         if (this.nbtName == "efficiency") {
             // If the item is a Stonk, or a non-mining tool with Efficiency 5 (whilst not being a Promising Shovel),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index f3d7e8017a24..66c4c040716a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -19,8 +19,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.isEnchanted
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getExtraAttributes
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import java.lang.ArithmeticException
 import net.minecraft.event.HoverEvent
 import net.minecraft.item.ItemStack
 import net.minecraft.util.ChatComponentText
@@ -202,7 +204,26 @@ object EnchantParser {
         val insertEnchants: MutableList<String> = mutableListOf()
 
         // Format enchants based on format config option
-        formatEnchants(insertEnchants)
+        try {
+            formatEnchants(insertEnchants)
+        } catch (e: ArithmeticException) {
+            ErrorManager.logErrorWithData(
+                e,
+                "Item has enchants in nbt but none were found?",
+                "item" to currentItem,
+                "loreList" to loreList,
+                "nbt" to currentItem?.getExtraAttributes()
+            )
+            return
+        } catch (e: ConcurrentModificationException) {
+            ErrorManager.logErrorWithData(
+                e,
+                "ConcurrentModificationException whilst formatting enchants",
+                "loreList" to loreList,
+                "format" to config.format.get(),
+                "orderedEnchants" to orderedEnchants
+            )
+        }
 
         // Add our parsed enchants back into the lore
         loreList.addAll(startEnchant, insertEnchants)

From 4663ebc4c9d5ef6ed890eced49d90dd8e3589fb5 Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:59:24 +0200
Subject: [PATCH 394/721] Feature: Accessory MP as stack size (#2243)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |   5 +
 .../inventory/MagicalPowerConfig.java         |  19 +++
 .../storage/ProfileSpecificStorage.java       |   3 +
 .../features/misc/MagicalPowerDisplay.kt      | 132 ++++++++++++++++++
 4 files changed, 159 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/MagicalPowerConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index f66f784c22ed..6c43591a5eab 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -118,6 +118,11 @@ public class InventoryConfig {
     @Accordion
     public PageScrollingConfig pageScrolling = new PageScrollingConfig();
 
+    @Expose
+    @ConfigOption(name = "Magical Power Display", desc = "")
+    @Accordion
+    public MagicalPowerConfig magicalPower = new MagicalPowerConfig();
+
     @Expose
     @ConfigOption(name = "Item Number", desc = "Showing the item number as a stack size for these items.")
     @ConfigEditorDraggableList
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/MagicalPowerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/MagicalPowerConfig.java
new file mode 100644
index 000000000000..ef6b76da336a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/MagicalPowerConfig.java
@@ -0,0 +1,19 @@
+package at.hannibal2.skyhanni.config.features.inventory;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class MagicalPowerConfig {
+    @Expose
+    @ConfigOption(name = "Magical Power Display", desc = "Show Magical Power as stack size inside Accessory Bag and Auction House.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Colored", desc = "Whether to make the numbers colored.")
+    @ConfigEditorBoolean
+    public boolean colored = false;
+}
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 51be4daf1dd6..e7a7565bb0ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -670,6 +670,9 @@ public static class WardrobeStorage {
     public UpgradeReminder.CommunityShopUpgrade communityShopProfileUpgrade = null;
 
     @Expose
+    @Nullable
+    public Integer abiphoneContactAmount = null;
+
     public Map<Integer, HoppityEventStats> hoppityEventStats = new HashMap<>();
 
     public static class HoppityEventStats {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt
new file mode 100644
index 000000000000..e7b8ea26c3c8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt
@@ -0,0 +1,132 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.RenderItemTipEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemCategory
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object MagicalPowerDisplay {
+    private val config get() = SkyHanniMod.feature.inventory.magicalPower
+    private var contactAmount: Int?
+        get() = ProfileStorageData.profileSpecific?.abiphoneContactAmount
+        private set(value) {
+            ProfileStorageData.profileSpecific?.abiphoneContactAmount = value
+        }
+
+    private val hegemonyArtifact = "HEGEMONY_ARTIFACT".asInternalName()
+    private val riftPrism = "RIFT_PRISM".asInternalName()
+
+    /**
+     * REGEX-TEST: Accessory Bag
+     * REGEX-TEST: Accessory Bag (1/75)
+     * REGEX-TEST: Accessory Bag (909/394294)
+     * REGEX-TEST: Auctions Browser
+     * REGEX-TEST: Auctions: "ligma"
+     * REGEX-TEST: Auctions: ""sugoma""
+     * */
+    private val acceptedInvPattern by RepoPattern.pattern(
+        "inv.acceptable",
+        "^(Accessory Bag(?: \\(\\d+\\/\\d+\\))?|Auctions Browser|Manage Auctions|Auctions: \".*\"?)$",
+    )
+
+    private val abiphoneGroup = RepoPattern.group("data.abiphone")
+
+    /**
+     * REGEX-TEST: Abiphone X Plus
+     * REGEX-TEST: Abiphone X Plus Special Edition
+     * REGEX-TEST: Abiphone XI Ultra Style
+     * REGEX-TEST: Abiphone XII Mega Color
+     * REGEX-TEST: Abiphone XIII Pro
+     * REGEX-TEST: Abiphone XIV Enormous Purple
+     * REGEX-TEST: Abiphone Flip
+     * */
+    private val abiphoneNamePattern by abiphoneGroup.pattern(
+        "name",
+        "Abiphone .*",
+    )
+
+    /**
+     * REGEX-TEST: Your contacts: 0/0
+     * REGEX-TEST: Your contacts: 1/75
+     * REGEX-TEST: Your contacts: 52/60
+     * */
+    private val yourContactPattern by abiphoneGroup.pattern(
+        "contacts",
+        "Your contacts: (?<contacts>\\d+)\\/\\d+",
+    )
+
+    @SubscribeEvent
+    fun onRenderItemTip(event: RenderItemTipEvent) {
+        if (!isEnabled()) return
+        if (!acceptedInvPattern.matches(InventoryUtils.openInventoryName().removeColor())) return
+
+        val item = event.stack
+        val rarity = item.getAccessoryRarityOrNull() ?: return
+        val internalName = item.getInternalNameOrNull() ?: return
+
+        var endMP = rarity.toMP() ?: ErrorManager.skyHanniError(
+            "Unknown rarity '$rarity' for item '${item.displayName}§7'",
+        )
+
+        when (internalName) {
+            hegemonyArtifact -> endMP *= 2
+            riftPrism -> endMP = 11
+            else -> if (internalName.isAbicase()) endMP += (contactAmount ?: 0) / 2
+        }
+
+        event.stackTip = "${if (config.colored) rarity.chatColorCode else "§7"}${endMP}"
+    }
+
+    @SubscribeEvent
+    fun onInventoryOpened(event: InventoryFullyOpenedEvent) {
+        if (!isEnabled()) return
+        if (!abiphoneNamePattern.matches(event.inventoryName)) return
+
+        val theBookLore = event.inventoryItems[51]?.getLore() ?: return
+        for (line in theBookLore) {
+            yourContactPattern.matchMatcher(line.removeColor()) {
+                contactAmount = group("contacts").toInt()
+                return
+            }
+        }
+    }
+
+    private fun NEUInternalName.isAbicase(): Boolean = this.startsWith("ABICASE_")
+
+    private fun LorenzRarity.toMP(): Int? = when (this) {
+        LorenzRarity.COMMON, LorenzRarity.SPECIAL -> 3
+        LorenzRarity.UNCOMMON, LorenzRarity.VERY_SPECIAL -> 5
+        LorenzRarity.RARE -> 8
+        LorenzRarity.EPIC -> 12
+        LorenzRarity.LEGENDARY -> 16
+        LorenzRarity.MYTHIC -> 22
+        else -> null
+    }
+
+    private fun ItemStack.getAccessoryRarityOrNull(): LorenzRarity? {
+        val category = this.getItemCategoryOrNull() ?: return null
+        if (category != ItemCategory.ACCESSORY && category != ItemCategory.HATCESSORY) return null
+        return this.getItemRarityOrNull()
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}

From 83d48c6aeee1656c5a6966839a1951e67fccbc53 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:59:58 +0200
Subject: [PATCH 395/721] Feature: Display Tab Widgets (#1276)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigManager.kt          | 21 ++---
 .../skyhanni/config/core/config/Position.java |  4 +
 .../config/core/config/PositionList.kt        | 47 +++++++++++
 .../config/features/gui/GUIConfig.java        |  5 ++
 .../config/features/gui/TabWidgetConfig.java  | 40 ++++++++++
 .../skyhanni/data/model/TabWidget.kt          |  4 +
 .../skyhanni/features/gui/TabWidgetDisplay.kt | 79 +++++++++++++++++++
 .../skyhanni/test/RepoPatternTest.kt          | 60 +++++++-------
 8 files changed, 220 insertions(+), 40 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/core/config/PositionList.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/TabWidgetConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index db70f7e89288..4ac3f7925ce5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.config
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.core.config.Position
+import at.hannibal2.skyhanni.config.core.config.PositionList
 import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson
 import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson
 import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson
@@ -39,7 +40,6 @@ import java.nio.file.StandardCopyOption
 import java.util.EnumMap
 import kotlin.concurrent.fixedRateTimer
 import kotlin.reflect.KMutableProperty0
-import kotlin.reflect.KMutableProperty1
 
 private fun GsonBuilder.registerIfBeta(create: TypeAdapterFactory): GsonBuilder {
     return if (LorenzUtils.isBetaVersion()) {
@@ -66,8 +66,7 @@ class ConfigManager {
 
     private fun setConfigHolder(type: ConfigFileType, value: Any) {
         require(value.javaClass == type.clazz)
-        @Suppress("UNCHECKED_CAST")
-        (type.property as KMutableProperty0<Any>).set(value)
+        @Suppress("UNCHECKED_CAST") (type.property as KMutableProperty0<Any>).set(value)
         (jsonHolder as MutableMap<ConfigFileType, Any>)[type] = value
     }
 
@@ -96,8 +95,7 @@ class ConfigManager {
         try {
             findPositionLinks(features, mutableSetOf())
         } catch (e: Exception) {
-            if (LorenzEvent.isInGuardedEventHandler)
-                throw e
+            if (LorenzEvent.isInGuardedEventHandler) throw e
         }
     }
 
@@ -125,7 +123,7 @@ class ConfigManager {
         var missingConfigLink = false
         for (field in obj.javaClass.fields) {
             field.isAccessible = true
-            if (field.type != Position::class.java) {
+            if (field.type != Position::class.java && field.type != PositionList::class.java) {
                 findPositionLinks(field.get(obj), slog)
                 continue
             }
@@ -141,8 +139,13 @@ class ConfigManager {
                 }
                 continue
             }
-            val position = field.get(obj) as Position
-            position.setLink(configLink)
+            if (field.type == Position::class.java) {
+                val position = field.get(obj) as Position
+                position.setLink(configLink)
+            } else if (field.type == PositionList::class.java) {
+                val list = field.get(obj) as PositionList
+                list.setLink(configLink)
+            }
         }
         if (missingConfigLink) {
             println("")
@@ -245,7 +248,7 @@ class ConfigManager {
                 unit.toPath(),
                 file.toPath(),
                 StandardCopyOption.REPLACE_EXISTING,
-                StandardCopyOption.ATOMIC_MOVE
+                StandardCopyOption.ATOMIC_MOVE,
             )
         } catch (e: AccessDeniedException) {
             if (loop == 5) {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
index d0112766a47e..eb37131b120c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
@@ -56,6 +56,10 @@ public class Position {
     private boolean clicked = false;
     public String internalName = null;
 
+    public Position() {
+        this(0, 0);
+    }
+
     public Position(int x, int y) {
         this(x, y, false, false);
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/PositionList.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/PositionList.kt
new file mode 100644
index 000000000000..c33f542934f9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/PositionList.kt
@@ -0,0 +1,47 @@
+package at.hannibal2.skyhanni.config.core.config
+
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink
+
+class PositionList() : ArrayList<Position>(), MutableList<Position> {
+
+    constructor(init: Collection<Position>) : this() {
+        this.addAll(init)
+    }
+
+    constructor(size: Int) : this() {
+        this.addAll((0..<size).map { Position() })
+    }
+
+    @Throws(NoSuchFieldException::class)
+    fun setLink(configLink: ConfigLink) {
+        this.configLink = configLink
+        forEach {
+            it.setLink(configLink)
+        }
+    }
+
+    private var configLink: ConfigLink? = null
+
+    override fun add(element: Position): Boolean {
+        if (configLink != null) {
+            element.setLink(configLink!!)
+        }
+        return super.add(element)
+    }
+
+    override fun addAll(elements: Collection<Position>): Boolean {
+        if (configLink != null) {
+            elements.forEach {
+                it.setLink(configLink!!)
+            }
+        }
+        return super.addAll(elements)
+    }
+
+    override fun set(index: Int, element: Position): Position {
+        if (configLink != null) {
+            element.setLink(configLink!!)
+        }
+        return super.set(index, element)
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
index 6355857f5b89..74ab755c9940 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
@@ -86,6 +86,11 @@ public class GUIConfig {
     @Accordion
     public TextBoxConfig customTextBox = new TextBoxConfig();
 
+    @Expose
+    @ConfigOption(name = "Tab Widget", desc = "")
+    @Accordion
+    public TabWidgetConfig tabWidget = new TabWidgetConfig();
+
     @Expose
     @ConfigOption(name = "In-Game Date", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/TabWidgetConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/TabWidgetConfig.java
new file mode 100644
index 000000000000..2d4b27cb1459
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/TabWidgetConfig.java
@@ -0,0 +1,40 @@
+package at.hannibal2.skyhanni.config.features.gui;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.PositionList;
+import at.hannibal2.skyhanni.features.gui.TabWidgetDisplay;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabWidgetConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Enables the gui elements for the selected widgets.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @ConfigOption(name = "Not working Info", desc = "If the information isn't shown in the tablist it won't show anything. Use /widget to turn on the information you need.")
+    @ConfigEditorInfoText
+    public String text1;
+
+    @ConfigOption(name = "Enable Info", desc = "Drag only one new value at time into the list, since the default locations are all the same.")
+    @ConfigEditorInfoText
+    public String text2;
+
+    @Expose
+    @ConfigOption(name = "Widgets", desc = "")
+    @ConfigEditorDraggableList
+    public List<TabWidgetDisplay> display = new ArrayList<>();
+
+    @Expose
+    @ConfigLink(owner = TabWidgetConfig.class, field = "enabled")
+    public PositionList displayPositions = new PositionList(TabWidgetDisplay.getEntries().size());
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
index cd72264f31b1..523121b3763d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
@@ -307,6 +307,10 @@ enum class TabWidget(
         // language=RegExp
         "Scrap: (?:§.)*(?<amount>\\d)(?:§.)*/(?:§.)*\\d",
     ),
+    EVENT_TRACKERS(
+        // language=RegExp
+        "§e§lEvent Trackers:",
+    )
 
     ;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt
new file mode 100644
index 000000000000..2e598923d426
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt
@@ -0,0 +1,79 @@
+package at.hannibal2.skyhanni.features.gui
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.core.config.Position
+import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+enum class TabWidgetDisplay(private val configName: String?, vararg val widgets: TabWidget) {
+    SOULFLOW(null, TabWidget.SOULFLOW),
+    COINS("Bank and Interest", TabWidget.BANK, TabWidget.INTEREST),
+    SB_LEVEL("Skyblock Level", TabWidget.SB_LEVEL),
+    PROFILE(null, TabWidget.PROFILE),
+    PLAYER_LIST("Players", TabWidget.PLAYER_LIST),
+    PET(null, TabWidget.PET),
+    PET_TRAINING("Pet Upgrade Info", TabWidget.PET_SITTER, TabWidget.PET_TRAINING),
+    STATS(null, TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS),
+    DUNGEON_TEAM("Dungeon Info about every person", TabWidget.DUNGEON_PARTY),
+    DUNGEON_PUZZLE("Dungeon Info about puzzles", TabWidget.DUNGEON_PUZZLE),
+    DUNGEON_OVERALL("Dungeon General Info (very long)", TabWidget.DUNGEON_STATS),
+    BESTIARY(null, TabWidget.BESTIARY),
+    DRAGON("Dragon Fight Info", TabWidget.DRAGON),
+    PROTECTOR("Protector State", TabWidget.PROTECTOR),
+    SHEN_RIFT("Shen's Auction inside the Rift", TabWidget.RIFT_SHEN),
+    MINION("Minion Info", TabWidget.MINION),
+    COLLECTION(null, TabWidget.COLLECTION),
+    TIMERS(null, TabWidget.TIMERS),
+    FIRE_SALE(null, TabWidget.FIRE_SALE),
+    RAIN("Park Rain", TabWidget.RAIN),
+    ;
+
+    val position get() = config.displayPositions[ordinal]
+
+    override fun toString(): String {
+        return configName ?: name.lowercase().allLettersFirstUppercase()
+    }
+
+    @SkyHanniModule
+    companion object {
+
+        private val config get() = SkyHanniMod.feature.gui.tabWidget
+
+        private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+
+        @SubscribeEvent
+        fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+            if (!isEnabled()) return
+            if (config?.displayPositions == null) return
+            config.display.forEach { widget ->
+                widget.position.renderStrings(
+                    widget.widgets.flatMap { it.lines },
+                    posLabel = "Display Widget: ${widget.name}",
+                )
+            }
+        }
+
+        @SubscribeEvent
+        fun onJoin(event: ProfileJoinEvent) {
+            // Validation that the displayPositions in the config is correct
+            val sizeDiff = TabWidgetDisplay.entries.size - config.displayPositions.size
+            if (sizeDiff == 0) return
+            if (sizeDiff < 0) {
+                ErrorManager.skyHanniError(
+                    "Invalid State of config.displayPositions",
+                    "Display" to TabWidgetDisplay.entries,
+                    "Positions" to config.displayPositions,
+                )
+            } else {
+                config.displayPositions.addAll(generateSequence { Position() }.take(sizeDiff))
+            }
+        }
+    }
+}
diff --git a/src/test/java/at/hannibal2/skyhanni/test/RepoPatternTest.kt b/src/test/java/at/hannibal2/skyhanni/test/RepoPatternTest.kt
index f46a4f34bcb0..73ef1bcb7514 100644
--- a/src/test/java/at/hannibal2/skyhanni/test/RepoPatternTest.kt
+++ b/src/test/java/at/hannibal2/skyhanni/test/RepoPatternTest.kt
@@ -35,9 +35,9 @@ object RepoPatternTest {
         RepoPatternManager.loadPatternsFromDump(
             RepoPatternDump(
                 regexes = mapOf(
-                    simpleRepoPattern.key to remoteValue
-                )
-            )
+                    simpleRepoPattern.key to remoteValue,
+                ),
+            ),
         )
 
         val isRemoteWorking = simplePattern.pattern() == remoteValue
@@ -67,9 +67,9 @@ object RepoPatternTest {
             RepoPatternDump(
                 regexes = mapOf(
                     listPatterns.key + ".1" to remoteValue1,
-                    listPatterns.key + ".2" to remoteValue2
-                )
-            )
+                    listPatterns.key + ".2" to remoteValue2,
+                ),
+            ),
         )
 
         val isRemoteWorking = list[0].pattern() == remoteValue1 && list[1].pattern() == remoteValue2
@@ -80,8 +80,8 @@ object RepoPatternTest {
             RepoPatternDump(
                 regexes = mapOf(
                     listPatterns.key + ".1" to remoteValue3,
-                )
-            )
+                ),
+            ),
         )
 
         val isRemoteSingleWorking = list[0].pattern() == remoteValue3 && list.size == 1
@@ -92,8 +92,8 @@ object RepoPatternTest {
             RepoPatternDump(
                 regexes = mapOf(
                     listPatterns.key to remoteValue4,
-                )
-            )
+                ),
+            ),
         )
 
         val isRemoteListToSingleWorking = list.isEmpty()
@@ -116,8 +116,8 @@ object RepoPatternTest {
         val remoteValue3 = "I'm remote 3."
         val remoteValue4 = "I'm remote 4."
 
-        val isLocalWorking = group.getUnusedPatterns()
-            .isEmpty() && pattern1.pattern() == simpleLocalePattern1 && pattern2.pattern() == simpleLocalePattern2
+        val isLocalWorking =
+            group.getUnusedPatterns().isEmpty() && pattern1.pattern() == simpleLocalePattern1 && pattern2.pattern() == simpleLocalePattern2
 
         assert(isLocalWorking)
 
@@ -125,13 +125,13 @@ object RepoPatternTest {
             RepoPatternDump(
                 regexes = mapOf(
                     groupInfo.prefix + ".a" to remoteValue1,
-                    groupInfo.prefix + ".b" to remoteValue2
-                )
-            )
+                    groupInfo.prefix + ".b" to remoteValue2,
+                ),
+            ),
         )
 
-        val isRemoteWorking = group.getUnusedPatterns()
-            .isEmpty() && pattern1.pattern() == remoteValue1 && pattern2.pattern() == remoteValue2
+        val isRemoteWorking =
+            group.getUnusedPatterns().isEmpty() && pattern1.pattern() == remoteValue1 && pattern2.pattern() == remoteValue2
 
         assert(isRemoteWorking)
 
@@ -140,9 +140,9 @@ object RepoPatternTest {
                 regexes = mapOf(
                     groupInfo.prefix + ".a" to remoteValue3,
                     groupInfo.prefix + ".b" to remoteValue2,
-                    groupInfo.prefix + ".c" to remoteValue4
-                )
-            )
+                    groupInfo.prefix + ".c" to remoteValue4,
+                ),
+            ),
         )
 
         val unused = group.getUnusedPatterns()
@@ -166,8 +166,8 @@ object RepoPatternTest {
         val remoteValue3 = "I'm remote 3."
         val remoteValue4 = "I'm remote 4."
 
-        val isLocalWorking = group.getUnusedPatterns()
-            .isEmpty() && list[0].pattern() == simpleLocalePattern1 && list[1].pattern() == simpleLocalePattern2
+        val isLocalWorking =
+            group.getUnusedPatterns().isEmpty() && list[0].pattern() == simpleLocalePattern1 && list[1].pattern() == simpleLocalePattern2
 
         assert(isLocalWorking)
 
@@ -175,14 +175,12 @@ object RepoPatternTest {
             RepoPatternDump(
                 regexes = mapOf(
                     groupInfo.prefix + ".a.1" to remoteValue1,
-                    groupInfo.prefix + ".a.2" to remoteValue2
-                )
-            )
+                    groupInfo.prefix + ".a.2" to remoteValue2,
+                ),
+            ),
         )
 
-        val unused0 = group.getUnusedPatterns()
-        val isRemoteWorking = group.getUnusedPatterns()
-            .isEmpty() && list[0].pattern() == remoteValue1 && list[1].pattern() == remoteValue2
+        val isRemoteWorking = group.getUnusedPatterns().isEmpty() && list[0].pattern() == remoteValue1 && list[1].pattern() == remoteValue2
 
         assert(isRemoteWorking)
 
@@ -191,9 +189,9 @@ object RepoPatternTest {
                 regexes = mapOf(
                     groupInfo.prefix + ".a.1" to remoteValue3,
                     groupInfo.prefix + ".a.2" to remoteValue2,
-                    groupInfo.prefix + ".b" to remoteValue4
-                )
-            )
+                    groupInfo.prefix + ".b" to remoteValue4,
+                ),
+            ),
         )
 
         val unused = group.getUnusedPatterns()

From e3b39759ad89a91dda2ef0549d0a62b58598ec1c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 7 Sep 2024 20:00:48 +0200
Subject: [PATCH 396/721] added todo

---
 .../hannibal2/skyhanni/config/features/combat/CombatConfig.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
index b01647609efc..4beede62ba18 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
@@ -27,6 +27,7 @@ public class CombatConfig {
     @Expose
     @ConfigOption(name = "Armor Stack Display", desc = "")
     @Accordion
+    // TODO rename to armor stack display
     public StackDisplayConfig stackDisplayConfig = new StackDisplayConfig();
 
     @Expose

From f40863a821218938b8f53f17a4441ad5c973d0e3 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 7 Sep 2024 20:59:56 +0200
Subject: [PATCH 397/721] Feature: Personal Compactor Overlay (#1869)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |   5 +
 .../inventory/PersonalCompactorConfig.java    |  51 +++++++
 .../inventory/ItemDisplayOverlayFeatures.kt   |  11 +-
 .../inventory/PersonalCompactorOverlay.kt     | 134 ++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |  11 ++
 .../utils/SkyBlockItemModifierUtils.kt        |  12 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  78 +++++++++-
 .../utils/renderables/RenderableInventory.kt  | 120 ++++++++++++++++
 .../utils/renderables/RenderableTooltips.kt   |  56 ++++----
 .../resources/assets/skyhanni/gui/slot.png    | Bin 0 -> 314 bytes
 10 files changed, 444 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/PersonalCompactorConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/PersonalCompactorOverlay.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
 create mode 100644 src/main/resources/assets/skyhanni/gui/slot.png

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 6c43591a5eab..dfb8f1f9c396 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -73,6 +73,11 @@ public class InventoryConfig {
     @Accordion
     public HideNotClickableConfig hideNotClickable = new HideNotClickableConfig();
 
+    @Expose
+    @ConfigOption(name = "Personal Compactor Overlay", desc = "Overlay for the Personal Compactor and Deletor.")
+    @Accordion
+    public PersonalCompactorConfig personalCompactor = new PersonalCompactorConfig();
+
     @Expose
     @ConfigOption(name = "RNG Meter", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PersonalCompactorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PersonalCompactorConfig.java
new file mode 100644
index 000000000000..3ded2e8124a1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/PersonalCompactorConfig.java
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.config.features.inventory;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import org.lwjgl.input.Keyboard;
+
+public class PersonalCompactorConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Enable showing what items are inside your personal compactor/deletor.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Visibility Mode", desc = "Choose when to show the overlay.")
+    @ConfigEditorDropdown
+    public VisibilityMode visibilityMode = VisibilityMode.EXCEPT_KEYBIND;
+
+    public enum VisibilityMode {
+        ALWAYS("Always"),
+        KEYBIND("Keybind Held"),
+        EXCEPT_KEYBIND("Except Keybind Held"),
+        ;
+
+        private final String name;
+
+        VisibilityMode(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+    @Expose
+    @ConfigOption(name = "Keybind", desc = "The keybind to hold to show the overlay.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_LSHIFT)
+    public int keybind = Keyboard.KEY_LSHIFT;
+
+    @Expose
+    @ConfigOption(name = "Show On/Off", desc = "Show whether the Personal Compactor/Deletor is currently turned on or off.")
+    @ConfigEditorBoolean
+    public boolean showToggle = true;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 43448f8d8a76..1af2c8c88e67 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -251,7 +251,7 @@ object ItemDisplayOverlayFeatures {
             }
         }
 
-        if (VACUUM_GARDEN.isSelected() && internalName in PestAPI.vacuumVariants && isOwnVacuum(lore)) {
+        if (VACUUM_GARDEN.isSelected() && internalName in PestAPI.vacuumVariants && isOwnItem(lore)) {
             lore.matchFirst(gardenVacuumPatterm) {
                 val pests = group("amount").formatLong()
                 return if (config.vacuumBagCap) {
@@ -319,8 +319,13 @@ object ItemDisplayOverlayFeatures {
         return null
     }
 
-    private fun isOwnVacuum(lore: List<String>) =
-        lore.none { it.contains("Click to trade!") || it.contains("Starting bid:") || it.contains("Buy it now:") }
+    fun isOwnItem(lore: List<String>) =
+        lore.none {
+            it.contains("Click to trade!") ||
+                it.contains("Starting bid:") ||
+                it.contains("Buy it now:") ||
+                it.contains("Click to inspect")
+        }
 
     var done = false
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/PersonalCompactorOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/PersonalCompactorOverlay.kt
new file mode 100644
index 000000000000..7c6deb255d5a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/PersonalCompactorOverlay.kt
@@ -0,0 +1,134 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.features.inventory.PersonalCompactorConfig
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.events.RenderItemTipEvent
+import at.hannibal2.skyhanni.events.RenderObject
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUItems.getInternalNameFromHypixelId
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAttributeString
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemUuid
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPersonalCompactorActive
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableInventory
+import at.hannibal2.skyhanni.utils.renderables.RenderableTooltips
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object PersonalCompactorOverlay {
+
+    private val config get() = SkyHanniMod.feature.inventory.personalCompactor
+
+    private val group = RepoPattern.group("inventory.personalcompactor")
+    private val internalNamePattern by group.pattern(
+        "internalname",
+        "PERSONAL_(?<type>[^_]+)_(?<tier>\\d+)",
+    )
+
+    private val slotsMap = mapOf(
+        7000 to 12,
+        6000 to 7,
+        5000 to 3,
+        4000 to 1
+    )
+
+    private const val MAX_ITEMS_PER_ROW = 7
+
+    private val compactorRenderableMap = mutableMapOf<String, Renderable>()
+    private val compactorEnabledMap = mutableMapOf<String, Boolean>()
+
+    @SubscribeEvent
+    fun onTooltip(event: LorenzToolTipEvent) {
+        if (!isEnabled()) return
+        if (!shouldShow()) return
+
+        val itemStack = event.itemStack
+        val internalName = itemStack.getInternalName()
+        val name = event.toolTip.firstOrNull() ?: return
+        val (type, tier) = internalNamePattern.matchMatcher(internalName.asString()) {
+            group("type") to group("tier").formatInt()
+        } ?: return
+
+        val prefix = when (type) {
+            "COMPACTOR" -> "personal_compact_"
+            "DELETOR" -> "personal_deletor_"
+            else -> return
+        }
+
+        val uuid = itemStack.getItemUuid() ?: return
+        val enabled = getPersonalCompactorEnabled(itemStack) ?: return
+
+        val fakeInventory = compactorRenderableMap.getOrPut(uuid) {
+            val slots = slotsMap[tier] ?: return
+            val itemList = (0 until slots).map { slot ->
+                val skyblockId = itemStack.getAttributeString(prefix + slot)
+                skyblockId?.let { getInternalNameFromHypixelId(it) }?.getItemStack()
+            }
+
+            RenderableInventory.fakeInventory(itemList, MAX_ITEMS_PER_ROW, 1.0)
+        }
+
+        val title = Renderable.string(name)
+        val status = Renderable.string(
+            "§7Status: " + if (enabled) "§aEnabled" else "§cDisabled"
+        )
+
+        RenderableTooltips.setTooltipForRender(listOf(title, status, fakeInventory), spacedTitle = true)
+        event.cancel()
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        compactorRenderableMap.clear()
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdate(event: InventoryUpdatedEvent) {
+        compactorEnabledMap.clear()
+    }
+
+    @SubscribeEvent
+    fun onRenderItemTip(event: RenderItemTipEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.showToggle) return
+        val itemStack = event.stack
+        val internalName = itemStack.getInternalNameOrNull() ?: return
+        if (!internalNamePattern.matches(internalName.asString())) return
+
+        val enabled = getPersonalCompactorEnabled(itemStack) ?: return
+        val text = if (enabled) "§a✔" else "§c✖"
+        val renderObject = RenderObject(
+            text,
+            -8,
+            -10
+        )
+        event.renderObjects.add(renderObject)
+    }
+
+    private fun shouldShow() = when (config.visibilityMode) {
+        PersonalCompactorConfig.VisibilityMode.ALWAYS -> true
+        PersonalCompactorConfig.VisibilityMode.KEYBIND -> config.keybind.isKeyHeld()
+        PersonalCompactorConfig.VisibilityMode.EXCEPT_KEYBIND -> !config.keybind.isKeyHeld()
+        else -> false
+    }
+
+    private fun getPersonalCompactorEnabled(itemStack: ItemStack): Boolean? {
+        val uuid = itemStack.getItemUuid() ?: return null
+        return compactorEnabledMap.getOrPut(uuid) { itemStack.getPersonalCompactorActive() }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 82dbb7349795..c271ef66c659 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.isInt
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
 import at.hannibal2.skyhanni.utils.json.BaseGsonBuilder
 import at.hannibal2.skyhanni.utils.json.fromJson
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemId
 import at.hannibal2.skyhanni.utils.system.PlatformUtils
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
@@ -169,6 +170,16 @@ object NEUItems {
     fun getInternalNameOrNull(nbt: NBTTagCompound): NEUInternalName? =
         ItemResolutionQuery(manager).withItemNBT(nbt).resolveInternalName()?.asInternalName()
 
+    fun getInternalNameFromHypixelIdOrNull(hypixelId: String): NEUInternalName? {
+        val internalName = hypixelId.replace(':', '-')
+        return internalName.asInternalName().takeIf { it.getItemStackOrNull()?.getItemId() == internalName }
+    }
+
+    fun getInternalNameFromHypixelId(hypixelId: String): NEUInternalName =
+        getInternalNameFromHypixelIdOrNull(hypixelId)
+            ?: error("hypixel item id does not match internal name: $hypixelId")
+
+
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
     fun NEUInternalName.getPrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index b39493741a3c..c9e19332953d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -191,6 +191,8 @@ object SkyBlockItemModifierUtils {
 
     fun ItemStack.getNewYearCake() = getAttributeInt("new_years_cake")
 
+    fun ItemStack.getPersonalCompactorActive() = getAttributeByte("PERSONAL_DELETOR_ACTIVE") == 1.toByte()
+
     fun ItemStack.getEnchantments(): Map<String, Int>? = getExtraAttributes()
         ?.takeIf { it.hasKey("enchantments") }
         ?.run {
@@ -253,7 +255,7 @@ object SkyBlockItemModifierUtils {
         list
     }
 
-    private fun ItemStack.getAttributeString(label: String) =
+    fun ItemStack.getAttributeString(label: String) =
         getExtraAttributes()?.getString(label)?.takeUnless { it.isBlank() }
 
     private fun ItemStack.getAttributeInt(label: String) =
@@ -262,9 +264,11 @@ object SkyBlockItemModifierUtils {
     private fun ItemStack.getAttributeLong(label: String) =
         getExtraAttributes()?.getLong(label)?.takeUnless { it == 0L }
 
-    private fun ItemStack.getAttributeBoolean(label: String): Boolean {
-        return getExtraAttributes()?.getBoolean(label) ?: false
-    }
+    private fun ItemStack.getAttributeBoolean(label: String) =
+        getExtraAttributes()?.getBoolean(label) ?: false
+
+    private fun ItemStack.getAttributeByte(label: String) =
+        getExtraAttributes()?.getByte(label) ?: 0
 
     fun ItemStack.getExtraAttributes() = tagCompound?.getCompoundTag("ExtraAttributes")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index a49f58b00db9..91abc636dd97 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -201,6 +201,7 @@ interface Renderable {
             highlightsOnHoverSlots: List<Int> = listOf(),
             stack: ItemStack? = null,
             color: LorenzColor? = null,
+            spacedTitle: Boolean = false,
             bypassChecks: Boolean = false,
             snapsToTopIfToLong: Boolean = true,
             condition: () -> Boolean = { true },
@@ -231,6 +232,7 @@ interface Renderable {
                                 stack = stack,
                                 borderColor = color,
                                 snapsToTopIfToLong = snapsToTopIfToLong,
+                                spacedTitle = spacedTitle,
                             )
                             GlStateManager.popMatrix()
                         }
@@ -839,6 +841,25 @@ interface Renderable {
             }
         }
 
+        fun paddingContainer(
+            content: Renderable,
+            topSpacing: Int = 0,
+            bottomSpacing: Int = 0,
+            leftSpacing: Int = 0,
+            rightSpacing: Int = 0,
+        ) = object : Renderable {
+            override val width = content.width + leftSpacing + rightSpacing
+            override val height = content.height + topSpacing + bottomSpacing
+            override val horizontalAlign = content.horizontalAlign
+            override val verticalAlign = content.verticalAlign
+
+            override fun render(posX: Int, posY: Int) {
+                GlStateManager.translate(leftSpacing.toFloat(), topSpacing.toFloat(), 0f)
+                content.render(posX + leftSpacing, posY + topSpacing)
+                GlStateManager.translate(-leftSpacing.toFloat(), -topSpacing.toFloat(), 0f)
+            }
+        }
+
         fun scrollList(
             list: List<Renderable>,
             height: Int,
@@ -1063,11 +1084,56 @@ interface Renderable {
             }
         }
 
+        fun drawInsideFixedSizedImage(
+            input: Renderable,
+            texture: ResourceLocation,
+            width: Int = input.width,
+            height: Int = input.height,
+            alpha: Int = 255,
+            padding: Int = 2,
+            uMin: Float = 0f,
+            uMax: Float = 1f,
+            vMin: Float = 0f,
+            vMax: Float = 1f,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            override val width = width
+            override val height = height
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            override fun render(posX: Int, posY: Int) {
+                Minecraft.getMinecraft().textureManager.bindTexture(texture)
+                GlStateManager.color(1f, 1f, 1f, alpha / 255f)
+                Utils.drawTexturedRect(
+                    0f,
+                    0f,
+                    width.toFloat(),
+                    height.toFloat(),
+                    uMin,
+                    uMax,
+                    vMin,
+                    vMax,
+                    GL11.GL_NEAREST
+                )
+                GlStateManager.color(1f, 1f, 1f, 1f)
+
+                GlStateManager.translate(padding.toFloat(), padding.toFloat(), 0f)
+                input.render(posX + padding, posY + padding)
+                GlStateManager.translate(-padding.toFloat(), -padding.toFloat(), 0f)
+            }
+        }
+
         fun image(
             texture: ResourceLocation,
             width: Int,
             height: Int,
             alpha: Int = 255,
+            uMin: Float = 0f,
+            uMax: Float = 1f,
+            vMin: Float = 0f,
+            vMax: Float = 1f,
             horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
             verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
         ) = object : Renderable {
@@ -1079,7 +1145,17 @@ interface Renderable {
             override fun render(posX: Int, posY: Int) {
                 Minecraft.getMinecraft().textureManager.bindTexture(texture)
                 GlStateManager.color(1f, 1f, 1f, alpha / 255f)
-                Utils.drawTexturedRect(0f, 0f, width.toFloat(), height.toFloat(), GL11.GL_NEAREST)
+                Utils.drawTexturedRect(
+                    0f,
+                    0f,
+                    width.toFloat(),
+                    height.toFloat(),
+                    uMin,
+                    uMax,
+                    vMin,
+                    vMax,
+                    GL11.GL_NEAREST
+                )
                 GlStateManager.color(1f, 1f, 1f, 1f)
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
new file mode 100644
index 000000000000..6f783a485c3c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
@@ -0,0 +1,120 @@
+package at.hannibal2.skyhanni.utils.renderables
+
+import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
+import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
+import net.minecraft.item.ItemStack
+import net.minecraft.util.ResourceLocation
+import kotlin.math.ceil
+
+object RenderableInventory {
+
+    private val inventoryTextures by lazy { ResourceLocation("skyhanni", "gui/slot.png") }
+    private const val TEXTURE_WIDTH = 90
+    private const val TEXTURE_HEIGHT = 54
+
+    private enum class SlotsUv(val uMin: Int, val uMax: Int, val vMin: Int, val vMax: Int) {
+        TOP_LEFT_CORNER(14, 18, 32, 36),
+        TOP_BORDER(18, 36, 32, 36),
+        TOP_RIGHT_CORNER(36, 40, 32, 36),
+        LEFT_BORDER(68, 72, 18, 36),
+        CENTER(0, 18, 0, 18),
+        RIGHT_BORDER(72, 76, 18, 36),
+        BOTTOM_LEFT_CORNER(14, 18, 36, 40),
+        BOTTOM_BORDER(18, 36, 36, 40),
+        BOTTOM_RIGHT_CORNER(36, 40, 36, 40),
+        HALF_EMPTY(54, 63, 0, 18),
+        EMPTY(18, 36, 0, 18),
+        ;
+
+        fun getUvCoords(): FloatArray {
+            return floatArrayOf(
+                (uMin.toFloat() / TEXTURE_WIDTH),
+                (uMax.toFloat() / TEXTURE_WIDTH),
+                (vMin.toFloat() / TEXTURE_HEIGHT),
+                (vMax.toFloat() / TEXTURE_HEIGHT),
+            )
+        }
+
+        fun height() = vMax - vMin
+        fun width() = uMax - uMin
+    }
+
+    private fun createUvList(size: Int, maxSize: Int) = buildList {
+        val length = if (size >= maxSize) maxSize else size
+        val lastLength = if (size % maxSize == 0) maxSize else size % maxSize
+        val isWeird = lastLength % 2 != length % 2
+
+        val rows = ceil(size.toDouble() / maxSize).toInt()
+
+        for (i in 0 until rows + 2) {
+            val row = mutableListOf<SlotsUv>()
+            if (i == 0) { // top border
+                row.add(SlotsUv.TOP_LEFT_CORNER)
+                row.addAll(List(length) { SlotsUv.TOP_BORDER })
+                row.add(SlotsUv.TOP_RIGHT_CORNER)
+            } else if (i == rows + 1) { // last border
+                row.add(SlotsUv.BOTTOM_LEFT_CORNER)
+                row.addAll(List(length) { SlotsUv.BOTTOM_BORDER })
+                row.add(SlotsUv.BOTTOM_RIGHT_CORNER)
+            } else if (i == rows && rows != 1) { // last row
+                val spaces = if (isWeird) (length - lastLength) - 1 else length - lastLength
+                row.add(SlotsUv.LEFT_BORDER)
+                row.addAll(List(spaces / 2) { SlotsUv.EMPTY })
+                if (isWeird) row.add(SlotsUv.HALF_EMPTY)
+                row.addAll(List(lastLength) { SlotsUv.CENTER })
+                if (isWeird) row.add(SlotsUv.HALF_EMPTY)
+                row.addAll(List(spaces / 2) { SlotsUv.EMPTY })
+                row.add(SlotsUv.RIGHT_BORDER)
+            } else {
+                row.add(SlotsUv.LEFT_BORDER)
+                row.addAll(List(length) { SlotsUv.CENTER })
+                row.add(SlotsUv.RIGHT_BORDER)
+            }
+            add(row.toList())
+        }
+    }
+
+    fun fakeInventory(
+        items: List<ItemStack?>,
+        maxRowSize: Int,
+        scale: Double,
+        horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+        verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+    ): Renderable {
+        val uvList = createUvList(items.size, maxRowSize)
+        var index = 0
+        val finalList = uvList.map { uvRow ->
+            uvRow.map { uv ->
+                val uvArray = uv.getUvCoords()
+                val renderable = if (uv == SlotsUv.CENTER) {
+                    (items[index]?.let { item ->
+                        Renderable.itemStack(
+                            item,
+                            scale,
+                            0,
+                            0,
+                        )
+                    } ?: Renderable.placeholder((16 * scale).toInt(), (16 * scale).toInt())).also { index++ }
+                } else Renderable.placeholder(0, 0)
+                Renderable.drawInsideFixedSizedImage(
+                    renderable,
+                    inventoryTextures,
+                    (uv.width() * scale).toInt(),
+                    (uv.height() * scale).toInt(),
+                    padding = scale.toInt(),
+                    uMin = uvArray[0],
+                    uMax = uvArray[1],
+                    vMin = uvArray[2],
+                    vMax = uvArray[3],
+                )
+            }
+        }
+
+        return Renderable.verticalContainer(
+            finalList.map { Renderable.horizontalContainer(it, 0) },
+            0,
+            horizontalAlign = horizontalAlign,
+            verticalAlign = verticalAlign,
+        )
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
index 0d2c887854ae..b37c89bb552d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent
-import java.awt.Color
 
 @SkyHanniModule
 object RenderableTooltips {
@@ -35,8 +34,9 @@ object RenderableTooltips {
         stack: ItemStack? = null,
         borderColor: LorenzColor? = null,
         snapsToTopIfToLong: Boolean = true,
+        spacedTitle: Boolean = false
     ) {
-        tooltip = DeferredTooltip(tips, stack, borderColor, snapsToTopIfToLong)
+        tooltip = DeferredTooltip(tips, stack, borderColor, snapsToTopIfToLong, spacedTitle)
     }
 
     private fun drawHoveringText() {
@@ -45,9 +45,10 @@ object RenderableTooltips {
         if (tips.isEmpty()) return
 
         val x = Utils.getMouseX() + 12
-        val y = Utils.getMouseY() - if (tips.size > 1) 2 else -7
-        val borderColorStart = Color(tooltip.getBorderColor()).darker().rgb and 0x00FFFFFF or (200 shl 24)
+        val y = Utils.getMouseY() - if (tips.size > 1) 1 else -7
+        val borderColorStart = tooltip.getBorderColor()
         val scaled = ScaledResolution(Minecraft.getMinecraft())
+        val isSpacedTitle = tooltip.isSpacedTitle()
 
         val tooltipTextWidth = tips.maxOf { it.width }
         val tooltipHeight = tips.sumOf { it.height }
@@ -58,11 +59,11 @@ object RenderableTooltips {
                 if (tooltip.snapsToTopIfToLong && tooltipHeight + 8 > scaled.scaledHeight)
                     4 // Snap to Top if to Long
                 else
-                    scaled.scaledHeight - tooltipHeight - 4 // Limit Bottom
+                    scaled.scaledHeight - tooltipHeight - 6 // Limit Bottom
             }
 
             else -> {
-                y - 12 // normal
+                y - 10 // normal
             }
         }
         val tooltipX = if (x + tooltipTextWidth + 4 > scaled.scaledWidth) {
@@ -81,19 +82,19 @@ object RenderableTooltips {
         RenderUtils.drawGradientRect(
             left = -3,
             top = -4,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = -3,
         )
         RenderUtils.drawGradientRect(
             left = -3,
             top = tooltipHeight + 3,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = tooltipHeight + 4,
         )
         RenderUtils.drawGradientRect(
             left = -3,
             top = -3,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = tooltipHeight + 3,
         )
         RenderUtils.drawGradientRect(
@@ -103,9 +104,9 @@ object RenderableTooltips {
             bottom = tooltipHeight + 3,
         )
         RenderUtils.drawGradientRect(
-            left = tooltipTextWidth + 3,
+            left = tooltipTextWidth + 2,
             top = -3,
-            right = tooltipTextWidth + 4,
+            right = tooltipTextWidth + 3,
             bottom = tooltipHeight + 3,
         )
         val borderColorEnd = borderColorStart and 0xFEFEFE shr 1 or (borderColorStart and -0x1000000)
@@ -118,9 +119,9 @@ object RenderableTooltips {
             endColor = borderColorEnd
         )
         RenderUtils.drawGradientRect(
-            left = tooltipTextWidth + 2,
+            left = tooltipTextWidth + 1,
             top = -3 + 1,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = tooltipHeight + 3 - 1,
             startColor = borderColorStart,
             endColor = borderColorEnd
@@ -128,7 +129,7 @@ object RenderableTooltips {
         RenderUtils.drawGradientRect(
             left = -3,
             top = -3,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = -3 + 1,
             startColor = borderColorStart,
             endColor = borderColorStart
@@ -136,25 +137,24 @@ object RenderableTooltips {
         RenderUtils.drawGradientRect(
             left = -3,
             top = tooltipHeight + 2,
-            right = tooltipTextWidth + 3,
+            right = tooltipTextWidth + 2,
             bottom = tooltipHeight + 3,
             startColor = borderColorEnd,
             endColor = borderColorEnd
         )
-        GlStateManager.disableDepth()
-        GlStateManager.translate(0f, 0f, -zLevel)
+        GlStateManager.translate(-1f, -1f, 0f)
 
         var yTranslateSum = 0
-        for (line in tips) {
+        tips.forEachIndexed { index, line ->
             line.renderXAligned(tooltipX, tooltipY, tooltipTextWidth)
-            val yShift = line.height
+            var yShift = line.height
+            if (index == 0 && isSpacedTitle) yShift += 2
             GlStateManager.translate(0f, yShift.toFloat(), 0f)
             yTranslateSum += yShift
         }
 
-        GlStateManager.translate(-tooltipX.toFloat(), -tooltipY.toFloat() + yTranslateSum.toFloat(), 0f)
+        GlStateManager.translate(-tooltipX.toFloat() + 1, -tooltipY.toFloat() + 1 + yTranslateSum.toFloat(), -zLevel)
         GlStateManager.enableLighting()
-        GlStateManager.enableDepth()
         RenderHelper.enableStandardItemLighting()
         GlStateManager.enableRescaleNormal()
         GlStateManager.disableLighting()
@@ -164,13 +164,17 @@ object RenderableTooltips {
 private data class DeferredTooltip(
     val tips: List<Renderable>,
     val stack: ItemStack? = null,
-    val borderColor: LorenzColor? = null,
+    private val borderColor: LorenzColor? = null,
     val snapsToTopIfToLong: Boolean = true,
+    private val spacedTitle: Boolean = false,
 ) {
 
-    fun getBorderColor(): Int {
-        return Minecraft.getMinecraft().fontRendererObj.getColorCode(
-            borderColor?.chatColorCode ?: stack?.getLore()?.lastOrNull()?.take(4)?.get(1) ?: 'f'
-        )
+    fun getBorderColor(): Int =
+        (borderColor?.chatColorCode ?: stack?.getLore()?.lastOrNull()?.take(4)?.get(1))
+            ?.let { Minecraft.getMinecraft().fontRendererObj.getColorCode(it) }
+            ?: 0x505000FF
+
+    fun isSpacedTitle(): Boolean {
+        return spacedTitle
     }
 }
diff --git a/src/main/resources/assets/skyhanni/gui/slot.png b/src/main/resources/assets/skyhanni/gui/slot.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e15b97d12de8de081658434d38bfb6074fc3a7b
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^Q9x|Q!3HGV=k+NADVB6cUq=RpjeRx011AIdA3a?h
zLn`LHy>*bc*?`9_ad{H&GlwSANxqvzt7kY$9I^d!XzkRbzaC#|nP+_Hun;)4Nhh&6
zYwfn&+b<-Hjiaw`O*vEeef{^TrEBAT(&h&!SG_NjaX-~G?^Wq{rhlvpT{(1}G6bEv
z1)^FmD7A<wZs9-`3SN7)>V5fo=KoqshwdJ}yLhWv4cF1t&e#<r>7S^Xe4=vR;rrR^
zpH)u#+qvFI#!5-)cmDrtQEz_#TX93v`d6oy=1P96)QDq&=dWHaGX{DU47BnS-s^dK
SUY)WH#PxLbb6Mw<&;$Sp(tV5o

literal 0
HcmV?d00001


From 2d2ba2a02f542d288e142cf3a626dc81cb163006 Mon Sep 17 00:00:00 2001
From: Ovi-111 <142670705+Ovi-111@users.noreply.github.com>
Date: Sun, 8 Sep 2024 01:00:55 +0600
Subject: [PATCH 398/721] Feature: Dungeon Secret Chime (#2478)

Co-authored-by: Ovi <ovi2561@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/dungeon/DungeonConfig.java       |  5 ++
 .../features/dungeon/SecretChimeConfig.java   | 40 +++++++++++++
 .../skyhanni/data/ClickedBlockType.kt         |  8 +++
 .../events/DungeonClickedBlockEvent.kt        |  7 +++
 .../skyhanni/features/dungeon/DungeonAPI.kt   | 48 +++++++++++----
 .../dungeon/DungeonHighlightClickedBlocks.kt  | 59 +++++++------------
 .../features/dungeon/DungeonSecretChime.kt    | 38 ++++++++++++
 7 files changed, 156 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/SecretChimeConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/ClickedBlockType.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonSecretChime.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
index 60809f44f00b..ec2bc0c4b0f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
@@ -15,6 +15,11 @@ public class DungeonConfig {
     @Accordion
     public HighlightClickedBlocksConfig clickedBlocks = new HighlightClickedBlocksConfig();
 
+    @Expose
+    @ConfigOption(name = "Secret Chime", desc = "Play a sound effect when levers, chests, and wither essence are clicked in dungeons.")
+    @Accordion
+    public SecretChimeConfig secretChime = new SecretChimeConfig();
+
     @Expose
     @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in Dungeons.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/SecretChimeConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/SecretChimeConfig.java
new file mode 100644
index 000000000000..99a1e103d212
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/SecretChimeConfig.java
@@ -0,0 +1,40 @@
+package at.hannibal2.skyhanni.config.features.dungeon;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.features.dungeon.DungeonSecretChime;
+import at.hannibal2.skyhanni.utils.OSUtils;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class SecretChimeConfig {
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Play a sound effect when levers, chests, and wither essence are clicked in dungeons.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Secret Chime Sound", desc = "The sound played for the secret chime.")
+    @ConfigEditorText
+    public String soundName = "random.orb";
+
+    @Expose
+    @ConfigOption(name = "Pitch", desc = "The pitch of the secret chime sound.")
+    @ConfigEditorSlider(minValue = 0.5f, maxValue = 2.0f, minStep = 0.1f)
+    public float soundPitch = 1.0f;
+
+    @ConfigOption(name = "Sounds",
+        desc = "Click to open the list of available sounds.\n" +
+        "§l§cWarning: Clicking this will open a webpage in your browser."
+    )
+    @ConfigEditorButton(buttonText = "OPEN")
+    public Runnable soundsListURL = () -> OSUtils.openBrowser("https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/mapping-and-modding-tutorials/2213619-1-8-all-playsound-sound-arguments");
+
+    @ConfigOption(name = "Play Sound", desc = "Plays current secret chime sound.")
+    @ConfigEditorButton(buttonText = "Play")
+    public Runnable checkSound = DungeonSecretChime::playSound;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ClickedBlockType.kt b/src/main/java/at/hannibal2/skyhanni/data/ClickedBlockType.kt
new file mode 100644
index 000000000000..e69c9b5160d8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/ClickedBlockType.kt
@@ -0,0 +1,8 @@
+package at.hannibal2.skyhanni.data
+
+enum class ClickedBlockType {
+    LEVER,
+    CHEST,
+    TRAPPED_CHEST,
+    WITHER_ESSENCE
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt
new file mode 100644
index 000000000000..9a7f5119aa64
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt
@@ -0,0 +1,7 @@
+package at.hannibal2.skyhanni.events
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.data.ClickedBlockType
+import at.hannibal2.skyhanni.utils.LorenzVec
+
+class DungeonBlockClickEvent(val position: LorenzVec, val blockType: ClickedBlockType) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index 50a3ff8f61d6..f95c846b2a0a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -1,9 +1,13 @@
 package at.hannibal2.skyhanni.features.dungeon
 
+import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.ClickedBlockType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.ScoreboardData
+import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.DungeonBlockClickEvent
 import at.hannibal2.skyhanni.events.DungeonBossRoomEnterEvent
 import at.hannibal2.skyhanni.events.DungeonCompleteEvent
 import at.hannibal2.skyhanni.events.DungeonEnterEvent
@@ -14,6 +18,8 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.TablistFooterUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.BlockUtils
+import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.equalsOneOf
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -30,6 +36,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.init.Blocks
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -37,13 +44,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 object DungeonAPI {
 
     private val floorPattern = " §7⏣ §cThe Catacombs §7\\((?<floor>.*)\\)".toPattern()
-    private val uniqueClassBonus =
-        "^Your ([A-Za-z]+) stats are doubled because you are the only player using this class!$".toRegex()
+    private val uniqueClassBonus = "^Your ([A-Za-z]+) stats are doubled because you are the only player using this class!$".toRegex()
 
-    private val bossPattern =
-        "View all your (?<name>\\w+) Collection".toPattern()
-    private val levelPattern =
-        " +(?<kills>\\d+).*".toPattern()
+    private val bossPattern = "View all your (?<name>\\w+) Collection".toPattern()
+    private val levelPattern = " +(?<kills>\\d+).*".toPattern()
     private val killPattern = " +☠ Defeated (?<boss>\\w+).*".toPattern()
     private val totalKillsPattern = "§7Total Kills: §e(?<kills>.*)".toPattern()
 
@@ -58,6 +62,8 @@ object DungeonAPI {
     val bossStorage: MutableMap<DungeonFloor, Int>? get() = ProfileStorageData.profileSpecific?.dungeons?.bosses
 
     private val patternGroup = RepoPattern.group("dungeon")
+    private const val WITHER_ESSENCE_TEXTURE =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzRkYjRhZGZhOWJmNDhmZjVkNDE3MDdhZTM0ZWE3OGJkMjM3MTY1OWZjZDhjZDg5MzQ3NDlhZjRjY2U5YiJ9fX0="
 
     /**
      * REGEX-TEST: Time Elapsed: §a01m 17s
@@ -173,10 +179,9 @@ object DungeonAPI {
             }
         }
         if (dungeonFloor != null && playerClass == null) {
-            val playerTeam =
-                TabListData.getTabList().firstOrNull {
-                    it.contains(LorenzUtils.getPlayerName())
-                }?.removeColor() ?: ""
+            val playerTeam = TabListData.getTabList().firstOrNull {
+                it.contains(LorenzUtils.getPlayerName())
+            }?.removeColor() ?: ""
 
             for (dungeonClass in DungeonClass.entries) {
                 if (playerTeam.contains("(${dungeonClass.scoreboardName} ")) {
@@ -354,4 +359,27 @@ object DungeonAPI {
             fun getByInventoryName(inventory: String) = entries.firstOrNull { it.inventory == inventory }
         }
     }
+
+    @SubscribeEvent
+    fun onBlockClick(event: BlockClickEvent) {
+        if (!inDungeon() || event.clickType != ClickType.RIGHT_CLICK) return
+
+        val position = event.position
+        val blockType: ClickedBlockType = when (position.getBlockAt()) {
+            Blocks.chest -> ClickedBlockType.CHEST
+            Blocks.trapped_chest -> ClickedBlockType.TRAPPED_CHEST
+            Blocks.lever -> ClickedBlockType.LEVER
+            Blocks.skull -> {
+                val blockTexture = BlockUtils.getTextureFromSkull(position.toBlockPos())
+                if (blockTexture == WITHER_ESSENCE_TEXTURE) {
+                    ClickedBlockType.WITHER_ESSENCE
+                } else {
+                    return
+                }
+            }
+
+            else -> return
+        }
+        DungeonBlockClickEvent(position, blockType).post()
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index e5867273453c..4d494567d4d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -1,14 +1,13 @@
 package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.ClickType
-import at.hannibal2.skyhanni.events.BlockClickEvent
+import at.hannibal2.skyhanni.data.ClickedBlockType
+import at.hannibal2.skyhanni.events.DungeonBlockClickEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.BlockUtils
-import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ExtendedChatColor
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -18,7 +17,6 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraft.init.Blocks
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import kotlin.time.Duration.Companion.seconds
@@ -40,7 +38,7 @@ object DungeonHighlightClickedBlocks {
 
     private val blocks = TimeLimitedCache<LorenzVec, ClickedBlock>(3.seconds)
     private var colorIndex = 0
-    val undesirableColors = listOf(
+    private val undesirableColors = listOf(
         LorenzColor.BLACK,
         LorenzColor.WHITE,
         LorenzColor.CHROMA,
@@ -69,45 +67,27 @@ object DungeonHighlightClickedBlocks {
         }
     }
 
-    @SubscribeEvent
-    fun onBlockClick(event: BlockClickEvent) {
+    @HandleEvent
+    fun onDungeonClickedBlock(event: DungeonBlockClickEvent) {
         if (!isEnabled()) return
-        if (event.clickType != ClickType.RIGHT_CLICK) return
+        val isWaterRoom = DungeonAPI.getRoomID() == "-60,-60"
+        if (isWaterRoom && event.blockType == ClickedBlockType.LEVER) return
 
-        val position = event.position
-        if (blocks.containsKey(position)) return
+        val type = event.blockType
 
-        val type: ClickedBlockType = when (position.getBlockAt()) {
-            Blocks.chest -> ClickedBlockType.CHEST
-            Blocks.trapped_chest -> ClickedBlockType.TRAPPED_CHEST
-            Blocks.lever -> ClickedBlockType.LEVER
-            Blocks.skull -> ClickedBlockType.WITHER_ESSENCE
-            else -> return
-        }
+        val color = if (config.randomColor) getRandomColor().toColor() else getBlockProperties(type).color.toChromaColor()
+        val displayText = ExtendedChatColor(color.rgb, false).toString() + "Clicked " + getBlockProperties(type).name
+        blocks[event.position] = ClickedBlock(displayText, color)
 
-        if (type == ClickedBlockType.WITHER_ESSENCE) {
-            val text = BlockUtils.getTextureFromSkull(position.toBlockPos())
-            if (text != "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQ" +
-                "ubmV0L3RleHR1cmUvYzRkYjRhZGZhOWJmNDhmZjVkNDE3M" +
-                "DdhZTM0ZWE3OGJkMjM3MTY1OWZjZDhjZDg5MzQ3NDlhZjRjY2U5YiJ9fX0="
-            ) {
-                return
-            }
-        }
-
-        val inWaterRoom = DungeonAPI.getRoomID() == "-60,-60"
-        if (inWaterRoom && type == ClickedBlockType.LEVER) return
-
-        val color = if (config.randomColor) getRandomColor().toColor() else type.color().toChromaColor()
-        val displayText = ExtendedChatColor(color.rgb, false).toString() + "Clicked " + type.display
-        blocks[position] = ClickedBlock(displayText, color)
     }
 
-    enum class ClickedBlockType(val display: String, val color: () -> String) {
-        LEVER("Lever", { config.leverColor }),
-        CHEST("Chest", { config.chestColor }),
-        TRAPPED_CHEST("Trapped Chest", { config.trappedChestColor }),
-        WITHER_ESSENCE("Wither Essence", { config.witherEssenceColor }),
+    private fun getBlockProperties(type: ClickedBlockType): BlockProperties {
+        return when (type) {
+            ClickedBlockType.LEVER -> BlockProperties("Lever", config.leverColor)
+            ClickedBlockType.CHEST -> BlockProperties("Chest", config.chestColor)
+            ClickedBlockType.TRAPPED_CHEST -> BlockProperties("Trapped Chest", config.trappedChestColor)
+            ClickedBlockType.WITHER_ESSENCE -> BlockProperties("Wither Essence", config.witherEssenceColor)
+        }
     }
 
     @SubscribeEvent
@@ -128,6 +108,7 @@ object DungeonHighlightClickedBlocks {
     }
 
     class ClickedBlock(val displayText: String, var color: Color)
+    class BlockProperties(val name: String, val color: String)
 
     fun isEnabled() = !DungeonAPI.inBossRoom && DungeonAPI.inDungeon() && config.enabled
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonSecretChime.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonSecretChime.kt
new file mode 100644
index 000000000000..a19b60a13cce
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonSecretChime.kt
@@ -0,0 +1,38 @@
+package at.hannibal2.skyhanni.features.dungeon
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.data.ClickedBlockType
+import at.hannibal2.skyhanni.events.DungeonBlockClickEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.SoundUtils.playSound
+
+@SkyHanniModule
+object DungeonSecretChime {
+    private val config get() = SkyHanniMod.feature.dungeon.secretChime
+
+    @HandleEvent
+    fun onDungeonClickedBlock(event: DungeonBlockClickEvent) {
+        if (!isEnabled()) return
+        val isWaterRoom = DungeonAPI.getRoomID() == "-60,-60"
+        if (isWaterRoom && event.blockType == ClickedBlockType.LEVER) return
+
+        when (event.blockType) {
+            ClickedBlockType.CHEST,
+            ClickedBlockType.TRAPPED_CHEST,
+            ClickedBlockType.LEVER,
+            ClickedBlockType.WITHER_ESSENCE,
+            -> playSound()
+        }
+    }
+
+    fun isEnabled() = !DungeonAPI.inBossRoom && DungeonAPI.inDungeon() && config.enabled
+
+    @JvmStatic
+    fun playSound() {
+        with(config) {
+            SoundUtils.createSound(soundName, soundPitch, 100f).playSound()
+        }
+    }
+}

From 196c1d5780f90386dc2b53282c1a3a1b6345a781 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sat, 7 Sep 2024 21:20:17 +0200
Subject: [PATCH 399/721] Feature: Experiment Rewards compacting (#2209)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/chat/ChatConfig.java      |   6 +
 .../features/chat/CompactExperimentRewards.kt | 103 ++++++++++++++++++
 .../inventory/SuperpairsClicksAlert.kt        |   2 +-
 3 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
index 6a1d129a27fc..53f7aac94df8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java
@@ -89,6 +89,12 @@ public String toString() {
     @FeatureToggle
     public boolean compactBestiaryMessage = true;
 
+    @Expose
+    @ConfigOption(name = "Compact Enchanting Rewards", desc = "Compact the rewards gained from Add-ons and Experiments in Experimentation Table, only showing additional information when hovering.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean compactExperimentationTable = false;
+
     @Expose
     @ConfigOption(name = "Arachne Hider", desc = "Hide chat messages about the Arachne Fight while outside of §eArachne's Sanctuary§7.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
new file mode 100644
index 000000000000..d1c2d2c460b8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
@@ -0,0 +1,103 @@
+package at.hannibal2.skyhanni.features.chat
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+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.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object CompactExperimentRewards {
+
+    private val config get() = SkyHanniMod.feature.chat
+
+    private var gainedRewards = mutableListOf<String>()
+    private var lastTimeTableOpened = SimpleTimeMark.farPast()
+    private var currentMessage = ""
+
+    private val patternGroup = RepoPattern.group("chat.experiments.compact")
+
+    /**
+     * REGEX-TEST: Superpairs (Metaphysical)
+     * REGEX-TEST: Superpairs Rewards
+     */
+    private val experimentInventoriesPattern by patternGroup.pattern(
+        "inventories",
+        "(?:Superpairs|Chronomatron|Ultrasequencer) (?:\\(.+\\)|➜ Stakes|Rewards)|Experimentation Table",
+    )
+
+    /**
+     * REGEX-TEST: §eYou claimed the §r§dUltrasequencer §r§erewards!
+     * REGEX-TEST: §eYou claimed the §r§cUltrasequencer §r§erewards!
+     */
+    private val claimMessagePattern by patternGroup.pattern(
+        "message",
+        "(?<message>§eYou claimed the §r§.\\S+ §r§erewards!)",
+    )
+
+    /**
+     * REGEX-TEST: §8 +§r§3600k Enchanting Exp
+     * REGEX-TEST:  §r§8+§r§3132k Enchanting Exp
+     * REGEX-TEST:  §r§8+§r§aThunderlord V
+     * REGEX-TEST:  §r§8+§r§3143k Enchanting Exp
+     * REGEX-TEST:  §r§8+§r§aGrand Experience Bottle
+     * REGEX-TEST:  §r§8+§r§aCaster V
+     */
+    private val experimentsDropPattern by patternGroup.pattern(
+        "drop",
+        "^(?:§8 \\+| §r§8\\+)(?<reward>.*)\$",
+    )
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        if (isEnabled() && experimentInventoriesPattern.matches(InventoryUtils.openInventoryName())) {
+            lastTimeTableOpened = SimpleTimeMark.now()
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled() || lastTimeTableOpened.passedSince() >= 3.seconds || event.blockedReason != "") return
+
+        val message = event.message
+        claimMessagePattern.matchMatcher(message) {
+            currentMessage = group("message")
+            event.blockedReason = "COMPACT_REWARDS"
+            return
+        }
+        experimentsDropPattern.matchMatcher(message) {
+            val reward = group("reward")
+
+            gainedRewards.add(reward)
+            event.blockedReason = "COMPACT_REWARDS"
+
+            DelayedRun.runDelayed(100.milliseconds) {
+                sendMessage(reward)
+            }
+        }
+    }
+
+    private fun sendMessage(reward: String?) {
+        if (gainedRewards.last() != reward || currentMessage == "") return
+
+        val expList = mutableListOf<String>().apply {
+            gainedRewards.forEach { add("§8+$it") }
+        }
+
+        ChatUtils.hoverableChat(currentMessage, expList, null, false)
+        gainedRewards.clear()
+        currentMessage = ""
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.compactExperimentationTable
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
index 5c5011c85b1c..8e3c126798ba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
@@ -19,7 +19,7 @@ object SuperpairsClicksAlert {
     private var roundsNeeded = -1
     private val roundsNeededRegex = Regex("""(?:Chain|Series) of (\d+):""")
     private val currentRoundRegex = Regex("""Round: (\d+)""")
-    private val targetInventoryNames = arrayOf("Chronomatron", "Ultrasequencer")
+    private val targetInventoryNames = arrayOf("Chronomatron", "c")
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryOpenEvent) {

From e657a74d8ef21bfc05873b5a2dcd73b6c1b8503f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 7 Sep 2024 21:22:12 +0200
Subject: [PATCH 400/721] code cleanup

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
index d1c2d2c460b8..286166ee7c0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
@@ -79,6 +79,7 @@ object CompactExperimentRewards {
             val reward = group("reward")
 
             gainedRewards.add(reward)
+            // TODO check price and only block when below x coins (user option)
             event.blockedReason = "COMPACT_REWARDS"
 
             DelayedRun.runDelayed(100.milliseconds) {

From 321188e2828284484718a78ecaf9e7a98905d658 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 7 Sep 2024 21:32:20 +0200
Subject: [PATCH 401/721] Backend: Cleanup Forge Gfs (#2434)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/ForgeGfs.kt      | 29 ++++++-------------
 .../skyhanni/utils/CollectionUtils.kt         |  4 +++
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |  4 +--
 .../skyhanni/utils/PrimitiveItemStack.kt      |  4 ++-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
index 28f117832f5e..995198674334 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
@@ -8,12 +8,13 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
-import at.hannibal2.skyhanni.utils.ItemUtils.itemNameWithoutColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.player.inventory.ContainerLocalMenu
@@ -78,27 +79,15 @@ object ForgeGfs {
         // Search for the first 4 columns only
         // Normally would be 3, but the gemstone mixture is the only one that overflows to 4
 
-        for (i in 0..53) {
-            if (i % 9 <= 3) {
-                val currentItem = event.container.getSlot(i).stack
-                val amount = currentItem.stackSize
-                val currItemInternalName = currentItem.getInternalNameOrNull() ?: continue
-                if (SackAPI.sackListInternalNames.contains(currItemInternalName.asString())) {
-                    itemMap.addAndFold(currItemInternalName, amount)
-                }
+        for (i in CollectionUtils.takeColumn(0, 53, 0, 4)) {
+            val currentItem = event.container.getSlot(i).stack
+            val currItemInternalName = currentItem.getInternalNameOrNull() ?: continue
+            if (SackAPI.sackListInternalNames.contains(currItemInternalName.asString())) {
+                itemMap.addOrPut(currItemInternalName, currentItem.stackSize)
             }
         }
 
-        for ((internalName, amount) in itemMap) {
-            val getItYet = GetFromSackAPI.getFromSack(internalName, amount)
-            if (!getItYet) {
-                ChatUtils.chat("§cFailed to get $amount ${internalName.itemNameWithoutColor} from sacks.")
-            }
-        }
-    }
-
-    private fun MutableMap<NEUInternalName, Int>.addAndFold(key: NEUInternalName, value: Int) {
-        this[key] = this.getOrDefault(key, 0) + value
+        GetFromSackAPI.getFromSack(itemMap.map { it.key.makePrimitiveStack(it.value) })
     }
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.forgeGfs
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 9590ba5c1f78..56bdcfabd933 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -288,6 +288,10 @@ object CollectionUtils {
         add(Renderable.itemStack(itemStack, scale = scale))
     }
 
+    fun takeColumn(start: Int, end: Int, startColumn: Int, endColumn: Int, rowSize: Int = 9) =
+        generateSequence(start) { it + 1 }.map { (it / (endColumn - startColumn)) * rowSize + (it % (endColumn - startColumn)) + startColumn }
+            .takeWhile { it <= end }
+
     fun MutableList<Renderable>.addItemStack(internalName: NEUInternalName) {
         addItemStack(internalName.getItemStack())
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index c271ef66c659..81eb2968cce3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -14,9 +14,9 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.isInt
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemId
 import at.hannibal2.skyhanni.utils.json.BaseGsonBuilder
 import at.hannibal2.skyhanni.utils.json.fromJson
-import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemId
 import at.hannibal2.skyhanni.utils.system.PlatformUtils
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
@@ -343,7 +343,7 @@ object NEUItems {
             val id = current.first
             return if (current.second > 1) {
                 val child = getPrimitiveMultiplier(id, tryCount + 1)
-                val result = child.multiply(current.second)
+                val result = child * current.second
                 multiplierCache[internalName] = result
                 result
             } else {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
index 2173fcc8ffc3..52faaba30066 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
@@ -9,7 +9,9 @@ data class PrimitiveItemStack(val internalName: NEUInternalName, val amount: Int
 
     fun createItem(): ItemStack = internalName.getItemStack().apply { stackSize = amount }
 
-    fun multiply(multiplier: Int): PrimitiveItemStack = PrimitiveItemStack(internalName, amount * multiplier)
+    operator fun times(multiplier: Int): PrimitiveItemStack = PrimitiveItemStack(internalName, amount * multiplier)
+
+    operator fun plus(amount: Int): PrimitiveItemStack = PrimitiveItemStack(internalName, this.amount + amount)
 
     val itemName by lazy { internalName.itemName }
 

From b0b2d42b999ebf8ebb41ad48a54f52ce1315d1dd Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sat, 7 Sep 2024 21:34:20 +0200
Subject: [PATCH 402/721] Improvement: Make pest middle waypoint optional
 (#2469)

---
 .../config/features/garden/pests/PestWaypointConfig.java  | 8 ++++++++
 .../skyhanni/features/garden/pests/PestParticleLine.kt    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestWaypointConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestWaypointConfig.java
index 0462554689f3..58ba1892273a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestWaypointConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestWaypointConfig.java
@@ -33,6 +33,14 @@ public class PestWaypointConfig {
     @ConfigEditorBoolean
     public boolean drawLine = true;
 
+    @Expose
+    @ConfigOption(
+        name = "Show Middle",
+        desc = "Also show a waypoint to the middle of a plot. This can help determine if the tracker is pointing to the middle instead of a pest."
+    )
+    @ConfigEditorBoolean
+    public boolean showMiddle = false;
+
     @Expose
     @ConfigOption(
         name = "Show For Seconds",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
index e81486ecd944..ff9af9cff523 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
@@ -94,6 +94,7 @@ object PestParticleLine {
     }
 
     private fun showMiddle(event: LorenzRenderWorldEvent) {
+        if (!config.showMiddle) return
         if (locations.size <= 0) return
         val plot = GardenPlotAPI.getCurrentPlot() ?: return
         val middle = plot.middle.copy(y = LocationUtils.playerLocation().y)

From 988807120f71bafe20d63b8beeb8fac244065219 Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Sat, 7 Sep 2024 21:26:59 +0100
Subject: [PATCH 403/721] Feature: Arachne kill timer (#1993)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/combat/MobsConfig.java    |  9 ++
 .../features/chat/ArachneChatMessageHider.kt  |  4 +-
 .../features/combat/mobs/ArachneKillTimer.kt  | 88 +++++++++++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
index f51076360dc2..fc46880fc538 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java
@@ -89,6 +89,15 @@ public class MobsConfig {
     @FeatureToggle
     public boolean showArachneSpawnTimer = true;
 
+    @Expose
+    @ConfigOption(
+        name = "Arachne Kill Timer", desc = "Shows how long it took to kill Arachne after the fight ends. " +
+        "§cDoes not show if you were not in the Sanctuary when it spawned."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean arachneKillTimer = true;
+
     @Expose
     @ConfigOption(name = "Enderman TP Hider", desc = "Stops the Enderman Teleportation animation.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
index 5bf5b34489a1..846458456ad1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
@@ -17,11 +17,11 @@ object ArachneChatMessageHider {
     private var hideArachneDeadMessage = false
 
     private val patternGroup = RepoPattern.group("chat.arachne")
-    private val arachneCallingPattern by patternGroup.pattern(
+    val arachneCallingPattern by patternGroup.pattern(
         "calling",
         "§4☄ §r.* §r§eplaced an §r§9Arachne's Calling§r§e!.*"
     )
-    private val arachneCrystalPattern by patternGroup.pattern(
+    val arachneCrystalPattern by patternGroup.pattern(
         "crystal",
         "§4☄ §r.* §r§eplaced an Arachne Crystal! Something is awakening!"
     )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt
new file mode 100644
index 000000000000..d4980ec506f4
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt
@@ -0,0 +1,88 @@
+package at.hannibal2.skyhanni.features.combat.mobs
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.features.chat.ArachneChatMessageHider
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
+
+@SkyHanniModule
+object ArachneKillTimer {
+
+    private val config get() = SkyHanniMod.feature.combat.mobs
+
+    private val patternGroup = RepoPattern.group("chat.arachne")
+
+    /**
+     * REGEX-TEST: §c[BOSS] Arachne§r§f: A befitting welcome!
+     */
+    private val arachneCallingSpawnedPattern by patternGroup.pattern(
+        "calling.spawned",
+        "§c\\[BOSS] Arachne§r§f: A befitting welcome!"
+    )
+    /**
+     * REGEX-TEST: §c[BOSS] Arachne§r§f: With your sacrifice.
+     */
+    private val arachneCrystalSpawnedPattern by patternGroup.pattern(
+        "crystal.spawned",
+        "§c\\[BOSS] Arachne§r§f: With your sacrifice."
+    )
+    /**
+     * REGEX-TEST: §f                              §r§6§lARACHNE DOWN!
+     */
+    private val arachneDeathPattern by patternGroup.pattern(
+        "dead",
+        "§f.*§r§6§lARACHNE DOWN!"
+    )
+    /**
+     * REGEX-TEST: §f                 §r§eYour Damage: §r§a1,155,000 §r§7(Position #1)
+     */
+    private val arachneDamagePattern by patternGroup.pattern(
+        "damage",
+        "§f +§r§eYour Damage: §r§a[0-9,]+ §r§7\\(Position #[0-9,]+\\)"
+    )
+
+    private var arachneSpawnedTime = SimpleTimeMark.farPast()
+    private var arachneKillTime = Duration.ZERO
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        if (arachneCallingSpawnedPattern.matches(event.message) || arachneCrystalSpawnedPattern.matches(event.message)) {
+            arachneSpawnedTime = SimpleTimeMark.now()
+        }
+
+        if (arachneDeathPattern.matches(event.message) && arachneSpawnedTime != SimpleTimeMark.farPast()) {
+            arachneKillTime = arachneSpawnedTime.passedSince()
+        }
+
+        if (ArachneChatMessageHider.arachneCallingPattern.matches(event.message) ||
+            ArachneChatMessageHider.arachneCrystalPattern.matches(event.message)
+        ) {
+            arachneSpawnedTime = SimpleTimeMark.farPast()
+        }
+
+        if (arachneKillTime.isPositive() && arachneDamagePattern.matches(event.message)) {
+            val format = arachneKillTime.format(showMilliSeconds = true)
+            ChatUtils.chat("                   §eArachne took §b$format§e seconds to kill.", prefix = false)
+            arachneKillTime = Duration.ZERO
+            arachneSpawnedTime = SimpleTimeMark.farPast()
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        arachneSpawnedTime = SimpleTimeMark.farPast()
+    }
+
+    fun isEnabled() = IslandType.SPIDER_DEN.isInIsland() && config.arachneKillTimer
+}

From ae587b6cb7964fbe36a7d70f4b5c944a1671225f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 7 Sep 2024 22:28:35 +0200
Subject: [PATCH 404/721] Docs: diana burrow logic in discord FAQ (#2473)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 docs/DISCORD_FAQ.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md
index e937ca4030a0..72c1aefb31a7 100644
--- a/docs/DISCORD_FAQ.md
+++ b/docs/DISCORD_FAQ.md
@@ -63,6 +63,11 @@ _Frequently Asked Questions_
 > If you are using [Patcher](https://sk1er.club/mods/patcher) or [PolyPatcher](https://modrinth.com/mod/patcher) and the vanilla scoreboard is flickering, disable the "HUD Caching" option.
 > If you don't use any of these mods, make sure the option to "Hide Vanilla Scoreboard" is actually enabled.
 
+> **13: Why doesn't the burrow warp key and line prioritize my guess waypoint when there are known burrows nearby?**
+> This is intended behavior. SkyHanni prioritizes the closest known burrow or guess waypoint, not necessarily the guess waypoint itself. Focusing on the closest point, even if it's a known burrow and not your guess, is faster and leads to a higher "burrows dug over time" rate, meaning more mobs, more inquisitors, more money and faster milestones. 
+> While interrupting your current chain to focus on a nearby burrow might feel counterintuitive, it ultimately benefits you in the long run. 
+> The existing chain isn't reset, and you gain the advantage of a higher burrow digging rate.
+
 
 *This FAQ was last updated on August 26th, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*

From 88416edd2f5a50e1ba88e9adb574e3c60c49abca Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 7 Sep 2024 23:00:02 +0200
Subject: [PATCH 405/721] Feature: Rift time Nametag Format (#2015)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/rift/RiftTimerConfig.java |  6 +++++
 .../at/hannibal2/skyhanni/data/EntityData.kt  | 10 ++++++++
 .../events/entity/EntityHealthDisplayEvent.kt |  5 ++++
 .../features/rift/everywhere/RiftTimer.kt     | 24 +++++++++++++++++--
 .../transformers/MixinRenderPlayer.java       | 23 ++++++++++++++++++
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderPlayer.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftTimerConfig.java
index 679a01aa32db..c2db26b8e176 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftTimerConfig.java
@@ -30,4 +30,10 @@ public class RiftTimerConfig {
     @ConfigLink(owner = RiftTimerConfig.class, field = "enabled")
     public Position timerPosition = new Position(10, 10, false, true);
 
+    @Expose
+    @ConfigOption(name = "Nametag Format", desc = "Format the remaining rift time for other players in their nametag.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean nametag = true;
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
index c4e5fd7e76db..d2f81a6d8191 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.entity.EntityDisplayNameEvent
+import at.hannibal2.skyhanni.events.entity.EntityHealthDisplayEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.EntityUtils
@@ -32,6 +33,7 @@ object EntityData {
 
     private val maxHealthMap = mutableMapOf<EntityLivingBase, Int>()
     private val nametagCache = TimeLimitedCache<Entity, ChatComponentText>(50.milliseconds)
+    private val healthDisplayCache = TimeLimitedCache<String, String>(50.milliseconds)
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -103,4 +105,12 @@ object EntityData {
         event.postAndCatch()
         event.chatComponent
     }
+
+    @JvmStatic
+    fun getHealthDisplay(text: String) = healthDisplayCache.getOrPut(text) {
+        val event = EntityHealthDisplayEvent(text)
+        event.postAndCatch()
+        event.text
+    }
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt
new file mode 100644
index 000000000000..5657dc2c83da
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt
@@ -0,0 +1,5 @@
+package at.hannibal2.skyhanni.events.entity
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+
+class EntityHealthDisplayEvent(var text: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
index a4d277cebf8d..21f13c1560ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
@@ -4,11 +4,13 @@ import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.entity.EntityHealthDisplayEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -23,11 +25,20 @@ object RiftTimer {
 
     private val config get() = RiftAPI.config.timer
 
-    private val timePattern by RepoPattern.pattern(
-        "rift.everywhere.timer",
+    private val repoGroup = RepoPattern.group("rift.everywhere")
+    private val timePattern by repoGroup.pattern(
+        "timer",
         "§(?<color>[a7])(?<time>.*)ф Left.*"
     )
 
+    /**
+     * REGEX-TEST: 3150 §aф
+     */
+    private val nametagPattern by repoGroup.pattern(
+        "nametag.timer",
+        "(?<time>\\d+) §aф"
+    )
+
     private var display = emptyList<String>()
     private var maxTime = 0.seconds
     private var currentTime = 0.seconds
@@ -117,5 +128,14 @@ object RiftTimer {
         config.timerPosition.renderStrings(display, posLabel = "Rift Timer")
     }
 
+    @SubscribeEvent
+    fun onEntityHealthDisplay(event: EntityHealthDisplayEvent) {
+        if (!RiftAPI.inRift() || !config.nametag) return
+        val time = nametagPattern.matchMatcher(event.text) {
+            group("time")?.toIntOrNull()
+        } ?: return
+        event.text = "${time.seconds.format()} §aф"
+    }
+
     fun isEnabled() = RiftAPI.inRift() && config.enabled
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderPlayer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderPlayer.java
new file mode 100644
index 000000000000..7a5dad63bb72
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderPlayer.java
@@ -0,0 +1,23 @@
+package at.hannibal2.skyhanni.mixins.transformers;
+
+import at.hannibal2.skyhanni.data.EntityData;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(RenderPlayer.class)
+public class MixinRenderPlayer {
+
+    @ModifyArg(
+        method = "renderOffsetLivingLabel(Lnet/minecraft/client/entity/AbstractClientPlayer;DDDLjava/lang/String;FD)V",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/client/renderer/entity/RenderPlayer;renderLivingLabel(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V"
+        ),
+        index = 1
+    )
+    private String modifyRenderLivingLabelArgs(String string) {
+        return EntityData.getHealthDisplay(string);
+    }
+}

From d09480c3d272f270fb1b45c51bc3540b5416c09a Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 8 Sep 2024 07:03:51 +1000
Subject: [PATCH 406/721] Backend: Use on DelayedRun to add scheduled tasks
 (#2462)

---
 .../hannibal2/skyhanni/data/FixedRateTimerManager.kt |  6 +++---
 .../at/hannibal2/skyhanni/data/repo/RepoManager.kt   |  4 ++--
 .../skyhanni/features/misc/update/UpdateManager.kt   |  6 +++---
 .../skyhanni/test/hotswap/HotswapSupportImpl.kt      |  4 ++--
 .../java/at/hannibal2/skyhanni/utils/DelayedRun.kt   | 12 ++++++++++++
 .../java/at/hannibal2/skyhanni/utils/SoundUtils.kt   |  6 +++---
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt
index 4d825b2e9b9d..36dc3c6f0b24 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.client.Minecraft
 import kotlin.concurrent.fixedRateTimer
 
 @SkyHanniModule
@@ -12,8 +12,8 @@ object FixedRateTimerManager {
 
     init {
         fixedRateTimer(name = "skyhanni-fixed-rate-timer-manager", period = 1000L) {
-            Minecraft.getMinecraft().addScheduledTask {
-                if (!LorenzUtils.onHypixel) return@addScheduledTask
+            DelayedRun.onThread.execute {
+                if (!LorenzUtils.onHypixel) return@execute
                 SecondPassedEvent(totalSeconds).postAndCatch()
                 totalSeconds++
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index 79d329f2207a..551f4469947a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -7,12 +7,12 @@ import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
 import at.hannibal2.skyhanni.utils.chat.Text.send
 import com.google.gson.JsonObject
-import net.minecraft.client.Minecraft
 import net.minecraft.util.IChatComponent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.apache.commons.io.FileUtils
@@ -169,7 +169,7 @@ class RepoManager(private val configLocation: File) {
         val comp = CompletableFuture<Void?>()
         if (!atomicShouldManuallyReload.get()) return comp
         ErrorManager.resetCache()
-        Minecraft.getMinecraft().addScheduledTask {
+        DelayedRun.onThread.execute {
             error = false
             successfulConstants.clear()
             unsuccessfulConstants.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
index fae931ff2598..040b6741a847 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
@@ -7,10 +7,10 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import com.google.gson.JsonElement
 import io.github.moulberry.notenoughupdates.util.ApiUtil
-import io.github.moulberry.notenoughupdates.util.MinecraftExecutor
 import io.github.notenoughupdates.moulconfig.observer.Property
 import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor
 import moe.nea.libautoupdate.CurrentVersion
@@ -113,7 +113,7 @@ object UpdateManager {
                 } else if (forceDownload) {
                     ChatUtils.chat("§aSkyHanni didn't find a new update.")
                 }
-            }, MinecraftExecutor.OnThread)
+            }, DelayedRun.onThread)
     }
 
     fun queueUpdate() {
@@ -130,7 +130,7 @@ object UpdateManager {
             potentialUpdate!!.executePreparedUpdate()
             ChatUtils.chat("Download of update complete. ")
             ChatUtils.chat("§aThe update will be installed after your next restart.")
-        }, MinecraftExecutor.OnThread)
+        }, DelayedRun.onThread)
     }
 
     private val context = UpdateContext(
diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
index a42a10faf858..6e497efcae3e 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
@@ -2,12 +2,12 @@ package at.hannibal2.skyhanni.test.hotswap
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
 import at.hannibal2.skyhanni.utils.ReflectionUtils.removeFinal
 import moe.nea.hotswapagentforge.forge.ClassDefinitionEvent
 import moe.nea.hotswapagentforge.forge.HotswapEvent
 import moe.nea.hotswapagentforge.forge.HotswapFinishedEvent
-import net.minecraft.client.Minecraft
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -22,7 +22,7 @@ class HotswapSupportImpl : HotswapSupportHandle {
     fun onHotswapClass(event: ClassDefinitionEvent.Redefinition) {
         val instance = SkyHanniMod.modules.find { it.javaClass.name == event.fullyQualifiedName } ?: return
         val primaryConstructor = runCatching { instance.javaClass.getDeclaredConstructor() }.getOrNull()
-        Minecraft.getMinecraft().addScheduledTask {
+        DelayedRun.onThread.execute {
             ChatUtils.chat("Refreshing event subscriptions for module $instance!")
             MinecraftForge.EVENT_BUS.unregister(instance)
             if (primaryConstructor == null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt b/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
index eb83bce3aff2..4642124b7003 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
@@ -2,7 +2,9 @@ package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.drainTo
+import net.minecraft.client.Minecraft
 import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.Executor
 import kotlin.time.Duration
 
 object DelayedRun {
@@ -35,4 +37,14 @@ object DelayedRun {
         }
         futureTasks.drainTo(tasks)
     }
+
+    @JvmField
+    val onThread = Executor {
+        val mc = Minecraft.getMinecraft()
+        if (mc.isCallingFromMinecraftThread) {
+            it.run()
+        } else {
+            Minecraft.getMinecraft().addScheduledTask(it)
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
index 79e320949067..f001cfadba17 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
@@ -19,8 +19,8 @@ object SoundUtils {
     val centuryActiveTimerAlert by lazy { createSound("skyhanni:centurytimer.active", 1f) }
 
     fun ISound.playSound() {
-        Minecraft.getMinecraft().addScheduledTask {
-            if (Minecraft.getMinecraft().soundHandler.isSoundPlaying(this)) return@addScheduledTask
+        DelayedRun.onThread.execute {
+            if (Minecraft.getMinecraft().soundHandler.isSoundPlaying(this)) return@execute
             val gameSettings = Minecraft.getMinecraft().gameSettings
             val oldLevel = gameSettings.getSoundLevel(SoundCategory.PLAYERS)
             if (!SkyHanniMod.feature.misc.maintainGameVolume) {
@@ -33,7 +33,7 @@ object SoundUtils {
                     e.message?.let {
                         if (it.startsWith("value already present:")) {
                             println("SkyHanni Sound error: $it")
-                            return@addScheduledTask
+                            return@execute
                         }
                     }
                 }

From bb625d127fbbf14c780d57b0bda798503778f201 Mon Sep 17 00:00:00 2001
From: Not a cow <104355555+Not-a-cowfr@users.noreply.github.com>
Date: Sat, 7 Sep 2024 14:07:09 -0700
Subject: [PATCH 407/721] Improvement: Added parkour and teleport messages to
 blockable messages (#2348)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/chat/FilterTypesConfig.java      | 12 +++++
 .../skyhanni/features/chat/ChatFilter.kt      | 44 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
index 8898ab68a957..b2fb03d76c80 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
@@ -117,6 +117,18 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean hideAlphaAchievements = false;
 
+    @Expose
+    @ConfigOption(name = "Hide Parkour", desc = "Hide parkour messages (starting, stopping, reaching a milestone).")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideParkour = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Teleport Pads", desc = "Hide annoying messages when using teleport pads.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideTeleportPads = false;
+
     //TODO remove
     @Expose
     @ConfigOption(name = "Others", desc = "Hide other annoying messages.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index ada41bab44a1..0e23fbb791bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -406,6 +406,42 @@ object ChatFilter {
         "§e§k.§a>> {3}§aAchievement Unlocked: .* {3}<<§e§k.".toPattern(),
     )
 
+    /**
+     * REGEX-TEST: §aStarted parkour cocoa!
+     * REGEX-TEST: §aFinished parkour cocoa in 12:34.567
+     * REGEX-TEST: §aReached checkpoint #4 for parkour cocoa!
+     * REGEX-TEST: §4Wrong checkpoint for parkour cocoa!
+     * REGEX-TEST: §4You haven't reached all checkpoints for parkour cocoa!
+     */
+    private val parkourPatterns = listOf(
+        "§aStarted parkour (.*)!".toPattern(),
+        "§aFinished parkour (.*) in (.*)!".toPattern(),
+        "§aReached checkpoint #(.*) for parkour (.*)!".toPattern(),
+        "§4Wrong checkpoint for parkour (.*)!".toPattern(),
+        "§4You haven't reached all checkpoints for parkour (.*)!".toPattern(),
+    )
+
+    /**
+     * REGEX-TEST: §4Cancelled parkour! You cannot fly.
+     * REGEX-TEST: §4Cancelled parkour! You cannot use item abilities.
+     * REGEX-TEST: §4Cancelled parkour!
+     */
+    private val parkourCancelMessages = listOf(
+        "§4Cancelled parkour! You cannot fly.",
+        "§4Cancelled parkour! You cannot use item abilities.",
+        "§4Cancelled parkour!",
+    )
+
+    // §r§aWarped from the tppadone §r§ato the tppadtwo§r§a!
+    private val teleportPadPatterns = listOf(
+        "§aWarped from the (.*) §r§ato the (.*)§r§a!".toPattern(),
+    )
+
+    // §r§4This Teleport Pad does not have a destination set!
+    private val teleportPadMessages = listOf(
+        "§4This Teleport Pad does not have a destination set!"
+    )
+
     private val patternsMap: Map<String, List<Pattern>> = mapOf(
         "lobby" to lobbyPatterns,
         "warping" to warpingPatterns,
@@ -428,6 +464,8 @@ object ChatFilter {
         "solo_stats" to soloStatsPatterns,
         "fairy" to fairyPatterns,
         "achievement_get" to achievementGetPatterns,
+        "parkour" to parkourPatterns,
+        "teleport_pads" to teleportPadPatterns,
     )
 
     private val messagesMap: Map<String, List<String>> = mapOf(
@@ -447,10 +485,14 @@ object ChatFilter {
         "fire_sale" to fireSaleMessages,
         "event" to eventMessage,
         "skymall" to skymallMessages,
+        "parkour" to parkourCancelMessages,
+        "teleport_pads" to teleportPadMessages,
     )
+
     private val messagesContainsMap: Map<String, List<String>> = mapOf(
         "lobby" to lobbyMessagesContains,
     )
+
     private val messagesStartsWithMap: Map<String, List<String>> = mapOf(
         "slayer" to slayerMessageStartWith,
         "profile_join" to profileJoinMessageStartsWith,
@@ -478,6 +520,8 @@ object ChatFilter {
         config.guildExp && message.isPresent("guild_exp") -> "guild_exp"
         config.killCombo && message.isPresent("kill_combo") -> "kill_combo"
         config.profileJoin && message.isPresent("profile_join") -> "profile_join"
+        config.hideParkour && message.isPresent("parkour") -> "parkour"
+        config.hideTeleportPads && message.isPresent("teleport_pads") -> "teleport_pads"
 
         config.hideAlphaAchievements && HypixelData.hypixelAlpha && message.isPresent("achievement_get") -> "achievement_get"
 

From 270788e2ee876450f62a63197cb8914a803f5cc4 Mon Sep 17 00:00:00 2001
From: saga <45262877+saga-00@users.noreply.github.com>
Date: Sat, 7 Sep 2024 18:15:06 -0300
Subject: [PATCH 408/721] Feature: Notifications for Non God Pot Effects almost
 ending (#2004)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/misc/MiscConfig.java      |  3 +-
 .../features/misc/PotionEffectsConfig.java    | 25 ++++++++++
 .../features/misc/NonGodPotEffectDisplay.kt   | 50 +++++++++++--------
 3 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index d27d3a0e39f2..a06055f97afe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -48,8 +48,9 @@ public class MiscConfig {
     public HideArmorConfig hideArmor2 = new HideArmorConfig();
 
     @Expose
-    @ConfigOption(name = "Potion Effects", desc = "")
+    @ConfigOption(name = "Non-God Pot Effects", desc = "")
     @Accordion
+    // TODO rename nonGodPotEffect
     public PotionEffectsConfig potionEffect = new PotionEffectsConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/PotionEffectsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/PotionEffectsConfig.java
index 6ead171864ad..34af9fbf208f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/PotionEffectsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/PotionEffectsConfig.java
@@ -4,6 +4,7 @@
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
@@ -20,7 +21,31 @@ public class PotionEffectsConfig {
     @FeatureToggle
     public boolean nonGodPotEffectShowMixins = false;
 
+    @Expose
+    @ConfigOption(name = "Expire Warning", desc = "Sends a title when one of the Non God Pot Effects is expiring.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean expireWarning = false;
+
+    @Expose
+    @ConfigOption(name = "Expire Sound", desc = "Makes a sound when one of the Non God Pot Effects is expiring.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean expireSound = false;
+
+    @Expose
+    @ConfigOption(
+        name = "Expire Warning Time",
+        desc = "Change the time in seconds before the potion expries to warn you.")
+    @ConfigEditorSlider(
+        minValue = 30,
+        maxValue = 300,
+        minStep = 5
+    )
+    public int expireWarnTime = 30;
+
     @Expose
     @ConfigLink(owner = PotionEffectsConfig.class, field = "nonGodPotEffectDisplay")
+    // TODO rename position
     public Position nonGodPotEffectPos = new Position(10, 10, false, true);
 }
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 7f077588980e..89db21304472 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.SoundUtils.playPlingSound
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -80,7 +81,7 @@ object NonGodPotEffectDisplay {
 
     private val effectsCountPattern by RepoPattern.pattern(
         "misc.nongodpot.effects",
-        "§7You have §e(?<name>\\d+) §7non-god effects\\."
+        "§7You have §e(?<name>\\d+) §7non-god effects\\.",
     )
     private var totalEffectsCount = 0
 
@@ -181,7 +182,19 @@ object NonGodPotEffectDisplay {
         if (!isEnabled()) return
         if (!ProfileStorageData.loaded) return
 
-        update()
+        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
@@ -199,22 +212,18 @@ object NonGodPotEffectDisplay {
             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")
-                    ) {
-                        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()
+                    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()
                 }
             }
         }
@@ -258,13 +267,13 @@ object NonGodPotEffectDisplay {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
-        if (!isEnabled()) return
+        if (!isEnabled() || !config.nonGodPotEffectDisplay) return
         if (RiftAPI.inRift()) return
 
         config.nonGodPotEffectPos.renderStrings(
             display,
             extraSpace = 3,
-            posLabel = "Non God Pot Effects"
+            posLabel = "Non God Pot Effects",
         )
     }
 
@@ -275,6 +284,5 @@ object NonGodPotEffectDisplay {
         event.move(3, "misc.nonGodPotEffectPos", "misc.potionEffect.nonGodPotEffectPos")
     }
 
-    private fun isEnabled() =
-        LorenzUtils.inSkyBlock && config.nonGodPotEffectDisplay && !DungeonAPI.inDungeon() && !LorenzUtils.inKuudraFight
+    private fun isEnabled() = LorenzUtils.inSkyBlock && !DungeonAPI.inDungeon() && !LorenzUtils.inKuudraFight
 }

From 5ac091a11d558717eb42106bcad35d23653dab5d Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sun, 8 Sep 2024 09:06:01 +0200
Subject: [PATCH 409/721] Fix: Heavy Pearls sometimes not detected (#2479)

---
 .../java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt   | 2 +-
 src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
index ef0f4bff916a..2acbe3546117 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
@@ -121,7 +121,7 @@ object IslandExceptions {
         armorStand: EntityArmorStand?,
         nextEntity: EntityLivingBase?,
     ) = when {
-        baseEntity is EntitySlime && armorStand?.name == "§f§lCOLLECT!" ->
+        baseEntity is EntitySlime && MobFilter.heavyPearlPattern.matches(armorStand?.name) ->
             MobData.MobResult.found(
                 MobFactories.special(baseEntity, "Heavy Pearl"),
             )
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
index da8699bca2fb..a9f8a14533ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@@ -103,6 +103,10 @@ object MobFilter {
         "pattern.summon.owner",
         ".*Spawned by: (?<name>.*).*",
     )
+    val heavyPearlPattern by repoGroup.pattern(
+        "pattern.heavypearl.collect",
+        "§.§lCOLLECT!",
+    )
 
     /**
      * REGEX-TEST: §8[§7Lv1§8] §5Horse

From 9352ace3e97c92645b176f88b6cef6e638121b95 Mon Sep 17 00:00:00 2001
From: Jordan <77755681+Jordyrat@users.noreply.github.com>
Date: Sun, 8 Sep 2024 08:21:14 +0100
Subject: [PATCH 410/721] Improvement: Powder Tracker revamped (#2394)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/api/HotmAPI.kt | 14 +++---
 .../storage/ProfileSpecificStorage.java       |  2 +-
 .../at/hannibal2/skyhanni/data/HotmData.kt    | 43 +++++++++++++++----
 .../skyhanni/events/mining/PowderGainEvent.kt |  6 +++
 .../customscoreboard/ScoreboardElements.kt    |  2 +-
 .../mining/powdertracker/PowderTracker.kt     | 25 +++++++++--
 6 files changed, 72 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/mining/PowderGainEvent.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
index 39305a012af1..97e041a89475 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
@@ -2,12 +2,14 @@ package at.hannibal2.skyhanni.api
 
 import at.hannibal2.skyhanni.data.HotmData
 import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.mining.PowderGainEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getDrillUpgrades
-import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.item.ItemStack
@@ -30,7 +32,7 @@ object HotmAPI {
             }
         } == true
 
-    enum class Powder(val displayName: String, val color: String) {
+    enum class PowderType(val displayName: String, val color: String) {
         MITHRIL("Mithril", "§2"),
         GEMSTONE("Gemstone", "§d"),
         GLACITE("Glacite", "§b"),
@@ -71,9 +73,11 @@ object HotmAPI {
         }
 
         /** Use when new powder gets collected*/
-        fun gain(value: Long) {
-            addTotal(value)
-            addCurrent(value)
+        fun gain(difference: Long) {
+            ChatUtils.debug("Gained §a${difference.addSeparators()} §e${displayName} Powder")
+            addTotal(difference)
+            addCurrent(difference)
+            PowderGainEvent(this, difference).post()
         }
 
         fun reset() {
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 e7a7565bb0ee..794819cf1c5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -534,7 +534,7 @@ public static class MiningConfig {
         public HotmTree hotmTree = new HotmTree();
 
         @Expose
-        public Map<HotmAPI.Powder, PowderStorage> powder = new HashMap<>();
+        public Map<HotmAPI.PowderType, PowderStorage> powder = new HashMap<>();
 
         public static class PowderStorage {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index e82ddd4aebea..0392eab25af8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.api.HotmAPI.MayhemPerk
 import at.hannibal2.skyhanni.api.HotmAPI.SkymallPerk
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.jsonobjects.local.HotmTree
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -12,6 +13,7 @@ import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
@@ -23,7 +25,6 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 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.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.indexOfFirstMatch
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
@@ -475,6 +476,15 @@ enum class HotmData(
             "§b§lMAYHEM! §r§7(?<perk>.*)",
         )
 
+        /**
+         * REGEX-TEST:  Mithril: §r§299,918
+         * REGEX-TEST:  Gemstone: §r§d37,670
+         */
+        private val powderPattern by patternGroup.pattern(
+            "widget.powder",
+            "\\s*(?<type>\\w+): (?:§.)+(?<amount>[\\d,.]+)"
+        )
+
         var inInventory = false
 
         var tokens: Int
@@ -493,7 +503,7 @@ enum class HotmData(
 
         init {
             entries.forEach { it.guiNamePattern }
-            HotmAPI.Powder.entries.forEach {
+            HotmAPI.PowderType.entries.forEach {
                 it.heartPattern
                 it.resetPattern
             }
@@ -527,7 +537,7 @@ enum class HotmData(
             it.rawLevel = 0
             it.enabled = false
             it.isUnlocked = false
-            HotmAPI.Powder.entries.forEach { it.setCurrent(it.getTotal()) }
+            HotmAPI.PowderType.entries.forEach { it.setCurrent(it.getTotal()) }
             availableTokens = tokens
         }
 
@@ -585,7 +595,7 @@ enum class HotmData(
             if (isHeartItem) { // Reset on the heart Item to remove duplication
                 tokens = 0
                 availableTokens = 0
-                HotmAPI.Powder.entries.forEach { it.reset() }
+                HotmAPI.PowderType.entries.forEach { it.reset() }
                 heartItem = this
             }
 
@@ -595,7 +605,7 @@ enum class HotmData(
 
             lore@ for (line in lore) {
 
-                HotmAPI.Powder.entries.forEach {
+                HotmAPI.PowderType.entries.forEach {
                     it.pattern(isHeartItem).matchMatcher(line) {
                         val powder = group("powder").replace(",", "").toLong()
                         if (isHeartItem) {
@@ -654,13 +664,12 @@ enum class HotmData(
             if (!LorenzUtils.inSkyBlock) return
 
             event.scoreboard.matchFirst(ScoreboardPattern.powderPattern) {
-                val type = HotmAPI.Powder.entries.firstOrNull { it.displayName == group("type") } ?: return
+                val type = HotmAPI.PowderType.entries.firstOrNull { it.displayName == group("type") } ?: return
                 val amount = group("amount").formatLong()
                 val difference = amount - type.getCurrent()
 
                 if (difference > 0) {
                     type.gain(difference)
-                    ChatUtils.debug("Gained §a${difference.addSeparators()} §e${type.displayName} Powder")
                 }
             }
         }
@@ -686,6 +695,22 @@ enum class HotmData(
             }
         }
 
+        @SubscribeEvent
+        fun onWidgetUpdate(event: WidgetUpdateEvent) {
+            if (!event.isWidget(TabWidget.POWDER)) return
+            event.lines.forEach {
+                powderPattern.matchMatcher(it) {
+                    val type = HotmAPI.PowderType.entries.firstOrNull { it.displayName == group("type") } ?: return
+                    val amount = group("amount").replace(",", "").toLong()
+                    val difference = amount - type.getCurrent()
+
+                    if (difference > 0) {
+                        type.gain(difference)
+                    }
+                }
+            }
+        }
+
         @SubscribeEvent
         fun onChat(event: LorenzChatEvent) {
             if (!LorenzUtils.inSkyBlock) return
@@ -733,7 +758,7 @@ enum class HotmData(
 
         @SubscribeEvent
         fun onProfileSwitch(event: ProfileJoinEvent) {
-            HotmAPI.Powder.entries.forEach {
+            HotmAPI.PowderType.entries.forEach {
                 if (it.getStorage() == null) {
                     ProfileStorageData.profileSpecific?.mining?.powder?.put(
                         it,
@@ -748,7 +773,7 @@ enum class HotmData(
             event.title("HotM")
             event.addIrrelevant {
                 add("Tokens : $availableTokens/$tokens")
-                HotmAPI.Powder.entries.forEach {
+                HotmAPI.PowderType.entries.forEach {
                     add("${it.displayName} Powder: ${it.getCurrent()}/${it.getTotal()}")
                 }
                 add("Ability: ${HotmAPI.activeMiningAbility?.printName}")
diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/PowderGainEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/PowderGainEvent.kt
new file mode 100644
index 000000000000..15bf3ee58119
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/mining/PowderGainEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.mining
+
+import at.hannibal2.skyhanni.api.HotmAPI
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class PowderGainEvent(val powder: HotmAPI.PowderType, val amount: Long) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index a58a7efc4a6a..369fca62e3c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -731,7 +731,7 @@ private fun getQuiverShowWhen(): Boolean {
 }
 
 private fun getPowderDisplayPair() = buildList {
-    val powderTypes = HotmAPI.Powder.values()
+    val powderTypes = HotmAPI.PowderType.values()
     if (informationFilteringConfig.hideEmptyLines && powderTypes.all { it.getTotal() == 0L }) {
         return listOf("<hidden>" to HorizontalAlignment.LEFT)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 69e93489f9c9..6edcac0a0f70 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.features.mining.powdertracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.HotmAPI
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
 import at.hannibal2.skyhanni.data.BossbarData
@@ -12,8 +14,10 @@ import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.mining.PowderGainEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -32,6 +36,7 @@ import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object PowderTracker {
@@ -192,13 +197,11 @@ object PowderTracker {
         }
 
         for (reward in PowderChestReward.entries) {
+            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) return
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
-                    var amount = groupOrNull("amount")?.formatLong() ?: 1
-                    if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder) {
-                        amount *= 2
-                    }
+                    val amount = groupOrNull("amount")?.formatLong() ?: 1
                     it.rewards[reward] = count + amount
                 }
             }
@@ -206,6 +209,20 @@ object PowderTracker {
         tracker.update()
     }
 
+    @HandleEvent(onlyOnIsland = IslandType.CRYSTAL_HOLLOWS)
+    fun onPowderGain(event: PowderGainEvent) {
+        if (lastChestPicked.passedSince() > 5.seconds) return
+        tracker.modify {
+            val reward = when (event.powder) {
+                HotmAPI.PowderType.GEMSTONE -> PowderChestReward.GEMSTONE_POWDER
+                HotmAPI.PowderType.MITHRIL -> PowderChestReward.MITHRIL_POWDER
+                else -> return@modify
+            }
+            it.rewards.addOrPut(reward, event.amount)
+        }
+        tracker.update()
+    }
+
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
         config.textFormat.afterChange {

From 3db3627ec03baa134940a92e596e591f2d88aa0c Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 8 Sep 2024 03:29:27 -0400
Subject: [PATCH 411/721] Feature: Hoppity Call Warning (#2272)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hoppity/HoppityCallWarningConfig.java     |  47 ++++++
 .../event/hoppity/HoppityEggsConfig.java      |   5 +
 .../event/hoppity/HoppityCallWarning.kt       | 155 ++++++++++++++++++
 .../skyhanni/utils/HypixelCommands.kt         |   4 +
 .../hannibal2/skyhanni/utils/StringUtils.kt   |   9 +
 5 files changed, 220 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityCallWarningConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityCallWarningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityCallWarningConfig.java
new file mode 100644
index 000000000000..6e4ccf027305
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityCallWarningConfig.java
@@ -0,0 +1,47 @@
+package at.hannibal2.skyhanni.config.features.event.hoppity;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.utils.OSUtils;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+import org.lwjgl.input.Keyboard;
+
+public class HoppityCallWarningConfig {
+
+    @Expose
+    @ConfigOption(name = "Hoppity Call Warning", desc = "Warn when hoppity is calling you.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(
+        name = "Accept Call Hotkey",
+        desc = "Accept the call from hoppity by pressing this keybind."
+    )
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int acceptHotkey = Keyboard.KEY_NONE;
+
+    @Expose
+    @ConfigOption(name = "Warning Sound", desc = "The sound that plays when hoppity calls.\n" +
+        "§eYou can use custom sounds, put it in the §bskyhanni/sounds §efolder in your resource pack.\n" +
+        "§eThen write §bskyhanni:yourfilename\n" +
+        "§cMust be a .ogg file")
+    @ConfigEditorText
+    public Property<String> hoppityCallSound = Property.of("note.pling");
+
+    @Expose
+    @ConfigOption(name = "Flash Color", desc = "Color of the screen when flashing")
+    @ConfigEditorColour
+    public String flashColor = "0:127:0:238:255";
+
+    @ConfigOption(name = "Sounds", desc = "Click to open the list of available sounds.")
+    @ConfigEditorButton(buttonText = "OPEN")
+    public Runnable sounds = () -> OSUtils.openBrowser("https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/mapping-and-modding-tutorials/2213619-1-8-all-playsound-sound-arguments");
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
index 50a5731a5571..c270dae8bbe7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
@@ -14,6 +14,11 @@
 
 public class HoppityEggsConfig {
 
+    @Expose
+    @ConfigOption(name = "Hoppity Abiphone Calls", desc = "")
+    @Accordion
+    public HoppityCallWarningConfig hoppityCallWarning = new HoppityCallWarningConfig();
+
     @Expose
     @ConfigOption(name = "Event Summary", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt
new file mode 100644
index 000000000000..57bc0975fac8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt
@@ -0,0 +1,155 @@
+package at.hannibal2.skyhanni.features.event.hoppity
+
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColorInt
+import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.StringUtils.isValidUuid
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.Gui
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.lwjgl.input.Keyboard
+import java.time.Instant
+import kotlin.math.sin
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object HoppityCallWarning {
+
+    /**
+     * Test messages (and the real ones from Hypixel) have a space at the end of
+     * them that the IDE kills. So it's "§r§e ✆ "
+     *
+     * REGEX-TEST: §e✆ §r§bHoppity§r§e ✆
+     * REGEX-TEST: §e✆ §r§aHoppity§r§e ✆
+     */
+    private val initHoppityCallPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "hoppity.call.init",
+        "§e✆ §r(?:§a|§b)Hoppity§r§e ✆.*",
+    )
+
+    /**
+     * REGEX-TEST: §a✆ RING... §r §r§2§l[PICK UP]
+     * REGEX-TEST: §a✆ RING... RING... §r §r§2§l[PICK UP]
+     * REGEX-TEST: §a✆ RING... RING... RING... §r §r§2§l[PICK UP]
+     * REGEX-TEST: §a✆ RING... RING... RING...
+     */
+    private val callRingPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "hoppity.call.ring",
+        "§a✆ (?:RING\\.{3} ?){1,3}(?:§r §r§2§l\\[PICK UP])?",
+    )
+
+    /**
+     * REGEX-TEST: §e[NPC] §aHoppity§f: §b✆ §f§rWhat's up, §boBlazin§f?
+     */
+    private val pickupHoppityCallPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "hoppity.call.pickup",
+        "§e\\[NPC] §aHoppity§f: §b✆ §f§rWhat's up, .*§f\\?",
+    )
+
+    private val config get() = HoppityEggsManager.config.hoppityCallWarning
+    private var warningSound = SoundUtils.createSound("note.pling", 1f)
+    private var activeWarning = false
+    private var nextWarningTime: Instant? = null
+    private var finalWarningTime: Instant? = null
+    private val callLength = 7.seconds
+    private var acceptUUID: String? = null
+
+    @SubscribeEvent
+    fun onKeyPress(event: LorenzKeyPressEvent) {
+        if (config.acceptHotkey == Keyboard.KEY_NONE || config.acceptHotkey != event.keyCode) return
+        acceptUUID?.let {
+            HypixelCommands.callback(acceptUUID!!)
+            acceptUUID = null
+        }
+    }
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        val soundProperty = config.hoppityCallSound
+        ConditionalUtils.onToggle(soundProperty) {
+            warningSound = SoundUtils.createSound(soundProperty.get(), 1f)
+        }
+        nextWarningTime = null
+        finalWarningTime = null
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    fun onChat(event: LorenzChatEvent) {
+        if (callRingPattern.matches(event.message) && acceptUUID == null) readPickupUuid(event)
+        if (!isEnabled()) return
+        if (initHoppityCallPattern.matches(event.message)) startWarningUser()
+        if (pickupHoppityCallPattern.matches(event.message)) stopWarningUser()
+    }
+
+    @SubscribeEvent
+    fun onTick(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        if (!activeWarning) return
+        if (nextWarningTime == null || finalWarningTime == null) return
+        val currentTime = Instant.now()
+        if (currentTime.isAfter(nextWarningTime)) {
+            SoundUtils.repeatSound(100, 10, warningSound)
+            nextWarningTime = currentTime.plusMillis(100)
+        }
+        if (currentTime >= finalWarningTime) stopWarningUser()
+    }
+
+    @SubscribeEvent
+    fun onRender(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled() || !activeWarning) return
+        val minecraft = Minecraft.getMinecraft()
+        // Calculate a fluctuating alpha value based on the sine of time, for a smooth oscillation
+        val randomizationAlphaDouble = ((2 + sin(Instant.now().toEpochMilli().toDouble() / 1000)) * 255 / 4)
+        // Ensure the alpha value is an integer and within the valid range (0-255)
+        val randomizationAlphaInt = randomizationAlphaDouble.toInt().coerceIn(0..255)
+        // Shift the alpha value 24 bits to the left to position it in the color's alpha channel.
+        val shiftedRandomAlpha = randomizationAlphaInt shl 24
+        Gui.drawRect(
+            0,
+            0,
+            minecraft.displayWidth,
+            minecraft.displayHeight,
+            // Apply the shifted alpha and combine it with the RGB components of flashColor.
+            shiftedRandomAlpha or (config.flashColor.toChromaColorInt() and 0xFFFFFF),
+        )
+        GlStateManager.color(1F, 1F, 1F, 1F)
+    }
+
+    private fun readPickupUuid(event: LorenzChatEvent) {
+        val siblings = event.chatComponent.siblings.takeIf { it.size >= 3 } ?: return
+        val clickEvent = siblings[2]?.chatStyle?.chatClickEvent ?: return
+        if (clickEvent.action.name.lowercase() != "run_command" || !clickEvent.value.lowercase().startsWith("/cb")) return
+        acceptUUID = clickEvent.value.lowercase().replace("/cb ", "").takeIf { it.isValidUuid() }
+        if (acceptUUID != null) DelayedRun.runDelayed(12.seconds) { acceptUUID = null }
+    }
+
+    private fun startWarningUser() {
+        if (activeWarning) return
+        activeWarning = true
+        SoundUtils.repeatSound(100, 10, warningSound)
+        val currentTime = Instant.now()
+        nextWarningTime = currentTime.plusMillis(100)
+        finalWarningTime = finalWarningTime ?: currentTime.plusMillis(callLength.inWholeMilliseconds)
+    }
+
+    private fun stopWarningUser() {
+        activeWarning = false
+        finalWarningTime = null
+        nextWarningTime = null
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
index c788d019a8b0..176afe8c0860 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@@ -150,6 +150,10 @@ object HypixelCommands {
         send("chatprompt $prompt")
     }
 
+    fun callback(uuid: String) {
+        send("cb $uuid")
+    }
+
     private fun send(command: String) {
         @Suppress("DEPRECATION")
         // TODO rename function
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 14e4a989f472..e1a01e5dfcba 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -561,4 +561,13 @@ object StringUtils {
     fun String.width(): Int = Minecraft.getMinecraft().fontRendererObj.getStringWidth(this)
 
     fun String.lastColorCode(): String? = minecraftColorCodesPattern.findAll(this).lastOrNull()
+
+    fun String.isValidUuid(): Boolean {
+        return try {
+            UUID.fromString(this)
+            true
+        } catch (e: IllegalArgumentException) {
+            false
+        }
+    }
 }

From 68044ebd31dc1af39c01a26285b1de1eb46c3263 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Sun, 8 Sep 2024 09:53:42 +0200
Subject: [PATCH 412/721] Feature: Mirrorverse Crafting Room Helper (#2178)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../area/mirrorverse/CraftingRoomConfig.java  | 31 ++++++
 .../area/mirrorverse/MirrorVerseConfig.java   | 11 ++-
 .../mirrorverse/CraftRoomHolographicMob.kt    | 99 +++++++++++++++++++
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/CraftingRoomConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/CraftRoomHolographicMob.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/CraftingRoomConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/CraftingRoomConfig.java
new file mode 100644
index 000000000000..e1bc145c3521
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/CraftingRoomConfig.java
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.config.features.rift.area.mirrorverse;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CraftingRoomConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Show an holographic version of the mob on your side of the craft room.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Show Name", desc = "Show the name of the mob.")
+    @ConfigEditorBoolean
+    public boolean showName = true;
+
+    @Expose
+    @ConfigOption(name = "Show Health", desc = "Show the health of the mob.")
+    @ConfigEditorBoolean
+    public boolean showHealth = true;
+
+    @Expose
+    @ConfigOption(name = "Hide Players", desc = "Hide other players in the room.")
+    @ConfigEditorBoolean
+    public boolean hidePlayers = true;
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/MirrorVerseConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/MirrorVerseConfig.java
index c1fedf3a4f22..0ab546ae8ab2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/MirrorVerseConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/MirrorVerseConfig.java
@@ -7,16 +7,25 @@
 
 public class MirrorVerseConfig {
 
+    // Four Levers
+
     @ConfigOption(name = "Lava Maze", desc = "")
     @Accordion
     @Expose
     public LavaMazeConfig lavaMazeConfig = new LavaMazeConfig();
 
-    @ConfigOption(name = "Upside Down Parkour", desc = "")
+    @ConfigOption(name = "Crafting Room", desc = "")
+    @Accordion
+    @Expose
+    public CraftingRoomConfig craftingRoom = new CraftingRoomConfig();
+
+    @ConfigOption(name = "Upside-Down Parkour", desc = "")
     @Accordion
     @Expose
     public UpsideDownParkourConfig upsideDownParkour = new UpsideDownParkourConfig();
 
+    // Red-Green Puzzle
+
     @ConfigOption(name = "Dance Room Helper", desc = "")
     @Accordion
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/CraftRoomHolographicMob.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/CraftRoomHolographicMob.kt
new file mode 100644
index 000000000000..ab5060be3a2b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/CraftRoomHolographicMob.kt
@@ -0,0 +1,99 @@
+package at.hannibal2.skyhanni.features.rift.area.mirrorverse
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
+import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.HolographicEntities
+import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.isInside
+import at.hannibal2.skyhanni.utils.RenderUtils.drawString
+import at.hannibal2.skyhanni.utils.getLorenzVec
+import net.minecraft.client.entity.EntityOtherPlayerMP
+import net.minecraft.entity.EntityLivingBase
+import net.minecraft.entity.monster.EntityCaveSpider
+import net.minecraft.entity.monster.EntitySlime
+import net.minecraft.entity.monster.EntityZombie
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.util.AxisAlignedBB
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.math.abs
+
+@SkyHanniModule
+object CraftRoomHolographicMob {
+
+    private val config get() = SkyHanniMod.feature.rift.area.mirrorverse.craftingRoom
+    private val craftRoomArea = AxisAlignedBB(
+        -108.0, 58.0, -106.0,
+        -117.0, 51.0, -128.0,
+    )
+    private var entitiesList = listOf<HolographicEntities.HolographicEntity<out EntityLivingBase>>()
+    private var entityToHolographicEntity = mapOf(
+        EntityZombie::class.java to HolographicEntities.zombie,
+        EntitySlime::class.java to HolographicEntities.slime,
+        EntityCaveSpider::class.java to HolographicEntities.caveSpider,
+    )
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        for (entity in entitiesList) {
+            entity.moveTo(entity.position.up(.1), (entity.yaw + 5) % 360)
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldRender(event: LorenzRenderWorldEvent) {
+        if (!isEnabled()) return
+
+        for (theMob in EntityUtils.getEntitiesNearby<EntityLivingBase>(LocationUtils.playerLocation(), 25.0)) {
+            if (theMob is EntityPlayer) continue
+
+            if (!craftRoomArea.isInside(theMob.getLorenzVec())) continue
+
+            val mobPos = theMob.getLorenzVec()
+            val wallZ = -116.5
+            val dist = abs(mobPos.z - wallZ)
+            val holographicMobPos = mobPos.add(z = dist * 2)
+            val displayString = buildString {
+                val mobName = theMob.displayName.formattedText
+                if (config.showName) {
+                    append("§a$mobName ")
+                }
+                if (config.showHealth) {
+                    append("§c${theMob.health}♥")
+                }
+            }.trim()
+
+            val mob = entityToHolographicEntity[theMob::class.java] ?: continue
+
+            val instance = mob.instance(holographicMobPos, -theMob.rotationYaw)
+
+            instance.isChild = theMob.isChild
+
+            HolographicEntities.renderHolographicEntity(instance, event.partialTicks)
+
+            if (displayString.isNotEmpty()) {
+                event.drawString(holographicMobPos.add(y = theMob.eyeHeight + .5), displayString)
+            }
+
+            entitiesList = entitiesList.editCopy { add(instance) }
+        }
+    }
+
+    @SubscribeEvent(receiveCanceled = true)
+    fun onPlayerRender(event: CheckRenderEntityEvent<*>) {
+        if (!RiftAPI.inRift() || !config.hidePlayers) return
+
+        val entity = event.entity
+        if (entity is EntityOtherPlayerMP && craftRoomArea.isInside(entity.getLorenzVec())) {
+            event.cancel()
+        }
+    }
+
+    private fun isEnabled() = config.enabled && RiftAPI.inRift()
+}

From 7519ef5249502f9aa14e350e5e5b8b83eab0e1eb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 8 Sep 2024 13:11:08 +0200
Subject: [PATCH 413/721] fix typo

---
 .../skyhanni/features/inventory/SuperpairsClicksAlert.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
index 8e3c126798ba..5c5011c85b1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
@@ -19,7 +19,7 @@ object SuperpairsClicksAlert {
     private var roundsNeeded = -1
     private val roundsNeededRegex = Regex("""(?:Chain|Series) of (\d+):""")
     private val currentRoundRegex = Regex("""Round: (\d+)""")
-    private val targetInventoryNames = arrayOf("Chronomatron", "c")
+    private val targetInventoryNames = arrayOf("Chronomatron", "Ultrasequencer")
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryOpenEvent) {

From 796ef7ca4139669f15e323c112378125760b5292 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 8 Sep 2024 13:36:19 +0200
Subject: [PATCH 414/721] Backend: No List<Any> in Trackers (#2474)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../endernodetracker/EnderNodeTracker.kt      | 29 +++++++-------
 .../event/diana/DianaProfitTracker.kt         | 10 ++---
 .../diana/MythologicalCreatureTracker.kt      | 13 ++++---
 .../frozentreasure/FrozenTreasureTracker.kt   | 25 ++++++------
 .../fishing/tracker/FishingProfitTracker.kt   | 14 +++----
 .../fishing/tracker/SeaCreatureTracker.kt     | 15 +++----
 .../garden/farming/ArmorDropTracker.kt        |  9 +++--
 .../garden/farming/DicerRngDropTracker.kt     |  6 +--
 .../garden/pests/PestProfitTracker.kt         | 10 ++---
 .../ChocolateFactoryStrayTracker.kt           |  7 ++--
 .../fossilexcavator/ExcavatorProfitTracker.kt | 22 +++++------
 .../mining/powdertracker/PowderTracker.kt     | 35 +++++++++--------
 .../rift/area/westvillage/VerminTracker.kt    |  9 +++--
 .../features/slayer/SlayerProfitTracker.kt    | 12 +++---
 .../at/hannibal2/skyhanni/test/GraphEditor.kt |  2 +
 .../skyhanni/utils/CollectionUtils.kt         |  5 +++
 .../utils/tracker/SkyHanniItemTracker.kt      | 16 ++++----
 .../skyhanni/utils/tracker/SkyHanniTracker.kt | 39 ++++++++++---------
 18 files changed, 147 insertions(+), 131 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 12bd69658880..931f3b6229bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -12,8 +12,8 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent
 import at.hannibal2.skyhanni.events.SackChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -26,6 +26,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -211,36 +212,36 @@ object EnderNodeTracker {
         else -> null
     }
 
-    private fun drawDisplay(data: Data) = buildList<List<Any>> {
+    private fun drawDisplay(data: Data) = buildList<Renderable> {
         val lootProfit = getLootProfit(data)
 
-        addAsSingletonList("§5§lEnder Node Tracker")
-        addAsSingletonList("§d${data.totalNodesMined.addSeparators()} Ender Nodes mined")
-        addAsSingletonList("§6${lootProfit.values.sum().shortFormat()} Coins made")
-        addAsSingletonList(" ")
-        addAsSingletonList("§b${data.totalEndermiteNests.addSeparators()} §cEndermite Nest")
+        addString("§5§lEnder Node Tracker")
+        addString("§d${data.totalNodesMined.addSeparators()} Ender Nodes mined")
+        addString("§6${lootProfit.values.sum().shortFormat()} Coins made")
+        addString(" ")
+        addString("§b${data.totalEndermiteNests.addSeparators()} §cEndermite Nest")
 
         for (item in EnderNode.entries.subList(0, 11)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
             val profit = (lootProfit[item] ?: 0.0).shortFormat()
-            addAsSingletonList("§b$count ${item.displayName} §7(§6$profit§7)")
+            addString("§b$count ${item.displayName} §7(§6$profit§7)")
         }
-        addAsSingletonList(" ")
+        addString(" ")
 
         val totalEnderArmor = calculateEnderArmor(data)
-        addAsSingletonList(
+        addString(
             "§b${totalEnderArmor.addSeparators()} §5Ender Armor " +
                 "§7(§6${(totalEnderArmor * 10_000).shortFormat()}§7)"
         )
         for (item in EnderNode.entries.subList(11, 16)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
             val profit = (lootProfit[item] ?: 0.0).shortFormat()
-            addAsSingletonList("§b$count ${item.displayName} §7(§6$profit§7)")
+            addString("§b$count ${item.displayName} §7(§6$profit§7)")
         }
         // enderman pet rarities
         val (c, u, r, e, l) = EnderNode.entries.subList(16, 21).map { (data.lootCount[it] ?: 0).addSeparators() }
         val profit = EnderNode.entries.subList(16, 21).sumOf { lootProfit[it] ?: 0.0 }.shortFormat()
-        addAsSingletonList("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
+        addString("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
     }
 
     private fun calculateEnderArmor(storage: Data) =
@@ -248,10 +249,10 @@ object EnderNodeTracker {
             .map { it.value }
             .sum()
 
-    private fun formatDisplay(map: List<List<Any>>): List<List<Any>> {
+    private fun formatDisplay(map: List<Renderable>): List<Renderable> {
         if (!ProfileStorageData.loaded) return emptyList()
 
-        val newList = mutableListOf<List<Any>>()
+        val newList = mutableListOf<Renderable>()
         for (index in config.textFormat.get()) {
             // TODO, change functionality to use enum rather than ordinals
             newList.add(map[index.ordinal])
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index 01d2c1d2ed65..f8ae6165b9d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -77,20 +77,20 @@ object DianaProfitTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§e§lDiana Profit Tracker")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§e§lDiana Profit Tracker")
 
         val profit = tracker.drawItems(data, { true }, this)
 
         val treasureCoins = data.burrowsDug
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7Burrows dug: §e${treasureCoins.addSeparators()}",
                 listOf("§7You dug out griffin burrows §e${treasureCoins.addSeparators()} §7times."),
             ),
         )
 
-        addAsSingletonList(tracker.addTotalProfit(profit, data.burrowsDug, "burrow"))
+        add(tracker.addTotalProfit(profit, data.burrowsDug, "burrow"))
 
         tracker.addPriceFromButton(this)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index 68b70a77adf1..fc7442fafb8e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -5,14 +5,15 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -99,8 +100,8 @@ object MythologicalCreatureTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§7Mythological Creature Tracker:")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§7Mythological Creature Tracker:")
         val total = data.count.sumAllValues()
         for ((creatureType, amount) in data.count.entries.sortedByDescending { it.value }) {
             val percentageSuffix = if (config.showPercentage.get()) {
@@ -108,10 +109,10 @@ object MythologicalCreatureTracker {
                 " §7$percentage"
             } else ""
 
-            addAsSingletonList(" §7- §e${amount.addSeparators()} ${creatureType.displayName}$percentageSuffix")
+            addString(" §7- §e${amount.addSeparators()} ${creatureType.displayName}$percentageSuffix")
         }
-        addAsSingletonList(" §7- §e${total.addSeparators()} §7Total Mythological Creatures")
-        addAsSingletonList(" §7- §e${data.creaturesSinceLastInquisitor.addSeparators()} §7Creatures since last Minos Inquisitor")
+        addString(" §7- §e${total.addSeparators()} §7Total Mythological Creatures")
+        addString(" §7- §e${data.creaturesSinceLastInquisitor.addSeparators()} §7Creatures since last Minos Inquisitor")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index 7547f1bc2f83..4fc5b824b91b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -11,8 +11,8 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -104,8 +105,8 @@ object FrozenTreasureTracker {
         icePerHour = (icePerSecond.average() * 3600).toInt()
     }
 
-    private fun formatDisplay(map: List<List<Any>>): List<List<Any>> {
-        val newList = mutableListOf<List<Any>>()
+    private fun formatDisplay(map: List<Renderable>): List<Renderable> {
+        val newList = mutableListOf<Renderable>()
         for (index in config.textFormat) {
             // TODO, change functionality to use enum rather than ordinals
             newList.add(map[index.ordinal])
@@ -136,20 +137,20 @@ object FrozenTreasureTracker {
         }
     }
 
-    private fun drawDisplay(data: Data) = buildList<List<Any>> {
+    private fun drawDisplay(data: Data) = buildList {
         calculateIce(data)
-        addAsSingletonList("§e§lFrozen Treasure Tracker")
-        addAsSingletonList("§6${formatNumber(data.treasuresMined)} Treasures Mined")
-        addAsSingletonList("§3${formatNumber(estimatedIce)} Total Ice")
-        addAsSingletonList("§3${formatNumber(icePerHour)} Ice/hr")
-        addAsSingletonList("§8${formatNumber(data.compactProcs)} Compact Procs")
-        addAsSingletonList("")
+        addString("§e§lFrozen Treasure Tracker")
+        addString("§6${formatNumber(data.treasuresMined)} Treasures Mined")
+        addString("§3${formatNumber(estimatedIce)} Total Ice")
+        addString("§3${formatNumber(icePerHour)} Ice/hr")
+        addString("§8${formatNumber(data.compactProcs)} Compact Procs")
+        addString("")
 
         for (treasure in FrozenTreasure.entries) {
             val count = (data.treasureCount[treasure] ?: 0) * if (config.showAsDrops) treasure.defaultAmount else 1
-            addAsSingletonList("§b${formatNumber(count)} ${treasure.displayName}")
+            addString("§b${formatNumber(count)} ${treasure.displayName}")
         }
-        addAsSingletonList("")
+        addString("")
     }
 
     fun formatNumber(amount: Number): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index a0590816efbd..619334a98aed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -13,10 +13,10 @@ import at.hannibal2.skyhanni.features.fishing.FishingAPI
 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.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addButton
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addButton
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -119,26 +119,26 @@ object FishingProfitTracker {
         return map
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§e§lFishing Profit Tracker")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§e§lFishing Profit Tracker")
         val filter: (NEUInternalName) -> Boolean = addCategories(data)
 
         val profit = tracker.drawItems(data, filter, this)
 
         val fishedCount = data.totalCatchAmount
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7Times fished: §e${fishedCount.addSeparators()}",
                 listOf("§7You've reeled in §e${fishedCount.addSeparators()} §7catches."),
             ),
         )
 
-        addAsSingletonList(tracker.addTotalProfit(profit, data.totalCatchAmount, "catch"))
+        add(tracker.addTotalProfit(profit, data.totalCatchAmount, "catch"))
 
         tracker.addPriceFromButton(this)
     }
 
-    private fun MutableList<List<Any>>.addCategories(data: Data): (NEUInternalName) -> Boolean {
+    private fun MutableList<Renderable>.addCategories(data: Data): (NEUInternalName) -> Boolean {
         val amounts = getCurrentCategories(data)
         checkMissingItems(data)
         val list = amounts.keys.toList()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index d241b6a19564..fd41883ef0fb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -9,14 +9,15 @@ import at.hannibal2.skyhanni.features.fishing.FishingAPI
 import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addButton
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addButton
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -70,8 +71,8 @@ object SeaCreatureTracker {
         return map
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§7Sea Creature Tracker:")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§7Sea Creature Tracker:")
 
         val filter: (String) -> Boolean = addCategories(data)
         val realAmount = data.amount.filter { filter(it.key) }
@@ -93,12 +94,12 @@ object SeaCreatureTracker {
                 " §7$percentage"
             } else ""
 
-            addAsSingletonList(" §7- §e${amount.addSeparators()} $displayName$percentageSuffix")
+            addString(" §7- §e${amount.addSeparators()} $displayName$percentageSuffix")
         }
-        addAsSingletonList(" §7- §e${total.addSeparators()} §7Total Sea Creatures")
+        addString(" §7- §e${total.addSeparators()} §7Total Sea Creatures")
     }
 
-    private fun MutableList<List<Any>>.addCategories(data: Data): (String) -> Boolean {
+    private fun MutableList<Renderable>.addCategories(data: Data): (String) -> Boolean {
         val amounts = getCurrentCategories(data)
         val list = amounts.keys.toList()
         if (currentCategory !in list) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
index b55ed769dda8..1e9397d5f182 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
@@ -13,13 +13,14 @@ import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -83,11 +84,11 @@ object ArmorDropTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§7Armor Drop Tracker:")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§7Armor Drop Tracker:")
         for ((drop, amount) in data.drops.sortedDesc()) {
             val dropName = drop.dropName
-            addAsSingletonList(" §7- §e${amount.addSeparators()}x $dropName")
+            addString(" §7- §e${amount.addSeparators()}x $dropName")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 7d9f2587e3fd..34d3fe53d943 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -120,13 +120,13 @@ object DicerRngDropTracker {
         }
     }
 
-    private fun drawDisplay(data: Data) = buildList {
+    private fun drawDisplay(data: Data) = buildList<Renderable> {
         val cropInHand = cropInHand ?: return@buildList
 
         val topLine = mutableListOf<Renderable>()
         topLine.add(Renderable.itemStack(cropInHand.icon))
         topLine.add(Renderable.string("§7Dicer Tracker:"))
-        add(listOf(Renderable.horizontalContainer(topLine)))
+        add(Renderable.horizontalContainer(topLine))
 
         val items = data.drops[cropInHand] ?: return@buildList
         val list = mutableListOf<Renderable>()
@@ -143,7 +143,7 @@ object DicerRngDropTracker {
                 list.add(Renderable.string(" §7- §e${amount.addSeparators()}x §$colorCode$displayName"))
             }
         }
-        add(listOf(Renderable.verticalContainer(list)))
+        add(Renderable.verticalContainer(list))
     }
 
     private var cropInHand: CropType? = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 1d2710c7c129..7dcd078612b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.events.PurseChangeCause
 import at.hannibal2.skyhanni.events.PurseChangeEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -117,18 +117,18 @@ object PestProfitTracker {
         lastPestKillTime = SimpleTimeMark.now()
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§e§lPest Profit Tracker")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§e§lPest Profit Tracker")
         val profit = tracker.drawItems(data, { true }, this)
 
         val pestsKilled = data.totalPestsKills
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7Pests killed: §e${pestsKilled.addSeparators()}",
                 listOf("§7You killed pests §e${pestsKilled.addSeparators()} §7times."),
             ),
         )
-        addAsSingletonList(tracker.addTotalProfit(profit, data.totalPestsKills, "kill"))
+        add(tracker.addTotalProfit(profit, data.totalPestsKills, "kill"))
 
         tracker.addPriceFromButton(this)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 89b8355be153..abab20400ff8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -148,18 +149,18 @@ object ChocolateFactoryStrayTracker {
         tracker.modify { it.goldenTypesCaught.addOrPut(typeCaught, amount) }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
         val extraChocMs = data.straysExtraChocMs.values.sum().milliseconds
         val formattedExtraTime = extraChocMs.let { if (it == 0.milliseconds) "0s" else it.format() }
 
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§6§lStray Tracker",
                 tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"),
             ),
         )
         rarityFormatMap.keys.forEach { rarity ->
-            extractHoverableOfRarity(rarity, data)?.let { addAsSingletonList(it) }
+            extractHoverableOfRarity(rarity, data)?.let { add(it) }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
index ef3b780b7038..655b885e0768 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.mining.FossilExcavationEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -73,12 +73,12 @@ object ExcavatorProfitTracker {
 
     private val scrapItem get() = FossilExcavatorAPI.scrapItem
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§e§lFossil Excavation Profit Tracker")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§e§lFossil Excavation Profit Tracker")
         var profit = tracker.drawItems(data, { true }, this)
 
         val timesExcavated = data.timesExcavated
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7Times excavated: §e${timesExcavated.addSeparators()}",
                 listOf("§7You excavated §e${timesExcavated.addSeparators()} §7times."),
@@ -93,12 +93,12 @@ object ExcavatorProfitTracker {
             addGlacitePowder(data)
         }
 
-        addAsSingletonList(tracker.addTotalProfit(profit, data.timesExcavated, "excavation"))
+        add(tracker.addTotalProfit(profit, data.timesExcavated, "excavation"))
 
         tracker.addPriceFromButton(this)
     }
 
-    private fun MutableList<List<Any>>.addFossilDust(
+    private fun MutableList<Renderable>.addFossilDust(
         fossilDustGained: Long,
         profit: Double,
     ): Double {
@@ -106,7 +106,7 @@ object ExcavatorProfitTracker {
         // TODO use same price source as profit tracker
         val pricePer = scrapItem.getPrice() / 500
         val fossilDustPrice = pricePer * fossilDustGained
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7${fossilDustGained.shortFormat()}x §fFossil Dust§7: §6${fossilDustPrice.shortFormat()}",
                 listOf(
@@ -121,10 +121,10 @@ object ExcavatorProfitTracker {
         return profit + fossilDustPrice
     }
 
-    private fun MutableList<List<Any>>.addGlacitePowder(data: Data) {
+    private fun MutableList<Renderable>.addGlacitePowder(data: Data) {
         val glacitePowderGained = data.glacitePowderGained
         if (glacitePowderGained <= 0) return
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§bGlacite Powder§7: §e${glacitePowderGained.addSeparators()}",
                 listOf(
@@ -135,7 +135,7 @@ object ExcavatorProfitTracker {
         )
     }
 
-    private fun MutableList<List<Any>>.addScrap(
+    private fun MutableList<Renderable>.addScrap(
         timesExcavated: Long,
         profit: Double,
     ): Double {
@@ -143,7 +143,7 @@ object ExcavatorProfitTracker {
         // TODO use same price source as profit tracker
         val scrapPrice = timesExcavated * scrapItem.getPrice()
         val name = StringUtils.pluralize(timesExcavated.toInt(), scrapItem.itemName)
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "$name §7price: §c-${scrapPrice.shortFormat()}",
                 listOf(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 6edcac0a0f70..a8c81edab91e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -16,8 +16,8 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.mining.PowderGainEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -27,6 +27,7 @@ import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -283,10 +284,10 @@ object PowderTracker {
         }
     }
 
-    private fun formatDisplay(map: List<List<Any>>) = buildList<List<Any>> {
+    private fun formatDisplay(map: List<Renderable>) = buildList<Renderable> {
         if (map.isEmpty()) return@buildList
 
-        addAsSingletonList("§b§lPowder Tracker")
+        addString("§b§lPowder Tracker")
 
         for (index in config.textFormat.get()) {
             // TODO, change functionality to use enum rather than ordinals
@@ -294,7 +295,7 @@ object PowderTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
         calculate(data, gemstoneInfo, PowderChestReward.GEMSTONE_POWDER)
         calculate(data, mithrilInfo, PowderChestReward.MITHRIL_POWDER)
         calculate(data, diamondEssenceInfo, PowderChestReward.DIAMOND_ESSENCE)
@@ -303,20 +304,20 @@ object PowderTracker {
         calculateHardStone(data)
 
         val chestPerHour = format(chestInfo.perHour)
-        addAsSingletonList("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
-        addAsSingletonList("§bDouble Powder: ${if (doublePowder) "§aActive! §7($powderTimer)" else "§cInactive!"}")
+        addString("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
+        addString("§bDouble Powder: ${if (doublePowder) "§aActive! §7($powderTimer)" else "§cInactive!"}")
 
         val entries = PowderChestReward.entries
         val rewards = data.rewards
         addPerHour(rewards, entries[0], mithrilInfo)
         addPerHour(rewards, entries[1], gemstoneInfo)
-        addAsSingletonList("")
+        addString("")
         addPerHour(rewards, entries[46], diamondEssenceInfo)
         addPerHour(rewards, entries[47], goldEssenceInfo)
-        addAsSingletonList("")
+        addString("")
         val hardStonePerHour = format(hardStoneInfo.perHour)
-        addAsSingletonList("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)")
-        addAsSingletonList("")
+        addString("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)")
+        addString("")
         for ((gem, color) in gemstones) {
             var totalGemstone = 0L
 
@@ -333,38 +334,38 @@ object PowderTracker {
             }
 
             val (flawless, fine, flawed, rough) = convert(totalGemstone)
-            addAsSingletonList("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone")
+            addString("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone")
         }
 
         var totalParts = 0L
         for (reward in entries.subList(26, 32)) { // robots part
             val count = rewards.getOrDefault(reward, 0)
             totalParts += count
-            addAsSingletonList("§b${count.addSeparators()} ${reward.displayName}")
+            addString("§b${count.addSeparators()} ${reward.displayName}")
         }
-        addAsSingletonList("§b${totalParts.addSeparators()} §9Total Robot Parts")
+        addString("§b${totalParts.addSeparators()} §9Total Robot Parts")
 
         val goblinEgg = rewards.getOrDefault(PowderChestReward.GOBLIN_EGG, 0)
         val greenEgg = rewards.getOrDefault(PowderChestReward.GREEN_GOBLIN_EGG, 0)
         val redEgg = rewards.getOrDefault(PowderChestReward.RED_GOBLIN_EGG, 0)
         val yellowEgg = rewards.getOrDefault(PowderChestReward.YELLOW_GOBLIN_EGG, 0)
         val blueEgg = rewards.getOrDefault(PowderChestReward.BLUE_GOBLIN_EGG, 0)
-        addAsSingletonList("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
+        addString("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
 
         for (reward in entries.subList(37, 46)) {
             val count = rewards.getOrDefault(reward, 0).addSeparators()
-            addAsSingletonList("§b$count ${reward.displayName}")
+            addString("§b$count ${reward.displayName}")
         }
     }
 
-    private fun MutableList<List<Any>>.addPerHour(
+    private fun MutableList<Renderable>.addPerHour(
         map: Map<PowderChestReward, Long>,
         reward: PowderChestReward,
         info: ResourceInfo,
     ) {
         val mithrilCount = map.getOrDefault(reward, 0).addSeparators()
         val mithrilPerHour = format(info.perHour)
-        addAsSingletonList("§b$mithrilCount ${reward.displayName} §7($mithrilPerHour/h)")
+        addString("§b$mithrilCount ${reward.displayName} §7($mithrilPerHour/h)")
     }
 
     private fun format(e: Double): String = if (e < 0) "0" else e.toInt().addSeparators()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
index 8377e5c762eb..c8fabc226a5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
@@ -8,8 +8,8 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -150,11 +151,11 @@ object VerminTracker {
         tracker.modify(SkyHanniTracker.DisplayMode.TOTAL) { it.count[vermin] = count }
     }
 
-    private fun drawDisplay(data: Data): List<List<Any>> = buildList {
-        addAsSingletonList("§7Vermin Tracker:")
+    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+        addString("§7Vermin Tracker:")
         for ((vermin, amount) in data.count.entries.sortedBy { it.key.order }) {
             val verminName = vermin.vermin
-            addAsSingletonList(" §7- §e${amount.addSeparators()} $verminName")
+            addString(" §7- §e${amount.addSeparators()} $verminName")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
index d2f50358d216..ee4192b03750 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.events.SlayerChangeEvent
 import at.hannibal2.skyhanni.events.SlayerQuestCompleteEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -171,15 +171,15 @@ object SlayerProfitTracker {
         return internalName in allowedList
     }
 
-    private fun drawDisplay(data: Data) = buildList<List<Any>> {
+    private fun drawDisplay(data: Data) = buildList {
         val tracker = getTracker() ?: return@buildList
-        addAsSingletonList("§e§l$itemLogCategory Profit Tracker")
+        addString("§e§l$itemLogCategory Profit Tracker")
 
         var profit = tracker.drawItems(data, { true }, this)
         val slayerSpawnCost = data.slayerSpawnCost
         if (slayerSpawnCost != 0L) {
             val slayerSpawnCostFormat = slayerSpawnCost.shortFormat()
-            addAsSingletonList(
+            add(
                 Renderable.hoverTips(
                     " §7Slayer Spawn Costs: §c$slayerSpawnCostFormat",
                     listOf("§7You paid §c$slayerSpawnCostFormat §7in total", "§7for starting the slayer quests."),
@@ -189,14 +189,14 @@ object SlayerProfitTracker {
         }
 
         val slayerCompletedCount = data.slayerCompletedCount
-        addAsSingletonList(
+        add(
             Renderable.hoverTips(
                 "§7Bosses killed: §e${slayerCompletedCount.addSeparators()}",
                 listOf("§7You killed the $itemLogCategory boss", "§e${slayerCompletedCount.addSeparators()} §7times."),
             ),
         )
 
-        addAsSingletonList(tracker.addTotalProfit(profit, data.slayerCompletedCount, "boss"))
+        add(tracker.addTotalProfit(profit, data.slayerCompletedCount, "boss"))
 
         tracker.addPriceFromButton(this)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index 8757f19bf963..4564b9b72c17 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -79,6 +79,7 @@ object GraphEditor {
                 activeNode?.name?.let {
                     textBox.textBox = it
                 }
+
                 textBox.makeActive()
             } else {
                 textBox.clear()
@@ -88,6 +89,7 @@ object GraphEditor {
 
     private var inTutorialMode = false
 
+
     private val textBox = TextInput()
 
     private val nodeColor = LorenzColor.BLUE.addOpacity(200)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 56bdcfabd933..d91078d71b3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -176,6 +176,7 @@ object CollectionUtils {
         add(Collections.singletonList(text))
     }
 
+    // TODO move to RenderableUtils
     fun MutableList<List<Renderable>>.addSingleString(text: String) {
         add(Collections.singletonList(Renderable.string(text)))
     }
@@ -296,6 +297,7 @@ object CollectionUtils {
         addItemStack(internalName.getItemStack())
     }
 
+    // TODO move to RenderableUtils
     inline fun <reified T : Enum<T>> MutableList<Renderable>.addSelector(
         prefix: String,
         getName: (T) -> String,
@@ -305,6 +307,7 @@ object CollectionUtils {
         add(Renderable.horizontalContainer(buildSelector<T>(prefix, getName, isCurrent, onChange)))
     }
 
+    // TODO move to RenderableUtils
     inline fun <reified T : Enum<T>> buildSelector(
         prefix: String,
         getName: (T) -> String,
@@ -329,6 +332,7 @@ object CollectionUtils {
         }
     }
 
+    // TODO move to RenderableUtils
     inline fun MutableList<Renderable>.addButton(
         prefix: String,
         getName: String,
@@ -358,6 +362,7 @@ object CollectionUtils {
         )
     }
 
+    // TODO move to RenderableUtils
     fun Collection<Collection<Renderable>>.tableStretchXPadding(xSpace: Int): Int {
         if (this.isEmpty()) return xSpace
         val off = RenderableUtils.calculateTableXOffsets(this as List<List<Renderable?>>, 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index e7af81cea685..8806f3bdb044 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -5,14 +5,13 @@ import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSelector
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemPriceSource
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.readableInternalName
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
@@ -24,7 +23,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
     name: String,
     createNewSession: () -> Data,
     getStorage: (ProfileSpecificStorage) -> Data,
-    drawDisplay: (Data) -> List<List<Any>>,
+    drawDisplay: (Data) -> List<Renderable>,
 ) : SkyHanniTracker<Data>(name, createNewSession, getStorage, drawDisplay) {
 
     companion object {
@@ -61,7 +60,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         }
     }
 
-    fun addPriceFromButton(lists: MutableList<List<Any>>) {
+    fun addPriceFromButton(lists: MutableList<Renderable>) {
         if (isInventoryOpen()) {
             lists.addSelector<ItemPriceSource>(
                 "",
@@ -78,7 +77,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
     fun drawItems(
         data: Data,
         filter: (NEUInternalName) -> Boolean,
-        lists: MutableList<List<Any>>,
+        lists: MutableList<Renderable>,
     ): Double {
         var profit = 0.0
         val items = mutableMapOf<NEUInternalName, Long>()
@@ -86,8 +85,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
             if (!filter(internalName)) continue
 
             val amount = itemProfit.totalAmount
-            val pricePer =
-                if (internalName == SKYBLOCK_COIN) 1.0 else data.getCustomPricePer(internalName)
+            val pricePer = if (internalName == SKYBLOCK_COIN) 1.0 else data.getCustomPricePer(internalName)
             val price = (pricePer * amount).toLong()
             val hidden = itemProfit.hidden
 
@@ -151,11 +149,11 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                 },
             ) else Renderable.string(displayName)
 
-            lists.addAsSingletonList(renderable)
+            lists.add(renderable)
         }
         if (hiddenItemTexts.size > 0) {
             val text = Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts)
-            lists.addAsSingletonList(text)
+            lists.add(text)
         }
 
         return profit
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 345767b051b5..9d77d4668005 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -7,11 +7,10 @@ import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
-import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
@@ -24,13 +23,13 @@ open class SkyHanniTracker<Data : TrackerData>(
     private val createNewSession: () -> Data,
     private val getStorage: (ProfileSpecificStorage) -> Data,
     // TODO change to renderable
-    private val drawDisplay: (Data) -> List<List<Any>>,
+    private val drawDisplay: (Data) -> List<Renderable>,
 ) {
 
     private var inventoryOpen = false
     private var displayMode: DisplayMode? = null
     private val currentSessions = mutableMapOf<ProfileSpecificStorage, Data>()
-    private var display = emptyList<List<Any>>()
+    private var display = emptyList<Renderable>()
     private var sessionResetTime = SimpleTimeMark.farPast()
     private var dirty = false
 
@@ -84,25 +83,27 @@ open class SkyHanniTracker<Data : TrackerData>(
 
         if (dirty || TrackerManager.dirty) {
             display = getSharedTracker()?.let {
-                buildFinalDisplay(drawDisplay(it.get(getDisplayMode())))
+                val get = it.get(getDisplayMode())
+                val rawList = drawDisplay(get)
+                buildFinalDisplay(rawList)
             } ?: emptyList()
             dirty = false
         }
 
-        position.renderStringsAndItems(display, posLabel = name)
+        position.renderRenderables(display, posLabel = name)
     }
 
     fun update() {
         dirty = true
     }
 
-    private fun buildFinalDisplay(rawList: List<List<Any>>) = rawList.toMutableList().also {
+    private fun buildFinalDisplay(rawList: List<Renderable>) = rawList.toMutableList().also {
         if (it.isEmpty()) return@also
         if (inventoryOpen) {
             it.add(1, buildDisplayModeView())
         }
         if (inventoryOpen && getDisplayMode() == DisplayMode.SESSION) {
-            it.addAsSingletonList(buildSessionResetButton())
+            it.add(buildSessionResetButton())
         }
     }
 
@@ -121,15 +122,17 @@ open class SkyHanniTracker<Data : TrackerData>(
         },
     )
 
-    private fun buildDisplayModeView() = LorenzUtils.buildSelector<DisplayMode>(
-        "§7Display Mode: ",
-        getName = { type -> type.displayName },
-        isCurrent = { it == getDisplayMode() },
-        onChange = {
-            displayMode = it
-            storedTrackers[name] = it
-            update()
-        },
+    private fun buildDisplayModeView() = Renderable.horizontalContainer(
+        CollectionUtils.buildSelector<DisplayMode>(
+            "§7Display Mode: ",
+            getName = { type -> type.displayName },
+            isCurrent = { it == getDisplayMode() },
+            onChange = {
+                displayMode = it
+                storedTrackers[name] = it
+                update()
+            },
+        ),
     )
 
     protected fun getSharedTracker() = ProfileStorageData.profileSpecific?.let {

From c578c393b9ff882563a4e9d380a94662fa1ce2fb Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 9 Sep 2024 09:58:25 +0200
Subject: [PATCH 415/721] Backend: Renderable SearchBox added full hide if
 empty (#2481)

---
 .../skyhanni/utils/renderables/Renderable.kt  | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 91abc636dd97..48d5caafb129 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -568,8 +568,10 @@ interface Renderable {
 
             val textBoxHeight = (9 * scale).toInt() + 1
 
+            val isTextBoxEmpty get() = textInput.textBox.isEmpty()
+
             override var width: Int = content.width
-            override val height: Int = content.height + ySpacing + textBoxHeight
+            override var height: Int = content.height + if (hideIfNoText && isTextBoxEmpty) 0 else (ySpacing + textBoxHeight)
             override val horizontalAlign = content.horizontalAlign
             override val verticalAlign = content.verticalAlign
 
@@ -577,24 +579,39 @@ interface Renderable {
 
             init {
                 textInput.registerToEvent(key) {
+                    var shouldUpdate = false
+                    if (hideIfNoText) {
+                        if (isTextBoxEmpty) {
+                            if (height != content.height) {
+                                height = content.height
+                                shouldUpdate = true
+                            }
+                        } else {
+                            if (height == content.height) {
+                                height = content.height + ySpacing + textBoxHeight
+                                shouldUpdate = true
+                            }
+                        }
+                    }
                     val searchWidth = searchWidth
                     if (searchWidth > width) {
                         width = searchWidth
-                        onUpdateSize(this)
+                        shouldUpdate = true
                     } else {
                         if (width > content.width) {
                             width = maxOf(content.width, searchWidth)
-                            onUpdateSize(this)
+                            shouldUpdate = true
                         }
                     }
+                    if (shouldUpdate) {
+                        onUpdateSize(this)
+                    }
                 }
             }
 
             override fun render(posX: Int, posY: Int) {
-                if (shouldRenderTopElseBottom) {
-                    if (!(hideIfNoText && textInput.textBox.isEmpty())) {
-                        RenderableUtils.renderString(searchPrefix + textInput.editText(), scale, color)
-                    }
+                if (shouldRenderTopElseBottom && !(hideIfNoText && isTextBoxEmpty)) {
+                    RenderableUtils.renderString(searchPrefix + textInput.editText(), scale, color)
                     GlStateManager.translate(0f, (ySpacing + textBoxHeight).toFloat(), 0f)
                 }
                 if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks)) {
@@ -613,7 +630,9 @@ interface Renderable {
                 } else {
                     textInput.disable()
                 }
-                if (!shouldRenderTopElseBottom) {
+                if (hideIfNoText && isTextBoxEmpty) {
+                    content.render(posX, posY)
+                } else if (!shouldRenderTopElseBottom) {
                     content.render(posX, posY)
                     GlStateManager.translate(0f, (ySpacing).toFloat(), 0f)
                     if (!(hideIfNoText && textInput.textBox.isEmpty())) {
@@ -1115,7 +1134,7 @@ interface Renderable {
                     uMax,
                     vMin,
                     vMax,
-                    GL11.GL_NEAREST
+                    GL11.GL_NEAREST,
                 )
                 GlStateManager.color(1f, 1f, 1f, 1f)
 
@@ -1154,7 +1173,7 @@ interface Renderable {
                     uMax,
                     vMin,
                     vMax,
-                    GL11.GL_NEAREST
+                    GL11.GL_NEAREST,
                 )
                 GlStateManager.color(1f, 1f, 1f, 1f)
             }

From 6b31a0143364c11aada80f511413eb87e0ec7b92 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:43:01 +0200
Subject: [PATCH 416/721] Fix: Scoreboard Error with Barry Protestors (#2480)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../gui/customscoreboard/ScoreboardEvent.kt     |  2 ++
 .../gui/customscoreboard/ScoreboardPattern.kt   | 17 +++++++++++++++++
 .../gui/customscoreboard/UnknownLinesHandler.kt |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index d35952cb3d5e..efe7c953db8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -550,6 +550,8 @@ private fun getRiftLines() = getSbLines().filter { line ->
         || SbPattern.riftAveikxPattern.matches(line)
         || SbPattern.riftHayEatenPattern.matches(line)
         || SbPattern.cluesPattern.matches(line)
+        || SbPattern.barryProtestorsQuestlinePattern.matches(line)
+        || SbPattern.barryProtestorsHandledPattern.matches(line)
 }
 
 private fun getEssenceLines(): List<String> = listOf(getSbLines().first { SbPattern.essencePattern.matches(it) })
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 390d34e59872..9e2694ec0d88 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -497,6 +497,23 @@ object ScoreboardPattern {
         "Clues: §.\\d+/\\d+",
     )
 
+    /**
+     * REGEX-TEST: §eFirst Up
+     * REGEX-TEST: Find and talk with Barry
+     */
+    val barryProtestorsQuestlinePattern by riftSb.pattern(
+        "protestors.quest",
+        "§eFirst Up|Find and talk with Barry",
+    )
+
+    /**
+     * REGEX-TEST: Protestors handled: §b5/7
+     */
+    val barryProtestorsHandledPattern by riftSb.pattern(
+        "protestors.handled",
+        "Protestors handled: §b\\d+\\/\\d+",
+    )
+
     private val carnivalSb = scoreboardGroup.group("carnival")
 
     /**
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index 2c0ba2c86da0..4e102ee34ba3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -126,6 +126,8 @@ object UnknownLinesHandler {
             SbPattern.riftHayEatenPattern,
             SbPattern.fossilDustPattern,
             SbPattern.cluesPattern,
+            SbPattern.barryProtestorsQuestlinePattern,
+            SbPattern.barryProtestorsHandledPattern,
             SbPattern.carnivalPattern,
             SbPattern.carnivalTasksPattern,
             SbPattern.carnivalTokensPattern,

From 31134aabbf803ac8f3caf0bff98b12eef8821bc9 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 9 Sep 2024 05:44:30 -0400
Subject: [PATCH 417/721] Fix: Sound Utils Over-correction (#2482)

---
 .../at/hannibal2/skyhanni/utils/SoundUtils.kt   | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
index f001cfadba17..c05b305499c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
@@ -20,7 +20,6 @@ object SoundUtils {
 
     fun ISound.playSound() {
         DelayedRun.onThread.execute {
-            if (Minecraft.getMinecraft().soundHandler.isSoundPlaying(this)) return@execute
             val gameSettings = Minecraft.getMinecraft().gameSettings
             val oldLevel = gameSettings.getSoundLevel(SoundCategory.PLAYERS)
             if (!SkyHanniMod.feature.misc.maintainGameVolume) {
@@ -28,19 +27,11 @@ object SoundUtils {
             }
             try {
                 Minecraft.getMinecraft().soundHandler.playSound(this)
+            } catch (e: IllegalArgumentException) {
+                if (e.message?.startsWith("value already present:") == true) return@execute
+                ErrorManager.logErrorWithData(e, "Failed to play a sound", "soundLocation" to this.soundLocation)
             } catch (e: Exception) {
-                if (e is IllegalArgumentException) {
-                    e.message?.let {
-                        if (it.startsWith("value already present:")) {
-                            println("SkyHanni Sound error: $it")
-                            return@execute
-                        }
-                    }
-                }
-                ErrorManager.logErrorWithData(
-                    e, "Failed to play a sound",
-                    "soundLocation" to this.soundLocation,
-                )
+                ErrorManager.logErrorWithData(e, "Failed to play a sound", "soundLocation" to this.soundLocation)
             } finally {
                 if (!SkyHanniMod.feature.misc.maintainGameVolume) {
                     gameSettings.setSoundLevel(SoundCategory.PLAYERS, oldLevel)

From 5e77ccdf9c55ba3791427b67dc9456d5ae874380 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:00:51 +0200
Subject: [PATCH 418/721] Feature: Miniboss timer (#2042)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../crimsonisle/CrimsonIsleConfig.java        |  10 +
 .../nether/CrimsonMinibossRespawnTimer.kt     | 273 ++++++++++++++++++
 .../hannibal2/skyhanni/utils/EntityUtils.kt   |  18 +-
 3 files changed, 294 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java
index f2398e20740a..b0b55422404e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java
@@ -26,6 +26,16 @@ public class CrimsonIsleConfig {
     @Accordion
     public MatriarchHelperConfig matriarchHelper = new MatriarchHelperConfig();
 
+    @Expose
+    @ConfigOption(name = "Miniboss Respawn Timer", desc = "Shows a timer for when minibosses will respawn.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean minibossRespawnTimer = false;
+
+    @Expose
+    @ConfigLink(owner = CrimsonIsleConfig.class, field = "minibossRespawnTimer")
+    public Position minibossTimerPosition = new Position(20, 50);
+
     @Expose
     @ConfigOption(name = "Pablo NPC Helper", desc = "Show a clickable message that grabs the flower needed from your sacks.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt
new file mode 100644
index 000000000000..3c5325697dbb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt
@@ -0,0 +1,273 @@
+package at.hannibal2.skyhanni.features.nether
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.mob.MobData
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.nether.CrimsonMinibossRespawnTimer.MiniBoss.Companion.isSpawned
+import at.hannibal2.skyhanni.features.nether.CrimsonMinibossRespawnTimer.MiniBoss.Companion.isSpawningSoon
+import at.hannibal2.skyhanni.features.nether.CrimsonMinibossRespawnTimer.MiniBoss.Companion.isTimerKnown
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.isInside
+import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import at.hannibal2.skyhanni.utils.toLorenzVec
+import net.minecraft.tileentity.TileEntityBeacon
+import net.minecraft.util.AxisAlignedBB
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object CrimsonMinibossRespawnTimer {
+
+    private val config get() = SkyHanniMod.feature.crimsonIsle
+
+    private val patternGroup = RepoPattern.group("crimson.miniboss")
+
+    /**
+     * REGEX-TEST: §c§lBEWARE - Bladesoul Is Spawning.
+     */
+    private val spawnPattern by patternGroup.pattern(
+        "spawn",
+        "§c§lBEWARE - (?<name>.+) Is Spawning\\.",
+    )
+
+    /**
+     * REGEX-TEST: §f                            §r§6§lBLADESOUL DOWN!
+     */
+    private val downPattern by patternGroup.pattern(
+        "down",
+        "§f\\s*§r§6§l(?<name>.+) DOWN!",
+    )
+
+    private var currentAreaBoss: MiniBoss? = null
+
+    private var display: Renderable? = null
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        val message = event.message
+        downPattern.matchMatcher(message) {
+            val miniBoss = MiniBoss.fromName(group("name")) ?: return
+            miniBoss.nextSpawnTime = SimpleTimeMark.now() + 2.minutes
+            miniBoss.spawned = false
+            miniBoss.possibleSpawnTime = null
+            miniBoss.foundBeacon = null
+            update()
+            return
+        }
+        spawnPattern.matchMatcher(message) {
+            val miniBoss = MiniBoss.fromName(group("name")) ?: return
+            miniBoss.spawned = true
+            miniBoss.possibleSpawnTime = null
+            miniBoss.foundBeacon = null
+            update()
+            return
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        val renderable = display ?: drawDisplay()
+        config.minibossTimerPosition.renderRenderable(renderable, posLabel = "Miniboss Timer")
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        updateArea()
+        update()
+    }
+
+    private fun updateArea() {
+        MiniBoss.entries.forEach {
+            if (it.lastSeenArea.passedSince() > 2.minutes) {
+                it.nextSpawnTime = null
+                it.possibleSpawnTime = null
+                it.foundBeacon = null
+                it.spawned = null
+            }
+        }
+        currentAreaBoss = MiniBoss.entries.firstOrNull {
+            it.area.isPlayerInside()
+        }
+        val now = SimpleTimeMark.now()
+        currentAreaBoss?.lastSeenArea = now
+        val boss = currentAreaBoss ?: return
+        if (boss.isTimerKnown()) return
+
+        val isBossInArea = MobData.skyblockMobs.filter {
+            it.name == boss.displayName
+        }.any { boss.area.isInside(it.baseEntity.position.toLorenzVec()) }
+        if (isBossInArea) {
+            boss.spawned = true
+            boss.foundBeacon = null
+            boss.possibleSpawnTime = null
+            return
+        }
+        boss.spawned = false
+
+        val isThereBeacon = EntityUtils.getAllTileEntities().filter { it is TileEntityBeacon }.any {
+            boss.area.isInside(it.pos.toLorenzVec())
+        }
+        if (boss.foundBeacon == true && !isThereBeacon) {
+            boss.foundBeacon = false
+            boss.possibleSpawnTime = null
+            boss.nextSpawnTime = now + 1.minutes
+            return
+        }
+        if (boss.possibleSpawnTime != null) return
+        if (isThereBeacon && boss.foundBeacon == null) {
+            boss.foundBeacon = true
+            boss.possibleSpawnTime = now + 1.minutes to now + 2.minutes
+            return
+        }
+        if (!isThereBeacon && boss.foundBeacon == null) {
+            boss.foundBeacon = false
+            boss.possibleSpawnTime = now to now + 1.minutes
+        }
+    }
+
+    private fun update() {
+        display = drawDisplay()
+    }
+
+    private fun drawDisplay(): Renderable {
+        val lines = MiniBoss.entries.map {
+            val timer = it.nextSpawnTime
+            val possibleTimer = it.possibleSpawnTime
+            Renderable.string(
+                buildString {
+                    append("§b${it.displayName}: ")
+                    if (it.isSpawned()) append("§aSPAWNED!")
+                    else when {
+                        it.isSpawningSoon() -> append("§6Soon!")
+                        it.isTimerKnown() -> append("§e${timer?.timeUntil()?.format()}")
+                        possibleTimer != null -> {
+                            val (start, end) = possibleTimer
+                            if (start.timeUntil().isNegative()) append("§e~Now - ")
+                            else append("§e~${start.timeUntil().format()} - ")
+                            if (end.timeUntil().isNegative()) append("§eNow")
+                            else append("§e${end.timeUntil().format()}")
+                        }
+                        else -> append("§cUnknown")
+                    }
+                },
+            )
+        }
+        return Renderable.verticalContainer(lines)
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        MiniBoss.entries.forEach {
+            it.nextSpawnTime = null
+            it.possibleSpawnTime = null
+            it.foundBeacon = null
+            it.spawned = null
+            it.lastSeenArea = SimpleTimeMark.farPast()
+        }
+        currentAreaBoss = null
+    }
+
+    @SubscribeEvent
+    fun onDebug(event: DebugDataCollectEvent) {
+        event.title("Crimson Isle Miniboss")
+        event.addIrrelevant {
+            if (!isEnabled()) {
+                add("Feature is Disabled")
+                return@addIrrelevant
+            }
+            add("Current Area Boss: ${currentAreaBoss?.displayName}")
+            MiniBoss.entries.forEach {
+                add("")
+                add(it.displayName)
+                add("   Timer ${it.nextSpawnTime?.timeUntil()?.format()}")
+                add(
+                    "   Possible Timer ${it.possibleSpawnTime?.first?.timeUntil()?.format()} - " + "${
+                        it.possibleSpawnTime?.second?.timeUntil()?.format()
+                    }",
+                )
+                add("   Found Beacon ${it.foundBeacon}")
+                add("   Spawned ${it.spawned}")
+                add("   Last Seen Area ${it.lastSeenArea.passedSince().format()}")
+            }
+        }
+    }
+
+    enum class MiniBoss(
+        val displayName: String,
+        val area: AxisAlignedBB,
+        var nextSpawnTime: SimpleTimeMark? = null,
+        var possibleSpawnTime: Pair<SimpleTimeMark, SimpleTimeMark>? = null,
+        var foundBeacon: Boolean? = null,
+        var spawned: Boolean? = null,
+        var lastSeenArea: SimpleTimeMark = SimpleTimeMark.farPast(),
+    ) {
+        BLADESOUL(
+            "Bladesoul",
+            LorenzVec(-330, 80, -486).axisAlignedTo(LorenzVec(-257, 107, -545)),
+        ),
+        MAGE_OUTLAW(
+            "Mage Outlaw",
+            LorenzVec(-200, 98, -843).axisAlignedTo(LorenzVec(-162, 116, -878)),
+        ),
+        BARBARIAN_DUKE_X(
+            "Barbarian Duke X",
+            LorenzVec(-550, 101, -890).axisAlignedTo(LorenzVec(-522, 131, -918)),
+        ),
+        ASHFANG(
+            "Ashfang",
+            LorenzVec(-462, 155, -1035).axisAlignedTo(LorenzVec(-507, 131, -955)),
+        ),
+        MAGMA_BOSS(
+            "Magma Boss",
+            LorenzVec(-318, 59, -751).axisAlignedTo(LorenzVec(-442, 90, -851)),
+        ),
+        ;
+
+        override fun toString() = displayName
+
+        companion object {
+            fun fromName(spawnName: String) = entries.firstOrNull {
+                it.displayName.removeColor().lowercase() == spawnName.lowercase()
+            }
+
+            fun MiniBoss.isTimerKnown(): Boolean {
+                val timer = nextSpawnTime ?: return false
+                return timer.passedSince() < 2.minutes + 5.seconds
+            }
+
+            fun MiniBoss.isSpawningSoon(): Boolean {
+                if (spawned == true) return false
+                val timer = nextSpawnTime ?: return false
+                return timer.passedSince() in 0.seconds..10.seconds
+            }
+
+            fun MiniBoss.isSpawned(): Boolean {
+                if (spawned == true) return true
+                val timer = nextSpawnTime ?: return false
+                return (timer.passedSince() - 2.minutes) in 0.seconds..20.seconds
+            }
+        }
+    }
+
+    private fun isEnabled() = IslandType.CRIMSON_ISLE.isInIsland() && config.minibossRespawnTimer
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 5e85bb64fd5c..5f52508f2141 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -27,12 +27,15 @@ import net.minecraft.entity.monster.EntityEnderman
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.potion.Potion
+import net.minecraft.scoreboard.ScorePlayerTeam
+import net.minecraft.tileentity.TileEntity
 import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.client.event.RenderLivingEvent
 
 //#if FORGE
 import net.minecraftforge.fml.common.eventhandler.Event
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
 //#endif
 
 @SkyHanniModule
@@ -131,8 +134,7 @@ object EntityUtils {
         return gameProfile.properties.entries()
             .filter { it.key == "textures" }
             .map { it.value }
-            .firstOrNull { it.name == "textures" }
-            ?.value
+            .firstOrNull { it.name == "textures" }?.value
     }
 
     inline fun <reified T : Entity> getEntitiesNextToPlayer(radius: Double): Sequence<T> =
@@ -182,6 +184,10 @@ object EntityUtils {
         ) it else it.toMutableList() // TODO: while i am here, i want to point out that copying the entity list does not constitute proper synchronization, but *does* make crashes because of it rarer.
     }?.asSequence()?.filterNotNull() ?: emptySequence()
 
+    fun getAllTileEntities(): Sequence<TileEntity> = Minecraft.getMinecraft()?.theWorld?.loadedTileEntityList?.let {
+        if (Minecraft.getMinecraft().isCallingFromMinecraftThread) it else it.toMutableList()
+    }?.asSequence()?.filterNotNull() ?: emptySequence()
+
     fun Entity.canBeSeen(radius: Double = 150.0) = getLorenzVec().add(y = 0.5).canBeSeen(radius)
 
     fun getEntityByID(entityId: Int) = Minecraft.getMinecraft()?.thePlayer?.entityWorld?.getEntityByID(entityId)
@@ -217,11 +223,10 @@ object EntityUtils {
         SkyHanniRenderEntityEvent.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }
 
-//#if MC < 11400
+    //#if MC < 11400
     @SubscribeEvent
     fun onEntityRenderSpecialsPre(
-        event:
-        RenderLivingEvent.Specials.Pre<*>,
+        event: RenderLivingEvent.Specials.Pre<*>,
     ) {
         val shEvent = SkyHanniRenderEntityEvent.Specials.Pre(event.entity, event.renderer, event.x, event.y, event.z)
         if (shEvent.postAndCatch()) {
@@ -231,8 +236,7 @@ object EntityUtils {
 
     @SubscribeEvent
     fun onEntityRenderSpecialsPost(
-        event:
-        RenderLivingEvent.Specials.Post<*>,
+        event: RenderLivingEvent.Specials.Post<*>,
     ) {
         SkyHanniRenderEntityEvent.Specials.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }

From 8fb2fbf7e06f6d711a9093334f7fa14df794be20 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 9 Sep 2024 14:48:03 +0200
Subject: [PATCH 419/721] Version 0.27 Beta 6

---
 docs/CHANGELOG.md                             | 46 +++++++++++++++++++
 docs/FEATURES.md                              | 20 ++++++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index c6742b5112a0..0d26050da8b3 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -18,12 +18,17 @@
 #### Rift Features
 
 + Added Motes per Session. - Empa (https://github.com/hannibal002/SkyHanni/pull/2323)
++ Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
+    + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
++ Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
 
 #### Dungeon Features
 
 + Added highlight for starred dungeon mobs. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
 + Added highlight for Fel skulls. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
     + Optionally draws a line to them as well.
++ Added a Secret Chime for Dungeons with adjustable pitch and sound. - Ovi_1 (https://github.com/hannibal002/SkyHanni/pull/2478)
+    + The sound and pitch of chimes in dungeons are customizable.
 
 #### Scoreboard Features
 
@@ -34,11 +39,15 @@
 
 + Added Hoppity Hunt event summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
     + Use /shhoppitystats for live stats.
++ Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
++ Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 
 #### GUI Features
 
 + Added Editable XP Bar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1944)
     + Enabled moving and scaling of the XP bar in the SkyHanni GUI Editor.
++ Added Display Tab Widgets. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1276)
+    + Allows the display of information from the Tab (e.g., Bestiary info).
 
 #### Inventory Features
 
@@ -50,6 +59,12 @@
     + Shows the Bits you would gain.
     + Can show the change for the available Bits.
     + Also shows the time more clearly (or adds it if not present).
++ Added Compact Experimentation Table chat rewards. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2209)
+    + Uses a compact chat message of rewards gained from Add-ons/Experiments.
++ Added Personal Compactor/Deletor Overlay. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
+    + Shows what items are currently inside the personal compactor/deletor, and whether the accessory is turned on or off.
++ Added Accessory magical power display as stack size. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2243)
+    + Only works inside the Accessory Bag and Auction House.
 
 #### Chat Features
 
@@ -69,9 +84,20 @@
     + Changes the tracked item amount for Diana, Fishing, Pest, Excavator, and Slayer Item Trackers.
     + Use a negative amount to remove items.
 
+#### Crimson Isle Features
+
++ Added Crimson Isle Miniboss Respawn Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/2042)
+
+#### Combat Features
+
++ Added Arachne Kill Timer. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/1993)
+    + Shows how long it took to kill Arachne when the fight ends.
+
 #### Misc Features
 
 + Added a notification when you join a server you have joined previously. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2046)
++ Added warning when Non-God Pot effects are about to expire. - saga (https://github.com/hannibal002/SkyHanni/pull/2004)
+    + Sends a title and plays a sound at a customizable time before the effect expires.
 
 ### Improvements
 
@@ -82,6 +108,7 @@
 + Added current session and total Mineshaft count to the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2310)
 + Some icons in the Mining Event Display now use the texture of the item they represent. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2425)
     + E.g., Raffle Event -> Raffle Ticket.
++ Changed how Powder Tracker works to account for powder buffs. - Jordyrat + Empa (https://github.com/hannibal002/SkyHanni/pull/2394)
 
 #### Diana Improvements
 
@@ -116,6 +143,8 @@
 + Reworked the chat formatting for reminders and warnings across multiple features. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2428)
     + They now all allow performing an action on click (e.g., warping you somewhere or opening a menu) and can be disabled in the config via shift-click or control-click on the chat message.
     + Changed chat messages: Account/Profile Upgrade reminder, Hoppity Cake reminder, New Year Hoppity NPC reminder, New Year Cake reminder, City Project reminder, Garden Composter empty warning, CF Custom Goal reached message, Time Tower warning, CF upgrade warning.
++ Added more options to the Chat Hider feature. - not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2348)
+    + Option to block parkour messages and teleport pad messages.
 
 #### Hoppity Improvements
 
@@ -138,6 +167,7 @@
     + Now warns only when actually farming and wearing Rancher Boots.
 + Changed suggested cactus speed to 464 again. - DarkDash (https://github.com/hannibal002/SkyHanni/pull/2424)
     + Since the cactus knife now allows 500 max speed.
++ Made the waypoint to the middle of the plot for Pest Waypoint optional (off by default). - Luna (https://github.com/hannibal002/SkyHanni/pull/2469)
 
 #### Rift Improvements
 
@@ -165,6 +195,7 @@
 + Fixed /show displaying an incorrect number of enchants. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2435)
 + Fixed Armor Hider hiding armor inside the Custom Wardrobe. - Empa (https://github.com/hannibal002/SkyHanni/pull/2449)
 + Fixed detection of El Dorado and Stray Hordes in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2450)
++ Fixed merged enchant books tooltip being overwritten. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2454)
 
 #### Mining Fixes
 
@@ -191,6 +222,7 @@
 + Fixed Minister not resetting after the election closed. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2467)
 + Fixed Custom Scoreboard errors while doing Carnival activities. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2455)
 + Fixed Custom Scoreboard error while in a Dungeon Queue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2441)
++ Fixed Custom Scoreboard Error during the Barry Protestors Quest. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2480)
 
 #### Hoppity Fixes
 
@@ -207,6 +239,9 @@
 + Fixed the mod crashing on startup when the game directory path contains a "!". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2427)
 + Fixed chat formatting for coin drops in profit trackers (Diana, Slayer, Fishing, Pest). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2444)
 + Fixed Last Server Time Slider not functioning. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2440)
++ Fixed warning sounds being stuttered and cutting out. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2482)
++ Fixed an internal bug with `getItemName` that caused the `NEUInternalName.NONE has no name!` error messages to appear. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2471)
++ Fixed a typo in mob detection config. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2472)
 
 #### Chat Fixes
 
@@ -226,6 +261,7 @@
 #### Crimson Isle Fixes
 
 + Fixed the reputation helper not updating after a sack update. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2439)
++ Fixed Heavy Pearls sometimes not being highlighted. - Luna (https://github.com/hannibal002/SkyHanni/pull/2479)
 
 ### Technical Details
 
@@ -247,6 +283,16 @@
     + WASD node movement now reflects the player's look direction.
     + Nodes are only deleted when they are selected/active.
     + Allows creating nodes much closer to each other.
++ Replaced `List<List<Any>>` with `List<Renderable>` in all SkyHanni trackers. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2474)
++ Rebased Hoppity config to be in its own package. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
++ Use on DelayedRun to add scheduled tasks. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2462)
++ Created a `ClickBlockType` enum and a `DungeonBlockClickEvent` class. - Ovi_1 (https://github.com/hannibal002/SkyHanni/pull/2478)
+    + Added a new enum for block types and a class to handle click events on dungeon blocks.
++ Updated `DungeonHighlightClickedBlocks` to use the new `DungeonBlockClickEvent` class. - Ovi_1 (https://github.com/hannibal002/SkyHanni/pull/2478)
++ Added fakeInventory, paddingContainer and drawInsideFixedSizedImage. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
++ Changed RenderableTooltips to be more consistent with the vanilla ones. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
++ Improved error logging for enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2454)
++ Added renderable search box. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2475)
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 5b2c0a0c35cc..5ae7ac05a2be 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -113,6 +113,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added highlight for starred dungeon mobs. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
 + Added highlight for Fel skulls. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1558)
     + Optionally draws a line to them as well.
++ Added a Secret Chime for Dungeons with adjustable pitch and sound. - Ovi_1 (https://github.com/hannibal002/SkyHanni/pull/2478)
+    + The sound and pitch of chimes in dungeons are customizable.
 
 </details>
 <details open><summary>
@@ -532,6 +534,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + "Line to Arachne" setting, just like with slayer mini bosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888)
 + Countdown for Arachne spawn. - Cad
     + Supports quick spawns.
++ Added Arachne Kill Timer. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/1993)
+    + Shows how long it took to kill Arachne when the fight ends.
 + Option to hide the vanilla particles around enderman
 
 </details>
@@ -824,6 +828,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highlights unpunched players in the Rift.
 + Added Splatter Hearts Highlight for the Rift. - Empa (https://github.com/hannibal002/SkyHanni/pull/2318)
 + Added Motes per Session. - Empa (https://github.com/hannibal002/SkyHanni/pull/2323)
++ Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
+    + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
++ Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
 
 </details>
 <details open><summary>
@@ -973,6 +980,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added a tracker for stray rabbits caught in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2210)
 + Added Hoppity Hunt event summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2311)
     + Use /shhoppitystats for live stats.
++ Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
++ Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 
 </details>
 <details open><summary>
@@ -1041,6 +1050,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Option to hide all damage splashes, from anywhere in SkyBlock.
 + Hide armor or just helmet of other player or yourself
 + Display the active non-god potion effects.
++ Added warning when Non-God Pot effects are about to expire. - saga (https://github.com/hannibal002/SkyHanni/pull/2004)
+    + Sends a title and plays a sound at a customizable time before the effect expires.
 + Wishing compass uses amount display.
 + Brewing Stand Overlay.
 + Crimson Isle Reputation Helper.
@@ -1059,6 +1070,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Dojo Rank Display. - HiZe
     + Display your rank, score, actual belt and points needed for the next belt in the Challenges inventory on the
       Crimson Isles.
++ Added Crimson Isle Miniboss Respawn Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/2042)
 + Matriarch Helper. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1385)
     + Highlights the Heavy Pearls.
     + Draws a line to the Heavy Pearls.
@@ -1289,6 +1301,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added a warning when opening the Experimentation Table without a Guardian pet. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2127)
 + Added Enchanting Experience as Stack Size in Experimentation Table. - saga (https://github.com/hannibal002/SkyHanni/pull/1988)
     + Added to the Item Number list.
++ Added Compact Experimentation Table chat rewards. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2209)
+    + Uses a compact chat message of rewards gained from Add-ons/Experiments.
 + In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
 + Added Beacon Power Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1901)
@@ -1315,6 +1329,12 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Enabled moving and scaling of the XP bar in the SkyHanni GUI Editor.
 + Show dye hex code as the actual color in the item lore. - nopo (https://github.com/hannibal002/SkyHanni/pull/2321)
 + Added a notification when you join a server you have joined previously. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2046)
++ Added Personal Compactor/Deletor Overlay. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
+    + Shows what items are currently inside the personal compactor/deletor, and whether the accessory is turned on or off.
++ Added Display Tab Widgets. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1276)
+    + Allows the display of information from the Tab (e.g., Bestiary info).
++ Added Accessory magical power display as stack size. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2243)
+    + Only works inside the Accessory Bag and Auction House.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 112dda37068a..5fbee7047912 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.5"
+    version = "0.27.Beta.6"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 832c3ab93972..c0723cf48dec 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.5",
+    version = "0.27.Beta.6",
 )
 class SkyHanniMod {
 

From 2b4011efc9ef79fc478b44bce4959dc37424138a Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:07:12 +0200
Subject: [PATCH 420/721] Feature: Show Custom Scoreboard outside SkyBlock
 (#1881)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |  2 +-
 .../skyhanni/config/enums/OutsideSbFeature.kt |  7 +--
 .../gui/customscoreboard/DisplayConfig.java   |  5 ++
 .../TitleAndFooterConfig.java                 | 10 ++--
 .../config/features/misc/MiscConfig.java      |  3 +-
 .../gui/customscoreboard/CustomScoreboard.kt  | 46 +++++++++++++++----
 .../customscoreboard/ScoreboardElements.kt    | 26 +++++++----
 .../customscoreboard/UnknownLinesHandler.kt   | 10 ++--
 8 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index b677134358a3..c881cc578ba4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 56
+    const val CONFIG_VERSION = 57
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt b/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt
index e334785c556e..9180273aab78 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt
@@ -18,10 +18,11 @@ enum class OutsideSbFeature(private val displayName: String) {
     FOLLOWING_LINE("Following Line"),
     ARROW_TRAIL("Arrow Trail"),
     HIGHLIGHT_PARTY_MEMBERS("Highlight Party Members"),
-    MOVEMENT_SPEED("Movement Speed");
+    MOVEMENT_SPEED("Movement Speed"),
+    CUSTOM_SCOREBOARD("Custom Scoreboard (only on Hypixel)"),
+    ;
 
     override fun toString() = displayName
 
-    fun isSelected() =
-        Minecraft.getMinecraft().thePlayer != null && SkyHanniMod.feature.misc.showOutsideSB.contains(this)
+    fun isSelected() = Minecraft.getMinecraft().thePlayer != null && SkyHanniMod.feature.misc.showOutsideSB.get().contains(this)
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
index 0d61401eefb6..2f0eb502e509 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
@@ -70,6 +70,11 @@ public class DisplayConfig {
     @ConfigEditorBoolean
     public boolean hideCoinsDifference = false;
 
+    @Expose
+    @ConfigOption(name = "Use Custom Lines", desc = "Use custom lines instead of the default ones.")
+    @ConfigEditorBoolean
+    public boolean useCustomLines = true;
+
     @Expose
     @ConfigOption(name = "Show unclaimed bits", desc = "Show the amount of available Bits that can still be claimed.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/TitleAndFooterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/TitleAndFooterConfig.java
index 6bb517d6ffb3..1c3bb4304509 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/TitleAndFooterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/TitleAndFooterConfig.java
@@ -23,10 +23,14 @@ public class TitleAndFooterConfig {
     public Property<String> customTitle = Property.of("&6&lSKYBLOCK");
 
     @Expose
-    @ConfigOption(name = "Hypixel's Title Animation", desc = "Will overwrite the custom title with Hypixel's title animation." +
-        "\nWill also include \"COOP\" if you are in a coop.")
+    @ConfigOption(name = "Use Custom Title", desc = "Use a custom title instead of the default Hypixel title.")
     @ConfigEditorBoolean
-    public boolean useHypixelTitleAnimation = false;
+    public boolean useCustomTitle = true;
+
+    @Expose
+    @ConfigOption(name = "Use Custom Title Outside SkyBlock", desc = "Use a custom title outside of SkyBlock.")
+    @ConfigEditorBoolean
+    public boolean useCustomTitleOutsideSkyBlock = false;
 
     @Expose
     @ConfigOption(name = "Custom Footer", desc = "What should be displayed as the footer of the scoreboard." +
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index a06055f97afe..1464d35ada2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -15,6 +15,7 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -121,7 +122,7 @@ public class MiscConfig {
     @Expose
     @ConfigOption(name = "Show Outside SkyBlock", desc = "Show these features outside of SkyBlock.")
     @ConfigEditorDraggableList
-    public List<OutsideSbFeature> showOutsideSB = new ArrayList<>();
+    public Property<List<OutsideSbFeature>> showOutsideSB = Property.of(new ArrayList<>());
 
     @Expose
     @ConfigOption(name = "Exp Bottles", desc = "Hide all the experience orbs lying on the ground.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index 93a5b2a13ac0..a3da970c660f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -12,6 +12,8 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.config.enums.OutsideSbFeature
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiPositionMovedEvent
@@ -61,7 +63,7 @@ object CustomScoreboard {
         if (display.isEmpty()) return
 
         val render =
-            if (!TabListData.fullyLoaded && displayConfig.cacheScoreboardOnIslandSwitch && cache.isNotEmpty()) {
+            if (LorenzUtils.inSkyBlock && !TabListData.fullyLoaded && displayConfig.cacheScoreboardOnIslandSwitch && cache.isNotEmpty()) {
                 cache
             } else {
                 display
@@ -128,7 +130,7 @@ object CustomScoreboard {
         }
 
         // Remove Known Lines, so we can get the unknown ones
-        UnknownLinesHandler.handleUnknownLines()
+        if (LorenzUtils.inSkyBlock && displayConfig.useCustomLines) UnknownLinesHandler.handleUnknownLines()
     }
 
     @SubscribeEvent
@@ -150,12 +152,27 @@ object CustomScoreboard {
     internal val informationFilteringConfig get() = config.informationFiltering
     internal val backgroundConfig get() = config.background
 
-    private fun createLines() = buildList<ScoreboardElementType> {
+    private fun createLines() = when {
+        !LorenzUtils.inSkyBlock -> addAllNonSkyBlockLines()
+        !displayConfig.useCustomLines -> addDefaultSkyBlockLines()
+        else -> addCustomSkyBlockLines()
+    }
+
+    private fun addAllNonSkyBlockLines() = buildList {
+        addAll(ScoreboardElement.TITLE.getVisiblePair())
+        addAll(activeLines.map { it to HorizontalAlignment.LEFT })
+    }
+
+    private fun addDefaultSkyBlockLines() = buildList {
+        add(ScoreboardData.objectiveTitle to displayConfig.titleAndFooter.alignTitleAndFooter)
+        addAll(activeLines.map { it to HorizontalAlignment.LEFT })
+    }
+
+    private fun addCustomSkyBlockLines() = buildList<ScoreboardElementType> {
         for (element in config.scoreboardEntries) {
             val lines = element.getVisiblePair()
             if (lines.isEmpty()) continue
 
-            // Hide consecutive empty lines
             if (
                 informationFilteringConfig.hideConsecutiveEmptyLines &&
                 lines.first().first == "<empty>" && lastOrNull()?.first?.isEmpty() == true
@@ -163,13 +180,11 @@ object CustomScoreboard {
                 continue
             }
 
-            // Adds empty lines
             if (lines.first().first == "<empty>") {
                 add("" to HorizontalAlignment.LEFT)
                 continue
             }
 
-            // Does not display this line
             if (lines.any { it.first == "<hidden>" }) {
                 continue
             }
@@ -205,7 +220,11 @@ object CustomScoreboard {
 
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
-        ConditionalUtils.onToggle(config.enabled, displayConfig.hideVanillaScoreboard) {
+        ConditionalUtils.onToggle(
+            config.enabled,
+            displayConfig.hideVanillaScoreboard,
+            SkyHanniMod.feature.misc.showOutsideSB,
+        ) {
             if (!isHideVanillaScoreboardEnabled()) dirty = true
         }
     }
@@ -213,7 +232,7 @@ object CustomScoreboard {
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         runDelayed(2.seconds) {
-            if (!LorenzUtils.inSkyBlock) dirty = true
+            if (!LorenzUtils.inSkyBlock || !(LorenzUtils.onHypixel && OutsideSbFeature.CUSTOM_SCOREBOARD.isSelected())) dirty = true
         }
     }
 
@@ -235,7 +254,9 @@ object CustomScoreboard {
         }
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled.get()
+    private fun isEnabled() =
+        (LorenzUtils.inSkyBlock || (OutsideSbFeature.CUSTOM_SCOREBOARD.isSelected() && LorenzUtils.onHypixel)) && config.enabled.get()
+
     private fun isHideVanillaScoreboardEnabled() = isEnabled() && displayConfig.hideVanillaScoreboard.get()
 
     @SubscribeEvent
@@ -327,5 +348,12 @@ object CustomScoreboard {
             array.add(JsonPrimitive(ScoreboardEvent.NEW_YEAR.name))
             array
         }
+        event.move(
+            57,
+            "$displayPrefix.titleAndFooter.useHypixelTitleAnimation",
+            "$displayPrefix.titleAndFooter.useCustomTitle",
+        ) {
+            JsonPrimitive(!it.asBoolean)
+        }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 369fca62e3c9..7636d43ebabf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -64,6 +64,8 @@ internal var unconfirmedUnknownLines = listOf<String>()
 internal var unknownLinesSet = TimeLimitedSet<String>(1.seconds) { onRemoval(it) }
 
 private fun onRemoval(line: String) {
+    if (!LorenzUtils.inSkyBlock) return
+    if (!unconfirmedUnknownLines.contains(line)) return
     if (line !in unconfirmedUnknownLines) return
     unconfirmedUnknownLines = unconfirmedUnknownLines.filterNot { it == line }
     confirmedUnknownLines = confirmedUnknownLines.editCopy { add(line) }
@@ -360,17 +362,23 @@ enum class ScoreboardElement(
     }
 }
 
-private fun getTitleDisplayPair(): List<ScoreboardElementType> =
-    if (displayConfig.titleAndFooter.useHypixelTitleAnimation) {
-        listOf(ScoreboardData.objectiveTitle to displayConfig.titleAndFooter.alignTitleAndFooter)
-    } else {
-        listOf(
-            displayConfig.titleAndFooter.customTitle.get().toString()
-                .replace("&", "§")
-                .split("\\n")
-                .map { it to displayConfig.titleAndFooter.alignTitleAndFooter },
+private fun getTitleDisplayPair(): List<ScoreboardElementType> {
+    val alignment = displayConfig.titleAndFooter.alignTitleAndFooter
+
+    if (!LorenzUtils.inSkyBlock && !displayConfig.titleAndFooter.useCustomTitleOutsideSkyBlock) {
+        return listOf(ScoreboardData.objectiveTitle to alignment)
+    }
+
+    return if (displayConfig.titleAndFooter.useCustomTitle) {
+        listOf(displayConfig.titleAndFooter.customTitle.get().toString()
+            .replace("&", "§")
+            .split("\\n")
+            .map { it to alignment }
         ).flatten()
+    } else {
+        listOf(ScoreboardData.objectiveTitle to alignment)
     }
+}
 
 private fun getProfileDisplayPair() = listOf(
     CustomScoreboardUtils.getProfileTypeSymbol() + HypixelData.profileName.firstLetterUppercase()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index 4e102ee34ba3..fa693f648dbc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.features.misc.ServerRestartTitle
 import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigies
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import java.util.regex.Pattern
@@ -18,10 +19,7 @@ object UnknownLinesHandler {
     fun handleUnknownLines() {
         val sidebarLines = CustomScoreboard.activeLines
 
-        var unknownLines = sidebarLines
-            .map { it.removeResets() }
-            .filter { it.isNotBlank() }
-            .filter { it.trim().length > 3 }
+        var unknownLines = sidebarLines.map { it.removeResets() }.filter { it.isNotBlank() }.filter { it.trim().length > 3 }
 
         /**
          * Remove known lines with patterns
@@ -214,7 +212,9 @@ object UnknownLinesHandler {
         unknownLines = unknownLines.filter { it !in unknownLinesSet }
 
         unknownLines.forEach {
-            ChatUtils.debug("Unknown Scoreboard line: '$it'")
+            if (LorenzUtils.inSkyBlock) {
+                ChatUtils.debug("Unknown Scoreboard line: '$it'")
+            }
             unknownLinesSet.add(it)
         }
     }

From e17e70b6933982ca417577f441928f77cbbf9ef1 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:24:39 +0200
Subject: [PATCH 421/721] Feature: Current Minister in Calendar (#2342)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |  6 ++
 .../at/hannibal2/skyhanni/data/MayorAPI.kt    | 18 ++--
 .../java/at/hannibal2/skyhanni/data/Mayors.kt | 20 +++--
 .../features/inventory/MinisterInCalendar.kt  | 86 +++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 13 +++
 .../hannibal2/skyhanni/utils/StringUtils.kt   |  1 -
 6 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index dfb8f1f9c396..cf162ad7b6a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -275,6 +275,12 @@ public String toString() {
     @FeatureToggle
     public boolean stonkOfStonkPrice = true;
 
+    @Expose
+    @ConfigOption(name = "Minister in Calendar", desc = "Show the Minister with their perk in the Calendar.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean ministerInCalendar = true;
+
     @Expose
     @ConfigOption(name = "Show hex as actual color", desc = "Changes the color of hex codes to the actual color.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index a8024ea3687a..2f89b340b656 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -24,6 +24,7 @@ import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
+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.SimpleTimeMark.Companion.asTimeMark
@@ -63,17 +64,18 @@ object MayorAPI {
     /**
      * REGEX-TEST: Calendar and Events
      */
-    private val calendarGuiPattern by group.pattern(
+    val calendarGuiPattern by group.pattern(
         "calendar.gui",
         "Calendar and Events",
     )
 
     /**
      * REGEX-TEST: §dMayor Jerry
+     * REGEX-TEST: §cMayor Aatrox
      */
-    private val jerryHeadPattern by group.pattern(
-        "jerry.head",
-        "§dMayor Jerry",
+    private val mayorHeadPattern by group.pattern(
+        "mayor.head",
+        "§.Mayor (?<name>.*)",
     )
 
     /**
@@ -162,7 +164,11 @@ object MayorAPI {
 
         if (!calendarGuiPattern.matches(event.inventoryName)) return
 
-        val stack: ItemStack = event.inventoryItems.values.firstOrNull { jerryHeadPattern.matches(it.displayName) } ?: return
+        val stack: ItemStack = event.inventoryItems.values.firstOrNull {
+            mayorHeadPattern.matchMatcher(it.displayName) {
+                group("name") == "Jerry"
+            } ?: false
+        } ?: return
 
         val perk = stack.getLore().nextAfter({ perkpocalypsePerksPattern.matches(it) }) ?: return
         // This is the first Perk of the Perkpocalypse Mayor
@@ -248,7 +254,7 @@ object MayorAPI {
         event.addIrrelevant {
             add("Current Mayor: ${currentMayor?.name ?: "Unknown"}")
             add("Active Perks: ${currentMayor?.activePerks}")
-            add("Last Update: $lastUpdate (${lastUpdate.passedSince()} ago)")
+            add("Last Update: ${lastUpdate.formattedDate("EEEE, MMM d h:mm a")} (${lastUpdate.passedSince()} ago)")
             add("Time Till Next Mayor: ${nextMayorTimestamp.timeUntil()}")
             add("Current Minister: ${currentMinister?.name ?: "Unknown"}")
             add("Current Minister Perk: ${currentMinister?.activePerks}")
diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 2215f620cc69..78647944c9a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -132,8 +132,12 @@ enum class Mayor(
                 )
                 return null
             }
-            val perks = perksJson.mapNotNull { perk ->
-                Perk.entries.firstOrNull { it.perkName == perk.renameIfFoxyExtraEventPerkFound() }
+
+            val perks = perksJson.mapNotNull { perkJson ->
+                val perk = Perk.entries.firstOrNull { it.perkName == perkJson.renameIfFoxyExtraEventPerkFound() }
+                perk?.also {
+                    it.description = perkJson.description
+                }
             }
 
             mayor.addPerks(perks)
@@ -149,17 +153,16 @@ enum class Mayor(
             }
         }
 
-        private fun MayorPerk.renameIfFoxyExtraEventPerkFound(): String? {
+        private fun MayorPerk.renameIfFoxyExtraEventPerkFound(): String {
             val foxyExtraEventPairs = mapOf(
                 "Spooky Festival" to "Extra Event (Spooky)",
                 "Mining Fiesta" to "Extra Event (Mining)",
                 "Fishing Festival" to "Extra Event (Fishing)",
             )
 
-            foxyExtraEventPattern.matchMatcher(this.description) {
-                return foxyExtraEventPairs.entries.firstOrNull { it.key == group("event") }?.value
-            }
-            return this.name
+            return foxyExtraEventPattern.matchMatcher(this.description) {
+                foxyExtraEventPairs.entries.firstOrNull { it.key == group("event") }?.value
+            } ?: this.name
         }
     }
 }
@@ -230,6 +233,9 @@ enum class Perk(val perkName: String) {
     ;
 
     var isActive = false
+    var description = "§cDescription failed to load from the API."
+
+    override fun toString(): String = "$perkName: $description"
 
     companion object {
         fun getPerkFromName(name: String): Perk? = entries.firstOrNull { it.perkName == name }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
new file mode 100644
index 000000000000..d078f0d1a39f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
@@ -0,0 +1,86 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.Mayor
+import at.hannibal2.skyhanni.data.MayorAPI
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.setLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.splitLines
+import net.minecraft.client.player.inventory.ContainerLocalMenu
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object MinisterInCalendar {
+
+    private const val MINISTER_SLOT = 38
+    private var ministerItemStack: ItemStack? = null
+
+    private val prefix = listOf(
+        "§8(from SkyHanni)",
+        "",
+        "§8§m--------------------------",
+    )
+    private val suffix = listOf(
+        "§8§m--------------------------",
+        "",
+        "§7The Minister is who came in 2nd place",
+        "§7during the election. They have one",
+        "§7of their perks active.",
+    )
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryOpenEvent) {
+        if (!isEnabled()) return
+        if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return
+        val minister = MayorAPI.currentMinister ?: return
+
+        val itemStack = "${minister.name}_MAYOR_MONSTER".asInternalName().getItemStack()
+        val ministerColor = MayorAPI.mayorNameToColorCode(minister.mayorName)
+
+        ministerItemStack = changeItem(ministerColor, minister, itemStack)
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        if (!isEnabled()) return
+        if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return
+        ministerItemStack = null
+    }
+
+    @SubscribeEvent
+    fun replaceItem(event: ReplaceItemEvent) {
+        if (!isEnabled()) return
+        if (event.inventory !is ContainerLocalMenu || event.slot != MINISTER_SLOT) return
+        if (!MayorAPI.calendarGuiPattern.matches(InventoryUtils.openInventoryName())) return
+        event.replace(ministerItemStack ?: return)
+    }
+
+    private fun changeItem(
+        ministerColor: String,
+        minister: Mayor,
+        item: ItemStack,
+    ): ItemStack? {
+        val ministerDisplayName = "${ministerColor}Minister ${minister.mayorName}"
+        val ministerLore = buildList {
+            addAll(prefix)
+            for (perk in minister.activePerks) {
+                add("$ministerColor${perk.perkName}")
+                addAll(perk.description.splitLines(170).removePrefix("§r").split("\n").map { "§7$it" })
+            }
+            addAll(suffix)
+        }
+
+        return item.setLore(ministerLore).setStackDisplayName(ministerDisplayName)
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.inventory.ministerInCalendar
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 774638c5d66f..168a12d95d62 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -55,6 +55,19 @@ object ItemUtils {
         return list
     }
 
+    fun ItemStack.setLore(lore: List<String>): ItemStack {
+        val tagCompound = this.tagCompound ?: NBTTagCompound()
+        val display = tagCompound.getCompoundTag("display")
+        val tagList = NBTTagList()
+        for (line in lore) {
+            tagList.appendTag(NBTTagString(line))
+        }
+        display.setTag("Lore", tagList)
+        tagCompound.setTag("display", display)
+        this.tagCompound = tagCompound
+        return this
+    }
+
     var ItemStack.extraAttributes: NBTTagCompound
         get() = this.tagCompound?.getCompoundTag("ExtraAttributes") ?: NBTTagCompound()
         set(value) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index e1a01e5dfcba..f3076284d3e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -247,7 +247,6 @@ object StringUtils {
         } ?: text
     }
 
-
     /**
      * Creates a comma-separated list using natural formatting (a, b, and c).
      * @param list - the list of strings to join into a string, containing 0 or more elements.

From 18da4a7c13d215fb6cd7969654986d9072dd24fa Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:26:16 +0200
Subject: [PATCH 422/721] Improvement: SH Tracker Search (#2477)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../endernodetracker/EnderNodeTracker.kt      |  33 ++-
 .../event/diana/DianaProfitTracker.kt         |  10 +-
 .../diana/MythologicalCreatureTracker.kt      |  35 +--
 .../frozentreasure/FrozenTreasureTracker.kt   |  26 +-
 .../fishing/tracker/FishingProfitTracker.kt   |  14 +-
 .../fishing/tracker/SeaCreatureTracker.kt     |  16 +-
 .../garden/farming/ArmorDropTracker.kt        |  10 +-
 .../garden/farming/DicerRngDropTracker.kt     |  13 +-
 .../garden/pests/PestProfitTracker.kt         |  10 +-
 .../features/inventory/SackDisplay.kt         |  26 +-
 .../ChocolateFactoryStrayTracker.kt           |  13 +-
 .../fossilexcavator/ExcavatorProfitTracker.kt |  22 +-
 .../mining/powdertracker/PowderTracker.kt     |  63 ++---
 .../rift/area/westvillage/VerminTracker.kt    |  10 +-
 .../features/slayer/SlayerProfitTracker.kt    |  12 +-
 .../at/hannibal2/skyhanni/test/GraphEditor.kt |  67 ++---
 .../skyhanni/utils/CollectionUtils.kt         |  23 +-
 .../skyhanni/utils/renderables/Renderable.kt  | 237 ++++++++++++++----
 .../utils/renderables/RenderableUtils.kt      |  33 +++
 .../skyhanni/utils/renderables/Searchable.kt  |  58 +++++
 .../utils/tracker/SkyHanniItemTracker.kt      |  23 +-
 .../skyhanni/utils/tracker/SkyHanniTracker.kt |  20 +-
 22 files changed, 513 insertions(+), 261 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 931f3b6229bc..51deea2b865d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent
 import at.hannibal2.skyhanni.events.SackChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -26,7 +26,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -212,36 +212,35 @@ object EnderNodeTracker {
         else -> null
     }
 
-    private fun drawDisplay(data: Data) = buildList<Renderable> {
+    private fun drawDisplay(data: Data) = buildList<Searchable> {
         val lootProfit = getLootProfit(data)
 
-        addString("§5§lEnder Node Tracker")
-        addString("§d${data.totalNodesMined.addSeparators()} Ender Nodes mined")
-        addString("§6${lootProfit.values.sum().shortFormat()} Coins made")
-        addString(" ")
-        addString("§b${data.totalEndermiteNests.addSeparators()} §cEndermite Nest")
+        addSearchString("§5§lEnder Node Tracker")
+        addSearchString("§d${data.totalNodesMined.addSeparators()} Ender Nodes mined")
+        addSearchString("§6${lootProfit.values.sum().shortFormat()} Coins made")
+        addSearchString(" ")
+        addSearchString("§b${data.totalEndermiteNests.addSeparators()} §cEndermite Nest", "Endermite Nest")
 
         for (item in EnderNode.entries.subList(0, 11)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
             val profit = (lootProfit[item] ?: 0.0).shortFormat()
-            addString("§b$count ${item.displayName} §7(§6$profit§7)")
+            addSearchString("§b$count ${item.displayName} §7(§6$profit§7)", item.displayName)
         }
-        addString(" ")
+        addSearchString(" ")
 
         val totalEnderArmor = calculateEnderArmor(data)
-        addString(
-            "§b${totalEnderArmor.addSeparators()} §5Ender Armor " +
-                "§7(§6${(totalEnderArmor * 10_000).shortFormat()}§7)"
+        addSearchString(
+            "§b${totalEnderArmor.addSeparators()} §5Ender Armor " + "§7(§6${(totalEnderArmor * 10_000).shortFormat()}§7)"
         )
         for (item in EnderNode.entries.subList(11, 16)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
             val profit = (lootProfit[item] ?: 0.0).shortFormat()
-            addString("§b$count ${item.displayName} §7(§6$profit§7)")
+            addSearchString("§b$count ${item.displayName} §7(§6$profit§7)")
         }
         // enderman pet rarities
         val (c, u, r, e, l) = EnderNode.entries.subList(16, 21).map { (data.lootCount[it] ?: 0).addSeparators() }
         val profit = EnderNode.entries.subList(16, 21).sumOf { lootProfit[it] ?: 0.0 }.shortFormat()
-        addString("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
+        addSearchString("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
     }
 
     private fun calculateEnderArmor(storage: Data) =
@@ -249,10 +248,10 @@ object EnderNodeTracker {
             .map { it.value }
             .sum()
 
-    private fun formatDisplay(map: List<Renderable>): List<Renderable> {
+    private fun formatDisplay(map: List<Searchable>): List<Searchable> {
         if (!ProfileStorageData.loaded) return emptyList()
 
-        val newList = mutableListOf<Renderable>()
+        val newList = mutableListOf<Searchable>()
         for (index in config.textFormat.get()) {
             // TODO, change functionality to use enum rather than ordinals
             newList.add(map[index.ordinal])
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index f8ae6165b9d9..ade5966eaaa6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -19,6 +19,8 @@ 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.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
@@ -77,8 +79,8 @@ object DianaProfitTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§e§lDiana Profit Tracker")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§e§lDiana Profit Tracker")
 
         val profit = tracker.drawItems(data, { true }, this)
 
@@ -87,7 +89,7 @@ object DianaProfitTracker {
             Renderable.hoverTips(
                 "§7Burrows dug: §e${treasureCoins.addSeparators()}",
                 listOf("§7You dug out griffin burrows §e${treasureCoins.addSeparators()} §7times."),
-            ),
+            ).toSearchable(),
         )
 
         add(tracker.addTotalProfit(profit, data.burrowsDug, "burrow"))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index fc7442fafb8e..ec882d6ecd74 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -6,14 +6,14 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -30,32 +30,31 @@ object MythologicalCreatureTracker {
     private val patternGroup = RepoPattern.group("event.diana.mythological.tracker")
     private val minotaurPattern by patternGroup.pattern(
         "minotaur",
-        ".* §r§eYou dug out a §r§2Minotaur§r§e!"
+        ".* §r§eYou dug out a §r§2Minotaur§r§e!",
     )
     private val gaiaConstructPattern by patternGroup.pattern(
         "gaiaconstruct",
-        ".* §r§eYou dug out a §r§2Gaia Construct§r§e!"
+        ".* §r§eYou dug out a §r§2Gaia Construct§r§e!",
     )
     private val minosChampionPattern by patternGroup.pattern(
         "minoschampion",
-        ".* §r§eYou dug out a §r§2Minos Champion§r§e!"
+        ".* §r§eYou dug out a §r§2Minos Champion§r§e!",
     )
     private val siameseLynxesPattern by patternGroup.pattern(
         "siameselynxes",
-        ".* §r§eYou dug out §r§2Siamese Lynxes§r§e!"
+        ".* §r§eYou dug out §r§2Siamese Lynxes§r§e!",
     )
     private val minosHunterPattern by patternGroup.pattern(
         "minoshunter",
-        ".* §r§eYou dug out a §r§2Minos Hunter§r§e!"
+        ".* §r§eYou dug out a §r§2Minos Hunter§r§e!",
     )
     private val minosInquisitorPattern by patternGroup.pattern(
         "minosinquisitor",
-        ".* §r§eYou dug out a §r§2Minos Inquisitor§r§e!"
+        ".* §r§eYou dug out a §r§2Minos Inquisitor§r§e!",
     )
 
     private val tracker =
-        SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker })
-        { drawDisplay(it) }
+        SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker }) { drawDisplay(it) }
 
     class Data : TrackerData() {
 
@@ -90,8 +89,7 @@ object MythologicalCreatureTracker {
 
                     // TODO migrate to abstract feature in the future
                     if (creatureType == MythologicalCreatureType.MINOS_INQUISITOR) {
-                        event.chatComponent =
-                            ChatComponentText(event.message + " §e(${it.creaturesSinceLastInquisitor})")
+                        event.chatComponent = ChatComponentText(event.message + " §e(${it.creaturesSinceLastInquisitor})")
                         it.creaturesSinceLastInquisitor = 0
                     } else it.creaturesSinceLastInquisitor++
                 }
@@ -100,8 +98,8 @@ object MythologicalCreatureTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§7Mythological Creature Tracker:")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§7Mythological Creature Tracker:")
         val total = data.count.sumAllValues()
         for ((creatureType, amount) in data.count.entries.sortedByDescending { it.value }) {
             val percentageSuffix = if (config.showPercentage.get()) {
@@ -109,10 +107,13 @@ object MythologicalCreatureTracker {
                 " §7$percentage"
             } else ""
 
-            addString(" §7- §e${amount.addSeparators()} ${creatureType.displayName}$percentageSuffix")
+            addSearchString(
+                " §7- §e${amount.addSeparators()} ${creatureType.displayName}$percentageSuffix",
+                searchText = creatureType.displayName,
+            )
         }
-        addString(" §7- §e${total.addSeparators()} §7Total Mythological Creatures")
-        addString(" §7- §e${data.creaturesSinceLastInquisitor.addSeparators()} §7Creatures since last Minos Inquisitor")
+        addSearchString(" §7- §e${total.addSeparators()} §7Total Mythological Creatures")
+        addSearchString(" §7- §e${data.creaturesSinceLastInquisitor.addSeparators()} §7Creatures since last Minos Inquisitor")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index 4fc5b824b91b..80812c4c563b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -20,7 +20,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -105,8 +105,8 @@ object FrozenTreasureTracker {
         icePerHour = (icePerSecond.average() * 3600).toInt()
     }
 
-    private fun formatDisplay(map: List<Renderable>): List<Renderable> {
-        val newList = mutableListOf<Renderable>()
+    private fun formatDisplay(map: List<Searchable>): List<Searchable> {
+        val newList = mutableListOf<Searchable>()
         for (index in config.textFormat) {
             // TODO, change functionality to use enum rather than ordinals
             newList.add(map[index.ordinal])
@@ -137,20 +137,20 @@ object FrozenTreasureTracker {
         }
     }
 
-    private fun drawDisplay(data: Data) = buildList {
+    private fun drawDisplay(data: Data) = buildList<Searchable> {
         calculateIce(data)
-        addString("§e§lFrozen Treasure Tracker")
-        addString("§6${formatNumber(data.treasuresMined)} Treasures Mined")
-        addString("§3${formatNumber(estimatedIce)} Total Ice")
-        addString("§3${formatNumber(icePerHour)} Ice/hr")
-        addString("§8${formatNumber(data.compactProcs)} Compact Procs")
-        addString("")
+        addSearchString("§e§lFrozen Treasure Tracker")
+        addSearchString("§6${formatNumber(data.treasuresMined)} Treasures Mined")
+        addSearchString("§3${formatNumber(estimatedIce)} Total Ice")
+        addSearchString("§3${formatNumber(icePerHour)} Ice/hr")
+        addSearchString("§8${formatNumber(data.compactProcs)} Compact Procs")
+        addSearchString("")
 
         for (treasure in FrozenTreasure.entries) {
             val count = (data.treasureCount[treasure] ?: 0) * if (config.showAsDrops) treasure.defaultAmount else 1
-            addString("§b${formatNumber(count)} ${treasure.displayName}")
+            addSearchString("§b${formatNumber(count)} ${treasure.displayName}", treasure.displayName)
         }
-        addString("")
+        addSearchString("")
     }
 
     fun formatNumber(amount: Number): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index 619334a98aed..12f3accd1de1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -13,8 +13,7 @@ import at.hannibal2.skyhanni.features.fishing.FishingAPI
 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.addButton
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -26,6 +25,9 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.addButton
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
@@ -119,8 +121,8 @@ object FishingProfitTracker {
         return map
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§e§lFishing Profit Tracker")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§e§lFishing Profit Tracker")
         val filter: (NEUInternalName) -> Boolean = addCategories(data)
 
         val profit = tracker.drawItems(data, filter, this)
@@ -130,7 +132,7 @@ object FishingProfitTracker {
             Renderable.hoverTips(
                 "§7Times fished: §e${fishedCount.addSeparators()}",
                 listOf("§7You've reeled in §e${fishedCount.addSeparators()} §7catches."),
-            ),
+            ).toSearchable(),
         )
 
         add(tracker.addTotalProfit(profit, data.totalCatchAmount, "catch"))
@@ -138,7 +140,7 @@ object FishingProfitTracker {
         tracker.addPriceFromButton(this)
     }
 
-    private fun MutableList<Renderable>.addCategories(data: Data): (NEUInternalName) -> Boolean {
+    private fun MutableList<Searchable>.addCategories(data: Data): (NEUInternalName) -> Boolean {
         val amounts = getCurrentCategories(data)
         checkMissingItems(data)
         val list = amounts.keys.toList()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index fd41883ef0fb..b293c2736fbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -9,15 +9,15 @@ import at.hannibal2.skyhanni.features.fishing.FishingAPI
 import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.CollectionUtils.addButton
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.addButton
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -71,8 +71,8 @@ object SeaCreatureTracker {
         return map
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§7Sea Creature Tracker:")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§7Sea Creature Tracker:")
 
         val filter: (String) -> Boolean = addCategories(data)
         val realAmount = data.amount.filter { filter(it.key) }
@@ -94,12 +94,12 @@ object SeaCreatureTracker {
                 " §7$percentage"
             } else ""
 
-            addString(" §7- §e${amount.addSeparators()} $displayName$percentageSuffix")
+            addSearchString(" §7- §e${amount.addSeparators()} $displayName$percentageSuffix", displayName)
         }
-        addString(" §7- §e${total.addSeparators()} §7Total Sea Creatures")
+        addSearchString(" §7- §e${total.addSeparators()} §7Total Sea Creatures")
     }
 
-    private fun MutableList<Renderable>.addCategories(data: Data): (String) -> Boolean {
+    private fun MutableList<Searchable>.addCategories(data: Data): (String) -> Boolean {
         val amounts = getCurrentCategories(data)
         val list = amounts.keys.toList()
         if (currentCategory !in list) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
index 1e9397d5f182..90c68a046980 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
@@ -14,13 +14,13 @@ import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -84,11 +84,11 @@ object ArmorDropTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§7Armor Drop Tracker:")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§7Armor Drop Tracker:")
         for ((drop, amount) in data.drops.sortedDesc()) {
             val dropName = drop.dropName
-            addString(" §7- §e${amount.addSeparators()}x $dropName")
+            addSearchString(" §7- §e${amount.addSeparators()}x $dropName", dropName)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 34d3fe53d943..8cc8c55cb32a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -10,12 +10,15 @@ import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -120,30 +123,28 @@ object DicerRngDropTracker {
         }
     }
 
-    private fun drawDisplay(data: Data) = buildList<Renderable> {
+    private fun drawDisplay(data: Data) = buildList<Searchable> {
         val cropInHand = cropInHand ?: return@buildList
 
         val topLine = mutableListOf<Renderable>()
         topLine.add(Renderable.itemStack(cropInHand.icon))
         topLine.add(Renderable.string("§7Dicer Tracker:"))
-        add(Renderable.horizontalContainer(topLine))
+        add(Renderable.horizontalContainer(topLine).toSearchable())
 
         val items = data.drops[cropInHand] ?: return@buildList
-        val list = mutableListOf<Renderable>()
         if (config.compact.get()) {
             val compactLine = items.sortedDesc().map { (rarity, amount) ->
                 "§${rarity.colorCode}${amount.addSeparators()}"
             }.joinToString("§7/")
-            list.add(Renderable.string(compactLine))
+            addSearchString(compactLine)
 
         } else {
             for ((rarity, amount) in items.sortedDesc()) {
                 val colorCode = rarity.colorCode
                 val displayName = rarity.displayName
-                list.add(Renderable.string(" §7- §e${amount.addSeparators()}x §$colorCode$displayName"))
+                addSearchString(" §7- §e${amount.addSeparators()}x §$colorCode$displayName", displayName)
             }
         }
-        add(Renderable.verticalContainer(list))
     }
 
     private var cropInHand: CropType? = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
index 7dcd078612b0..19506109ec9e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt
@@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.events.PurseChangeCause
 import at.hannibal2.skyhanni.events.PurseChangeEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -19,6 +19,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
@@ -117,8 +119,8 @@ object PestProfitTracker {
         lastPestKillTime = SimpleTimeMark.now()
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§e§lPest Profit Tracker")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§e§lPest Profit Tracker")
         val profit = tracker.drawItems(data, { true }, this)
 
         val pestsKilled = data.totalPestsKills
@@ -126,7 +128,7 @@ object PestProfitTracker {
             Renderable.hoverTips(
                 "§7Pests killed: §e${pestsKilled.addSeparators()}",
                 listOf("§7You killed pests §e${pestsKilled.addSeparators()} §7times."),
-            ),
+            ).toSearchable(),
         )
         add(tracker.addTotalProfit(profit, data.totalPestsKills, "kill"))
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 697947e3fef5..eb15f6165645 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -27,6 +27,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.buildSearchableTable
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -82,7 +83,7 @@ object SackDisplay {
         val sortedPairs = sort(sackItems)
         val amountShowing = if (config.itemToShow > sortedPairs.size) sortedPairs.size else config.itemToShow
         list.addString("§7Items in Sacks: §o(Rendering $amountShowing of ${sortedPairs.size} items)")
-        val table = mutableListOf<List<Renderable>>()
+        val table = mutableMapOf<List<Renderable>, String?>()
         for ((itemName, item) in sortedPairs) {
             val (internalName, colorCode, total, magmaFish) = item
             val stored = item.stored
@@ -92,7 +93,7 @@ object SackDisplay {
             totalPrice += price
             if (rendered >= config.itemToShow) continue
             if (stored == 0 && !config.showEmpty) continue
-            table.add(buildList {
+            table[buildList {
                 addString(" §7- ")
                 addItemStack(internalName)
                 // TODO move replace into itemName
@@ -156,10 +157,10 @@ object SackDisplay {
                     addItemStack("MAGMA_FISH".asInternalName())
                 }
                 if (config.showPrice && price != 0L) addAlignedNumber("§6${format(price)}")
-            })
+            }] = itemName
             rendered++
         }
-        list.add(Renderable.table(table))
+        list.add(table.buildSearchableTable())
 
         if (SackAPI.isTrophySack) list.addString("§cTotal Magmafish: §6${totalMagmaFish.addSeparators()}")
         return totalPrice
@@ -230,10 +231,10 @@ object SackDisplay {
     private fun drawRunesDisplay(list: MutableList<Renderable>) {
         if (SackAPI.runeItem.isEmpty()) return
         list.addString("§7Runes:")
-        val table = mutableListOf<List<Renderable>>()
+        val table = mutableMapOf<List<Renderable>, String?>()
         for ((name, rune) in sort(SackAPI.runeItem.toList())) {
             val (stack, lv1, lv2, lv3) = rune
-            table.add(buildList {
+            table[buildList {
                 addString(" §7- ")
                 stack?.let { addItemStack(it) }
                 add(
@@ -246,19 +247,19 @@ object SackDisplay {
                 addAlignedNumber("§e$lv1")
                 addAlignedNumber("§e$lv2")
                 addAlignedNumber("§e$lv3")
-            })
+            }] = name
         }
-        list.add(Renderable.table(table))
+        list.add(table.buildSearchableTable())
     }
 
     private fun drawGemstoneDisplay(list: MutableList<Renderable>): Long {
         if (SackAPI.gemstoneItem.isEmpty()) return 0L
         list.addString("§7Gemstones:")
         var totalPrice = 0L
-        val table = mutableListOf<List<Renderable>>()
+        val table = mutableMapOf<List<Renderable>, String?>()
         for ((name, gem) in sort(SackAPI.gemstoneItem.toList())) {
             val (internalName, rough, flawed, fine, roughprice, flawedprice, fineprice) = gem
-            table.add(buildList {
+            table[buildList {
                 addString(" §7- ")
                 addItemStack(internalName)
                 add(Renderable.optionalLink(
@@ -274,9 +275,10 @@ object SackDisplay {
                 val price = roughprice + flawedprice + fineprice
                 totalPrice += price
                 if (config.showPrice && price != 0L) addAlignedNumber("§7(§6${format(price)}§7)")
-            })
+            }] = name
         }
-        list.add(Renderable.table(table))
+
+        list.add(table.buildSearchableTable())
         return totalPrice
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index abab20400ff8..5c964c639122 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -7,9 +7,7 @@ import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityAPI
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -24,6 +22,8 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -149,7 +149,7 @@ object ChocolateFactoryStrayTracker {
         tracker.modify { it.goldenTypesCaught.addOrPut(typeCaught, amount) }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
         val extraChocMs = data.straysExtraChocMs.values.sum().milliseconds
         val formattedExtraTime = extraChocMs.let { if (it == 0.milliseconds) "0s" else it.format() }
 
@@ -157,14 +157,14 @@ object ChocolateFactoryStrayTracker {
             Renderable.hoverTips(
                 "§6§lStray Tracker",
                 tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"),
-            ),
+            ).toSearchable(),
         )
         rarityFormatMap.keys.forEach { rarity ->
             extractHoverableOfRarity(rarity, data)?.let { add(it) }
         }
     }
 
-    private fun extractHoverableOfRarity(rarity: String, data: Data): Renderable? {
+    private fun extractHoverableOfRarity(rarity: String, data: Data): Searchable? {
         val caughtOfRarity = data.straysCaught[rarity]
         val caughtString = caughtOfRarity?.toString() ?: return null
 
@@ -175,11 +175,12 @@ object ChocolateFactoryStrayTracker {
         val lineHeader = "$colorCode${rarity.substring(0, 1).uppercase()}${rarity.substring(1)}§7: §r$colorCode"
         val lineFormat = "${lineHeader}${caughtString}"
 
-        return rarityExtraChocMs?.let {
+        val renderable = rarityExtraChocMs?.let {
             val tip =
                 "§a+§b$extraChocFormat §afrom $colorCode$rarity strays§7${if (rarity == "legendary") extractGoldenTypesCaught(data) else ""}"
             Renderable.hoverTips(Renderable.string(lineFormat), tips = tip.split("\n"))
         } ?: Renderable.string(lineFormat)
+        return renderable.toSearchable(rarity)
     }
 
     private fun extractGoldenTypesCaught(data: Data): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
index 655b885e0768..ef3f922fbf8e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.mining.FossilExcavationEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -19,6 +19,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
 import com.google.gson.annotations.Expose
@@ -73,8 +75,8 @@ object ExcavatorProfitTracker {
 
     private val scrapItem get() = FossilExcavatorAPI.scrapItem
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§e§lFossil Excavation Profit Tracker")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§e§lFossil Excavation Profit Tracker")
         var profit = tracker.drawItems(data, { true }, this)
 
         val timesExcavated = data.timesExcavated
@@ -82,7 +84,7 @@ object ExcavatorProfitTracker {
             Renderable.hoverTips(
                 "§7Times excavated: §e${timesExcavated.addSeparators()}",
                 listOf("§7You excavated §e${timesExcavated.addSeparators()} §7times."),
-            ),
+            ).toSearchable(),
         )
 
         profit = addScrap(timesExcavated, profit)
@@ -98,7 +100,7 @@ object ExcavatorProfitTracker {
         tracker.addPriceFromButton(this)
     }
 
-    private fun MutableList<Renderable>.addFossilDust(
+    private fun MutableList<Searchable>.addFossilDust(
         fossilDustGained: Long,
         profit: Double,
     ): Double {
@@ -116,12 +118,12 @@ object ExcavatorProfitTracker {
                     "",
                     "§7Price Per Fossil Dust: §6${pricePer.shortFormat()}",
                 ),
-            ),
+            ).toSearchable("Fossil Dust"),
         )
         return profit + fossilDustPrice
     }
 
-    private fun MutableList<Renderable>.addGlacitePowder(data: Data) {
+    private fun MutableList<Searchable>.addGlacitePowder(data: Data) {
         val glacitePowderGained = data.glacitePowderGained
         if (glacitePowderGained <= 0) return
         add(
@@ -131,11 +133,11 @@ object ExcavatorProfitTracker {
                     "§7No real profit,",
                     "§7but still nice to see! Right?",
                 ),
-            ),
+            ).toSearchable("Glacite Powder"),
         )
     }
 
-    private fun MutableList<Renderable>.addScrap(
+    private fun MutableList<Searchable>.addScrap(
         timesExcavated: Long,
         profit: Double,
     ): Double {
@@ -151,7 +153,7 @@ object ExcavatorProfitTracker {
                     "§7for all §e$timesExcavated $name",
                     "§7you have used.",
                 ),
-            ),
+            ).toSearchable("Scrap"),
         )
         return profit - scrapPrice
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index a8c81edab91e..a90b980d9a60 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -1,8 +1,6 @@
 package at.hannibal2.skyhanni.features.mining.powdertracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.api.HotmAPI
-import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
 import at.hannibal2.skyhanni.data.BossbarData
@@ -14,10 +12,8 @@ import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.events.mining.PowderGainEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -27,7 +23,7 @@ import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -37,7 +33,6 @@ import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object PowderTracker {
@@ -198,11 +193,13 @@ object PowderTracker {
         }
 
         for (reward in PowderChestReward.entries) {
-            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) return
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
-                    val amount = groupOrNull("amount")?.formatLong() ?: 1
+                    var amount = groupOrNull("amount")?.formatLong() ?: 1
+                    if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder) {
+                        amount *= 2
+                    }
                     it.rewards[reward] = count + amount
                 }
             }
@@ -210,20 +207,6 @@ object PowderTracker {
         tracker.update()
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.CRYSTAL_HOLLOWS)
-    fun onPowderGain(event: PowderGainEvent) {
-        if (lastChestPicked.passedSince() > 5.seconds) return
-        tracker.modify {
-            val reward = when (event.powder) {
-                HotmAPI.PowderType.GEMSTONE -> PowderChestReward.GEMSTONE_POWDER
-                HotmAPI.PowderType.MITHRIL -> PowderChestReward.MITHRIL_POWDER
-                else -> return@modify
-            }
-            it.rewards.addOrPut(reward, event.amount)
-        }
-        tracker.update()
-    }
-
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
         config.textFormat.afterChange {
@@ -284,10 +267,10 @@ object PowderTracker {
         }
     }
 
-    private fun formatDisplay(map: List<Renderable>) = buildList<Renderable> {
+    private fun formatDisplay(map: List<Searchable>) = buildList<Searchable> {
         if (map.isEmpty()) return@buildList
 
-        addString("§b§lPowder Tracker")
+        addSearchString("§b§lPowder Tracker")
 
         for (index in config.textFormat.get()) {
             // TODO, change functionality to use enum rather than ordinals
@@ -295,7 +278,7 @@ object PowderTracker {
         }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
         calculate(data, gemstoneInfo, PowderChestReward.GEMSTONE_POWDER)
         calculate(data, mithrilInfo, PowderChestReward.MITHRIL_POWDER)
         calculate(data, diamondEssenceInfo, PowderChestReward.DIAMOND_ESSENCE)
@@ -304,20 +287,20 @@ object PowderTracker {
         calculateHardStone(data)
 
         val chestPerHour = format(chestInfo.perHour)
-        addString("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
-        addString("§bDouble Powder: ${if (doublePowder) "§aActive! §7($powderTimer)" else "§cInactive!"}")
+        addSearchString("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
+        addSearchString("§bDouble Powder: ${if (doublePowder) "§aActive! §7($powderTimer)" else "§cInactive!"}")
 
         val entries = PowderChestReward.entries
         val rewards = data.rewards
         addPerHour(rewards, entries[0], mithrilInfo)
         addPerHour(rewards, entries[1], gemstoneInfo)
-        addString("")
+        addSearchString("")
         addPerHour(rewards, entries[46], diamondEssenceInfo)
         addPerHour(rewards, entries[47], goldEssenceInfo)
-        addString("")
+        addSearchString("")
         val hardStonePerHour = format(hardStoneInfo.perHour)
-        addString("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)")
-        addString("")
+        addSearchString("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)", "Hard Stone")
+        addSearchString("")
         for ((gem, color) in gemstones) {
             var totalGemstone = 0L
 
@@ -334,38 +317,40 @@ object PowderTracker {
             }
 
             val (flawless, fine, flawed, rough) = convert(totalGemstone)
-            addString("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone")
+            addSearchString("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone", "Gemstone")
         }
 
         var totalParts = 0L
         for (reward in entries.subList(26, 32)) { // robots part
             val count = rewards.getOrDefault(reward, 0)
             totalParts += count
-            addString("§b${count.addSeparators()} ${reward.displayName}")
+            val name = reward.displayName
+            addSearchString("§b${count.addSeparators()} $name", name)
         }
-        addString("§b${totalParts.addSeparators()} §9Total Robot Parts")
+        addSearchString("§b${totalParts.addSeparators()} §9Total Robot Parts")
 
         val goblinEgg = rewards.getOrDefault(PowderChestReward.GOBLIN_EGG, 0)
         val greenEgg = rewards.getOrDefault(PowderChestReward.GREEN_GOBLIN_EGG, 0)
         val redEgg = rewards.getOrDefault(PowderChestReward.RED_GOBLIN_EGG, 0)
         val yellowEgg = rewards.getOrDefault(PowderChestReward.YELLOW_GOBLIN_EGG, 0)
         val blueEgg = rewards.getOrDefault(PowderChestReward.BLUE_GOBLIN_EGG, 0)
-        addString("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
+        addSearchString("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
 
         for (reward in entries.subList(37, 46)) {
             val count = rewards.getOrDefault(reward, 0).addSeparators()
-            addString("§b$count ${reward.displayName}")
+            val name = reward.displayName
+            addSearchString("§b$count $name", name)
         }
     }
 
-    private fun MutableList<Renderable>.addPerHour(
+    private fun MutableList<Searchable>.addPerHour(
         map: Map<PowderChestReward, Long>,
         reward: PowderChestReward,
         info: ResourceInfo,
     ) {
         val mithrilCount = map.getOrDefault(reward, 0).addSeparators()
         val mithrilPerHour = format(info.perHour)
-        addString("§b$mithrilCount ${reward.displayName} §7($mithrilPerHour/h)")
+        addSearchString("§b$mithrilCount ${reward.displayName} §7($mithrilPerHour/h)")
     }
 
     private fun format(e: Double): String = if (e < 0) "0" else e.toInt().addSeparators()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
index c8fabc226a5e..e47fe8002b6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
-import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -151,11 +151,11 @@ object VerminTracker {
         tracker.modify(SkyHanniTracker.DisplayMode.TOTAL) { it.count[vermin] = count }
     }
 
-    private fun drawDisplay(data: Data): List<Renderable> = buildList {
-        addString("§7Vermin Tracker:")
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§7Vermin Tracker:")
         for ((vermin, amount) in data.count.entries.sortedBy { it.key.order }) {
             val verminName = vermin.vermin
-            addString(" §7- §e${amount.addSeparators()} $verminName")
+            addSearchString(" §7- §e${amount.addSeparators()} $verminName", verminName)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
index ee4192b03750..acd37e9d5c14 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.events.SlayerChangeEvent
 import at.hannibal2.skyhanni.events.SlayerQuestCompleteEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -25,6 +25,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
@@ -171,9 +173,9 @@ object SlayerProfitTracker {
         return internalName in allowedList
     }
 
-    private fun drawDisplay(data: Data) = buildList {
+    private fun drawDisplay(data: Data) = buildList<Searchable> {
         val tracker = getTracker() ?: return@buildList
-        addString("§e§l$itemLogCategory Profit Tracker")
+        addSearchString("§e§l$itemLogCategory Profit Tracker")
 
         var profit = tracker.drawItems(data, { true }, this)
         val slayerSpawnCost = data.slayerSpawnCost
@@ -183,7 +185,7 @@ object SlayerProfitTracker {
                 Renderable.hoverTips(
                     " §7Slayer Spawn Costs: §c$slayerSpawnCostFormat",
                     listOf("§7You paid §c$slayerSpawnCostFormat §7in total", "§7for starting the slayer quests."),
-                ),
+                ).toSearchable(),
             )
             profit += slayerSpawnCost
         }
@@ -193,7 +195,7 @@ object SlayerProfitTracker {
             Renderable.hoverTips(
                 "§7Bosses killed: §e${slayerCompletedCount.addSeparators()}",
                 listOf("§7You killed the $itemLogCategory boss", "§e${slayerCompletedCount.addSeparators()} §7times."),
-            ),
+            ).toSearchable(),
         )
 
         add(tracker.addTotalProfit(profit, data.slayerCompletedCount, "boss"))
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index 4564b9b72c17..e720b57cacb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 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.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ColorUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
@@ -33,6 +34,9 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.ScrollValue
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.buildSearchableScrollable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import kotlinx.coroutines.runBlocking
 import net.minecraft.client.settings.KeyBinding
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -89,7 +93,6 @@ object GraphEditor {
 
     private var inTutorialMode = false
 
-
     private val textBox = TextInput()
 
     private val nodeColor = LorenzColor.BLUE.addOpacity(200)
@@ -102,7 +105,8 @@ object GraphEditor {
     private val edgeSelectedColor = LorenzColor.DARK_RED.addOpacity(150)
 
     val scrollValue = ScrollValue()
-    var nodesDisplay = emptyList<Renderable>()
+    val textInput = TextInput()
+    var nodesDisplay = emptyList<Searchable>()
     var lastUpdate = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -185,6 +189,8 @@ object GraphEditor {
     @SubscribeEvent
     fun onGuiRender(event: GuiRenderEvent) {
         if (!isEnabled()) return
+
+
         config.namedNodesList.renderRenderables(
             buildList {
                 val list = getNodeNames()
@@ -192,14 +198,14 @@ object GraphEditor {
                 addString("§eGraph Nodes: $size")
                 val height = (size * 10).coerceAtMost(150)
                 if (list.isNotEmpty()) {
-                    add(Renderable.scrollList(list, height, scrollValue = scrollValue, velocity = 10.0))
+                    add(list.buildSearchableScrollable(height, textInput, scrollValue, velocity = 10.0))
                 }
             },
             posLabel = "Graph Nodes List",
         )
     }
 
-    private fun getNodeNames(): List<Renderable> {
+    private fun getNodeNames(): List<Searchable> {
         if (lastUpdate.passedSince() > 250.milliseconds) {
             updateNodeNames()
         }
@@ -216,16 +222,16 @@ object GraphEditor {
         nodesDisplay = drawTagNames(node)
     }
 
-    private fun drawTagNames(node: GraphingNode): List<Renderable> = buildList {
-        addString("§eChange tag for node '${node.name}§e'")
-        addString("")
+    private fun drawTagNames(node: GraphingNode): List<Searchable> = buildList {
+        addSearchString("§eChange tag for node '${node.name}§e'")
+        addSearchString("")
 
         for (tag in GraphNodeTag.entries) {
             val state = if (tag in node.tags) "§aYES" else "§cNO"
             val name = state + " §r" + tag.displayName
             add(createTagName(name, tag, node))
         }
-        addString("")
+        addSearchString("")
         add(
             Renderable.clickAndHover(
                 "§cGo Back!",
@@ -233,11 +239,11 @@ object GraphEditor {
                 onClick = {
                     updateNodeNames()
                 },
-            ),
+            ).toSearchable(),
         )
     }
 
-private fun createTagName(
+    private fun createTagName(
         name: String,
         tag: GraphNodeTag,
         node: GraphingNode,
@@ -257,9 +263,9 @@ private fun createTagName(
             }
             updateTagView(node)
         },
-    )
+    ).toSearchable(name)
 
-    private fun drawNodeNames(): List<Renderable> = buildList {
+    private fun drawNodeNames(): List<Searchable> = buildList {
         for ((node, distance: Double) in nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
             val name = node.name?.takeIf { !it.isBlank() } ?: continue
             val color = if (node == activeNode) "§a" else "§7"
@@ -278,11 +284,11 @@ private fun createTagName(
         }
     }
 
-    private fun MutableList<Renderable>.createNodeTextLine(
+    private fun MutableList<Searchable>.createNodeTextLine(
         text: String,
         name: String,
         node: GraphingNode,
-    ): Renderable = Renderable.clickAndHover(
+    ): Searchable = Renderable.clickAndHover(
         text,
         tips = buildList {
             add("Node '$name'")
@@ -308,7 +314,7 @@ private fun createTagName(
                 updateNodeNames()
             }
         },
-    )
+    ).toSearchable(name)
 
     private fun feedBackInTutorial(text: String) {
         if (inTutorialMode) {
@@ -388,8 +394,7 @@ private fun createTagName(
         }
     }
 
-    private fun chatAtDisable() =
-        ChatUtils.clickableChat("Graph Editor is now inactive. §lClick to activate.", ::commandIn)
+    private fun chatAtDisable() = ChatUtils.clickableChat("Graph Editor is now inactive. §lClick to activate.", ::commandIn)
 
     private fun input() {
         if (LorenzUtils.isAnyGuiActive()) return
@@ -538,11 +543,9 @@ private fun createTagName(
         if (config.showsStats) {
             val length = edges.sumOf { it.node1.position.distance(it.node2.position) }.toInt().addSeparators()
             ChatUtils.chat(
-                "§lStats\n" +
-                    "§eNamed Nodes: ${nodes.count { it.name != null }.addSeparators()}\n" +
-                    "§eNodes: ${nodes.size.addSeparators()}\n" +
-                    "§eEdges: ${edges.size.addSeparators()}\n" +
-                    "§eLength: $length",
+                "§lStats\n" + "§eNamed Nodes: ${
+                    nodes.count { it.name != null }.addSeparators()
+                }\n" + "§eNodes: ${nodes.size.addSeparators()}\n" + "§eEdges: ${edges.size.addSeparators()}\n" + "§eLength: $length",
             )
         }
     }
@@ -619,15 +622,14 @@ private fun createTagName(
         ).let { e -> edges.indexOfFirst { it == e }.takeIf { it != -1 } }
         else null
 
-    private fun addEdge(node1: GraphingNode?, node2: GraphingNode?) =
-        if (node1 != null && node2 != null && node1 != node2) {
-            val edge = GraphingEdge(node1, node2)
-            if (edge.isInEdge(activeNode)) {
-                checkDissolve()
-                selectedEdge = findEdgeBetweenActiveAndClosed()
-            }
-            edges.add(edge)
-        } else false
+    private fun addEdge(node1: GraphingNode?, node2: GraphingNode?) = if (node1 != null && node2 != null && node1 != node2) {
+        val edge = GraphingEdge(node1, node2)
+        if (edge.isInEdge(activeNode)) {
+            checkDissolve()
+            selectedEdge = findEdgeBetweenActiveAndClosed()
+        }
+        edges.add(edge)
+    } else false
 
     /** Has a side effect on the graphing graph, since it runs [prune] on the graphing graph*/
     private fun compileGraph(): Graph {
@@ -748,8 +750,7 @@ private class GraphingEdge(val node1: GraphingNode, val node2: GraphingNode) {
 
         other as GraphingEdge
 
-        return (this.node1 == other.node1 && this.node2 == other.node2) ||
-            (this.node1 == other.node2 && this.node2 == other.node1)
+        return (this.node1 == other.node1 && this.node2 == other.node2) || (this.node1 == other.node2 && this.node2 == other.node1)
     }
 
     override fun hashCode(): Int {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index d91078d71b3b..41560553e223 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -3,6 +3,8 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import net.minecraft.enchantment.Enchantment
 import net.minecraft.item.ItemStack
 import java.util.Collections
@@ -276,6 +278,16 @@ object CollectionUtils {
         add(Renderable.string(text, horizontalAlign = horizontalAlign, verticalAlign = verticalAlign))
     }
 
+    // TODO add cache
+    fun MutableList<Searchable>.addSearchString(
+        text: String,
+        searchText: String? = null,
+        horizontalAlign: RenderUtils.HorizontalAlignment = RenderUtils.HorizontalAlignment.LEFT,
+        verticalAlign: RenderUtils.VerticalAlignment = RenderUtils.VerticalAlignment.CENTER,
+    ) {
+        add(Renderable.string(text, horizontalAlign = horizontalAlign, verticalAlign = verticalAlign).toSearchable(searchText))
+    }
+
     // TODO add internal name support, and caching
     fun MutableList<Renderable>.addItemStack(
         itemStack: ItemStack,
@@ -307,13 +319,22 @@ object CollectionUtils {
         add(Renderable.horizontalContainer(buildSelector<T>(prefix, getName, isCurrent, onChange)))
     }
 
+    inline fun <reified T : Enum<T>> MutableList<Searchable>.addSearchableSelector(
+        prefix: String,
+        getName: (T) -> String,
+        isCurrent: (T) -> Boolean,
+        crossinline onChange: (T) -> Unit,
+    ) {
+        add(Renderable.horizontalContainer(buildSelector<T>(prefix, getName, isCurrent, onChange)).toSearchable())
+    }
+
     // TODO move to RenderableUtils
     inline fun <reified T : Enum<T>> buildSelector(
         prefix: String,
         getName: (T) -> String,
         isCurrent: (T) -> Boolean,
         crossinline onChange: (T) -> Unit,
-    ) = buildList {
+    ) = buildList<Renderable> {
         addString(prefix)
         for (entry in enumValues<T>()) {
             val display = getName(entry)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 48d5caafb129..e916d01e10fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -99,8 +99,7 @@ interface Renderable {
             bypassChecks: Boolean = false,
             highlightsOnHoverSlots: List<Int> = emptyList(),
             condition: () -> Boolean = { true },
-        ): Renderable =
-            link(string(text), onClick, bypassChecks, highlightsOnHoverSlots = highlightsOnHoverSlots, condition)
+        ): Renderable = link(string(text), onClick, bypassChecks, highlightsOnHoverSlots = highlightsOnHoverSlots, condition)
 
         fun link(
             renderable: Renderable,
@@ -164,9 +163,7 @@ interface Renderable {
             override val verticalAlign = render.verticalAlign
 
             override fun render(posX: Int, posY: Int) {
-                if (isHovered(posX, posY) && condition() &&
-                    shouldAllowLink(true, bypassChecks) && (button - 100).isKeyClicked()
-                ) {
+                if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks) && (button - 100).isKeyClicked()) {
                     onClick()
                 }
                 render.render(posX, posY)
@@ -185,11 +182,8 @@ interface Renderable {
             override val verticalAlign = render.verticalAlign
 
             override fun render(posX: Int, posY: Int) {
-                if (isHovered(posX, posY) && condition() &&
-                    shouldAllowLink(true, bypassChecks)
-                ) for ((button, onClick) in click) {
-                    if ((button - 100).isKeyClicked())
-                        onClick()
+                if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks)) for ((button, onClick) in click) {
+                    if ((button - 100).isKeyClicked()) onClick()
                 }
                 render.render(posX, posY)
             }
@@ -265,16 +259,8 @@ interface Renderable {
                 openGui.let { it.startsWith("gg.skytils.vigilance.gui.") || it.startsWith("gg.skytils.skytilsmod.gui.") }
             val isInNeuSettings = openGui.startsWith("io.github.moulberry.notenoughupdates.")
 
-            val result = isGuiScreen &&
-                isGuiPositionEditor &&
-                inMenu &&
-                isNotInSignAndOnSlot &&
-                isConfigScreen &&
-                !isInNeuPv &&
-                !isInSkytilsPv &&
-                !neuFocus &&
-                !isInSkytilsSettings &&
-                !isInNeuSettings
+            val result =
+                isGuiScreen && isGuiPositionEditor && inMenu && isNotInSignAndOnSlot && isConfigScreen && !isInNeuPv && !isInSkytilsPv && !neuFocus && !isInSkytilsSettings && !isInNeuSettings
 
             if (debug) {
                 if (!result) {
@@ -374,20 +360,19 @@ interface Renderable {
             rescaleSkulls: Boolean = true,
             horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
             verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
-        ) =
-            hoverTips(
-                itemStack(
-                    item,
-                    scale,
-                    xSpacing,
-                    ySpacing,
-                    rescaleSkulls,
-                    horizontalAlign = horizontalAlign,
-                    verticalAlign = verticalAlign,
-                ),
-                item.getTooltip(Minecraft.getMinecraft().thePlayer, false),
-                stack = item,
-            )
+        ) = hoverTips(
+            itemStack(
+                item,
+                scale,
+                xSpacing,
+                ySpacing,
+                rescaleSkulls,
+                horizontalAlign = horizontalAlign,
+                verticalAlign = verticalAlign,
+            ),
+            item.getTooltip(Minecraft.getMinecraft().thePlayer, false),
+            stack = item,
+        )
 
         fun itemStack(
             item: ItemStack,
@@ -497,11 +482,57 @@ interface Renderable {
             }
         }
 
+        fun searchableTable(
+            map: Map<List<Renderable?>, String?>,
+            textInput: TextInput,
+            key: Int,
+            xPadding: Int = 1,
+            yPadding: Int = 0,
+            useEmptySpace: Boolean = false,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            var content = map.keys.toList()
+            val xOffsets: List<Int> = calculateTableXOffsets(content, xPadding)
+            val yOffsets: List<Int> = calculateTableYOffsets(content, yPadding)
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            override val width = xOffsets.last() - xPadding
+            override val height = yOffsets.last() - yPadding
+
+            val emptySpaceX = if (useEmptySpace) 0 else xPadding
+            val emptySpaceY = if (useEmptySpace) 0 else yPadding
+
+            init {
+                textInput.registerToEvent(key) {
+                    // null = ignored, never filtered
+                    content = map.filter { it.value?.contains(textInput.textBox, ignoreCase = true) ?: true }.keys.toList()
+                }
+            }
+
+            override fun render(posX: Int, posY: Int) {
+                for ((rowIndex, row) in content.withIndex()) {
+                    for ((index, renderable) in row.withIndex()) {
+                        GlStateManager.pushMatrix()
+                        GlStateManager.translate(xOffsets[index].toFloat(), yOffsets[rowIndex].toFloat(), 0F)
+                        renderable?.renderXYAligned(
+                            posX + xOffsets[index],
+                            posY + yOffsets[rowIndex],
+                            xOffsets[index + 1] - xOffsets[index] - emptySpaceX,
+                            yOffsets[rowIndex + 1] - yOffsets[rowIndex] - emptySpaceY,
+                        )
+                        GlStateManager.popMatrix()
+                    }
+                }
+            }
+        }
+
         /**
          * @param content the list of rows the table should render
          */
         fun table(
-            content: List<List<Renderable?>>,
+            content: List<List<Renderable>>,
             xPadding: Int = 1,
             yPadding: Int = 0,
             useEmptySpace: Boolean = false,
@@ -565,7 +596,6 @@ interface Renderable {
             color: Color = Color.WHITE,
             key: Int = 0,
         ) = object : Renderable {
-
             val textBoxHeight = (9 * scale).toInt() + 1
 
             val isTextBoxEmpty get() = textInput.textBox.isEmpty()
@@ -879,6 +909,39 @@ interface Renderable {
             }
         }
 
+        fun verticalSearchableContainer(
+            content: Map<Renderable, String?>,
+            spacing: Int = 0,
+            textInput: TextInput,
+            key: Int,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            var renderables = filterList(content, textInput.textBox)
+
+            override val width = renderables.maxOfOrNull { it.width } ?: 0
+            override val height = renderables.sumOf { it.height } + spacing * (renderables.size - 1)
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            init {
+                textInput.registerToEvent(key) {
+                    // null = ignored, never filtered
+                    renderables = filterList(content, textInput.textBox)
+                }
+            }
+
+            override fun render(posX: Int, posY: Int) {
+                var yOffset = posY
+                renderables.forEach {
+                    it.renderXAligned(posX, yOffset, width)
+                    yOffset += it.height + spacing
+                    GlStateManager.translate(0f, (it.height + spacing).toFloat(), 0f)
+                }
+                GlStateManager.translate(0f, -height.toFloat() - spacing.toFloat(), 0f)
+            }
+        }
+
         fun scrollList(
             list: List<Renderable>,
             height: Int,
@@ -933,6 +996,83 @@ interface Renderable {
             }
         }
 
+        fun searchableScrollList(
+            content: Map<Renderable, String?>,
+            height: Int,
+            scrollValue: ScrollValue = ScrollValue(),
+            velocity: Double = 2.0,
+            button: Int? = null,
+            textInput: TextInput,
+            key: Int,
+            bypassChecks: Boolean = false,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+            private var list = filterList(content, textInput.textBox)
+            override val width = list.maxOf { it.width }
+            override val height = height
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
+
+            init {
+                textInput.registerToEvent(key) {
+                    // null = ignored, never filtered
+                    list = filterList(content, textInput.textBox)
+                    scroll = createScroll()
+                }
+            }
+
+            // correct
+            private val virtualHeight get() = list.sumOf { it.height }
+
+            private var scroll = createScroll()
+
+            private fun createScroll() = ScrollInput.Companion.Vertical(
+                scrollValue,
+                0,
+                virtualHeight - height,
+                velocity,
+                button,
+            )
+
+            private val end get() = scroll.asInt() + height
+
+            override fun render(posX: Int, posY: Int) {
+                scroll.update(
+                    isHovered(posX, posY) && shouldAllowLink(true, bypassChecks),
+                )
+
+                var renderY = 0
+                var virtualY = 0
+                var found = false
+                for (renderable in list) {
+                    if ((virtualY..virtualY + renderable.height) in scroll.asInt()..end) {
+                        renderable.renderXAligned(posX, posY + renderY, width)
+                        GlStateManager.translate(0f, renderable.height.toFloat(), 0f)
+                        renderY += renderable.height
+                        found = true
+                    } else if (found) {
+                        found = false
+                        if (renderY + renderable.height <= height) {
+                            renderable.renderXAligned(posX, posY + renderY, width)
+                        }
+                        continue
+                    }
+                    virtualY += renderable.height
+                }
+                GlStateManager.translate(0f, -renderY.toFloat(), 0f)
+            }
+        }
+
+        private fun filterList(content: Map<Renderable, String?>, textBox: String): Set<Renderable> {
+            val map = content.filter { it.value?.contains(textBox, ignoreCase = true) ?: true }
+            val set = map.keys.toMutableSet()
+            if (map.filter { it.value != null }.isEmpty()) {
+                set.add(string("§cNo search results!"))
+            }
+            return set
+        }
+
         fun scrollTable(
             content: List<List<Renderable?>>,
             height: Int,
@@ -988,17 +1128,14 @@ interface Renderable {
                     GlStateManager.translate(0f, yShift.toFloat(), 0f)
                     renderY += yShift
                 }
-                val range =
-                    yOffsets.indexOfFirst { it >= scroll.asInt() }..<(yOffsets.indexOfFirst { it >= end }
-                        .takeIf { it > 0 }
-                        ?: yOffsets.size) - 1
-
-                val range2 =
-                    if (range.last + 3 <= yOffsets.size && yOffsets[range.last + 2] - yOffsets[range.first] <= height - renderY) {
-                        range.first..range.last() + 1
-                    } else {
-                        range
-                    }
+                val range = yOffsets.indexOfFirst { it >= scroll.asInt() }..<(yOffsets.indexOfFirst { it >= end }.takeIf { it > 0 }
+                    ?: yOffsets.size) - 1
+
+                val range2 = if (range.last + 3 <= yOffsets.size && yOffsets[range.last + 2] - yOffsets[range.first] <= height - renderY) {
+                    range.first..range.last() + 1
+                } else {
+                    range
+                }
 
                 for (rowIndex in range2) {
                     for ((index, renderable) in content[rowIndex].withIndex()) {
@@ -1242,10 +1379,8 @@ interface Renderable {
                 GlStateManager.color(1f, 1f, 1f, 1f)
                 if (color != null) RenderLivingEntityHelper.setEntityColor(player, color, colorCondition)
                 val mouse = currentRenderPassMousePosition ?: return
-                val mouseXRelativeToPlayer =
-                    if (followMouse) (posX + playerX - mouse.first).toFloat() else eyesX
-                val mouseYRelativeToPlayer =
-                    if (followMouse) (posY + playerY - mouse.second - 1.62 * entityScale).toFloat() else eyesY
+                val mouseXRelativeToPlayer = if (followMouse) (posX + playerX - mouse.first).toFloat() else eyesX
+                val mouseYRelativeToPlayer = if (followMouse) (posY + playerY - mouse.second - 1.62 * entityScale).toFloat() else eyesY
                 GlStateManager.translate(0f, 0f, 100f)
                 drawEntityOnScreen(
                     playerX,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
index 4a8f28c8e620..9200b467a20e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -1,7 +1,10 @@
 package at.hannibal2.skyhanni.utils.renderables
 
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
+import at.hannibal2.skyhanni.utils.SoundUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
 import java.awt.Color
@@ -84,6 +87,36 @@ internal object RenderableUtils {
         GlStateManager.scale(inverseScale, inverseScale, 1.0)
         GlStateManager.translate(-1.0, -1.0, 0.0)
     }
+
+    // TODO move to RenderableUtils
+    inline fun MutableList<Searchable>.addButton(
+        prefix: String,
+        getName: String,
+        crossinline onChange: () -> Unit,
+        tips: List<String> = emptyList(),
+    ) {
+        val onClick = {
+            if ((System.currentTimeMillis() - ChatUtils.lastButtonClicked) > 150) { // funny thing happen if I don't do that
+                onChange()
+                SoundUtils.playClickSound()
+                ChatUtils.lastButtonClicked = System.currentTimeMillis()
+            }
+        }
+        add(
+            Renderable.horizontalContainer(
+                buildList {
+                    addString(prefix)
+                    addString("§a[")
+                    if (tips.isEmpty()) {
+                        add(Renderable.link("§e$getName", false, onClick))
+                    } else {
+                        add(Renderable.clickAndHover("§e$getName", tips, false, onClick))
+                    }
+                    addString("§a]")
+                },
+            ).toSearchable(),
+        )
+    }
 }
 
 internal abstract class RenderableWrapper internal constructor(protected val content: Renderable) : Renderable {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
new file mode 100644
index 000000000000..8ce7c5ec242d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
@@ -0,0 +1,58 @@
+package at.hannibal2.skyhanni.utils.renderables
+
+import at.hannibal2.skyhanni.data.model.TextInput
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+
+class Searchable(val renderable: Renderable, val string: String?)
+
+fun Renderable.toSearchable(searchText: String? = null) = Searchable(this, searchText?.removeColor())
+fun Searchable.toRenderable() = renderable
+fun List<Searchable>.toRenderable() = map { it.toRenderable() }
+fun List<Searchable>.toMap() = associate { it.renderable to it.string }
+val searchPrefix = "§eSearch: §7"
+fun List<Searchable>.buildSearchBox(): Renderable {
+    val textInput = TextInput()
+    val key = 0
+    return Renderable.searchBox(
+        Renderable.verticalSearchableContainer(toMap(), textInput = textInput, key = key + 1),
+        searchPrefix,
+        onUpdateSize = { println("onUpdateSize") },
+        textInput = textInput,
+        key = key,
+    )
+}
+
+fun List<Searchable>.buildSearchableScrollable(
+    height: Int,
+    textInput: TextInput,
+    scrollValue: ScrollValue = ScrollValue(),
+    velocity: Double = 2.0,
+): Renderable {
+    val key = 0
+    return Renderable.searchBox(
+        Renderable.searchableScrollList(
+            toMap(),
+            textInput = textInput,
+            key = key + 1,
+            height = height,
+            scrollValue = scrollValue,
+            velocity = velocity,
+        ),
+        searchPrefix,
+        onUpdateSize = { println("onUpdateSize") },
+        textInput = textInput,
+        key = key,
+    )
+}
+
+fun Map<List<Renderable>, String?>.buildSearchableTable(): Renderable {
+    val textInput = TextInput()
+    val key = 0
+    return Renderable.searchBox(
+        Renderable.searchableTable(toMap(), textInput = textInput, key = key + 1),
+        searchPrefix,
+        onUpdateSize = { println("onUpdateSize") },
+        textInput = textInput,
+        key = key,
+    )
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 8806f3bdb044..8d6f98d6983d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addSelector
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchableSelector
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.ItemPriceSource
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
@@ -17,13 +17,15 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import kotlin.time.Duration.Companion.seconds
 
 class SkyHanniItemTracker<Data : ItemTrackerData>(
     name: String,
     createNewSession: () -> Data,
     getStorage: (ProfileSpecificStorage) -> Data,
-    drawDisplay: (Data) -> List<Renderable>,
+    drawDisplay: (Data) -> List<Searchable>,
 ) : SkyHanniTracker<Data>(name, createNewSession, getStorage, drawDisplay) {
 
     companion object {
@@ -60,9 +62,9 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         }
     }
 
-    fun addPriceFromButton(lists: MutableList<Renderable>) {
+    fun addPriceFromButton(lists: MutableList<Searchable>) {
         if (isInventoryOpen()) {
-            lists.addSelector<ItemPriceSource>(
+            lists.addSearchableSelector<ItemPriceSource>(
                 "",
                 getName = { type -> type.sellName },
                 isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
@@ -77,7 +79,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
     fun drawItems(
         data: Data,
         filter: (NEUInternalName) -> Boolean,
-        lists: MutableList<Renderable>,
+        lists: MutableList<Searchable>,
     ): Double {
         var profit = 0.0
         val items = mutableMapOf<NEUInternalName, Long>()
@@ -117,8 +119,9 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
             val newDrop = itemProfit.lastTimeUpdated.passedSince() < 10.seconds && config.showRecentDrops
             val numberColor = if (newDrop) "§a§l" else "§7"
 
+            val name = cleanName.removeColor(keepFormatting = true).replace("§r", "")
             var displayName = if (hidden) {
-                "§8§m" + cleanName.removeColor(keepFormatting = true).replace("§r", "")
+                "§8§m$name"
             } else cleanName
             displayName = " $numberColor${displayAmount.addSeparators()}x $displayName§7: §6$priceFormat"
 
@@ -149,10 +152,10 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                 },
             ) else Renderable.string(displayName)
 
-            lists.add(renderable)
+            lists.add(renderable.toSearchable(name))
         }
         if (hiddenItemTexts.size > 0) {
-            val text = Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts)
+            val text = Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts).toSearchable()
             lists.add(text)
         }
 
@@ -190,7 +193,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         }
     }
 
-    fun addTotalProfit(profit: Double, totalAmount: Long, action: String): Renderable {
+    fun addTotalProfit(profit: Double, totalAmount: Long, action: String): Searchable {
         val profitFormat = profit.toLong().addSeparators()
         val profitPrefix = if (profit < 0) "§c" else "§6"
 
@@ -201,6 +204,6 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
         } else emptyList()
 
         val text = "§eTotal Profit: $profitPrefix$profitFormat coins"
-        return Renderable.hoverTips(text, tips)
+        return Renderable.hoverTips(text, tips).toSearchable()
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 9d77d4668005..5b07c990650d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -13,6 +13,8 @@ import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.buildSearchBox
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.gui.inventory.GuiInventory
@@ -22,8 +24,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     val name: String,
     private val createNewSession: () -> Data,
     private val getStorage: (ProfileSpecificStorage) -> Data,
-    // TODO change to renderable
-    private val drawDisplay: (Data) -> List<Renderable>,
+    private val drawDisplay: (Data) -> List<Searchable>,
 ) {
 
     private var inventoryOpen = false
@@ -83,9 +84,9 @@ open class SkyHanniTracker<Data : TrackerData>(
 
         if (dirty || TrackerManager.dirty) {
             display = getSharedTracker()?.let {
-                val get = it.get(getDisplayMode())
-                val rawList = drawDisplay(get)
-                buildFinalDisplay(rawList)
+                val data = it.get(getDisplayMode())
+                val searchables = drawDisplay(data)
+                buildFinalDisplay(searchables.buildSearchBox())
             } ?: emptyList()
             dirty = false
         }
@@ -97,13 +98,14 @@ open class SkyHanniTracker<Data : TrackerData>(
         dirty = true
     }
 
-    private fun buildFinalDisplay(rawList: List<Renderable>) = rawList.toMutableList().also {
-        if (it.isEmpty()) return@also
+    private fun buildFinalDisplay(searchBox: Renderable) = buildList {
+        add(searchBox)
+        if (isEmpty()) return@buildList
         if (inventoryOpen) {
-            it.add(1, buildDisplayModeView())
+            add(buildDisplayModeView())
         }
         if (inventoryOpen && getDisplayMode() == DisplayMode.SESSION) {
-            it.add(buildSessionResetButton())
+            add(buildSessionResetButton())
         }
     }
 

From b9b0e9a5dea8db979d5df5dda8f5866dc6f739be Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:12:00 +0200
Subject: [PATCH 423/721] fix showing "no search" when not searched for
 anything yet

---
 .../at/hannibal2/skyhanni/utils/renderables/Renderable.kt     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index e916d01e10fc..9a9cc2adc9d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -1068,7 +1068,9 @@ interface Renderable {
             val map = content.filter { it.value?.contains(textBox, ignoreCase = true) ?: true }
             val set = map.keys.toMutableSet()
             if (map.filter { it.value != null }.isEmpty()) {
-                set.add(string("§cNo search results!"))
+                if (textBox.isNotEmpty()) {
+                    set.add(string("§cNo search results!"))
+                }
             }
             return set
         }

From 28aa990dd3530b5c8e1a78dc322a4da1155a082b Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:28:38 -0400
Subject: [PATCH 424/721] Add back @Expose tag (#2489)

---
 .../skyhanni/config/storage/ProfileSpecificStorage.java          | 1 +
 1 file changed, 1 insertion(+)

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 794819cf1c5a..bb023f230d95 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -673,6 +673,7 @@ public static class WardrobeStorage {
     @Nullable
     public Integer abiphoneContactAmount = null;
 
+    @Expose
     public Map<Integer, HoppityEventStats> hoppityEventStats = new HashMap<>();
 
     public static class HoppityEventStats {

From 8a15a24cb3311c4afe2e1a0f0c12bd8c5b7aa36d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:14:58 +0200
Subject: [PATCH 425/721] fix red (#2493)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 build.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index e8464ada27e8..812b89e7eb9e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,9 @@ repositories {
     maven("https://maven.notenoughupdates.org/releases") // NotEnoughUpdates (dev env)
     maven("https://repo.hypixel.net/repository/Hypixel/") // mod-api
     maven("https://maven.teamresourceful.com/repository/thatgravyboat/") // DiscordIPC
+
+    // only for the rare cases when maven.deftu.xyz is offline
+    maven("https://repo.polyfrost.org/releases")
 }
 
 // Toolchains:

From 0c5d241d90d6b26c614d250e0dfff32d4ee49838 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:29:36 +0200
Subject: [PATCH 426/721] Fix: Inquis share button (#2484)

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/event/diana/InquisitorWaypointShare.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index a5263fc44e5e..2d0e2a809e81 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.diana.InquisitorFoundEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 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.editCopy
 import at.hannibal2.skyhanni.utils.EntityUtils
@@ -202,7 +201,8 @@ object InquisitorWaypointShare {
         lastShareTime = SimpleTimeMark.now()
 
         if (inquisitor == -1) {
-            ErrorManager.skyHanniError("No Inquisitor Found!")
+            ChatUtils.debug("Trying to send inquisitor via chat, but no Inquisitor is nearby.")
+            return
         }
 
         val inquisitor = EntityUtils.getEntityByID(inquisitor)

From 3da4862fee4a445842f338d6fe5f7d0643874163 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:50:06 +0200
Subject: [PATCH 427/721] formatting

---
 .../java/at/hannibal2/skyhanni/utils/system/PlatformUtils.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/system/PlatformUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/system/PlatformUtils.kt
index 4828bc2af825..07fc8ed485f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/system/PlatformUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/system/PlatformUtils.kt
@@ -11,9 +11,7 @@ import net.minecraftforge.fml.common.ModContainer
 object PlatformUtils {
 
     private val modPackages: Map<String, ModContainer> by lazy {
-        Loader.instance().modList
-            .flatMap { mod -> mod.ownedPackages.map { it to mod } }
-            .toMap()
+        Loader.instance().modList.flatMap { mod -> mod.ownedPackages.map { it to mod } }.toMap()
     }
 
     val isDevEnvironment: Boolean by lazy {

From d9b6bce816727327db4b69144b36827bfc1ad453 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:57:22 +0200
Subject: [PATCH 428/721] Fix : Glacite Commissions tunnel map (#2485)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index b6c1c81d01c4..afe5694b1f56 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
@@ -195,6 +196,11 @@ object TunnelsMaps {
         }
     }
 
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        clickTranslate = mapOf()
+    }
+
     @SubscribeEvent
     fun onRenderItemTooltip(event: LorenzToolTipEvent) {
         if (!isEnabled()) return

From ce8c235c34aa7a7291377bd2b8c5b40e86d56bae Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:57:27 +0200
Subject: [PATCH 429/721] Fix: AH Price Comparison (#2483)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/misc/AuctionHousePriceComparison.kt       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
index bef3b469e66a..081af4ea911c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt
@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
@@ -109,6 +110,7 @@ object AuctionHousePriceComparison {
         if (!isEnabled()) return
 
         val diff = slotPriceMap[event.slot.slotIndex] ?: return
+        if (event.slot.inventory !is ContainerLocalMenu) return
 
         event.toolTip.add("")
         if (diff >= 0) {

From d2493f9525c01f549d924ac7ccd5ec3fbf530286 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 10 Sep 2024 16:00:42 +0200
Subject: [PATCH 430/721] fix dicer tracker visibility

---
 .../config/features/garden/DicerRngDropTrackerConfig.java        | 1 +
 .../skyhanni/features/garden/farming/DicerRngDropTracker.kt      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java
index 55dab6c74195..77cb352f69ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java
@@ -29,5 +29,6 @@ public class DicerRngDropTrackerConfig {
 
     @Expose
     @ConfigLink(owner = DicerRngDropTrackerConfig.class, field = "display")
+    // TODO rename to "positon"
     public Position pos = new Position(16, -232, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 8cc8c55cb32a..9e9e3620b618 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -170,6 +170,7 @@ object DicerRngDropTracker {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isEnabled()) return
+        if (cropInHand == null) return
 
         tracker.renderDisplay(config.pos)
     }

From f8a3b96bb34db1105d0f0d92b77ee38095c45792 Mon Sep 17 00:00:00 2001
From: Not a cow <104355555+Not-a-cowfr@users.noreply.github.com>
Date: Tue, 10 Sep 2024 11:09:08 -0700
Subject: [PATCH 431/721] Fix: Fix some regex tests from old pr (#2490)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/chat/FilterTypesConfig.java     |  8 ++++----
 .../hannibal2/skyhanni/features/chat/ChatFilter.kt  | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
index b2fb03d76c80..c50a04bae2b6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java
@@ -118,16 +118,16 @@ public class FilterTypesConfig {
     public boolean hideAlphaAchievements = false;
 
     @Expose
-    @ConfigOption(name = "Hide Parkour", desc = "Hide parkour messages (starting, stopping, reaching a milestone).")
+    @ConfigOption(name = "Parkour Messages", desc = "Hide parkour messages (starting, stopping, reaching a checkpoint).")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean hideParkour = false;
+    public boolean parkour = false;
 
     @Expose
-    @ConfigOption(name = "Hide Teleport Pads", desc = "Hide annoying messages when using teleport pads.")
+    @ConfigOption(name = "Teleport Pad Messages", desc = "Hide annoying messages when using teleport pads.")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean hideTeleportPads = false;
+    public boolean teleportPads = false;
 
     //TODO remove
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 0e23fbb791bf..964b255735af 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.chat.ChatFilter.messagesMap
 import at.hannibal2.skyhanni.features.chat.PowderMiningChatFilter.genericMiningRewardMessage
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenAPI
@@ -408,7 +409,7 @@ object ChatFilter {
 
     /**
      * REGEX-TEST: §aStarted parkour cocoa!
-     * REGEX-TEST: §aFinished parkour cocoa in 12:34.567
+     * REGEX-TEST: §aFinished parkour cocoa in 12:34.567!
      * REGEX-TEST: §aReached checkpoint #4 for parkour cocoa!
      * REGEX-TEST: §4Wrong checkpoint for parkour cocoa!
      * REGEX-TEST: §4You haven't reached all checkpoints for parkour cocoa!
@@ -432,14 +433,16 @@ object ChatFilter {
         "§4Cancelled parkour!",
     )
 
-    // §r§aWarped from the tppadone §r§ato the tppadtwo§r§a!
+    /**
+     ** REGEX-TEST: §r§aWarped from the tpPadOne §r§ato the tpPadTwo§r§a!
+     */
     private val teleportPadPatterns = listOf(
         "§aWarped from the (.*) §r§ato the (.*)§r§a!".toPattern(),
     )
 
     // §r§4This Teleport Pad does not have a destination set!
     private val teleportPadMessages = listOf(
-        "§4This Teleport Pad does not have a destination set!"
+        "§4This Teleport Pad does not have a destination set!",
     )
 
     private val patternsMap: Map<String, List<Pattern>> = mapOf(
@@ -520,8 +523,8 @@ object ChatFilter {
         config.guildExp && message.isPresent("guild_exp") -> "guild_exp"
         config.killCombo && message.isPresent("kill_combo") -> "kill_combo"
         config.profileJoin && message.isPresent("profile_join") -> "profile_join"
-        config.hideParkour && message.isPresent("parkour") -> "parkour"
-        config.hideTeleportPads && message.isPresent("teleport_pads") -> "teleport_pads"
+        config.parkour && message.isPresent("parkour") -> "parkour"
+        config.teleportPads && message.isPresent("teleport_pads") -> "teleport_pads"
 
         config.hideAlphaAchievements && HypixelData.hypixelAlpha && message.isPresent("achievement_get") -> "achievement_get"
 

From a8abfbb456ba4e4cc846897b4eaac7b35deb32e4 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:10:00 +0200
Subject: [PATCH 432/721] Improvement: Last Server (#2494)

---
 .../at/hannibal2/skyhanni/features/misc/LastServers.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
index 8a40233142e3..8bc2d96e45f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
@@ -20,15 +20,19 @@ object LastServers {
 
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
-        if (!isEnabled() || HypixelData.serverId == lastServerId) return
+        if (!isEnabled()) return
 
         val id = HypixelData.serverId ?: return
+        // Update the time of the current server if the player is still on the same server.
+        // This is necessary because the player can be on the same server for a long time.
+        // And if the player leaves the server and joins it again, it still warns the player.
+        lastServers[id] = SimpleTimeMark.now()
+
         lastServers.entries.removeIf { it.value.passedSince() > config.warnTime.seconds }
         lastServers[id]?.passedSince()?.let {
             ChatUtils.chat("§7You already joined this server §b${it.format()}§7 ago.")
         }
         ChatUtils.debug("Adding $id to last servers.")
-        lastServers[id] = SimpleTimeMark.now()
         lastServerId = id
     }
 

From 517f2bb907feebac0dbdb63e2a3cb76c47dc2e92 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:11:07 +0200
Subject: [PATCH 433/721] Fix: Personal Compactor Skull Sizes (#2486)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../hannibal2/skyhanni/utils/renderables/RenderableInventory.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
index 6f783a485c3c..9760ef867f98 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
@@ -93,6 +93,7 @@ object RenderableInventory {
                             scale,
                             0,
                             0,
+                            false,
                         )
                     } ?: Renderable.placeholder((16 * scale).toInt(), (16 * scale).toInt())).also { index++ }
                 } else Renderable.placeholder(0, 0)

From 3708ea6a83c39badad3486143572949d1933dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Tue, 10 Sep 2024 20:40:01 +0200
Subject: [PATCH 434/721] Improvement: Add per election year diana trackers
 (#2487)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../storage/ProfileSpecificStorage.java       |  6 +++
 .../at/hannibal2/skyhanni/data/MayorAPI.kt    | 20 +++++----
 .../event/diana/DianaProfitTracker.kt         |  8 ++++
 .../diana/MythologicalCreatureTracker.kt      | 12 ++++-
 .../skyhanni/utils/CollectionUtils.kt         | 43 +++++++++---------
 .../utils/tracker/SkyHanniItemTracker.kt      |  8 ++--
 .../skyhanni/utils/tracker/SkyHanniTracker.kt | 45 ++++++++++++-------
 7 files changed, 90 insertions(+), 52 deletions(-)

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 bb023f230d95..d622d317a447 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -646,9 +646,15 @@ public static class DianaStorage {
         // TODO rename to 'profitTracker'
         public DianaProfitTracker.Data dianaProfitTracker = new DianaProfitTracker.Data();
 
+        @Expose
+        public Map<Integer, DianaProfitTracker.Data> dianaProfitTrackerPerElectionSeason = new HashMap<>();
+
         @Expose
         // TODO rename
         public MythologicalCreatureTracker.Data mythologicalMobTracker = new MythologicalCreatureTracker.Data();
+
+        @Expose
+        public Map<Integer, MythologicalCreatureTracker.Data> mythologicalMobTrackerPerElectionSeason = new HashMap<>();
     }
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index 2f89b340b656..b4fb7eaa2dc8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -186,17 +186,21 @@ object MayorAPI {
         jerryExtraMayor = jerryMayor to expireTime
     }
 
-    private fun calculateNextMayorTime(): SimpleTimeMark {
-        val now = SkyBlockTime.now()
-        var mayorYear = now.year
+    fun SkyBlockTime.getElectionYear(): Int {
+        var mayorYear = year
 
-        // Check if either the month is already over or the day after 27th in the third month
-        if (now.month > ELECTION_END_MONTH || (now.day >= ELECTION_END_DAY && now.month == ELECTION_END_MONTH)) {
-            // If so, the next mayor will be in the next year
-            mayorYear++
+        // Check if this year's election has not happened yet
+        if (month < ELECTION_END_MONTH || (day < ELECTION_END_DAY && month == ELECTION_END_MONTH)) {
+            // If so, the current mayor is still from last year's election
+            mayorYear--
         }
+        return mayorYear
+    }
+
+    private fun calculateNextMayorTime(): SimpleTimeMark {
+        val now = SkyBlockTime.now()
 
-        return SkyBlockTime(mayorYear, ELECTION_END_MONTH, day = ELECTION_END_DAY).asTimeMark()
+        return SkyBlockTime(now.getElectionYear() + 1, ELECTION_END_MONTH, day = ELECTION_END_DAY).asTimeMark()
     }
 
     private fun getTimeTillNextMayor() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index ade5966eaaa6..b6ec4d0a62e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ItemAddManager
+import at.hannibal2.skyhanni.data.MayorAPI.getElectionYear
 import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDropsJson
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
@@ -18,12 +19,14 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 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.SkyBlockTime
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -47,6 +50,11 @@ object DianaProfitTracker {
         "Diana Profit Tracker",
         { Data() },
         { it.diana.dianaProfitTracker },
+        SkyHanniTracker.DisplayMode.MAYOR to {
+            it.diana.dianaProfitTrackerPerElectionSeason.getOrPut(
+                SkyBlockTime.now().getElectionYear(), ::Data,
+            )
+        },
     ) { drawDisplay(it) }
 
     class Data : ItemTrackerData() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index ec882d6ecd74..3c512d4c4389 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.MayorAPI.getElectionYear
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -13,6 +14,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
@@ -53,8 +55,14 @@ object MythologicalCreatureTracker {
         ".* §r§eYou dug out a §r§2Minos Inquisitor§r§e!",
     )
 
-    private val tracker =
-        SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker }) { drawDisplay(it) }
+    private val tracker = SkyHanniTracker(
+        "Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker },
+        SkyHanniTracker.DisplayMode.MAYOR to {
+            it.diana.mythologicalMobTrackerPerElectionSeason.getOrPut(
+                SkyBlockTime.now().getElectionYear(), ::Data,
+            )
+        },
+    ) { drawDisplay(it) }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 41560553e223..991b1a53e9c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -15,28 +15,22 @@ import kotlin.math.ceil
 object CollectionUtils {
 
     inline fun <reified T : Queue<E>, reified E> T.drainForEach(action: (E) -> Unit): T {
-        while (true)
-            action(this.poll() ?: break)
+        while (true) action(this.poll() ?: break)
         return this
     }
 
     inline fun <reified T : Queue<E>, reified E> T.drain(amount: Int): T {
-        for (i in 1..amount)
-            this.poll() ?: break
+        for (i in 1..amount) this.poll() ?: break
         return this
     }
 
-    inline fun <reified E, reified K, reified L : MutableCollection<K>>
-        Queue<E>.drainTo(list: L, action: (E) -> K): L {
-        while (true)
-            list.add(action(this.poll() ?: break))
+    inline fun <reified E, reified K, reified L : MutableCollection<K>> Queue<E>.drainTo(list: L, action: (E) -> K): L {
+        while (true) list.add(action(this.poll() ?: break))
         return list
     }
 
-    inline fun <reified E, reified L : MutableCollection<E>>
-        Queue<E>.drainTo(list: L): L {
-        while (true)
-            list.add(this.poll() ?: break)
+    inline fun <reified E, reified L : MutableCollection<E>> Queue<E>.drainTo(list: L): L {
+        while (true) list.add(this.poll() ?: break)
         return list
     }
 
@@ -155,11 +149,9 @@ object CollectionUtils {
      */
     fun List<String>.addIfNotNull(element: String?) = element?.let { plus(it) } ?: this
 
-    fun <K, V> Map<K, V>.editCopy(function: MutableMap<K, V>.() -> Unit) =
-        toMutableMap().also { function(it) }.toMap()
+    fun <K, V> Map<K, V>.editCopy(function: MutableMap<K, V>.() -> Unit) = toMutableMap().also { function(it) }.toMap()
 
-    fun <T> List<T>.editCopy(function: MutableList<T>.() -> Unit) =
-        toMutableList().also { function(it) }.toList()
+    fun <T> List<T>.editCopy(function: MutableList<T>.() -> Unit) = toMutableList().also { function(it) }.toList()
 
     fun <K, V> Map<K, V>.moveEntryToTop(matcher: (Map.Entry<K, V>) -> Boolean): Map<K, V> {
         val entry = entries.find(matcher)
@@ -171,8 +163,7 @@ object CollectionUtils {
         return this
     }
 
-    operator fun IntRange.contains(range: IntRange): Boolean =
-        range.first in this && range.last in this
+    operator fun IntRange.contains(range: IntRange): Boolean = range.first in this && range.last in this
 
     fun <E> MutableList<List<E>>.addAsSingletonList(text: E) {
         add(Collections.singletonList(text))
@@ -262,12 +253,10 @@ object CollectionUtils {
     } else false
 
     @Suppress("UNCHECKED_CAST")
-    fun <T> Iterable<T?>.takeIfAllNotNull(): Iterable<T>? =
-        takeIf { null !in this } as? Iterable<T>
+    fun <T> Iterable<T?>.takeIfAllNotNull(): Iterable<T>? = takeIf { null !in this } as? Iterable<T>
 
     @Suppress("UNCHECKED_CAST")
-    fun <T> List<T?>.takeIfAllNotNull(): List<T>? =
-        takeIf { null !in this } as? List<T>
+    fun <T> List<T?>.takeIfAllNotNull(): List<T>? = takeIf { null !in this } as? List<T>
 
     // TODO add cache
     fun MutableList<Renderable>.addString(
@@ -334,9 +323,17 @@ object CollectionUtils {
         getName: (T) -> String,
         isCurrent: (T) -> Boolean,
         crossinline onChange: (T) -> Unit,
+    ) = buildSelector(prefix, getName, isCurrent, onChange, enumValues<T>())
+
+    inline fun <T> buildSelector(
+        prefix: String,
+        getName: (T) -> String,
+        isCurrent: (T) -> Boolean,
+        crossinline onChange: (T) -> Unit,
+        universe: Array<T>,
     ) = buildList<Renderable> {
         addString(prefix)
-        for (entry in enumValues<T>()) {
+        for (entry in universe) {
             val display = getName(entry)
             if (isCurrent(entry)) {
                 addString("§a[$display]")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 8d6f98d6983d..3cadd767b5a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -25,8 +25,9 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
     name: String,
     createNewSession: () -> Data,
     getStorage: (ProfileSpecificStorage) -> Data,
+    vararg extraStorage: Pair<DisplayMode, (ProfileSpecificStorage) -> Data>,
     drawDisplay: (Data) -> List<Searchable>,
-) : SkyHanniTracker<Data>(name, createNewSession, getStorage, drawDisplay) {
+) : SkyHanniTracker<Data>(name, createNewSession, getStorage, *extraStorage, drawDisplay = drawDisplay) {
 
     companion object {
         val SKYBLOCK_COIN = NEUInternalName.SKYBLOCK_COIN
@@ -37,9 +38,8 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
             it.addItem(internalName, amount, command)
         }
         getSharedTracker()?.let { sharedData ->
-            sharedData.get(DisplayMode.TOTAL).items[internalName]?.let { data ->
-                sharedData.get(DisplayMode.SESSION).items[internalName]!!.hidden = data.hidden
-            }
+            val isHidden = sharedData.get(DisplayMode.TOTAL).items[internalName]?.hidden
+            if (isHidden != null) sharedData.modify { it.items[internalName]?.hidden = isHidden }
         }
 
         if (command) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 5b07c990650d..7810c1ee6392 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.TrackerManager
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -24,9 +25,11 @@ open class SkyHanniTracker<Data : TrackerData>(
     val name: String,
     private val createNewSession: () -> Data,
     private val getStorage: (ProfileSpecificStorage) -> Data,
+    vararg extraStorage: Pair<DisplayMode, (ProfileSpecificStorage) -> Data>,
     private val drawDisplay: (Data) -> List<Searchable>,
 ) {
 
+    private val extraDisplayModes = extraStorage.toMap()
     private var inventoryOpen = false
     private var displayMode: DisplayMode? = null
     private val currentSessions = mutableMapOf<ProfileSpecificStorage, Data>()
@@ -61,12 +64,8 @@ open class SkyHanniTracker<Data : TrackerData>(
     }
 
     fun modify(mode: DisplayMode, modifyFunction: (Data) -> Unit) {
-        val storage = ProfileStorageData.profileSpecific ?: return
-        val data: Data = when (mode) {
-            DisplayMode.TOTAL -> storage.getTotal()
-            DisplayMode.SESSION -> storage.getCurrentSession()
-        }
-        modifyFunction(data)
+        val sharedTracker = getSharedTracker() ?: return
+        sharedTracker.modify(mode, modifyFunction)
         update()
     }
 
@@ -124,6 +123,8 @@ open class SkyHanniTracker<Data : TrackerData>(
         },
     )
 
+    private val availableTrackers = arrayOf(DisplayMode.TOTAL, DisplayMode.SESSION) + extraDisplayModes.keys
+
     private fun buildDisplayModeView() = Renderable.horizontalContainer(
         CollectionUtils.buildSelector<DisplayMode>(
             "§7Display Mode: ",
@@ -134,11 +135,17 @@ open class SkyHanniTracker<Data : TrackerData>(
                 storedTrackers[name] = it
                 update()
             },
+            universe = availableTrackers,
         ),
     )
 
-    protected fun getSharedTracker() = ProfileStorageData.profileSpecific?.let {
-        SharedTracker(it.getTotal(), it.getCurrentSession())
+    protected fun getSharedTracker() = ProfileStorageData.profileSpecific?.let { ps ->
+        SharedTracker(
+            mapOf(
+                DisplayMode.TOTAL to ps.getTotal(),
+                DisplayMode.SESSION to ps.getCurrentSession(),
+            ) + extraDisplayModes.mapValues { it.value(ps) },
+        )
     }
 
     private fun ProfileSpecificStorage.getCurrentSession() = currentSessions.getOrPut(this) { createNewSession() }
@@ -165,22 +172,30 @@ open class SkyHanniTracker<Data : TrackerData>(
         }
     }
 
-    class SharedTracker<Data : TrackerData>(private val total: Data, private val currentSession: Data) {
+    inner class SharedTracker<Data : TrackerData>(
+        private val entries: Map<DisplayMode, Data>,
+    ) {
 
-        fun modify(modifyFunction: (Data) -> Unit) {
-            modifyFunction(total)
-            modifyFunction(currentSession)
+        fun modify(mode: DisplayMode, modifyFunction: (Data) -> Unit) {
+            get(mode).let(modifyFunction)
         }
 
-        fun get(displayMode: DisplayMode) = when (displayMode) {
-            DisplayMode.TOTAL -> total
-            DisplayMode.SESSION -> currentSession
+        fun modify(modifyFunction: (Data) -> Unit) {
+            entries.values.forEach(modifyFunction)
         }
+
+        fun get(displayMode: DisplayMode) = entries[displayMode] ?: ErrorManager.skyHanniError(
+            "Unregistered display mode accessed on tracker",
+            "tracker" to name,
+            "displayMode" to displayMode,
+            "availableModes" to entries.keys,
+        )
     }
 
     enum class DisplayMode(val displayName: String) {
         TOTAL("Total"),
         SESSION("This Session"),
+        MAYOR("This Mayor"),
         ;
     }
 

From e2795490be75dd6e4ddbfa8896d99db956719d3f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:57:37 +0200
Subject: [PATCH 435/721] Version 0.27 Beta 7

---
 docs/CHANGELOG.md                             | 27 ++++++++++++++++++-
 docs/FEATURES.md                              |  3 +++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0d26050da8b3..d7172fe55739 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -34,6 +34,9 @@
 
 + Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
     + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
++ Added the current minister to the calendar. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
++ Allowed the use of the Custom Scoreboard outside of SkyBlock, but only on Hypixel. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1881)
++ Added an option to disable custom lines in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1881)
 
 #### Hoppity Features
 
@@ -113,6 +116,9 @@
 #### Diana Improvements
 
 + Added /warp stonks to the Burrow Warp Helper. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2399)
++ Added per-election season Diana Trackers. - !nea (https://github.com/hannibal002/SkyHanni/pull/2487)
+    + This includes the Diana Profit Tracker and the Mythological Creature Tracker.
+    + The data is stored moving forward, but there is currently no way to view anything other than the current year.
 
 #### Scoreboard Improvements
 
@@ -145,6 +151,8 @@
     + Changed chat messages: Account/Profile Upgrade reminder, Hoppity Cake reminder, New Year Hoppity NPC reminder, New Year Cake reminder, City Project reminder, Garden Composter empty warning, CF Custom Goal reached message, Time Tower warning, CF upgrade warning.
 + Added more options to the Chat Hider feature. - not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2348)
     + Option to block parkour messages and teleport pad messages.
++ Added more options to block messages. - not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2490)
+    + Chat Filter settings now include blocking parkour messages and teleport pad messages.
 
 #### Hoppity Improvements
 
@@ -173,12 +181,20 @@
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
 
+#### Misc Improvements
+
++ Updated Last Server to also alert for servers you have just left. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2494)
++ Added search functionality to some SkyHanni GUIs. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2477)
+    + Search works in all SkyHanni Trackers and the Sack Display.
+    + In your inventory, hover over the GUI with your mouse, then start typing to search.
+
 ### Fixes
 
-#### DIana Fixes
+#### Diana Fixes
 
 + Added a chat option to disable a Patcher setting that breaks SkyHanni's line from the center of the player to something else. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2387)
     + E.g. Diana guesses, Slayer Mini Bosses, etc.
++ Fixed an error when pressing the inquisitor share button. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2484)
 
 #### Bingo Fixes
 
@@ -196,6 +212,9 @@
 + Fixed Armor Hider hiding armor inside the Custom Wardrobe. - Empa (https://github.com/hannibal002/SkyHanni/pull/2449)
 + Fixed detection of El Dorado and Stray Hordes in the Chocolate Factory. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2450)
 + Fixed merged enchant books tooltip being overwritten. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2454)
++ Fixed skull sizes inside the Personal Compactor Overlay. - Empa (https://github.com/hannibal002/SkyHanni/pull/2486)
++ Fixed the Auction House Price Comparison appearing in your own inventory as well. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2483)
++ Fixed "click to show tunnel map" from the Glacite Mines commission menu appearing in the inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2485)
 
 #### Mining Fixes
 
@@ -230,6 +249,7 @@
 + Fixed rabbit rarity not appearing on compacted Duplicate rabbit messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
 + Fixed "Highlight Requirement Rabbits" requiring "Hoppity Collection Stats" to function. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2398)
 + Fixed minor formatting issues with Hoppity Event Summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2416)
++ Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
 
 #### Misc Fixes
 
@@ -293,6 +313,11 @@
 + Changed RenderableTooltips to be more consistent with the vanilla ones. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
 + Improved error logging for enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2454)
 + Added renderable search box. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2475)
++ Added the ability to add more optional display modes to trackers. - !nea (https://github.com/hannibal002/SkyHanni/pull/2487)
+    + These extra trackers still need to provide their own storage.
++ Added perk descriptions to mayor perks. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
+    + These are loaded when checking the active mayor/minister from the API, so most of the perks will initially have no description.
++ Added a method to override an ItemStack's lore. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 5ae7ac05a2be..c12bee86ac0d 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -1264,6 +1264,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
         + Select and prioritize the order of the stats you want to see.
     + Added Soulflow to the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
       + Requires Soulflow to be enabled in Hypixel settings: /tab -> Profile Widget -> Show Soulflow.
+  + Added the current minister to the calendar. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
+  + Allowed the use of the Custom Scoreboard outside of SkyBlock, but only on Hypixel. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1881)
+  + Added an option to disable custom lines in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1881)
 + No Bits Available Warning. - Empa (https://github.com/hannibal002/SkyHanni/pull/1286)
     + Warns when you run out of available bits to generate.
 + Added Display for Bits on Cookie buy. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2265)
diff --git a/root.gradle.kts b/root.gradle.kts
index 5fbee7047912..6bfee57db573 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.6"
+    version = "0.27.Beta.7"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index c0723cf48dec..442441825a5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.6",
+    version = "0.27.Beta.7",
 )
 class SkyHanniMod {
 

From 2f6121bc209fb28e1d9f12fe2d10bfacfb12836d Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:53:30 -0400
Subject: [PATCH 436/721] Feature: Corpse Tracker (#2306)

---
 .../skyhanni/config/commands/Commands.kt      |   2 +
 .../features/mining/CorpseTrackerConfig.java  |  24 ++
 .../mining/GlaciteMineshaftConfig.java        |   5 +
 .../storage/ProfileSpecificStorage.java       |   4 +
 .../events/mining/CorpseLootedEvent.kt        |   2 +-
 .../CorpseAPI.kt                              |   2 +-
 .../mining/glacitemineshaft/CorpseTracker.kt  | 142 ++++++++++++
 .../CorpseType.kt                             |   4 +-
 .../MineshaftCorpseProfitPer.kt               |   2 +-
 .../skyhanni/utils/CollectionUtils.kt         |   2 +-
 .../utils/tracker/BucketedItemTrackerData.kt  | 101 +++++++++
 .../skyhanni/utils/tracker/ItemTrackerData.kt |  14 ++
 .../tracker/SkyHanniBucketedItemTracker.kt    | 214 ++++++++++++++++++
 13 files changed, 513 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
 rename src/main/java/at/hannibal2/skyhanni/features/mining/{mineshaft => glacitemineshaft}/CorpseAPI.kt (98%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
 rename src/main/java/at/hannibal2/skyhanni/features/mining/{mineshaft => glacitemineshaft}/CorpseType.kt (76%)
 rename src/main/java/at/hannibal2/skyhanni/features/mining/{mineshaft => glacitemineshaft}/MineshaftCorpseProfitPer.kt (97%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index edfdb2d7a235..7a17c14620cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -58,6 +58,7 @@ import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
+import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseTracker
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
@@ -219,6 +220,7 @@ object Commands {
         registerCommand("shresetghostcounter", "Resets the ghost counter") { GhostUtil.reset() }
         registerCommand("shresetpowdertracker", "Resets the Powder Tracker") { PowderTracker.resetCommand() }
         registerCommand("shresetdicertracker", "Resets the Dicer Drop Tracker") { DicerRngDropTracker.resetCommand() }
+        registerCommand("shresetcorpsetracker", "Resets the Glacite Mineshaft Corpse Tracker") { CorpseTracker.resetCommand() }
         registerCommand(
             "shresetendernodetracker",
             "Resets the Ender Node Tracker",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
new file mode 100644
index 000000000000..61d3b19594a7
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
@@ -0,0 +1,24 @@
+package at.hannibal2.skyhanni.config.features.mining;
+
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CorpseTrackerConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Enable the Corpse Tracker overlay for Glacite Mineshafts.")
+    @ConfigEditorBoolean
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Only when in Mineshaft", desc = "Only show the overlay while in a Glacite Mineshaft.")
+    @ConfigEditorBoolean
+    public boolean onlyInMineshaft = false;
+
+    @Expose
+    @ConfigLink(owner = CorpseTrackerConfig.class, field = "enabled")
+    public Position position = new Position(-274, 0, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/GlaciteMineshaftConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/GlaciteMineshaftConfig.java
index b89a7d3d0db9..723cf9b908c8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/GlaciteMineshaftConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/GlaciteMineshaftConfig.java
@@ -17,6 +17,11 @@ public class GlaciteMineshaftConfig {
     @Accordion
     public CorpseLocatorConfig corpseLocator = new CorpseLocatorConfig();
 
+    @Expose
+    @ConfigOption(name = "Corpse Tracker", desc = "")
+    @Accordion
+    public CorpseTrackerConfig corpseTracker = new CorpseTrackerConfig();
+
     @Expose
     @ConfigOption(name = "Share Waypoint Location", desc = "Share the location of the nearest waypoint upon key press.\n" +
         "§eYou can share the location even if it has already been shared!")
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 d622d317a447..5938eebdb326 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -33,6 +33,7 @@
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
+import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseTracker;
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker;
 import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker;
 import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker;
@@ -564,6 +565,9 @@ public static class MineshaftStorage {
 
             @Expose
             public List<MineshaftPityDisplay.PityData> blocksBroken = new ArrayList<>();
+
+            @Expose
+            public CorpseTracker.BucketData corpseProfitTracker = new CorpseTracker.BucketData();
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt
index ea1e813d0081..9e38d8e956d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events.mining
 
 import at.hannibal2.skyhanni.events.LorenzEvent
-import at.hannibal2.skyhanni.features.mining.mineshaft.CorpseType
+import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseType
 
 class CorpseLootedEvent(val corpseType: CorpseType, val loot: List<Pair<String, Int>>) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseAPI.kt
similarity index 98%
rename from src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt
rename to src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseAPI.kt
index e49ca462f213..c8ee81288a79 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseAPI.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.mining.mineshaft
+package at.hannibal2.skyhanni.features.mining.glacitemineshaft
 
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
new file mode 100644
index 000000000000..77aabc1bd996
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -0,0 +1,142 @@
+package at.hannibal2.skyhanni.features.mining.glacitemineshaft
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.mining.CorpseLootedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
+import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import at.hannibal2.skyhanni.utils.tracker.BucketedItemTrackerData
+import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData.TrackedItem
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniBucketedItemTracker
+import com.google.gson.annotations.Expose
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.EnumMap
+
+@SkyHanniModule
+object CorpseTracker {
+    private val config get() = SkyHanniMod.feature.mining.glaciteMineshaft.corpseTracker
+
+    private val tracker = SkyHanniBucketedItemTracker<CorpseType, BucketData>(
+        "Corpse Tracker",
+        { BucketData() },
+        { it.mining.mineshaft.corpseProfitTracker },
+        { drawDisplay(it) }
+    )
+
+    class BucketData : BucketedItemTrackerData<CorpseType>() {
+        override fun resetItems() {
+            corpsesLooted = EnumMap(CorpseType::class.java)
+        }
+
+        override fun getDescription(timesGained: Long): List<String> {
+            val divisor = 1.coerceAtLeast(getSelectedBucket()?.let { corpsesLooted[it]?.toInt() } ?: corpsesLooted.sumAllValues().toInt())
+            val percentage = timesGained.toDouble() / divisor
+            val dropRate = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0))
+            return listOf(
+                "§7Dropped §e${timesGained.addSeparators()} §7times.",
+                "§7Your drop rate: §c$dropRate.",
+            )
+        }
+
+        override fun getCoinName(bucket: CorpseType?, item: TrackedItem) = "<no coins>"
+        override fun getCoinDescription(bucket: CorpseType?, item: TrackedItem): List<String> = listOf("<no coins>")
+
+        @Expose
+        var corpsesLooted: MutableMap<CorpseType, Long> = EnumMap(CorpseType::class.java)
+
+        fun getCorpseCount(): Long = getSelectedBucket()?.let { corpsesLooted[it] } ?: corpsesLooted.values.sum()
+    }
+
+    private fun addLootedCorpse(type: CorpseType) = tracker.modify { it.corpsesLooted.addOrPut(type, 1) }
+
+    @SubscribeEvent
+    fun onCorpseLoot(event: CorpseLootedEvent) {
+        addLootedCorpse(event.corpseType)
+        for ((itemName, amount) in event.loot) {
+            NEUInternalName.fromItemNameOrNull(itemName)?.let { item ->
+                tracker.modify {
+                    it.addItem(event.corpseType, item, amount)
+                }
+            }
+        }
+    }
+
+    private fun drawDisplay(bucketData: BucketData): List<Searchable> = buildList {
+        addSearchString("§b§lMineshaft Corpse Profit Tracker")
+        tracker.addBucketSelector(this, bucketData, "Corpse Type")
+
+        if (bucketData.getCorpseCount() == 0L) return@buildList
+
+        var profit = tracker.drawItems(bucketData, { true }, this)
+        val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) }
+            ?: enumValues<CorpseType>().toList().filter { bucketData.corpsesLooted[it] != null }
+        var totalKeyCost = 0.0
+        var totalKeyCount = 0
+        val keyCostStrings = buildList {
+            applicableKeys.forEach { keyData ->
+                keyData.key?.let { key ->
+                    val keyName = key.itemName
+                    val price = key.getPrice()
+                    val count = bucketData.corpsesLooted[keyData] ?: 0
+                    val totalPrice = price * count
+                    if (totalPrice > 0) {
+                        profit -= totalPrice
+                        totalKeyCost += totalPrice
+                        totalKeyCount += count.toInt()
+                        add("§7${count}x $keyName§7: §c-${totalPrice.shortFormat()}")
+                    }
+                }
+            }
+        }
+
+        if (totalKeyCount > 0) {
+            val specificKeyFormat = if (applicableKeys.count() == 1) applicableKeys.first().key!!.itemName else "§eCorpse Keys"
+            val keyFormat = "§7${totalKeyCount}x $specificKeyFormat§7: §c-${totalKeyCost.shortFormat()}"
+            add(
+                if (applicableKeys.count() == 1) Renderable.string(keyFormat).toSearchable()
+                else Renderable.hoverTips(
+                    keyFormat,
+                    keyCostStrings,
+                ).toSearchable(),
+            )
+        }
+
+        add(tracker.addTotalProfit(profit, bucketData.getCorpseCount(), "loot"))
+
+        tracker.addPriceFromButton(this)
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent) {
+        if (!isEnabled()) return
+        tracker.renderDisplay(config.position)
+    }
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        if (event.newIsland == IslandType.MINESHAFT || event.newIsland == IslandType.DWARVEN_MINES) {
+            tracker.firstUpdate()
+        }
+    }
+
+    fun resetCommand() {
+        tracker.resetCommand()
+    }
+
+    fun isEnabled() =
+        config.enabled && IslandType.DWARVEN_MINES.isInIsland() && (!config.onlyInMineshaft || IslandType.MINESHAFT.isInIsland())
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseType.kt
similarity index 76%
rename from src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseType.kt
rename to src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseType.kt
index 7ddfca86715d..42567d5f3363 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/CorpseType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseType.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.mining.mineshaft
+package at.hannibal2.skyhanni.features.mining.glacitemineshaft
 
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 
@@ -10,4 +10,6 @@ enum class CorpseType(val displayName: String, private val keyName: String? = nu
     ;
 
     val key by lazy { keyName?.asInternalName() }
+
+    override fun toString(): String = displayName
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/MineshaftCorpseProfitPer.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt
similarity index 97%
rename from src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/MineshaftCorpseProfitPer.kt
rename to src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt
index 102391b8755d..eed5f2b9d4d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/mineshaft/MineshaftCorpseProfitPer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.mining.mineshaft
+package at.hannibal2.skyhanni.features.mining.glacitemineshaft
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.mining.CorpseLootedEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 991b1a53e9c0..898466ce4b84 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -336,7 +336,7 @@ object CollectionUtils {
         for (entry in universe) {
             val display = getName(entry)
             if (isCurrent(entry)) {
-                addString("§a[$display]")
+                addString("§a[$display§a]")
             } else {
                 addString("§e[")
                 add(
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
new file mode 100644
index 000000000000..3bedaf8a4303
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
@@ -0,0 +1,101 @@
+package at.hannibal2.skyhanni.utils.tracker
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData.TrackedItem
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl
+
+abstract class BucketedItemTrackerData<E : Enum<E>> : TrackerData() {
+
+    private val config get() = SkyHanniMod.feature.misc.tracker
+
+    abstract fun resetItems()
+
+    abstract fun getDescription(timesGained: Long): List<String>
+
+    abstract fun getCoinName(bucket: E?, item: TrackedItem): String
+
+    abstract fun getCoinDescription(bucket: E?, item: TrackedItem): List<String>
+
+    open fun getCustomPricePer(internalName: NEUInternalName) = SkyHanniTracker.getPricePer(internalName)
+
+    override fun reset() {
+        bucketedItems.clear()
+        selectedBucket = null
+        resetItems()
+    }
+
+    fun addItem(bucket: E, internalName: NEUInternalName, stackSize: Int) {
+        val bucketMap = bucketedItems.getOrPut(bucket) { HashMap() }
+        val item = bucketMap.getOrPut(internalName) { TrackedItem() }
+
+        item.timesGained++
+        item.totalAmount += stackSize
+        item.lastTimeUpdated = SimpleTimeMark.now()
+    }
+
+    fun removeItem(bucket: E?, internalName: NEUInternalName) {
+        bucket?.let {
+            bucketedItems[bucket]?.remove(internalName)
+        } ?: bucketedItems.forEach {
+            it.value.remove(internalName)
+        }
+    }
+
+    fun toggleItemHide(bucket: E?, internalName: NEUInternalName) {
+        bucket?.let {
+            bucketedItems[bucket]?.get(internalName)?.let { it.hidden = !it.hidden }
+        } ?: bucketedItems.forEach {
+            it.value[internalName]?.hidden = !it.value[internalName]?.hidden!!
+        }
+    }
+
+    private val buckets: Array<E> by lazy {
+        @Suppress("UNCHECKED_CAST")
+        selectedBucket?.javaClass?.enumConstants
+            ?: (this.javaClass.genericSuperclass as? ParameterizedTypeImpl)?.actualTypeArguments?.firstOrNull()?.let { type ->
+                (type as? Class<E>)?.enumConstants
+            } ?: ErrorManager.skyHanniError(
+                "Unable to retrieve enum constants for E in BucketedItemTrackerData",
+                "selectedBucket" to selectedBucket,
+                "dataClass" to this.javaClass.superclass.name,
+            )
+    }
+
+    private var selectedBucket: E? = null
+    private var bucketedItems: MutableMap<E, MutableMap<NEUInternalName, TrackedItem>> = HashMap()
+
+    private fun getBucket(bucket: E): MutableMap<NEUInternalName, TrackedItem> = bucketedItems[bucket]?.toMutableMap() ?: HashMap()
+    private fun getPoppedBuckets(): MutableList<E> = (bucketedItems.toMutableMap().filter { it.value.isNotEmpty() }.keys).toMutableList()
+    fun getItemsProp(): MutableMap<NEUInternalName, TrackedItem> = getSelectedBucket()?.let { getBucket(it) } ?: flattenBuckets()
+    fun getSelectedBucket() = selectedBucket
+    fun selectNextSequentialBucket() {
+        // Move to the next ordinal, or wrap to null if at the last value
+        val nextOrdinal = selectedBucket?.let { it.ordinal + 1 } // Only calculate if selectedBucket is non-null
+        selectedBucket = when {
+            selectedBucket == null -> buckets.first() // If selectedBucket is null, start with the first enum
+            nextOrdinal != null && nextOrdinal >= buckets.size -> null // Wrap to null if we've reached the end
+            nextOrdinal != null -> buckets[nextOrdinal] // Move to the next enum value
+            else -> selectedBucket // Fallback, shouldn't happen
+        }
+    }
+
+    private fun flattenBuckets(): MutableMap<NEUInternalName, TrackedItem> {
+        val flatMap: MutableMap<NEUInternalName, TrackedItem> = HashMap()
+        getPoppedBuckets().distinct().forEach { bucket ->
+            getBucket(bucket).filter { !it.value.hidden }.entries.distinctBy { it.key }.forEach { (key, value) ->
+                flatMap.merge(key, value) { existing, new ->
+                    existing.copy(
+                        hidden = false,
+                        totalAmount = existing.totalAmount + new.totalAmount,
+                        timesGained = existing.timesGained + new.timesGained,
+                        lastTimeUpdated = maxOf(existing.lastTimeUpdated, new.lastTimeUpdated),
+                    )
+                }
+            }
+        }
+        return flatMap.toMutableMap()
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
index bce63e2d17be..a3976e44f6e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt
@@ -52,5 +52,19 @@ abstract class ItemTrackerData : TrackerData() {
         var hidden = false
 
         var lastTimeUpdated = SimpleTimeMark.farPast()
+
+        fun copy(
+            timesGained: Long = this.timesGained,
+            totalAmount: Long = this.totalAmount,
+            hidden: Boolean = this.hidden,
+            lastTimeUpdated: SimpleTimeMark = this.lastTimeUpdated,
+        ): TrackedItem {
+            val copy = TrackedItem()
+            copy.timesGained = timesGained
+            copy.totalAmount = totalAmount
+            copy.hidden = hidden
+            copy.lastTimeUpdated = lastTimeUpdated
+            return copy
+        }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
new file mode 100644
index 000000000000..dcbab2b1b0f1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
@@ -0,0 +1,214 @@
+package at.hannibal2.skyhanni.utils.tracker
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
+import at.hannibal2.skyhanni.data.SlayerAPI
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchableSelector
+import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.ItemPriceSource
+import at.hannibal2.skyhanni.utils.ItemUtils.itemName
+import at.hannibal2.skyhanni.utils.KeyboardManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.addButton
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import kotlin.time.Duration.Companion.seconds
+
+class SkyHanniBucketedItemTracker<E : Enum<E>, BucketedData : BucketedItemTrackerData<E>>(
+    name: String,
+    createNewSession: () -> BucketedData,
+    getStorage: (ProfileSpecificStorage) -> BucketedData,
+    drawDisplay: (BucketedData) -> List<Searchable>,
+    vararg extraStorage: Pair<DisplayMode, (ProfileSpecificStorage) -> BucketedData>,
+) : SkyHanniTracker<BucketedData>(name, createNewSession, getStorage, *extraStorage, drawDisplay = drawDisplay) {
+
+    companion object {
+        val SKYBLOCK_COIN = NEUInternalName.SKYBLOCK_COIN
+    }
+
+    fun addCoins(bucket: E, coins: Int) {
+        addItem(bucket, SKYBLOCK_COIN, coins)
+    }
+
+    fun addItem(bucket: E, internalName: NEUInternalName, amount: Int) {
+        modify {
+            it.addItem(bucket, internalName, amount)
+        }
+        getSharedTracker()?.let {
+            val hidden = it.get(DisplayMode.TOTAL).getItemsProp()[internalName]!!.hidden
+            it.get(DisplayMode.SESSION).getItemsProp()[internalName]!!.hidden = hidden
+        }
+
+        val (itemName, price) = SlayerAPI.getItemNameAndPrice(internalName, amount)
+        if (config.warnings.chat && price >= config.warnings.minimumChat) {
+            ChatUtils.chat("§a+Tracker Drop§7: §r$itemName")
+        }
+        if (config.warnings.title && price >= config.warnings.minimumTitle) {
+            LorenzUtils.sendTitle("§a+ $itemName", 5.seconds)
+        }
+    }
+
+    fun addPriceFromButton(lists: MutableList<Searchable>) {
+        if (isInventoryOpen()) {
+            lists.addSearchableSelector<ItemPriceSource>(
+                "",
+                getName = { type -> type.sellName },
+                isCurrent = { it?.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
+                onChange = {
+                    config.priceSource = it?.let { ItemPriceSource.entries[it.ordinal] } // todo avoid ordinal
+                    update()
+                },
+            )
+        }
+    }
+
+    fun addBucketSelector(
+        lists: MutableList<Searchable>,
+        data: BucketedData,
+        sourceStringPrefix: String,
+        nullBucketLabel: String = "All",
+    ) {
+        if (isInventoryOpen()) {
+            lists.addButton(
+                prefix = "§7$sourceStringPrefix: ",
+                getName = data.getSelectedBucket()?.toString() ?: nullBucketLabel,
+                onChange = {
+                    data.selectNextSequentialBucket()
+                    update()
+                },
+            )
+        }
+    }
+
+    fun drawItems(
+        data: BucketedData,
+        filter: (NEUInternalName) -> Boolean,
+        lists: MutableList<Searchable>,
+    ): Double {
+        var profit = 0.0
+        val dataItems = data.getItemsProp()
+        val items = mutableMapOf<NEUInternalName, Long>()
+        for ((internalName, itemProfit) in dataItems) {
+            if (!filter(internalName)) continue
+
+            val amount = itemProfit.totalAmount
+            val pricePer =
+                if (internalName == SKYBLOCK_COIN) 1.0 else data.getCustomPricePer(internalName)
+            val price = (pricePer * amount).toLong()
+            val hidden = itemProfit.hidden
+
+            if (isInventoryOpen() || !hidden) {
+                items[internalName] = price
+            }
+            if (!hidden || !config.excludeHiddenItemsInPrice) {
+                profit += price
+            }
+        }
+
+        val limitList = config.hideCheapItems
+        var pos = 0
+        val hiddenItemTexts = mutableListOf<String>()
+        for ((internalName, price) in items.sortedDesc()) {
+            val itemProfit = data.getItemsProp()[internalName] ?: error("Item not found for $internalName")
+
+            val amount = itemProfit.totalAmount
+            val displayAmount = if (internalName == SKYBLOCK_COIN) itemProfit.timesGained else amount
+
+            val cleanName = if (internalName == SKYBLOCK_COIN) {
+                data.getCoinName(data.getSelectedBucket(), itemProfit)
+            } else {
+                internalName.itemName
+            }
+
+            val priceFormat = price.shortFormat()
+            val hidden = itemProfit.hidden
+            val newDrop = itemProfit.lastTimeUpdated.passedSince() < 10.seconds && config.showRecentDrops
+            val numberColor = if (newDrop) "§a§l" else "§7"
+
+            var displayName = if (hidden) {
+                "§8§m" + cleanName.removeColor(keepFormatting = true).replace("§r", "")
+            } else cleanName
+            displayName = " $numberColor${displayAmount.addSeparators()}x $displayName§7: §6$priceFormat"
+
+            pos++
+            if (limitList.enabled.get()) {
+                if (pos > limitList.alwaysShowBest.get()) {
+                    if (price < limitList.minPrice.get() * 1000) {
+                        hiddenItemTexts += displayName
+                        continue
+                    }
+                }
+            }
+
+            val lore = buildLore(data, itemProfit, hidden, newDrop, internalName)
+            val renderable = if (isInventoryOpen()) Renderable.clickAndHover(
+                displayName, lore,
+                onClick = {
+                    if (KeyboardManager.isModifierKeyDown()) {
+                        data.removeItem(data.getSelectedBucket(), internalName)
+                        ChatUtils.chat("Removed $cleanName §efrom $name${if (data.getSelectedBucket() != null) " (${data.getSelectedBucket()})" else ""}")
+                    } else {
+                        modify {
+                            it.toggleItemHide(data.getSelectedBucket(), internalName)
+                        }
+                    }
+                    update()
+
+                },
+            ) else Renderable.string(displayName)
+
+            lists.add(renderable.toSearchable(name))
+        }
+        if (hiddenItemTexts.size > 0) {
+            val text = Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts).toSearchable()
+            lists.add(text)
+        }
+
+        return profit
+    }
+
+    private fun buildLore(
+        data: BucketedData,
+        item: ItemTrackerData.TrackedItem,
+        hidden: Boolean,
+        newDrop: Boolean,
+        internalName: NEUInternalName,
+    ) = buildList {
+        if (internalName == SKYBLOCK_COIN) {
+            addAll(data.getCoinDescription(data.getSelectedBucket(), item))
+        } else {
+            addAll(data.getDescription(item.timesGained))
+        }
+        add("")
+        if (newDrop) {
+            add("§aYou obtained this item recently.")
+            add("")
+        }
+        add("§eClick to " + (if (hidden) "show" else "hide") + "!")
+        add("§eControl + Click to remove this item!")
+        if (SkyHanniMod.feature.dev.debug.enabled) {
+            add("")
+            add("§7${internalName}")
+        }
+    }
+
+    fun addTotalProfit(profit: Double, totalAmount: Long, action: String): Searchable {
+        val profitFormat = profit.toLong().addSeparators()
+        val profitPrefix = if (profit < 0) "§c" else "§6"
+
+        val tips = if (totalAmount > 0) {
+            val profitPerCatch = profit / totalAmount
+            val profitPerCatchFormat = profitPerCatch.shortFormat()
+            listOf("§7Profit per $action: $profitPrefix$profitPerCatchFormat")
+        } else emptyList()
+
+        val text = "§eTotal Profit: $profitPrefix$profitFormat coins"
+        return Renderable.hoverTips(text, tips).toSearchable()
+    }
+}

From 9acb6e88fb868ce9d591fb98cfa80730681653f6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:54:18 +0200
Subject: [PATCH 437/721] fixed profit per mineshaft corpse

---
 .../mining/glacitemineshaft/CorpseTracker.kt  |  2 +-
 ...ofitPer.kt => ProfitPerMineshaftCorpse.kt} | 19 +++++++++----------
 .../tracker/SkyHanniBucketedItemTracker.kt    |  3 +--
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/{MineshaftCorpseProfitPer.kt => ProfitPerMineshaftCorpse.kt} (75%)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
index 77aabc1bd996..c54315d7e430 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -34,7 +34,7 @@ object CorpseTracker {
         "Corpse Tracker",
         { BucketData() },
         { it.mining.mineshaft.corpseProfitTracker },
-        { drawDisplay(it) }
+        { drawDisplay(it) },
     )
 
     class BucketData : BucketedItemTrackerData<CorpseType>() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
similarity index 75%
rename from src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt
rename to src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
index eed5f2b9d4d4..7eebeeaab890 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftCorpseProfitPer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.mining.CorpseLootedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
@@ -13,7 +14,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
-object MineshaftCorpseProfitPer {
+object ProfitPerMineshaftCorpse {
     private val config get() = SkyHanniMod.feature.mining.mineshaft
 
     @SubscribeEvent
@@ -25,14 +26,12 @@ object MineshaftCorpseProfitPer {
         val map = mutableMapOf<String, Double>()
         for ((name, amount) in loot) {
             if (name == "§bGlacite Powder") continue
-            NEUInternalName.fromItemNameOrNull(name)?.let {
-                val pricePer = it.getPrice()
-                if (pricePer == -1.0) continue
-                val profit = amount * pricePer
-                val text = "§eFound $name §8${amount.addSeparators()}x §7(§6${profit.shortFormat()}§7)"
-                map[text] = profit
-                totalProfit += profit
-            }
+            val internalName = NEUInternalName.fromItemNameOrNull(name) ?: continue
+            val pricePer = internalName.getPriceOrNull() ?: continue
+            val profit = amount * pricePer
+            val text = "§eFound $name §8${amount.addSeparators()}x §7(§6${profit.shortFormat()}§7)"
+            map[text] = profit
+            totalProfit += profit
         }
 
         val corpseType = event.corpseType
@@ -42,7 +41,7 @@ object MineshaftCorpseProfitPer {
             val keyName = it.itemName
             val price = it.getPrice()
 
-            map["$keyName: §c-${price.shortFormat()}"] = -price
+            map["§cCost: $keyName §7(§c-${price.shortFormat()}§7)"] = -price
             totalProfit -= price
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
index dcbab2b1b0f1..2975d57e2461 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
@@ -98,8 +98,7 @@ class SkyHanniBucketedItemTracker<E : Enum<E>, BucketedData : BucketedItemTracke
             if (!filter(internalName)) continue
 
             val amount = itemProfit.totalAmount
-            val pricePer =
-                if (internalName == SKYBLOCK_COIN) 1.0 else data.getCustomPricePer(internalName)
+            val pricePer = if (internalName == SKYBLOCK_COIN) 1.0 else data.getCustomPricePer(internalName)
             val price = (pricePer * amount).toLong()
             val hidden = itemProfit.hidden
 

From d6c9b63136cae3a8abf7d4ce91424dfc648dc59c Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Tue, 10 Sep 2024 23:23:42 +0200
Subject: [PATCH 438/721] Feature: Golden Fish Timer (#1941)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../trophyfishing/GoldenFishTimerConfig.java  |  47 +++
 .../trophyfishing/TrophyFishingConfig.java    |   5 +
 .../events/FishingBobberInLiquidEvent.kt      |   5 +
 .../events/FishingBobberInWaterEvent.kt       |   3 -
 .../skyhanni/features/fishing/FishingAPI.kt   |  24 +-
 .../features/fishing/FishingBaitWarnings.kt   |   4 +-
 .../features/fishing/IsFishingDetection.kt    |   4 +-
 .../fishing/trophy/GoldenFishTimer.kt         | 343 ++++++++++++++++++
 .../fishing/trophy/TrophyFishMessages.kt      |  18 +-
 .../skyhanni/utils/InventoryUtils.kt          |   5 +-
 .../at/hannibal2/skyhanni/utils/TimeUtils.kt  |   7 +-
 11 files changed, 437 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/GoldenFishTimerConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/events/FishingBobberInWaterEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/GoldenFishTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/GoldenFishTimerConfig.java
new file mode 100644
index 000000000000..ca803483bed9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/GoldenFishTimerConfig.java
@@ -0,0 +1,47 @@
+package at.hannibal2.skyhanni.config.features.fishing.trophyfishing;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class GoldenFishTimerConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Enable the Golden Fish Timer.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Nametag", desc = "Show a nametag on the Golden Fish showing how weak it is and when it will despawn.")
+    @ConfigEditorBoolean
+    public boolean nametag = true;
+
+    @Expose
+    @ConfigOption(name = "Highlight when ready", desc = "Highlight the Golden Fish when it is ready to be caught.")
+    @ConfigEditorBoolean
+    public boolean highlight = true;
+
+    @Expose
+    @ConfigOption(name = "Throw Rod Warning", desc = "Show a warning when you are close to the time limit of throwing your rod.")
+    @ConfigEditorBoolean
+    public boolean throwRodWarning = false;
+
+    @Expose
+    @ConfigOption(name = "Show Head", desc = "Show the Golden Fish head in the Golden Fish Timer GUI.")
+    @ConfigEditorBoolean
+    public boolean showHead = true;
+
+    @Expose
+    @ConfigOption(name = "Throw Rod Warning Time", desc = "The time in seconds before the throw rod warning appears.")
+    @ConfigEditorSlider(minValue = 1, maxValue = 60, minStep = 1)
+    public int throwRodWarningTime = 20;
+
+    @Expose
+    @ConfigLink(owner = GoldenFishTimerConfig.class, field = "enabled")
+    public Position position = new Position(50, 80);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/TrophyFishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/TrophyFishingConfig.java
index d6b5effcb6e8..a8df7495015d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/TrophyFishingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/TrophyFishingConfig.java
@@ -29,6 +29,11 @@ public class TrophyFishingConfig {
     @Expose
     public SulphurSkitterBoxConfig sulphurSkitterBox = new SulphurSkitterBoxConfig();
 
+    @Expose
+    @ConfigOption(name = "Golden Fish Timer", desc = "")
+    @Accordion
+    public GoldenFishTimerConfig goldenFishTimer = new GoldenFishTimerConfig();
+
     @Expose
     @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of Trophy Fish in tooltip.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt
new file mode 100644
index 000000000000..a2cf6d2709c7
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt
@@ -0,0 +1,5 @@
+package at.hannibal2.skyhanni.events
+
+import net.minecraft.entity.projectile.EntityFishHook
+
+class FishingBobberInLiquidEvent(val bobber: EntityFishHook, val onWater: Boolean) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInWaterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInWaterEvent.kt
deleted file mode 100644
index 9423ea2d9ae1..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInWaterEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package at.hannibal2.skyhanni.events
-
-class FishingBobberInWaterEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
index 800f01cfea8e..596d6f49cfd2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.fishing
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.jsonobjects.repo.ItemsJson
 import at.hannibal2.skyhanni.events.FishingBobberCastEvent
-import at.hannibal2.skyhanni.events.FishingBobberInWaterEvent
+import at.hannibal2.skyhanni.events.FishingBobberInLiquidEvent
 import at.hannibal2.skyhanni.events.ItemInHandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -13,7 +13,6 @@ import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager.getFilletValue
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -21,8 +20,8 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
@@ -52,7 +51,7 @@ object FishingAPI {
     private var waterRods = listOf<NEUInternalName>()
 
     var bobber: EntityFishHook? = null
-    var bobberHasTouchedWater = false
+    var bobberHasTouchedLiquid = false
 
     var wearingTrophyArmor = false
 
@@ -63,13 +62,13 @@ object FishingAPI {
 
         lastCastTime = SimpleTimeMark.now()
         bobber = event.entity
-        bobberHasTouchedWater = false
+        bobberHasTouchedLiquid = false
         FishingBobberCastEvent(event.entity).postAndCatch()
     }
 
     private fun resetBobber() {
         bobber = null
-        bobberHasTouchedWater = false
+        bobberHasTouchedLiquid = false
     }
 
     @SubscribeEvent
@@ -89,12 +88,15 @@ object FishingAPI {
         if (bobber.isDead) {
             resetBobber()
         } else {
-            if (!bobberHasTouchedWater) {
-                val block = bobber.getLorenzVec().getBlockAt()
-                if (block in getAllowedBlocks()) {
-                    bobberHasTouchedWater = true
-                    FishingBobberInWaterEvent().postAndCatch()
+            if (!bobberHasTouchedLiquid) {
+                val isWater = when {
+                    bobber.isInLava && holdingLavaRod -> false
+                    bobber.isInWater && holdingWaterRod -> true
+                    else -> return
                 }
+
+                bobberHasTouchedLiquid = true
+                FishingBobberInLiquidEvent(bobber, isWater).postAndCatch()
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt
index 6773f13411f6..7d11f91fd7eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingBaitWarnings.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.event.HandleEvent
-import at.hannibal2.skyhanni.events.FishingBobberInWaterEvent
+import at.hannibal2.skyhanni.events.FishingBobberInLiquidEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.entity.EntityEnterWorldEvent
 import at.hannibal2.skyhanni.features.fishing.FishingAPI.isBait
@@ -48,7 +48,7 @@ object FishingBaitWarnings {
     }
 
     @SubscribeEvent
-    fun onBobberInWater(event: FishingBobberInWaterEvent) {
+    fun onBobber(event: FishingBobberInLiquidEvent) {
         if (!isEnabled()) return
         DelayedRun.runDelayed(500.milliseconds) {
             checkBait()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/IsFishingDetection.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/IsFishingDetection.kt
index 74bc567c13db..4bd6d170cd6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/IsFishingDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/IsFishingDetection.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.features.fishing
 
-import at.hannibal2.skyhanni.events.FishingBobberInWaterEvent
+import at.hannibal2.skyhanni.events.FishingBobberInLiquidEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.EntityUtils
@@ -26,7 +26,7 @@ object IsFishingDetection {
     private var lastSeaCreatureKillAreaTime = SimpleTimeMark.farPast()
 
     @SubscribeEvent
-    fun onBobberInWater(event: FishingBobberInWaterEvent) {
+    fun onBobber(event: FishingBobberInLiquidEvent) {
         lastRodCastLocation = LocationUtils.playerLocation()
         lastRodCastTime = SimpleTimeMark.now()
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt
new file mode 100644
index 000000000000..7a0e2d65f822
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt
@@ -0,0 +1,343 @@
+package at.hannibal2.skyhanni.features.fishing.trophy
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.TitleManager
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.EntityMaxHealthUpdateEvent
+import at.hannibal2.skyhanni.events.FishingBobberCastEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.fishing.FishingAPI
+import at.hannibal2.skyhanni.features.fishing.FishingAPI.isLavaRod
+import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.drawString
+import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.TimeLimitedSet
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.entity.EntityLivingBase
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object GoldenFishTimer {
+
+    private val config get() = SkyHanniMod.feature.fishing.trophyFishing.goldenFishTimer
+
+    private val patternGroup = RepoPattern.group("fishing.goldenfish")
+    private val spawnPattern by patternGroup.pattern(
+        "spawn",
+        "§9You spot a §r§6Golden Fish §r§9surface from beneath the lava!",
+    )
+    private val interactPattern by patternGroup.pattern(
+        "interact",
+        "§9The §r§6Golden Fish §r§9escapes your hook but looks weakened\\.",
+    )
+    private val weakPattern by patternGroup.pattern(
+        "weak",
+        "§9The §r§6Golden Fish §r§9is weak!",
+    )
+    private val despawnPattern by patternGroup.pattern(
+        "despawn",
+        "§9The §r§6Golden Fish §r§9swims back beneath the lava\\.\\.\\.",
+    )
+
+    private val timeOut = 10.seconds
+    private val despawnTime = 1.minutes
+    private val maxRodTime = 3.minutes
+    private val minimumSpawnTime = 15.minutes
+    private const val MAX_INTERACTIONS = 3
+
+    private var lastFishEntity = SimpleTimeMark.farPast()
+    private var lastChatMessage = SimpleTimeMark.farPast()
+
+    private var lastGoldenFishTime = SimpleTimeMark.farPast()
+
+    private var lastRodThrowTime = SimpleTimeMark.farPast()
+    private var goldenFishDespawnTimer = SimpleTimeMark.farFuture()
+    private var timePossibleSpawn = SimpleTimeMark.farFuture()
+
+    private val isFishing get() = FishingAPI.isFishing() || lastRodThrowTime.passedSince() < maxRodTime
+    private var hasLavaRodInInventory = false
+
+    private fun checkGoldenFish(entity: EntityLivingBase) {
+        if (entity.inventory.none { it?.getSkullTexture() == GOLDEN_FISH_SKULL_TEXTURE }) return
+        possibleGoldenFishEntity = entity
+        lastFishEntity = SimpleTimeMark.now()
+        handle()
+    }
+
+    private const val GOLDEN_FISH_SKULL_TEXTURE =
+        "ewogICJ0aW1lc3RhbXAiIDogMTY0MzgzMTA2MDE5OCwKICAicHJvZmlsZUlkIiA6ICJiN2ZkYmU2N2NkMDA0NjgzYjlmYTllM2UxNzczODI1NCIsCiAgInByb2ZpbGVOYW1lIiA6ICJDVUNGTDE0IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzEyMGNmM2MwYTQwZmM2N2UwZTVmZTBjNDZiMGFlNDA5YWM3MTAzMGE3NjU2ZGExN2IxMWVkMDAxNjQ1ODg4ZmUiCiAgICB9CiAgfQp9"
+    private val goldenFishSkullItem by lazy {
+        ItemUtils.createSkull(
+            displayName = "§6Golden Fish",
+            uuid = "b7fdbe67cd004683b9fa9e3e17738254",
+            value = GOLDEN_FISH_SKULL_TEXTURE,
+        )
+    }
+    private var interactions = 0
+    private var goingDownInit = true
+    private var goingDownPost = false
+    private var hasWarnedRod = false
+
+    private var possibleGoldenFishEntity: EntityLivingBase? = null
+    private var confirmedGoldenFishEntity: EntityLivingBase? = null
+
+    private var display = listOf<Renderable>()
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isActive()) return
+        if (spawnPattern.matches(event.message)) {
+            lastChatMessage = SimpleTimeMark.now()
+            handle()
+            return
+        }
+        if (interactPattern.matches(event.message)) {
+            goldenFishDespawnTimer = SimpleTimeMark.now() + despawnTime
+            interactions++
+            return
+        }
+        if (weakPattern.matches(event.message)) {
+            goldenFishDespawnTimer = SimpleTimeMark.now() + despawnTime
+            val entity = confirmedGoldenFishEntity ?: return
+            if (config.highlight) RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+                entity,
+                LorenzColor.GREEN.toColor().withAlpha(100)
+            ) { true }
+            return
+        }
+        if (despawnPattern.matches(event.message)) {
+            timePossibleSpawn = SimpleTimeMark.now() + minimumSpawnTime
+            removeGoldenFish()
+            return
+        }
+        TrophyFishMessages.trophyFishPattern.matchMatcher(event.message) {
+            val internalName = TrophyFishMessages.getInternalName(group("displayName"))
+            if (internalName != "goldenfish") return@matchMatcher
+            timePossibleSpawn = SimpleTimeMark.now() + minimumSpawnTime
+            removeGoldenFish()
+            return
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isActive()) return
+        if (!config.nametag) return
+        val entity = confirmedGoldenFishEntity ?: return
+
+        val location = event.exactLocation(entity).add(y = 2.5)
+        if (location.distanceToPlayer() > 20) return
+        event.drawString(location.add(y = 0.5), "§b${(goldenFishDespawnTimer + 1.seconds).timeUntil().format()}", false)
+        if (interactions >= MAX_INTERACTIONS) event.drawString(location.add(y = 0.25), "§cPULL", false)
+        event.drawString(location, "§6Golden Fish §a($interactions/$MAX_INTERACTIONS)", false)
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isActive()) return
+        val list = display.takeIf { it.isNotEmpty() } ?: return
+        val renderable = Renderable.horizontalContainer(list, verticalAlign = RenderUtils.VerticalAlignment.CENTER)
+        config.position.renderRenderables(listOf(renderable), posLabel = "Golden Fish Timer")
+    }
+
+    private fun updateDisplay() {
+        display = drawDisplay()
+    }
+
+    private fun drawDisplay() = buildList {
+        if (config.showHead) add(
+            Renderable.itemStack(
+                goldenFishSkullItem,
+                2.5,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            ),
+        )
+        val text = buildList {
+            add("§6§lGolden Fish Timer")
+            if (!isGoldenFishActive()) {
+                if (lastGoldenFishTime.isFarPast()) add("§7Last Golden Fish: §cNone this session")
+                else add("§7Last Golden Fish: §b${lastGoldenFishTime.passedSince().formatTime()}")
+                if (lastRodThrowTime.isFarPast()) add("§7Last Row Throw: §cNone yet")
+                else add(
+                    "§7Last Rod Throw: §b${lastRodThrowTime.passedSince().formatTime()} " +
+                        "§3(${(lastRodThrowTime + maxRodTime + 1.seconds).timeUntil().formatTime()})",
+                )
+                if (timePossibleSpawn.isFarFuture()) add("§7Can spawn in: §cUnknown")
+                else if (timePossibleSpawn.isInFuture()) add(
+                    "§7Can spawn in: §b${
+                        (timePossibleSpawn + 1.seconds).timeUntil().formatTime()
+                    }",
+                )
+                else {
+                    add("§7Can spawn since: §b${timePossibleSpawn.passedSince().formatTime()}")
+                    val chance = timePossibleSpawn.passedSince().inWholeSeconds.toDouble() / 5.minutes.inWholeSeconds
+                    add("§7Chance: §b${LorenzUtils.formatPercentage(chance.coerceAtMost(1.0))}")
+                }
+            } else {
+                add("§7Interactions: §b$interactions/$MAX_INTERACTIONS")
+                add("§7Despawn in: §b${(goldenFishDespawnTimer + 1.seconds).timeUntil().formatTime()}")
+            }
+        }
+
+        add(
+            Renderable.verticalContainer(
+                text.map { Renderable.string(it) },
+                spacing = 1,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            ),
+        )
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isEnabled()) return
+        hasLavaRodInInventory = InventoryUtils.containsInLowerInventory { it.getInternalNameOrNull()?.isLavaRod() == true }
+
+        if (!isActive()) return
+
+        if (lastRodThrowTime.passedSince() > maxRodTime) {
+            timePossibleSpawn = SimpleTimeMark.farFuture()
+            lastRodThrowTime = SimpleTimeMark.farPast()
+        }
+        if (!lastRodThrowTime.isFarPast() && (lastRodThrowTime + maxRodTime).timeUntil() < config.throwRodWarningTime.seconds) {
+            rodWarning()
+        }
+
+        updateDisplay()
+    }
+
+    private fun rodWarning() {
+        if (!config.throwRodWarning || hasWarnedRod) return
+        hasWarnedRod = true
+        TitleManager.sendTitle("§cThrow your rod!", 5.seconds, 3.6, 7.0f)
+        SoundUtils.repeatSound(100, 10, SoundUtils.plingSound)
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isActive()) return
+        // This makes it only count as the rod being throw into lava if the rod goes down, up, and down again.
+        // Not confirmed that this is correct, but it's the best solution found.
+        val bobber = FishingAPI.bobber ?: return
+        if (!bobber.isInLava || bobber.ticksExisted < 5) return
+        if (bobber.motionY > 0 && goingDownInit) goingDownInit = false
+        else if (bobber.motionY < 0 && !goingDownInit && !goingDownPost) {
+            hasWarnedRod = false
+            goingDownPost = true
+            lastRodThrowTime = SimpleTimeMark.now()
+            if (timePossibleSpawn.isFarFuture()) timePossibleSpawn = SimpleTimeMark.now() + minimumSpawnTime
+        }
+    }
+
+    @SubscribeEvent
+    fun onBobberThrow(event: FishingBobberCastEvent) {
+        if (!isActive()) return
+        goingDownInit = true
+        goingDownPost = false
+    }
+
+    @SubscribeEvent
+    fun onEntityHealthUpdate(event: EntityMaxHealthUpdateEvent) {
+        if (!isActive()) return
+        if (isGoldenFishActive()) return
+        val entity = event.entity as? EntityArmorStand ?: return
+        entity.inventory.forEach { it?.getSkullTexture()?.let { texture -> println(texture) } }
+
+        DelayedRun.runDelayed(1.seconds) { checkGoldenFish(entity) }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        lastChatMessage = SimpleTimeMark.farPast()
+        lastFishEntity = SimpleTimeMark.farPast()
+        lastGoldenFishTime = SimpleTimeMark.farPast()
+        possibleGoldenFishEntity = null
+        lastRodThrowTime = SimpleTimeMark.farPast()
+        timePossibleSpawn = SimpleTimeMark.farFuture()
+        interactions = 0
+        display = listOf()
+        removeGoldenFish()
+    }
+
+    @SubscribeEvent
+    fun onDebugData(event: DebugDataCollectEvent) {
+        event.title("Golden Fish Timer")
+        if (!isEnabled()) {
+            event.addIrrelevant("Not Enabled")
+        } else {
+            event.addIrrelevant {
+                add("lastChatMessage: ${lastChatMessage.passedSince().format()}")
+                add("lastFishEntity: ${lastFishEntity.passedSince().format()}")
+                add("lastGoldenFishTime: ${lastGoldenFishTime.passedSince().format()}")
+                add("lastRodThrowTime: ${lastRodThrowTime.passedSince().format()}")
+                add("goldenFishDespawnTimer: ${goldenFishDespawnTimer.timeUntil().format()}")
+                add("timePossibleSpawn: ${timePossibleSpawn.timeUntil().format()}")
+                add("interactions: $interactions")
+                add("goingDownInit: $goingDownInit")
+                add("goingDownPost: $goingDownPost")
+                add("hasWarnedRod: $hasWarnedRod")
+                add("possibleGoldenFishEntity: $possibleGoldenFishEntity")
+                add("confirmedGoldenFishEntity: $confirmedGoldenFishEntity")
+            }
+        }
+    }
+
+    private fun removeGoldenFish() {
+        goldenFishDespawnTimer = SimpleTimeMark.farFuture()
+        confirmedGoldenFishEntity?.let {
+            confirmedGoldenFishEntity = null
+            RenderLivingEntityHelper.removeEntityColor(it)
+        }
+    }
+
+    private fun handle() {
+        if (lastChatMessage.passedSince() > timeOut || lastFishEntity.passedSince() > timeOut) return
+        lastFishEntity = SimpleTimeMark.farPast()
+        lastChatMessage = SimpleTimeMark.farPast()
+        lastGoldenFishTime = SimpleTimeMark.now()
+        interactions = 0
+        ChatUtils.debug("Found Golden Fish!")
+        confirmedGoldenFishEntity = possibleGoldenFishEntity
+        possibleGoldenFishEntity = null
+        goldenFishDespawnTimer = SimpleTimeMark.now() + despawnTime
+    }
+
+    private fun Duration.formatTime() = format(showMilliSeconds = false, showSmallerUnits = true)
+
+    private fun isGoldenFishActive() = confirmedGoldenFishEntity != null
+
+    private fun isEnabled() = config.enabled && (IslandType.CRIMSON_ISLE.isInIsland() || LorenzUtils.isStrandedProfile)
+    private fun isActive() = isEnabled() && isFishing && hasLavaRodInInventory
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
index 606f780417c2..7068ef8aa7b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
@@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 object TrophyFishMessages {
     private val config get() = SkyHanniMod.feature.fishing.trophyFishing.chatMessages
 
-    private val trophyFishPattern by RepoPattern.pattern(
+    val trophyFishPattern by RepoPattern.pattern(
         "fishing.trophy.trophyfish",
         "§6§lTROPHY FISH! §r§bYou caught an? §r(?<displayName>§[0-9a-f](?:§k)?[\\w -]+) §r(?<displayRarity>§[0-9a-f]§l\\w+)§r§b\\."
     )
@@ -31,16 +31,13 @@ object TrophyFishMessages {
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        var displayName = ""
-        var displayRarity = ""
 
-        trophyFishPattern.matchMatcher(event.message) {
-            displayName = group("displayName").replace("§k", "")
-            displayRarity = group("displayRarity")
+        val (displayName, displayRarity) = trophyFishPattern.matchMatcher(event.message) {
+            group("displayName").replace("§k", "") to
+                group("displayRarity")
         } ?: return
 
-        val internalName = displayName.replace("Obfuscated", "Obfuscated Fish")
-            .replace("[- ]".toRegex(), "").lowercase().removeColor()
+        val internalName = getInternalName(displayName)
         val rawRarity = displayRarity.lowercase().removeColor()
         val rarity = TrophyRarity.getByName(rawRarity) ?: return
 
@@ -88,6 +85,11 @@ object TrophyFishMessages {
         }
     }
 
+    fun getInternalName(displayName: String): String {
+        return displayName.replace("Obfuscated", "Obfuscated Fish")
+            .replace("[- ]".toRegex(), "").lowercase().removeColor()
+    }
+
     private fun shouldBlockTrophyFish(rarity: TrophyRarity, amount: Int) =
         config.bronzeHider && rarity == TrophyRarity.BRONZE && amount != 1
             || config.silverHider && rarity == TrophyRarity.SILVER && amount != 1
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index c8492086ad79..fd240b1457b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -54,7 +54,10 @@ object InventoryUtils {
     fun getItemsInHotbar() =
         getItemsInOwnInventoryWithNull()?.sliceArray(0..8)?.filterNotNull() ?: emptyList()
 
-    fun countItemsInLowerInventory(predicate: (ItemStack) -> Boolean) =
+    fun containsInLowerInventory(predicate: (ItemStack) -> Boolean): Boolean =
+        countItemsInLowerInventory(predicate) > 0
+
+    fun countItemsInLowerInventory(predicate: (ItemStack) -> Boolean): Int =
         getItemsInOwnInventory().filter { predicate(it) }.sumOf { it.stackSize }
 
     fun inStorage() = openInventoryName().let {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index b31bb828b147..5cf3ec2e51f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -19,6 +19,7 @@ object TimeUtils {
         showMilliSeconds: Boolean = this in -1.seconds..1.seconds,
         longName: Boolean = false,
         maxUnits: Int = -1,
+        showSmallerUnits: Boolean = false,
     ): String {
         var millis = inWholeMilliseconds
         val parts = mutableMapOf<TimeUnit, Int>()
@@ -31,10 +32,14 @@ object TimeUtils {
             }
         }
 
+        val largestNonZeroUnit = parts.firstNotNullOfOrNull { if (it.value != 0) it.key else null } ?: TimeUnit.SECOND
+
         var currentUnits = 0
         val result = buildString {
             for ((unit, value) in parts) {
-                if (value != 0 || (unit == TimeUnit.SECOND && showMilliSeconds)) {
+                val showUnit = value != 0 || (showSmallerUnits && unit.factor <= largestNonZeroUnit.factor)
+
+                if (showUnit) {
                     val formatted = value.addSeparators()
                     val text = if (unit == TimeUnit.SECOND && showMilliSeconds) {
                         val formattedMillis = (millis / 100).toInt()

From f75c9933794cdb9c7dff5486369636b18854b76d Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 10 Sep 2024 23:35:59 +0200
Subject: [PATCH 439/721] Fix: Last Server Chat Spam (#2495)

---
 .../skyhanni/config/features/misc/LastServersConfig.java  | 2 +-
 .../at/hannibal2/skyhanni/features/misc/LastServers.kt    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
index a488b52e9071..e613b013b38f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
@@ -9,7 +9,7 @@
 public class LastServersConfig {
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Receive notifications when you rejoin a server you have previously joined.")
+    @ConfigOption(name = "Enabled", desc = "Receive notifications when you rejoin a server you were in previously.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean enabled = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
index 8bc2d96e45f8..7a59ef4f6520 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
@@ -26,14 +26,18 @@ object LastServers {
         // Update the time of the current server if the player is still on the same server.
         // This is necessary because the player can be on the same server for a long time.
         // And if the player leaves the server and joins it again, it still warns the player.
-        lastServers[id] = SimpleTimeMark.now()
+        if (lastServerId == id) {
+            lastServers[id] = SimpleTimeMark.now()
+            return
+        }
 
         lastServers.entries.removeIf { it.value.passedSince() > config.warnTime.seconds }
         lastServers[id]?.passedSince()?.let {
-            ChatUtils.chat("§7You already joined this server §b${it.format()}§7 ago.")
+            ChatUtils.chat("§7You were already on this server §b${it.format()}§7 ago.")
         }
         ChatUtils.debug("Adding $id to last servers.")
         lastServerId = id
+        lastServers[id] = SimpleTimeMark.now()
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled

From 6a3f13cb21c81ba69ee324c751ee481605c170ef Mon Sep 17 00:00:00 2001
From: Not a cow <104355555+Not-a-cowfr@users.noreply.github.com>
Date: Wed, 11 Sep 2024 00:22:15 -0700
Subject: [PATCH 440/721] Fix: dicer gemstone fortune in ffguide (#2499)

---
 .../hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
index d2740928a4ca..77862b74daf5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
@@ -77,7 +77,7 @@ object FFStats {
             in dicerCrops -> {
                 FortuneStats.SUNDER.set(FarmingFortuneDisplay.getSunderFortune(tool), 75.0)
                 FortuneStats.REFORGE.set(FarmingFortuneDisplay.reforgeFortune, 20.0)
-                FortuneStats.GEMSTONE.set(FarmingFortuneDisplay.gemstoneFortune, 20.0)
+                FortuneStats.GEMSTONE.set(FarmingFortuneDisplay.gemstoneFortune, 30.0)
             }
 
             CropType.MUSHROOM -> {

From c1f6c7242ae4f14556cfddbd2794694a5416b64f Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 11 Sep 2024 17:43:41 +1000
Subject: [PATCH 441/721] Fix: Build actions failing (#2500)

---
 build.gradle.kts    | 3 ---
 settings.gradle.kts | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 812b89e7eb9e..e8464ada27e8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,9 +41,6 @@ repositories {
     maven("https://maven.notenoughupdates.org/releases") // NotEnoughUpdates (dev env)
     maven("https://repo.hypixel.net/repository/Hypixel/") // mod-api
     maven("https://maven.teamresourceful.com/repository/thatgravyboat/") // DiscordIPC
-
-    // only for the rare cases when maven.deftu.xyz is offline
-    maven("https://repo.polyfrost.org/releases")
 }
 
 // Toolchains:
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2de2760b266d..aaf0f02cf6d6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
         maven("https://repo.spongepowered.org/maven/")
         maven("https://repo.nea.moe/releases")
         maven("https://repo.sk1er.club/repository/maven-releases/")
-        maven("https://maven.deftu.xyz/releases")
+        maven("https://maven.deftu.dev/releases")
         maven("https://jitpack.io") {
             content {
                 includeGroupByRegex("(com|io)\\.github\\..*")

From 7aea6aa7b3774a3797f68a503eb42e99e88c2e56 Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:14:08 +0200
Subject: [PATCH 442/721] Feature: Transfer Cooldown Prevention (#1751)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/commands/CommandsConfig.java     | 12 ++++
 .../features/commands/TransferCooldown.kt     | 61 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/commands/TransferCooldown.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
index 1747baee6348..854ed39cc38f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
@@ -47,4 +47,16 @@ public class CommandsConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean viewRecipeLowerCase = true;
+
+    @Expose
+    @ConfigOption(name = "Fix Transfer Cooldown", desc = "Waits for the transfer cooldown to complete if you try to warp.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean transferCooldown = false;
+
+    @Expose
+    @ConfigOption(name = "Transfer Cooldown Ended Message", desc = "Sends a message in chat when the transfer cooldown ends.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean transferCooldownMessage = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/TransferCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/TransferCooldown.kt
new file mode 100644
index 000000000000..2a9c70cd9233
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/TransferCooldown.kt
@@ -0,0 +1,61 @@
+package at.hannibal2.skyhanni.features.commands
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.MessageSendToServerEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object TransferCooldown {
+
+    private val config get() = SkyHanniMod.feature.misc.commands
+    private var lastRunCompleted: SimpleTimeMark = SimpleTimeMark.farPast()
+    private var action: (() -> Unit)? = null
+
+    @SubscribeEvent
+    fun onWorldLoad(event: LorenzWorldChangeEvent) {
+        if (!config.transferCooldown || lastRunCompleted.isInFuture()) return
+        lastRunCompleted = DelayedRun.runDelayed(3.seconds) {
+            if (config.transferCooldownMessage && LorenzUtils.inSkyBlock) {
+                ChatUtils.chat("§aPlayer Transfer Cooldown has ended.")
+            }
+            action?.invoke()
+            action = null
+        }
+    }
+
+    @SubscribeEvent
+    fun onCommand(event: MessageSendToServerEvent) {
+        if (!LorenzUtils.inSkyBlock || !config.transferCooldown || lastRunCompleted.isInPast()) return
+        when (event.splitMessage[0]) {
+            "/is" -> {
+                event.cancel()
+                action = { HypixelCommands.island() }
+            }
+
+            "/warp" -> {
+                event.cancel()
+                action = {
+                    HypixelCommands.warp(event.splitMessage.subList(1, event.splitMessage.size).joinToString(" "))
+                }
+            }
+
+            "/warpforge" -> {
+                event.cancel()
+                action = { HypixelCommands.warp("forge") }
+            }
+
+            "/hub" -> {
+                event.cancel()
+                action = { HypixelCommands.warp("hub") }
+            }
+        }
+    }
+}

From c48d82d06f375139f1e0a0a32ffd6d2f4aa98546 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:56:56 +0200
Subject: [PATCH 443/721] Feature: Pet Nametag (#1880)

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../config/features/misc/pets/PetConfig.java  |  5 ++
 .../features/misc/pets/PetNametagConfig.java  | 19 +++++++
 .../misc/{ => pets}/CurrentPetDisplay.kt      |  2 +-
 .../misc/{ => pets}/PetCandyUsedDisplay.kt    |  2 +-
 .../features/misc/{ => pets}/PetExpTooltip.kt |  2 +-
 .../misc/{ => pets}/PetItemDisplay.kt         |  2 +-
 .../skyhanni/features/misc/pets/PetNametag.kt | 56 +++++++++++++++++++
 7 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetNametagConfig.java
 rename src/main/java/at/hannibal2/skyhanni/features/misc/{ => pets}/CurrentPetDisplay.kt (98%)
 rename src/main/java/at/hannibal2/skyhanni/features/misc/{ => pets}/PetCandyUsedDisplay.kt (96%)
 rename src/main/java/at/hannibal2/skyhanni/features/misc/{ => pets}/PetExpTooltip.kt (99%)
 rename src/main/java/at/hannibal2/skyhanni/features/misc/{ => pets}/PetItemDisplay.kt (96%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetNametag.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
index 8cd295249ad5..02c2b2ed45fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
@@ -30,6 +30,11 @@ public class PetConfig {
     @Accordion
     public PetExperienceToolTipConfig petExperienceToolTip = new PetExperienceToolTipConfig();
 
+    @Expose
+    @ConfigOption(name = "Pet Nametag", desc = "")
+    @Accordion
+    public PetNametagConfig nametag = new PetNametagConfig();
+
     @Expose
     @ConfigOption(name = "Hide Autopet Messages", desc = "Hide the autopet messages from chat.\n" +
         "§eRequires the display to be enabled.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetNametagConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetNametagConfig.java
new file mode 100644
index 000000000000..4da1b816014e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetNametagConfig.java
@@ -0,0 +1,19 @@
+package at.hannibal2.skyhanni.config.features.misc.pets;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class PetNametagConfig {
+
+    @Expose
+    @ConfigOption(name = "Hide Pet Level", desc = "Hide the pet level above the pet.")
+    @ConfigEditorBoolean
+    public boolean hidePetLevel = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Max Pet Level", desc = "Hide the pet level above the pet if it is max level.")
+    @ConfigEditorBoolean
+    public boolean hideMaxPetLevel = false;
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/CurrentPetDisplay.kt
similarity index 98%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
rename to src/main/java/at/hannibal2/skyhanni/features/misc/pets/CurrentPetDisplay.kt
index 1c93d6b3c82a..6f74f353d46a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/CurrentPetDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.misc
+package at.hannibal2.skyhanni.features.misc.pets
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetCandyUsedDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetCandyUsedDisplay.kt
similarity index 96%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/PetCandyUsedDisplay.kt
rename to src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetCandyUsedDisplay.kt
index c80c30f09c74..e331e6c750ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PetCandyUsedDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetCandyUsedDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.misc
+package at.hannibal2.skyhanni.features.misc.pets
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
similarity index 99%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt
rename to src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
index 3a7cf784a0c9..8e544a3dfefc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.misc
+package at.hannibal2.skyhanni.features.misc.pets
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetItemDisplay.kt
similarity index 96%
rename from src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
rename to src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetItemDisplay.kt
index 12e82a893716..9d3349c5b1e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetItemDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.misc
+package at.hannibal2.skyhanni.features.misc.pets
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetNametag.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetNametag.kt
new file mode 100644
index 000000000000..f3b16069e655
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetNametag.kt
@@ -0,0 +1,56 @@
+package at.hannibal2.skyhanni.features.misc.pets
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.entity.EntityDisplayNameEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.chat.Text.asComponent
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object PetNametag {
+
+    private val config get() = SkyHanniMod.feature.misc.pets.nametag
+
+    /**
+     * REGEX-TEST: §8[§7Lv99§8] Ammonite
+     * REGEX-TEST: §8[§7Lv100§8] Endermite§5 ✦
+     */
+    private val petNametagPattern by RepoPattern.pattern(
+        "pet.nametag",
+        "(?<start>§8\\[§7Lv(?<lvl>\\d+)§8]) (?<rarity>§.)(?<pet>[\\w\\s]+)(?<skin>§. ✦)?",
+    )
+
+    @SubscribeEvent
+    fun onNameTagRender(event: EntityDisplayNameEvent) {
+        if (!isEnabled()) return
+        if (event.entity !is EntityArmorStand) return
+
+        petNametagPattern.matchMatcher(event.chatComponent.unformattedText) {
+            val start = group("start")
+            val lvl = group("lvl").formatInt()
+            val rarity = group("rarity")
+            val pet = group("pet")
+            val skin = groupOrNull("skin") ?: ""
+
+            val hideLevel = config.hidePetLevel
+            val hideMaxLevel = config.hideMaxPetLevel && (lvl == 100 || lvl == 200)
+
+            val text = buildString {
+                if (!hideLevel && !hideMaxLevel) {
+                    append(start)
+                }
+                append(rarity + pet + skin)
+            }
+
+            event.chatComponent = text.asComponent()
+        }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && (config.hidePetLevel || config.hideMaxPetLevel)
+}

From 5151e1a0a73e9e194f0b5ec06c49be2c853cc23f Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 11 Sep 2024 23:24:00 +0200
Subject: [PATCH 444/721] Technical: Make HandleEvent Islands take in a vararg
 (#2502)

---
 .../java/at/hannibal2/skyhanni/api/event/EventHandler.kt   | 7 ++++---
 .../java/at/hannibal2/skyhanni/api/event/HandleEvent.kt    | 2 +-
 .../skyhanni/features/combat/mobs/ArachneSpawnTimer.kt     | 2 +-
 .../features/dungeon/DungeonShadowAssassinNotification.kt  | 2 +-
 .../features/event/diana/GriffinBurrowParticleFinder.kt    | 2 +-
 .../features/event/diana/InquisitorWaypointShare.kt        | 2 +-
 .../at/hannibal2/skyhanni/features/garden/GardenAPI.kt     | 4 ++--
 .../at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt | 2 +-
 .../skyhanni/features/garden/pests/PestParticleWaypoint.kt | 2 +-
 .../skyhanni/features/garden/visitor/VisitorListener.kt    | 4 ++--
 src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt   | 4 +++-
 11 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
index cfc8e63b87a8..78769060accf 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.LorenzUtils.inAnyIsland
 import at.hannibal2.skyhanni.utils.chat.Text
 import java.lang.invoke.LambdaMetafactory
 import java.lang.invoke.MethodHandles
@@ -113,7 +113,7 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
     private fun shouldInvoke(event: SkyHanniEvent, listener: Listener): Boolean {
         if (SkyHanniEvents.isDisabledInvoker(listener.name)) return false
         if (listener.options.onlyOnSkyblock && !LorenzUtils.inSkyBlock) return false
-        if (listener.options.onlyOnIsland != IslandType.ANY && !listener.options.onlyOnIsland.isInIsland()) return false
+        if (IslandType.ANY !in listener.onlyOnIslandTypes && !inAnyIsland(listener.onlyOnIslandTypes)) return false
         if (event.isCancelled && !listener.options.receiveCancelled) return false
         if (
             event is GenericSkyHanniEvent<*> &&
@@ -129,6 +129,7 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
         val name: String,
         val invoker: Consumer<Any>,
         val options: HandleEvent,
-        val generic: Class<*>?
+        val generic: Class<*>?,
+        val onlyOnIslandTypes: Set<IslandType> = options.onlyOnIslands.toSet(),
     )
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt b/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
index 39b047a6e1de..c07239dc2ae9 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
@@ -13,7 +13,7 @@ annotation class HandleEvent(
     /**
      * If the event should only be received while on a specific skyblock island.
      */
-    val onlyOnIsland: IslandType = IslandType.ANY,
+    vararg val onlyOnIslands: IslandType = [IslandType.ANY],
 
     /**
      * The priority of when the event will be called, lower priority will be called first, see the companion object.
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
index 2fee0577e8f6..b3c9be188752 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
@@ -80,7 +80,7 @@ object ArachneSpawnTimer {
         }
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.SPIDER_DEN, priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIslands = [IslandType.SPIDER_DEN], priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {
         if (!saveNextTickParticles) return
         if (searchTime.passedSince() < 3.seconds) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
index ca888392f35c..abe83df8cbd4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
@@ -16,7 +16,7 @@ object DungeonShadowAssassinNotification {
 
     private val config get() = SkyHanniMod.feature.dungeon
 
-    @HandleEvent(onlyOnIsland = IslandType.CATACOMBS)
+    @HandleEvent(onlyOnIslands = [IslandType.CATACOMBS])
     fun onWorldBorderChange(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         if (DungeonAPI.dungeonFloor?.contains("3") == true && DungeonAPI.inBossRoom) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 80d6ea0e0df9..0f0220a76208 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -58,7 +58,7 @@ object GriffinBurrowParticleFinder {
         }
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.HUB, priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIslands = [IslandType.HUB], priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         if (!config.burrowsSoopyGuess) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index 2d0e2a809e81..fbb599d68f90 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -222,7 +222,7 @@ object InquisitorWaypointShare {
         HypixelCommands.partyChat("x: $x, y: $y, z: $z ")
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.HUB, priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIslands = [IslandType.HUB], priority = HandleEvent.LOW, receiveCancelled = true)
     fun onFirstChatEvent(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         val packet = event.packet
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index ba8b6bb701da..e188dcfd0d56 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -87,10 +87,10 @@ object GardenAPI {
         "BASIC_GARDENING_AXE",
         "ADVANCED_GARDENING_HOE",
         "ROOKIE_HOE",
-        "BINGHOE"
+        "BINGHOE",
     )
 
-    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
+    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
     fun onSendPacket(event: PacketSentEvent) {
         if (event.packet !is C09PacketHeldItemChange) return
         checkItemInHand()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
index d49de324c851..7aefb74cd37c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
@@ -158,7 +158,7 @@ object PestAPI {
         PestUpdateEvent().post()
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
+    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
     fun onPestSpawn(event: PestSpawnEvent) {
         PestSpawnTimer.lastSpawnTime = SimpleTimeMark.now()
         val plotNames = event.plotNames
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index 23ead6f911d0..d3dd8a27ba10 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -121,7 +121,7 @@ object PestParticleWaypoint {
         ++particles
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
+    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
     fun onFireWorkSpawn(event: PacketReceivedEvent) {
         if (event.packet !is S0EPacketSpawnObject) return
         if (!config.hideParticles) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
index 66d03745f372..e709fcda7633 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
@@ -56,7 +56,7 @@ object VisitorListener {
     }
 
     // TODO make event
-    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
+    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
     fun onSendEvent(event: PacketSentEvent) {
         val packet = event.packet
         if (packet !is C02PacketUseEntity) return
@@ -136,7 +136,7 @@ object VisitorListener {
         inventory.handleMouseClick_skyhanni(slot, slot.slotIndex, 0, 0)
     }
 
-    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
+    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
     fun onTooltip(event: ItemHoverEvent) {
         if (!GardenAPI.onBarnPlot) return
         if (!VisitorAPI.inInventory) return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 3c97919fca4d..1fd5419d9622 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -300,7 +300,8 @@ object LorenzUtils {
 
     fun IslandType.isInIsland() = inSkyBlock && skyBlockIsland == this
 
-    fun inAnyIsland(vararg islandTypes: IslandType) = inSkyBlock && islandTypes.any { it.isInIsland() }
+    fun inAnyIsland(vararg islandTypes: IslandType) = inSkyBlock && HypixelData.skyBlockIsland in islandTypes
+    fun inAnyIsland(islandTypes: Collection<IslandType>) = inSkyBlock && HypixelData.skyBlockIsland in islandTypes
 
     fun GuiContainerEvent.SlotClickEvent.makeShiftClick() {
         if (this.clickedButton == 1 && slot?.stack?.getItemCategoryOrNull() == ItemCategory.SACK) return
@@ -315,6 +316,7 @@ object LorenzUtils {
             this.cancel()
         }
     }
+
     // TODO move into mayor api
     val isDerpy by RecalculatingValue(1.seconds) { Perk.DOUBLE_MOBS_HP.isActive }
 

From 5459fc8aa33915e8d4be0c538dbb19a5e80d29db Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Thu, 12 Sep 2024 02:15:38 +0200
Subject: [PATCH 445/721] Improvement: Chocolate Factory time to next instead
 of max milestone (#2503)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../repo/HoppityEggLocationsJson.kt           |  3 +-
 .../chocolatefactory/ChocolateFactoryAPI.kt   | 29 ++++++++++---------
 .../chocolatefactory/ChocolateFactoryStats.kt | 13 +++++----
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
index 5e601ed32745..4ad81b06a663 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.utils.LorenzVec
 import com.google.gson.annotations.Expose
+import java.util.TreeSet
 
 data class HoppityEggLocationsJson(
     @Expose val eggLocations: Map<IslandType, List<LorenzVec>>,
@@ -21,7 +22,7 @@ data class HoppityEggLocationsJson(
     @Expose val coachRabbitIndex: Int,
     @Expose val maxRabbits: Int,
     @Expose val maxPrestige: Int,
-    @Expose val maxMilestoneChocolate: Long,
+    @Expose val chocolateMilestones: TreeSet<Long>,
     @Expose val apiEggLocations: Map<IslandType, Map<String, LorenzVec>>,
     @Expose val specialRabbits: List<String>,
 )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 59a119bf5470..40cd700c4eb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -20,13 +20,13 @@ import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
-import at.hannibal2.skyhanni.utils.SkyblockSeason
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.UtilsPatterns
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.TreeSet
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.seconds
@@ -80,7 +80,7 @@ object ChocolateFactoryAPI {
     var shrineIndex = 41
     var coachRabbitIndex = 42
     var maxRabbits = 395
-    var maxMilestoneChocolate = 700_000_000_000L
+    var chocolateMilestones = TreeSet<Long>()
     private var maxPrestige = 5
 
     var inChocolateFactory = false
@@ -142,7 +142,7 @@ object ChocolateFactoryAPI {
         coachRabbitIndex = data.coachRabbitIndex
         maxRabbits = data.maxRabbits
         maxPrestige = data.maxPrestige
-        maxMilestoneChocolate = data.maxMilestoneChocolate
+        chocolateMilestones = data.chocolateMilestones
         specialRabbitTextures = data.specialRabbits
 
         ChocolateFactoryUpgrade.updateIgnoredSlots()
@@ -179,23 +179,24 @@ object ChocolateFactoryAPI {
         }
     }
 
-    fun getNextLevelName(stack: ItemStack): String? =
-        upgradeLorePattern.firstMatcher(stack.getLore()) {
-            val upgradeName = if (stack.getLore().any { it == "§8Employee" }) employeeNamePattern.matchMatcher(stack.name) {
-                groupOrNull("employee")
-            } else groupOrNull("upgradename")
-            val nextLevel = groupOrNull("nextlevel") ?: groupOrNull("nextlevelalt")
-            if (upgradeName == null || nextLevel == null) null
-            else "$upgradeName $nextLevel"
-        }
+    fun getNextLevelName(stack: ItemStack): String? = upgradeLorePattern.firstMatcher(stack.getLore()) {
+        val upgradeName = if (stack.getLore().any { it == "§8Employee" }) employeeNamePattern.matchMatcher(stack.name) {
+            groupOrNull("employee")
+        } else groupOrNull("upgradename")
+        val nextLevel = groupOrNull("nextlevel") ?: groupOrNull("nextlevelalt")
+        if (upgradeName == null || nextLevel == null) null
+        else "$upgradeName $nextLevel"
+    }
 
+    fun getNextMilestoneChocolate(amount: Long): Long {
+        return chocolateMilestones.higher(amount) ?: 0
+    }
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
 
     fun isMaxPrestige() = currentPrestige >= maxPrestige
 
-    fun timeTowerChargeDuration() =
-        if (HoppityCollectionStats.hasFoundRabbit("Einstein")) 7.hours else 8.hours
+    fun timeTowerChargeDuration() = if (HoppityCollectionStats.hasFoundRabbit("Einstein")) 7.hours else 8.hours
 
     fun timeTowerMultiplier(): Double {
         var multiplier = (profileStorage?.timeTowerLevel ?: 0) * 0.1
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
index cc193f2ef533..8d08e485e16f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
@@ -113,15 +113,16 @@ object ChocolateFactoryStats {
             )
 
             if (ChocolateFactoryAPI.isMaxPrestige()) {
-                val chocolateUntilMaxMilestone = ChocolateFactoryAPI.maxMilestoneChocolate
-                val amountUntilMaxMilestone = chocolateUntilMaxMilestone - ChocolateAmount.ALL_TIME.chocolate()
-                val maxMilestoneEstimate = ChocolateAmount.ALL_TIME.formattedTimeUntilGoal(chocolateUntilMaxMilestone)
+                val allTime = ChocolateAmount.ALL_TIME.chocolate()
+                val nextChocolateMilestone = ChocolateFactoryAPI.getNextMilestoneChocolate(allTime)
+                val amountUntilNextMilestone = nextChocolateMilestone - allTime
+                val maxMilestoneEstimate = ChocolateAmount.ALL_TIME.formattedTimeUntilGoal(nextChocolateMilestone)
 
-                if (amountUntilMaxMilestone >= 0) {
-                    put(ChocolateFactoryStat.TIME_TO_PRESTIGE, "§eTime To Max Milestone: $maxMilestoneEstimate")
+                if (amountUntilNextMilestone >= 0) {
+                    put(ChocolateFactoryStat.TIME_TO_PRESTIGE, "§eTime To Next Milestone: $maxMilestoneEstimate")
                     put(
                         ChocolateFactoryStat.CHOCOLATE_UNTIL_PRESTIGE,
-                        "§eChocolate To Max Milestone: §6${amountUntilMaxMilestone.addSeparators()}",
+                        "§eChocolate To Next Milestone: §6${amountUntilNextMilestone.addSeparators()}",
                     )
                 }
             } else {

From b2d1c22d4baebc6eaf9eef823b11fa9d1801ced1 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Thu, 12 Sep 2024 02:31:14 +0200
Subject: [PATCH 446/721] Feature: Zombie Shootout QOL (#2497)

---
 .../config/features/event/EventConfig.java    |   6 +
 .../event/carnival/CarnivalConfig.java        |  13 ++
 .../event/carnival/ZombieShootoutConfig.java  |  41 +++++
 .../event/carnival/CarnivalZombieShootout.kt  | 164 ++++++++++++++++++
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  21 +++
 5 files changed, 245 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
index 57d3e0699a30..1c916bbe15ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.config.features.event;
 
 import at.hannibal2.skyhanni.config.features.event.bingo.BingoConfig;
+import at.hannibal2.skyhanni.config.features.event.carnival.CarnivalConfig;
 import at.hannibal2.skyhanni.config.features.event.diana.DianaConfig;
 import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEggsConfig;
 import at.hannibal2.skyhanni.config.features.event.waypoints.LobbyWaypointsConfig;
@@ -43,6 +44,11 @@ public class EventConfig {
     @Expose
     public GreatSpookConfig spook = new GreatSpookConfig();
 
+    @ConfigOption(name = "Carnival", desc = "")
+    @Accordion
+    @Expose
+    public CarnivalConfig carnival = new CarnivalConfig();
+
     // comment in if the event is needed again
 //    @ConfigOption(name = "300þ Anniversary Celebration", desc = "Features for the 300þ year of SkyBlock")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
new file mode 100644
index 000000000000..b874f7558d8e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
@@ -0,0 +1,13 @@
+package at.hannibal2.skyhanni.config.features.event.carnival;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CarnivalConfig {
+
+    @Expose
+    @ConfigOption(name = "Zombie Shootout", desc = "")
+    @Accordion
+    public ZombieShootoutConfig zombieShootout = new ZombieShootoutConfig();
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
new file mode 100644
index 000000000000..5709e7e58d31
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.config.features.event.carnival;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ZombieShootoutConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "QOL Features for Zombie Shootout.")
+    @FeatureToggle
+    @ConfigEditorBoolean
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Colored Hitboxes", desc = "Display colored hitboxes for zombies and lamps.")
+    @ConfigEditorBoolean
+    public boolean coloredHitboxes = true;
+
+    @Expose
+    @ConfigOption(name = "Colored Lines", desc = "Display a colored line to lamps.")
+    @ConfigEditorBoolean
+    public boolean coloredLines = true;
+
+    @Expose
+    @ConfigOption(name = "Highest Only", desc = "Only draw colored hitboxes/lines for the highest scoring zombies.")
+    @ConfigEditorBoolean
+    public boolean highestOnly = false;
+
+    @Expose
+    @ConfigOption(name = "Lamp Timer", desc = "Show time until current lamp disappears.")
+    @ConfigEditorBoolean
+    public boolean lampTimer = true;
+
+    @Expose
+    @ConfigLink(owner = ZombieShootoutConfig.class, field = "lampTimer")
+    public Position lampPosition = new Position(20, 20, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
new file mode 100644
index 000000000000..cae5cbda1f91
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -0,0 +1,164 @@
+package at.hannibal2.skyhanni.features.event.carnival
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
+import at.hannibal2.skyhanni.utils.RenderUtils.drawHitbox
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.entity.monster.EntityZombie
+import net.minecraft.init.Blocks
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object CarnivalZombieShootout {
+
+    private val config get() = SkyHanniMod.feature.event.carnival.zombieShootout
+
+    private data class Lamp(var pos: LorenzVec, var time: SimpleTimeMark)
+    private data class Updates(var zombie: SimpleTimeMark, var content: SimpleTimeMark)
+
+    private var lastUpdate = Updates(SimpleTimeMark.farPast(), SimpleTimeMark.farPast())
+
+    private var content = Renderable.horizontalContainer(listOf())
+    private var drawZombies = mapOf<EntityZombie, ZombieType>()
+    private var lamp: Lamp? = null
+    private var started = false
+
+    private val patternGroup = RepoPattern.group("event.carnival")
+
+    /**
+     * REGEX-TEST: [NPC] Carnival Cowboy: Good luck, pal!
+     */
+    private val startPattern by patternGroup.pattern(
+        "shootout.start",
+        "\\[NPC] Carnival Cowboy: Good luck, pal!",
+    )
+
+    /**
+     * REGEX-TEST:                              Zombie Shootout
+     */
+    private val endPattern by patternGroup.pattern(
+        "shootout.end",
+        " {29}Zombie Shootout",
+    )
+
+    enum class ZombieType(val points: Int, val helmet: String, val color: Color) {
+        LEATHER(30, "Leather Cap", Color(165, 42, 42)),  //Brown
+        IRON(50, "Iron Helmet", Color(192, 192, 192)),  //Silver
+        GOLD(80, "Golden Helmet", Color(255, 215, 0)),  //Gold
+        DIAMOND(120, "Diamond Helmet", Color(185, 242, 255)) //Diamond
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled() || !started || (!config.coloredHitboxes && !config.coloredLines)) return
+
+        lamp?.let {
+            if (config.coloredLines) event.draw3DLine(event.exactPlayerEyeLocation(), it.pos.add(0.0, 0.5, 0.0), Color.RED, 3, false)
+            if (config.coloredHitboxes) event.drawWaypointFilled(it.pos, Color.RED, minimumAlpha = 1.0f)
+        }
+
+        if (!config.coloredHitboxes) return
+
+        if (lastUpdate.zombie.passedSince() >= 0.25.seconds) {
+            val nearbyZombies = EntityUtils.getEntitiesNextToPlayer<EntityZombie>(50.0).mapNotNull { zombie ->
+                if (zombie.health <= 0) return@mapNotNull null
+                val armor = zombie.getCurrentArmor(3) ?: return@mapNotNull null
+                val type = toType(armor) ?: return@mapNotNull null
+                zombie to type
+            }.toMap()
+
+            drawZombies = nearbyZombies.filterValues { it == nearbyZombies.values.maxByOrNull { it.points } }
+            lastUpdate.zombie = SimpleTimeMark.now()
+        }
+
+        for ((zombie, type) in drawZombies) {
+            val entity = EntityUtils.getEntityByID(zombie.entityId) ?: continue
+
+            event.drawHitbox(
+                entity.entityBoundingBox.expand(0.1, 0.05, 0.0).offset(0.0, 0.05, 0.0),
+                lineWidth = 3,
+                type.color,
+                depth = false,
+            )
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled() || !started || !config.lampTimer) return
+
+        val time = lamp?.time ?: return
+
+        val lamp = ItemStack(Blocks.redstone_lamp)
+        val timer = 6.seconds - (SimpleTimeMark.now() - time)
+        val prefix = when (timer) {
+            in 4.seconds..6.seconds -> "§a"
+            in 2.seconds..4.seconds -> "§e"
+            else -> "§c"
+        }
+
+        if (lastUpdate.content.passedSince() >= 0.1.seconds) {
+            content = Renderable.horizontalContainer(
+                listOf(
+                    Renderable.itemStack(lamp),
+                    Renderable.string("§6Disappears in $prefix${timer}"),
+                ),
+                spacing = 1,
+                verticalAlign = RenderUtils.VerticalAlignment.CENTER,
+            )
+            lastUpdate.content = SimpleTimeMark.now()
+        }
+
+        config.lampPosition.renderRenderable(content, posLabel = "Lantern Timer")
+    }
+
+    @SubscribeEvent
+    fun onBlockChange(event: ServerBlockChangeEvent) {
+        if (!isEnabled() || !started) return
+
+        val old = event.old
+        val new = event.new
+
+        lamp = when {
+            old == "redstone_lamp" && new == "lit_redstone_lamp" -> Lamp(event.location, SimpleTimeMark.now())
+            old == "lit_redstone_lamp" && new == "redstone_lamp" -> null
+            else -> lamp
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        val message = event.message.removeColor()
+
+        if (startPattern.matches(message)) {
+            started = true
+        } else if (endPattern.matches(message)) {
+            started = false
+        }
+    }
+
+    private fun toType(item: ItemStack) = ZombieType.entries.find { it.helmet == item.displayName }
+
+    private fun isEnabled() = config.enabled && LorenzUtils.skyBlockArea == "Carnival"
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 0d6417688c3b..3442032e6eac 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -1611,6 +1611,27 @@ object RenderUtils {
         GlStateManager.enableCull()
     }
 
+    fun LorenzRenderWorldEvent.drawHitbox(
+        boundingBox: AxisAlignedBB,
+        lineWidth: Int,
+        color: Color,
+        depth: Boolean,
+    ) {
+        val cornersTop = boundingBox.getCorners(boundingBox.maxY)
+        val cornersBottom = boundingBox.getCorners(boundingBox.minY)
+
+        // Draw lines for the top and bottom faces
+        for (i in 0..3) {
+            this.draw3DLine(cornersTop[i], cornersTop[(i + 1) % 4], color, lineWidth, depth)
+            this.draw3DLine(cornersBottom[i], cornersBottom[(i + 1) % 4], color, lineWidth, depth)
+        }
+
+        // Draw lines connecting the top and bottom faces
+        for (i in 0..3) {
+            this.draw3DLine(cornersBottom[i], cornersTop[i], color, lineWidth, depth)
+        }
+    }
+
     fun chromaColor(
         timeTillRepeat: Duration,
         offset: Float = 0f,

From e350ade0d86955ce1a865f4286cd208d54693777 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 12 Sep 2024 02:33:44 +0200
Subject: [PATCH 447/721] Improvement: Stars in Estimated Item Value (#2492)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../misc/EstimatedItemValueConfig.java        |   9 +
 .../repo/neu/NeuEssenceCostJson.kt            |  40 ++++
 .../events/NeuRepositoryReloadEvent.kt        |  11 +
 .../features/misc/items/EstimatedItemValue.kt |  11 +
 .../items/EstimatedItemValueCalculator.kt     | 193 +++++++++++++++---
 .../skyhanni/utils/EssenceItemUtils.kt        | 136 ++++++++++++
 .../utils/SkyBlockItemModifierUtils.kt        |   4 +-
 7 files changed, 378 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuEssenceCostJson.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
index 0963703088a2..3f5874ac0941 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
@@ -39,6 +39,15 @@ public class EstimatedItemValueConfig {
     )
     public Property<Integer> enchantmentsCap = Property.of(7);
 
+    @Expose
+    @ConfigOption(name = "Star Material Cap", desc = "Only show the top # most expensive parts of star prices.")
+    @ConfigEditorSlider(
+        minValue = 1,
+        maxValue = 15,
+        minStep = 1
+    )
+    public Property<Integer> starMaterialCap = Property.of(3);
+
     @Expose
     @ConfigOption(name = "Show Exact Price", desc = "Show the exact total price instead of the compact number.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuEssenceCostJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuEssenceCostJson.kt
new file mode 100644
index 000000000000..12aa600ee48f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuEssenceCostJson.kt
@@ -0,0 +1,40 @@
+package at.hannibal2.skyhanni.data.jsonobjects.repo.neu
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+
+data class NeuEssenceCostJson(
+    @Expose @SerializedName("type") val essenceType: String,
+    @Expose @SerializedName("dungeonize") val essenceForDungeonize: Int?,
+    @Expose @SerializedName("1") val essenceFor1: Int?,
+    @Expose @SerializedName("2") val essenceFor2: Int?,
+    @Expose @SerializedName("3") val essenceFor3: Int?,
+    @Expose @SerializedName("4") val essenceFor4: Int?,
+    @Expose @SerializedName("5") val essenceFor5: Int?,
+    @Expose @SerializedName("6") val essenceFor6: Int?,
+    @Expose @SerializedName("7") val essenceFor7: Int?,
+    @Expose @SerializedName("8") val essenceFor8: Int?,
+    @Expose @SerializedName("9") val essenceFor9: Int?,
+    @Expose @SerializedName("10") val essenceFor10: Int?,
+    @Expose @SerializedName("11") val essenceFor11: Int?,
+    @Expose @SerializedName("12") val essenceFor12: Int?,
+    @Expose @SerializedName("13") val essenceFor13: Int?,
+    @Expose @SerializedName("14") val essenceFor14: Int?,
+    @Expose @SerializedName("15") val essenceFor15: Int?,
+    @Expose @SerializedName("items") val extraItems: Map<String, List<String>>?,
+
+    @Expose @SerializedName("catacombs_requirements") val catacombsRequirements: List<NeuCatacombsRequirements>,
+) {
+
+    companion object {
+        val TYPE: Type = object : TypeToken<Map<String?, NeuEssenceCostJson>>() {}.type
+    }
+}
+
+data class NeuCatacombsRequirements(
+    @Expose @SerializedName("type") val type: String,
+    @Expose @SerializedName("dungeon_type") val dungeonType: String?,
+    @Expose @SerializedName("level") val level: Int,
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
index 6f7df596422b..c2bd261ca0a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
@@ -1,6 +1,9 @@
+
 package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.repo.RepoError
+import at.hannibal2.skyhanni.data.repo.RepoUtils
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.NEUItems.manager
 import at.hannibal2.skyhanni.utils.json.fromJson
@@ -8,6 +11,7 @@ import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonSyntaxException
 import java.io.File
+import java.lang.reflect.Type
 
 class NeuRepositoryReloadEvent : LorenzEvent() {
     fun getConstant(file: String): JsonObject? {
@@ -26,4 +30,11 @@ class NeuRepositoryReloadEvent : LorenzEvent() {
             throw e
         }
     }
+
+    inline fun <reified T : Any> getConstant(constant: String, type: Type? = null, gson: Gson = ConfigManager.gson): T = try {
+        if (!manager.repoLocation.exists()) throw RepoError("NEU-Repo folder does not exist!")
+        RepoUtils.getConstant(manager.repoLocation, constant, gson, T::class.java, type)
+    } catch (e: Exception) {
+        throw RepoError("Repo parsing error while trying to read constant '$constant'", e)
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index a587443e5da8..0463257496f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -21,6 +21,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.isRune
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -32,6 +33,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.lwjgl.input.Keyboard
 import kotlin.math.roundToLong
 
 @SkyHanniModule
@@ -88,6 +90,15 @@ object EstimatedItemValue {
         currentlyShowing = checkCurrentlyVisible()
         if (!currentlyShowing) return
 
+        // TODO add "is debug enabled" check once users notice this easteregg
+        if (Keyboard.KEY_RIGHT.isKeyClicked()) {
+            EstimatedItemValueCalculator.starChange += 1
+            cache.clear()
+        } else if (Keyboard.KEY_LEFT.isKeyClicked()) {
+            EstimatedItemValueCalculator.starChange -= 1
+            cache.clear()
+        }
+
         config.itemPriceDataPos.renderStringsAndItems(display, posLabel = "Estimated Item Value")
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index ffa92489cea4..6842ccc77620 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -3,9 +3,14 @@ package at.hannibal2.skyhanni.features.misc.items
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.ReforgeAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
+import at.hannibal2.skyhanni.utils.EssenceItemUtils
+import at.hannibal2.skyhanni.utils.EssenceItemUtils.getEssencePrices
 import at.hannibal2.skyhanni.utils.ItemUtils.getAttributeFromShard
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.isRune
@@ -20,6 +25,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
@@ -41,6 +47,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPowerScroll
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getReforgeName
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getRune
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getSilexCount
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getStarCount
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getTransmissionTunerCount
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasArtOfPeace
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasArtOfWar
@@ -62,6 +69,8 @@ object EstimatedItemValueCalculator {
 
     private val kuudraSets = listOf("AURORA", "CRIMSON", "TERROR", "HOLLOW", "FERVOR")
 
+    var starChange = 0
+
     private val additionalCostFunctions = listOf(
         ::addAttributeCost,
         ::addReforgeStone,
@@ -79,6 +88,7 @@ object EstimatedItemValueCalculator {
         ::addDivanPowderCoating,
 
         // counted
+        ::addStars, // crimson, dungeon
         ::addMasterStars,
         ::addHotPotatoBooks,
         ::addFarmingForDummies,
@@ -110,6 +120,8 @@ object EstimatedItemValueCalculator {
     val transmissionTuner = "TRANSMISSION_TUNER".asInternalName()
     val manaDisintegrator = "MANA_DISINTEGRATOR".asInternalName()
 
+    val kuudraUpgradeTiers = listOf("HOT_", "BURNING_", "FIERY_", "INFERNAL_")
+
     fun getTotalPrice(stack: ItemStack): Double = EstimatedItemValueCalculator.calculate(stack, mutableListOf()).first
 
     fun calculate(stack: ItemStack, list: MutableList<String>): Pair<Double, Double> {
@@ -118,9 +130,12 @@ object EstimatedItemValueCalculator {
         return Pair(totalPrice, basePrice)
     }
 
-    private fun isKuudraSet(internalName: String) =
-        (kuudraSets.any { internalName.contains(it) } &&
-            listOf("CHESTPLATE", "LEGGINGS", "HELMET", "BOOTS").any { internalName.endsWith(it) })
+    private fun isKuudraSet(internalName: String) = (kuudraSets.any { internalName.contains(it) } && listOf(
+        "CHESTPLATE",
+        "LEGGINGS",
+        "HELMET",
+        "BOOTS",
+    ).any { internalName.endsWith(it) })
 
     private fun addAttributeCost(stack: ItemStack, list: MutableList<String>): Double {
         val attributes = stack.getAttributes() ?: return 0.0
@@ -150,8 +165,7 @@ object EstimatedItemValueCalculator {
         }
         for (attr in attributes) {
             val attributeName = "$genericName+ATTRIBUTE_${attr.first}"
-            val price =
-                getPriceOrCompositePriceForAttribute(attributeName, attr.second)
+            val price = getPriceOrCompositePriceForAttribute(attributeName, attr.second)
             var priceColor = "§7"
             val useless = isUselessAttribute(attributeName)
             var nameColor = if (!useless) "§9" else "§7"
@@ -177,21 +191,21 @@ object EstimatedItemValueCalculator {
         if (!isKuudraSet(original)) return original
 
         var internalName = original
-        for (prefix in listOf("HOT_", "BURNING_", "FIERY_", "INFERNAL_")) {
+        for (prefix in kuudraUpgradeTiers) {
             internalName = internalName.removePrefix(prefix)
         }
         return internalName
     }
 
-    private fun addAttributePrice(attributePrice: Double, basePrice: Double): Double =
-        if (attributePrice > basePrice) {
-            attributePrice - basePrice
-        } else {
-            0.0
-        }
+    private fun addAttributePrice(attributePrice: Double, basePrice: Double): Double = if (attributePrice > basePrice) {
+        attributePrice - basePrice
+    } else {
+        0.0
+    }
 
     private fun isUselessAttribute(internalName: String): Boolean {
         if (internalName.contains("RESISTANCE")) return true
+        if (internalName.contains("FISHING_SPEED")) return false
         if (internalName.contains("SPEED")) return true
         if (internalName.contains("EXPERIENCE")) return true
         if (internalName.contains("FORTITUDE")) return true
@@ -205,8 +219,7 @@ object EstimatedItemValueCalculator {
     private fun getPriceOrCompositePriceForAttribute(attributeName: String, level: Int): Double? {
         val intRange = if (config.useAttributeComposite.get()) 1..10 else level..level
         return intRange.mapNotNull { lowerLevel ->
-            "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()
-                ?.let { it / (1 shl lowerLevel) * (1 shl level).toDouble() }
+            "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()?.let { it / (1 shl lowerLevel) * (1 shl level).toDouble() }
         }.minOrNull()
     }
 
@@ -414,10 +427,143 @@ object EstimatedItemValueCalculator {
         return price
     }
 
+    private fun addStars(stack: ItemStack, list: MutableList<String>): Double {
+        val internalName = stack.getInternalNameOrNull() ?: return 0.0
+        var totalStars = stack.getDungeonStarCount() ?: stack.getStarCount() ?: 0
+
+        starChange.takeIf { it != 0 }?.let {
+            list.add("change: $it")
+            totalStars += it
+        }
+
+        val (price, stars) = calculateStarPrice(internalName, totalStars) ?: return 0.0
+        val (havingStars, maxStars) = stars
+
+        var totalPrice = 0.0
+        val map = mutableMapOf<String, Double>()
+        price.essencePrice.let {
+            val essenceName = "ESSENCE_${it.essenceType}".asInternalName()
+            val amount = it.essenceAmount
+            val essencePrice = essenceName.getPrice() * amount
+            map["  §8${amount.addSeparators()}x ${essenceName.itemName} §7(§6${essencePrice.shortFormat()}§7)"] = essencePrice
+            totalPrice += essencePrice
+        }
+
+        price.coinPrice.takeIf { it != 0L }?.let {
+            map["  §6${it.shortFormat()} coins"] = it.toDouble()
+            totalPrice += it
+        }
+
+        for ((materialInternalName, amount) in price.itemPrice) {
+            val itemPrice = materialInternalName.getPriceOrNull()?.let { it * amount }
+            if (itemPrice != null) {
+                map["  §8${amount.addSeparators()}x ${materialInternalName.itemName} §7(§6${itemPrice.shortFormat()}§7)"] = itemPrice
+            } else {
+                map["  §8${amount.addSeparators()}x ${materialInternalName.itemName}"] = 0.0
+            }
+            totalPrice += itemPrice ?: 0.0
+        }
+
+        list.add("§7Stars: §e$havingStars§7/§e$maxStars §7(§6" + totalPrice.shortFormat() + "§7)")
+        val starMaterialCap: Int = config.starMaterialCap.get()
+        list.addAll(map.sortedDesc().keys.take(starMaterialCap))
+        return totalPrice
+    }
+
+    private fun calculateStarPrice(
+        internalName: NEUInternalName,
+        inputStars: Int,
+    ): Pair<EssenceItemUtils.EssenceUpgradePrice, Pair<Int, Int>>? {
+        var totalStars = inputStars
+        val rawInternalName = internalName.asString()
+        val (price, maxStars) = if (isKuudraSet(rawInternalName)) {
+            val tier = getKuudraTier(internalName)
+            totalStars += (tier + 1) * 10
+
+            var remainingStars = totalStars
+
+            val removed = removeKuudraArmorPrefix(rawInternalName)
+            var maxStars = 0
+            var finalPrice: EssenceItemUtils.EssenceUpgradePrice? = null
+
+            val tiers = mutableMapOf<NEUInternalName, Int>()
+
+            for ((id, prices) in EssenceItemUtils.itemPrices) {
+                if (!id.contains(removed)) continue
+                tiers[id] = getKuudraTier(id)
+
+            }
+            for ((id, tier) in tiers.sorted()) {
+                val prices = EssenceItemUtils.itemPrices[id]!!
+                maxStars += prices.size
+                if (remainingStars <= 0) continue
+
+                val price = getPriceFor(prices, remainingStars) ?: return null
+                println(" ")
+                println("price for $id ($remainingStars)")
+                println("price.itemPrice: ${price.itemPrice}")
+                println("essencePrice: ${price.essencePrice}")
+                println("itemPrice: ${price.itemPrice}")
+                finalPrice = finalPrice?.let { it + price } ?: price
+                remainingStars -= prices.size
+            }
+            if (finalPrice == null) return null
+
+            finalPrice to maxStars
+        } else {
+            if (totalStars == 0) return null
+
+            val prices = internalName.getEssencePrices() ?: return null
+
+            (getPriceFor(prices, totalStars) ?: return null) to prices.size
+        }
+        val havingStars = totalStars.coerceAtMost(maxStars)
+
+        return price to (havingStars to maxStars)
+    }
+
+    private fun getKuudraTier(internalName: NEUInternalName): Int {
+        for (tier in kuudraUpgradeTiers) {
+            if (internalName.asString().contains(tier)) {
+                return kuudraUpgradeTiers.indexOf(tier)
+            }
+        }
+        return 0
+    }
+//     private fun getKuudraTier(internalName: NEUInternalName): Int? =
+//         kuudraUpgradeTiers.firstOrNull { it in internalName.toString() }?.let { kuudraUpgradeTiers.indexOf(it) }
+
+    private fun getPriceFor(
+        prices: Map<Int, EssenceItemUtils.EssenceUpgradePrice>,
+        totalStars: Int,
+    ): EssenceItemUtils.EssenceUpgradePrice? {
+        var totalEssencePrice: EssenceItemUtils.EssencePrice? = null
+        var totalCoinPrice = 0L
+        val totalItemPrice = mutableMapOf<NEUInternalName, Int>()
+
+        for ((tier, price) in prices) {
+            if (tier > totalStars) break
+            val essencePrice = price.essencePrice
+            totalEssencePrice = totalEssencePrice?.let { it + essencePrice } ?: essencePrice
+
+            price.coinPrice?.let {
+                totalCoinPrice += it
+            }
+            for (entry in price.itemPrice) {
+                totalItemPrice.addOrPut(entry.key, entry.value)
+            }
+        }
+        totalEssencePrice ?: return null
+        return EssenceItemUtils.EssenceUpgradePrice(totalEssencePrice, totalCoinPrice, totalItemPrice)
+    }
+
     private fun addMasterStars(stack: ItemStack, list: MutableList<String>): Double {
-        val totalStars = stack.getDungeonStarCount() ?: return 0.0
+        var totalStars = stack.getDungeonStarCount() ?: return 0.0
+        starChange.takeIf { it != 0 }?.let {
+            totalStars += it
+        }
 
-        val masterStars = totalStars - 5
+        val masterStars = (totalStars - 5).coerceAtMost(5)
         if (masterStars < 1) return 0.0
 
         var price = 0.0
@@ -600,8 +746,7 @@ object EstimatedItemValueCalculator {
 
         //todo use repo
         val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb", "toxophilite")
-        val onlyTierOnePrices =
-            listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
+        val onlyTierOnePrices = listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
         val onlyTierFivePrices = listOf("ferocious_mana", "hardened_mana", "mana_vampire", "strong_mana")
 
         val internalName = stack.getInternalName()
@@ -718,8 +863,7 @@ object EstimatedItemValueCalculator {
         val internalName = stack.getInternalName()
 
         // item have to contains gems.unlocked_slots NBT array for unlocked slot detection
-        val unlockedSlots =
-            stack.getExtraAttributes()?.getCompoundTag("gems")?.getTag("unlocked_slots")?.toString() ?: return 0.0
+        val unlockedSlots = stack.getExtraAttributes()?.getCompoundTag("gems")?.getTag("unlocked_slots")?.toString() ?: return 0.0
 
         // TODO detection for old items which doesn't have gems.unlocked_slots NBT array
 //        if (unlockedSlots == "null") return 0.0
@@ -782,9 +926,8 @@ object EstimatedItemValueCalculator {
         return "§b$name ${second} Shard"
     }
 
-    fun Pair<String, Int>.getAttributePrice(): Double? =
-        EstimatedItemValueCalculator.getPriceOrCompositePriceForAttribute(
-            "ATTRIBUTE_SHARD+ATTRIBUTE_" + first,
-            second,
-        )
+    fun Pair<String, Int>.getAttributePrice(): Double? = EstimatedItemValueCalculator.getPriceOrCompositePriceForAttribute(
+        "ATTRIBUTE_SHARD+ATTRIBUTE_" + first,
+        second,
+    )
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
new file mode 100644
index 000000000000..fbb106d083c3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
@@ -0,0 +1,136 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuEssenceCostJson
+import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object EssenceItemUtils {
+    var itemPrices = mapOf<NEUInternalName, Map<Int, EssenceUpgradePrice>>()
+
+    @SubscribeEvent
+    fun onNeuRepoReload(event: NeuRepositoryReloadEvent) {
+        val unformattedData = event.getConstant<Map<String, NeuEssenceCostJson>>("essencecosts", NeuEssenceCostJson.TYPE)
+
+        ConfigManager.gson.toJson(unformattedData).let {
+            ChatUtils.debug("saved to clipboard!")
+            OSUtils.copyToClipboard(it)
+        }
+        this.itemPrices = reformatData(unformattedData)
+
+        println("result: ${itemPrices.size}")
+    }
+
+    fun NEUInternalName.getEssencePrices(): Map<Int, EssenceUpgradePrice>? = itemPrices[this]
+
+    private fun reformatData(unformattedData: Map<String, NeuEssenceCostJson>): MutableMap<NEUInternalName, Map<Int, EssenceUpgradePrice>> {
+        val itemPrices = mutableMapOf<NEUInternalName, Map<Int, EssenceUpgradePrice>>()
+        for ((name, data) in unformattedData) {
+
+            val essencePrices = loadEssencePrices(data)
+            val extraItems = data.extraItems ?: emptyMap()
+            val (coinPrices, iemPrices) = loadCoinAndItemPrices(extraItems)
+
+            val upgradePrices = mutableMapOf<Int, EssenceUpgradePrice>()
+            for ((tier, essencePrice) in essencePrices) {
+                val coinPrice = coinPrices[tier]
+                val itemPrice = iemPrices[tier] ?: emptyMap()
+                upgradePrices[tier] = EssenceUpgradePrice(essencePrice, coinPrice, itemPrice)
+            }
+
+            val internalName = name.asInternalName()
+            itemPrices[internalName] = upgradePrices
+        }
+        return itemPrices
+    }
+
+    private fun loadCoinAndItemPrices(
+        extraItems: Map<String, List<String>>,
+    ): Pair<MutableMap<Int, Long>, MutableMap<Int, Map<NEUInternalName, Int>>> {
+
+        val collectCoinPrices = mutableMapOf<Int, Long>()
+        val collectItemPrices = mutableMapOf<Int, Map<NEUInternalName, Int>>()
+
+        for ((tier, rawItems) in extraItems.mapKeys { it.key.toInt() }) {
+            val itemPrices = mutableMapOf<NEUInternalName, Int>()
+
+            for ((itemName, amount) in rawItems.map { split(it) }) {
+                if (itemName == NEUInternalName.SKYBLOCK_COIN) {
+                    collectCoinPrices[tier] = amount
+                } else {
+                    itemPrices[itemName] = amount.toInt()
+                }
+            }
+
+            collectItemPrices[tier] = itemPrices
+        }
+        return Pair(collectCoinPrices, collectItemPrices)
+    }
+
+    private fun split(string: String): Pair<NEUInternalName, Long> = string.split(":").let { it[0].asInternalName() to it[1].toLong() }
+
+    private fun loadEssencePrices(data: NeuEssenceCostJson): MutableMap<Int, EssencePrice> {
+        val map = mutableMapOf<Int, EssencePrice>()
+        val essenceType = data.essenceType
+        data.essenceFor1?.let { map[1] = EssencePrice(it, essenceType) }
+        data.essenceFor2?.let { map[2] = EssencePrice(it, essenceType) }
+        data.essenceFor3?.let { map[3] = EssencePrice(it, essenceType) }
+        data.essenceFor4?.let { map[4] = EssencePrice(it, essenceType) }
+        data.essenceFor5?.let { map[5] = EssencePrice(it, essenceType) }
+        data.essenceFor6?.let { map[6] = EssencePrice(it, essenceType) }
+        data.essenceFor7?.let { map[7] = EssencePrice(it, essenceType) }
+        data.essenceFor8?.let { map[8] = EssencePrice(it, essenceType) }
+        data.essenceFor9?.let { map[9] = EssencePrice(it, essenceType) }
+        data.essenceFor10?.let { map[10] = EssencePrice(it, essenceType) }
+        data.essenceFor11?.let { map[11] = EssencePrice(it, essenceType) }
+        data.essenceFor12?.let { map[12] = EssencePrice(it, essenceType) }
+        data.essenceFor13?.let { map[13] = EssencePrice(it, essenceType) }
+        data.essenceFor14?.let { map[14] = EssencePrice(it, essenceType) }
+        data.essenceFor15?.let { map[15] = EssencePrice(it, essenceType) }
+        return map
+    }
+
+    data class EssenceUpgradePrice(
+        val essencePrice: EssencePrice,
+        val coinPrice: Long?,
+        val itemPrice: Map<NEUInternalName, Int>,
+    ) {
+
+        operator fun plus(other: EssenceUpgradePrice): EssenceUpgradePrice {
+            if (other.essencePrice.essenceType != essencePrice.essenceType) ErrorManager.skyHanniError(
+                "Trying to add non compatible EssenceUpgradePrices!",
+                "essencePrice.essenceType" to essencePrice.essenceType,
+                "other.essencePrice.essenceType" to other.essencePrice.essenceType,
+            )
+
+            val coinPrice = coinPrice ?: 0L
+            val otherCoinPrice = other.coinPrice ?: 0L
+
+            val map = itemPrice.toMutableMap()
+            for (entry in other.itemPrice) {
+                map.addOrPut(entry.key, entry.value)
+            }
+
+            return EssenceUpgradePrice(essencePrice + other.essencePrice, coinPrice + otherCoinPrice, map)
+        }
+    }
+
+    data class EssencePrice(val essenceAmount: Int, val essenceType: String) {
+
+        operator fun plus(other: EssencePrice): EssencePrice {
+            if (other.essenceType != essenceType) ErrorManager.skyHanniError(
+                "Trying to add non compatible essence prices!",
+                "essenceType" to essenceType,
+                "other.essenceType" to other.essenceType,
+            )
+
+            return EssencePrice(essenceAmount + other.essenceAmount, essenceType)
+        }
+    }
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index c9e19332953d..4d0cf446856f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -46,9 +46,11 @@ object SkyBlockItemModifierUtils {
     fun ItemStack.getManaDisintegrators() = getAttributeInt("mana_disintegrator_count")
 
     fun ItemStack.getDungeonStarCount() = if (isDungeonItem()) {
-        getAttributeInt("upgrade_level") ?: getAttributeInt("dungeon_item_level")
+        getStarCount() ?: getAttributeInt("dungeon_item_level")
     } else null
 
+    fun ItemStack.getStarCount() = getAttributeInt("upgrade_level")
+
     private fun ItemStack.isDungeonItem() = getLore().any { it.contains("DUNGEON ") }
 
     fun ItemStack.getPetExp() = getPetInfo()?.get("exp")?.asDouble

From 996b70464766ca017de65b85b0574b0ed6eccab4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 12 Sep 2024 08:57:22 +0200
Subject: [PATCH 448/721] Fix: Duplex (#2501)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/utils/ItemNameResolver.kt        | 29 ++++++++++++++++++-
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  |  2 +-
 .../hannibal2/skyhanni/utils/UtilsPatterns.kt | 10 +++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
index 37849d79a1ea..996d19a938ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
@@ -1,7 +1,9 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
+import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -27,6 +29,9 @@ object ItemNameResolver {
         resolveEnchantmentByName(itemName)?.let {
             return itemNameCache.getOrPut(lowercase) { fixEnchantmentName(it) }
         }
+        resolveEnchantmentByCleanName(itemName)?.let {
+            return itemNameCache.getOrPut(lowercase) { it }
+        }
         if (itemName.endsWith("gemstone", ignoreCase = true)) {
             val split = lowercase.split(" ")
             if (split.size == 3) {
@@ -68,6 +73,28 @@ object ItemNameResolver {
         return internalName
     }
 
+    private fun resolveEnchantmentByCleanName(itemName: String): NEUInternalName? {
+        UtilsPatterns.cleanEnchantedNamePattern.matchMatcher(itemName) {
+            val name = group("name")
+            val level = group("level").romanToDecimalIfNecessary()
+            val rawInternalName = "$name;$level".uppercase()
+
+            var internalName = fixEnchantmentName(rawInternalName)
+            internalName.getItemStackOrNull()?.let {
+                return internalName
+            }
+
+            internalName = fixEnchantmentName("ULTIMATE_$rawInternalName")
+            internalName.getItemStackOrNull()?.let {
+                return internalName
+            }
+
+            return null
+        }
+        return null
+    }
+
+    // does not work without color codes, or with roman numbers
     // Taken and edited from NEU
     private fun resolveEnchantmentByName(enchantmentName: String) =
         UtilsPatterns.enchantmentNamePattern.matchMatcher(enchantmentName) {
@@ -87,7 +114,7 @@ object ItemNameResolver {
     // Workaround for duplex
     private val duplexPattern = "ULTIMATE_DUPLEX;(?<tier>.*)".toPattern()
 
-    private fun fixEnchantmentName(originalName: String): NEUInternalName {
+    fun fixEnchantmentName(originalName: String): NEUInternalName {
         duplexPattern.matchMatcher(originalName) {
             val tier = group("tier")
             return "ULTIMATE_REITERATE;$tier".asInternalName()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 168a12d95d62..cc1a4362b070 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -126,7 +126,7 @@ object ItemUtils {
             return NEUInternalName.WISP_POTION
         }
         val internalName = NEUItems.getInternalName(this)?.replace("ULTIMATE_ULTIMATE_", "ULTIMATE_")
-        return internalName?.asInternalName()
+        return internalName?.let { ItemNameResolver.fixEnchantmentName(it) }
     }
 
     fun ItemStack.isVanilla() = NEUItems.isVanillaItem(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
index 8bb09e6fc7ee..9ce7a32c5feb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
@@ -49,6 +49,16 @@ object UtilsPatterns {
         "^(?<format>(?:§.)*)(?<name>[^§]+) (?<level>[IVXL]+)(?: Book)?$"
     )
 
+    /**
+     * REGEX-TEST: duplex i
+     * REGEX-TEST: ultimate wise v
+     * REGEX-TEST: chimera 2
+     */
+    val cleanEnchantedNamePattern by patternGroup.pattern(
+        "item.enchantment.clean.name",
+        "(?i)(?<name>.*) (?<level>[IVXL]+|[0-9]+)"
+    )
+
     val potionPattern by patternGroup.pattern(
         "item.name.potion",
         ".*Potion"

From 4e23db746f35965b84f8dd5be19b9883c67d8add Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:21:53 +0100
Subject: [PATCH 449/721] Feature: Broodmother alerts/messages and damage
 indicator support (#2325)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/combat/CombatConfig.java  |   6 +
 .../combat/broodmother/BroodmotherConfig.java |  68 +++++++
 .../BroodmotherSpawnAlertConfig.java          |  41 ++++
 .../DamageIndicatorConfig.java                |   3 +
 .../skyhanni/data/model/TabWidget.kt          |   2 +-
 .../features/combat/BroodmotherFeatures.kt    | 183 ++++++++++++++++++
 .../skyhanni/features/combat/SpidersDenAPI.kt |  12 ++
 .../combat/damageindicator/BossType.kt        |   3 +-
 .../combat/damageindicator/MobFinder.kt       |   5 +
 .../gui/customscoreboard/ScoreboardEvent.kt   |   5 +-
 10 files changed, 322 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherSpawnAlertConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
index 4beede62ba18..7042b2fdbdd9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.config.features.combat;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.features.combat.broodmother.BroodmotherConfig;
 import at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig;
 import at.hannibal2.skyhanni.config.features.combat.ghostcounter.GhostCounterConfig;
 import com.google.gson.annotations.Expose;
@@ -60,6 +61,11 @@ public class CombatConfig {
     @Accordion
     public FlareConfig flare = new FlareConfig();
 
+    @Expose
+    @ConfigOption(name = "Broodmother", desc = "")
+    @Accordion
+    public BroodmotherConfig broodmother = new BroodmotherConfig();
+
     @Expose
     @ConfigOption(name = "Hide Damage Splash", desc = "Hide all damage splashes anywhere in SkyBlock.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherConfig.java
new file mode 100644
index 000000000000..8acd69c1f400
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherConfig.java
@@ -0,0 +1,68 @@
+package at.hannibal2.skyhanni.config.features.combat.broodmother;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.combat.BroodmotherFeatures.StageEntry;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class BroodmotherConfig {
+
+    @Expose
+    @ConfigOption(name = "Countdown", desc = "Display a countdown until the Broodmother will spawn.\n" +
+        "§cCountdown will not show unless the time until spawn has been established, and may be off by a few seconds.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean countdown = true;
+
+    @Expose
+    @ConfigOption(name = "Spawn Alert", desc = "Send a chat message, title and sound when the Broodmother spawns.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean alertOnSpawn = false;
+
+    @Expose
+    @ConfigOption(name = "Alert Settings", desc = "")
+    @Accordion
+    public BroodmotherSpawnAlertConfig spawnAlert = new BroodmotherSpawnAlertConfig();
+
+    @Expose
+    @ConfigOption(name = "Imminent Warning", desc = "Warns you when the Broodmother is 1 minute away from spawning.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean imminentWarning = false;
+
+    @Expose
+    @ConfigOption(name = "Chat Messages", desc = "Send a chat message when the Broodmother enters these stages.\n" +
+        "§cThe 'Alive!' and 'Imminent' stages are overridden by the \"Spawn Alert\" and \"Imminent Warning\" features.")
+    @ConfigEditorDraggableList
+    public List<StageEntry> stages = new ArrayList<>(Arrays.asList(
+        StageEntry.SLAIN,
+        StageEntry.ALIVE
+    ));
+
+    @Expose
+    @ConfigOption(name = "Stage on Server Join", desc = "Send a chat message with the Broodmother's current stage upon joining the Spider's Den.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean stageOnJoin = false;
+
+    @Expose
+    @ConfigOption(name = "Hide own kills", desc = "Disable the chat message for the §eSlain §rstage if at the Spider Mound.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideSlainWhenNearby = false;
+
+    @Expose
+    @ConfigLink(owner = BroodmotherConfig.class, field = "countdown")
+    public Position countdownPosition = new Position(10, 10, false, true);
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherSpawnAlertConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherSpawnAlertConfig.java
new file mode 100644
index 000000000000..d0c2ccfe9ecd
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/broodmother/BroodmotherSpawnAlertConfig.java
@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.config.features.combat.broodmother;
+
+import at.hannibal2.skyhanni.features.combat.BroodmotherFeatures;
+import at.hannibal2.skyhanni.utils.OSUtils;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class BroodmotherSpawnAlertConfig {
+
+    @Expose
+    @ConfigOption(name = "Alert Sound", desc = "The sound that plays for the alert.")
+    @ConfigEditorText
+    public String alertSound = "note.pling";
+
+    @Expose
+    @ConfigOption(name = "Pitch", desc = "The pitch of the alert sound.")
+    @ConfigEditorSlider(minValue = 0.5f, maxValue = 2.0f, minStep = 0.1f)
+    public float pitch = 1.0f;
+
+    @ConfigOption(name = "Test Sound", desc = "Test current sound settings.")
+    @ConfigEditorButton(buttonText = "Test")
+    public Runnable testSound = BroodmotherFeatures::playTestSound;
+
+    @Expose
+    @ConfigOption(name = "Repeat Sound", desc = "How many times the sound should be repeated.")
+    @ConfigEditorSlider(minValue = 1, maxValue = 20, minStep = 1)
+    public int repeatSound = 20;
+
+    @ConfigOption(name = "Sounds", desc = "Click to open the list of available sounds.")
+    @ConfigEditorButton(buttonText = "OPEN")
+    public Runnable sounds = () -> OSUtils.openBrowser("https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/mapping-and-modding-tutorials/2213619-1-8-all-playsound-sound-arguments");
+
+    @Expose
+    @ConfigOption(name = "Text", desc = "The text with color to be displayed as the title notification.")
+    @ConfigEditorText
+    public String text = "&4Broodmother has spawned!";
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
index 7010c7d35ff0..ed37c396ccb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java
@@ -14,6 +14,7 @@
 import java.util.List;
 
 import static at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig.BossCategory.ARACHNE;
+import static at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig.BossCategory.BROODMOTHER;
 import static at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig.BossCategory.DIANA_MOBS;
 import static at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig.BossCategory.GARDEN_PESTS;
 import static at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig.BossCategory.INFERNO_DEMONLORD;
@@ -96,6 +97,7 @@ public String toString() {
         DIANA_MOBS,
         SEA_CREATURES,
         ARACHNE,
+        BROODMOTHER,
         THE_RIFT_BOSSES,
         RIFTSTALKER_BLOODFIEND,
         REINDRAKE,
@@ -129,6 +131,7 @@ public enum BossCategory implements HasLegacyId {
         RIFTSTALKER_BLOODFIEND("§bRiftstalker Bloodfiend", 23),
         REINDRAKE("§6Reindrake", 24),
         GARDEN_PESTS("§aGarden Pests", 25),
+        BROODMOTHER("§bBroodmother")
         ;
 
         private final String str;
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
index 523121b3763d..85c50528f4e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt
@@ -195,7 +195,7 @@ enum class TabWidget(
     ),
     BROODMOTHER(
         // language=RegExp
-        "Broodmother: (?:§.)*(?<time>.*)",
+        "Broodmother: (?:§.)*(?<stage>.*)",
     ),
     EYES_PLACED(
         // language=RegExp
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
new file mode 100644
index 000000000000..e087fdd1934e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
@@ -0,0 +1,183 @@
+package at.hannibal2.skyhanni.features.combat
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RenderUtils.renderString
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.SoundUtils.playSound
+import at.hannibal2.skyhanni.utils.StringUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.reflect.KMutableProperty0
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.DurationUnit
+
+@SkyHanniModule
+object BroodmotherFeatures {
+
+    enum class StageEntry(private val str: String, val minutes: Int) {
+        SLAIN("§eSlain", 10),
+        DORMANT("§eDormant", 9),
+        SOON("§6Soon", 6),
+        AWAKENING("§6Awakening", 3),
+        IMMINENT("§4Imminent", 1),
+        ALIVE("§4Alive!", 0);
+
+        override fun toString() = str
+    }
+
+    private val config get() = SkyHanniMod.feature.combat.broodmother
+    private val spawnAlertConfig get() = config.spawnAlert
+
+    private var lastStage: StageEntry? = null
+    private var currentStage: StageEntry? = null
+    private var broodmotherSpawnTime = SimpleTimeMark.farPast()
+    private var display = ""
+
+    @SubscribeEvent
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
+        if (!event.isWidget(TabWidget.BROODMOTHER)) return
+        val newStage = event.widget.matchMatcherFirstLine { group("stage") } ?: ""
+        if (newStage.isNotEmpty()) {
+            lastStage = currentStage
+            currentStage = StageEntry.valueOf(newStage.replace("!", "").uppercase())
+            onStageUpdate()
+        }
+    }
+
+    private fun onStageUpdate() {
+        ChatUtils.debug("New Broodmother stage: $currentStage")
+
+        if (lastStage == null) {
+            if (onServerJoin()) return
+        }
+
+        // ignore Hypixel bug where the stage may temporarily revert to Imminent after the Broodmother's death
+        if (currentStage == StageEntry.IMMINENT && lastStage == StageEntry.ALIVE) return
+
+        if (currentStage == StageEntry.ALIVE) {
+            onBroodmotherSpawn()
+            return
+        }
+
+        val timeUntilSpawn = currentStage?.minutes?.minutes
+        broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn!!
+
+        if (currentStage == StageEntry.IMMINENT && config.imminentWarning) {
+            playImminentWarning()
+            return
+        }
+
+        if (config.stages.contains(currentStage) && lastStage != null) {
+            if (currentStage == StageEntry.SLAIN) {
+                onBroodmotherSlain()
+            } else {
+                val pluralize = StringUtils.pluralize(timeUntilSpawn.toInt(DurationUnit.MINUTES), "minute")
+                ChatUtils.chat(
+                    "Broodmother: $lastStage §e-> $currentStage§e. §b${timeUntilSpawn.inWholeMinutes} $pluralize §euntil it spawns!"
+                )
+            }
+        }
+    }
+
+    private fun onServerJoin(): Boolean {
+        // don't send if user has config enabled for either of the alive messages
+        // this is so that two messages aren't immediately sent upon joining a server
+        if (config.stageOnJoin && !(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
+            val pluralize = StringUtils.pluralize(currentStage?.minutes ?: 0, "minute")
+            var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
+            if (currentStage?.minutes != 0) {
+                message += " It will spawn within §b${currentStage?.minutes} $pluralize§e."
+            }
+            ChatUtils.chat(message)
+            return true
+        } else {
+            return false
+        }
+    }
+
+    private fun onBroodmotherSpawn() {
+        broodmotherSpawnTime = SimpleTimeMark.farPast()
+        if (!isAliveMessageEnabled()) return
+        val feature: KMutableProperty0<*>
+        if (config.alertOnSpawn) {
+            feature = config::alertOnSpawn
+            val alertSound = SoundUtils.createSound(spawnAlertConfig.alertSound, spawnAlertConfig.pitch)
+            SoundUtils.repeatSound(100, spawnAlertConfig.repeatSound, alertSound)
+            LorenzUtils.sendTitle(spawnAlertConfig.text.replace("&", "§"), 3.seconds)
+        } else {
+            feature = config::stages
+        }
+        ChatUtils.clickToActionOrDisable(
+            "The Broodmother has spawned!",
+            feature,
+            actionName = "warp to the Top of the Nest",
+            action = { HypixelCommands.warp("nest") },
+        )
+    }
+
+    private fun playImminentWarning() {
+        SoundUtils.repeatSound(100, 2, SoundUtils.createSound("note.pling", 0.5f))
+        ChatUtils.chat("The Broodmother is §4Imminent§e! It will spawn in §b60 seconds§e!")
+    }
+
+    private fun onBroodmotherSlain() {
+        broodmotherSpawnTime = SimpleTimeMark.now() + 10.minutes
+        if (!(config.hideSlainWhenNearby && SpidersDenAPI.isAtTopOfNest())) {
+            ChatUtils.chat("The Broodmother was killed!")
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        broodmotherSpawnTime = SimpleTimeMark.farPast()
+        lastStage = null
+        currentStage = null
+        display = ""
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isCountdownEnabled()) return
+        if (display.isEmpty()) return
+
+        config.countdownPosition.renderString(display, posLabel = "Broodmother Countdown")
+    }
+
+    @SubscribeEvent
+    fun onSecondPassed(event: SecondPassedEvent) {
+        if (!isCountdownEnabled()) return
+
+        if (broodmotherSpawnTime.isFarPast()) {
+            if (lastStage != null) {
+                display = "§4Broodmother spawned!"
+            }
+        } else {
+            val countdown = broodmotherSpawnTime.timeUntil().format()
+            display = "§4Broodmother spawning in §b$countdown"
+        }
+    }
+
+    @JvmStatic
+    fun playTestSound() {
+        with(spawnAlertConfig) {
+            SoundUtils.createSound(alertSound, pitch).playSound()
+        }
+    }
+
+    private fun inSpidersDen() = IslandType.SPIDER_DEN.isInIsland()
+    private fun isCountdownEnabled() = inSpidersDen() && config.countdown
+    private fun isAliveMessageEnabled() = config.alertOnSpawn || config.stages.contains(StageEntry.ALIVE)
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt
new file mode 100644
index 000000000000..7986c55e9d3a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt
@@ -0,0 +1,12 @@
+package at.hannibal2.skyhanni.features.combat
+
+import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard
+import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+
+@SkyHanniModule
+object SpidersDenAPI {
+    private fun getSbLines(): List<String> = CustomScoreboard.activeLines
+    fun isAtTopOfNest(): Boolean = getSbLines().any { ScoreboardPattern.broodmotherPattern.matches(it) }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
index 3bc12fa4c8a8..3d46d3edc5d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
@@ -101,6 +101,7 @@ enum class BossType(
     DUMMY("Dummy", Type.DUMMY),
     ARACHNE_SMALL("§cSmall Arachne", Type.ARACHNE),
     ARACHNE_BIG("§4Big Arachne", Type.ARACHNE),
+    BROODMOTHER("§cBroodmother", Type.BROODMOTHER),
 
     // The Rift
     LEECH_SUPREME("§cLeech Supreme", Type.THE_RIFT_BOSSES),
@@ -119,8 +120,6 @@ enum class BossType(
     GARDEN_PEST_SLUG("§cSlug", Type.GARDEN_PESTS),
     GARDEN_PEST_EARTHWORM("§cEarthworm", Type.GARDEN_PESTS),
 
-    // TODO arachne
-
     // TODO Corleone
     // TODO bal
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
index e9b2f879b693..975e3b4f8457 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
@@ -429,6 +429,11 @@ class MobFinder {
                 entity.hasMaxHealth(2_400_000, true) -> return EntityResult(bossType = BossType.SLAYER_SPIDER_4)
             }
         }
+        if (entity.hasNameTagWith(1, "[§7Lv12§8] §4Broodmother")) {
+            if (entity.hasMaxHealth(6000)) {
+                return EntityResult(bossType = BossType.BROODMOTHER)
+            }
+        }
         checkArachne(entity as EntitySpider)?.let { return it }
         return null
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index efe7c953db8f..9f3c009e57f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.VOTING
@@ -121,7 +122,7 @@ enum class ScoreboardEvent(
     ),
     BROODMOTHER(
         ::getBroodmotherLines,
-        ::getBroodmotherShowWhen,
+        ::isAtTopOfNest,
         "§4Broodmother§7: §eDormant",
     ),
     MINING_EVENTS(
@@ -441,8 +442,6 @@ private fun getSoonEventShowWhen(): Boolean =
 private fun getBroodmotherLines(): List<String> =
     listOf(getSbLines().first { SbPattern.broodmotherPattern.matches(it) })
 
-private fun getBroodmotherShowWhen(): Boolean = getSbLines().any { SbPattern.broodmotherPattern.matches(it) }
-
 private fun getMiningEventsLines() = buildList {
     // Wind
     if (getSbLines().any { SbPattern.windCompassPattern.matches(it) }

From b99310be47d5caeb6de8832ce9e2b10c423f77ce Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Thu, 12 Sep 2024 10:25:09 +0200
Subject: [PATCH 450/721] Feature: GetFromSack Piggy Bank (#2150)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../config/features/misc/MiscConfig.java      |  6 +++
 .../skyhanni/features/misc/GFSPiggyBank.kt    | 48 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/GFSPiggyBank.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 1464d35ada2d..f3b9ab16e922 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -316,6 +316,12 @@ public class MiscConfig {
     @FeatureToggle
     public boolean maintainGameVolume = false;
 
+    @Expose
+    @ConfigOption(name = "GFS Piggy Bank", desc = "When your Piggy Bank breaks, send a chat warning to get enchanted pork from sacks.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean gfsPiggyBank = true;
+
     @Expose
     @ConfigOption(name = "SkyHanni User Luck", desc = "Shows SkyHanni User Luck in the SkyBlock Stats.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/GFSPiggyBank.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/GFSPiggyBank.kt
new file mode 100644
index 000000000000..159383d8a6ac
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/GFSPiggyBank.kt
@@ -0,0 +1,48 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.GetFromSackAPI
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatchers
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object GFSPiggyBank {
+
+    private val ENCHANTED_PORK by lazy { "ENCHANTED_PORK".asInternalName().makePrimitiveStack(8) }
+
+    private val group = RepoPattern.group("misc.piggybank")
+
+    /**
+     * REGEX-TEST: §cYou died and your piggy bank cracked!
+     */
+    private val crackedPattern by group.pattern(
+        "cracked",
+        "§cYou died and your piggy bank cracked!",
+    )
+
+    /**
+     * REGEX-TEST: §cYou died, lost 50,000 coins and your piggy bank broke!
+     */
+    private val brokePattern by group.pattern(
+        "broke",
+        "§cYou died, lost [\\d.,]* coins and your piggy bank broke!",
+    )
+
+    private val patternList = listOf(crackedPattern, brokePattern)
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        patternList.matchMatchers(event.message) {
+            GetFromSackAPI.getFromChatMessageSackItems(ENCHANTED_PORK)
+        }
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.misc.gfsPiggyBank
+}

From 6b1c3fa0454315b2fede1cb66f47a2958482525e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:06:53 +0200
Subject: [PATCH 451/721] removed debug

---
 src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
index fbb106d083c3..c63fb7177a14 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
@@ -22,8 +22,6 @@ object EssenceItemUtils {
             OSUtils.copyToClipboard(it)
         }
         this.itemPrices = reformatData(unformattedData)
-
-        println("result: ${itemPrices.size}")
     }
 
     fun NEUInternalName.getEssencePrices(): Map<Int, EssenceUpgradePrice>? = itemPrices[this]

From 0801fef79264784584814b357d39877ffb6d5afb Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:08:53 +0200
Subject: [PATCH 452/721] Fix: MobDetection Memory Collection (#2504)

---
 .../skyhanni/data/mob/MobDetection.kt         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index b7cc4dfaa13a..1427eb5fbbc6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.events.MobEvent
 import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.drainForEach
 import at.hannibal2.skyhanni.utils.CollectionUtils.drainTo
 import at.hannibal2.skyhanni.utils.CollectionUtils.put
@@ -31,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.network.play.server.S01PacketJoinGame
 import net.minecraft.network.play.server.S0CPacketSpawnPlayer
 import net.minecraft.network.play.server.S0FPacketSpawnMob
+import net.minecraft.world.World
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean
@@ -62,8 +64,41 @@ object MobDetection {
         MobData.currentMobs.map {
             it.createDeSpawnEvent()
         }.forEach { it.postAndCatch() }
+        MobData.retries.clear()
     }
 
+    private fun watchdog() {
+        val world = LorenzUtils.getPlayer()?.worldObj ?: return
+        if (MobData.retries.any { it.value.entity.worldObj != world }) {
+            ChatUtils.chat("Watchdog: Retires")
+        }
+        if (MobData.currentMobs.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Current Mobs")
+        }
+        if (MobData.players.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Players")
+        }
+        if (MobData.displayNPCs.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Display NPCs")
+        }
+        if (MobData.skyblockMobs.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: SkyBlockMobs")
+        }
+        if (MobData.summoningMobs.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Summoning")
+        }
+        if (MobData.special.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Special")
+        }
+        if (MobData.notSeenMobs.any { it.watchdogCheck(world) }) {
+            ChatUtils.chat("Watchdog: Not Seen Mobs")
+        }
+    }
+
+    private fun Mob.watchdogCheck(world: World): Boolean =
+        this.baseEntity.worldObj != world || (this.armorStand?.let { it.worldObj != world }
+            ?: false) || this.extraEntities.any { it.worldObj != world }
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (shouldClear.get()) { // Needs to work outside skyblock since it needs clearing when leaving skyblock and joining limbo

From 326c632ed18b7677c72d86497e54086c9b409e9c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:09:35 +0200
Subject: [PATCH 453/721] added todo

---
 src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 1427eb5fbbc6..9b7ba2cfd5e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -67,6 +67,7 @@ object MobDetection {
         MobData.retries.clear()
     }
 
+    // TODO this is a unused debug funciton. maybe connect with a debug commmand or remove
     private fun watchdog() {
         val world = LorenzUtils.getPlayer()?.worldObj ?: return
         if (MobData.retries.any { it.value.entity.worldObj != world }) {

From 20081af74fd53f35746ab0d5c974bb5db92bec3b Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:16:41 +0200
Subject: [PATCH 454/721] Fix: Mouse Keys in Wardrobe (#2506)

---
 .../at/hannibal2/skyhanni/data/GuiData.kt     |  3 +++
 .../wardrobe/CustomWardrobeKeybinds.kt        | 23 +++++++++++++------
 .../skyhanni/utils/KeyboardManager.kt         | 13 +++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
index 38ac99d1b3f6..5f2ca510bfef 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
@@ -36,6 +36,9 @@ object GuiData {
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onGuiClick(event: GuiScreenEvent.MouseInputEvent.Pre) {
+
+        if (CustomWardrobeKeybinds.allowMouseClick()) return
+
         if (preDrawEventCancelled) event.isCanceled = true
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
index a2fdd21ff0e6..b2ccdfe355f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobeKeybinds.kt
@@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiKeyPressEvent
 import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobe.clickSlot
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import net.minecraftforge.client.event.GuiScreenEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -31,7 +31,16 @@ object CustomWardrobeKeybinds {
 
     @SubscribeEvent
     fun onGui(event: GuiKeyPressEvent) {
-        if (!isEnabled()) return
+        if (handlePress()) event.cancel()
+    }
+
+    @SubscribeEvent
+    fun onMouse(event: GuiScreenEvent.MouseInputEvent.Pre) {
+        if (handlePress()) event.isCanceled = true
+    }
+
+    private fun handlePress(): Boolean {
+        if (!isEnabled()) return false
         val slots = WardrobeAPI.slots.filter { it.isInCurrentPage() }.filterNot { config.onlyFavorites && !it.favorite }
 
         for ((index, key) in keybinds.withIndex()) {
@@ -39,16 +48,16 @@ object CustomWardrobeKeybinds {
             if (lastClick.passedSince() < 200.milliseconds) break
             val slot = slots.getOrNull(index) ?: continue
 
-            event.cancel()
-
             slot.clickSlot()
             lastClick = SimpleTimeMark.now()
-            break
+            return true
         }
+
+        return false
     }
 
-    fun allowKeyboardClick() = isEnabled() && keybinds.any { it.isKeyClicked() }
+    fun allowMouseClick() = isEnabled() && keybinds.filter { it < 0 }.any { it.isKeyHeld() }
+    fun allowKeyboardClick() = isEnabled() && keybinds.filter { it > 0 }.any { it.isKeyHeld() }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && WardrobeAPI.inCustomWardrobe && config.keybinds.slotKeybindsToggle && config.enabled
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
index dbdccb72acd3..f56ba4f0b331 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
@@ -108,16 +108,15 @@ object KeyboardManager {
         return this.isKeyDown || this.isPressed
     }
 
-    fun Int.isKeyHeld(): Boolean {
-        if (this == 0) return false
-        return if (this < 0) {
-            Mouse.isButtonDown(this + 100)
-        } else if (this >= Keyboard.KEYBOARD_SIZE) {
+    fun Int.isKeyHeld(): Boolean = when {
+        this == 0 -> false
+        this < 0 -> Mouse.isButtonDown(this + 100)
+        this >= Keyboard.KEYBOARD_SIZE -> {
             val pressedKey = if (Keyboard.getEventKey() == 0) Keyboard.getEventCharacter().code + 256 else Keyboard.getEventKey()
             Keyboard.getEventKeyState() && this == pressedKey
-        } else {
-            Keyboard.isKeyDown(this)
         }
+
+        else -> Keyboard.isKeyDown(this)
     }
 
     private val pressedKeys = mutableMapOf<Int, Boolean>()

From 691d2551cf722b76c1894c814d1f6c2e98fe17d6 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:23:40 +0200
Subject: [PATCH 455/721] Feature: Carnival QoL (#2498)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/event/EventConfig.java    |   4 +-
 .../event/carnival/CarnivalConfig.java        |  26 ++
 .../storage/ProfileSpecificStorage.java       |  17 ++
 .../features/event/carnival/CarnivalGoal.kt   | 236 ++++++++++++++++++
 .../event/carnival/CarnivalQuickStart.kt      |  60 +++++
 .../event/carnival/CarnivalReminder.kt        |  99 ++++++++
 .../skyhanni/utils/HypixelCommands.kt         |   4 +
 .../skyhanni/utils/json/BaseGsonBuilder.kt    |   4 +-
 .../utils/json/SkyHanniTypeAdapters.kt        |  16 +-
 9 files changed, 461 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
index 1c916bbe15ce..41d5771ab475 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java
@@ -44,9 +44,8 @@ public class EventConfig {
     @Expose
     public GreatSpookConfig spook = new GreatSpookConfig();
 
-    @ConfigOption(name = "Carnival", desc = "")
-    @Accordion
     @Expose
+    @Category(name = "The Carnival", desc = "Features for games at §eThe Carnival §7when §bFoxy §7is Mayor.")
     public CarnivalConfig carnival = new CarnivalConfig();
 
     // comment in if the event is needed again
@@ -58,5 +57,4 @@ public class EventConfig {
     @Category(name = "Lobby Waypoints", desc = "Lobby Event Waypoint settings")
     @Expose
     public LobbyWaypointsConfig lobbyWaypoints = new LobbyWaypointsConfig();
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
index b874f7558d8e..cad2b7ea3d72 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/CarnivalConfig.java
@@ -1,7 +1,11 @@
 package at.hannibal2.skyhanni.config.features.event.carnival;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class CarnivalConfig {
@@ -10,4 +14,26 @@ public class CarnivalConfig {
     @ConfigOption(name = "Zombie Shootout", desc = "")
     @Accordion
     public ZombieShootoutConfig zombieShootout = new ZombieShootoutConfig();
+
+    @Expose
+    @ConfigOption(name = "Reminder Daily Tickets", desc = "Reminds you when tickets can be claimed from the carnival leader.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean reminderDailyTickets = true;
+
+    @Expose
+    @ConfigOption(name = "Show Goals", desc = "Displays the goals for this carnival event.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean showGoals = true;
+
+    @Expose
+    @ConfigLink(owner = CarnivalConfig.class, field = "showGoals")
+    public Position goalsPosition = new Position(20, 20);
+
+    @Expose
+    @ConfigOption(name = "Double Click to Start", desc = "Clicking the npc again after the npc finishes talking to start game.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean doubleClickToStart = true;
 }
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 5938eebdb326..83e7ea47c254 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -10,6 +10,7 @@
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostData;
 import at.hannibal2.skyhanni.features.dungeon.CroesusChestTracker;
 import at.hannibal2.skyhanni.features.dungeon.DungeonFloor;
+import at.hannibal2.skyhanni.features.event.carnival.CarnivalGoal;
 import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker;
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker;
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats;
@@ -159,6 +160,22 @@ public static class PositionChange {
         public ChocolateFactoryStrayTracker.Data strayTracker = new ChocolateFactoryStrayTracker.Data();
     }
 
+    @Expose
+    public CarnivalStorage carnival = new CarnivalStorage();
+
+    public static class CarnivalStorage {
+
+        @Expose
+        @Nullable
+        public java.time.LocalDate lastClaimedDay = null;
+
+        @Expose
+        public int carnivalYear = 0;
+
+        @Expose
+        public Map<CarnivalGoal, Boolean> goals = new HashMap<>();
+    }
+
     @Expose
     public MaxwellPowerStorage maxwell = new MaxwellPowerStorage();
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
new file mode 100644
index 000000000000..c36212a22d8b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
@@ -0,0 +1,236 @@
+package at.hannibal2.skyhanni.features.event.carnival
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.Perk
+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.ProfileJoinEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.SkyBlockTime
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.init.Blocks
+import net.minecraft.init.Items
+import net.minecraft.item.Item
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.intellij.lang.annotations.Language
+
+private val repoGroup = RepoPattern.group("carnvial.goals")
+
+enum class CarnivalGoal(
+    private val type: GoalType,
+    @Language("RegEXP") loreLine: String,
+    @Language("RegEXP") chatLine: String,
+    val display: String,
+) {
+    FRUIT_DIGGING_PLAY(
+        GoalType.FRUIT_DIGGING,
+        "§7Play §a3 games §7of §6Fruit Digging§7.",
+        "(§8 - §r)?§7Play §r§a3 games §r§7of §r§6Fruit Digging§r§7.",
+        "Play §a3 games",
+    ),
+    FRUIT_DIGGING_SCORE(
+        GoalType.FRUIT_DIGGING,
+        "§7Reach §a3,000 score §7in a single game",
+        "(§8 - §r)?§7Reach §r§a3,000 score §r§7in a single game of §r§6Fruit Digging§r§7.",
+        "Reach §a3,000 score",
+    ),
+    DIG_APPLE(
+        GoalType.FRUIT_DIGGING,
+        "§7Dig up §a3 Apples §7in a single game of",
+        "(§8 - §r)?§7Dig up §r§a3 Apples §r§7in a single game of §r§6Fruit Digging§r§7.",
+        "Dig up §a3 Apples",
+    ),
+    UNIQUE_FRUIT(
+        GoalType.FRUIT_DIGGING,
+        "§7Dig up §a5 unique Fruits §7in a single",
+        "(§8 - §r)?§7Dig up §r§a5 unique Fruits §r§7in a single game of §r§6Fruit Digging§r§7.",
+        "Dig up §a5 unique Fruits",
+    ),
+    DRAGONFRUIT(
+        GoalType.FRUIT_DIGGING,
+        "§7Dig up a §dDragonfruit§7.",
+        "(§8 - §r)?§7Dig up a §r§dDragonfruit§r§7.",
+        "Dig up a §dDragonfruit",
+    ),
+    CATCH_A_FISH_PLAY(
+        GoalType.CATCH_A_FISH,
+        "§7Play §a3 games §7of §3Catch a Fish§7.",
+        "(§8 - §r)?§7Play §r§a3 games §r§7of §r§3Catch a Fish§r§7.",
+        "Play §a3 games",
+    ),
+    CATCH_A_FISH_SCORE(
+        GoalType.CATCH_A_FISH,
+        "§7Reach §a3,000 score §7in a single game",
+        "(§8 - §r)?§7Catch §r§a30 Fish §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "Reach §a3,000 score",
+    ),
+    CATCH_FISH(
+        GoalType.CATCH_A_FISH,
+        "§7Catch §a30 Fish §7in a single game of",
+        "(§8 - §r)?§7Reach §r§a3,000 score §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "Catch §a30 Fish",
+    ),
+    CATCH_YELLOW_FISH(
+        GoalType.CATCH_A_FISH,
+        "§7Catch §a5 Yellow Fish §7in a single game",
+        "(§8 - §r)?§7Catch §r§a5 Yellow Fish §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "Catch §a5 Yellow Fish",
+    ),
+    CATCH_STREAK(
+        GoalType.CATCH_A_FISH,
+        "§7Reach a §a5 Catch Streak §7in a single",
+        "(§8 - §r)?§7Reach a §r§a5 Catch Streak §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "Reach a §a5 Catch Streak",
+    ),
+    ZOMBIE_SHOOTOUT_PLAY(
+        GoalType.ZOMBIE_SHOOTOUT,
+        "§7Play §a3 games §7of §cZombie Shootout§7.",
+        "(§8 - §r)?§7Play §r§a3 games §r§7of §r§cZombie Shootout§r§7.",
+        "Play §a3 games",
+    ),
+    ZOMBIE_SHOOTOUT_SCORE(
+        GoalType.ZOMBIE_SHOOTOUT,
+        "§7Reach §a3,000 score §7in a single game",
+        "(§8 - §r)?§7Reach §r§a3,000 score §r§7in a single game of §r§cZombie Shootout§r§7.",
+        "Reach §a3,000 score",
+    ),
+    SHOOT_ZOMBIE(
+        GoalType.ZOMBIE_SHOOTOUT,
+        "§7Shoot §a60 Zombies §7in a single game of",
+        "(§8 - §r)?§7Shoot §r§a60 Zombies §r§7in a single game of §r§cZombie Shootout§r§7.",
+        "Shoot §a60 Zombies",
+    ),
+    SHOOT_DIAMOND_ZOMBIE(
+        GoalType.ZOMBIE_SHOOTOUT,
+        "§7Shoot §a5 Diamond Zombies §7in a single",
+        "(§8 - §r)?§7Shoot §r§a5 Diamond Zombies §r§7in a single game of §r§cZombie Shootout§r§7.",
+        "Shoot §a5 Diamond Zombies",
+    ),
+    SHOOT_LAMPS(
+        GoalType.ZOMBIE_SHOOTOUT,
+        "§7Shoot §a5 Redstone Lamps §7in a single",
+        "(§8 - §r)?§7Shoot §r§a5 Redstone Lamps §r§7in a single game of §r§cZombie Shootout§r§7.",
+        "Shoot §a5 Redstone Lamps",
+    ),
+    ;
+
+    private val patternKeyName = name.lowercase().replace("_", ".")
+
+    private val lorePattern by repoGroup.pattern("lore.$patternKeyName", loreLine)
+    private val chatPattern by repoGroup.pattern("chat.$patternKeyName", chatLine)
+
+    private var isReached: Boolean
+        get() {
+            val year = SkyBlockTime.now().year
+            if (year != storage?.carnivalYear) {
+                storage?.goals?.clear()
+                storage?.carnivalYear = year
+            }
+            return storage?.goals?.get(this) ?: false
+        }
+        set(value) {
+            val year = SkyBlockTime.now().year
+            if (year != storage?.carnivalYear) {
+                storage?.goals?.clear()
+                storage?.carnivalYear = year
+            }
+            storage?.goals?.set(this, value)
+            dirty = true
+        }
+
+    @SkyHanniModule
+    companion object {
+
+        init {
+            entries.forEach {
+                it.chatPattern
+                it.lorePattern
+            }
+        }
+
+        private val config get() = SkyHanniMod.feature.event.carnival
+        private val storage get() = ProfileStorageData.profileSpecific?.carnival
+
+        private val inventoryPattern by repoGroup.pattern("inventory", "Carnival Goals")
+
+        private val completePattern by repoGroup.pattern("complete", "§a§lCOMPLETE")
+
+        private var dirty = true
+
+        private fun getEntry(item: Item, lore: List<String>): CarnivalGoal? =
+            entries.filter { it.type.item == item }.firstOrNull { it.lorePattern.matches(lore.firstOrNull()) }
+
+        @SubscribeEvent
+        fun onProfileJoin(event: ProfileJoinEvent) {
+            dirty = true
+        }
+
+        @SubscribeEvent
+        fun onInventoryFullyOpened(event: InventoryFullyOpenedEvent) {
+            if (!isEnabled()) return
+            if (!inventoryPattern.matches(event.inventoryName)) return
+            for (stack in event.inventoryItems.values) {
+                val lore = stack.getLore()
+                val goal = getEntry(stack.item, lore) ?: continue
+                val lastLine = lore.last()
+                goal.isReached = completePattern.matches(lastLine)
+            }
+        }
+
+        @SubscribeEvent
+        fun onLorenzChat(event: LorenzChatEvent) {
+            if (!isEnabled()) return
+            entries.firstOrNull { it.chatPattern.matches(event.message) }?.isReached = true
+        }
+
+        private var display = emptyList<Renderable>()
+
+        @SubscribeEvent
+        fun onGuiRenderGuiOverlayRender(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+            if (!isEnabled()) return
+            if (dirty) {
+                display = buildList {
+                    GoalType.entries.map { it.fullDisplay }.forEach { list -> addAll(list) }
+                }
+                dirty = false
+            }
+            config.goalsPosition.renderRenderables(display, posLabel = "Carnival Goals")
+        }
+
+        fun isEnabled() =
+            LorenzUtils.inSkyBlock && config.showGoals && Perk.CHIVALROUS_CARNIVAL.isActive && LorenzUtils.skyBlockArea == "Carnival"
+
+        private enum class GoalType(val item: Item, display: String) {
+            FRUIT_DIGGING(Item.getItemFromBlock(Blocks.sand), "§6Fruit Digging"),
+            CATCH_A_FISH(Items.fish, "§3Catch a Fish"),
+            ZOMBIE_SHOOTOUT(Items.arrow, "§cZombie Shootout");
+
+            val singleDisplay by lazy {
+                Renderable.horizontalContainer(
+                    listOf(
+                        Renderable.itemStack(ItemStack(item)),
+                        Renderable.string(display),
+                    ),
+                )
+            }
+
+            val fullDisplay: List<Renderable>
+                get() {
+                    val goals = getGoals.filterNot { it.isReached }
+                    if (goals.isEmpty()) return emptyList()
+                    return listOf(singleDisplay) + goals.map { Renderable.string(" " + it.display) }
+                }
+
+            val getGoals get() = CarnivalGoal.entries.filter { it.type == this }
+        }
+    }
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
new file mode 100644
index 000000000000..ee2a9028ae7e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
@@ -0,0 +1,60 @@
+package at.hannibal2.skyhanni.features.event.carnival
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.Perk
+import at.hannibal2.skyhanni.events.EntityClickEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.MobUtils.mob
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.entity.EntityLivingBase
+import net.minecraft.util.ChatComponentText
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object CarnivalQuickStart {
+
+    private val config get() = SkyHanniMod.feature.event.carnival.doubleClickToStart
+
+    /** REGEX-TEST: §eSelect an option: §r\n§e ➜ §a[Sure thing, partner!] §r\n§e ➜ §b[Could ya tell me the rules again?] §r\n§e ➜ §c[I'd like to do somthin' else fer now.]
+     * */
+    private val chatPattern by RepoPattern.pattern("carnival.select.option.chat", "§eSelect an option:.*")
+
+    private val repoGroup = RepoPattern.group("carnival.npcs")
+
+    private val pirate by repoGroup.pattern("pirate", "Carnival Pirateman")
+    private val fisher by repoGroup.pattern("fisher", "Carnival Fisherman")
+    private val cowboy by repoGroup.pattern("cowboy", "Carnival Cowboy")
+
+    private var lastChat = SimpleTimeMark.farPast()
+
+    @SubscribeEvent
+    fun onEntityClick(event: EntityClickEvent) {
+        if (!isEnabled()) return
+        if (lastChat.passedSince() > 5.0.seconds) return
+        val mob = (event.clickedEntity as? EntityLivingBase)?.mob ?: return
+        val type = when {
+            cowboy.matches(mob.name) -> "carnival_cowboy"
+            fisher.matches(mob.name) -> "carnival_fisherman"
+            pirate.matches(mob.name) -> "carnival_pirateman"
+            else -> return
+        }
+        HypixelCommands.npcOption(type, "r_2_1")
+        event.cancel()
+    }
+
+    @SubscribeEvent
+    fun onLorenzChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        // IDK what is wrong here, but it does not work with event.message
+        if (!chatPattern.matches((event.chatComponent as? ChatComponentText)?.chatComponentText_TextValue)) return
+        lastChat = SimpleTimeMark.now()
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config && Perk.CHIVALROUS_CARNIVAL.isActive && LorenzUtils.skyBlockArea == "Carnival"
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt
new file mode 100644
index 000000000000..eff7516617b1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt
@@ -0,0 +1,99 @@
+package at.hannibal2.skyhanni.features.event.carnival
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.Perk
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.fame.ReminderUtils
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object CarnivalReminder {
+
+    private val config get() = SkyHanniMod.feature.event.carnival
+    private val storage get() = ProfileStorageData.profileSpecific?.carnival
+
+    private var nextCheckTime = SimpleTimeMark.farFuture()
+
+    private var claimedToday = false
+
+    private var lastClaimedDay
+        get() = storage?.lastClaimedDay
+        set(value) {
+            storage?.lastClaimedDay = value
+        }
+
+    private val repoGroup = RepoPattern.group("carnival.tickets")
+
+    /** REGEX-TEST: §aYou claimed §r§aCarnival Ticket §r§8x25§r§a!
+     */
+    private val ticketClaimedPattern by repoGroup.pattern("claimed", "§aYou claimed §r§aCarnival Ticket §r§8x25§r§a!")
+
+    /** REGEX-TEST: §e[NPC] §aCarnival Leader§f: §rYou've already claimed your §aCarnival Tickets §ffor §btoday§f, but I'm happy to answer any questions you might have.
+     */
+    private val alreadyClaimedPattern by repoGroup.pattern(
+        "already",
+        "§e\\[NPC\\] §aCarnival Leader§f: §rYou've already claimed your §aCarnival Tickets §ffor §btoday§f, but I'm happy to answer any questions you might have.",
+    )
+
+    @SubscribeEvent
+    fun onSecondPassedEvent(event: SecondPassedEvent) {
+        if (!isEnabled() || nextCheckTime.isInFuture()) return
+        check()
+    }
+
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        claimedToday = false
+        if (!isEnabled()) return
+        nextCheckTime = 30.0.seconds.fromNow()
+        checkDate()
+        check()
+    }
+
+    @SubscribeEvent
+    fun onLorenzChat(event: LorenzChatEvent) {
+        if (!isEnabled() && !claimedToday) return
+        if (!ticketClaimedPattern.matches(event.message) && !alreadyClaimedPattern.matches(event.message)) return
+        claimedToday = true
+        lastClaimedDay = ZonedDateTime.now(ZoneOffset.UTC).toLocalDate()
+    }
+
+    private fun checkDate() {
+        val currentDay = ZonedDateTime.now(ZoneOffset.UTC).toLocalDate()
+        val lastClaimedDay = lastClaimedDay
+
+        claimedToday = !(lastClaimedDay == null || currentDay.isAfter(lastClaimedDay))
+    }
+
+    fun check() {
+        if (claimedToday) {
+            checkDate()
+        } else if (!ReminderUtils.isBusy()) {
+            ChatUtils.clickToActionOrDisable(
+                "Carnival Tickets are ready to be claimed!",
+                config::reminderDailyTickets,
+                "warp to The Carnival",
+            ) {
+                HypixelCommands.warp("carnival")
+            }
+            nextCheckTime = 5.0.minutes.fromNow()
+        }
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.reminderDailyTickets && Perk.CHIVALROUS_CARNIVAL.isActive
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
index 176afe8c0860..c148e93e80fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@@ -32,6 +32,10 @@ object HypixelCommands {
         send("recipe $itemName")
     }
 
+    fun npcOption(npc: String, answer: String) {
+        send("selectnpcoption $npc $answer")
+    }
+
     fun warp(warp: String) {
         send("warp $warp")
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/BaseGsonBuilder.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/BaseGsonBuilder.kt
index bc9f706f8c2f..5b3e8c8e1f58 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/BaseGsonBuilder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/BaseGsonBuilder.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import com.google.gson.GsonBuilder
 import io.github.notenoughupdates.moulconfig.observer.PropertyTypeAdapterFactory
 import net.minecraft.item.ItemStack
+import java.time.LocalDate
 import java.util.UUID
 
 object BaseGsonBuilder {
@@ -28,9 +29,10 @@ object BaseGsonBuilder {
         .registerTypeAdapter(IslandType::class.java, SkyHanniTypeAdapters.ISLAND_TYPE.nullSafe())
         .registerTypeAdapter(
             SkyHanniTracker.DefaultDisplayMode::class.java,
-            SkyHanniTypeAdapters.TRACKER_DISPLAY_MODE.nullSafe()
+            SkyHanniTypeAdapters.TRACKER_DISPLAY_MODE.nullSafe(),
         )
         .registerTypeAdapter(SimpleTimeMark::class.java, SkyHanniTypeAdapters.TIME_MARK.nullSafe())
+        .registerTypeAdapter(LocalDate::class.java, SkyHanniTypeAdapters.LOCALE_DATE.nullSafe())
         .enableComplexMapKeySerialization()
 
     fun lenientGson(): GsonBuilder = gson()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
index 7859853ca45f..2048be522061 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
@@ -18,9 +18,11 @@ import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import net.minecraft.item.ItemStack
+import java.time.LocalDate
 import java.util.UUID
 
 object SkyHanniTypeAdapters {
+
     val NEU_ITEMSTACK: TypeAdapter<ItemStack> = SimpleStringTypeAdapter(NEUItems::saveNBTData, NEUItems::loadNBTData)
 
     val UUID: TypeAdapter<UUID> = SimpleStringTypeAdapter(
@@ -72,7 +74,19 @@ object SkyHanniTypeAdapters {
     val ISLAND_TYPE = SimpleStringTypeAdapter.forEnum<IslandType>()
     val RARITY = SimpleStringTypeAdapter.forEnum<LorenzRarity>()
 
-    inline fun <reified T> GsonBuilder.registerTypeAdapter(
+    val LOCALE_DATE = object : TypeAdapter<LocalDate>() {
+        override fun write(out: JsonWriter, value: LocalDate) {
+            out.value(value.toString())
+        }
+
+        override fun read(reader: JsonReader): LocalDate {
+            return LocalDate.parse(reader.nextString())
+        }
+    }
+
+    inline
+
+    fun <reified T> GsonBuilder.registerTypeAdapter(
         crossinline write: (JsonWriter, T) -> Unit,
         crossinline read: (JsonReader) -> T,
     ): GsonBuilder {

From 5e01624dcc315a2bf7665fc808b1113fa4c9e0d8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:23:57 +0200
Subject: [PATCH 456/721] Feature: Graphs Pathfinding (#2468)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |   4 +-
 .../config/features/dev/GraphConfig.java      |   5 +
 .../event/hoppity/HoppityEggsConfig.java      |   6 +
 .../features/misc/AreaNavigationConfig.java   |  32 ++
 .../features/misc/AreaPathfinderConfig.java   |  41 +++
 .../config/features/misc/MiscConfig.java      |   4 +
 .../hannibal2/skyhanni/data/IslandGraphs.kt   | 320 ++++++++++++++++++
 .../at/hannibal2/skyhanni/data/PurseAPI.kt    |   5 +-
 .../at/hannibal2/skyhanni/data/model/Graph.kt |  28 +-
 .../skyhanni/data/repo/RepoManager.kt         |   2 +-
 .../event/diana/GriffinBurrowHelper.kt        |  32 +-
 .../event/hoppity/HoppityEggLocations.kt      |   2 +-
 .../event/hoppity/HoppityEggLocator.kt        |  46 ++-
 .../skyhanni/features/mining/TunnelsMaps.kt   |   1 +
 .../skyhanni/features/misc/IslandAreas.kt     | 290 ++++++++++++++++
 .../at/hannibal2/skyhanni/test/GraphEditor.kt |  18 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  19 +-
 .../hannibal2/skyhanni/utils/LocationUtils.kt |  10 +-
 .../at/hannibal2/skyhanni/utils/LorenzVec.kt  |   6 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |   7 +-
 .../skyhanni/utils/renderables/Searchable.kt  |   5 +-
 .../skyhanni/utils/tracker/SkyHanniTracker.kt |   4 +-
 22 files changed, 820 insertions(+), 67 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaNavigationConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 7a17c14620cd..d0f58f0829d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -33,6 +33,7 @@ import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggLocations
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggLocator
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker
 import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker
@@ -58,8 +59,8 @@ import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
-import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseTracker
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker
+import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseTracker
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
@@ -495,6 +496,7 @@ object Commands {
     private fun developersCodingHelp() {
         registerCommand("shrepopatterns", "See where regexes are loaded from") { RepoPatternGui.open() }
         registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) }
+        registerCommand("shtestrabbitpaths", "Tests pathfinding to rabbit eggs. Use a number 0-14.") { HoppityEggLocator.testPathfind(it) }
         registerCommand(
             "shtestitem",
             "test item internal name resolving",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
index 9a2806f64e01..9eed8233c995 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
@@ -103,4 +103,9 @@ public class GraphConfig {
     @ConfigOption(name = "Shows Stats", desc = "Show funny extra statistics on save. May lag the game a bit.")
     @ConfigEditorBoolean
     public boolean showsStats = true;
+
+    @Expose
+    @ConfigOption(name = "Use as Island Area", desc = "When saving, use the current edited graph as temporary island area for the current island.")
+    @ConfigEditorBoolean
+    public boolean useAsIslandArea = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
index c270dae8bbe7..b438d83f5c3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
@@ -50,6 +50,12 @@ public class HoppityEggsConfig {
     @FeatureToggle
     public boolean showLine = false;
 
+    @Expose
+    @ConfigOption(name = "Show Path Finder", desc = "Show a pathfind to the next hoppity egg.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean showPathFinder = false;
+
     @Expose
     @ConfigOption(name = "Show All Waypoints", desc = "Show all possible egg waypoints for the current lobby. §e" +
         "Only works when you don't have an Egglocator in your inventory.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaNavigationConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaNavigationConfig.java
new file mode 100644
index 000000000000..38a399ed4b20
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaNavigationConfig.java
@@ -0,0 +1,32 @@
+package at.hannibal2.skyhanni.config.features.misc;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class AreaNavigationConfig {
+
+    @Expose
+    @ConfigOption(name = "Area Path Finder", desc = "")
+    @Accordion
+    public AreaPathfinderConfig pathfinder = new AreaPathfinderConfig();
+
+    @Expose
+    @ConfigOption(name = "In World", desc = "Shows the area names in world")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean inWorld = false;
+
+    @Expose
+    @ConfigOption(name = "Small Areas", desc = "Include small areas.")
+    @ConfigEditorBoolean
+    public boolean includeSmallAreas = false;
+
+    @Expose
+    @ConfigOption(name = "Title on Enter", desc = "Sends a titles on screen when entering an area.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enterTitle = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
new file mode 100644
index 000000000000..af9b1de647d1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.config.features.misc;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+
+public class AreaPathfinderConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "While in your invenotry, show all areas of the island. Click on an area to display the path to this area.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Show Always", desc = "Show the list always, not only while inside the inventory.")
+    @ConfigEditorBoolean
+    public boolean showAlways = false;
+
+    @Expose
+    @ConfigOption(name = "Current Area", desc = "Show the name of the current area at the top of the list")
+    @ConfigEditorBoolean
+    public Property<Boolean> includeCurrentArea = Property.of(false);
+
+    @Expose
+    @ConfigOption(
+        name = "Path Color",
+        desc = "Change the color of the path."
+    )
+    @ConfigEditorColour
+    public Property<String> color = Property.of("0:245:85:255:85");
+
+    @Expose
+    @ConfigLink(owner = AreaPathfinderConfig.class, field = "enabled")
+    public Position position = new Position(20, 20);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index f3b9ab16e922..03b0bf779f61 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -42,6 +42,10 @@ public class MiscConfig {
     @Category(name = "Stranded", desc = "Features for the Stranded game mode.")
     public StrandedConfig stranded = new StrandedConfig();
 
+    @Expose
+    @Category(name = "Area Navigation", desc = "Helps navigate to different areas on the current island.")
+    public AreaNavigationConfig areaNavigation = new AreaNavigationConfig();
+
     @ConfigOption(name = "Hide Armor", desc = "")
     @Accordion
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
new file mode 100644
index 000000000000..02a065abe63a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -0,0 +1,320 @@
+package at.hannibal2.skyhanni.data
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.model.Graph
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
+import at.hannibal2.skyhanni.data.repo.RepoUtils
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.misc.IslandAreas
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
+import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
+import at.hannibal2.skyhanni.utils.RenderUtils.draw3DPathWithWaypoint
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+import java.io.File
+import kotlin.math.abs
+
+/**
+ * TODO
+ * benefits of every island graphs:
+ * global:
+ * 	NEU's fairy souls
+ * 	point of interest
+ * 	slayer area
+ * 	NEU's NPC's
+ * 	races (end, park, winter, dungeon hub)
+ * 	jump pads between servers
+ * 	ring of love/romeo juliet quest
+ * 	death location
+ * hub:
+ * 	12 starter NPC's
+ * 	diana
+ * farming:
+ * 	pelt farming
+ * rift:
+ * 	enigma souls
+ * 	eyes
+ * 	big quests
+ * spider:
+ * 	relicts + throw spot
+ * dwarven mines:
+ * 	emissary
+ * 	commssion areas
+ * 	events: raffle, goblin slayer, donpieresso
+ * deep
+ * 	path to the bottom
+ * end
+ * 	golem spawn
+ * 	dragon death spot
+ * crimson
+ *  vanquisher path
+ *  area mini bosses
+ *  daily quests
+ *  intro tutorials with elle
+ *
+ * graph todo:
+ * 	fix rename not using tick but input event we have (+ create the input event in the first place)
+ * 	toggle distance to node by node path lengh, instead of eye of sight lenght
+ * 	press test button again to enable "true test mode", with graph math and hiding other stuff
+ * 	option to compare two graphs, and store multiple graphs in the edit mode in paralell
+ */
+
+@SkyHanniModule
+object IslandGraphs {
+    var currentIslandGraph: Graph? = null
+
+    val existsForThisIsland get() = currentIslandGraph != null
+
+    var closedNote: GraphNode? = null
+
+    private var currentTarget: LorenzVec? = null
+    private var color = Color.WHITE
+    private var showGoalExact = false
+    private var onFound: () -> Unit = {}
+    private var goal: GraphNode? = null
+        set(value) {
+            prevGoal = field
+            field = value
+        }
+    private var prevGoal: GraphNode? = null
+
+    private var fastestPath: Graph? = null
+    private var condition: () -> Boolean = { true }
+
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+
+        reloadFromJson(LorenzUtils.skyBlockIsland)
+    }
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        reloadFromJson(event.newIsland)
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        reset()
+    }
+
+    private fun reloadFromJson(newIsland: IslandType) {
+        val islandName = newIsland.name
+        val constant = "island_graphs/$islandName"
+        val name = "constants/$constant.json"
+        val jsonFile = File(SkyHanniMod.repo.repoLocation, name)
+        if (!jsonFile.isFile) {
+            currentIslandGraph = null
+            return
+        }
+
+        val graph = RepoUtils.getConstant(SkyHanniMod.repo.repoLocation, constant, Graph.gson, Graph::class.java)
+        setNewGraph(graph)
+    }
+
+    fun setNewGraph(graph: Graph) {
+        reset()
+        currentIslandGraph = graph
+    }
+
+    private fun reset() {
+        closedNote = null
+        currentTarget = null
+        goal = null
+        fastestPath = null
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        val prevClosed = closedNote
+
+        val graph = currentIslandGraph ?: return
+
+        currentTarget?.let {
+            if (it.distanceToPlayer() < 3) {
+                onFound()
+                reset()
+            }
+            if (!condition()) {
+                reset()
+            }
+        }
+
+        val newClosest = if (SkyHanniDebugsAndTests.c == 0.0) {
+            graph.minBy { it.position.distanceSqToPlayer() }
+        } else null
+        if (closedNote == newClosest) return
+        closedNote = newClosest
+        onNewNote()
+        val closest = closedNote ?: return
+        val goal = goal ?: return
+        if (closest == prevClosed) return
+
+        val (path, distance) = graph.findShortestPathAsGraphWithDistance(closest, goal)
+        val first = path.firstOrNull()
+        val second = path.getOrNull(1)
+
+        val playerPosition = LocationUtils.playerLocation()
+        val nodeDistance = first?.let { playerPosition.distance(it.position) } ?: 0.0
+        if (first != null && second != null) {
+            val direct = playerPosition.distance(second.position)
+            val firstPath = first.neighbours[second] ?: 0.0
+            val around = nodeDistance + firstPath
+            if (direct < around) {
+                setFastestPath(Graph(path.drop(1)) to (distance - firstPath + direct))
+                return
+            }
+        }
+        setFastestPath(path to (distance + nodeDistance))
+    }
+
+    private fun setFastestPath(path: Pair<Graph, Double>) {
+        fastestPath = path.takeIf { it.first.isNotEmpty() }?.first
+
+        fastestPath?.let {
+            fastestPath = Graph(cutByMaxDistance(it.nodes, 3.0))
+        }
+    }
+
+    private fun onNewNote() {
+        // TODO create an event
+        IslandAreas.noteMoved()
+    }
+
+    fun stop() {
+        currentTarget = null
+        goal = null
+        fastestPath = null
+    }
+
+    fun pathFind(
+        location: LorenzVec,
+        color: Color = LorenzColor.WHITE.toColor(),
+        onFound: () -> Unit = {},
+        showGoalExact: Boolean = false,
+        condition: () -> Boolean = { true },
+    ) {
+        reset()
+        currentTarget = location
+        this.color = color
+        this.onFound = onFound
+        this.showGoalExact = showGoalExact
+        this.condition = condition
+        val graph = currentIslandGraph ?: return
+        goal = graph.minBy { it.position.distance(currentTarget!!) }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        val path = fastestPath ?: return
+
+        var graph = path
+        graph = skipNodes(graph) ?: graph
+
+        event.draw3DPathWithWaypoint(
+            graph,
+            color,
+            6,
+            true,
+            bezierPoint = 2.0,
+            textSize = 1.0,
+        )
+        val lastNode = graph.nodes.last().position
+        val targetLocation = currentTarget ?: return
+        event.draw3DLine(lastNode.add(0.5, 0.5, 0.5), targetLocation.add(0.5, 0.5, 0.5), color, 4, true)
+
+        if (showGoalExact) {
+            event.drawWaypointFilled(targetLocation, color)
+        }
+    }
+
+    // TODO move into new utils class
+    private fun cutByMaxDistance(nodes: List<GraphNode>, maxDistance: Double): List<GraphNode> {
+        var index = nodes.size * 10
+        val locations = mutableListOf<LorenzVec>()
+        var first = true
+        for (node in nodes) {
+            if (first) {
+                first = false
+            } else {
+                var lastPosition = locations.last()
+                val currentPosition = node.position
+                val vector = (currentPosition - lastPosition).normalize()
+                var distance = lastPosition.distance(currentPosition)
+                while (distance > maxDistance) {
+                    distance -= maxDistance
+                    val nextStepDistance = if (distance < maxDistance / 2) {
+                        (maxDistance + distance) / 2
+                        break
+                    } else maxDistance
+                    val newPosition = lastPosition + (vector * (nextStepDistance))
+                    locations.add(newPosition)
+                    lastPosition = newPosition
+                }
+            }
+            locations.add(node.position)
+        }
+
+        return locations.map { GraphNode(index++, it) }
+    }
+
+    // trying to find a faster node-path, if the future nodes are in line of sight and gratly beneift the current path
+    private fun skipNodes(graph: Graph): Graph? {
+        val closedNode = closedNote ?: return null
+
+        val playerEyeLocation = LocationUtils.playerEyeLocation()
+        val playerY = playerEyeLocation.y - 1
+
+        val distanceToPlayer = closedNode.position.distanceToPlayer()
+        val skipNodeDistance = distanceToPlayer > 8
+        val maxSkipDistance = if (skipNodeDistance) 50.0 else 20.0
+
+        val nodes = graph.nodes
+        val potentialSkip =
+            nodes.lastOrNull { it.position.canBeSeen(maxSkipDistance, -1.0) && abs(it.position.y - playerY) <= 2 }
+                ?: return null
+
+        val angleSkip = if (potentialSkip == nodes.first()) {
+            false
+        } else {
+            val v1 = potentialSkip.position - playerEyeLocation
+            val v2 = nodes.first().position - playerEyeLocation
+            val v = v1.angleInRad(v2)
+            v > 1
+        }
+
+        if (!skipNodeDistance && !angleSkip) return null
+
+        val list = mutableListOf<GraphNode>()
+        list.add(potentialSkip)
+
+        var passed = false
+        for (node in nodes) {
+            if (passed) {
+                list.add(node)
+            } else {
+                if (node == potentialSkip) {
+                    passed = true
+                }
+            }
+        }
+
+        return Graph(list)
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
index a5a8eb1847bd..0f029a1f2e2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
@@ -19,11 +19,11 @@ object PurseAPI {
     private val patternGroup = RepoPattern.group("data.purse")
     val coinsPattern by patternGroup.pattern(
         "coins",
-        "(§.)*(Piggy|Purse): §6(?<coins>[\\d,.]+)( ?(§.)*\\([+-](?<earned>[\\d,.]+)\\)?|.*)?$"
+        "(§.)*(Piggy|Purse): §6(?<coins>[\\d,.]+)( ?(§.)*\\([+-](?<earned>[\\d,.]+)\\)?|.*)?$",
     )
     val piggyPattern by patternGroup.pattern(
         "piggy",
-        "Piggy: (?<coins>.*)"
+        "Piggy: (?<coins>.*)",
     )
 
     private var inventoryCloseTime = SimpleTimeMark.farPast()
@@ -54,6 +54,7 @@ object PurseAPI {
                 return PurseChangeCause.GAIN_TALISMAN_OF_COINS
             }
 
+            // TODO relic of coins support
             if (diff == 15.million || diff == 100.million) {
                 return PurseChangeCause.GAIN_DICE_ROLL
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index 21440197d8b0..8c63be891fb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -12,29 +12,29 @@ import java.util.PriorityQueue
 
 @JvmInline
 value class Graph(
-    @Expose val graph: List<GraphNode>,
+    @Expose val nodes: List<GraphNode>,
 ) : List<GraphNode> {
     override val size
-        get() = graph.size
+        get() = nodes.size
 
-    override fun contains(element: GraphNode) = graph.contains(element)
+    override fun contains(element: GraphNode) = nodes.contains(element)
 
-    override fun containsAll(elements: Collection<GraphNode>) = graph.containsAll(elements)
+    override fun containsAll(elements: Collection<GraphNode>) = nodes.containsAll(elements)
 
-    override fun get(index: Int) = graph.get(index)
+    override fun get(index: Int) = nodes.get(index)
 
-    override fun isEmpty() = graph.isEmpty()
+    override fun isEmpty() = nodes.isEmpty()
 
-    override fun indexOf(element: GraphNode) = graph.indexOf(element)
+    override fun indexOf(element: GraphNode) = nodes.indexOf(element)
 
-    override fun iterator(): Iterator<GraphNode> = graph.iterator()
-    override fun listIterator() = graph.listIterator()
+    override fun iterator(): Iterator<GraphNode> = nodes.iterator()
+    override fun listIterator() = nodes.listIterator()
 
-    override fun listIterator(index: Int) = graph.listIterator(index)
+    override fun listIterator(index: Int) = nodes.listIterator(index)
 
-    override fun subList(fromIndex: Int, toIndex: Int) = graph.subList(fromIndex, toIndex)
+    override fun subList(fromIndex: Int, toIndex: Int) = nodes.subList(fromIndex, toIndex)
 
-    override fun lastIndexOf(element: GraphNode) = graph.lastIndexOf(element)
+    override fun lastIndexOf(element: GraphNode) = nodes.lastIndexOf(element)
 
     companion object {
         val gson = GsonBuilder().setPrettyPrinting().registerTypeAdapter<Graph>(
@@ -142,6 +142,10 @@ value class Graph(
 // The node object that gets parsed from/to json
 class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null, val tagNames: List<String>? = null) {
 
+    val tags: List<GraphNodeTag> by lazy {
+        tagNames?.mapNotNull { GraphNodeTag.byId(it) } ?: emptyList()
+    }
+
     /** Keys are the neighbours and value the edge weight (e.g. Distance) */
     lateinit var neighbours: Map<GraphNode, Double>
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index 551f4469947a..ec6f0cbd9ebe 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -34,7 +34,7 @@ class RepoManager(private val configLocation: File) {
 
     private val gson get() = ConfigManager.gson
     private var latestRepoCommit: String? = null
-    private val repoLocation: File = File(configLocation, "repo")
+    val repoLocation: File = File(configLocation, "repo")
     private var error = false
     private var lastRepoUpdate = SimpleTimeMark.farPast()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 35a783f7d93f..aa58c3c0f43f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -49,17 +49,16 @@ object GriffinBurrowHelper {
 
     private val config get() = SkyHanniMod.feature.event.diana
 
-    private val allowedBlocksAboveGround =
-        listOf(
-            Blocks.air,
-            Blocks.leaves,
-            Blocks.leaves2,
-            Blocks.tallgrass,
-            Blocks.double_plant,
-            Blocks.red_flower,
-            Blocks.yellow_flower,
-            Blocks.spruce_fence
-        )
+    private val allowedBlocksAboveGround = listOf(
+        Blocks.air,
+        Blocks.leaves,
+        Blocks.leaves2,
+        Blocks.tallgrass,
+        Blocks.double_plant,
+        Blocks.red_flower,
+        Blocks.yellow_flower,
+        Blocks.spruce_fence,
+    )
 
     var targetLocation: LorenzVec? = null
     private var guessLocation: LorenzVec? = null
@@ -134,7 +133,14 @@ object GriffinBurrowHelper {
             }
             locations.addAll(InquisitorWaypointShare.waypoints.values.map { it.location })
         }
-        targetLocation = locations.minByOrNull { it.distanceToPlayer() }
+        val newLocation = locations.minByOrNull { it.distanceToPlayer() }
+        if (targetLocation != newLocation) {
+            targetLocation = newLocation
+            // add island graphs here some day when the hub is fully added in the graph
+//             newLocation?.let {
+//                 IslandGraphs.find(it)
+//             }
+        }
 
         if (config.burrowNearestWarp) {
             targetLocation?.let {
@@ -401,7 +407,7 @@ object GriffinBurrowHelper {
             if (currentMayor != Mayor.DIANA) {
                 ChatUtils.chatAndOpenConfig(
                     "§cSelect Diana as mayor overwrite!",
-                    SkyHanniMod.feature.dev.debug::assumeMayor
+                    SkyHanniMod.feature.dev.debug::assumeMayor,
                 )
 
             } else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
index cce0aef79755..8962208424e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
@@ -30,7 +30,7 @@ object HoppityEggLocations {
             ChocolateFactoryAPI.profileStorage?.collectedEggLocations = value
         }
 
-    private var apiEggLocations: Map<IslandType, Map<String, LorenzVec>> = mapOf()
+    var apiEggLocations: Map<IslandType, Map<String, LorenzVec>> = mapOf()
 
     val islandLocations
         get() = apiEggLocations[LorenzUtils.skyBlockIsland]?.values?.toSet() ?: emptySet()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index d15d43d8109e..0d5bfefa8878 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -19,6 +20,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RecalculatingValue
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
@@ -154,8 +156,7 @@ object HoppityEggLocator {
     }
 
     private fun LorenzRenderWorldEvent.drawEggWaypoint(location: LorenzVec, label: String) {
-        val shouldMarkDuplicate = config.highlightDuplicateEggLocations
-            && HoppityEggLocations.hasCollectedEgg(location)
+        val shouldMarkDuplicate = config.highlightDuplicateEggLocations && HoppityEggLocations.hasCollectedEgg(location)
         val possibleDuplicateLabel = if (shouldMarkDuplicate) "$label §c(Duplicate Location)" else label
         if (!shouldMarkDuplicate) {
             drawWaypointFilled(location, config.waypointColor.toChromaColor(), seeThroughBlocks = true)
@@ -165,8 +166,7 @@ object HoppityEggLocator {
         drawDynamicText(location.add(y = 1), possibleDuplicateLabel, 1.5)
     }
 
-    private fun shouldShowAllEggs() =
-        config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
+    private fun shouldShowAllEggs() = config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
 
     fun eggFound() {
         resetData()
@@ -214,6 +214,7 @@ object HoppityEggLocator {
         if (event.clickType == ClickType.RIGHT_CLICK && item.isLocatorItem) {
             lastClick = SimpleTimeMark.now()
             MythicRabbitPetWarning.check()
+            trySendingGraph()
         }
     }
 
@@ -264,20 +265,29 @@ object HoppityEggLocator {
 
         possibleEggLocations = filteredEggs
 
+        if (drawLocations) return
         drawLocations = true
+
+        trySendingGraph()
+    }
+
+    private fun trySendingGraph() {
+        if (!config.showPathFinder) return
+        val location = possibleEggLocations.firstOrNull() ?: return
+
+        val color = config.waypointColor.toChromaColor()
+
+        IslandGraphs.pathFind(location, color, condition = { config.showPathFinder })
     }
 
-    fun isValidEggLocation(location: LorenzVec): Boolean =
-        HoppityEggLocations.islandLocations.any { it.distance(location) < 5.0 }
+    fun isValidEggLocation(location: LorenzVec): Boolean = HoppityEggLocations.islandLocations.any { it.distance(location) < 5.0 }
 
-    private fun ReceiveParticleEvent.isVillagerParticle() =
-        type == EnumParticleTypes.VILLAGER_HAPPY && speed == 0.0f && count == 1
+    private fun ReceiveParticleEvent.isVillagerParticle() = type == EnumParticleTypes.VILLAGER_HAPPY && speed == 0.0f && count == 1
 
-    private fun ReceiveParticleEvent.isEnchantmentParticle() =
-        type == EnumParticleTypes.ENCHANTMENT_TABLE && speed == -2.0f && count == 10
+    private fun ReceiveParticleEvent.isEnchantmentParticle() = type == EnumParticleTypes.ENCHANTMENT_TABLE && speed == -2.0f && count == 10
 
-    fun isEnabled() = LorenzUtils.inSkyBlock && config.waypoints && !GardenAPI.inGarden() &&
-        !ReminderUtils.isBusy(true) && HoppityAPI.isHoppityEvent()
+    fun isEnabled() =
+        LorenzUtils.inSkyBlock && config.waypoints && !GardenAPI.inGarden() && !ReminderUtils.isBusy(true) && HoppityAPI.isHoppityEvent()
 
     private val ItemStack.isLocatorItem get() = getInternalName() == locatorItem
 
@@ -314,4 +324,16 @@ object HoppityEggLocator {
             add("Current Egg Note: ${currentEggNote ?: "None"}")
         }
     }
+
+    fun testPathfind(args: Array<String>) {
+        val target = args[0].formatInt()
+        HoppityEggLocations.apiEggLocations[LorenzUtils.skyBlockIsland]?.let {
+            for ((i, location) in it.values.withIndex()) {
+                if (i == target) {
+                    IslandGraphs.pathFind(location)
+                    return
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index afe5694b1f56..8d7f771b7223 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -447,6 +447,7 @@ object TunnelsMaps {
             true,
             bezierPoint = 2.0,
             textSize = config.textSize.toDouble(),
+            showNoteNames = true,
         )
         event.drawDynamicText(
             if (config.distanceFirst) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
new file mode 100644
index 000000000000..c5c0071f95da
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -0,0 +1,290 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.model.Graph
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.GraphNodeTag
+import at.hannibal2.skyhanni.data.model.TextInput
+import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.EntityMoveEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.buildSearchBox
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object IslandAreas {
+    private val config get() = SkyHanniMod.feature.misc.areaNavigation
+
+    private var nodes = mapOf<GraphNode, Double>()
+    private var paths = mapOf<GraphNode, Graph>()
+    private var display: Renderable? = null
+    private var targetNode: GraphNode? = null
+    private var currentAreaName = ""
+    private val textInput = TextInput()
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        nodes = emptyMap()
+        display = null
+        targetNode = null
+        hasMoved = true
+    }
+
+    fun noteMoved() {
+        updateNodes()
+    }
+
+    private fun updateNodes() {
+        if (!isEnabled()) return
+        val graph = IslandGraphs.currentIslandGraph ?: return
+        val closedNote = IslandGraphs.closedNote ?: return
+
+        val paths = mutableMapOf<GraphNode, Graph>()
+
+        val map = mutableMapOf<GraphNode, Double>()
+        for (graphNode in graph.nodes) {
+            if (graphNode.getAreaTag() == null) continue
+            val (path, distance) = graph.findShortestPathAsGraphWithDistance(closedNote, graphNode)
+            paths[graphNode] = path
+            map[graphNode] = distance
+        }
+        this.paths = paths
+
+        val finalNodes = mutableMapOf<GraphNode, Double>()
+
+        val alreadyFoundAreas = mutableListOf<String>()
+        for ((node, distance) in map.sorted()) {
+            val areaName = node.name ?: continue
+            if (areaName in alreadyFoundAreas) continue
+            alreadyFoundAreas.add(areaName)
+
+            finalNodes[node] = distance
+        }
+
+        nodes = finalNodes
+    }
+
+    var hasMoved = false
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!IslandGraphs.existsForThisIsland) return
+
+        if (event.isMod(2) && hasMoved) {
+            hasMoved = false
+            updatePosition()
+        }
+    }
+
+    @SubscribeEvent
+    fun onPlayerMove(event: EntityMoveEvent) {
+        if (isEnabled()) {
+            if (event.entity == Minecraft.getMinecraft().thePlayer) {
+                hasMoved = true
+            }
+        }
+    }
+
+    private fun updatePosition() {
+        display = buildDisplay().buildSearchBox(textInput)
+    }
+
+    @SubscribeEvent
+    fun onOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (!config.pathfinder.enabled) return
+        if (!config.pathfinder.showAlways) return
+
+        display?.let {
+            config.pathfinder.position.renderRenderable(it, posLabel = "Island Areas")
+        }
+    }
+
+    @SubscribeEvent
+    fun onOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (!config.pathfinder.enabled) return
+
+        display?.let {
+            config.pathfinder.position.renderRenderable(it, posLabel = "Island Areas")
+        }
+    }
+
+    private fun buildDisplay() = buildList<Searchable> {
+        val closedNote = IslandGraphs.closedNote ?: return@buildList
+        val playerDiff = closedNote.position.distanceToPlayer()
+
+        var foundCurrentArea = false
+        var foundAreas = 0
+
+        for ((node, diff) in nodes) {
+            val difference = diff + playerDiff
+            val tag = node.getAreaTag() ?: continue
+
+            val name = node.name ?: continue
+            // can not compare nodes directly. By using names, we also accept other nodes
+            val isTarget = node.name == targetNode?.name
+            val color = if (isTarget) LorenzColor.GOLD else tag.color
+
+            // trying to find a faster path to the existing target
+            if (isTarget && node != targetNode) {
+                ChatUtils.debug("Found a faster node, rerouting...")
+                setTarget(node)
+            }
+            val coloredName = "${color.getChatColor()}${name}"
+
+            var suffix = ""
+            paths[node]?.let { path ->
+                val passedAreas = path.nodes.filter { it.getAreaTag() != null }.map { it.name }.distinct().toMutableList()
+                passedAreas.remove(name)
+                passedAreas.remove(null)
+                passedAreas.remove("null")
+                passedAreas.remove(currentAreaName)
+                // so show areas needed to pass thorough
+                if (passedAreas.isNotEmpty()) {
+//                     suffix = " §7${passedAreas.joinToString(", ")}"
+                }
+            }
+
+            val distance = difference.round(1)
+            val text = "${coloredName}§7: §e$distance$suffix"
+
+            if (!foundCurrentArea) {
+                foundCurrentArea = true
+
+                val inAnArea = name != "no_area"
+                if (config.pathfinder.includeCurrentArea.get()) {
+                    if (inAnArea) {
+                        addSearchString("§eCurrent area: $coloredName")
+                    } else {
+                        addSearchString("§7Not in an area.")
+                    }
+                }
+                if (name != currentAreaName) {
+                    if (inAnArea && config.enterTitle) {
+                        LorenzUtils.sendTitle("§aEntered $name!", 3.seconds)
+                    }
+                    currentAreaName = name
+                }
+
+                addSearchString("§eAreas nearby:")
+                continue
+            }
+
+            if (name == "no_area") continue
+            foundAreas++
+
+            add(
+                Renderable.clickAndHover(
+                    text,
+                    tips = buildList {
+                        add(tag.color.getChatColor() + node.name)
+                        add("§7Type: ${tag.displayName}")
+                        add("§7Distance: §e$distance blocks")
+                        add("")
+                        if (node == targetNode) {
+                            add("§aPath Finder points to this!")
+                            add("")
+                            add("§eClick to disable!")
+                        } else {
+                            add("§eClick to find a path!")
+                        }
+                    },
+                    onClick = {
+                        if (node == targetNode) {
+                            targetNode = null
+                            IslandGraphs.stop()
+                            updatePosition()
+                        } else {
+                            setTarget(node)
+                        }
+                    },
+                ).toSearchable(name),
+            )
+        }
+        if (foundAreas == 0) {
+            val islandName = LorenzUtils.skyBlockIsland.displayName
+            if (foundCurrentArea) {
+                addSearchString("§cThere is only one area in $islandName,")
+                addSearchString("§cnothing else to navigate to!")
+            } else {
+                addSearchString("§cThere is no $islandName area data avaliable yet!")
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.inWorld) return
+        for ((node, distance) in nodes) {
+            val name = node.name ?: continue
+            if (name == currentAreaName) continue
+            if (name == "no_area") continue
+            val position = node.position
+            val color = node.getAreaTag()?.color?.getChatColor() ?: ""
+            if (!position.canBeSeen(40.0)) return
+            event.drawDynamicText(position, color + name, 1.5)
+        }
+    }
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        ConditionalUtils.onToggle(config.pathfinder.color) {
+            targetNode?.let {
+                setTarget(it)
+            }
+        }
+        ConditionalUtils.onToggle(config.pathfinder.color, config.pathfinder.includeCurrentArea) {
+            updateNodes()
+            updatePosition()
+        }
+    }
+
+    private val allAreas = listOf(GraphNodeTag.AREA, GraphNodeTag.SMALL_AREA)
+    private val onlyLargeAreas = listOf(GraphNodeTag.AREA)
+
+    private fun GraphNode.getAreaTag(): GraphNodeTag? = tags.firstOrNull {
+        it in (if (config.includeSmallAreas) allAreas else onlyLargeAreas)
+    }
+
+    private fun setTarget(node: GraphNode) {
+        targetNode = node
+        val color = config.pathfinder.color.get().toChromaColor()
+        IslandGraphs.pathFind(
+            node.position, color,
+            onFound = {
+                targetNode = null
+                updatePosition()
+            },
+            condition = { config.pathfinder.enabled },
+        )
+        hasMoved = true
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && config.let { it.pathfinder.enabled || it.enterTitle || it.inWorld }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index e720b57cacb6..81a85283e828 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.test
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
@@ -39,6 +40,7 @@ import at.hannibal2.skyhanni.utils.renderables.buildSearchableScrollable
 import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import kotlinx.coroutines.runBlocking
 import net.minecraft.client.settings.KeyBinding
+import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import java.awt.Color
@@ -104,12 +106,12 @@ object GraphEditor {
     private val edgeDijkstraColor = LorenzColor.DARK_BLUE.addOpacity(150)
     private val edgeSelectedColor = LorenzColor.DARK_RED.addOpacity(150)
 
-    val scrollValue = ScrollValue()
-    val textInput = TextInput()
-    var nodesDisplay = emptyList<Searchable>()
+    private val scrollValue = ScrollValue()
+    private val textInput = TextInput()
+    private var nodesDisplay = emptyList<Searchable>()
     var lastUpdate = SimpleTimeMark.farPast()
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRender(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
         nodes.forEach { event.drawNode(it) }
@@ -196,7 +198,7 @@ object GraphEditor {
                 val list = getNodeNames()
                 val size = list.size
                 addString("§eGraph Nodes: $size")
-                val height = (size * 10).coerceAtMost(150)
+                val height = (size * 10).coerceAtMost(250)
                 if (list.isNotEmpty()) {
                     add(list.buildSearchableScrollable(height, textInput, scrollValue, velocity = 10.0))
                 }
@@ -537,7 +539,11 @@ object GraphEditor {
             ChatUtils.chat("Copied nothing since the graph is empty.")
             return
         }
-        val json = compileGraph().toJson()
+        val compileGraph = compileGraph()
+        if (config.useAsIslandArea) {
+            IslandGraphs.setNewGraph(compileGraph)
+        }
+        val json = compileGraph.toJson()
         OSUtils.copyToClipboard(json)
         ChatUtils.chat("Copied Graph to Clipboard.")
         if (config.showsStats) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index d3a5e0bceb16..9e95df881225 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.core.config.Position
 import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.events.GuiKeyPressEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -120,12 +121,17 @@ object SkyHanniDebugsAndTests {
         val x = args[0].toDouble()
         val y = args[1].toDouble()
         val z = args[2].toDouble()
-        testLocation = LorenzVec(x, y, z)
+        val location = LorenzVec(x, y, z)
+        testLocation = location
+        if (args.getOrNull(3) == "pathfind") {
+            IslandGraphs.pathFind(location)
+        }
         ChatUtils.chat("set test waypoint")
     }
 
     fun testCommand(args: Array<String>) {
-        SoundUtils.playBeepSound()
+
+
 //            val a = Thread { OSUtils.copyToClipboard("123") }
 //            val b = Thread { OSUtils.copyToClipboard("456") }
 //            a.start()
@@ -509,8 +515,7 @@ object SkyHanniDebugsAndTests {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
-        @Suppress("ConstantConditionIf")
-        if (false) {
+        @Suppress("ConstantConditionIf") if (false) {
             itemRenderDebug()
         }
 
@@ -545,8 +550,7 @@ object SkyHanniDebugsAndTests {
 
     @SubscribeEvent
     fun onGuiRenderChestGuiOverlayRender(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
-        @Suppress("ConstantConditionIf")
-        if (false) {
+        @Suppress("ConstantConditionIf") if (false) {
             dragAbleTest()
         }
     }
@@ -594,8 +598,7 @@ object SkyHanniDebugsAndTests {
         }.editCopy {
             this.add(
                 0,
-                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.round(1).toString()) }
-                    .toList(),
+                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.round(1).toString()) }.toList(),
             )
         }
         config.debugItemPos.renderRenderables(
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
index ba82321f2dd8..34aa3f22f303 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
@@ -8,7 +8,11 @@ import kotlin.math.min
 
 object LocationUtils {
 
-    fun canSee(a: LorenzVec, b: LorenzVec) =
+    fun canSee(a: LorenzVec, b: LorenzVec, offset: Double? = null): Boolean {
+        return canSee0(a, b) && offset?.let { canSee0(a.add(y = it), b.add(y = it)) } ?: true
+    }
+
+    private fun canSee0(a: LorenzVec, b: LorenzVec) =
         Minecraft.getMinecraft().theWorld.rayTraceBlocks(a.toVec3(), b.toVec3(), false, true, false) == null
 
     fun playerLocation() = Minecraft.getMinecraft().thePlayer.getLorenzVec()
@@ -38,10 +42,10 @@ object LocationUtils {
 
     fun AxisAlignedBB.isPlayerInside() = isInside(playerLocation())
 
-    fun LorenzVec.canBeSeen(radius: Double = 150.0): Boolean {
+    fun LorenzVec.canBeSeen(radius: Double = 150.0, offset: Double? = null): Boolean {
         val a = playerEyeLocation()
         val b = this
-        val noBlocks = canSee(a, b)
+        val noBlocks = canSee(a, b, offset)
         val notTooFar = a.distance(b) < radius
         val inFov = true // TODO add Frustum "Frustum().isBoundingBoxInFrustum(entity.entityBoundingBox)"
         return noBlocks && notTooFar && inFov
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 4a50d79f3af0..51bb8b72cd81 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -74,13 +74,13 @@ data class LorenzVec(
 
     override fun toString() = "LorenzVec{x=$x, y=$y, z=$z}"
 
-    @Deprecated("Use operator fun times instead", ReplaceWith("this * LorenzVec(x, y, z)"))
+    @Deprecated("Use operator fun times instead", ReplaceWith("this * d"))
     fun multiply(d: Double): LorenzVec = LorenzVec(x * d, y * d, z * d)
 
-    @Deprecated("Use operator fun times instead", ReplaceWith("this * LorenzVec(x, y, z)"))
+    @Deprecated("Use operator fun times instead", ReplaceWith("this * d"))
     fun multiply(d: Int): LorenzVec = LorenzVec(x * d, y * d, z * d)
 
-    @Deprecated("Use operator fun times instead", ReplaceWith("this * LorenzVec(x, y, z)"))
+    @Deprecated("Use operator fun times instead", ReplaceWith("this * v"))
     fun multiply(v: LorenzVec) = LorenzVec(x * v.x, y * v.y, z * v.z)
 
     fun dotProduct(other: LorenzVec): Double = (x * other.x) + (y * other.y) + (z * other.z)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 3442032e6eac..08532e0c4eec 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -1269,6 +1269,7 @@ object RenderUtils {
         waypointColor: Color =
             (path.lastOrNull()?.name?.getFirstColorCode()?.toLorenzColor() ?: LorenzColor.WHITE).toColor(),
         bezierPoint: Double = 1.0,
+        showNoteNames: Boolean = false
     ) {
         if (path.isEmpty()) return
         val points = if (startAtEye) {
@@ -1290,8 +1291,10 @@ object RenderUtils {
                 bezierPoint,
             )
         }
-        path.filter { it.name?.isNotEmpty() == true }.forEach {
-            this.drawDynamicText(it.position, it.name!!, textSize)
+        if (showNoteNames) {
+            path.filter { it.name?.isNotEmpty() == true }.forEach {
+                this.drawDynamicText(it.position, it.name!!, textSize)
+            }
         }
         val last = path.last()
         drawWaypointFilled(last.position, waypointColor, seeThroughBlocks = true)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
index 8ce7c5ec242d..4a81830a8728 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
@@ -10,8 +10,9 @@ fun Searchable.toRenderable() = renderable
 fun List<Searchable>.toRenderable() = map { it.toRenderable() }
 fun List<Searchable>.toMap() = associate { it.renderable to it.string }
 val searchPrefix = "§eSearch: §7"
-fun List<Searchable>.buildSearchBox(): Renderable {
-    val textInput = TextInput()
+fun List<Searchable>.buildSearchBox(
+    textInput: TextInput,
+): Renderable {
     val key = 0
     return Renderable.searchBox(
         Renderable.verticalSearchableContainer(toMap(), textInput = textInput, key = key + 1),
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index 7810c1ee6392..a6d42839cdb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.core.config.Position
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.TrackerManager
+import at.hannibal2.skyhanni.data.model.TextInput
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -36,6 +37,7 @@ open class SkyHanniTracker<Data : TrackerData>(
     private var display = emptyList<Renderable>()
     private var sessionResetTime = SimpleTimeMark.farPast()
     private var dirty = false
+    private val textInput = TextInput()
 
     companion object {
 
@@ -85,7 +87,7 @@ open class SkyHanniTracker<Data : TrackerData>(
             display = getSharedTracker()?.let {
                 val data = it.get(getDisplayMode())
                 val searchables = drawDisplay(data)
-                buildFinalDisplay(searchables.buildSearchBox())
+                buildFinalDisplay(searchables.buildSearchBox(textInput))
             } ?: emptyList()
             dirty = false
         }

From 7160089c812f97929105878d5b3c91e48066e9db Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:55:05 +0200
Subject: [PATCH 457/721] changed default position

---
 .../skyhanni/config/features/misc/AreaPathfinderConfig.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
index af9b1de647d1..ed8bda18f4de 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/AreaPathfinderConfig.java
@@ -37,5 +37,5 @@ public class AreaPathfinderConfig {
 
     @Expose
     @ConfigLink(owner = AreaPathfinderConfig.class, field = "enabled")
-    public Position position = new Position(20, 20);
+    public Position position = new Position(-350, 100);
 }

From c20e817af5cd0e297c2414adab6ffee46b88bb90 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sat, 14 Sep 2024 09:04:56 +0200
Subject: [PATCH 458/721] Fix: Zombie Shootout QOL (#2507)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/carnival/ZombieShootoutConfig.java |  8 ++++----
 .../features/event/carnival/CarnivalZombieShootout.kt | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
index 5709e7e58d31..e65fc4c8a196 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/carnival/ZombieShootoutConfig.java
@@ -21,14 +21,14 @@ public class ZombieShootoutConfig {
     public boolean coloredHitboxes = true;
 
     @Expose
-    @ConfigOption(name = "Colored Lines", desc = "Display a colored line to lamps.")
+    @ConfigOption(name = "Highest Only", desc = "Only draw colored hitboxes for the highest scoring zombies.")
     @ConfigEditorBoolean
-    public boolean coloredLines = true;
+    public boolean highestOnly = false;
 
     @Expose
-    @ConfigOption(name = "Highest Only", desc = "Only draw colored hitboxes/lines for the highest scoring zombies.")
+    @ConfigOption(name = "Colored Line", desc = "Display a colored line to lamps.")
     @ConfigEditorBoolean
-    public boolean highestOnly = false;
+    public boolean coloredLines = true;
 
     @Expose
     @ConfigOption(name = "Lamp Timer", desc = "Show time until current lamp disappears.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index cae5cbda1f91..d57903a57949 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -61,9 +61,9 @@ object CarnivalZombieShootout {
     )
 
     enum class ZombieType(val points: Int, val helmet: String, val color: Color) {
-        LEATHER(30, "Leather Cap", Color(165, 42, 42)),  //Brown
-        IRON(50, "Iron Helmet", Color(192, 192, 192)),  //Silver
-        GOLD(80, "Golden Helmet", Color(255, 215, 0)),  //Gold
+        LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown
+        IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver
+        GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold
         DIAMOND(120, "Diamond Helmet", Color(185, 242, 255)) //Diamond
     }
 
@@ -86,7 +86,10 @@ object CarnivalZombieShootout {
                 zombie to type
             }.toMap()
 
-            drawZombies = nearbyZombies.filterValues { it == nearbyZombies.values.maxByOrNull { it.points } }
+            drawZombies =
+                if (config.highestOnly) nearbyZombies.filterValues { zombieType -> zombieType == nearbyZombies.values.maxByOrNull { it.points } }
+                else nearbyZombies
+
             lastUpdate.zombie = SimpleTimeMark.now()
         }
 

From 46e19de23b6070456d17ff41b382987ad0c829b3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 14 Sep 2024 09:28:57 +0200
Subject: [PATCH 459/721] Version 0.27 Beta 8

---
 docs/CHANGELOG.md                             | 72 +++++++++++++++----
 docs/FEATURES.md                              | 29 ++++++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d7172fe55739..76181dcf78b5 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -14,6 +14,8 @@
 #### Mining Features
 
 + Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
++ Added Tracker for Glacite Corpses. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
+    + Tracks overall loot and loot per type.
 
 #### Rift Features
 
@@ -45,6 +47,15 @@
 + Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 + Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 
+#### The Carnival Features
+
++ Added a Reminder to claim Carnival Tickets. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added display for Carnival Goals. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added Zombie Shootout QoL improvements for the Carnival. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2497)
+    + Colored hitboxes.
+    + Lamp timer + line.
+
 #### GUI Features
 
 + Added Editable XP Bar. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1944)
@@ -68,6 +79,7 @@
     + Shows what items are currently inside the personal compactor/deletor, and whether the accessory is turned on or off.
 + Added Accessory magical power display as stack size. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2243)
     + Only works inside the Accessory Bag and Auction House.
++ Added `/gfs` to fix a broken Piggy Bank. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2150)
 
 #### Chat Features
 
@@ -95,12 +107,32 @@
 
 + Added Arachne Kill Timer. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/1993)
     + Shows how long it took to kill Arachne when the fight ends.
++ Added Broodmother spawn alert, countdown and stage change messages. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
+    + Countdown will not show until a spawning stage change is observed, and may be off by a few seconds.
++ Added Broodmother support to the Damage Indicator. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
+
+#### Fishing Features
+
++ Added Golden Fish Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1941)
+    + Includes an option to warn you when to throw your rod.
+    + Shows how weak the golden fish is, as a nametag.
+    + Also works on Stranded.
 
 #### Misc Features
 
 + Added a notification when you join a server you have joined previously. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2046)
 + Added warning when Non-God Pot effects are about to expire. - saga (https://github.com/hannibal002/SkyHanni/pull/2004)
     + Sends a title and plays a sound at a customizable time before the effect expires.
++ Added Area Navigation. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2468)
+    + Reused the logic from the Tunnel Maps Graphs (Glacite Tunnels), now applied to other islands.
+    + Displays a list of all areas on your current island. Click on a name to find a path to that area via pathfinding.
+    + Find a route to the Hoppity egg. Useful for islands with small, nested corridors.
+    + Get a title warning when entering an area.
+    + See area names in the world.
+    + Does not yet work with Spider's Den and Dungeon Hub. Only partial support for Farming Islands and the Rift.
++ Added option to hide pet nametag text. - Empa + j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1880)
++ Added Transfer Cooldown Prevention. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/1751)
+    + Wait for the transfer cooldown to complete before sending commands like warp/is/hub.
 
 ### Improvements
 
@@ -157,6 +189,7 @@
 #### Hoppity Improvements
 
 + Added config option to disable rarity in Compact Hoppity messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
++ Chocolate Factory: Shows "time to next milestone" instead of "max milestone" when you are at Prestige 6. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2503)
 
 #### Combat Improvements
 
@@ -181,6 +214,10 @@
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
 
+#### Dungeon Improvements
+
++ Added dungeon stars and crimson stars to estimated item value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2492)
+
 #### Misc Improvements
 
 + Updated Last Server to also alert for servers you have just left. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2494)
@@ -215,6 +252,7 @@
 + Fixed skull sizes inside the Personal Compactor Overlay. - Empa (https://github.com/hannibal002/SkyHanni/pull/2486)
 + Fixed the Auction House Price Comparison appearing in your own inventory as well. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2483)
 + Fixed "click to show tunnel map" from the Glacite Mines commission menu appearing in the inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2485)
++ Fixed Mouse Keys not working as Wardrobe Slot Hotkeys. - j10a1n15, ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2506)
 
 #### Mining Fixes
 
@@ -251,18 +289,6 @@
 + Fixed minor formatting issues with Hoppity Event Summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2416)
 + Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
 
-#### Misc Fixes
-
-+ Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
-+ Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
-+ Fixed Christmas presents in the Hypixel lobby being visible outside of December. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2396)
-+ Fixed the mod crashing on startup when the game directory path contains a "!". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2427)
-+ Fixed chat formatting for coin drops in profit trackers (Diana, Slayer, Fishing, Pest). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2444)
-+ Fixed Last Server Time Slider not functioning. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2440)
-+ Fixed warning sounds being stuttered and cutting out. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2482)
-+ Fixed an internal bug with `getItemName` that caused the `NEUInternalName.NONE has no name!` error messages to appear. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2471)
-+ Fixed a typo in mob detection config. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2472)
-
 #### Chat Fixes
 
 + Fixed an error with Patcher Coordinate Detection from chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2410)
@@ -283,6 +309,25 @@
 + Fixed the reputation helper not updating after a sack update. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2439)
 + Fixed Heavy Pearls sometimes not being highlighted. - Luna (https://github.com/hannibal002/SkyHanni/pull/2479)
 
+#### Garden Fixes
+
++ Fixed outdated Dicer gemstone fortune in FF guide. - Not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2499)
+
+#### Misc Fixes
+
++ Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
++ Updated Derpy's extra tax perk to use the correct name. - Luna (https://github.com/hannibal002/SkyHanni/pull/2393)
++ Fixed Christmas presents in the Hypixel lobby being visible outside of December. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2396)
++ Fixed the mod crashing on startup when the game directory path contains a "!". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2427)
++ Fixed chat formatting for coin drops in profit trackers (Diana, Slayer, Fishing, Pest). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2444)
++ Fixed Last Server Time Slider not functioning. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2440)
++ Fixed warning sounds being stuttered and cutting out. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2482)
++ Fixed an internal bug with `getItemName` that caused the `NEUInternalName.NONE has no name!` error messages to appear. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2471)
++ Fixed a typo in mob detection config. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2472)
++ Fixed performance issues with a high number of dungeon runs in one session. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2504)
++ Fixed `/shedittracker duplex` not working. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2501)
++ Fixed "Last Server Joined" spamming the chat. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2495)
+
 ### Technical Details
 
 + Cleaned up IslandExceptions to improve readability. - walker (https://github.com/hannibal002/SkyHanni/pull/1560)
@@ -318,6 +363,9 @@
 + Added perk descriptions to mayor perks. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
     + These are loaded when checking the active mayor/minister from the API, so most of the perks will initially have no description.
 + Added a method to override an ItemStack's lore. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
++ Updated HandleEvent onlyOnIslands to handle multiple islands. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2502)
++ Added an abstract "bucketed" tracker that can store where items came from. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
+    + Takes an enum in instantiation and has built-in logic for swapping display types.
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index c12bee86ac0d..a96ca8fc2640 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -365,6 +365,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Option to show only when wearing a full hunter armor set.
     + Options to show checkmarks or crosses instead of numbers.
     + Hover over a trophy fish to see the percentage caught and how to gain progress.
++ Added Golden Fish Timer. - Empa (https://github.com/hannibal002/SkyHanni/pull/1941)
+    + Includes an option to warn you when to throw your rod.
+    + Shows how weak the golden fish is, as a nametag.
+    + Also works on Stranded.
 
 </details>
 <details open><summary>
@@ -387,6 +391,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 - Garden Pests in Damage Indicator
 - **Time to Kill**
     - Show the time it takes to kill the Slayer boss.
++ Added Broodmother support to the Damage Indicator. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
 
 + **Vampire Slayer**
     + Show the amount of HP missing until the steak can be used on the vampire slayer on top of the boss.
@@ -892,6 +897,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655)
     + Displays information about Mineshaft spawns, your progress towards a Pity Mineshaft, and more.
 + Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
++ Added Tracker for Glacite Corpses. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
+    + Tracks overall loot and loot per type.
 
 </details>
 <details open><summary>
@@ -983,6 +990,15 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 + Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 
+### The Carnival
+
++ Added a Reminder to claim Carnival Tickets. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added display for Carnival Goals. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added Zombie Shootout QoL improvements for the Carnival. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2497)
+    + Colored hitboxes.
+    + Lamp timer + line.
+
 </details>
 <details open><summary>
 
@@ -1338,6 +1354,19 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Allows the display of information from the Tab (e.g., Bestiary info).
 + Added Accessory magical power display as stack size. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2243)
     + Only works inside the Accessory Bag and Auction House.
++ Added Area Navigation. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2468)
+    + Reused the logic from the Tunnel Maps Graphs (Glacite Tunnels), now applied to other islands.
+    + Displays a list of all areas on your current island. Click on a name to find a path to that area via pathfinding.
+    + Find a route to the Hoppity egg. Useful for islands with small, nested corridors.
+    + Get a title warning when entering an area.
+    + See area names in the world.
+    + Does not yet work with Spider's Den and Dungeon Hub. Only partial support for Farming Islands and the Rift.
++ Added `/gfs` to fix a broken Piggy Bank. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2150)
++ Added Broodmother spawn alert, countdown and stage change messages. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
+    + Countdown will not show until a spawning stage change is observed, and may be off by a few seconds.
++ Added option to hide pet nametag text. - Empa + j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1880)
++ Added Transfer Cooldown Prevention. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/1751)
+    + Wait for the transfer cooldown to complete before sending commands like warp/is/hub.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 6bfee57db573..ebdebe043c9b 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.7"
+    version = "0.27.Beta.8"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 442441825a5c..09a293829e25 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.7",
+    version = "0.27.Beta.8",
 )
 class SkyHanniMod {
 

From a0c5e9c538bd8a083d03c6c3ea312d8b054c84e4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 14 Sep 2024 10:21:32 +0200
Subject: [PATCH 460/721] not so bald anymore

---
 docs/CHANGELOG.md | 6 +++---
 docs/FEATURES.md  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 76181dcf78b5..f42ddfffc477 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -49,9 +49,9 @@
 
 #### The Carnival Features
 
-+ Added a Reminder to claim Carnival Tickets. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
-+ Added display for Carnival Goals. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
-+ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a Reminder to claim Carnival Tickets. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added display for Carnival Goals. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
 + Added Zombie Shootout QoL improvements for the Carnival. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2497)
     + Colored hitboxes.
     + Lamp timer + line.
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index a96ca8fc2640..9c67c0de1246 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -992,9 +992,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 
 ### The Carnival
 
-+ Added a Reminder to claim Carnival Tickets. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
-+ Added display for Carnival Goals. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
-+ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderbalde73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a Reminder to claim Carnival Tickets. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added display for Carnival Goals. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
++ Added a feature to double-click the Carnival NPC to start the game without clicking in the chat. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2498)
 + Added Zombie Shootout QoL improvements for the Carnival. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2497)
     + Colored hitboxes.
     + Lamp timer + line.

From a6ecdbcb42572739d4290bbaca463956c66b20cb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 15 Sep 2024 11:41:48 +0200
Subject: [PATCH 461/721] Improvement: Spade tracker visibility (#2496)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../event/diana/DianaProfitTracker.kt         | 18 ++++++----
 .../diana/MythologicalCreatureTracker.kt      | 34 +++++++++++--------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index b6ec4d0a62e9..fb90de9e118e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -8,9 +8,11 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.event.diana.DianaAPI.isDianaSpade
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
+import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -107,7 +109,7 @@ object DianaProfitTracker {
 
     @SubscribeEvent
     fun onItemAdd(event: ItemAddEvent) {
-        if (!isEnabled()) return
+        if (!(DianaAPI.isDoingDiana() && config.enabled)) return
 
         tryAddItem(event.internalName, event.amount, event.source == ItemAddManager.Source.COMMAND)
     }
@@ -137,9 +139,7 @@ object DianaProfitTracker {
             tryHide(event)
         }
 
-        if (message == "§6§lRARE DROP! §r§eYou dug out a §r§9Griffin Feather§r§e!" ||
-            message == "§eFollow the arrows to find the §r§6treasure§r§e!"
-        ) {
+        if (message == "§6§lRARE DROP! §r§eYou dug out a §r§9Griffin Feather§r§e!" || message == "§eFollow the arrows to find the §r§6treasure§r§e!") {
             BurrowAPI.lastBurrowRelatedChatMessage = SimpleTimeMark.now()
             tryHide(event)
         }
@@ -153,7 +153,13 @@ object DianaProfitTracker {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.enabled) return
+        val spadeInHand = InventoryUtils.getItemInHand()?.isDianaSpade ?: false
+        if (!DianaAPI.isDoingDiana() && !spadeInHand) return
+        if (spadeInHand) {
+            tracker.firstUpdate()
+        }
 
         tracker.renderDisplay(config.position)
     }
@@ -168,6 +174,4 @@ object DianaProfitTracker {
     fun resetCommand() {
         tracker.resetCommand()
     }
-
-    private fun isEnabled() = DianaAPI.isDoingDiana() && config.enabled
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index 3c512d4c4389..55e422caba5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -5,11 +5,13 @@ import at.hannibal2.skyhanni.data.MayorAPI.getElectionYear
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.event.diana.DianaAPI.isDianaSpade
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -90,19 +92,18 @@ object MythologicalCreatureTracker {
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         for (creatureType in MythologicalCreatureType.entries) {
-            if (creatureType.pattern.matches(event.message)) {
-                BurrowAPI.lastBurrowRelatedChatMessage = SimpleTimeMark.now()
-                tracker.modify {
-                    it.count.addOrPut(creatureType, 1)
-
-                    // TODO migrate to abstract feature in the future
-                    if (creatureType == MythologicalCreatureType.MINOS_INQUISITOR) {
-                        event.chatComponent = ChatComponentText(event.message + " §e(${it.creaturesSinceLastInquisitor})")
-                        it.creaturesSinceLastInquisitor = 0
-                    } else it.creaturesSinceLastInquisitor++
-                }
-                if (config.hideChat) event.blockedReason = "mythological_creature_dug"
+            if (!creatureType.pattern.matches(event.message)) continue
+            BurrowAPI.lastBurrowRelatedChatMessage = SimpleTimeMark.now()
+            tracker.modify {
+                it.count.addOrPut(creatureType, 1)
+
+                // TODO migrate to abstract feature in the future
+                if (creatureType == MythologicalCreatureType.MINOS_INQUISITOR) {
+                    event.chatComponent = ChatComponentText(event.message + " §e(${it.creaturesSinceLastInquisitor})")
+                    it.creaturesSinceLastInquisitor = 0
+                } else it.creaturesSinceLastInquisitor++
             }
+            if (config.hideChat) event.blockedReason = "mythological_creature_dug"
         }
     }
 
@@ -133,7 +134,13 @@ object MythologicalCreatureTracker {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.enabled) return
+        val spadeInHand = InventoryUtils.getItemInHand()?.isDianaSpade ?: false
+        if (!DianaAPI.isDoingDiana() && !spadeInHand) return
+        if (spadeInHand) {
+            tracker.firstUpdate()
+        }
 
         tracker.renderDisplay(config.position)
     }
@@ -142,5 +149,4 @@ object MythologicalCreatureTracker {
         tracker.resetCommand()
     }
 
-    private fun isEnabled() = DianaAPI.isDoingDiana() && config.enabled
 }

From 3e2cd8ee29ce571286d5cc2ccdc7ed74a9fffcbe Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 15 Sep 2024 11:56:44 +0200
Subject: [PATCH 462/721] Fix: Scoreboard Error during M7 Dragons (#2510)

---
 src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 378fe03c6953..a8cafcf3d981 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -51,16 +51,13 @@ object ScoreboardData {
             val lastColor = start.lastColorCode() ?: ""
 
             // Generate the list of color suffixes
-            val colorSuffixes = generateSequence(lastColor) { it.dropLast(2) }
-                .takeWhile { it.isNotEmpty() }
-                .toMutableList()
+            val colorSuffixes = lastColor.chunked(2).toMutableList()
 
             // Iterate through the colorSuffixes to remove matching prefixes from 'end'
             for (suffix in colorSuffixes.toList()) {
                 if (end.startsWith(suffix)) {
                     end = end.removePrefix(suffix)
                     colorSuffixes.remove(suffix)
-                    break
                 }
             }
 

From 67e09820b733caee179ea3c8808aa358cdcff94d Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Sun, 15 Sep 2024 11:01:03 +0100
Subject: [PATCH 463/721] Fix: Broodmother countdown wrong in singular case
 (#2513)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/combat/BroodmotherFeatures.kt    | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
index e087fdd1934e..dd7c088b0b7e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
@@ -60,9 +60,7 @@ object BroodmotherFeatures {
     private fun onStageUpdate() {
         ChatUtils.debug("New Broodmother stage: $currentStage")
 
-        if (lastStage == null) {
-            if (onServerJoin()) return
-        }
+        if (lastStage == null && onServerJoin()) return
 
         // ignore Hypixel bug where the stage may temporarily revert to Imminent after the Broodmother's death
         if (currentStage == StageEntry.IMMINENT && lastStage == StageEntry.ALIVE) return
@@ -72,23 +70,23 @@ object BroodmotherFeatures {
             return
         }
 
-        val timeUntilSpawn = currentStage?.minutes?.minutes
-        broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn!!
-
         if (currentStage == StageEntry.IMMINENT && config.imminentWarning) {
             playImminentWarning()
             return
         }
 
-        if (config.stages.contains(currentStage) && lastStage != null) {
-            if (currentStage == StageEntry.SLAIN) {
-                onBroodmotherSlain()
-            } else {
-                val pluralize = StringUtils.pluralize(timeUntilSpawn.toInt(DurationUnit.MINUTES), "minute")
-                ChatUtils.chat(
-                    "Broodmother: $lastStage §e-> $currentStage§e. §b${timeUntilSpawn.inWholeMinutes} $pluralize §euntil it spawns!"
-                )
-            }
+        val lastStage = lastStage ?: return
+        val timeUntilSpawn = currentStage?.minutes?.minutes ?: return
+        broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn
+
+        if (currentStage !in config.stages) return
+        if (currentStage == StageEntry.SLAIN) {
+            onBroodmotherSlain()
+        } else {
+            val pluralize = StringUtils.pluralize(timeUntilSpawn.toInt(DurationUnit.MINUTES), "minute")
+            ChatUtils.chat(
+                "Broodmother: $lastStage §e-> $currentStage§e. §b${timeUntilSpawn.inWholeMinutes} $pluralize §euntil it spawns!"
+            )
         }
     }
 
@@ -99,7 +97,7 @@ object BroodmotherFeatures {
             val pluralize = StringUtils.pluralize(currentStage?.minutes ?: 0, "minute")
             var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
             if (currentStage?.minutes != 0) {
-                message += " It will spawn within §b${currentStage?.minutes} $pluralize§e."
+                message += " It will spawn §bwithin ${currentStage?.minutes} $pluralize§e."
             }
             ChatUtils.chat(message)
             return true
@@ -161,7 +159,7 @@ object BroodmotherFeatures {
         if (!isCountdownEnabled()) return
 
         if (broodmotherSpawnTime.isFarPast()) {
-            if (lastStage != null) {
+            if (lastStage != null && currentStage == StageEntry.ALIVE) {
                 display = "§4Broodmother spawned!"
             }
         } else {

From bea837f2ba12f049614f92096b47a9e601c288b9 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 15 Sep 2024 12:10:47 +0200
Subject: [PATCH 464/721] Fix: Zombie Shootout Baby Zombie Bounding Box (#2512)

---
 .../event/carnival/CarnivalZombieShootout.kt      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index d57903a57949..79e93f2addf5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -23,6 +23,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.entity.monster.EntityZombie
 import net.minecraft.init.Blocks
 import net.minecraft.item.ItemStack
+import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import kotlin.time.Duration.Companion.seconds
@@ -95,9 +96,21 @@ object CarnivalZombieShootout {
 
         for ((zombie, type) in drawZombies) {
             val entity = EntityUtils.getEntityByID(zombie.entityId) ?: continue
+            val isSmall = (entity as? EntityZombie)?.isChild ?: false
+
+            val boundingBox = entity.entityBoundingBox.let {
+                if (isSmall) {
+                    val widthScale = 0.5
+                    val heightScale = 0.85
+                    val newMin = it.minX + (it.maxX - it.minX) * (1 - widthScale) / 2
+                    val newMax = it.maxX - (it.maxX - it.minX) * (1 - widthScale) / 2
+                    val newHeight = it.minY + (it.maxY - it.minY) * heightScale / 1.75
+                    AxisAlignedBB(newMin, it.minY, it.minZ, newMax, newHeight, it.maxZ)
+                } else it
+            }.expand(0.1, 0.05, 0.0).offset(0.0, 0.05, 0.0)
 
             event.drawHitbox(
-                entity.entityBoundingBox.expand(0.1, 0.05, 0.0).offset(0.0, 0.05, 0.0),
+                boundingBox,
                 lineWidth = 3,
                 type.color,
                 depth = false,

From 8bea71e2a047cd643e88907fe9a6a7d98f47fdc8 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sun, 15 Sep 2024 12:13:02 +0200
Subject: [PATCH 465/721] Fix: Catch a Fish Goals (#2517)

---
 .../skyhanni/features/event/carnival/CarnivalGoal.kt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
index c36212a22d8b..beedfd6a5676 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt
@@ -69,13 +69,13 @@ enum class CarnivalGoal(
     CATCH_A_FISH_SCORE(
         GoalType.CATCH_A_FISH,
         "§7Reach §a3,000 score §7in a single game",
-        "(§8 - §r)?§7Catch §r§a30 Fish §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "(§8 - §r)?§7Reach §r§a3,000 score §r§7in a single game of §r§3Catch a Fish§r§7.",
         "Reach §a3,000 score",
     ),
     CATCH_FISH(
         GoalType.CATCH_A_FISH,
         "§7Catch §a30 Fish §7in a single game of",
-        "(§8 - §r)?§7Reach §r§a3,000 score §r§7in a single game of §r§3Catch a Fish§r§7.",
+        "(§8 - §r)?§7Catch §r§a30 Fish §r§7in a single game of §r§3Catch a Fish§r§7.",
         "Catch §a30 Fish",
     ),
     CATCH_YELLOW_FISH(

From b8f4b63f6efdef2cb189d6094b5f5bad17b8a80a Mon Sep 17 00:00:00 2001
From: The1Divider <65572114+The1Divider@users.noreply.github.com>
Date: Sun, 15 Sep 2024 04:25:29 -0600
Subject: [PATCH 466/721] Feature: Highlight More Hoppity's Collection Rabbits
 (#2438)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../ChocolateFactoryConfig.java               |  21 ++--
 .../event/hoppity/HoppityCollectionStats.kt   | 116 +++++++++++++++---
 2 files changed, 109 insertions(+), 28 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 e35bc4d7e790..fa817ede042f 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
@@ -2,6 +2,7 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats.HighlightRabbitTypes;
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStats.ChocolateFactoryStat;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
@@ -174,18 +175,22 @@ public class ChocolateFactoryConfig {
     public boolean hoppityMenuShortcut = true;
 
     @Expose
-    @ConfigOption(name = "Highlight Requirement Rabbits", desc = "Highlight rabbits that have requirements.\n" +
-        "§cRed: Requirement not met.\n" +
-        "§aGreen: Requirement met.")
+    @ConfigOption(name = "Highlight Found Rabbits", desc = "Highlight rabbits that have already been found.")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean highlightRabbitsWithRequirement = false;
+    public boolean highlightFoundRabbits = false;
 
     @Expose
-    @ConfigOption(name = "Only Requirement Not Met", desc = "Only highlight the rabbits you don't have the requirement for.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean onlyHighlightRequirementNotMet = true;
+    @ConfigOption(name = "Highlight Rabbits", desc = "Highlight specific rabbit types in Hoppity's Collection.")
+    @ConfigEditorDraggableList
+    public List<HighlightRabbitTypes> highlightRabbits = new ArrayList<>(Arrays.asList(
+        HighlightRabbitTypes.ABI,
+        HighlightRabbitTypes.FACTORY,
+        HighlightRabbitTypes.MET,
+        HighlightRabbitTypes.NOT_MET,
+        HighlightRabbitTypes.SHOP,
+        HighlightRabbitTypes.STRAYS
+    ));
 
     @Expose
     @ConfigOption(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index a06b3dcbc202..800ac5729aaf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -24,15 +24,17 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.anyMatches
-import at.hannibal2.skyhanni.utils.RegexUtils.find
 import at.hannibal2.skyhanni.utils.RegexUtils.findMatcher
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.regex.Pattern
 
 @SkyHanniModule
 object HoppityCollectionStats {
@@ -97,6 +99,30 @@ object HoppityCollectionStats {
         "§c✖ §7Requirement §e(?<acquired>[\\d,]+)§7/§a(?<required>[\\d,]+)",
     )
 
+    /**
+     * REGEX-TEST: §6Factory Milestones§7.
+     */
+    private val factoryMilestone by RepoPattern.pattern(
+        "rabbit.requirement.factory",
+        "§6Factory Milestones§7.",
+    )
+
+    /**
+     * REGEX-TEST: §6Shop Milestones§7.
+     */
+    private val shopMilestone by RepoPattern.pattern(
+        "rabbit.requirement.shop",
+        "§6Shop Milestones§7.",
+    )
+
+    /**
+     * REGEX-TEST: §7§7Obtained by finding the §aStray Rabbit
+     */
+    private val strayRabbit by RepoPattern.pattern(
+        "rabbit.requirement.stray",
+        "§7§7Obtained by finding the §aStray Rabbit",
+    )
+
     /**
      * REGEX-TEST: Find 15 unique egg locations in the Deep Caverns.
      */
@@ -109,6 +135,21 @@ object HoppityCollectionStats {
     private val loggedRabbits
         get() = ProfileStorageData.profileSpecific?.chocolateFactory?.rabbitCounts ?: mutableMapOf()
 
+    enum class HighlightRabbitTypes(
+        private val displayName: String,
+        val color: LorenzColor,
+    ) {
+        ABI("§2Abi", LorenzColor.DARK_GREEN),
+        FACTORY("§eFactory Milestones", LorenzColor.YELLOW),
+        MET("§aRequirement Met", LorenzColor.GREEN),
+        NOT_MET("§cRequirement Not Met.", LorenzColor.RED),
+        SHOP("§6Shop Milestones", LorenzColor.GOLD),
+        STRAYS("§3Stray Rabbits", LorenzColor.DARK_AQUA),
+        ;
+
+        override fun toString(): String = displayName
+    }
+
     @KSerializable
     data class LocationRabbit(
         val locationName: String,
@@ -133,17 +174,57 @@ object HoppityCollectionStats {
 
     var inInventory = false
 
+    private val highlightConfigMap: Map<Pattern, HighlightRabbitTypes> = mapOf(
+        factoryMilestone to HighlightRabbitTypes.FACTORY,
+        requirementMet to HighlightRabbitTypes.MET,
+        requirementNotMet to HighlightRabbitTypes.NOT_MET,
+        shopMilestone to HighlightRabbitTypes.SHOP,
+        strayRabbit to HighlightRabbitTypes.STRAYS,
+    )
+
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!(LorenzUtils.inSkyBlock)) return
-        if (!pagePattern.matches(event.inventoryName)) return
+        if (!pagePattern.matches(event.inventoryName)) {
+            // Clear highlight cache in case options are toggled
+            highlightMap.clear()
+            return
+        }
 
         inInventory = true
         if (config.hoppityCollectionStats) {
             display = buildDisplay(event)
         }
+
+        if (config.highlightRabbits.isNotEmpty()) {
+            for ((_, stack) in event.inventoryItems) filterRabbitToHighlight(stack)
+        }
     }
 
+    private fun filterRabbitToHighlight(stack: ItemStack) {
+        val lore = stack.getLore()
+
+        if (lore.isEmpty()) return
+        if (!rabbitNotFoundPattern.anyMatches(lore) && !config.highlightFoundRabbits) return
+
+        if (highlightMap.containsKey(stack.displayName)) return
+
+        if (stack.displayName == "§aAbi" && config.highlightRabbits.contains(HighlightRabbitTypes.ABI)) {
+            highlightMap[stack.displayName] = HighlightRabbitTypes.ABI.color
+            return
+        }
+
+        // cache rabbits until collection is closed
+        for ((pattern, rabbitType) in highlightConfigMap) {
+            if (pattern.anyMatches(lore) && config.highlightRabbits.contains(rabbitType)) {
+                highlightMap[stack.displayName] = rabbitType.color
+                break
+            }
+        }
+    }
+
+    private var highlightMap = mutableMapOf<String, LorenzColor>()
+
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
         inInventory = false
@@ -162,22 +243,17 @@ object HoppityCollectionStats {
         )
     }
 
-    // TODO cache with inventory update event
     @SubscribeEvent
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
-        if (!config.highlightRabbitsWithRequirement) return
         if (!inInventory) return
+        if (config.highlightRabbits.isEmpty()) return
 
         for (slot in InventoryUtils.getItemsInOpenChest()) {
-            val lore = slot.stack.getLore()
-            if (lore.any { requirementMet.find(it) } && !config.onlyHighlightRequirementNotMet)
-                slot highlight LorenzColor.GREEN
-            if (lore.any { requirementNotMet.find(it) }) {
-                val found = !rabbitNotFoundPattern.anyMatches(lore)
-                // Hypixel allows purchasing Rabbits from Hoppity NPC even when the requirement is not yet met.
-                if (!found) {
-                    slot highlight LorenzColor.RED
-                }
+            val name = slot.stack.displayName
+
+            if (name.isEmpty()) continue
+            highlightMap[name]?.let {
+                slot highlight it
             }
         }
     }
@@ -186,9 +262,10 @@ object HoppityCollectionStats {
         if (!config.showLocationRequirementsRabbitsInHoppityStats) return
         val missingLocationRabbits = locationRabbitRequirements.values.filter { !it.hasMetRequirements() }
 
-        val tips = locationRabbitRequirements.map {
-            it.key + " §7(§e" + it.value.locationName + "§7): " + (if (it.value.hasMetRequirements()) "§a" else "§c") +
-                it.value.foundCount + "§7/§a" + it.value.requiredCount
+        val tips = locationRabbitRequirements.map { (name, rabbit) ->
+            "$name §7(§e${rabbit.locationName}§7): ${
+                if (rabbit.hasMetRequirements()) "§a" else "§c"
+            }${rabbit.foundCount}§7/§a${rabbit.requiredCount}"
         }
 
         newList.add(
@@ -311,7 +388,7 @@ object HoppityCollectionStats {
     // used to make sure that mod data is synchronized with Hypixel
     private fun getFoundRabbitsFromHypixel(event: InventoryFullyOpenedEvent): Int {
         return event.inventoryItems.firstNotNullOf {
-            it.value.getLore().matchFirst(rabbitsFoundPattern) {
+            rabbitsFoundPattern.firstMatcher(it.value.getLore()) {
                 group("current").formatInt()
             }
         }
@@ -354,7 +431,7 @@ object HoppityCollectionStats {
 
             if (!found) continue
 
-            val duplicates = itemLore.matchFirst(duplicatesFoundPattern) {
+            val duplicates = duplicatesFoundPattern.firstMatcher(itemLore) {
                 group("duplicates").formatInt()
             } ?: 0
 
@@ -362,7 +439,6 @@ object HoppityCollectionStats {
         }
     }
 
-
     // bugfix for some weird potential user errors (e.g. if users play on alpha and get rabbits)
     fun clearSavedRabbits() {
         loggedRabbits.clear()

From 0a49e3eb55f8804d6716fa8dd1239c502682726f Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Mon, 16 Sep 2024 10:42:40 +0200
Subject: [PATCH 467/721] Fix: Old mayor perks not being marked as inactive
 (#2524)

---
 src/main/java/at/hannibal2/skyhanni/data/Mayors.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 78647944c9a0..335648dc5116 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -146,6 +146,7 @@ enum class Mayor(
 
         fun Mayor.addPerks(perks: List<Perk>) {
             perks.forEach { it.isActive = false }
+            activePerks.forEach { it.isActive = false }
             activePerks.clear()
             for (perk in perks.filter { perks.contains(it) }) {
                 perk.isActive = true

From 2e959c27fa0e0ec75bf26456df9ba80d2a8e5e5b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 17 Sep 2024 08:53:33 +0200
Subject: [PATCH 468/721] Fix: Lag spikes in pathfinder (#2525)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index c5c0071f95da..d85b34cc6936 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -30,6 +30,7 @@ import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.renderables.buildSearchBox
 import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import kotlinx.coroutines.launch
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
@@ -54,7 +55,9 @@ object IslandAreas {
     }
 
     fun noteMoved() {
-        updateNodes()
+        SkyHanniMod.coroutineScope.launch {
+            updateNodes()
+        }
     }
 
     private fun updateNodes() {

From bae0275fc7b176c58c53b827e6b717aec351854f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 17 Sep 2024 08:57:14 +0200
Subject: [PATCH 469/721] Fix: Corpse Tracker visiblility (#2516)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/mining/glacitemineshaft/CorpseTracker.kt      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
index c54315d7e430..f1d23185f3e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.mining.glacitemineshaft
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.MiningAPI
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.mining.CorpseLootedEvent
@@ -82,8 +83,8 @@ object CorpseTracker {
         if (bucketData.getCorpseCount() == 0L) return@buildList
 
         var profit = tracker.drawItems(bucketData, { true }, this)
-        val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) }
-            ?: enumValues<CorpseType>().toList().filter { bucketData.corpsesLooted[it] != null }
+        val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) } ?: enumValues<CorpseType>().toList()
+            .filter { bucketData.corpsesLooted[it] != null }
         var totalKeyCost = 0.0
         var totalKeyCount = 0
         val keyCostStrings = buildList {
@@ -138,5 +139,5 @@ object CorpseTracker {
     }
 
     fun isEnabled() =
-        config.enabled && IslandType.DWARVEN_MINES.isInIsland() && (!config.onlyInMineshaft || IslandType.MINESHAFT.isInIsland())
+        LorenzUtils.inSkyBlock && config.enabled && (IslandType.MINESHAFT.isInIsland() || (!config.onlyInMineshaft && MiningAPI.inGlacialTunnels()))
 }

From 1247a11ea7846af1531546263c525b3e005d0eed Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 17 Sep 2024 03:00:08 -0400
Subject: [PATCH 470/721] Fix: BucketedItemTrackerData Not Exposed (#2528)

---
 .../skyhanni/utils/tracker/BucketedItemTrackerData.kt          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
index 3bedaf8a4303..2197bf5c0e9e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData.TrackedItem
+import com.google.gson.annotations.Expose
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl
 
 abstract class BucketedItemTrackerData<E : Enum<E>> : TrackerData() {
@@ -64,7 +65,9 @@ abstract class BucketedItemTrackerData<E : Enum<E>> : TrackerData() {
             )
     }
 
+    @Expose
     private var selectedBucket: E? = null
+    @Expose
     private var bucketedItems: MutableMap<E, MutableMap<NEUInternalName, TrackedItem>> = HashMap()
 
     private fun getBucket(bucket: E): MutableMap<NEUInternalName, TrackedItem> = bucketedItems[bucket]?.toMutableMap() ?: HashMap()

From 46d39d831c23b02481c3ed0b34ebf74ac26bc088 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:35:17 +0200
Subject: [PATCH 471/721] Fix: Efficient Miner on Ore Mined Event (#2526)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 39 +++++++++++--------
 .../skyhanni/events/ServerBlockChangeEvent.kt |  4 +-
 .../skyhanni/features/mining/OreBlock.kt      |  2 +-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index ecf90172dc79..fd399ae8b037 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -8,11 +8,13 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.mining.OreMinedEvent
 import at.hannibal2.skyhanni.events.player.PlayerDeathEvent
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.features.mining.OreBlock
+import at.hannibal2.skyhanni.features.mining.isTitanium
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.countBy
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
@@ -50,8 +52,7 @@ object MiningAPI {
 
     private var lastInitSound = SimpleTimeMark.farPast()
 
-    private var waitingForInitBlock = false
-    private var waitingForInitBlockPos: LorenzVec? = null
+    private var initBlockPos: LorenzVec? = null
     private var waitingForInitSound = true
 
     private var waitingForEffMinerSound = false
@@ -146,8 +147,8 @@ object MiningAPI {
                 val pos = event.location.roundLocationToBlock()
                 if (recentClickedBlocks.none { it.first == pos }) return
                 waitingForInitSound = false
-                waitingForInitBlock = true
-                waitingForInitBlockPos = event.location.roundLocationToBlock()
+                waitingForEffMinerBlock = true
+                initBlockPos = event.location.roundLocationToBlock()
                 lastInitSound = SimpleTimeMark.now()
             }
             return
@@ -164,21 +165,25 @@ object MiningAPI {
     @SubscribeEvent
     fun onBlockChange(event: ServerBlockChangeEvent) {
         if (!inCustomMiningIsland()) return
-        if (event.newState.block.let { it != Blocks.air && it != Blocks.bedrock }) return
-        if (event.oldState.block.let { it == Blocks.air || it == Blocks.bedrock }) return
-        if (event.oldState.block == Blocks.air) return
+        val oldState = event.oldState
+        val newState = event.newState
+        val oldBlock = oldState.block
+        val newBlock = newState.block
+
+        if (oldState == newState) return
+        if (oldBlock == Blocks.air || oldBlock == Blocks.bedrock) return
+        if (newBlock != Blocks.air && newBlock != Blocks.bedrock && !isTitanium(newState)) return
+
         val pos = event.location
         if (pos.distanceToPlayer() > 7) return
 
         if (lastInitSound.passedSince() > 100.milliseconds) return
 
-        val ore = OreBlock.getByStateOrNull(event.oldState) ?: return
+        val ore = OreBlock.getByStateOrNull(oldState) ?: return
 
-        if (waitingForInitBlock) {
-            if (waitingForInitBlockPos != pos) return
-            waitingForInitBlock = false
+        if (initBlockPos == pos) {
             surroundingMinedBlocks += MinedBlock(ore, true) to pos
-            waitingForEffMinerBlock = true
+            runEvent()
             return
         }
         if (waitingForEffMinerBlock) {
@@ -205,7 +210,11 @@ object MiningAPI {
 
         if (waitingForInitSound) return
         if (lastInitSound.passedSince() < 200.milliseconds) return
+        // in case the init block is not found
+        resetOreEvent()
+    }
 
+    private fun runEvent() {
         resetOreEvent()
 
         if (surroundingMinedBlocks.isEmpty()) return
@@ -237,8 +246,7 @@ object MiningAPI {
     private fun resetOreEvent() {
         lastInitSound = SimpleTimeMark.farPast()
         waitingForInitSound = true
-        waitingForInitBlock = false
-        waitingForInitBlockPos = null
+        initBlockPos = null
         waitingForEffMinerSound = false
         waitingForEffMinerBlock = false
     }
@@ -258,8 +266,7 @@ object MiningAPI {
                 add("lastInitSound: ${lastInitSound.passedSince().format()}")
             }
             add("waitingForInitSound: $waitingForInitSound")
-            add("waitingForInitBlock: $waitingForInitBlock")
-            add("waitingForInitBlockPos: $waitingForInitBlockPos")
+            add("waitingForInitBlockPos: $initBlockPos")
             add("waitingForEffMinerSound: $waitingForEffMinerSound")
             add("waitingForEffMinerBlock: $waitingForEffMinerBlock")
             add("recentlyClickedBlocks: ${recentClickedBlocks.joinToString { "(${it.first.toCleanString()}" }}")
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt
index 07aa7630ed37..106ee2821cb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.utils.toLorenzVec
 import net.minecraft.block.state.IBlockState
 import net.minecraft.util.BlockPos
 
-class ServerBlockChangeEvent(private val blockPos: BlockPos, private val blockState: IBlockState) : LorenzEvent() {
+class ServerBlockChangeEvent(blockPos: BlockPos, blockState: IBlockState) : LorenzEvent() {
 
     val location by lazy { blockPos.toLorenzVec() }
     val old by lazy { location.getBlockAt().toString().getName() }
@@ -17,7 +17,7 @@ class ServerBlockChangeEvent(private val blockPos: BlockPos, private val blockSt
 
     companion object {
 
-        val pattern = "Block\\{minecraft:(?<name>.*)}".toPattern()
+        private val pattern = "Block\\{minecraft:(?<name>.*)}".toPattern()
 
         private fun String.getName() = pattern.matchMatcher(this) {
             group("name")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 7f5582036dfd..c5d9774b15bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -252,7 +252,7 @@ private fun isHighTierMithril(state: IBlockState): Boolean {
     return (state.block == Blocks.wool && state.getValue(BlockColored.COLOR) == EnumDyeColor.LIGHT_BLUE)
 }
 
-private fun isTitanium(state: IBlockState): Boolean {
+fun isTitanium(state: IBlockState): Boolean {
     return (state.block == Blocks.stone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.DIORITE_SMOOTH)
 }
 

From fe59a3143b0b8a181869c5f11b5c869b6ea7c225 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:36:45 +0200
Subject: [PATCH 472/721] Fix: Dojo Pattern (#2519)

---
 .../gui/customscoreboard/ScoreboardPattern.kt     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 9e2694ec0d88..1c6fb4282fec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -364,23 +364,28 @@ object ScoreboardPattern {
     )
     val dojoChallengePattern by miscSb.pattern(
         "dojochallenge",
-        "^(§.)*Challenge: (§.)*(?<challenge>[\\w ]+)$",
+        "(§.)*Challenge: (§.)*(?<challenge>[\\w ]+)",
     )
     val dojoDifficultyPattern by miscSb.pattern(
         "dojodifficulty",
-        "^(§.)*Difficulty: (§.)*(?<difficulty>[\\w ]+)$",
+        "(§.)*Difficulty: (§.)*(?<difficulty>[\\w ]+)",
     )
     val dojoPointsPattern by miscSb.pattern(
         "dojopoints",
-        "^(§.)*Points: (§.)*[\\w.]+ ?(§7\\(§.*§7\\))?\$",
+        "(§.)*Points: (§.)*[\\w.]+.*",
     )
+
+    /**
+     * There should be a space at the end of the test, Intellij keeps removing it
+     * REGEX-TEST: Time: §a20s
+     */
     val dojoTimePattern by miscSb.pattern(
         "dojotime",
-        "^(§.)*Time: (§.)*[\\w.]+( §7\\(§.*§7\\))?$",
+        "(§.)*Time: (§.)*[\\w.]+.*",
     )
     val objectivePattern by miscSb.pattern(
         "objective",
-        "^(§.)*(Objective|Quest).*",
+        "(§.)*(Objective|Quest).*",
     )
     val queuePattern by miscSb.pattern(
         "queued",

From 5cba1329e720553854e79557815cdf9319768850 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:39:08 +0200
Subject: [PATCH 473/721] Fix: Baby Zombie Carnival Size (#2518)

---
 .../event/carnival/CarnivalZombieShootout.kt      | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index 79e93f2addf5..23e7b9ee48b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -23,7 +23,6 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.entity.monster.EntityZombie
 import net.minecraft.init.Blocks
 import net.minecraft.item.ItemStack
-import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import kotlin.time.Duration.Companion.seconds
@@ -98,19 +97,11 @@ object CarnivalZombieShootout {
             val entity = EntityUtils.getEntityByID(zombie.entityId) ?: continue
             val isSmall = (entity as? EntityZombie)?.isChild ?: false
 
-            val boundingBox = entity.entityBoundingBox.let {
-                if (isSmall) {
-                    val widthScale = 0.5
-                    val heightScale = 0.85
-                    val newMin = it.minX + (it.maxX - it.minX) * (1 - widthScale) / 2
-                    val newMax = it.maxX - (it.maxX - it.minX) * (1 - widthScale) / 2
-                    val newHeight = it.minY + (it.maxY - it.minY) * heightScale / 1.75
-                    AxisAlignedBB(newMin, it.minY, it.minZ, newMax, newHeight, it.maxZ)
-                } else it
-            }.expand(0.1, 0.05, 0.0).offset(0.0, 0.05, 0.0)
+            val boundingBox = if (isSmall) entity.entityBoundingBox.expand(0.0, -0.4, 0.0).offset(0.0, -0.4, 0.0)
+            else entity.entityBoundingBox
 
             event.drawHitbox(
-                boundingBox,
+                boundingBox.expand(0.1, 0.05, 0.0).offset(0.0, 0.05, 0.0),
                 lineWidth = 3,
                 type.color,
                 depth = false,

From a1a903e3a3d223d2654ad941070a552c57fb6642 Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Tue, 17 Sep 2024 08:40:31 +0100
Subject: [PATCH 474/721] Removed Feature: Wild Strawberry Dye notification
 (#2520)

---
 .../config/features/garden/GardenConfig.java  |  6 ---
 .../farming/WildStrawberryDyeNotification.kt  | 48 -------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index b39f5f01ce63..8aa9aa6a1124 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -158,12 +158,6 @@ public class GardenConfig {
     @FeatureToggle
     public boolean burrowingSporesNotification = true;
 
-    @Expose
-    @ConfigOption(name = "Wild Strawberry", desc = "Show a notification when a Wild Strawberry Dye drops while farming.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean wildStrawberryDyeNotification = true;
-
     @Expose
     @ConfigOption(
         name = "FF for Contest",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt
deleted file mode 100644
index 34b4191d4e46..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.hannibal2.skyhanni.features.garden.farming
-
-import at.hannibal2.skyhanni.events.InventoryCloseEvent
-import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent
-import at.hannibal2.skyhanni.features.garden.GardenAPI
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.ItemBlink
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
-import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SoundUtils
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.seconds
-
-@SkyHanniModule
-object WildStrawberryDyeNotification {
-
-    private var lastCloseTime = SimpleTimeMark.farPast()
-
-    val item by lazy { "DYE_WILD_STRAWBERRY".asInternalName() }
-
-    @SubscribeEvent
-    fun onInventoryClose(event: InventoryCloseEvent) {
-        lastCloseTime = SimpleTimeMark.now()
-    }
-
-    @SubscribeEvent
-    fun onOwnInventoryItemUpdate(event: OwnInventoryItemUpdateEvent) {
-        if (!GardenAPI.inGarden()) return
-        if (!GardenAPI.config.wildStrawberryDyeNotification) return
-        // Prevent false positives when buying the item in ah or moving it from a storage
-        if (lastCloseTime.passedSince() < 1.seconds) return
-
-        val itemStack = event.itemStack
-
-        val internalName = itemStack.getInternalName()
-        if (internalName == item) {
-            val name = itemStack.name
-            LorenzUtils.sendTitle(name, 5.seconds)
-            ChatUtils.chat("You found a $name§e!")
-            SoundUtils.playBeepSound()
-            ItemBlink.setBlink(itemStack, 5_000)
-        }
-    }
-}

From 9de67ded5a222598e7b2e6225210785bd690530e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:27:50 +0200
Subject: [PATCH 475/721] better display names

---
 .../skyhanni/config/features/inventory/InventoryConfig.java     | 1 +
 .../skyhanni/features/garden/composter/ComposterDisplay.kt      | 2 +-
 .../skyhanni/features/mining/eventtracker/MiningEventDisplay.kt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index cf162ad7b6a8..5c3bf3170920 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -61,6 +61,7 @@ public class InventoryConfig {
     @Expose
     @ConfigOption(name = "Item Pickup Log", desc = "Logs all the picked up and dropped items")
     @Accordion
+    // TODO remove the suffix "config"
     public ItemPickupLogConfig itemPickupLogConfig = new ItemPickupLogConfig();
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index cebbeef08a71..058ae15909f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -180,7 +180,7 @@ object ComposterDisplay {
         val outsideSb = !LorenzUtils.inSkyBlock && OutsideSbFeature.COMPOSTER_TIME.isSelected()
         if (!GardenAPI.inGarden() && (inSb || outsideSb)) {
             val list = Collections.singletonList(listOf(bucket, "§b$format"))
-            config.outsideGardenPos.renderStringsAndItems(list, posLabel = "Composter Outside Garden Display")
+            config.outsideGardenPos.renderStringsAndItems(list, posLabel = "Composter Outside Garden")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt
index 26f41c799b32..a5c34850a2dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt
@@ -33,7 +33,7 @@ object MiningEventDisplay {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!shouldDisplay()) return
-        config.position.renderRenderables(display, posLabel = "Upcoming Events Display")
+        config.position.renderRenderables(display, posLabel = "Upcoming Mining Events")
     }
 
     private fun updateDisplay() {

From d1bb73a6826b4c56694a47b5811980ec4cdc90af Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:28:17 +0200
Subject: [PATCH 476/721] Improvement: Updated Carnival Diamond Zombie Color
 (#2511)

---
 .../skyhanni/features/event/carnival/CarnivalZombieShootout.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index 23e7b9ee48b0..ec18d016b561 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -64,7 +64,7 @@ object CarnivalZombieShootout {
         LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown
         IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver
         GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold
-        DIAMOND(120, "Diamond Helmet", Color(185, 242, 255)) //Diamond
+        DIAMOND(120, "Diamond Helmet", Color(44, 214, 250)) //Diamond
     }
 
     @SubscribeEvent

From 1dcc43a3f37591912f086299c298df4e0e471bd9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:28:38 +0200
Subject: [PATCH 477/721] Improvement: More Graph Things (#2515)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/dev/GraphConfig.java      |  12 +
 .../features/rift/EnigmaSoulConfig.java       |   8 +-
 .../hannibal2/skyhanni/data/IslandGraphs.kt   |   8 +-
 .../skyhanni/data/model/GraphNodeTag.kt       |  32 ++-
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |  33 ++-
 .../at/hannibal2/skyhanni/test/GraphEditor.kt | 207 +++---------------
 .../skyhanni/test/GraphNodeEditor.kt          | 178 +++++++++++++++
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   1 +
 8 files changed, 284 insertions(+), 195 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
index 9eed8233c995..acf9ac67d9e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
@@ -4,6 +4,7 @@
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
@@ -99,6 +100,17 @@ public class GraphConfig {
     @ConfigLink(owner = GraphConfig.class, field = "enabled")
     public Position namedNodesList = new Position(20, 20);
 
+    @Expose
+    @ConfigOption(
+        name = "Max Node Distance",
+        desc = "Only render nodes below this distance to the player.")
+    @ConfigEditorSlider(
+        minValue = 10,
+        maxValue = 500,
+        minStep = 10
+    )
+    public int maxNodeDistance = 50;
+
     @Expose
     @ConfigOption(name = "Shows Stats", desc = "Show funny extra statistics on save. May lag the game a bit.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
index 96c721539c1c..f64a42506043 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
@@ -15,6 +15,11 @@ public class EnigmaSoulConfig {
     @FeatureToggle
     public boolean enabled = true;
 
+    @Expose
+    @ConfigOption(name = "Show Path Finder", desc = "Additionally show a pathfind to the Enigma Soul.")
+    @ConfigEditorBoolean
+    public boolean showPathFinder = true;
+
     @ConfigOption(
         name = "§aRift Guide",
         desc = "Type §e/riftguide §7in chat or navigate through the SkyBlock Menu to open the §aRift Guide§7. " +
@@ -26,6 +31,5 @@ public class EnigmaSoulConfig {
     @Expose
     @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.")
     @ConfigEditorColour
-    public String color = "0:120:13:49:255";
-
+    public String color = "0:245:219:27:198";
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 02a065abe63a..0b173db46e04 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -40,6 +40,7 @@ import kotlin.math.abs
  * 	jump pads between servers
  * 	ring of love/romeo juliet quest
  * 	death location
+ * 	% of island discvovered (every node was most closest node at least once)
  * hub:
  * 	12 starter NPC's
  * 	diana
@@ -49,6 +50,8 @@ import kotlin.math.abs
  * 	enigma souls
  * 	eyes
  * 	big quests
+ * 	montezuma souls
+ * 	blood effigies
  * spider:
  * 	relicts + throw spot
  * dwarven mines:
@@ -56,7 +59,7 @@ import kotlin.math.abs
  * 	commssion areas
  * 	events: raffle, goblin slayer, donpieresso
  * deep
- * 	path to the bottom
+ * 	path to the bottom (Rhys NPC)
  * end
  * 	golem spawn
  * 	dragon death spot
@@ -65,12 +68,15 @@ import kotlin.math.abs
  *  area mini bosses
  *  daily quests
  *  intro tutorials with elle
+ *  fishing spots
  *
  * graph todo:
  * 	fix rename not using tick but input event we have (+ create the input event in the first place)
  * 	toggle distance to node by node path lengh, instead of eye of sight lenght
  * 	press test button again to enable "true test mode", with graph math and hiding other stuff
  * 	option to compare two graphs, and store multiple graphs in the edit mode in paralell
+ *
+ * 	mineshaft + corpse + ladder spot
  */
 
 @SkyHanniModule
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index a7349801324a..e1fa3317a8cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -1,8 +1,15 @@
 package at.hannibal2.skyhanni.data.model
 
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.utils.LorenzColor
 
-enum class GraphNodeTag(val internalName: String?, val color: LorenzColor, val cleanName: String, val description: String) {
+enum class GraphNodeTag(
+    val internalName: String,
+    val color: LorenzColor,
+    val cleanName: String,
+    val description: String,
+    val onlyIsland: IslandType? = null,
+) {
     DEV("dev", LorenzColor.WHITE, "Dev", "Intentionally marked as dev."), // E.g. Spawn points, todos, etc
 
     // Everywhere
@@ -16,31 +23,40 @@ enum class GraphNodeTag(val internalName: String?, val color: LorenzColor, val c
     ROMEO("romeo", LorenzColor.WHITE, "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
     RACE("race", LorenzColor.WHITE, "Race Start/Stop", "A race start or stop point."),
     SLAYER("slayer", LorenzColor.WHITE, "Slayer", "A Slayer area"),
+    HOPPITY("hoppity", LorenzColor.AQUA, "Hoppity Egg", "An egg location in Hoppity's Hunt."),
     // hoppity
 
     // Hub
-    HUB_12_STARTER("starter_npc", LorenzColor.WHITE, "Starter NPC", "One of the 12 starter NPC's you need to talk to."),
+    HUB_12_STARTER(
+        "starter_npc", LorenzColor.WHITE, "Starter NPC", "One of the 12 starter NPC's you need to talk to.",
+        onlyIsland = IslandType.HUB,
+    ),
     // diana
 
     // Farming Islands: Pelts
-    FARMING_CROP("farming_crop", LorenzColor.WHITE, "Farming Crop", "A spot where you can break crops on farming islands."),
+//     FARMING_CROP("farming_crop", LorenzColor.WHITE, "Farming Crop", "A spot where you can break crops on farming islands."),
 
     // Rift
-    RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the rift."),
-    RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Eye", "An Eye in the rift to teleport to."),
+    RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the rift.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Rift Eye", "An Eye in the rift to teleport to.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_MONTEZUMA("rift_montezuma", LorenzColor.GRAY, "Montezuma Soul Piece", "A piece of the Montezuma Soul.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_EFFIGY("rift_effigy", LorenzColor.RED, "Blood Effigies", "Locations of the Blood Effigies.", onlyIsland = IslandType.THE_RIFT),
 
     // Spider's Den
-    SPIDER_RELIC("SPIDER_RELIC", LorenzColor.DARK_PURPLE, "Relic", "An relic in the Spider's Den."),
+    SPIDER_RELIC("SPIDER_RELIC", LorenzColor.DARK_PURPLE, "Spider's Relic", "An relic in the Spider's Den.", onlyIsland = IslandType.SPIDER_DEN),
 
     // Dwarven Mines
-    MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Emissary", "A Emissary from the king."),
+    MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Mines Emissary", "A Emissary from the king.", onlyIsland = IslandType.DWARVEN_MINES),
     // commission areas
 
+    // Crimson Isles
+    CRIMSON_MINIBOSS("crimson_miniboss", LorenzColor.RED, "Crimson Miniboss", "Mini bosses in Crimson Isle.", onlyIsland = IslandType.CRIMSON_ISLE),
+
     ;
 
     val displayName: String = color.getChatColor() + cleanName
 
     companion object {
-        fun byId(internalName: String?): GraphNodeTag? = values().firstOrNull { it.internalName == internalName }
+        fun byId(internalName: String?): GraphNodeTag? = entries.firstOrNull { it.internalName == internalName }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index 67bf84aa94a7..d91b4008d912 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.rift.everywhere
 
+import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.jsonobjects.repo.EnigmaSoulsJson
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
@@ -11,6 +12,7 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.InventoryUtils.getAllItems
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
@@ -46,7 +48,7 @@ object EnigmaSoulWaypoints {
             "§5Toggle Missing",
             "§7Click here to toggle",
             "§7the waypoints for each",
-            "§7missing souls on this page"
+            "§7missing souls on this page",
         )
     }
 
@@ -97,19 +99,26 @@ object EnigmaSoulWaypoints {
         }
 
         if (event.slot?.stack == null) return
+
         val split = event.slot.stack.displayName.split("Enigma: ")
-        if (split.size == 2) {
-            event.makePickblock()
-            val name = split.last()
-            if (soulLocations.contains(name)) {
-                if (!trackedSouls.contains(name)) {
-                    ChatUtils.chat("§5Tracking the $name Enigma Soul!", prefixColor = "§5")
-                    trackedSouls.add(name)
-                } else {
-                    trackedSouls.remove(name)
-                    ChatUtils.chat("§5No longer tracking the $name Enigma Soul!", prefixColor = "§5")
+        if (split.size != 2) return
+
+        event.makePickblock()
+        val name = split.last()
+        if (!soulLocations.contains(name)) return
+
+        if (!trackedSouls.contains(name)) {
+            ChatUtils.chat("§5Tracking the $name Enigma Soul!", prefixColor = "§5")
+            if (config.showPathFinder) {
+                soulLocations[name]?.let {
+                    IslandGraphs.pathFind(it, config.color.toChromaColor(), condition = { config.showPathFinder })
                 }
             }
+            trackedSouls.add(name)
+        } else {
+            trackedSouls.remove(name)
+            ChatUtils.chat("§5No longer tracking the $name Enigma Soul!", prefixColor = "§5")
+            IslandGraphs.stop()
         }
     }
 
@@ -138,7 +147,7 @@ object EnigmaSoulWaypoints {
         if (!isEnabled()) return
         for (soul in trackedSouls) {
             soulLocations[soul]?.let {
-                event.drawWaypointFilled(it, LorenzColor.DARK_PURPLE.toColor(), seeThroughBlocks = true, beacon = true)
+                event.drawWaypointFilled(it, config.color.toChromaColor(), seeThroughBlocks = true, beacon = true)
                 event.drawDynamicText(it.add(y = 1), "§5${soul.removeSuffix(" Soul")} Soul", 1.5)
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
index 81a85283e828..d4038162f865 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
@@ -14,13 +14,12 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 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.addSearchString
-import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ColorUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LocationUtils.playerLocation
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -30,37 +29,27 @@ import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine_nea
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.renderables.Renderable
-import at.hannibal2.skyhanni.utils.renderables.ScrollValue
-import at.hannibal2.skyhanni.utils.renderables.Searchable
-import at.hannibal2.skyhanni.utils.renderables.buildSearchableScrollable
-import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import kotlinx.coroutines.runBlocking
 import net.minecraft.client.settings.KeyBinding
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import java.awt.Color
-import kotlin.math.sqrt
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object GraphEditor {
 
-    private val config get() = SkyHanniMod.feature.dev.devTool.graph
+    val config get() = SkyHanniMod.feature.dev.devTool.graph
 
-    private fun isEnabled() = config != null && config.enabled
+    fun isEnabled() = config != null && config.enabled
 
     private var id = 0
 
-    private val nodes = mutableListOf<GraphingNode>()
+    val nodes = mutableListOf<GraphingNode>()
     private val edges = mutableListOf<GraphingEdge>()
 
-    private var activeNode: GraphingNode? = null
+    var activeNode: GraphingNode? = null
         set(value) {
             field = value
             selectedEdge = findEdgeBetweenActiveAndClosed()
@@ -106,25 +95,25 @@ object GraphEditor {
     private val edgeDijkstraColor = LorenzColor.DARK_BLUE.addOpacity(150)
     private val edgeSelectedColor = LorenzColor.DARK_RED.addOpacity(150)
 
-    private val scrollValue = ScrollValue()
-    private val textInput = TextInput()
-    private var nodesDisplay = emptyList<Searchable>()
-    var lastUpdate = SimpleTimeMark.farPast()
-
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRender(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
         nodes.forEach { event.drawNode(it) }
         edges.forEach { event.drawEdge(it) }
-        ghostPosition?.let {
-            event.drawWaypointFilled(
-                it,
-                if (activeNode == null) Color.RED else Color.GRAY,
-                seeThroughBlocks = seeThroughBlocks,
-                minimumAlpha = 0.2f,
-                inverseAlphaScale = true,
-            )
-        }
+        drawGhostPosition(event)
+    }
+
+    private fun drawGhostPosition(event: LorenzRenderWorldEvent) {
+        val ghostPosition = ghostPosition ?: return
+        if (ghostPosition.distanceToPlayer() >= config.maxNodeDistance) return
+
+        event.drawWaypointFilled(
+            ghostPosition,
+            if (activeNode == null) Color.RED else Color.GRAY,
+            seeThroughBlocks = seeThroughBlocks,
+            minimumAlpha = 0.2f,
+            inverseAlphaScale = true,
+        )
     }
 
     @SubscribeEvent
@@ -188,136 +177,6 @@ object GraphEditor {
         dissolvePossible = edges.count { it.isInEdge(activeNode) } == 2
     }
 
-    @SubscribeEvent
-    fun onGuiRender(event: GuiRenderEvent) {
-        if (!isEnabled()) return
-
-
-        config.namedNodesList.renderRenderables(
-            buildList {
-                val list = getNodeNames()
-                val size = list.size
-                addString("§eGraph Nodes: $size")
-                val height = (size * 10).coerceAtMost(250)
-                if (list.isNotEmpty()) {
-                    add(list.buildSearchableScrollable(height, textInput, scrollValue, velocity = 10.0))
-                }
-            },
-            posLabel = "Graph Nodes List",
-        )
-    }
-
-    private fun getNodeNames(): List<Searchable> {
-        if (lastUpdate.passedSince() > 250.milliseconds) {
-            updateNodeNames()
-        }
-        return nodesDisplay
-    }
-
-    private fun updateNodeNames() {
-        lastUpdate = SimpleTimeMark.now()
-        nodesDisplay = drawNodeNames()
-    }
-
-    private fun updateTagView(node: GraphingNode) {
-        lastUpdate = SimpleTimeMark.now() + 60.seconds
-        nodesDisplay = drawTagNames(node)
-    }
-
-    private fun drawTagNames(node: GraphingNode): List<Searchable> = buildList {
-        addSearchString("§eChange tag for node '${node.name}§e'")
-        addSearchString("")
-
-        for (tag in GraphNodeTag.entries) {
-            val state = if (tag in node.tags) "§aYES" else "§cNO"
-            val name = state + " §r" + tag.displayName
-            add(createTagName(name, tag, node))
-        }
-        addSearchString("")
-        add(
-            Renderable.clickAndHover(
-                "§cGo Back!",
-                tips = listOf("§eClick to go back to the node list!"),
-                onClick = {
-                    updateNodeNames()
-                },
-            ).toSearchable(),
-        )
-    }
-
-    private fun createTagName(
-        name: String,
-        tag: GraphNodeTag,
-        node: GraphingNode,
-    ) = Renderable.clickAndHover(
-        name,
-        tips = listOf(
-            "Tag ${tag.name}",
-            "§7${tag.description}",
-            "",
-            "§eClick to set tag for ${node.name} to ${tag.name}!",
-        ),
-        onClick = {
-            if (tag in node.tags) {
-                node.tags.remove(tag)
-            } else {
-                node.tags.add(tag)
-            }
-            updateTagView(node)
-        },
-    ).toSearchable(name)
-
-    private fun drawNodeNames(): List<Searchable> = buildList {
-        for ((node, distance: Double) in nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
-            val name = node.name?.takeIf { !it.isBlank() } ?: continue
-            val color = if (node == activeNode) "§a" else "§7"
-            val distanceFormat = sqrt(distance).toInt().addSeparators()
-            val tagText = node.tags.let {
-                if (it.isEmpty()) {
-                    " §cNo tag§r"
-                } else {
-                    val text = node.tags.map { it.internalName }.joinToString(", ")
-                    " §f($text)"
-                }
-            }
-
-            val text = "${color}Node §r$name$tagText §7[$distanceFormat]"
-            add(createNodeTextLine(text, name, node))
-        }
-    }
-
-    private fun MutableList<Searchable>.createNodeTextLine(
-        text: String,
-        name: String,
-        node: GraphingNode,
-    ): Searchable = Renderable.clickAndHover(
-        text,
-        tips = buildList {
-            add("Node '$name'")
-            add("")
-
-            if (node.tags.isNotEmpty()) {
-                add("Tags: ")
-                for (tag in node.tags) {
-                    add(" §8- §r${tag.displayName}")
-                }
-                add("")
-            }
-
-            add("§eClick to select/deselect this node!")
-            add("§eControl-Click to edit the tags for this node!")
-
-        },
-        onClick = {
-            if (KeyboardManager.isModifierKeyDown()) {
-                updateTagView(node)
-            } else {
-                activeNode = node
-                updateNodeNames()
-            }
-        },
-    ).toSearchable(name)
-
     private fun feedBackInTutorial(text: String) {
         if (inTutorialMode) {
             ChatUtils.chat(text)
@@ -333,6 +192,7 @@ object GraphEditor {
     }
 
     private fun LorenzRenderWorldEvent.drawNode(node: GraphingNode) {
+        if (node.position.distanceToPlayer() > config.maxNodeDistance) return
         this.drawWaypointFilled(
             node.position,
             node.getNodeColor(),
@@ -368,17 +228,20 @@ object GraphEditor {
         )
     }
 
-    private fun LorenzRenderWorldEvent.drawEdge(edge: GraphingEdge) = this.draw3DLine_nea(
-        edge.node1.position.add(0.5, 0.5, 0.5),
-        edge.node2.position.add(0.5, 0.5, 0.5),
-        when {
-            selectedEdge == edge -> edgeSelectedColor
-            edge in highlightedEdges -> edgeDijkstraColor
-            else -> edgeColor
-        },
-        7,
-        !seeThroughBlocks,
-    )
+    private fun LorenzRenderWorldEvent.drawEdge(edge: GraphingEdge) {
+        if (edge.node1.position.distanceToPlayer() > config.maxNodeDistance) return
+        this.draw3DLine_nea(
+            edge.node1.position.add(0.5, 0.5, 0.5),
+            edge.node2.position.add(0.5, 0.5, 0.5),
+            when {
+                selectedEdge == edge -> edgeSelectedColor
+                edge in highlightedEdges -> edgeDijkstraColor
+                else -> edgeColor
+            },
+            7,
+            !seeThroughBlocks,
+        )
+    }
 
     private fun GraphingNode.getNodeColor() = when (this) {
         activeNode -> if (this == closedNode) ColorUtils.blendRGB(activeColor, closedColor, 0.5) else activeColor
@@ -723,7 +586,7 @@ object GraphEditor {
 }
 
 // The node object the graph editor is working with
-private class GraphingNode(
+class GraphingNode(
     val id: Int,
     var position: LorenzVec,
     var name: String? = null,
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt
new file mode 100644
index 000000000000..f541b16e307c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt
@@ -0,0 +1,178 @@
+package at.hannibal2.skyhanni.test
+
+import at.hannibal2.skyhanni.data.model.GraphNodeTag
+import at.hannibal2.skyhanni.data.model.TextInput
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.GraphEditor.distanceSqToPlayer
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.KeyboardManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.ScrollValue
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.buildSearchableScrollable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.math.sqrt
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object GraphNodeEditor {
+
+    private val scrollValueNodes = ScrollValue()
+    private val scrollValueTags = ScrollValue()
+    private val textInput = TextInput()
+    private var nodesDisplay = emptyList<Renderable>()
+    private var lastUpdate = SimpleTimeMark.farPast()
+
+    @SubscribeEvent
+    fun onGuiRender(event: GuiRenderEvent) {
+        if (!isEnabled()) return
+
+
+        config.namedNodesList.renderRenderables(
+            getNodeNames(),
+            posLabel = "Graph Nodes List",
+        )
+    }
+
+    private fun getNodeNames(): List<Renderable> {
+        if (lastUpdate.passedSince() > 250.milliseconds) {
+            updateNodeNames()
+        }
+        return nodesDisplay
+    }
+
+    private fun updateNodeNames() {
+        lastUpdate = SimpleTimeMark.now()
+        nodesDisplay = buildList {
+            val list = drawNodeNames()
+            val size = list.size
+            addString("§eGraph Nodes: $size")
+            val height = (size * 10).coerceAtMost(250)
+            if (list.isNotEmpty()) {
+                add(list.buildSearchableScrollable(height, textInput, scrollValueNodes, velocity = 10.0))
+            }
+        }
+    }
+
+    private fun updateTagView(node: GraphingNode) {
+        lastUpdate = SimpleTimeMark.now() + 60.seconds
+        nodesDisplay = buildList {
+            val list = drawTagNames(node)
+            val size = list.size
+            addString("§eGraph Nodes: $size")
+            val height = (size * 10).coerceAtMost(250)
+            if (list.isNotEmpty()) {
+                add(Renderable.scrollList(list, height, scrollValueTags, velocity = 10.0))
+            }
+        }
+    }
+
+    private fun drawTagNames(node: GraphingNode): List<Renderable> = buildList {
+        addString("§eChange tag for node '${node.name}§e'")
+        addString("")
+
+        for (tag in GraphNodeTag.entries.filter { it in node.tags || checkIsland(it) }) {
+            val state = if (tag in node.tags) "§aYES" else "§cNO"
+            val name = state + " §r" + tag.displayName
+            add(createTagName(name, tag, node))
+        }
+        addString("")
+        add(
+            Renderable.clickAndHover(
+                "§cGo Back!",
+                tips = listOf("§eClick to go back to the node list!"),
+                onClick = {
+                    updateNodeNames()
+                },
+            ),
+        )
+    }
+
+    private fun checkIsland(tag: GraphNodeTag): Boolean = tag.onlyIsland?.let {
+        it == LorenzUtils.skyBlockIsland
+    } ?: true
+
+    private fun createTagName(
+        name: String,
+        tag: GraphNodeTag,
+        node: GraphingNode,
+    ) = Renderable.clickAndHover(
+        name,
+        tips = listOf(
+            "Tag ${tag.name}",
+            "§7${tag.description}",
+            "",
+            "§eClick to set tag for ${node.name} to ${tag.name}!",
+        ),
+        onClick = {
+            if (tag in node.tags) {
+                node.tags.remove(tag)
+            } else {
+                node.tags.add(tag)
+            }
+            updateTagView(node)
+        },
+    )
+
+    private fun drawNodeNames(): List<Searchable> = buildList {
+        for ((node, distance: Double) in GraphEditor.nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
+            val name = node.name?.takeIf { !it.isBlank() } ?: continue
+            val color = if (node == GraphEditor.activeNode) "§a" else "§7"
+            val distanceFormat = sqrt(distance).toInt().addSeparators()
+            val tagText = node.tags.let { tags ->
+                if (tags.isEmpty()) {
+                    " §cNo tag§r"
+                } else {
+                    val text = node.tags.joinToString(", ") { it.internalName }
+                    " §f($text)"
+                }
+            }
+
+            val text = "${color}Node §r$name$tagText §7[$distanceFormat]"
+            add(createNodeTextLine(text, name, node))
+        }
+    }
+
+    private fun createNodeTextLine(
+        text: String,
+        name: String,
+        node: GraphingNode,
+    ): Searchable = Renderable.clickAndHover(
+        text,
+        tips = buildList {
+            add("Node '$name'")
+            add("")
+
+            if (node.tags.isNotEmpty()) {
+                add("Tags: ")
+                for (tag in node.tags) {
+                    add(" §8- §r${tag.displayName}")
+                }
+                add("")
+            }
+
+            add("§eClick to select/deselect this node!")
+            add("§eControl-Click to edit the tags for this node!")
+
+        },
+        onClick = {
+            if (KeyboardManager.isModifierKeyDown()) {
+                updateTagView(node)
+            } else {
+                GraphEditor.activeNode = node
+                updateNodeNames()
+            }
+        },
+    ).toSearchable(name)
+
+    fun isEnabled() = GraphEditor.isEnabled()
+    private val config get() = GraphEditor.config
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 9e95df881225..5b7333189b1e 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -116,6 +116,7 @@ object SkyHanniDebugsAndTests {
         if (args.isEmpty()) {
             testLocation = null
             ChatUtils.chat("reset test waypoint")
+            IslandGraphs.stop()
         }
 
         val x = args[0].toDouble()

From 864a36ff3d5b8ede1878fcbc73f2f1ceb1485150 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:10:42 +0200
Subject: [PATCH 478/721] Fix: Mining Update ItemCategory (#2529)

---
 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt  |  6 +++---
 .../features/misc/PrivateIslandNoPickaxeAbility.kt     | 10 ++++------
 .../java/at/hannibal2/skyhanni/utils/ItemCategory.kt   |  8 ++++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index 987a864af77e..3fb643c7c8a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -75,7 +75,7 @@ object ReforgeAPI {
         fun isValid(itemCategory: ItemCategory?, internalName: NEUInternalName) = when (type) {
             ReforgeType.SWORD -> setOf(
                 ItemCategory.SWORD,
-                ItemCategory.GAUNTLET,
+                ItemCategory.PICKAXE_AND_SWORD,
                 ItemCategory.LONGSWORD,
                 ItemCategory.FISHING_WEAPON,
             ).contains(itemCategory)
@@ -98,7 +98,7 @@ object ReforgeAPI {
             ReforgeType.PICKAXE ->
                 itemCategory == ItemCategory.PICKAXE ||
                     itemCategory == ItemCategory.DRILL ||
-                    itemCategory == ItemCategory.GAUNTLET
+                    itemCategory == ItemCategory.PICKAXE_AND_SWORD
 
             ReforgeType.EQUIPMENT -> setOf(
                 ItemCategory.CLOAK,
@@ -111,7 +111,7 @@ object ReforgeAPI {
             ReforgeType.ROD -> itemCategory == ItemCategory.FISHING_ROD || itemCategory == ItemCategory.FISHING_WEAPON
             ReforgeType.SWORD_AND_ROD -> setOf(
                 ItemCategory.SWORD,
-                ItemCategory.GAUNTLET,
+                ItemCategory.PICKAXE_AND_SWORD,
                 ItemCategory.LONGSWORD,
                 ItemCategory.FISHING_ROD,
                 ItemCategory.FISHING_WEAPON,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
index a29bcecc5ba7..dc55af349d14 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
@@ -21,12 +21,10 @@ object PrivateIslandNoPickaxeAbility {
         if (!config.privateIslandNoPickaxeAbility) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
 
-        when (event.itemInHand?.getItemCategoryOrNull()) {
-            ItemCategory.GAUNTLET, ItemCategory.PICKAXE, ItemCategory.DRILL -> {
-                event.cancel()
-            }
-
-            else -> {}
+        if (event.itemInHand?.getItemCategoryOrNull()?.let {
+                ItemCategory.miningTools.contains(it)
+            } == true) {
+            event.cancel()
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
index 8fa41978e70c..08272ed0898b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -12,7 +12,7 @@ enum class ItemCategory {
     FISHING_WEAPON,
     FISHING_ROD,
     AXE,
-    GAUNTLET,
+    PICKAXE_AND_SWORD,
     HOE,
     PICKAXE,
     SHOVEL,
@@ -53,6 +53,10 @@ enum class ItemCategory {
     SACK,
     CHISEL,
     DYE,
+    ORE,
+    BLOCK,
+    DWARVEN_METAL,
+    GEMSTONE,
 
     NONE,
     ;
@@ -62,7 +66,7 @@ enum class ItemCategory {
         fun Collection<ItemCategory>.containsItem(stack: ItemStack?) =
             stack?.getItemCategoryOrNull()?.let { this.contains(it) } ?: false
 
-        val miningTools = listOf(PICKAXE, DRILL, GAUNTLET)
+        val miningTools = listOf(PICKAXE, DRILL, PICKAXE_AND_SWORD)
 
         val armor = setOf(HELMET, CHESTPLATE, LEGGINGS, BOOTS)
     }

From a7f0634426586c13500e5f8012e245d669053226 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:22:23 +0200
Subject: [PATCH 479/721] Fix: TunnelMaps area and missing stats for reforge
 helper (#2530)

---
 src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt | 3 ++-
 .../java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index 6fd65778ecfb..994ff524e869 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -44,7 +44,8 @@ enum class SkyblockStat(val icon: String) {
     FORAGING_FORTUNE("§☘"),
     FARMING_FORTUNE("§6☘"),
     MINING_FORTUNE("§6☘"),
-    FEAR("§a☠")
+    FEAR("§a☠"),
+    HEAT_RESISTANCE("§c♨"),
     ;
 
     val capitalizedName = name.lowercase().allLettersFirstUppercase()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 8d7f771b7223..847a3673f5ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -524,7 +524,7 @@ object TunnelsMaps {
         goal = getNext()
     }
 
-    private val areas = setOf("Glacite Tunnels", "Dwarven Base Camp", "Glacite Lake", "Fossil Research Center")
+    private val areas = setOf("Glacite Tunnels", "Dwarven Base Camp", "Great Glacite Lake", "Fossil Research Center")
 
     private fun isEnabled() = IslandType.DWARVEN_MINES.isInIsland() && config.enable && LorenzUtils.skyBlockArea in areas
 }

From 50cbf42bbf7d05a50e6a2ec10f5936667f0ef6f1 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Wed, 18 Sep 2024 09:27:05 +0200
Subject: [PATCH 480/721] Fix: Update Ghost Bestiary Tiers (#2533)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |  2 +-
 .../BestiaryFormattingConfig.java             |  2 +-
 .../combat/ghostcounter/GhostCounter.kt       | 49 ++++++++++---------
 .../features/combat/ghostcounter/GhostData.kt | 32 ++++++------
 .../combat/ghostcounter/GhostFormatting.kt    |  2 +-
 .../features/combat/ghostcounter/GhostUtil.kt |  2 +-
 6 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index c881cc578ba4..8eb47d3949b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 57
+    const val CONFIG_VERSION = 58
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java
index 46a02e9b21e3..ac9f6e0b210a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java
@@ -30,7 +30,7 @@ public class BestiaryFormattingConfig {
     @ConfigOption(name = "Progress to Max", desc = "Text to show progress when the §eMaxed Bestiary §7option is §aON\n" +
         "§e%currentKill% §7is replaced with your current total kill.")
     @ConfigEditorText
-    public String showMax_progress = "%currentKill%/250k (%percentNumber%%)";
+    public String showMax_progress = "%currentKill%/100k (%percentNumber%%)";
 
     @Expose
     @ConfigOption(name = "Progress", desc = "Text to show progress when the §eMaxed Bestiary §7option is §cOFF\n" +
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 3bc3c85d4b2a..664acbc976f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -55,6 +55,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import com.google.gson.JsonPrimitive
 import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.moulberry.notenoughupdates.util.XPInformation
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -76,27 +77,27 @@ object GhostCounter {
     private val patternGroup = RepoPattern.group("combat.ghostcounter")
     private val skillXPPattern by patternGroup.pattern(
         "skillxp",
-        "[+](?<gained>[0-9,.]+) \\((?<current>[0-9,.]+)(?:/(?<total>[0-9,.]+))?\\)"
+        "[+](?<gained>[0-9,.]+) \\((?<current>[0-9,.]+)(?:/(?<total>[0-9,.]+))?\\)",
     )
     private val combatSectionPattern by patternGroup.pattern(
         "combatsection",
-        ".*[+](?<gained>[0-9,.]+) (?<skillName>[A-Za-z]+) \\((?<progress>(?<current>[0-9.,]+)/(?<total>[0-9.,]+)|(?<percent>[0-9.]+)%)\\).*"
+        ".*[+](?<gained>[0-9,.]+) (?<skillName>[A-Za-z]+) \\((?<progress>(?<current>[0-9.,]+)/(?<total>[0-9.,]+)|(?<percent>[0-9.]+)%)\\).*",
     )
     private val killComboExpiredPattern by patternGroup.pattern(
         "killcomboexpired",
-        "§cYour Kill Combo has expired! You reached a (?<combo>.*) Kill Combo!"
+        "§cYour Kill Combo has expired! You reached a (?<combo>.*) Kill Combo!",
     )
     private val ghostXPPattern by patternGroup.pattern(
         "ghostxp",
-        "(?<current>\\d+(?:\\.\\d+)?(?:,\\d+)?[kK]?)/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)"
+        "(?<current>\\d+(?:\\.\\d+)?(?:,\\d+)?[kK]?)/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)",
     )
     private val bestiaryPattern by patternGroup.pattern(
         "bestiary",
-        ".*(?:§\\d|§\\w)+BESTIARY (?:§\\d|§\\w)+Ghost (?:§\\d|§\\w)(?<previousLevel>\\d+)➜(?:§\\d|§\\w)(?<nextLevel>\\d+).*"
+        ".*(?:§\\d|§\\w)+BESTIARY (?:§\\d|§\\w)+Ghost (?:§\\d|§\\w)(?<previousLevel>\\d+)➜(?:§\\d|§\\w)(?<nextLevel>\\d+).*",
     )
     private val skillLevelPattern by patternGroup.pattern(
         "skilllevel",
-        ".*§e§lSkills: §r§a(?<skillName>.*) (?<skillLevel>\\d+).*"
+        ".*§e§lSkills: §r§a(?<skillName>.*) (?<skillLevel>\\d+).*",
     )
 
     private val format = NumberFormat.getInstance()
@@ -127,7 +128,7 @@ object GhostCounter {
         config.position.renderStringsAndItems(
             display,
             extraSpace = config.extraSpace,
-            posLabel = "Ghost Counter"
+            posLabel = "Ghost Counter",
         )
     }
 
@@ -205,7 +206,7 @@ object GhostCounter {
 
         val etaFormatting = textFormatting.etaFormatting
         val remaining: Int = when (config.showMax) {
-            true -> 250_000 - bestiaryCurrentKill
+            true -> 100_000 - bestiaryCurrentKill
             false -> killNeeded - currentKill
         }
 
@@ -222,7 +223,7 @@ object GhostCounter {
                             "%days%" to "days",
                             "%hours%" to "hours",
                             "%minutes%" to "minutes",
-                            "%seconds%" to "seconds"
+                            "%seconds%" to "seconds",
                         )
                         for ((format, key) in formatMap) {
                             if (etaFormatting.time.contains(format)) {
@@ -255,8 +256,7 @@ object GhostCounter {
         addAsSingletonList(textFormatting.highestKillComboFormat.formatText(Option.MAXKILLCOMBO))
         addAsSingletonList(textFormatting.skillXPGainFormat.formatText(Option.SKILLXPGAINED))
         addAsSingletonList(
-            bestiaryFormatting.base.preFormat(bestiary, nextLevel - 1, nextLevel)
-                .formatBestiary(currentKill, killNeeded)
+            bestiaryFormatting.base.preFormat(bestiary, nextLevel - 1, nextLevel).formatBestiary(currentKill, killNeeded),
         )
 
         addAsSingletonList(xpHourFormatting.base.formatText(xp))
@@ -275,7 +275,7 @@ object GhostCounter {
             Triple("Volta", Option.VOLTACOUNT.getInt(), voltaValue),
             Triple("Bag Of Cash", Option.BAGOFCASH.getInt(), 1_000_000),
             Triple("Scavenger Coins", Option.SCAVENGERCOINS.getInt(), 1),
-            Triple("Ghostly Boots", Option.GHOSTLYBOOTS.getInt(), 77_777)
+            Triple("Ghostly Boots", Option.GHOSTLYBOOTS.getInt(), 77_777),
         )
         val moneyMadeTips = buildList {
             for ((name, count, value) in priceMap) {
@@ -288,7 +288,7 @@ object GhostCounter {
         val moneyMadeWithClickableTips = Renderable.clickAndHover(
             textFormatting.moneyMadeFormat.formatText(moneyMade.addSeparators()),
             moneyMadeTips,
-            onClick = { OSUtils.copyToClipboard(moneyMadeTips.joinToString("\n").removeColor()) }
+            onClick = { OSUtils.copyToClipboard(moneyMadeTips.joinToString("\n").removeColor()) },
         )
         addAsSingletonList(textFormatting.moneyHourFormat.formatText(final))
         addAsSingletonList(moneyMadeWithClickableTips)
@@ -327,7 +327,7 @@ object GhostCounter {
                     },
                     "§eClick to import data!",
                     prefixColor = "§6",
-                    oneTimeClick = true
+                    oneTimeClick = true,
                 )
             }
         }
@@ -365,9 +365,8 @@ object GhostCounter {
                 var parse = true
                 if (skillPercent) {
                     percent = nf.parse(group("percent")).toFloat()
-                    val level =
-                        if (currentSkill == "Combat" && currentSkillLevel != -1) currentSkillLevel else XPInformation.getInstance()
-                            .getSkillInfo(skillName)?.level ?: 0
+                    val level = if (currentSkill == "Combat" && currentSkillLevel != -1) currentSkillLevel else XPInformation.getInstance()
+                        .getSkillInfo(skillName)?.level ?: 0
                     if (level > 0) {
                         totalSkillXp = SkillExperience.getExpForNextLevel(level)
                         currentSkillXp = totalSkillXp * percent / 100
@@ -419,11 +418,10 @@ object GhostCounter {
                     Option.SORROWCOUNT, Option.VOLTACOUNT, Option.PLASMACOUNT, Option.GHOSTLYBOOTS -> {
                         opt.add(1.0)
                         opt.add(1.0, true)
-                        storage?.totalMF = storage?.totalMF?.plus(group("mf").substring(4).toDouble())
-                            ?: group("mf").substring(4).toDouble()
+                        storage?.totalMF =
+                            storage?.totalMF?.plus(group("mf").substring(4).toDouble()) ?: group("mf").substring(4).toDouble()
                         Option.TOTALDROPS.add(1.0)
-                        if (opt == Option.SORROWCOUNT)
-                            Option.GHOSTSINCESORROW.set(0.0)
+                        if (opt == Option.SORROWCOUNT) Option.GHOSTSINCESORROW.set(0.0)
                         update()
                     }
 
@@ -459,7 +457,7 @@ object GhostCounter {
             when (val nextLevel = if (currentLevel >= 25) 26 else currentLevel + 1) {
                 26 -> {
                     storage?.bestiaryNextLevel = 26.0
-                    storage?.bestiaryCurrentKill = 250_000.0
+                    storage?.bestiaryCurrentKill = 100_000.0
                     storage?.bestiaryKillNeeded = 0.0
                 }
 
@@ -491,8 +489,7 @@ object GhostCounter {
         val stacks = event.inventoryItems
         val ghostStack = stacks.values.find { it.displayName.contains("Ghost") } ?: return
         val bestiaryNextLevel =
-            if ("§\\wGhost".toRegex().matches(ghostStack.displayName)) 1 else ghostStack.displayName.substring(8)
-                .romanToDecimal() + 1
+            if ("§\\wGhost".toRegex().matches(ghostStack.displayName)) 1 else ghostStack.displayName.substring(8).romanToDecimal() + 1
         storage?.bestiaryNextLevel = bestiaryNextLevel.toDouble()
         var kills = 0.0
         for (line in ghostStack.getLore()) {
@@ -523,6 +520,10 @@ object GhostCounter {
         event.transform(11, "combat.ghostCounter.ghostDisplayText") { element ->
             ConfigUtils.migrateIntArrayListToEnumArrayList(element, GhostDisplayEntry::class.java)
         }
+
+        event.transform(58, "combat.ghostCounter.textFormatting.bestiaryFormatting.showMax_progress") {
+            JsonPrimitive("%currentKill%/100k (%percentNumber%%)")
+        }
     }
 
     fun isEnabled() = IslandType.DWARVEN_MINES.isInIsland() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
index abcf2dbba722..fde0f51dac1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
@@ -18,27 +18,23 @@ object GhostData {
         Option.SKILLXPGAINED to 0.0
     )
 
+    // TODO repo
     val bestiaryData = mutableMapOf<Int, Int>().apply {
         for (i in 1..25) {
             this[i] = when (i) {
-                1 -> 5
-                2 -> 5
-                3 -> 5
-                4 -> 10
-                5 -> 25
-                6 -> 50
-                7 -> 100
-                8 -> 150
-                9 -> 150
-                10 -> 250
-                11 -> 750
-                12 -> 1_500
-                13 -> 2_000
-                14, 15, 16, 17 -> 2_500
-                18 -> 3_000
-                19, 20 -> 3_500
-                21 -> 25_000
-                22, 23, 24, 25 -> 50_000
+                1, 2, 3, 4, 5 -> 4
+                6 -> 20
+                7 -> 40
+                8, 9 -> 60
+                10 -> 100
+                11 -> 300
+                12 -> 600
+                13 -> 800
+                14, 15, 16, 17 -> 1_000
+                18 -> 1_200
+                19, 20 -> 1_400
+                21 -> 10_000
+                22, 23, 24, 25 -> 20_000
                 else -> 0
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostFormatting.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostFormatting.kt
index 183753e51c63..b58201899bc4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostFormatting.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostFormatting.kt
@@ -160,7 +160,7 @@ object GhostFormatting {
                 base = "  &6Bestiary %currentLevel%->%nextLevel%: &b%value%"
                 openMenu = "§cOpen Bestiary Menu !"
                 maxed = "%currentKill% (&c&lMaxed!)"
-                showMax_progress = "%currentKill%/250k (%percentNumber%%)"
+                showMax_progress = "%currentKill%/100k (%percentNumber%%)"
                 progress = "%currentKill%/%killNeeded%"
             }
             with(killHourFormatting) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
index baacbfa43ed8..6cf777b48cea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
@@ -141,5 +141,5 @@ object GhostUtil {
     }
 
     private fun percent(number: Double) =
-        100.0.coerceAtMost(((number / 250_000) * 100).roundToPrecision(4)).toString()
+        100.0.coerceAtMost(((number / 100_000) * 100).roundToPrecision(4)).toString()
 }

From 92ec20864b6653f86bb1a149c9d280e0ae03e62b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:29:21 +0200
Subject: [PATCH 481/721] better description

---
 .../at/hannibal2/skyhanni/config/features/gui/GUIConfig.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
index 74ab755c9940..37f3d3c42037 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
@@ -36,7 +36,7 @@ public class GUIConfig {
     @Accordion
     public ChromaConfig chroma = new ChromaConfig();
 
-    @ConfigOption(name = "Edit GUI Locations", desc = "Change the position of SkyHanni's overlays.")
+    @ConfigOption(name = "Edit GUI Locations", desc = "Opens the Position Editor, allows changing the position of SkyHanni's overlays.")
     @ConfigEditorButton(buttonText = "Edit")
     public Runnable positions = () -> GuiEditManager.openGuiPositionEditor(true);
 

From 532e748e8e65d8435c5bcc7939f950a0e05a3de7 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 18 Sep 2024 03:30:32 -0400
Subject: [PATCH 482/721] Fix: Garden Color in Messages (#2532)

---
 .../at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt | 7 ++++++-
 .../features/garden/visitor/GardenVisitorFeatures.kt       | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
index 3ae865ac82a1..8ad8d21dab1a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
@@ -72,9 +72,14 @@ object GardenPlotAPI {
         "spray.target",
         "§a§lSPRAYONATOR! §r§7You sprayed §r§aPlot §r§7- §r§b(?<plot>.*) §r§7with §r§a(?<spray>.*)§r§7!"
     )
+
+    /**
+     * REGEX-TEST: §9§lSPLASH! §r§6Your §r§aGarden §r§6was cleared of all active §r§aSprayonator §r§6effects!
+     * REGEX-TEST: §9§lSPLASH! §r§6Your §r§bGarden §r§6was cleared of all active §r§aSprayonator §r§6effects!
+     */
     private val portableWasherPattern by patternGroup.pattern(
         "spray.cleared.portablewasher",
-        "§9§lSPLASH! §r§6Your §r§bGarden §r§6was cleared of all active §r§aSprayonator §r§6effects!"
+        "§9§lSPLASH! §r§6Your §r§[ba]Garden §r§6was cleared of all active §r§aSprayonator §r§6effects!"
     )
 
     var plots = listOf<Plot>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index fef28450f719..aed4f7e7cffc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -80,9 +80,14 @@ object GardenVisitorFeatures {
     private var display = emptyList<List<Any>>()
 
     private val patternGroup = RepoPattern.group("garden.visitor")
+
+    /**
+     * REGEX-TEST: §a§r§aBanker Broadjaw §r§ehas arrived on your §r§aGarden§r§e!
+     * REGEX-TEST: §a§r§aBanker Broadjaw §r§ehas arrived on your §r§bGarden§r§e!
+     */
     private val visitorArrivePattern by patternGroup.pattern(
         "visitorarrive",
-        ".* §r§ehas arrived on your §r§bGarden§r§e!",
+        ".* §r§ehas arrived on your §r§[ba]Garden§r§e!",
     )
     private val copperPattern by patternGroup.pattern(
         "copper",

From ff1d69d6238b6898dfe4f7c9986661a0737a2100 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:31:04 +0200
Subject: [PATCH 483/721] Fix: Custom Scoreboard Errors (#2531)

---
 .../gui/customscoreboard/ScoreboardPattern.kt       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 1c6fb4282fec..0324da855ae3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -274,8 +274,13 @@ object ScoreboardPattern {
         "uselessgoblin",
         "^§7Kill goblins!$",
     )
+
+    /**
+     * REGEX-TEST: Remaining: §a1 goblin
+     * REGEX-TEST: Remaining: §a2 goblins
+     */
     val remainingGoblinPattern by miningSb.pattern(
-        "remaininggoblin", "^Remaining: §a\\d+ goblins$",
+        "remaininggoblin", "^Remaining: §a\\d+ goblins?$",
     )
     val yourGoblinKillsPattern by miningSb.pattern(
         "yourgoblin", "^Your kills: §c\\d+ ☠( §a\\(\\+\\d+\\))?$",
@@ -303,9 +308,13 @@ object ScoreboardPattern {
         "magmaboss",
         "^§7Boss: §[c6e]\\d{1,3}%$",
     )
+
+    /**
+     * REGEX-TEST: §7Damage Soaked:§629,446 §e(+271
+     */
     val damageSoakedPattern by combatSb.pattern(
         "damagesoaked",
-        "^§7Damage Soaked:",
+        "^§7Damage Soaked:.*",
     )
     val killMagmasPattern by combatSb.pattern(
         "killmagmas",

From c614724dd0a92d89fa96c3468be156a407f924db Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:50:08 +0200
Subject: [PATCH 484/721] stop initializing the map on every function call

Co-authored-by: Empa <42304516+itsempa@users.noreply.github.com>
---
 .../commands/tabcomplete/PlayerTabComplete.kt | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
index bf44282114e2..070ab478e083 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
@@ -15,6 +15,24 @@ object PlayerTabComplete {
 
     private val config get() = SkyHanniMod.feature.misc.commands.tabComplete
     private var vipVisits = listOf<String>()
+    private val ignoredCommandCategories = mapOf(
+        "f" to listOf(PlayerCategory.FRIENDS),
+        "friend" to listOf(PlayerCategory.FRIENDS),
+
+        "msg" to listOf(),
+        "w" to listOf(),
+        "tell" to listOf(),
+        "boop" to listOf(),
+
+        "visit" to listOf(),
+        "invite" to listOf(),
+        "ah" to listOf(),
+
+        "pv" to listOf(), // NEU's Profile Viewer
+        "shmarkplayer" to listOf(), // SkyHanni's Mark Player
+
+        "trade" to listOf(PlayerCategory.FRIENDS, PlayerCategory.PARTY),
+    )
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
@@ -34,41 +52,21 @@ object PlayerTabComplete {
     }
 
     fun handleTabComplete(command: String): List<String>? {
-        val commands = mapOf(
-            "f" to listOf(PlayerCategory.FRIENDS),
-            "friend" to listOf(PlayerCategory.FRIENDS),
-
-            "msg" to listOf(),
-            "w" to listOf(),
-            "tell" to listOf(),
-            "boop" to listOf(),
-
-            "visit" to listOf(),
-            "invite" to listOf(),
-            "ah" to listOf(),
-
-            "pv" to listOf(), // NEU's Profile Viewer
-            "shmarkplayer" to listOf(), // SkyHanni's Mark Player
-
-            "trade" to listOf(PlayerCategory.FRIENDS, PlayerCategory.PARTY)
-        )
-        val ignored = commands[command] ?: return null
+        val ignoredCategories = ignoredCommandCategories[command] ?: return null
 
         return buildList {
 
-            if (config.friends && PlayerCategory.FRIENDS !in ignored) {
-                FriendAPI.getAllFriends()
-                    .filter { it.bestFriend || !config.onlyBestFriends }
-                    .forEach { add(it.name) }
+            if (config.friends && PlayerCategory.FRIENDS !in ignoredCategories) {
+                FriendAPI.getAllFriends().filter { it.bestFriend || !config.onlyBestFriends }.forEach { add(it.name) }
             }
 
-            if (config.islandPlayers && PlayerCategory.ISLAND_PLAYERS !in ignored) {
+            if (config.islandPlayers && PlayerCategory.ISLAND_PLAYERS !in ignoredCategories) {
                 for (entity in EntityUtils.getPlayerEntities()) {
                     add(entity.name)
                 }
             }
 
-            if (config.party && PlayerCategory.PARTY !in ignored) {
+            if (config.party && PlayerCategory.PARTY !in ignoredCategories) {
                 for (member in PartyAPI.partyMembers) {
                     add(member)
                 }

From 780435a4a8594ed3c172fbb4c5bf240a70199042 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:35:33 +0200
Subject: [PATCH 485/721] Fix: Tungsten Detection on Alpha (#2437)

Co-authored-by: Empa <42304516+itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/OreBlock.kt      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index c5d9774b15bf..d9b76a35be94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.data.MiningAPI.inSpidersDen
 import at.hannibal2.skyhanni.utils.CollectionUtils.equalsOneOf
 import net.minecraft.block.BlockColored
 import net.minecraft.block.BlockSand
+import net.minecraft.block.BlockSilverfish
 import net.minecraft.block.BlockStainedGlass
 import net.minecraft.block.BlockStainedGlassPane
 import net.minecraft.block.BlockStone
@@ -222,7 +223,7 @@ enum class OreBlock(
         checkArea = { inGlacite },
     ),
     LOW_TIER_TUNGSTEN(
-        checkBlock = { it.block == Blocks.cobblestone },
+        checkBlock = ::isLowTierTungsten,
         checkArea = { inGlacite },
     ),
     HIGH_TIER_TUNGSTEN(
@@ -240,12 +241,10 @@ enum class OreBlock(
     }
 }
 
-private fun isLowTierMithril(state: IBlockState): Boolean {
-    return when (state.block) {
-        Blocks.wool -> state.getValue(BlockColored.COLOR) == EnumDyeColor.GRAY
-        Blocks.stained_hardened_clay -> state.getValue(BlockColored.COLOR) == EnumDyeColor.CYAN
-        else -> false
-    }
+private fun isLowTierMithril(state: IBlockState): Boolean = when (state.block) {
+    Blocks.wool -> state.getValue(BlockColored.COLOR) == EnumDyeColor.GRAY
+    Blocks.stained_hardened_clay -> state.getValue(BlockColored.COLOR) == EnumDyeColor.CYAN
+    else -> false
 }
 
 private fun isHighTierMithril(state: IBlockState): Boolean {
@@ -270,18 +269,21 @@ private fun isHardStoneHollows(state: IBlockState): Boolean {
 }
 
 private fun isHardstoneGlacite(state: IBlockState): Boolean =
-    (state.block == Blocks.stone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE) ||
+    (state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.STONE) ||
         (state.block == Blocks.wool && state.getValue(BlockColored.COLOR) == EnumDyeColor.GRAY)
 
 private fun isRedSand(state: IBlockState): Boolean =
     (state.block == Blocks.sand && state.getValue(BlockSand.VARIANT) == BlockSand.EnumType.RED_SAND)
 
-private fun isLowTierUmber(state: IBlockState): Boolean = state.block == Blocks.hardened_clay ||
-    (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
+private fun isLowTierUmber(state: IBlockState): Boolean =
+    state.block == Blocks.hardened_clay || (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
 
 private fun isHighTierUmber(state: IBlockState): Boolean =
     (state.block == Blocks.double_stone_slab2 && state.getValue(BlockStoneSlabNew.VARIANT) == BlockStoneSlabNew.EnumType.RED_SANDSTONE)
 
+private fun isLowTierTungsten(state: IBlockState): Boolean =
+    state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.COBBLESTONE
+
 private fun IBlockState.isGemstoneWithColor(color: EnumDyeColor): Boolean {
     return when (this.block) {
         Blocks.stained_glass -> color == this.getValue(BlockStainedGlass.COLOR)

From 7b4a810019ad5aab0b689f9294cbde3eaeccb188 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:22:04 +0200
Subject: [PATCH 486/721] Version 0.27 Beta 9

---
 docs/CHANGELOG.md                             | 46 +++++++++++++++++++
 docs/FEATURES.md                              |  5 ++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f42ddfffc477..a0795097cb22 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -46,6 +46,11 @@
     + Use /shhoppitystats for live stats.
 + Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 + Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
++ Added a draggable list for Hoppity's Collection menu rabbit highlighting. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
+    + Factory/Shop milestones = Yellow/Gold.
+    + Stray rabbits = Dark Aqua.
+    + Abi = Dark Green.
++ Added a toggle to highlight found rabbits in Hoppity's Collection menu. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
 
 #### The Carnival Features
 
@@ -151,6 +156,7 @@
 + Added per-election season Diana Trackers. - !nea (https://github.com/hannibal002/SkyHanni/pull/2487)
     + This includes the Diana Profit Tracker and the Mythological Creature Tracker.
     + The data is stored moving forward, but there is currently no way to view anything other than the current year.
++ Changed the Diana Profit Tracker and Mythological Creature Tracker to always be visible when holding the Ancestral Spade in hand, even if Diana is not the mayor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2496)
 
 #### Scoreboard Improvements
 
@@ -213,11 +219,16 @@
 #### Rift Improvements
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
++ Added Path Finder to Enigma Soul waypoints in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2515)
 
 #### Dungeon Improvements
 
 + Added dungeon stars and crimson stars to estimated item value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2492)
 
+#### The Carnival Improvements
+
++ Updated the Zombie Shootout Diamond color to be a deeper blue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2511)
+
 #### Misc Improvements
 
 + Updated Last Server to also alert for servers you have just left. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2494)
@@ -262,6 +273,11 @@
 + Fixed Powder for 10 Levels overflowing over the max level. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2422)
 + Fixed Glacite Tunnel Maps repeatedly showing the last commission goal even when there is no new commission. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2432)
 + Fixed Mineshaft Pity Counter not working with some ore types. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2436)
++ Fixed Tungsten Ore and Hardstone detection after the mining update. - Empa (https://github.com/hannibal002/SkyHanni/pull/2437)
++ Fixed item category errors after the new mining update. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2529)
++ Fixed blocks mined by Efficient Miner not being detected. - Empa (https://github.com/hannibal002/SkyHanni/pull/2526)
++ Fixed Corpse Tracker resetting items between restarts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2528)
++ Fixed the Corpse Tracker not displaying while in the Mineshaft. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2516)
 
 #### Scoreboard Fixes
 
@@ -280,6 +296,9 @@
 + Fixed Custom Scoreboard errors while doing Carnival activities. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2455)
 + Fixed Custom Scoreboard error while in a Dungeon Queue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2441)
 + Fixed Custom Scoreboard Error during the Barry Protestors Quest. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2480)
++ Fixed a Custom Scoreboard error during the Magma Boss Fight and Goblin Raid. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2531)
++ Fixed a Custom Scoreboard error while in the Dojo. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2519)
++ Fixed a Custom Scoreboard error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2510)
 
 #### Hoppity Fixes
 
@@ -312,6 +331,18 @@
 #### Garden Fixes
 
 + Fixed outdated Dicer gemstone fortune in FF guide. - Not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2499)
++ Fixed some garden messages not being blocked. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2532)
++ Fixed active sprays not being removed from the GUI when using a washer. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2532)
+
+#### Combat Fixes
+
++ Updated Ghost Counter bestiary tiers to reflect Hypixel reducing the max kills needed from 250K to 100K. - Luna (https://github.com/hannibal002/SkyHanni/pull/2533)
++ Fixed a case where the Broodmother countdown could be wildly inaccurate. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2513)
+
+#### The Carnival Fixes
+
++ Fixed two "Catch a Fish" carnival goals not being properly detected from chat. - Luna (https://github.com/hannibal002/SkyHanni/pull/2517)
++ Fixed the bounding box of baby zombies in Zombie Shootout. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2512)
 
 #### Misc Fixes
 
@@ -327,6 +358,8 @@
 + Fixed performance issues with a high number of dungeon runs in one session. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2504)
 + Fixed `/shedittracker duplex` not working. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2501)
 + Fixed "Last Server Joined" spamming the chat. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2495)
++ Fixed lag spikes in Path Finder. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2525)
++ Fixed old mayor perks not being marked as inactive when the mayor changes. - Luna (https://github.com/hannibal002/SkyHanni/pull/2524)
 
 ### Technical Details
 
@@ -366,6 +399,19 @@
 + Updated HandleEvent onlyOnIslands to handle multiple islands. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2502)
 + Added an abstract "bucketed" tracker that can store where items came from. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
     + Takes an enum in instantiation and has built-in logic for swapping display types.
++ Graph Editor improvements. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2515)
+    + Code cleanup in Graph Editor, moving node lists into their own class.
+    + Fixed searchable tag list.
+    + Added more graph node tags; only display certain tags on specific islands in the editor.
+    + Added an option to limit the maximum render range of nodes and edges in the Graph Editor for better performance.
++ Hoppity's Collection highlighting now updates on event triggers instead of every frame. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
+
+### Removed Features
+
++ Removed Wild Strawberry Dye notification. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2520)
+    + Artist's Abode now sends a lobby-wide message for dye drops, making the notification obsolete.
++ Removed `Only Requirement Not Met` and `Highlight Requirement Rabbits` config options. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
+    + Replaced then with a draggable list of different Hoppity collection highlight options.
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 9c67c0de1246..cbf3abacf756 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -989,6 +989,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Use /shhoppitystats for live stats.
 + Added optional warning when Hoppity calls you with a rabbit to sell. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
 + Added hotkey for picking up Abiphone calls from Hoppity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2272)
++ Added a draggable list for Hoppity's Collection menu rabbit highlighting. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
+    + Factory/Shop milestones = Yellow/Gold.
+    + Stray rabbits = Dark Aqua.
+    + Abi = Dark Green.
++ Added a toggle to highlight found rabbits in Hoppity's Collection menu. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
 
 ### The Carnival
 
diff --git a/root.gradle.kts b/root.gradle.kts
index ebdebe043c9b..f799ed79d6a1 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.8"
+    version = "0.27.Beta.9"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 09a293829e25..cab1b690ffb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.8",
+    version = "0.27.Beta.9",
 )
 class SkyHanniMod {
 

From 17f900c1d54ba6007de7e6cf4f62ded5ce0655e3 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Wed, 18 Sep 2024 16:14:49 +0200
Subject: [PATCH 487/721] Fix: Revert Gauntlet item category change (#2534)

---
 src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt     | 6 +++---
 src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index 3fb643c7c8a3..987a864af77e 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -75,7 +75,7 @@ object ReforgeAPI {
         fun isValid(itemCategory: ItemCategory?, internalName: NEUInternalName) = when (type) {
             ReforgeType.SWORD -> setOf(
                 ItemCategory.SWORD,
-                ItemCategory.PICKAXE_AND_SWORD,
+                ItemCategory.GAUNTLET,
                 ItemCategory.LONGSWORD,
                 ItemCategory.FISHING_WEAPON,
             ).contains(itemCategory)
@@ -98,7 +98,7 @@ object ReforgeAPI {
             ReforgeType.PICKAXE ->
                 itemCategory == ItemCategory.PICKAXE ||
                     itemCategory == ItemCategory.DRILL ||
-                    itemCategory == ItemCategory.PICKAXE_AND_SWORD
+                    itemCategory == ItemCategory.GAUNTLET
 
             ReforgeType.EQUIPMENT -> setOf(
                 ItemCategory.CLOAK,
@@ -111,7 +111,7 @@ object ReforgeAPI {
             ReforgeType.ROD -> itemCategory == ItemCategory.FISHING_ROD || itemCategory == ItemCategory.FISHING_WEAPON
             ReforgeType.SWORD_AND_ROD -> setOf(
                 ItemCategory.SWORD,
-                ItemCategory.PICKAXE_AND_SWORD,
+                ItemCategory.GAUNTLET,
                 ItemCategory.LONGSWORD,
                 ItemCategory.FISHING_ROD,
                 ItemCategory.FISHING_WEAPON,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
index 08272ed0898b..43961f61d31d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -12,7 +12,7 @@ enum class ItemCategory {
     FISHING_WEAPON,
     FISHING_ROD,
     AXE,
-    PICKAXE_AND_SWORD,
+    GAUNTLET,
     HOE,
     PICKAXE,
     SHOVEL,
@@ -66,7 +66,7 @@ enum class ItemCategory {
         fun Collection<ItemCategory>.containsItem(stack: ItemStack?) =
             stack?.getItemCategoryOrNull()?.let { this.contains(it) } ?: false
 
-        val miningTools = listOf(PICKAXE, DRILL, PICKAXE_AND_SWORD)
+        val miningTools = listOf(PICKAXE, DRILL, GAUNTLET)
 
         val armor = setOf(HELMET, CHESTPLATE, LEGGINGS, BOOTS)
     }

From ae23866e8cd6264f6c55e6891fcfb9e748f91152 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:40:10 +0200
Subject: [PATCH 488/721] fix (#2545)

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
---
 .../features/gui/customscoreboard/ScoreboardPattern.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 0324da855ae3..fb014cc29243 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -246,13 +246,17 @@ object ScoreboardPattern {
         "raffleuseless",
         "^(Find tickets on the|ground and bring them|to the raffle box)$",
     )
+
+    /**
+     * REGEX-TEST: Tickets: §a8 §7(17.4%)
+     */
     val raffleTicketsPattern by miningSb.pattern(
         "raffletickets",
-        "^Tickets: §a\\d+ §7\\(\\d{1,3}\\.\\d%\\)$",
+        "Tickets: §a\\d+ §7\\(\\d+(\\.\\d)?%\\)",
     )
     val rafflePoolPattern by miningSb.pattern(
         "rafflepool",
-        "^Pool: §6\\d+§8/500$",
+        "Pool: §6\\d+",
     )
     val mithrilUselessPattern by miningSb.pattern(
         "mithriluseless",

From a900bd4a3df60664c5de758a76644871cba8abbd Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:46:35 +0200
Subject: [PATCH 489/721] Fix: Corpse Tracker not being modifed by
 /shdefaultoptions (#2549)

---
 .../skyhanni/config/features/mining/CorpseTrackerConfig.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
index 61d3b19594a7..229883c83352 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CorpseTrackerConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features.mining;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
@@ -11,6 +12,7 @@ public class CorpseTrackerConfig {
     @Expose
     @ConfigOption(name = "Enabled", desc = "Enable the Corpse Tracker overlay for Glacite Mineshafts.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean enabled = false;
 
     @Expose

From 94c2cac32296cc3c003bab78ea425e20539d218a Mon Sep 17 00:00:00 2001
From: Miestiek <58041219+Miestiek@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:00:18 +0200
Subject: [PATCH 490/721] Improvment: Click on Garden Shopping List now uses
 /viewrecipe instead of /recipe (#2505)

Co-authored-by: MysticKillerBear <58041219+MysticKillerBear@users.noreply.github.com>
---
 .../skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
index e10d1be36da4..6ecaa5491496 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
@@ -109,7 +109,7 @@ object GardenVisitorSupercraft {
         if (event.slotId != 31) return
         event.cancel()
         if (lastClick.passedSince() > 0.3.seconds) {
-            HypixelCommands.recipe(lastSuperCraftMaterial)
+            HypixelCommands.viewRecipe(lastSuperCraftMaterial)
             lastClick = SimpleTimeMark.now()
         }
     }

From 20a0aeb8cc9e795adf54cafbf381ab5c9dfe2595 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Fri, 20 Sep 2024 12:52:14 +0200
Subject: [PATCH 491/721] Fix: Visitor Supercraft use internal name (#2552)

---
 .../skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
index 6ecaa5491496..f441d17ab6a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
@@ -84,7 +84,7 @@ object GardenVisitorSupercraft {
         hasIngredients = true
         for ((key, value) in ingredientReqs) {
             val sackItem = key.asInternalName().getAmountInSacks()
-            lastSuperCraftMaterial = internalName.itemName.removeColor()
+            lastSuperCraftMaterial = internalName.asString()
             if (sackItem < value * amount) {
                 hasIngredients = false
                 break

From 23d779a47fdd114cad12552603b931fc2a31c318 Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <thatgravyboat@gmail.com>
Date: Fri, 20 Sep 2024 17:06:51 -0230
Subject: [PATCH 492/721] Fix: github source checking (#2548)

---
 .../tweaker/DownloadSourceChecker.java         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
index 5fb46592eab4..5672ee87cd7e 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
@@ -1,7 +1,5 @@
 package at.hannibal2.skyhanni.tweaker;
 
-import at.hannibal2.skyhanni.SkyHanniMod;
-
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -16,7 +14,8 @@
 
 public class DownloadSourceChecker {
 
-    private static final String GITHUB_REPO_TEXT = "repo_id=511310721";
+    private static final String GITHUB_REPO = "511310721";
+    private static final String GITHUB_REPO_TEXT = "repo_id=" + GITHUB_REPO;
     private static final String MODRINTH_URL = "/data/byNkmv5G/";
     private static final String THE_PASSWORD = "danger";
 
@@ -96,11 +95,12 @@ private static void openMenu(URI host) {
             }
         ));
 
-        String version = SkyHanniMod.Companion.getVersion();
+        // TODO FIX THIS CAUSING CLASS LOADING AND CRASHING
+        //String version = SkyHanniMod.Companion.getVersion();
         JOptionPane.showOptionDialog(
             frame,
             String.format(String.join("\n", SECURITY_POPUP), uriToSimpleString(host)),
-            "SkyHanni " + version + " Security Error",
+            "SkyHanni Security Error",
             JOptionPane.DEFAULT_OPTION,
             JOptionPane.ERROR_MESSAGE,
             null,
@@ -124,8 +124,12 @@ private static URI getDangerousHost() {
             URI host = getHost(file);
             if (host == null) return null;
 
-            if (host.getHost().equals("objects.githubusercontent.com") && host.getQuery().contains(GITHUB_REPO_TEXT)) {
-                return null;
+            if (host.getHost().equals("objects.githubusercontent.com")) {
+                if (host.getQuery().contains(GITHUB_REPO_TEXT)) {
+                    return null;
+                } else if (host.getPath().contains("/" + GITHUB_REPO + "/")) {
+                    return null;
+                }
             } else if (host.getHost().equals("cdn.modrinth.com") && host.getPath().startsWith(MODRINTH_URL)) {
                 return null;
             }

From a267da2c57fdc765a540540505db8c9c6ed66231 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:44:00 -0400
Subject: [PATCH 493/721] Fixes & Improvements: Hoppity Rework (#2488)

---
 .../skyhanni/events/hoppity/EggFoundEvent.kt  |  10 +
 .../features/event/hoppity/HoppityAPI.kt      | 141 ++++++-----
 .../event/hoppity/HoppityEggLocator.kt        |  11 +-
 .../features/event/hoppity/HoppityEggType.kt  |   4 +-
 .../event/hoppity/HoppityEggsCompactChat.kt   | 138 ++++++-----
 .../event/hoppity/HoppityEggsManager.kt       |  91 +++----
 .../ChocolateFactoryBarnManager.kt            |   2 +-
 .../ChocolateFactoryStrayTracker.kt           | 230 +++++++++---------
 8 files changed, 334 insertions(+), 293 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
new file mode 100644
index 000000000000..2cd81811f272
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
@@ -0,0 +1,10 @@
+package at.hannibal2.skyhanni.events.hoppity
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType
+
+class EggFoundEvent(
+    val type: HoppityEggType,
+    val slotIndex: Int?,
+    val note: String?,
+) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 5c63fe3a800a..6c42f8a17002 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -3,50 +3,55 @@ package at.hannibal2.skyhanni.features.event.hoppity
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
 import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPattern
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzRarity.DIVINE
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.SkyblockSeason
-import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
 object HoppityAPI {
 
-    private var hoppityEggChat = mutableListOf<String>()
+    private var messageCount = 0
     private var duplicate = false
     private var lastRarity = ""
     private var lastName = ""
     private var newRabbit = false
-    private var lastChatMeal: HoppityEggType? = null
+    private var lastMeal: HoppityEggType? = null
     private var lastDuplicateAmount: Long? = null
-    private var rabbitBought = false
 
     val hoppityRarities by lazy { LorenzRarity.entries.filter { it <= DIVINE } }
 
-    private fun resetChatData() {
-        this.hoppityEggChat = mutableListOf()
+    private fun resetRabbitData() {
+        this.messageCount = 0
         this.duplicate = false
         this.newRabbit = false
         this.lastRarity = ""
         this.lastName = ""
-        this.lastChatMeal = null
+        this.lastMeal = null
         this.lastDuplicateAmount = null
-        this.rabbitBought = false
     }
 
     fun isHoppityEvent() = (SkyblockSeason.currentSeason == SkyblockSeason.SPRING || SkyHanniMod.feature.dev.debug.alwaysHoppitys)
-
     fun rarityByRabbit(rabbit: String): LorenzRarity? = hoppityRarities.firstOrNull { it.chatColorCode == rabbit.substring(0, 2) }
 
     /**
@@ -59,6 +64,14 @@ object HoppityAPI {
         "(?:§.)*?(?<milestone>\\d{1,2})[a-z]{2} Chocolate Milestone",
     )
 
+    /**
+     * REGEX-TEST: §6§lGolden Rabbit §8- §aSide Dish
+     */
+    private val sideDishNamePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "rabbit.sidedish",
+        "(?:§.)*?Golden Rabbit (?:§.)?- (?:§.)?Side Dish"
+    )
+
     /**
      * REGEX-TEST: §7Reach §6300B Chocolate §7all-time to
      * REGEX-TEST: §7Reach §61k Chocolate §7all-time to unlock
@@ -77,99 +90,99 @@ object HoppityAPI {
         "§7Spend §6(?<amount>[\\d.MBk]*) Chocolate §7in.*",
     )
 
-    fun fireSideDishMessage() {
-        LorenzChatEvent(
-            "§d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!",
-            ChatComponentText(""),
-        ).postAndCatch()
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onTick(event: SecondPassedEvent) {
+        if (!ChocolateFactoryAPI.inChocolateFactory) return
+        InventoryUtils.getItemsInOpenChest().filter {
+            it.stack.hasDisplayName() &&
+            it.stack.getMinecraftId().toString() == "minecraft:skull" &&
+            it.stack.getLore().isNotEmpty()
+        }.forEach {
+            ChocolateFactoryStrayTracker.strayCaughtPattern.matchMatcher(it.stack.displayName) {
+                ChocolateFactoryStrayTracker.handleStrayClicked(it)
+                when(groupOrNull("name") ?: return@matchMatcher) {
+                    "Fish the Rabbit" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
+                    "El Dorado" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
+                    else -> return@matchMatcher
+                }
+            }
+        }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        val index = event.slot?.slotIndex ?: return
-        if (index == -999) return
+        val index = event.slot?.slotIndex?.takeIf { it != -999 } ?: return
 
         val clickedStack = InventoryUtils.getItemsInOpenChest()
             .find { it.slotNumber == event.slot.slotNumber && it.hasStack }
             ?.stack ?: return
         val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
 
+        sideDishNamePattern.matchMatcher(nameText) {
+            EggFoundEvent(SIDE_DISH, index, null).post()
+            lastMeal = SIDE_DISH
+            attemptFireRabbitFound()
+        }
         milestoneNamePattern.matchMatcher(nameText) {
-            val itemLore = clickedStack.getLore()
-            if (!itemLore.any { it == "§eClick to claim!" }) return
-
-            // Will never match both all time and shop patterns together
-            allTimeLorePattern.firstMatcher(clickedStack.getLore()) {
-                LorenzChatEvent(
-                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lChocolate Milestone Rabbit §r§din the Chocolate Factory§r§d!",
-                    ChatComponentText(""),
-                ).postAndCatch()
-            }
-
-            shopLorePattern.firstMatcher(clickedStack.getLore()) {
-                LorenzChatEvent(
-                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lShop Milestone Rabbit §r§din the Chocolate Factory§r§d!",
-                    ChatComponentText(""),
-                ).postAndCatch()
+            clickedStack.getLore().let {
+                if (!it.any { line -> line == "§eClick to claim!" }) return
+                allTimeLorePattern.firstMatcher(it) {
+                    EggFoundEvent(CHOCOLATE_FACTORY_MILESTONE, index, null).post()
+                    lastMeal = CHOCOLATE_FACTORY_MILESTONE
+                    attemptFireRabbitFound()
+                }
+                shopLorePattern.firstMatcher(it) {
+                    EggFoundEvent(CHOCOLATE_SHOP_MILESTONE, index, null).post()
+                    lastMeal = CHOCOLATE_SHOP_MILESTONE
+                    attemptFireRabbitFound()
+                }
             }
         }
     }
 
-    // Dumbed down version of the Compact Chat for Hoppity's,
-    // with the additional native context of side dishes
-    fun handleChat(event: LorenzChatEvent) {
-        HoppityEggsManager.eggFoundPatterns.forEach {
-            it.matchMatcher(event.message) {
-                resetChatData()
-                lastChatMeal = getEggType(event)
-                attemptFire(event)
-            }
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        eggFoundPattern.matchMatcher(event.message) {
+            resetRabbitData()
+            lastMeal = getEggType(event)
+            lastMeal?.let { EggFoundEvent(it, null, groupOrNull("note")).post() }
+            attemptFireRabbitFound()
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
             if (group("rabbitname").equals(lastName)) {
-                rabbitBought = true
-                lastChatMeal = HoppityEggType.BOUGHT
-                attemptFire(event)
+                lastMeal = HoppityEggType.BOUGHT
+                EggFoundEvent(HoppityEggType.BOUGHT, null, null).post()
+                attemptFireRabbitFound()
             }
         }
 
         HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
-            // The only cases where "You found ..." will come in with more than 1 message,
-            // or empty for hoppityEggChat, is where the rabbit was purchased from hoppity,
-            // In the case of buying, we want to reset variables to a clean state during this capture,
-            // as the important capture for the purchased message is the final message in
-            // the chain; "You found [rabbit]" -> "Dupe/New Rabbit" -> "You bought [rabbit]"
-            if ((hoppityEggChat.isEmpty() || hoppityEggChat.size > 1)) {
-                resetChatData()
-            }
-
             lastName = group("name")
             lastRarity = group("rarity")
-            attemptFire(event)
+            attemptFireRabbitFound()
         }
 
         HoppityEggsManager.newRabbitFound.matchMatcher(event.message) {
             newRabbit = true
             groupOrNull("other")?.let {
-                attemptFire(event)
+                attemptFireRabbitFound()
                 return
             }
-            attemptFire(event)
+            attemptFireRabbitFound()
         }
     }
 
-    fun attemptFire(event: LorenzChatEvent, lastDuplicateAmount: Long? = null) {
+    fun attemptFireRabbitFound(lastDuplicateAmount: Long? = null) {
         lastDuplicateAmount?.let {
             this.lastDuplicateAmount = it
-        }
-        hoppityEggChat.add(event.message)
-        if (lastDuplicateAmount != null) {
             this.duplicate = true
         }
-        val lastChatMeal = lastChatMeal ?: return
-        if (hoppityEggChat.size == 3) {
-            RabbitFoundEvent(lastChatMeal, duplicate, lastName, lastDuplicateAmount ?: 0).post()
-        }
+        messageCount++
+        val lastChatMeal = lastMeal ?: return
+        if (messageCount != 3) return
+        RabbitFoundEvent(lastChatMeal, duplicate, lastName, lastDuplicateAmount ?: 0).post()
+        resetRabbitData()
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 0d5bfefa8878..8e9e68e16731 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
@@ -8,6 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
+import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -59,6 +61,11 @@ object HoppityEggLocator {
     var currentEggType: HoppityEggType? = null
     var currentEggNote: String? = null
 
+    @HandleEvent
+    fun onEggFound(event: EggFoundEvent) {
+        if (event.type.isResetting) resetData()
+    }
+
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         resetData()
@@ -168,10 +175,6 @@ object HoppityEggLocator {
 
     private fun shouldShowAllEggs() = config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
 
-    fun eggFound() {
-        resetData()
-    }
-
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
         if (!isEnabled()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
index 23e00cf88cdb..5371816e1319 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt
@@ -17,7 +17,8 @@ enum class HoppityEggType(
     SIDE_DISH("Side Dish", "§6§l", -1),
     BOUGHT("Bought", "§a", -1),
     CHOCOLATE_SHOP_MILESTONE("Shop Milestone", "§6", -1),
-    CHOCOLATE_FACTORY_MILESTONE("Chocolate Milestone", "§6", -1)
+    CHOCOLATE_FACTORY_MILESTONE("Chocolate Milestone", "§6", -1),
+    STRAY("Stray Rabbit", "§a", -1)
     ;
 
     fun timeUntil(): Duration {
@@ -39,6 +40,7 @@ enum class HoppityEggType(
     }
 
     fun isClaimed() = claimed
+    val isResetting get() = resettingEntries.contains(this)
     val formattedName get() = "${if (isClaimed()) "§7§m" else mealColor}$mealName:$mealColor"
     val coloredName get() = "$mealColor$mealName"
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index 6bc1c8dfc276..abbdff1f023b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -1,25 +1,34 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.event.hoppity.HoppityEggsConfig
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.BOUGHT
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
-import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPatterns
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.STRAY
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPattern
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 typealias RarityType = HoppityEggsConfig.CompactRarityTypes
 
+@SkyHanniModule
 object HoppityEggsCompactChat {
 
     private var hoppityEggChat = mutableListOf<String>()
@@ -30,31 +39,32 @@ object HoppityEggsCompactChat {
     private var newRabbit = false
     private var lastChatMeal: HoppityEggType? = null
     private var lastDuplicateAmount: Long? = null
-    private var rabbitBought = false
     private val config get() = ChocolateFactoryAPI.config
+    private val eventConfig get() = SkyHanniMod.feature.event.hoppityEggs
 
-    fun compactChat(event: LorenzChatEvent, lastDuplicateAmount: Long? = null) {
+    fun compactChat(event: LorenzChatEvent? = null, lastDuplicateAmount: Long? = null) {
+        if (!HoppityEggsManager.config.compactChat) return
         lastDuplicateAmount?.let {
             this.lastDuplicateAmount = it
-        }
-        if (!HoppityEggsManager.config.compactChat) return
-        event.blockedReason = "compact_hoppity"
-        hoppityEggChat.add(event.message)
-        if (lastDuplicateAmount != null) {
             this.duplicate = true
         }
-        if (hoppityEggChat.size == 3) {
-            DelayedRun.runDelayed(200.milliseconds) {
-                sendCompact()
-            }
+        event?.let {
+            it.blockedReason = "compact_hoppity"
+            hoppityEggChat.add(it.message)
         }
+        if (hoppityEggChat.size == 3) sendCompact()
     }
 
     private fun sendCompact() {
-        if (hoppityEggChat.isNotEmpty()) {
+        if (lastChatMeal.let { HoppityEggType.resettingEntries.contains(it) } && eventConfig.sharedWaypoints) {
+            DelayedRun.runDelayed(5.milliseconds) {
+                clickableCompact(HoppityEggsManager.getAndDisposeWaypointOnclick())
+                resetCompactData()
+            }
+        } else {
             ChatUtils.hoverableChat(createCompactMessage(), hover = hoppityEggChat, prefix = false)
+            resetCompactData()
         }
-        resetCompactData()
     }
 
     private fun resetCompactData() {
@@ -66,15 +76,16 @@ object HoppityEggsCompactChat {
         this.lastProfit = ""
         this.lastChatMeal = null
         this.lastDuplicateAmount = null
-        this.rabbitBought = false
     }
 
     private fun createCompactMessage(): String {
-        val mealName = lastChatMeal?.coloredName ?: ""
-        val mealNameFormatted = if (rabbitBought) "§aBought Rabbit"
-        else if (lastChatMeal == SIDE_DISH) "§6§lSide Dish §r§6Egg"
-        else if (lastChatMeal == CHOCOLATE_SHOP_MILESTONE || lastChatMeal == CHOCOLATE_FACTORY_MILESTONE) "§6§lMilestone Rabbit"
-        else "$mealName Egg"
+        val mealNameFormat = when (lastChatMeal) {
+            BOUGHT -> "§aBought Rabbit"
+            SIDE_DISH -> "§6§lSide Dish §r§6Egg"
+            CHOCOLATE_SHOP_MILESTONE, CHOCOLATE_FACTORY_MILESTONE -> "§6§lMilestone Rabbit"
+            STRAY -> "§aStray Rabbit"
+            else -> "${lastChatMeal?.coloredName ?: ""} Egg"
+        }
 
         val rarityConfig = HoppityEggsManager.config.rarityInCompact
         return if (duplicate) {
@@ -85,39 +96,72 @@ object HoppityEggsCompactChat {
 
             val showDupeRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.DUPE }
             val timeStr = if (config.showDuplicateTime) ", §a+§b$timeFormatted§7" else ""
-            "$mealNameFormatted! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName §7(§6+$format Chocolate§7$timeStr)"
+            "$mealNameFormat! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName §7(§6+$format Chocolate§7$timeStr)"
         } else if (newRabbit) {
             val showNewRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.NEW }
-            "$mealNameFormatted! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)"
+            "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)"
         } else "?"
     }
 
-    fun handleChat(event: LorenzChatEvent) {
-        eggFoundPatterns.forEach {
-            it.matchMatcher(event.message) {
-                resetCompactData()
-                lastChatMeal = getEggType(event)
-                compactChat(event)
-            }
+    private fun clickableCompact(onClick: () -> Unit) {
+        val hover = hoppityEggChat.joinToString("\n") + " \n§eClick here to share the location of this chocolate egg with the server!"
+        hoppityEggChat.clear()
+        ChatUtils.clickableChat(
+            createCompactMessage(),
+            hover = hover,
+            onClick = onClick,
+            expireAt = 30.seconds.fromNow(),
+            oneTimeClick = true,
+            prefix = false,
+        )
+    }
+
+    @HandleEvent
+    fun onEggFound(event: EggFoundEvent) {
+        if (!HoppityEggsManager.config.compactChat || HoppityEggType.resettingEntries.contains(event.type) || event.type == BOUGHT) return
+        lastChatMeal = event.type
+        hoppityEggChat.add(
+            when (event.type) {
+                SIDE_DISH ->
+                    "§d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!"
+
+                CHOCOLATE_FACTORY_MILESTONE ->
+                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lChocolate Milestone Rabbit §r§din the Chocolate Factory§r§d!"
+
+                CHOCOLATE_SHOP_MILESTONE ->
+                    "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lShop Milestone Rabbit §r§din the Chocolate Factory§r§d!"
+
+                STRAY -> {
+                    "§d§lHOPPITY'S HUNT §r§dYou found a §r§aStray Rabbit§r§d!".also {
+                        // If it was an El Dorado dupe stray, we don't want hanging data
+                        DelayedRun.runDelayed(300.milliseconds) { resetCompactData() }
+                    }
+                }
+
+                else ->
+                    "§d§lHOPPITY'S HUNT §r§7Unknown Egg Type?"
+            },
+        )
+        if (hoppityEggChat.size == 3) sendCompact()
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        eggFoundPattern.matchMatcher(event.message) {
+            resetCompactData()
+            lastChatMeal = getEggType(event)
+            compactChat(event)
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
             if (group("rabbitname").equals(lastName)) {
-                rabbitBought = true
+                lastChatMeal = BOUGHT
                 compactChat(event)
             }
         }
 
         HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
-            // The only cases where "You found ..." will come in with more than 1 message,
-            // or empty for hoppityEggChat, is where the rabbit was purchased from hoppity,
-            // In the case of buying, we want to reset variables to a clean state during this capture,
-            // as the important capture for the purchased message is the final message in
-            // the chain; "You found [rabbit]" -> "Dupe/New Rabbit" -> "You bought [rabbit]"
-            if ((hoppityEggChat.isEmpty() || hoppityEggChat.size > 1)) {
-                resetCompactData()
-            }
-
             lastName = group("name")
             lastRarity = group("rarity")
             compactChat(event)
@@ -138,20 +182,4 @@ object HoppityEggsCompactChat {
             compactChat(event)
         }
     }
-
-    fun clickableCompact(onClick: () -> Unit): Boolean = if (hoppityEggChat.isNotEmpty() && !rabbitBought && lastChatMeal != null &&
-        HoppityEggType.resettingEntries.contains(lastChatMeal)
-    ) {
-        val hover = hoppityEggChat.joinToString("\n") + " \n§eClick here to share the location of this chocolate egg with the server!"
-        hoppityEggChat.clear()
-        ChatUtils.clickableChat(
-            createCompactMessage(),
-            hover = hover,
-            onClick = onClick,
-            expireAt = 30.seconds.fromNow(),
-            oneTimeClick = true,
-            prefix = false,
-        )
-        true
-    } else false
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index bec966128dd3..75b65fdc48ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -1,10 +1,13 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
+import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -21,11 +24,9 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.now
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.SoundUtils
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
-import java.util.regex.Pattern
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
@@ -38,36 +39,12 @@ object HoppityEggsManager {
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§9Chocolate Lunch Egg §r§don a ledge next to the stairs up§r§d!
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§aChocolate Dinner Egg §r§dbehind Emissary Sisko§r§d!
      * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§9Chocolate Lunch Egg §r§dnear the Diamond Essence Shop§r§d!
-     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!
      */
-    private val eggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
+    val eggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "egg.found",
         "§d§lHOPPITY'S HUNT §r§dYou found a §r§.Chocolate (?<meal>\\w+) Egg §r§d(?<note>.*)§r§d!",
     )
 
-    /**
-     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou found a §r§6§lSide Dish §r§6Egg §r§din the Chocolate Factory§r§d!
-     */
-    private val sideDishEggFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
-        "sidedish.found",
-        "§d§lHOPPITY'S HUNT §r§dYou found a §r§6§l(?<meal>.*) §r§6Egg §r§din the Chocolate Factory§r§d!",
-    )
-
-    /**
-     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lShop Milestone Rabbit §r§din the Chocolate Factory§r§d!
-     * REGEX-TEST: §d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§lChocolate Milestone Rabbit §r§din the Chocolate Factory§r§d!
-     */
-    private val milestoneRabbitFoundPattern by ChocolateFactoryAPI.patternGroup.pattern(
-        "milestone.claimed",
-        "§d§lHOPPITY'S HUNT §r§dYou claimed a §r§6§l(?<meal>[\\w ]+) Rabbit §r§din the Chocolate Factory§r§d!",
-    )
-
-    val eggFoundPatterns: List<Pattern> = listOf(
-        eggFoundPattern,
-        sideDishEggFoundPattern,
-        milestoneRabbitFoundPattern,
-    )
-
     /**
      * REGEX-TEST: §aYou bought §r§9Casanova §r§afor §r§6970,000 Coins§r§a!
      * REGEX-TEST: §aYou bought §r§fHeidie §r§afor §r§6194,000 Coins§r§a!
@@ -126,12 +103,28 @@ object HoppityEggsManager {
     private var warningActive = false
     private var lastWarnTime = SimpleTimeMark.farPast()
 
+    private var latestWaypointOnclick: () -> Unit = {}
+
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         lastMeal = null
         lastNote = null
     }
 
+    @HandleEvent
+    fun onEggFound(event: EggFoundEvent) {
+        if (!HoppityAPI.isHoppityEvent() || !event.type.isResetting) return
+        HoppityEggLocations.saveNearestEgg()
+        event.type.markClaimed()
+        lastMeal = event.type
+        lastNote = event.note
+    }
+
+    @HandleEvent
+    fun onRabbitFound(event: RabbitFoundEvent) {
+        HoppityCollectionStats.incrementRabbit(event.rabbitName)
+    }
+
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -147,22 +140,8 @@ object HoppityEggsManager {
             return
         }
 
-        HoppityEggsCompactChat.handleChat(event)
-        HoppityAPI.handleChat(event)
-
         if (!HoppityAPI.isHoppityEvent()) return
 
-        eggFoundPattern.matchMatcher(event.message) {
-            HoppityEggLocations.saveNearestEgg()
-            HoppityEggLocator.eggFound()
-            val meal = getEggType(event)
-            val note = group("note").removeColor()
-            meal.markClaimed()
-            lastMeal = meal
-            lastNote = note
-            return
-        }
-
         noEggsLeftPattern.matchMatcher(event.message) {
             HoppityEggType.allFound()
 
@@ -188,10 +167,6 @@ object HoppityEggsManager {
             getEggType(event).markSpawned()
             return
         }
-
-        rabbitFoundPattern.matchMatcher(event.message) {
-            HoppityCollectionStats.incrementRabbit(group("name"))
-        }
     }
 
     internal fun Matcher.getEggType(event: LorenzChatEvent): HoppityEggType =
@@ -202,6 +177,12 @@ object HoppityEggsManager {
             )
         }
 
+    fun getAndDisposeWaypointOnclick(): () -> Unit {
+        val onClick = latestWaypointOnclick
+        latestWaypointOnclick = {}
+        return onClick
+    }
+
     fun shareWaypointPrompt() {
         if (!config.sharedWaypoints) return
         val meal = lastMeal ?: return
@@ -211,16 +192,16 @@ object HoppityEggsManager {
 
         val currentLocation = LocationUtils.playerLocation()
         DelayedRun.runNextTick {
-            val onClick = { HoppityEggsShared.shareNearbyEggLocation(currentLocation, meal, note) }
-            if (!HoppityEggsCompactChat.clickableCompact(onClick)) {
-                ChatUtils.clickableChat(
-                    "Click here to share the location of this chocolate egg with the server!",
-                    onClick = onClick,
-                    "§eClick to share!",
-                    expireAt = 30.seconds.fromNow(),
-                    oneTimeClick = true,
-                )
-            }
+            latestWaypointOnclick = { HoppityEggsShared.shareNearbyEggLocation(currentLocation, meal, note) }
+            if (config.compactChat) return@runNextTick
+            ChatUtils.clickableChat(
+                "Click here to share the location of this chocolate egg with the server!",
+                onClick = latestWaypointOnclick,
+                "§eClick to share!",
+                expireAt = 30.seconds.fromNow(),
+                oneTimeClick = true,
+            )
+            latestWaypointOnclick = {}
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index bd1fc87174e1..ccb6712c0538 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -57,7 +57,7 @@ object ChocolateFactoryBarnManager {
             }
             ChocolateAmount.addToAll(amount)
             HoppityEggsCompactChat.compactChat(event, lastDuplicateAmount = amount)
-            HoppityAPI.attemptFire(event, lastDuplicateAmount = amount)
+            HoppityAPI.attemptFireRabbitFound(lastDuplicateAmount = amount)
         }
 
         rabbitCrashedPattern.matchMatcher(event.message) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 5c964c639122..805d2c8617b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -1,24 +1,29 @@
 package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 
-import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityAPI
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEventSummary
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzRarity
+import at.hannibal2.skyhanni.utils.LorenzRarity.LEGENDARY
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -26,8 +31,10 @@ import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.renderables.toSearchable
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
 import com.google.gson.annotations.Expose
-import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraft.inventory.Slot
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -43,14 +50,14 @@ object ChocolateFactoryStrayTracker {
      * REGEX-TEST: §6§lGolden Rabbit §d§lCAUGHT!
      * REGEX-TEST: §fAudi §d§lCAUGHT!
      */
-    private val strayCaughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
+    val strayCaughtPattern by ChocolateFactoryAPI.patternGroup.pattern(
         "stray.caught",
-        "^§[a-f0-9].* §d§lCAUGHT!",
+        "^(?:§.)*(?<name>.*) §d§lCAUGHT!",
     )
 
     /**
      * REGEX-TEST: §7You caught a stray §fMandy §7and §7gained §6+283,574 Chocolate§7!
-     * REGEX-TEST: §7You caught a stray §aSven §7and gained §7§6+397,004 Chocolate§7!'
+     * REGEX-TEST: §7You caught a stray §aSven §7and gained §7§6+397,004 Chocolate§7!
      */
     private val strayLorePattern by ChocolateFactoryAPI.patternGroup.pattern(
         "stray.loreinfo",
@@ -101,14 +108,6 @@ object ChocolateFactoryStrayTracker {
         "§7You caught a stray (?<color>§.)Fish the Rabbit§7! §7You have already found (?:§.)?Fish the (?:§.)?Rabbit§7, so you received §6(?<amount>[\\d,]*) (?:§6)?Chocolate§7!",
     )
 
-    private val rarityFormatMap = mapOf(
-        "common" to "§f",
-        "uncommon" to "§a",
-        "rare" to "§9",
-        "epic" to "§5",
-        "legendary" to "§6",
-    )
-
     private val tracker = SkyHanniTracker("Stray Tracker", { Data() }, { it.chocolateFactory.strayTracker })
     { drawDisplay(it) }
 
@@ -120,10 +119,10 @@ object ChocolateFactoryStrayTracker {
         }
 
         @Expose
-        var straysCaught: MutableMap<String, Int> = mutableMapOf()
+        var straysCaught: MutableMap<LorenzRarity, Int> = mutableMapOf()
 
         @Expose
-        var straysExtraChocMs: MutableMap<String, Long> = mutableMapOf()
+        var straysExtraChocMs: MutableMap<LorenzRarity, Long> = mutableMapOf()
 
         @Expose
         var goldenTypesCaught: MutableMap<String, Int> = mutableMapOf()
@@ -134,15 +133,12 @@ object ChocolateFactoryStrayTracker {
         return notEmptyLines.joinToString(" ")
     }
 
-    private fun incrementRarity(rarity: String, chocAmount: Long = 0) {
+    private fun incrementRarity(rarity: LorenzRarity, chocAmount: Long = 0) {
         tracker.modify { it.straysCaught.addOrPut(rarity, 1) }
         val extraTime = ChocolateFactoryAPI.timeUntilNeed(chocAmount + 1)
         tracker.modify { it.straysExtraChocMs.addOrPut(rarity, extraTime.inWholeMilliseconds) }
-        if (HoppityAPI.isHoppityEvent()) {
-            LorenzRarity.getByName(rarity)?.let {
-                HoppityEventSummary.addStrayCaught(it, chocAmount)
-            }
-        }
+        if (!HoppityAPI.isHoppityEvent()) return
+        HoppityEventSummary.addStrayCaught(rarity, chocAmount)
     }
 
     private fun incrementGoldenType(typeCaught: String, amount: Int = 1) {
@@ -159,107 +155,99 @@ object ChocolateFactoryStrayTracker {
                 tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"),
             ).toSearchable(),
         )
-        rarityFormatMap.keys.forEach { rarity ->
+        HoppityAPI.hoppityRarities.forEach { rarity ->
             extractHoverableOfRarity(rarity, data)?.let { add(it) }
         }
     }
 
-    private fun extractHoverableOfRarity(rarity: String, data: Data): Searchable? {
+    private fun extractHoverableOfRarity(rarity: LorenzRarity, data: Data): Searchable? {
         val caughtOfRarity = data.straysCaught[rarity]
         val caughtString = caughtOfRarity?.toString() ?: return null
 
         val rarityExtraChocMs = data.straysExtraChocMs[rarity]?.milliseconds
         val extraChocFormat = rarityExtraChocMs?.format() ?: ""
 
-        val colorCode = rarityFormatMap[rarity] ?: ""
-        val lineHeader = "$colorCode${rarity.substring(0, 1).uppercase()}${rarity.substring(1)}§7: §r$colorCode"
+        val colorCode = rarity.chatColorCode
+        val lineHeader = "$colorCode${rarity.toString().lowercase().replaceFirstChar { it.uppercase() }}§7: §r$colorCode"
         val lineFormat = "${lineHeader}${caughtString}"
 
         val renderable = rarityExtraChocMs?.let {
-            val tip =
-                "§a+§b$extraChocFormat §afrom $colorCode$rarity strays§7${if (rarity == "legendary") extractGoldenTypesCaught(data) else ""}"
+            var tip = "§a+§b$extraChocFormat §afrom $colorCode${rarity.toString().lowercase()} strays§7"
+            if (rarity == LEGENDARY) tip += extractGoldenTypesCaught(data)
             Renderable.hoverTips(Renderable.string(lineFormat), tips = tip.split("\n"))
         } ?: Renderable.string(lineFormat)
-        return renderable.toSearchable(rarity)
+        return renderable.toSearchable(rarity.toString())
+    }
+
+    private val goldenTypesMap: Map<String, (Int, MutableList<String>) -> Unit> by lazy {
+        mapOf(
+            "sidedish" to { count, list -> list.add("§b$count §6Side ${StringUtils.pluralize(count, "Dish", "Dishes")}") },
+            "jackpot" to { count, list -> list.add("§b$count §6Chocolate ${StringUtils.pluralize(count, "Jackpot")}") },
+            "mountain" to { count, list -> list.add("§b$count §6Chocolate ${StringUtils.pluralize(count, "Mountain")}") },
+            "dorado" to { count, list -> list.add("§b$count §6El Dorado ${StringUtils.pluralize(count, "Sighting")}") },
+            "stampede" to { count, list -> list.add("§b$count §6${StringUtils.pluralize(count, "Stampede")}") },
+            "goldenclick" to { count, list -> list.add("§b$count §6Golden ${StringUtils.pluralize(count, "Click")}") }
+        )
     }
 
     private fun extractGoldenTypesCaught(data: Data): String {
         val goldenList = mutableListOf<String>()
-        data.goldenTypesCaught["sidedish"]?.let {
-            goldenList.add("§b$it §6Side Dish" + if (it > 1) "es" else "")
+        data.goldenTypesCaught.sortedDesc().forEach { (key, count) -> goldenTypesMap[key]?.invoke(count, goldenList) }
+        return if (goldenList.isEmpty()) "" else ("\n" + goldenList.joinToString("\n"))
+    }
+
+    fun handleStrayClicked(slot: Slot) {
+        if (!isEnabled() || claimedStraysSlots.contains(slot.slotNumber)) return
+
+        claimedStraysSlots.add(slot.slotIndex)
+        val loreLine = formLoreToSingleLine(slot.stack.getLore())
+
+        // "Base" strays - Common -> Epic, raw choc only reward.
+        strayLorePattern.matchMatcher(loreLine) {
+            //Pretty sure base strays max at Epic, but...
+            val rarity = HoppityAPI.rarityByRabbit(group("rabbit")) ?: return@matchMatcher
+            incrementRarity(rarity, group("amount").formatLong())
         }
-        data.goldenTypesCaught["jackpot"]?.let {
-            goldenList.add("§b$it §6Chocolate Jackpot" + if (it > 1) "s" else "")
+
+        // Fish the Rabbit
+        fishTheRabbitPattern.matchMatcher(loreLine) {
+            //Also fairly sure that Fish maxes out at Rare, but...
+            val rarity = HoppityAPI.rarityByRabbit(group("color")) ?: return@matchMatcher
+            incrementRarity(rarity, group("amount").formatLong())
         }
-        data.goldenTypesCaught["mountain"]?.let {
-            goldenList.add("§b$it §6Chocolate Mountain" + if (it > 1) "s" else "")
+
+        // Golden Strays, Jackpot and Mountain, raw choc only reward.
+        goldenStrayJackpotMountainPattern.matchMatcher(loreLine) {
+            val amount = group("amount").formatLong().also { am -> incrementRarity(LEGENDARY, am) }
+            val multiplier = amount / ChocolateFactoryAPI.chocolatePerSecond
+            when (multiplier) {
+                in 479.0..481.0 -> incrementGoldenType("jackpot")
+                in 1499.0..1501.0 -> incrementGoldenType("mountain")
+            }
         }
-        data.goldenTypesCaught["dorado"]?.let {
-            goldenList.add((if (it >= 3) "§a" else "§b") + "$it§7/§a3 §6El Dorado §7Sighting" + if (it > 1) "s" else "")
+
+        // Golden Strays, "Golden Click"
+        goldenStrayClick.matchMatcher(loreLine) {
+            incrementGoldenType("goldenclick")
         }
-        data.goldenTypesCaught["stampede"]?.let {
-            goldenList.add("§b$it §6Stampede" + if (it > 1) "s" else "")
+
+        // Golden Strays, hoard/stampede
+        strayHoardPattern.matchMatcher(loreLine.removeResets()) {
+            incrementGoldenType("stampede")
         }
-        data.goldenTypesCaught["goldenclick"]?.let {
-            goldenList.add("§b$it §6Golden Click" + if (it > 1) "s" else "")
+
+        // El Dorado - all catches
+        strayDoradoPattern.matchMatcher(loreLine) {
+            groupOrNull("amount")?.let { amount ->
+                incrementRarity(LEGENDARY, amount.formatLong())
+            }
+            incrementGoldenType("dorado")
         }
-        return if (goldenList.size == 0) "" else ("\n" + goldenList.joinToString("\n"))
     }
 
     @SubscribeEvent
     fun onTick(event: SecondPassedEvent) {
         if (!isEnabled()) return
-        InventoryUtils.getItemsInOpenChest().filter {
-            !claimedStraysSlots.contains(it.slotIndex)
-        }.forEach {
-            strayCaughtPattern.matchMatcher(it.stack.name) {
-                if (it.stack.getLore().isEmpty()) return
-                claimedStraysSlots.add(it.slotIndex)
-                val loreLine = formLoreToSingleLine(it.stack.getLore())
-
-                // "Base" strays - Common -> Epic, raw choc only reward.
-                strayLorePattern.matchMatcher(loreLine) {
-                    //Pretty sure base strays max at Epic, but...
-                    val rarity = rarityFormatMap.entries.find { e -> e.value == group("rabbit").substring(0, 2) }?.key ?: "common"
-                    incrementRarity(rarity, group("amount").formatLong())
-                }
-
-                // Fish the Rabbit
-                fishTheRabbitPattern.matchMatcher(loreLine) {
-                    //Also fairly sure that Fish maxes out at Rare, but...
-                    val rarity = rarityFormatMap.entries.find { e -> e.value == group("color").substring(0, 2) }?.key ?: "common"
-                    incrementRarity(rarity, group("amount").formatLong())
-                }
-
-                // Golden Strays, Jackpot and Mountain, raw choc only reward.
-                goldenStrayJackpotMountainPattern.matchMatcher(loreLine) {
-                    val amount = group("amount").formatLong().also { am -> incrementRarity("legendary", am) }
-                    val multiplier = amount / ChocolateFactoryAPI.chocolatePerSecond
-                    when (multiplier) {
-                        in 479.0..481.0 -> incrementGoldenType("jackpot")
-                        in 1499.0..1501.0 -> incrementGoldenType("mountain")
-                    }
-                }
-
-                // Golden Strays, "Golden Click"
-                goldenStrayClick.matchMatcher(loreLine) {
-                    incrementGoldenType("goldenclick")
-                }
-
-                // Golden Strays, hoard/stampede
-                strayHoardPattern.matchMatcher(loreLine.removeResets()) {
-                    incrementGoldenType("stampede")
-                }
-
-                // El Dorado - all catches
-                strayDoradoPattern.matchMatcher(loreLine) {
-                    groupOrNull("amount")?.let { amount ->
-                        incrementRarity("legendary", amount.formatLong())
-                    }
-                    incrementGoldenType("dorado")
-                }
-            }
-        }
         InventoryUtils.getItemsInOpenChest().filter {
             claimedStraysSlots.contains(it.slotIndex)
         }.forEach {
@@ -269,27 +257,17 @@ object ChocolateFactoryStrayTracker {
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        val index = event.slot?.slotIndex ?: return
-        if (index == -999) return
-        if (claimedStraysSlots.contains(index)) return
-
-        val clickedStack = InventoryUtils.getItemsInOpenChest()
-            .find { it.slotNumber == event.slot.slotNumber && it.hasStack }
-            ?.stack ?: return
-        val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
-        if (!nameText.equals("§6§lGolden Rabbit §8- §aSide Dish")) return
-
-        HoppityAPI.fireSideDishMessage()
-        if (!isEnabled()) return
-
-        claimedStraysSlots.add(index)
-        incrementGoldenType("sidedish")
-        incrementRarity("legendary", 0)
-        DelayedRun.runDelayed(1.seconds) {
-            claimedStraysSlots.remove(claimedStraysSlots.indexOf(index))
+    @HandleEvent
+    fun onEggFound(event: EggFoundEvent) {
+        if (!isEnabled() || event.type != HoppityEggType.SIDE_DISH) return
+        event.slotIndex?.let {
+            claimedStraysSlots.add(it)
+            DelayedRun.runDelayed(1.seconds) {
+                claimedStraysSlots.remove(claimedStraysSlots.indexOf(it))
+            }
         }
+        incrementRarity(LEGENDARY, 0)
+        incrementGoldenType("sidedish")
     }
 
     @SubscribeEvent
@@ -304,6 +282,32 @@ object ChocolateFactoryStrayTracker {
         tracker.firstUpdate()
     }
 
+    private fun <T> migrateJsonStringKeyToRarityKey(jElement: JsonElement, enumClass: Class<T>): JsonElement {
+        if (!jElement.isJsonObject) return jElement
+        val newElement = JsonObject()
+
+        for ((key, value) in jElement.asJsonObject.entrySet()) {
+            val enum = try {
+                enumClass.javaClass.enumConstants.first { it.name.equals(key, ignoreCase = true) }
+            } catch (e: IllegalArgumentException) {
+                continue
+            }
+            value?.asInt?.let { newElement.addProperty(enum.toString(), it) }
+        }
+
+        return newElement
+    }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.transform(58, "chocolateFactory.strayTracker.straysCaught") { element ->
+            migrateJsonStringKeyToRarityKey(element, LorenzRarity::class.java)
+        }
+        event.transform(58, "chocolateFactory.strayTracker.straysExtraChocMs") { element ->
+            migrateJsonStringKeyToRarityKey(element, LorenzRarity::class.java)
+        }
+    }
+
     fun resetCommand() {
         tracker.resetCommand()
     }

From f3a70ae089fed6172b1526c38e1fe006c1c89974 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:46:47 +0200
Subject: [PATCH 494/721] Fix: Mining Commission Blocks Color and Connected
 Textures (#2553)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../transformers/MixinOptifineConfig.java      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
new file mode 100644
index 000000000000..97b20f19a621
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
@@ -0,0 +1,18 @@
+package at.hannibal2.skyhanni.mixins.transformers;
+
+import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Pseudo
+@Mixin(targets = "Config", remap = false)
+public class MixinOptifineConfig {
+
+    @Inject(method = {"isConnectedTextures", "isConnectedTexturesFancy"}, at = @At("HEAD"), cancellable = true)
+    private static void isConnectedTextures(CallbackInfoReturnable<Boolean> cir) {
+        if (MiningCommissionsBlocksColor.INSTANCE.getActive()) cir.setReturnValue(false);
+    }
+}

From 6eed91d18561e77e052f365cb4815c4f6f9b465a Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Fri, 20 Sep 2024 21:47:22 +0200
Subject: [PATCH 495/721] Fix: Update Sky Mall patterns (#2551)

---
 src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
index 97e041a89475..6217c56c21d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
@@ -91,10 +91,10 @@ object HotmAPI {
     var mineshaftMayhem: MayhemPerk? = null
 
     enum class SkymallPerk(chat: String, itemString: String) {
-        MINING_SPEED("Gain §r§a\\+100 §r§6⸕ Mining Speed§r§f\\.", "Gain §a\\+100 §6⸕ Mining Speed§7\\."),
-        MINING_FORTUNE("Gain §r§a\\+50 §r§6☘ Mining Fortune§r§f\\.", "Gain §a\\+50 §6☘ Mining Fortune§7\\."),
+        MINING_SPEED("Gain §r§6\\+100⸕ Mining Speed§r§f\\.", "Gain §6\\+100⸕ Mining Speed§7\\."),
+        MINING_FORTUNE("Gain §r§6\\+50☘ Mining Fortune§r§f\\.", "Gain §6\\+50☘ Mining Fortune§7\\."),
         EXTRA_POWDER("Gain §r§a\\+15% §r§fmore Powder while mining\\.", "Gain §a\\+15% §7more Powder while mining\\."),
-        ABILITY_COOLDOWN("Reduce Pickaxe Ability cooldown by §r§a20%§r§f\\.", "Reduce Pickaxe Ability cooldown by"),
+        ABILITY_COOLDOWN("§r§a-20%§r§f Pickaxe Ability cooldowns\\.", "§a-20%§7 Pickaxe Ability cooldowns\\."),
         GOBLIN_CHANCE("§r§a10x §r§fchance to find Golden and Diamond Goblins\\.", "§a10x §7chance to find Golden and"),
         TITANIUM("Gain §r§a5x §r§9Titanium §r§fdrops", "Gain §a5x §9Titanium §7drops\\.")
         ;

From 3f0a42c5e6eeda3576729c0ac28bf5feaa8217cc Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Fri, 20 Sep 2024 21:48:03 +0200
Subject: [PATCH 496/721] Fix: Kuudra armor always showing as starred (#2550)

---
 .../features/misc/items/EstimatedItemValueCalculator.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 6842ccc77620..953809b963d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -528,7 +528,7 @@ object EstimatedItemValueCalculator {
                 return kuudraUpgradeTiers.indexOf(tier)
             }
         }
-        return 0
+        return -1
     }
 //     private fun getKuudraTier(internalName: NEUInternalName): Int? =
 //         kuudraUpgradeTiers.firstOrNull { it in internalName.toString() }?.let { kuudraUpgradeTiers.indexOf(it) }

From a99f0bdd1c2c5df1495996844dcf62791c19498d Mon Sep 17 00:00:00 2001
From: Tryp0xd <54819490+Tryp0xd@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:53:53 +0100
Subject: [PATCH 497/721] Fix: HotmData perk rework (#2543)

---
 .../at/hannibal2/skyhanni/data/HotmData.kt    | 337 ++++++++++--------
 .../features/mining/MineshaftPityDisplay.kt   |   2 +-
 2 files changed, 181 insertions(+), 158 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 0392eab25af8..1d8182328b6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -26,22 +26,21 @@ 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.NumberUtil.formatLong
+import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.indexOfFirstMatch
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.inventory.Slot
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.math.ceil
 import kotlin.math.pow
 
-private fun calculatePeakOfTheMountainLoot(level: Int): Map<HotmReward, Double> = buildMap {
+private fun calculateCoreOfTheMountainLoot(level: Int): Map<HotmReward, Double> = buildMap {
     for (i in 1..level) {
         when (i) {
             1, 5, 7 -> addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
-            2 -> addOrPut(HotmReward.EXTRA_FORGE_SLOTS, 1.0)
+            2 -> addOrPut(HotmReward.ABILITY_LEVEL, 1.0)
             3 -> addOrPut(HotmReward.EXTRA_COMMISSION_SLOTS, 1.0)
             4 -> addOrPut(HotmReward.MORE_BASE_MITHRIL_POWER, 1.0)
             6 -> addOrPut(HotmReward.MORE_BASE_GEMSTONE_POWER, 2.0)
@@ -62,20 +61,14 @@ enum class HotmData(
     MINING_SPEED(
         "Mining Speed",
         50,
-        { level -> (level + 1.0).pow(3) },
+        { level -> (level + 1.0).pow(3.0) },
         { level -> mapOf(HotmReward.MINING_SPEED to level * 20.0) },
     ),
     MINING_FORTUNE(
         "Mining Fortune",
         50,
         { level -> (level + 1.0).pow(3.05) },
-        { level -> mapOf(HotmReward.MINING_FORTUNE to level * 5.0) },
-    ),
-    QUICK_FORGE(
-        "Quick Forge",
-        20,
-        { level -> (level + 1.0).pow(4) },
-        { level -> mapOf(HotmReward.FORGE_TIME_DECREASE to if (level >= 20) 30.0 else 10.0 + (level * 0.5)) },
+        { level -> mapOf(HotmReward.MINING_FORTUNE to level * 2.0) },
     ),
     TITANIUM_INSANIUM(
         "Titanium Insanium",
@@ -83,40 +76,47 @@ enum class HotmData(
         { level -> (level + 1.0).pow(3.1) },
         { level -> mapOf(HotmReward.TITANIUM_CHANCE to 2.0 + (level * 0.1)) },
     ),
-    DAILY_POWDER(
-        "Daily Powder",
-        100,
-        { level -> 200 + ((level - 1) * 18.0) },
-        { level -> mapOf(HotmReward.DAILY_POWDER to (200.0 + ((level - 1.0) * 18.0)) * 2.0) },
-    ),
     LUCK_OF_THE_CAVE(
         "Luck of the Cave",
         45,
         { level -> (level + 1.0).pow(3.07) },
         { level -> mapOf(HotmReward.EXTRA_CHANCE_TRIGGER_RARE_OCCURRENCES to 5.0 + level) },
     ),
-    CRYSTALLIZED(
-        "Crystallized",
-        30,
-        { level -> (level + 1.0).pow(3.4) },
-        { level ->
-            mapOf(
-                HotmReward.MINING_SPEED to 20.0 + ((level - 1.0) * 6.0),
-                HotmReward.MINING_FORTUNE to 20.0 + ((level - 1.0) * 5.0),
-            )
-        },
-    ),
     EFFICIENT_MINER(
         "Efficient Miner",
         100,
         { level -> (level + 1.0).pow(2.6) },
-        { level -> mapOf(HotmReward.AVERAGE_BLOCK_BREAKS to (10.0 + (level * 0.4)) * (1.0 + (level * 0.05))) },
+        { level -> mapOf(HotmReward.MINING_SPREAD to 3.0 * level) },
     ),
-    ORBITER(
-        "Orbiter",
-        80,
-        { level -> level * 70.0 },
-        { level -> mapOf(HotmReward.CHANCE_EXTRA_XP_ORBS to 0.2 + (level * 0.01)) },
+    QUICK_FORGE(
+        "Quick Forge",
+        20,
+        { level -> (level + 1.0).pow(3.2) },
+        { level -> mapOf(HotmReward.FORGE_TIME_DECREASE to if (level >= 20) 30.0 else 10.0 + (level * 0.5)) },
+    ),
+    OLD_SCHOOL(
+        "Old-School",
+        20,
+        { level -> (level + 1.0).pow(4.0) },
+        { level -> mapOf(HotmReward.ORE_FORTUNE to level * 5.0) },
+    ),
+    PROFESSIONAL(
+        "Professional",
+        140,
+        { level -> (level + 1.0).pow(2.3) },
+        { level -> mapOf(HotmReward.MINING_SPEED to 50.0 + (level * 5.0)) },
+    ),
+    MOLE(
+        "Mole",
+        200,
+        { level -> (level + 1.0).pow(2.17883) },
+        { level -> mapOf(HotmReward.MINING_SPREAD to 50.0 + ((level - 1) * (350 / 199))) },
+    ),
+    GEM_LOVER(
+        "Gem Lover",
+        20,
+        { level -> (level + 1.0).pow(4.0) },
+        { level -> mapOf(HotmReward.GEMSTONE_FORTUNE to 20.0 + (level * 4.0)) },
     ),
     SEASONED_MINEMAN(
         "Seasoned Mineman",
@@ -124,18 +124,25 @@ enum class HotmData(
         { level -> (level + 1.0).pow(2.3) },
         { level -> mapOf(HotmReward.MINING_WISDOM to 5.0 + (level * 0.1)) },
     ),
-    MOLE(
-        "Mole",
-        190,
-        { level -> (level + 1.0).pow(2.2) },
-        { level -> mapOf(HotmReward.AVERAGE_BLOCK_BREAKS to 1.0 + ((level + 9.0) * 0.05 * ((level + 8) % 20))) },
+    FORTUNATE_MINEMAN(
+        "Fortunate Mineman",
+        50,
+        { level -> (level + 1.0).pow(3.2) },
+        { level -> mapOf(HotmReward.MINING_FORTUNE to level * 3.0) },
     ),
-    PROFESSIONAL(
-        "Professional",
-        140,
-        { level -> (level + 1.0).pow(2.3) },
-        { level -> mapOf(HotmReward.MINING_SPEED to 50.0 + (level * 5.0)) },
+    BLOCKHEAD(
+        "Blockhead",
+        20,
+        { level -> (level + 1.0).pow(4.0) },
+        { level -> mapOf(HotmReward.BLOCK_FORTUNE to level * 5.0) },
+    ),
+    KEEP_IT_COOL(
+        "Keep It Cool",
+        50,
+        { level -> (level + 1.0).pow(3.07) },
+        { level -> mapOf(HotmReward.HEAT_RESISTANCE to level * 0.4) },
     ),
+
     LONESOME_MINER(
         "Lonesome Miner",
         45,
@@ -153,12 +160,7 @@ enum class HotmData(
             )
         },
     ),
-    FORTUNATE(
-        "Fortunate",
-        20,
-        { level -> (level + 1.0).pow(3.05) },
-        { level -> mapOf(HotmReward.MINING_FORTUNE to 20.0 + (level * 4.0)) },
-    ),
+
     POWDER_BUFF(
         "Powder Buff",
         50,
@@ -170,32 +172,32 @@ enum class HotmData(
             )
         },
     ),
-    MINING_SPEED_II(
-        "Mining Speed II",
+    SPEEDY_MINEMAN(
+        "Speedy Mineman",
         50,
         { level -> (level + 1.0).pow(3.2) },
         { level -> mapOf(HotmReward.MINING_SPEED to level * 40.0) },
     ),
-    MINING_FORTUNE_II(
-        "Mining Fortune II",
-        50,
-        { level -> (level + 1.0).pow(3.2) },
-        { level -> mapOf(HotmReward.MINING_FORTUNE to level * 5.0) },
-    ),
 
-    // Static
 
-    MINING_MADNESS(
-        "Mining Madness",
-        1,
-        { null },
-        {
+
+
+    SUBTERRANEAN_FISHER(
+        "Subterranean Fisher",
+        40,
+        { level -> (level + 1.0).pow(3.07) },
+        { level ->
             mapOf(
-                HotmReward.MINING_SPEED to 50.0,
-                HotmReward.MINING_FORTUNE to 50.0,
+                HotmReward.FISHING_SPEED to 5 + (level * 0.5),
+                HotmReward.SEA_CREATURE_CHANCE to 1 + (level * 0.1),
             )
         },
+
     ),
+
+
+    // Static
+
     SKY_MALL("Sky Mall", 1, { null }, { emptyMap() }),
     PRECISION_MINING("Precision Mining", 1, { null }, { mapOf(HotmReward.MINING_SPEED_BOOST to 30.0) }),
     FRONT_LOADED(
@@ -204,16 +206,14 @@ enum class HotmData(
         { null },
         {
             mapOf(
-                HotmReward.MINING_SPEED to 100.0,
-                HotmReward.MINING_FORTUNE to 100.0,
-                HotmReward.MORE_BASE_MITHRIL_POWER to 2.0,
-                HotmReward.MORE_BASE_GEMSTONE_POWER to 2.0,
+                HotmReward.MINING_SPEED to 250.0,
+                HotmReward.GEMSTONE_FORTUNE to 150.0,
+                HotmReward.MORE_GEMSTONE_POWER to 200.0,
             )
         },
     ),
-    STAR_POWDER("Star Powder", 1, { null }, { mapOf(HotmReward.MORE_MITHRIL_POWER to 300.0) }),
-    GOBLIN_KILLER("Goblin Killer", 1, { null }, { emptyMap() }),
-
+    DAILY_GRIND("Daily Grind", 1, { null }, { emptyMap() }),
+    DAILY_POWDER("Daily Powder", 1, { null }, { emptyMap() }),
     // Abilities
 
     PICKOBULUS(
@@ -222,8 +222,8 @@ enum class HotmData(
         { null },
         { level ->
             mapOf(
-                HotmReward.ABILITY_RADIUS to ceil(level * 0.5) + 1.0,
-                HotmReward.ABILITY_COOLDOWN to 130.0 - 10.0 * level,
+                HotmReward.ABILITY_RADIUS to 3.0,
+                HotmReward.ABILITY_COOLDOWN to 60.0 - 10.0 * (level - 1),
             )
         },
     ),
@@ -233,66 +233,57 @@ enum class HotmData(
         { null },
         { level ->
             mapOf(
-                HotmReward.ABILITY_DURATION to level + 1.0,
-                HotmReward.ABILITY_COOLDOWN to 10.0 + 5.0 * level,
+                HotmReward.MINING_SPEED_BOOST to 200.0 + 50.0 * (level - 1),
+                HotmReward.ABILITY_DURATION to 10.0 + 5 * (level - 1),
+                HotmReward.ABILITY_COOLDOWN to 120.0,
             )
         },
     ),
-    VEIN_SEEKER(
-        "Vein Seeker",
+    MANIAC_MINER(
+        "Maniac Miner",
         3,
         { null },
         { level ->
             mapOf(
-                HotmReward.ABILITY_RADIUS to level + 1.0,
-                HotmReward.ABILITY_DURATION to 10.0 + 2.0 * level,
+                HotmReward.ABILITY_DURATION to 20.0 + level * 5.0,
                 HotmReward.ABILITY_COOLDOWN to 60.0,
+                HotmReward.BREAKING_POWER to 1.0,
             )
         },
     ),
-    MANIAC_MINER(
-        "Maniac Miner",
+
+    SHEER_FORCE(
+        "Sheer Force",
         3,
         { null },
         { level ->
             mapOf(
-                HotmReward.ABILITY_DURATION to 5.0 + level * 5.0,
-                HotmReward.ABILITY_COOLDOWN to 60.0 - level,
+                HotmReward.ABILITY_DURATION to 20.0 + 5 * (level - 1),
+                HotmReward.MINING_SPREAD to 200.0,
             )
         },
     ),
 
-    PEAK_OF_THE_MOUNTAIN(
-        "Peak of the Mountain", 10, { null },
-        { level -> calculatePeakOfTheMountainLoot(level) },
+    ANOMALOUS_DESIRE(
+        "Anomalous Desire",
+        3,
+        { null },
+        { level ->
+            mapOf(
+                HotmReward.EXTRA_CHANCE_TRIGGER_RARE_OCCURRENCES to 30.0 + (level - 1) * 10.0,
+                HotmReward.ABILITY_COOLDOWN to 120.0 - (level - 1) * 10.0,
+                HotmReward.ABILITY_DURATION to 30.0,
+            )
+        },
     ),
 
-    // Mining V3
-    DAILY_GRIND(
-        "Daily Grind",
-        100,
-        { level -> 218 + (18 * (level - 1.0)) },
-        { level -> mapOf(HotmReward.DAILY_POWDER to 50.0 * level) },
-    ),
-    DUST_COLLECTOR(
-        "Dust Collector",
-        20,
-        { level -> (level + 1.0).pow(4) },
-        { level -> mapOf(HotmReward.FOSSIL_DUST to 1.0 * level) },
-    ),
-    WARM_HEARTED(
-        "Warm Hearted",
-        50,
-        { level -> (level + 1.0).pow(3.1) },
-        { level -> mapOf(HotmReward.COLD_RESISTANCE to 0.2 * level) },
+    CORE_OF_THE_MOUNTAIN(
+        "Core of the Mountain", 10, { null },
+        { level -> calculateCoreOfTheMountainLoot(level) },
     ),
 
-    STRONG_ARM(
-        "Strong Arm",
-        100,
-        { level -> (level + 1.0).pow(2.3) },
-        { level -> mapOf(HotmReward.MINING_SPEED to 5.0 * level) },
-    ),
+    // Mining V3
+
     NO_STONE_UNTURNED(
         "No Stone Unturned",
         50,
@@ -300,63 +291,87 @@ enum class HotmData(
         { level -> mapOf(HotmReward.UNKNOWN to 0.5 * level) },
     ),
 
-    SUB_ZERO_MINING(
-        "SubZero Mining",
+    STRONG_ARM(
+        "Strong Arm",
         100,
         { level -> (level + 1.0).pow(2.3) },
-        { level -> mapOf(HotmReward.MINING_FORTUNE to 1.0 * level) },
+        { level -> mapOf(HotmReward.MINING_SPEED to 5.0 * level) },
+    ),
+    STEADY_HAND(
+        "Steady Hand",
+        100,
+        { level -> (level + 1.0).pow(2.6) },
+        { level -> mapOf(HotmReward.GEMSTONE_SPREAD to 0.1 * level) },
+    ),
+    WARM_HEART(
+        "Warm Heart",
+        50,
+        { level -> (level + 1.0).pow(3.1) },
+        { level -> mapOf(HotmReward.COLD_RESISTANCE to 0.4 * level) },
     ),
     SURVEYOR(
         "Surveyor",
         20,
-        { level -> (level + 1.0).pow(4) },
+        { level -> (level + 1.0).pow(4.0) },
         { level -> mapOf(HotmReward.MINESHAFT_CHANCE to 0.75 * level) },
     ),
+    METAL_HEAD(
+        "Metal Head",
+        20,
+        { level -> (level + 1.0).pow(4.0) },
+        { level -> mapOf(HotmReward.DWARVEN_METAL_FORTUNE to 5.0 * level) },
+    ),
+    RAGS_TO_RICHES(
+        "Rags to Riches",
+        50,
+        { level -> (level + 1.0).pow(3.05) },
+        { level -> mapOf(HotmReward.MINING_FORTUNE to 4.0 * level) },
+    ),
     EAGER_ADVENTURER(
         "Eager Adventurer",
         100,
         { level -> (level + 1.0).pow(2.3) },
-        { level -> mapOf(HotmReward.MINING_SPEED to 2.0 * level) },
+        { level -> mapOf(HotmReward.MINING_SPEED to 4.0 * level) },
     ),
-
-    DEAD_MANS_CHEST(
-        "Dead Man's Chest",
+    CRYSTALLINE(
+        "Crystalline",
         50,
-        { level -> (level + 1.0).pow(3.2) },
-        { level -> mapOf(HotmReward.UNKNOWN to 1.0 * level) },
+        { level -> (level + 1.0).pow(3.3) },
+        { level -> mapOf(HotmReward.UNKNOWN to 0.5 * level) },
     ),
-
     GIFTS_FROM_THE_DEPARTED(
         "Gifts from the Departed",
         100,
         { level -> (level + 1.0).pow(2.45) },
         { level -> mapOf(HotmReward.UNKNOWN to 0.2 * level) },
     ),
-
-    EXCAVATOR(
-        "Excavator",
+    MINING_MASTER(
+        "Mining Master",
+        10,
+        { level -> (level + 7.0).pow(5.0) },
+        { level -> mapOf(HotmReward.PRISTINE to 0.1 * level) },
+    ),
+    DEAD_MANS_CHEST(
+        "Dead Man's Chest",
         50,
-        { level -> (level + 1.0).pow(3) },
-        { level -> mapOf(HotmReward.UNKNOWN to 0.5 * level) },
+        { level -> (level + 1.0).pow(3.2) },
+        { level -> mapOf(HotmReward.UNKNOWN to 1.0 * level) },
     ),
-    RAGS_TO_RICHES(
-        "Rags to Riches",
+    VANGUARD_SEEKER(
+        "Vanguard Seeker",
         50,
-        { level -> (level + 1.0).pow(3.05) },
-        { level -> mapOf(HotmReward.MINING_FORTUNE to 2.0 * level) },
+        { level -> (level + 1.0).pow(3.1) },
+        { level -> mapOf(HotmReward.UNKNOWN to 1.0 * level) },
     ),
 
-    KEEN_EYE("Keen Eye", 1, { null }, { emptyMap() }),
     MINESHAFT_MAYHEM("Mineshaft Mayhem", 1, { null }, { emptyMap() }),
-    FROZEN_SOLID("Frozen Solid", 1, { null }, { emptyMap() }),
     GEMSTONE_INFUSION("Gemstone Infusion", 1, { null }, { emptyMap() }),
-    HAZARDOUS_MINER("Hazardous Miner", 1, { null }, { emptyMap() }),
-
+    MINERS_BLESSING("Miner's Blessing", 1, { null }, { mapOf(HotmReward.MAGIC_FIND to 30.0) }),
     ;
 
     private val guiNamePattern by patternGroup.pattern("perk.name.${name.lowercase().replace("_", "")}", "§.$guiName")
 
-    val printName = name.allLettersFirstUppercase()
+    val printName get() = name.allLettersFirstUppercase()
 
     /** Level which are actually paid with powder (does exclude [blueEgg])*/
     var rawLevel: Int
@@ -367,15 +382,15 @@ enum class HotmData(
 
     /** Level for which the effect that is present (considers [enabled] and [blueEgg])*/
     val activeLevel: Int
-        get() = if (enabled) effectivLevel else 0
+        get() = if (enabled) effectiveLevel else 0
 
     /** Level that considering [blueEgg]*/
-    val effectivLevel: Int get() = storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0
+    val effectiveLevel: Int get() = storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0
 
     val isMaxLevel: Boolean
-        get() = effectivLevel >= maxLevel // >= to account for +1 from Blue Cheese
+        get() = effectiveLevel >= maxLevel // >= to account for +1 from Blue Cheese
 
-    private fun blueEgg() = if (this != PEAK_OF_THE_MOUNTAIN && maxLevel != 1 && HotmAPI.isBlueEggActive) 1 else 0
+    private fun blueEgg() = if (this != CORE_OF_THE_MOUNTAIN && maxLevel != 1 && HotmAPI.isBlueEggActive) 1 else 0
 
     var enabled: Boolean
         get() = storage?.perks?.get(this.name)?.enabled ?: false
@@ -406,7 +421,7 @@ enum class HotmData(
 
         val storage get() = ProfileStorageData.profileSpecific?.mining?.hotmTree
 
-        val abilities = listOf(PICKOBULUS, MINING_SPEED_BOOST, VEIN_SEEKER, MANIAC_MINER, HAZARDOUS_MINER, GEMSTONE_INFUSION)
+        val abilities = listOf(PICKOBULUS, MINING_SPEED_BOOST, MANIAC_MINER, GEMSTONE_INFUSION, ANOMALOUS_DESIRE, SHEER_FORCE)
 
         private val inventoryPattern by patternGroup.pattern(
             "inventory",
@@ -514,10 +529,10 @@ enum class HotmData(
             HotmAPI.MayhemPerk.entries.forEach {
                 it.chatPattern
             }
-            (0..PEAK_OF_THE_MOUNTAIN.maxLevel).forEach { level ->
+            (0..CORE_OF_THE_MOUNTAIN.maxLevel).forEach { level ->
                 val map = mutableMapOf<HotmReward, Double>()
                 if (level >= 1) map.addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
-                if (level >= 2) map.addOrPut(HotmReward.EXTRA_FORGE_SLOTS, 1.0)
+                if (level >= 2) map.addOrPut(HotmReward.ABILITY_LEVEL, 1.0)
                 if (level >= 3) map.addOrPut(HotmReward.EXTRA_COMMISSION_SLOTS, 1.0)
                 if (level >= 4) map.addOrPut(HotmReward.MORE_BASE_MITHRIL_POWER, 1.0)
                 if (level >= 5) map.addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
@@ -527,7 +542,7 @@ enum class HotmData(
                 if (level >= 9) map.addOrPut(HotmReward.MINESHAFT_CHANCE, 10.0)
                 if (level >= 10) map.addOrPut(HotmReward.EXTRA_TOKENS, 2.0)
 
-                peakOfTheMountainPerks[level] = map
+                coreOfTheMountainPerks[level] = map
             }
         }
 
@@ -551,7 +566,7 @@ enum class HotmData(
 
             val lore = item.getLore().takeIf { it.isNotEmpty() } ?: return
 
-            if (entry != PEAK_OF_THE_MOUNTAIN && notUnlockedPattern.matches(lore.last())) {
+            if (entry != CORE_OF_THE_MOUNTAIN && notUnlockedPattern.matches(lore.last())) {
                 entry.rawLevel = 0
                 entry.enabled = false
                 entry.isUnlocked = false
@@ -574,7 +589,7 @@ enum class HotmData(
                 )
             }
 
-            if (entry == PEAK_OF_THE_MOUNTAIN) {
+            if (entry == CORE_OF_THE_MOUNTAIN) {
                 entry.enabled = entry.rawLevel != 0
                 return
             }
@@ -663,7 +678,7 @@ enum class HotmData(
         fun onScoreboardUpdate(event: ScoreboardUpdateEvent) {
             if (!LorenzUtils.inSkyBlock) return
 
-            event.scoreboard.matchFirst(ScoreboardPattern.powderPattern) {
+            ScoreboardPattern.powderPattern.firstMatcher(event.scoreboard) {
                 val type = HotmAPI.PowderType.entries.firstOrNull { it.displayName == group("type") } ?: return
                 val amount = group("amount").formatLong()
                 val difference = amount - type.getCurrent()
@@ -690,7 +705,7 @@ enum class HotmData(
             DelayedRun.runNextTick {
                 InventoryUtils.getItemsInOpenChest().forEach { it.parse() }
                 abilities.filter { it.isUnlocked }.forEach {
-                    it.rawLevel = if (PEAK_OF_THE_MOUNTAIN.rawLevel >= 1) 2 else 1
+                    it.rawLevel = if (CORE_OF_THE_MOUNTAIN.rawLevel >= 1) 2 else 1
                 }
             }
         }
@@ -791,7 +806,7 @@ enum class HotmData(
     }
 }
 
-private val peakOfTheMountainPerks = mutableMapOf<Int, Map<HotmReward, Double>>()
+private val coreOfTheMountainPerks = mutableMapOf<Int, Map<HotmReward, Double>>()
 
 private val patternGroup = RepoPattern.group("mining.hotm")
 
@@ -801,7 +816,6 @@ enum class HotmReward {
     MINING_WISDOM,
     FORGE_TIME_DECREASE,
     TITANIUM_CHANCE,
-    DAILY_POWDER,
     MORE_BASE_MITHRIL_POWER,
     MORE_BASE_GEMSTONE_POWER,
     MORE_BASE_GLACITE_POWER,
@@ -811,17 +825,26 @@ enum class HotmReward {
     CHANCE_OF_TREASURE_CHEST,
     LOCKS_OF_TREASURE_CHEST,
     EXTRA_CHANCE_TRIGGER_RARE_OCCURRENCES,
-    AVERAGE_BLOCK_BREAKS,
-    CHANCE_EXTRA_XP_ORBS,
     MINING_SPEED_BOOST,
     ABILITY_DURATION,
     ABILITY_RADIUS,
     ABILITY_COOLDOWN,
-    FOSSIL_DUST,
+    ABILITY_LEVEL,
     MINESHAFT_CHANCE,
     EXTRA_TOKENS,
-    EXTRA_FORGE_SLOTS,
     EXTRA_COMMISSION_SLOTS,
     UNKNOWN,
-    COLD_RESISTANCE
+    COLD_RESISTANCE,
+    MINING_SPREAD,
+    GEMSTONE_SPREAD,
+    ORE_FORTUNE,
+    BLOCK_FORTUNE,
+    GEMSTONE_FORTUNE,
+    DWARVEN_METAL_FORTUNE,
+    HEAT_RESISTANCE,
+    MAGIC_FIND,
+    PRISTINE,
+    FISHING_SPEED,
+    SEA_CREATURE_CHANCE,
+    BREAKING_POWER,
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 77d580a0b194..3b89ae246bc2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -164,7 +164,7 @@ object MineshaftPityDisplay {
     // if the chance is 1/1500, it will return 1500
     private fun calculateChance(counter: Int): Double {
         val surveyorPercent = HotmData.SURVEYOR.getReward()[HotmReward.MINESHAFT_CHANCE] ?: 0.0
-        val peakMountainPercent = HotmData.PEAK_OF_THE_MOUNTAIN.getReward()[HotmReward.MINESHAFT_CHANCE] ?: 0.0
+        val peakMountainPercent = HotmData.CORE_OF_THE_MOUNTAIN.getReward()[HotmReward.MINESHAFT_CHANCE] ?: 0.0
         val chance = counter / (1 + surveyorPercent / 100 + peakMountainPercent / 100)
         return chance
     }

From 08da9f51266d8f514a047cd3f9ffb5adfd7b29e8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 20 Sep 2024 22:37:38 +0200
Subject: [PATCH 498/721] Improvement: Area Navigation updates (#2537)

Co-authored-by: nea <nea@nea.moe>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  2 +-
 .../config/features/dev/GraphConfig.java      |  5 +
 .../hannibal2/skyhanni/data/IslandGraphs.kt   |  3 +-
 .../at/hannibal2/skyhanni/data/model/Graph.kt | 85 +++++++++++++----
 .../skyhanni/data/model/GraphNodeTag.kt       | 13 ++-
 .../skyhanni/features/misc/IslandAreas.kt     | 17 +---
 .../mixins/transformers/MixinKeyBinding.java  |  2 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 33 +------
 .../skyhanni/test/{ => graph}/GraphEditor.kt  | 39 ++++++--
 .../test/graph/GraphEditorBugFinder.kt        | 95 +++++++++++++++++++
 .../test/{ => graph}/GraphNodeEditor.kt       | 68 +++++++++++--
 .../at/hannibal2/skyhanni/utils/GraphUtils.kt | 68 +++++++++++++
 .../at/hannibal2/skyhanni/utils/LorenzVec.kt  |  3 +
 .../hannibal2/skyhanni/utils/RaycastUtils.kt  | 73 ++++++++++++++
 14 files changed, 429 insertions(+), 77 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/test/{ => graph}/GraphEditor.kt (93%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
 rename src/main/java/at/hannibal2/skyhanni/test/{ => graph}/GraphNodeEditor.kt (71%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/RaycastUtils.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index d0f58f0829d9..3f2ddace62d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -77,7 +77,6 @@ import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker
 import at.hannibal2.skyhanni.features.rift.everywhere.PunchcardHighlight
 import at.hannibal2.skyhanni.features.slayer.SlayerProfitTracker
 import at.hannibal2.skyhanni.test.DebugCommand
-import at.hannibal2.skyhanni.test.GraphEditor
 import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.SkyBlockIslandTest
 import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
@@ -92,6 +91,7 @@ import at.hannibal2.skyhanni.test.command.CopyScoreboardCommand
 import at.hannibal2.skyhanni.test.command.TestChatCommand
 import at.hannibal2.skyhanni.test.command.TrackParticlesCommand
 import at.hannibal2.skyhanni.test.command.TrackSoundsCommand
+import at.hannibal2.skyhanni.test.graph.GraphEditor
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ExtendedChatColor
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
index acf9ac67d9e0..dda1ddb1e50c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java
@@ -32,6 +32,11 @@ public class GraphConfig {
     @ConfigEditorKeybind(defaultKey = -98) // Middle Mouse
     public int selectKey = -98;
 
+    @Expose
+    @ConfigOption(name = "Select near look", desc = "Select the node closest to where you are looking.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int selectRaycastKey = Keyboard.KEY_NONE;
+
     @Expose
     @ConfigOption(name = "Connect Key", desc = "Connect the nearest node with the active node. If the nodes are already connected removes the connection.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_C)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 0b173db46e04..ca3143b952ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -45,13 +45,14 @@ import kotlin.math.abs
  * 	12 starter NPC's
  * 	diana
  * farming:
- * 	pelt farming
+ * 	pelt farming area
  * rift:
  * 	enigma souls
  * 	eyes
  * 	big quests
  * 	montezuma souls
  * 	blood effigies
+ * 	avoid area around enderman
  * spider:
  * 	relicts + throw spot
  * dwarven mines:
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index 8c63be891fb3..b9ad1251ca8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -10,6 +10,7 @@ import com.google.gson.annotations.Expose
 import com.google.gson.stream.JsonToken
 import java.util.PriorityQueue
 
+// TODO: This class should be disambiguated into a NodePath and a Graph class
 @JvmInline
 value class Graph(
     @Expose val nodes: List<GraphNode>,
@@ -49,7 +50,7 @@ value class Graph(
                         out.name("Name").value(it)
                     }
 
-                    it.tagNames?.takeIf { it.isNotEmpty() }?.let {
+                    it.tagNames.takeIf { list -> list.isNotEmpty() }?.let {
                         out.name("Tags")
                         out.beginArray()
                         for (tagName in it) {
@@ -79,8 +80,8 @@ value class Graph(
                     reader.beginObject()
                     var position: LorenzVec? = null
                     var name: String? = null
-                    var tags: List<String>? = null
-                    var neighbors = mutableListOf<Pair<Int, Double>>()
+                    var tags = emptyList<String>()
+                    val neighbors = mutableListOf<Pair<Int, Double>>()
                     while (reader.hasNext()) {
                         if (reader.peek() != JsonToken.NAME) {
                             reader.skipValue()
@@ -140,10 +141,10 @@ value class Graph(
 }
 
 // The node object that gets parsed from/to json
-class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null, val tagNames: List<String>? = null) {
+class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null, val tagNames: List<String> = emptyList()) {
 
     val tags: List<GraphNodeTag> by lazy {
-        tagNames?.mapNotNull { GraphNodeTag.byId(it) } ?: emptyList()
+        tagNames.mapNotNull { GraphNodeTag.byId(it) }
     }
 
     /** Keys are the neighbours and value the edge weight (e.g. Distance) */
@@ -167,18 +168,50 @@ class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null,
 
 fun Graph.findShortestPathAsGraph(start: GraphNode, end: GraphNode): Graph = this.findShortestPathAsGraphWithDistance(start, end).first
 
-fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode): Pair<Graph, Double> {
+data class DijkstraTree(
+    val origin: GraphNode,
+    /**
+     * A map of distances between the [origin] and each node in a graph. This distance map is only accurate for nodes closer to the
+     * origin than the [lastVisitedNode]. In case there is no early bailout, this map will be accurate for all nodes in the graph.
+     */
+    val distances: Map<GraphNode, Double>,
+    /**
+     * A map of nodes to the neighbouring node that is the quickest path towards the origin (the neighbouring node that has the lowest value
+     * in [distances])
+     */
+    val towardsOrigin: Map<GraphNode, GraphNode>,
+    /**
+     * This is either the furthest away node in the graph, or the node that was bailed out on early because it fulfilled the search
+     * condition. In case the search condition matches nothing, this will *still* be the furthest away node, so an additional check might be
+     * necessary.
+     */
+    val lastVisitedNode: GraphNode,
+)
+
+/**
+ * Find a tree of distances to the [start] node using dijkstra's algorithm.
+ */
+fun Graph.findDijkstraDistances(
+    start: GraphNode,
+    /**
+     * Bail out early before collecting all the distances to all nodes in the graph. This will not collect valid distance data for *all*
+     * nodes for which bailout matches, but only the closest one.
+     */
+    bailout: (GraphNode) -> Boolean,
+): DijkstraTree {
     val distances = mutableMapOf<GraphNode, Double>()
     val previous = mutableMapOf<GraphNode, GraphNode>()
     val visited = mutableSetOf<GraphNode>()
     val queue = PriorityQueue<GraphNode>(compareBy { distances.getOrDefault(it, Double.MAX_VALUE) })
+    var lastVisitedNode: GraphNode = start
 
     distances[start] = 0.0
     queue.add(start)
 
     while (queue.isNotEmpty()) {
         val current = queue.poll()
-        if (current == end) break
+        lastVisitedNode = current
+        if (bailout(current)) break
 
         visited.add(current)
 
@@ -194,16 +227,34 @@ fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode):
         }
     }
 
-    return Graph(
-        buildList {
-            var current = end
-            while (current != start) {
-                add(current)
-                current = previous[current] ?: return Graph(emptyList()) to 0.0
-            }
-            add(start)
-        }.reversed(),
-    ) to distances[end]!!
+    return DijkstraTree(
+        start,
+        distances,
+        previous,
+        lastVisitedNode,
+    )
+}
+
+fun Graph.findAllShortestDistances(start: GraphNode): DijkstraTree {
+    return findDijkstraDistances(start) { false }
+}
+
+fun DijkstraTree.findPathToDestination(end: GraphNode): Pair<Graph, Double> {
+    val distances = this
+    val reversePath = buildList {
+        var current = end
+        while (true) {
+            add(current)
+            if (current == distances.origin) break
+            current = distances.towardsOrigin[current] ?: return Graph(emptyList()) to 0.0
+        }
+    }
+    return Graph(reversePath.reversed()) to distances.distances[end]!!
+}
+
+fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode): Pair<Graph, Double> {
+    val distances = findDijkstraDistances(start) { it == end }
+    return distances.findPathToDestination(end)
 }
 
 fun Graph.findShortestPath(start: GraphNode, end: GraphNode): List<LorenzVec> = this.findShortestPathAsGraph(start, end).toPositionsList()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index e1fa3317a8cf..e70786137bf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 enum class GraphNodeTag(
     val internalName: String,
     val color: LorenzColor,
-    val cleanName: String,
+    cleanName: String,
     val description: String,
     val onlyIsland: IslandType? = null,
 ) {
@@ -17,13 +17,17 @@ enum class GraphNodeTag(
     AREA("area", LorenzColor.DARK_GREEN, "Area", "A big SkyBlock area."),
     SMALL_AREA("small_area", LorenzColor.GREEN, "Small Area", "A small SkyBlock area, e.g. a house."),
     POI("poi", LorenzColor.WHITE, "PoI", "Point of interest."),
-    LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
+//     LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
+    TELEPORT("teleport", LorenzColor.BLUE, "Teleport", "A spot from/to teleport."),
 
     // on multiple islands
     ROMEO("romeo", LorenzColor.WHITE, "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
     RACE("race", LorenzColor.WHITE, "Race Start/Stop", "A race start or stop point."),
-    SLAYER("slayer", LorenzColor.WHITE, "Slayer", "A Slayer area"),
+    SLAYER("slayer", LorenzColor.RED, "Slayer", "A Slayer area"),
     HOPPITY("hoppity", LorenzColor.AQUA, "Hoppity Egg", "An egg location in Hoppity's Hunt."),
+    GRIND_MOBS("grind_mobs", LorenzColor.RED, "Grind Mobs", "A spot where combat mobs spawn that can be killed."),
+    GRIND_ORES("grind_ores", LorenzColor.DARK_AQUA, "Grind Ores", "A spot where mining ores spawn that can be mines."),
+    GRIND_CROPS("grind_crops", LorenzColor.DARK_GREEN, "Grind Crops", "A spot where farming crops spawn that can be farmed."),
     // hoppity
 
     // Hub
@@ -52,6 +56,9 @@ enum class GraphNodeTag(
     // Crimson Isles
     CRIMSON_MINIBOSS("crimson_miniboss", LorenzColor.RED, "Crimson Miniboss", "Mini bosses in Crimson Isle.", onlyIsland = IslandType.CRIMSON_ISLE),
 
+    // The End
+    END_GOLEM("end_golem", LorenzColor.RED, "Golem Spawn", "A spot where the golem in the end spawns", onlyIsland = IslandType.THE_END),
+
     ;
 
     val displayName: String = color.getChatColor() + cleanName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index d85b34cc6936..311af056eab0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -6,7 +6,6 @@ import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.TextInput
-import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.EntityMoveEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -19,6 +18,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -65,19 +65,10 @@ object IslandAreas {
         val graph = IslandGraphs.currentIslandGraph ?: return
         val closedNote = IslandGraphs.closedNote ?: return
 
-        val paths = mutableMapOf<GraphNode, Graph>()
-
-        val map = mutableMapOf<GraphNode, Double>()
-        for (graphNode in graph.nodes) {
-            if (graphNode.getAreaTag() == null) continue
-            val (path, distance) = graph.findShortestPathAsGraphWithDistance(closedNote, graphNode)
-            paths[graphNode] = path
-            map[graphNode] = distance
-        }
+        val (paths, map) = GraphUtils.findFastestPaths(graph, closedNote) { it.getAreaTag() != null }
         this.paths = paths
 
         val finalNodes = mutableMapOf<GraphNode, Double>()
-
         val alreadyFoundAreas = mutableListOf<String>()
         for ((node, distance) in map.sorted()) {
             val areaName = node.name ?: continue
@@ -271,8 +262,8 @@ object IslandAreas {
     private val allAreas = listOf(GraphNodeTag.AREA, GraphNodeTag.SMALL_AREA)
     private val onlyLargeAreas = listOf(GraphNodeTag.AREA)
 
-    private fun GraphNode.getAreaTag(): GraphNodeTag? = tags.firstOrNull {
-        it in (if (config.includeSmallAreas) allAreas else onlyLargeAreas)
+    fun GraphNode.getAreaTag(ignoreConfig: Boolean = false): GraphNodeTag? = tags.firstOrNull {
+        it in (if (config.includeSmallAreas || ignoreConfig) allAreas else onlyLargeAreas)
     }
 
     private fun setTarget(node: GraphNode) {
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
index a070f5e8928a..01efda5cebb8 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
@@ -2,7 +2,7 @@
 
 import at.hannibal2.skyhanni.data.model.TextInput;
 import at.hannibal2.skyhanni.features.garden.farming.GardenCustomKeybinds;
-import at.hannibal2.skyhanni.test.GraphEditor;
+import at.hannibal2.skyhanni.test.graph.GraphEditor;
 import net.minecraft.client.settings.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 5b7333189b1e..045ce5bce1c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -131,36 +131,13 @@ object SkyHanniDebugsAndTests {
     }
 
     fun testCommand(args: Array<String>) {
+        SkyHanniMod.coroutineScope.launch {
+            asyncTest()
+        }
+    }
 
+    private fun asyncTest() {
 
-//            val a = Thread { OSUtils.copyToClipboard("123") }
-//            val b = Thread { OSUtils.copyToClipboard("456") }
-//            a.start()
-//            b.start()
-
-//            for ((i, s) in ScoreboardData.siedebarLinesFormatted().withIndex()) {
-//                println("$i: '$s'")
-//            }
-
-//            val name = args[0]
-//            val pitch = args[1].toFloat()
-//            val sound = SoundUtils.createSound("note.harp", 1.35f)
-//            val sound = SoundUtils.createSound("random.orb", 11.2f)
-//            SoundUtils.createSound(name, pitch).playSound()
-
-//            a = args[0].toDouble()
-//            b = args[1].toDouble()
-//            c = args[2].toDouble()
-
-//            for (line in getPlayerTabOverlay().footer.unformattedText
-//                .split("\n")) {
-//                println("footer: '$line'")
-//            }
-//
-//
-//            for (line in TabListUtils.getTabList()) {
-//                println("tablist: '$line'")
-//            }
     }
 
     fun findNullConfig(args: Array<String>) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
similarity index 93%
rename from src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
rename to src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
index d4038162f865..1aefeda52925 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.test
+package at.hannibal2.skyhanni.test.graph
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandGraphs
@@ -26,6 +26,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.RaycastUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine_nea
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
@@ -127,6 +128,7 @@ object GraphEditor {
         if (!inEditMode && !inTextMode) {
             add("§ePlace: §6${KeyboardManager.getKeyName(config.placeKey)}")
             add("§eSelect: §6${KeyboardManager.getKeyName(config.selectKey)}")
+            add("§eSelect (Look): §6${KeyboardManager.getKeyName(config.selectRaycastKey)}")
             add("§eConnect: §6${KeyboardManager.getKeyName(config.connectKey)}")
             add("§eTest: §6${KeyboardManager.getKeyName(config.dijkstraKey)}")
             add("§eVision: §6${KeyboardManager.getKeyName(config.throughBlocksKey)}")
@@ -259,7 +261,9 @@ object GraphEditor {
         }
     }
 
-    private fun chatAtDisable() = ChatUtils.clickableChat("Graph Editor is now inactive. §lClick to activate.", ::commandIn)
+    private fun chatAtDisable() = ChatUtils.clickableChat("Graph Editor is now inactive. §lClick to activate.",
+        GraphEditor::commandIn
+    )
 
     private fun input() {
         if (LorenzUtils.isAnyGuiActive()) return
@@ -346,13 +350,35 @@ object GraphEditor {
                 closedNode
             }
         }
+        if (config.selectRaycastKey.isKeyClicked()) {
+            val playerRay = RaycastUtils.createPlayerLookDirectionRay()
+            var minimumDistance = Double.MAX_VALUE
+            var minimumNode: GraphingNode? = null
+            for (node in nodes) {
+                val nodeCenterPosition = node.position.add(0.5, 0.5, 0.5)
+                val distance = RaycastUtils.findDistanceToRay(playerRay, nodeCenterPosition)
+                if (distance > minimumDistance) {
+                    continue
+                }
+                if (minimumDistance > 1.0) {
+                    minimumNode = node
+                    minimumDistance = distance
+                    continue
+                }
+                if (minimumNode == null || minimumNode.position.distanceSqToPlayer() > node.position.distanceSqToPlayer()) {
+                    minimumNode = node
+                    minimumDistance = distance
+                }
+            }
+            activeNode = minimumNode
+        }
         if (activeNode != closedNode && config.connectKey.isKeyClicked()) {
             val edge = getEdgeIndex(activeNode, closedNode)
             if (edge == null) {
                 addEdge(activeNode, closedNode)
                 feedBackInTutorial("Added new edge.")
             } else {
-                this.edges.removeAt(edge)
+                edges.removeAt(edge)
                 checkDissolve()
                 selectedEdge = findEdgeBetweenActiveAndClosed()
                 feedBackInTutorial("Removed edge.")
@@ -405,6 +431,7 @@ object GraphEditor {
         val compileGraph = compileGraph()
         if (config.useAsIslandArea) {
             IslandGraphs.setNewGraph(compileGraph)
+            GraphEditorBugFinder.runTests()
         }
         val json = compileGraph.toJson()
         OSUtils.copyToClipboard(json)
@@ -457,7 +484,7 @@ object GraphEditor {
                 nodes.remove(closedNode)
                 edges.removeIf { it.isInEdge(closedNode) }
                 if (closedNode == activeNode) activeNode = null
-                this.closedNode = null
+                GraphEditor.closedNode = null
                 return
             }
         }
@@ -505,7 +532,7 @@ object GraphEditor {
         prune()
         val indexedTable = nodes.mapIndexed { index, node -> node.id to index }.toMap()
         val nodes = nodes.mapIndexed { index, it -> GraphNode(index, it.position, it.name, it.tags.mapNotNull { it.internalName }) }
-        val neighbours = this.nodes.map { node ->
+        val neighbours = GraphEditor.nodes.map { node ->
             edges.filter { it.isInEdge(node) }.map { edge ->
                 val otherNode = if (node == edge.node1) edge.node2 else edge.node1
                 nodes[indexedTable[otherNode.id]!!] to node.position.distance(otherNode.position)
@@ -523,7 +550,7 @@ object GraphEditor {
                     it.id,
                     it.position,
                     it.name,
-                    it.tagNames?.mapNotNull { GraphNodeTag.byId(it) }?.toMutableList() ?: mutableListOf(),
+                    it.tagNames.mapNotNull { tag -> GraphNodeTag.byId(tag) }.toMutableList(),
                 )
             },
         )
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
new file mode 100644
index 000000000000..aee75ec5faf6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
@@ -0,0 +1,95 @@
+package at.hannibal2.skyhanni.test.graph
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.features.misc.IslandAreas.getAreaTag
+import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
+import at.hannibal2.skyhanni.utils.GraphUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import kotlinx.coroutines.launch
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+
+// Trying to find errors in Area Graph for the current graph editor instance
+object GraphEditorBugFinder {
+    private var errorsInWorld = emptyMap<LorenzVec, String>()
+
+    fun runTests() {
+        SkyHanniMod.coroutineScope.launch {
+            asyncTest()
+        }
+    }
+
+    private fun asyncTest() {
+        val graph = IslandGraphs.currentIslandGraph ?: return
+        val errorsInWorld: MutableMap<LorenzVec, String> = mutableMapOf()
+        val nodes = graph.nodes
+
+        val nearestArea = mutableMapOf<GraphNode, GraphNode>()
+        for (node in nodes) {
+            val pathToNearestArea = GraphUtils.findFastestPath(graph, node) { it.getAreaTag(ignoreConfig = true) != null }?.first
+            if (pathToNearestArea == null) {
+                continue
+            }
+            val areaNode = pathToNearestArea.lastOrNull() ?: error("Empty path to nearest area")
+            nearestArea[node] = areaNode
+        }
+        var bugs = 0
+        for (node in nodes) {
+            val areaNode = nearestArea[node]?.name ?: continue
+            for (neighbour in node.neighbours.keys) {
+                val neighbouringAreaNode = nearestArea[neighbour]?.name ?: continue
+                if (neighbouringAreaNode == areaNode) continue
+                if ((null == node.getAreaTag(ignoreConfig = true))) {
+                    bugs++
+                    errorsInWorld[node.position] = "§cConflicting areas $areaNode and $neighbouringAreaNode"
+                }
+            }
+        }
+        for (node in nodes) {
+            val nameNull = node.name.isNullOrBlank()
+            val tagsEmpty = node.tags.isEmpty()
+            if (nameNull > tagsEmpty) {
+                errorsInWorld[node.position] = "§cMissing name despite having tags"
+                bugs++
+            }
+            if (tagsEmpty > nameNull) {
+                errorsInWorld[node.position] = "§cMissing tags despite having name"
+                bugs++
+            }
+        }
+
+        val clusters = GraphUtils.findDisjointClusters(graph)
+        if (clusters.size > 1) {
+            val closestCluster = clusters.minBy { it.minOf { it.position.distanceSqToPlayer() } }
+            val foreignClusters = clusters.filter { it !== closestCluster }
+            val closestForeignNodes = foreignClusters.map { network -> network.minBy { it.position.distanceSqToPlayer() } }
+            closestForeignNodes.forEach {
+                errorsInWorld[it.position] = "§cDisjoint node network"
+                bugs++
+            }
+            val closestForeignNode = closestForeignNodes.minBy { it.position.distanceSqToPlayer() }
+            val closestNodeToForeignNode = closestCluster.minBy { it.position.distanceSq(closestForeignNode.position) }
+            IslandGraphs.pathFind(closestNodeToForeignNode.position, Color.RED)
+        }
+
+        println("found $bugs bugs!")
+        this.errorsInWorld = errorsInWorld
+        if (clusters.size <= 1) {
+            IslandGraphs.pathFind(errorsInWorld.keys.minByOrNull { it.distanceSqToPlayer() } ?: return, Color.RED)
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled()) return
+
+        for ((location, text) in errorsInWorld) {
+            event.drawDynamicText(location, text, 1.5)
+        }
+    }
+    fun isEnabled() = GraphEditor.isEnabled()
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
similarity index 71%
rename from src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt
rename to src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
index f541b16e307c..e6c4536d8b84 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/GraphNodeEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
@@ -1,10 +1,10 @@
-package at.hannibal2.skyhanni.test
+package at.hannibal2.skyhanni.test.graph
 
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.TextInput
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.GraphEditor.distanceSqToPlayer
+import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -29,12 +29,12 @@ object GraphNodeEditor {
     private val textInput = TextInput()
     private var nodesDisplay = emptyList<Renderable>()
     private var lastUpdate = SimpleTimeMark.farPast()
+    private val tagsToShow: MutableList<GraphNodeTag> = GraphNodeTag.entries.toMutableList()
 
     @SubscribeEvent
     fun onGuiRender(event: GuiRenderEvent) {
         if (!isEnabled()) return
 
-
         config.namedNodesList.renderRenderables(
             getNodeNames(),
             posLabel = "Graph Nodes List",
@@ -52,15 +52,66 @@ object GraphNodeEditor {
         lastUpdate = SimpleTimeMark.now()
         nodesDisplay = buildList {
             val list = drawNodeNames()
-            val size = list.size
-            addString("§eGraph Nodes: $size")
-            val height = (size * 10).coerceAtMost(250)
+            val total = GraphEditor.nodes.count { it.name?.isNotBlank() ?: false }
+            val shown = list.size
+            add(
+                Renderable.clickAndHover(
+                    "§eGraph Nodes: $shown/$total",
+                    listOf("§eClick to toggle node tags!"),
+                    onClick = {
+                        updateToggleTags()
+                    },
+                ),
+            )
+            val height = (shown * 10).coerceAtMost(250)
             if (list.isNotEmpty()) {
                 add(list.buildSearchableScrollable(height, textInput, scrollValueNodes, velocity = 10.0))
             }
         }
     }
 
+    private fun updateToggleTags() {
+        lastUpdate = SimpleTimeMark.now() + 60.seconds
+        nodesDisplay = buildList {
+            addString("§eToggle Visible Tags")
+            for (tag in GraphNodeTag.entries) {
+                val isVisible = tag in tagsToShow
+                val nodes = GraphEditor.nodes.count { tag in it.tags }
+                val visibilityText = if (isVisible) " §aVisible" else " §7Invisible"
+                val name = " - ${tag.displayName} §8($nodes nodes) $visibilityText"
+                add(
+                    Renderable.clickAndHover(
+                        name,
+                        listOf("§eClick to " + (if (isVisible) "hide" else "show") + " nodes with this tag!"),
+                        onClick = {
+                            toggleTag(tag)
+                            updateToggleTags()
+                        },
+                    ),
+                )
+            }
+            addString("")
+            add(
+                Renderable.clickAndHover(
+                    "§cGo Back!",
+                    tips = listOf("§eClick to go back to the node list!"),
+                    onClick = {
+                        updateNodeNames()
+                    },
+                ),
+            )
+        }
+
+    }
+
+    private fun toggleTag(tag: GraphNodeTag) {
+        if (tag in tagsToShow) {
+            tagsToShow.remove(tag)
+        } else {
+            tagsToShow.add(tag)
+        }
+    }
+
     private fun updateTagView(node: GraphingNode) {
         lastUpdate = SimpleTimeMark.now() + 60.seconds
         nodesDisplay = buildList {
@@ -123,7 +174,10 @@ object GraphNodeEditor {
 
     private fun drawNodeNames(): List<Searchable> = buildList {
         for ((node, distance: Double) in GraphEditor.nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
-            val name = node.name?.takeIf { !it.isBlank() } ?: continue
+            if (node.tags.isNotEmpty()) {
+                if (!node.tags.any { it in tagsToShow }) continue
+            }
+            val name = node.name?.takeIf { it.isNotBlank() } ?: continue
             val color = if (node == GraphEditor.activeNode) "§a" else "§7"
             val distanceFormat = sqrt(distance).toInt().addSeparators()
             val tagText = node.tags.let { tags ->
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
new file mode 100644
index 000000000000..4a245a894252
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
@@ -0,0 +1,68 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.data.model.Graph
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.findAllShortestDistances
+import at.hannibal2.skyhanni.data.model.findDijkstraDistances
+import at.hannibal2.skyhanni.data.model.findPathToDestination
+import java.util.Stack
+
+object GraphUtils {
+    /**
+     * Find the fastest path from [closestNode] to *any* node that matches [condition].
+     */
+    fun findFastestPath(
+        graph: Graph,
+        closestNode: GraphNode,
+        condition: (GraphNode) -> Boolean,
+    ): Pair<Graph, Double>? {
+        val distances = graph.findDijkstraDistances(closestNode, condition)
+        val entry = distances.lastVisitedNode.takeIf(condition)
+        return entry?.let {
+            distances.findPathToDestination(it)
+        }
+    }
+
+    /**
+     * Find the fastest path from [closestNode] to *all* nodes that matches [condition].
+     */
+    fun findFastestPaths(
+        graph: Graph,
+        closestNode: GraphNode,
+        condition: (GraphNode) -> Boolean = { true },
+    ): Pair<MutableMap<GraphNode, Graph>, MutableMap<GraphNode, Double>> {
+        val paths = mutableMapOf<GraphNode, Graph>()
+
+        val map = mutableMapOf<GraphNode, Double>()
+        val distances = graph.findAllShortestDistances(closestNode)
+        for (graphNode in graph.nodes) {
+            if (!condition(graphNode)) continue
+            val (path, distance) = distances.findPathToDestination(graphNode)
+            paths[graphNode] = path
+            map[graphNode] = distance
+        }
+        return Pair(paths, map)
+    }
+
+    /**
+     * Find all maximal sub graphs of the given graph which are not connected
+     */
+    fun findDisjointClusters(graph: Graph): List<Set<GraphNode>> {
+        val universe = graph.toMutableSet()
+        val allClusters = mutableListOf<Set<GraphNode>>()
+        while (universe.isNotEmpty()) {
+            val cluster = mutableSetOf<GraphNode>()
+            allClusters.add(cluster)
+            val queue = Stack<GraphNode>()
+            queue.add(universe.first())
+            while (queue.isNotEmpty()) {
+                val next = queue.pop()
+                universe.remove(next)
+                cluster.add(next)
+                queue.addAll(next.neighbours.keys)
+                queue.retainAll(universe)
+            }
+        }
+        return allClusters
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 51bb8b72cd81..a573ed78daeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -9,6 +9,7 @@ import net.minecraft.util.BlockPos
 import net.minecraft.util.Rotations
 import net.minecraft.util.Vec3
 import kotlin.math.abs
+import kotlin.math.absoluteValue
 import kotlin.math.acos
 import kotlin.math.cos
 import kotlin.math.max
@@ -126,6 +127,8 @@ data class LorenzVec(
     fun lengthSquared(): Double = x * x + y * y + z * z
     fun length(): Double = sqrt(this.lengthSquared())
 
+    fun isNormalized(tolerance: Double = 0.01) = (lengthSquared() - 1.0).absoluteValue < tolerance
+
     fun isZero(): Boolean = x == 0.0 && y == 0.0 && z == 0.0
 
     fun clone(): LorenzVec = LorenzVec(x, y, z)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RaycastUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RaycastUtils.kt
new file mode 100644
index 000000000000..d5aafdcd3c8c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RaycastUtils.kt
@@ -0,0 +1,73 @@
+package at.hannibal2.skyhanni.utils
+
+import net.minecraft.client.Minecraft
+
+object RaycastUtils {
+
+    data class Ray(
+        val origin: LorenzVec,
+        val direction: LorenzVec,
+    ) {
+        init {
+            require(direction.isNormalized())
+        }
+    }
+
+    data class Plane(
+        val origin: LorenzVec,
+        val normal: LorenzVec,
+    ) {
+        init {
+            require(normal.isNormalized())
+        }
+    }
+
+    fun createPlayerLookDirectionRay(): Ray {
+        return Ray(
+            LocationUtils.playerEyeLocation(),
+            Minecraft.getMinecraft().thePlayer.lookVec.toLorenzVec()
+        )
+    }
+
+    /**
+     * Create a plane that contains [point] and is orthogonal to [ray].
+     */
+    fun createOrthogonalPlaneToRayAtPoint(
+        ray: Ray,
+        point: LorenzVec,
+    ): Plane {
+        return Plane(point, ray.direction)
+    }
+
+    /**
+     * Intersect a plane (of any orientation) with a ray. The ray and plane may not be parallel to each other.
+     */
+    fun intersectPlaneWithRay(plane: Plane, ray: Ray): LorenzVec {
+//         require(plane.normal.dotProduct(ray.direction).absoluteValue != 0.0)
+        val intersectionPointDistanceAlongRay =
+            (plane.normal.dotProduct(plane.origin) - plane.normal.dotProduct(ray.origin)) / plane.normal.dotProduct(ray.direction)
+        return ray.origin + ray.direction.scale(intersectionPointDistanceAlongRay)
+    }
+
+    /**
+     * Finds the distance between the given ray and the point. If the point is behind the ray origin (according to the ray's direction),
+     * returns [Double.MAX_VALUE] instead.
+     */
+    fun findDistanceToRay(ray: Ray, point: LorenzVec): Double {
+        val plane = createOrthogonalPlaneToRayAtPoint(ray, point)
+        val intersectionPoint = intersectPlaneWithRay(plane, ray)
+        if ((intersectionPoint - ray.origin).dotProduct(ray.direction) < 0) return Double.MAX_VALUE
+        return intersectionPoint.distance(point)
+    }
+
+    inline fun <T> createDistanceToRayEstimator(ray: Ray, crossinline position: (T) -> LorenzVec): (T) -> Double {
+        return {
+            findDistanceToRay(ray, position(it))
+        }
+    }
+
+    fun <T : Any> List<T>.findClosestPointToRay(ray: Ray, positionExtractor: (T) -> LorenzVec): T? {
+        return minByOrNull(createDistanceToRayEstimator(ray, positionExtractor))
+    }
+
+}

From ed91bbeaca46b3bbbf51cbeb208b14aa87de1cf6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 20 Sep 2024 22:38:27 +0200
Subject: [PATCH 499/721] misc changes

---
 src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt | 2 +-
 src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index 0646b884cdec..15fcbe8a9a62 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -111,7 +111,7 @@ class TextInput {
             }
             if (KeyboardManager.isPastingKeysDown()) {
                 runBlocking {
-                    textBox = OSUtils.readFromClipboard() ?: return@runBlocking
+                    textBox = OSUtils.readFromClipboard()?.take(2024) ?: return@runBlocking
                     updated()
                 }
                 return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
index ae0028b33f2b..ae7ec12de390 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
@@ -41,8 +41,7 @@ object BlockUtils {
     }
 
     fun rayTrace(start: LorenzVec, direction: LorenzVec, distance: Double = 50.0): LorenzVec? {
-        val help = direction.normalize() * distance
-        val target = start + help
+        val target = start + direction.normalize() * distance
         val result = Minecraft.getMinecraft().theWorld.rayTraceBlocks(start.toVec3(), target.toVec3())
 
         return result?.blockPos?.toLorenzVec()

From 40288e4d66dd53ab6865ac08a90ea843c1bc0f62 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 20 Sep 2024 22:48:17 +0200
Subject: [PATCH 500/721] Fix: Hardstone and Tungsten detection in Mineshafts
 (#2536)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 11 ++-
 .../features/mining/MineshaftPityDisplay.kt   |  1 -
 .../mining/MiningCommissionsBlocksColor.kt    |  1 -
 .../skyhanni/features/mining/OreBlock.kt      | 76 +++++++++++-----
 .../skyhanni/features/mining/OreType.kt       | 90 ++++++++++---------
 5 files changed, 113 insertions(+), 66 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index fd399ae8b037..758294ffc580 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.mining.OreMinedEvent
 import at.hannibal2.skyhanni.events.player.PlayerDeathEvent
@@ -59,6 +58,8 @@ object MiningAPI {
     private var waitingForEffMinerBlock = false
 
     var inGlacite = false
+    var inTunnels = false
+    var inMineshaft = false
     var inDwarvenMines = false
     var inCrystalHollows = false
     var inCrimsonIsle = false
@@ -66,12 +67,13 @@ object MiningAPI {
     var inSpidersDen = false
 
     var currentAreaOreBlocks = setOf<OreBlock>()
+        private set
 
     private var lastSkyblockArea: String? = null
 
     private val recentClickedBlocks = ConcurrentSet<Pair<LorenzVec, SimpleTimeMark>>()
     private val surroundingMinedBlocks = ConcurrentLinkedQueue<Pair<MinedBlock, LorenzVec>>()
-    private val allowedSoundNames = listOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
+    private val allowedSoundNames = setOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
 
     var cold: Int = 0
         private set
@@ -117,6 +119,7 @@ object MiningAPI {
     fun onBlockClick(event: BlockClickEvent) {
         if (!inCustomMiningIsland()) return
         if (event.clickType != ClickType.LEFT_CLICK) return
+        //println(event.getBlockState.properties)
         if (OreBlock.getByStateOrNull(event.getBlockState) == null) return
         recentClickedBlocks += event.position to SimpleTimeMark.now()
     }
@@ -142,6 +145,7 @@ object MiningAPI {
     fun onPlaySound(event: PlaySoundEvent) {
         if (!inCustomMiningIsland()) return
         if (event.soundName !in allowedSoundNames) return
+        //println("Sound: ${event.soundName} ${event.pitch} ${event.volume} ${event.location.toCleanString()}")
         if (waitingForInitSound) {
             if (event.soundName != "random.orb" && event.pitch == 0.7936508f) {
                 val pos = event.location.roundLocationToBlock()
@@ -176,6 +180,7 @@ object MiningAPI {
 
         val pos = event.location
         if (pos.distanceToPlayer() > 7) return
+        //println("Block change: $oldState -> $newState ${pos.toCleanString()}")
 
         if (lastInitSound.passedSince() > 100.milliseconds) return
 
@@ -288,6 +293,8 @@ object MiningAPI {
         lastSkyblockArea = currentArea
 
         inGlacite = inGlaciteArea()
+        inTunnels = inGlacialTunnels()
+        inMineshaft = inMineshaft()
         inDwarvenMines = inRegularDwarven()
         inCrystalHollows = inCrystalHollows()
         inCrimsonIsle = IslandType.CRIMSON_ISLE.isInIsland()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 3b89ae246bc2..8497951febb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -15,7 +15,6 @@ import at.hannibal2.skyhanni.events.mining.OreMinedEvent
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.PityBlock.Companion.getPity
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.PityBlock.Companion.getPityBlock
 import at.hannibal2.skyhanni.features.mining.OreType.Companion.getOreType
-import at.hannibal2.skyhanni.features.mining.OreType.Companion.isGemstone
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
index bf7c8c2ac81f..5eaff2b44604 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
@@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
-import at.hannibal2.skyhanni.features.mining.OreType.Companion.isGemstone
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index d9b76a35be94..8acf4fc86f9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -6,7 +6,9 @@ import at.hannibal2.skyhanni.data.MiningAPI.inCrystalHollows
 import at.hannibal2.skyhanni.data.MiningAPI.inDwarvenMines
 import at.hannibal2.skyhanni.data.MiningAPI.inEnd
 import at.hannibal2.skyhanni.data.MiningAPI.inGlacite
+import at.hannibal2.skyhanni.data.MiningAPI.inMineshaft
 import at.hannibal2.skyhanni.data.MiningAPI.inSpidersDen
+import at.hannibal2.skyhanni.data.MiningAPI.inTunnels
 import at.hannibal2.skyhanni.utils.CollectionUtils.equalsOneOf
 import net.minecraft.block.BlockColored
 import net.minecraft.block.BlockSand
@@ -14,11 +16,13 @@ import net.minecraft.block.BlockSilverfish
 import net.minecraft.block.BlockStainedGlass
 import net.minecraft.block.BlockStainedGlassPane
 import net.minecraft.block.BlockStone
+import net.minecraft.block.BlockStoneSlab
 import net.minecraft.block.BlockStoneSlabNew
 import net.minecraft.block.state.IBlockState
 import net.minecraft.init.Blocks
 import net.minecraft.item.EnumDyeColor
 
+
 enum class OreBlock(
     val checkBlock: (IBlockState) -> Boolean,
     val checkArea: () -> Boolean,
@@ -128,9 +132,13 @@ enum class OreBlock(
         checkBlock = ::isHardStoneHollows,
         checkArea = { inCrystalHollows },
     ),
-    HARD_STONE_GLACIAL(
-        checkBlock = ::isHardstoneGlacite,
-        checkArea = { inGlacite },
+    HARD_STONE_TUNNELS(
+        checkBlock = ::isHardstoneTunnels,
+        checkArea = { inTunnels },
+    ),
+    HARD_STONE_MINESHAFT(
+        checkBlock = ::isHardstoneMineshaft,
+        checkArea = { inMineshaft },
     ),
 
     // DWARVEN BLOCKS
@@ -139,10 +147,12 @@ enum class OreBlock(
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
     PURE_IRON(
+        // currently not detected
         checkBlock = { it.block == Blocks.iron_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
     PURE_GOLD(
+        // currently not detected
         checkBlock = { it.block == Blocks.gold_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
@@ -151,14 +161,17 @@ enum class OreBlock(
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
     PURE_REDSTONE(
+        // currently not detected
         checkBlock = { it.block == Blocks.redstone_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
     PURE_EMERALD(
+        // currently not detected
         checkBlock = { it.block == Blocks.emerald_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
     PURE_DIAMOND(
+        // currently not detected
         checkBlock = { it.block == Blocks.diamond_block },
         checkArea = { inDwarvenMines || inCrystalHollows },
     ),
@@ -222,14 +235,20 @@ enum class OreBlock(
         checkBlock = ::isHighTierUmber,
         checkArea = { inGlacite },
     ),
-    LOW_TIER_TUNGSTEN(
-        checkBlock = ::isLowTierTungsten,
-        checkArea = { inGlacite },
+
+    LOW_TIER_TUNGSTEN_TUNNELS(
+        checkBlock = ::isLowTierTungstenTunnels,
+        checkArea = { inTunnels },
+    ),
+    LOW_TIER_TUNGSTEN_MINESHAFT(
+        checkBlock = ::isLowTierTungstenMineshaft,
+        checkArea = { inMineshaft },
     ),
     HIGH_TIER_TUNGSTEN(
         checkBlock = { it.block == Blocks.clay },
         checkArea = { inGlacite },
     ),
+
     GLACITE(
         checkBlock = { it.block == Blocks.packed_ice },
         checkArea = { inGlacite },
@@ -261,33 +280,50 @@ private fun isStone(state: IBlockState): Boolean {
 
 private fun isHardStoneHollows(state: IBlockState): Boolean {
     return when (state.block) {
-        Blocks.wool -> (state.getValue(BlockColored.COLOR) == EnumDyeColor.GRAY)
-        Blocks.stained_hardened_clay -> (state.getValue(BlockColored.COLOR) == EnumDyeColor.CYAN)
-        Blocks.stone -> (state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE)
+        Blocks.wool -> {
+            val color = state.getValue(BlockColored.COLOR)
+            color == EnumDyeColor.GRAY || color == EnumDyeColor.GREEN
+        }
+        Blocks.stained_hardened_clay -> when (state.getValue(BlockColored.COLOR)) {
+            EnumDyeColor.CYAN, EnumDyeColor.BROWN, EnumDyeColor.GRAY, EnumDyeColor.BLACK,
+            EnumDyeColor.LIME, EnumDyeColor.GREEN, EnumDyeColor.BLUE, EnumDyeColor.RED,
+            EnumDyeColor.SILVER -> true
+            else -> false
+        }
+        Blocks.clay, Blocks.stonebrick, Blocks.stone -> true
         else -> false
     }
 }
 
-private fun isHardstoneGlacite(state: IBlockState): Boolean =
+private fun isHardstoneTunnels(state: IBlockState): Boolean =
     (state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.STONE) ||
-        (state.block == Blocks.wool && state.getValue(BlockColored.COLOR) == EnumDyeColor.GRAY)
+        (state.block == Blocks.wool && state.getValue(BlockColored.COLOR) == EnumDyeColor.SILVER)
+
+private fun isHardstoneMineshaft(state: IBlockState): Boolean =
+    (state.block == Blocks.stone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.STONE) ||
+        (state.block == Blocks.wool && state.getValue(BlockColored.COLOR) == EnumDyeColor.SILVER)
 
 private fun isRedSand(state: IBlockState): Boolean =
     (state.block == Blocks.sand && state.getValue(BlockSand.VARIANT) == BlockSand.EnumType.RED_SAND)
 
 private fun isLowTierUmber(state: IBlockState): Boolean =
-    state.block == Blocks.hardened_clay || (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
+    state.block == Blocks.hardened_clay ||
+        (state.block == Blocks.stained_hardened_clay && state.getValue(BlockColored.COLOR) == EnumDyeColor.BROWN)
 
 private fun isHighTierUmber(state: IBlockState): Boolean =
     (state.block == Blocks.double_stone_slab2 && state.getValue(BlockStoneSlabNew.VARIANT) == BlockStoneSlabNew.EnumType.RED_SANDSTONE)
 
-private fun isLowTierTungsten(state: IBlockState): Boolean =
-    state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.COBBLESTONE
+private fun isLowTierTungstenTunnels(state: IBlockState): Boolean =
+    state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.STONE
 
-private fun IBlockState.isGemstoneWithColor(color: EnumDyeColor): Boolean {
-    return when (this.block) {
-        Blocks.stained_glass -> color == this.getValue(BlockStainedGlass.COLOR)
-        Blocks.stained_glass_pane -> color == this.getValue(BlockStainedGlassPane.COLOR)
-        else -> false
-    }
+private fun isLowTierTungstenMineshaft(state: IBlockState): Boolean = when (state.block) {
+    Blocks.stone_slab -> state.getValue(BlockStoneSlab.VARIANT) == BlockStoneSlab.EnumType.COBBLESTONE
+    Blocks.cobblestone, Blocks.stone_stairs -> true
+    else -> false
+}
+
+private fun IBlockState.isGemstoneWithColor(color: EnumDyeColor): Boolean = when (block) {
+    Blocks.stained_glass -> color == getValue(BlockStainedGlass.COLOR)
+    Blocks.stained_glass_pane -> color == getValue(BlockStainedGlassPane.COLOR)
+    else -> false
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
index 5f9743b68a0e..66c12837114a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -7,187 +7,190 @@ import net.minecraft.block.state.IBlockState
 
 enum class OreType(
     val oreName: String,
-    private val internalNameString: String,
-    val oreBlocks: List<OreBlock>,
-    val internalName: NEUInternalName = internalNameString.asInternalName(),
+    internalName: String,
+    vararg val oreBlocks: OreBlock,
 ) {
     MITHRIL(
         "Mithril",
         "MITHRIL_ORE",
-        listOf(OreBlock.LOW_TIER_MITHRIL, OreBlock.MID_TIER_MITHRIL, OreBlock.HIGH_TIER_MITHRIL),
+        OreBlock.LOW_TIER_MITHRIL, OreBlock.MID_TIER_MITHRIL, OreBlock.HIGH_TIER_MITHRIL,
     ),
     TITANIUM(
         "Titanium",
         "TITANIUM_ORE",
-        listOf(OreBlock.TITANIUM),
+        OreBlock.TITANIUM,
     ),
     COBBLESTONE(
         "Cobblestone",
         "COBBLESTONE",
-        listOf(OreBlock.STONE, OreBlock.COBBLESTONE),
+        OreBlock.STONE, OreBlock.COBBLESTONE,
     ),
     COAL(
         "Coal",
         "COAL",
-        listOf(OreBlock.COAL_ORE, OreBlock.PURE_COAL),
+        OreBlock.COAL_ORE, OreBlock.PURE_COAL,
     ),
     IRON(
         "Iron",
         "IRON_INGOT",
-        listOf(OreBlock.IRON_ORE, OreBlock.PURE_IRON),
+        OreBlock.IRON_ORE, OreBlock.PURE_IRON,
     ),
     GOLD(
         "Gold",
         "GOLD_INGOT",
-        listOf(OreBlock.GOLD_ORE, OreBlock.PURE_GOLD),
+        OreBlock.GOLD_ORE, OreBlock.PURE_GOLD,
     ),
     LAPIS(
         "Lapis Lazuli",
         "INK_SACK-4",
-        listOf(OreBlock.LAPIS_ORE, OreBlock.PURE_LAPIS),
+        OreBlock.LAPIS_ORE, OreBlock.PURE_LAPIS,
     ),
     REDSTONE(
         "Redstone",
         "REDSTONE",
-        listOf(OreBlock.REDSTONE_ORE, OreBlock.PURE_REDSTONE),
+        OreBlock.REDSTONE_ORE, OreBlock.PURE_REDSTONE,
     ),
     EMERALD(
         "Emerald",
         "EMERALD",
-        listOf(OreBlock.EMERALD_ORE, OreBlock.PURE_EMERALD),
+        OreBlock.EMERALD_ORE, OreBlock.PURE_EMERALD,
     ),
     DIAMOND(
         "Diamond",
         "DIAMOND",
-        listOf(OreBlock.DIAMOND_ORE, OreBlock.PURE_DIAMOND),
+        OreBlock.DIAMOND_ORE, OreBlock.PURE_DIAMOND,
     ),
     NETHERRACK(
         "Netherrack",
         "NETHERRACK",
-        listOf(OreBlock.NETHERRACK),
+        OreBlock.NETHERRACK,
     ),
     QUARTZ(
         "Nether Quartz",
         "QUARTZ",
-        listOf(OreBlock.QUARTZ_ORE),
+        OreBlock.QUARTZ_ORE,
     ),
     GLOWSTONE(
         "Glowstone",
         "GLOWSTONE_DUST",
-        listOf(OreBlock.GLOWSTONE),
+        OreBlock.GLOWSTONE,
     ),
     MYCELIUM(
         "Mycelium",
         "MYCEL",
-        listOf(OreBlock.MYCELIUM),
+        OreBlock.MYCELIUM,
     ),
     RED_SAND(
         "Red Sand",
         "SAND-1",
-        listOf(OreBlock.RED_SAND),
+        OreBlock.RED_SAND,
     ),
     SULPHUR(
         "Sulphur",
         "SULPHUR_ORE",
-        listOf(OreBlock.SULPHUR),
+        OreBlock.SULPHUR,
     ),
     GRAVEL(
         "Gravel",
         "GRAVEL",
-        listOf(OreBlock.GRAVEL),
+        OreBlock.GRAVEL,
     ),
     END_STONE(
         "End Stone",
         "ENDER_STONE",
-        listOf(OreBlock.END_STONE),
+        OreBlock.END_STONE,
     ),
     OBSIDIAN(
         "Obsidian",
         "OBSIDIAN",
-        listOf(OreBlock.OBSIDIAN),
+        OreBlock.OBSIDIAN,
     ),
     HARD_STONE(
         "Hard Stone",
         "HARD_STONE",
-        listOf(OreBlock.HARD_STONE_HOLLOWS, OreBlock.HARD_STONE_GLACIAL),
+        OreBlock.HARD_STONE_HOLLOWS, OreBlock.HARD_STONE_TUNNELS, OreBlock.HARD_STONE_MINESHAFT,
     ),
     RUBY(
         "Ruby",
         "ROUGH_RUBY_GEM",
-        listOf(OreBlock.RUBY),
+        OreBlock.RUBY,
     ),
     AMBER(
         "Amber",
         "ROUGH_AMBER_GEM",
-        listOf(OreBlock.AMBER),
+        OreBlock.AMBER,
     ),
     AMETHYST(
         "Amethyst",
         "ROUGH_AMETHYST_GEM",
-        listOf(OreBlock.AMETHYST),
+        OreBlock.AMETHYST,
     ),
     JADE(
         "Jade",
         "ROUGH_JADE_GEM",
-        listOf(OreBlock.JADE),
+        OreBlock.JADE,
     ),
     SAPPHIRE(
         "Sapphire",
         "ROUGH_SAPPHIRE_GEM",
-        listOf(OreBlock.SAPPHIRE),
+        OreBlock.SAPPHIRE,
     ),
     TOPAZ(
         "Topaz",
         "ROUGH_TOPAZ_GEM",
-        listOf(OreBlock.TOPAZ),
+        OreBlock.TOPAZ,
     ),
     JASPER(
         "Jasper",
         "ROUGH_JASPER_GEM",
-        listOf(OreBlock.JASPER),
+        OreBlock.JASPER,
     ),
     OPAL(
         "Opal",
         "ROUGH_OPAL_GEM",
-        listOf(OreBlock.OPAL),
+        OreBlock.OPAL,
     ),
     AQUAMARINE(
         "Aquamarine",
         "ROUGH_AQUAMARINE_GEM",
-        listOf(OreBlock.AQUAMARINE),
+        OreBlock.AQUAMARINE,
     ),
     CITRINE(
         "Citrine",
         "ROUGH_CITRINE_GEM",
-        listOf(OreBlock.CITRINE),
+        OreBlock.CITRINE,
     ),
     ONYX(
         "Onyx",
         "ROUGH_ONYX_GEM",
-        listOf(OreBlock.ONYX),
+        OreBlock.ONYX,
     ),
     PERIDOT(
         "Peridot",
         "ROUGH_PERIDOT_GEM",
-        listOf(OreBlock.PERIDOT),
+        OreBlock.PERIDOT,
     ),
     UMBER(
         "Umber",
         "UMBER",
-        listOf(OreBlock.LOW_TIER_UMBER, OreBlock.HIGH_TIER_UMBER),
+        OreBlock.LOW_TIER_UMBER, OreBlock.HIGH_TIER_UMBER,
     ),
     TUNGSTEN(
         "Tungsten",
         "TUNGSTEN",
-        listOf(OreBlock.LOW_TIER_TUNGSTEN, OreBlock.HIGH_TIER_TUNGSTEN),
+        OreBlock.LOW_TIER_TUNGSTEN_TUNNELS, OreBlock.LOW_TIER_TUNGSTEN_MINESHAFT, OreBlock.HIGH_TIER_TUNGSTEN,
     ),
     GLACITE(
         "Glacite",
         "GLACITE",
-        listOf(OreBlock.GLACITE),
+        OreBlock.GLACITE,
     ),
     ;
 
+    val internalName: NEUInternalName = internalName.asInternalName()
+
+    fun isGemstone(): Boolean = this in gemstones
+
     companion object {
 
         private val gemstones = setOf(
@@ -197,12 +200,15 @@ enum class OreType(
         )
 
         fun IBlockState.isOreType(oreType: OreType): Boolean {
-            return oreType.oreBlocks.intersect(MiningAPI.currentAreaOreBlocks)
-                .any { it.checkBlock.invoke(this) }
+            for (oreBlock in oreType.oreBlocks) {
+                if (oreBlock !in MiningAPI.currentAreaOreBlocks) continue
+                if (oreBlock.checkBlock(this)) {
+                    return true
+                }
+            }
+            return false
         }
 
-        fun OreType.isGemstone(): Boolean = this in gemstones
-
         fun OreBlock.getOreType(): OreType? {
             return OreType.entries.firstOrNull { this in it.oreBlocks }
         }

From 8a7be2963b08d8f5f2ca6217545a9043f4792598 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 20 Sep 2024 23:06:17 +0200
Subject: [PATCH 501/721] fixed hardstone

---
 src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 8acf4fc86f9f..8e7cbf0821da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -314,7 +314,7 @@ private fun isHighTierUmber(state: IBlockState): Boolean =
     (state.block == Blocks.double_stone_slab2 && state.getValue(BlockStoneSlabNew.VARIANT) == BlockStoneSlabNew.EnumType.RED_SANDSTONE)
 
 private fun isLowTierTungstenTunnels(state: IBlockState): Boolean =
-    state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.STONE
+    state.block == Blocks.monster_egg && state.getValue(BlockSilverfish.VARIANT) == BlockSilverfish.EnumType.COBBLESTONE
 
 private fun isLowTierTungstenMineshaft(state: IBlockState): Boolean = when (state.block) {
     Blocks.stone_slab -> state.getValue(BlockStoneSlab.VARIANT) == BlockStoneSlab.EnumType.COBBLESTONE

From e026faba64c611d9b3cb6bde0337d59f02ffce63 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:13:19 -0400
Subject: [PATCH 502/721] Feature: Hoppity Collection Dye Recolor (#2522)

---
 .../ChocolateFactoryConfig.java               |  5 +++
 .../event/hoppity/HoppityCollectionStats.kt   | 32 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

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 fa817ede042f..5d1c63f8d7e1 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
@@ -192,6 +192,11 @@ public class ChocolateFactoryConfig {
         HighlightRabbitTypes.STRAYS
     ));
 
+    @Expose
+    @ConfigOption(name = "Re-color Missing Rabbit Dyes", desc = "Replace the gray dye in Hoppity's Collection with a color for the rarity of the rabbit.")
+    @ConfigEditorBoolean
+    public boolean rarityDyeRecolor = true;
+
     @Expose
     @ConfigOption(
         name = "Show Missing Location Rabbits",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 800ac5729aaf..d513c3becfb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -15,8 +16,10 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.consumeWhile
 import at.hannibal2.skyhanni.utils.DisplayTableEntry
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.setLore
 import at.hannibal2.skyhanni.utils.KSerializable
 import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -29,9 +32,11 @@ import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Pattern
@@ -50,7 +55,7 @@ object HoppityCollectionStats {
      */
     private val pagePattern by patternGroup.pattern(
         "page.current",
-        "(?:\\((?<page>\\d+)\\/(?<maxPage>\\d+)\\) )?Hoppity's Collection",
+        "(?:\\((?<page>\\d+)/(?<maxPage>\\d+)\\) )?Hoppity's Collection",
     )
     private val duplicatesFoundPattern by patternGroup.pattern(
         "duplicates.found",
@@ -182,6 +187,31 @@ object HoppityCollectionStats {
         strayRabbit to HighlightRabbitTypes.STRAYS,
     )
 
+    @SubscribeEvent
+    fun replaceItem(event: ReplaceItemEvent) {
+        if (!config.rarityDyeRecolor || !pagePattern.matches(event.inventory.name)) return
+        val item = event.originalItem
+        // The "base" missing rabbits are Gray Dye (minecraft:dye with metadata 8)
+        if (item.getMinecraftId().toString() != "minecraft:dye" || item.metadata != 8) return
+
+        val rarity = HoppityAPI.rarityByRabbit(item.displayName)
+        // Add NBT for the dye color itself
+        val newItemStack = ItemStack(Items.dye, 1, when (rarity) {
+            LorenzRarity.COMMON -> 7  // Light gray dye
+            LorenzRarity.UNCOMMON -> 10 // Lime dye
+            LorenzRarity.RARE -> 4 // Lapis lazuli
+            LorenzRarity.EPIC -> 5 // Purple dye
+            LorenzRarity.LEGENDARY -> 14 // Orange dye
+            LorenzRarity.MYTHIC -> 13 // Magenta dye
+            LorenzRarity.DIVINE -> 12 // Light blue dye
+            LorenzRarity.SPECIAL -> 1 // Rose Red - Covering bases for future (?)
+            else -> return
+        })
+        newItemStack.setLore(item.getLore())
+        newItemStack.setStackDisplayName(item.displayName)
+        event.replace(newItemStack)
+    }
+
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!(LorenzUtils.inSkyBlock)) return

From 62d45680f79c47479fe7d16a651eb8c7081586fe Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:19:57 -0400
Subject: [PATCH 503/721] Improvement (?): Descriptive Milestones in Hoppity
 Collection (#2523)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../repo/HoppityEggLocationsJson.kt           |  7 ++
 .../event/hoppity/HoppityCollectionStats.kt   | 85 ++++++++++++++-----
 .../chocolatefactory/ChocolateFactoryAPI.kt   | 15 +++-
 3 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
index 4ad81b06a663..ead4eb83c298 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt
@@ -23,6 +23,13 @@ data class HoppityEggLocationsJson(
     @Expose val maxRabbits: Int,
     @Expose val maxPrestige: Int,
     @Expose val chocolateMilestones: TreeSet<Long>,
+    @Expose val chocolateShopMilestones: List<MilestoneJson>,
+    @Expose val chocolateFactoryMilestones: List<MilestoneJson>,
     @Expose val apiEggLocations: Map<IslandType, Map<String, LorenzVec>>,
     @Expose val specialRabbits: List<String>,
 )
+
+data class MilestoneJson(
+    @Expose val amount: Long,
+    @Expose val rabbit: String,
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index d513c3becfb6..3782919666dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -26,13 +26,13 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.anyMatches
 import at.hannibal2.skyhanni.utils.RegexUtils.findMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
-import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -187,29 +187,14 @@ object HoppityCollectionStats {
         strayRabbit to HighlightRabbitTypes.STRAYS,
     )
 
+    private fun missingRabbitStackNeedsFix(stack: ItemStack): Boolean =
+        stack.item == Items.dye && (stack.metadata == 8 || stack.getLore().any { it.lowercase().contains("milestone") })
+
+    private val replacementCache: MutableMap<String, ItemStack> = mutableMapOf()
+
     @SubscribeEvent
     fun replaceItem(event: ReplaceItemEvent) {
-        if (!config.rarityDyeRecolor || !pagePattern.matches(event.inventory.name)) return
-        val item = event.originalItem
-        // The "base" missing rabbits are Gray Dye (minecraft:dye with metadata 8)
-        if (item.getMinecraftId().toString() != "minecraft:dye" || item.metadata != 8) return
-
-        val rarity = HoppityAPI.rarityByRabbit(item.displayName)
-        // Add NBT for the dye color itself
-        val newItemStack = ItemStack(Items.dye, 1, when (rarity) {
-            LorenzRarity.COMMON -> 7  // Light gray dye
-            LorenzRarity.UNCOMMON -> 10 // Lime dye
-            LorenzRarity.RARE -> 4 // Lapis lazuli
-            LorenzRarity.EPIC -> 5 // Purple dye
-            LorenzRarity.LEGENDARY -> 14 // Orange dye
-            LorenzRarity.MYTHIC -> 13 // Magenta dye
-            LorenzRarity.DIVINE -> 12 // Light blue dye
-            LorenzRarity.SPECIAL -> 1 // Rose Red - Covering bases for future (?)
-            else -> return
-        })
-        newItemStack.setLore(item.getLore())
-        newItemStack.setStackDisplayName(item.displayName)
-        event.replace(newItemStack)
+        replacementCache[event.originalItem.displayName]?.let { event.replace(it) }
     }
 
     @SubscribeEvent
@@ -221,6 +206,29 @@ object HoppityCollectionStats {
             return
         }
 
+        event.inventoryItems.values.filter { it.hasDisplayName() && missingRabbitStackNeedsFix(it) }.forEach { stack ->
+            val rarity = HoppityAPI.rarityByRabbit(stack.displayName)
+            // Add NBT for the dye color itself
+            val newItemStack = if (config.rarityDyeRecolor) ItemStack(
+                Items.dye, 1,
+                when (rarity) {
+                    LorenzRarity.COMMON -> 7  // Light gray dye
+                    LorenzRarity.UNCOMMON -> 10 // Lime dye
+                    LorenzRarity.RARE -> 4 // Lapis lazuli
+                    LorenzRarity.EPIC -> 5 // Purple dye
+                    LorenzRarity.LEGENDARY -> 14 // Orange dye
+                    LorenzRarity.MYTHIC -> 13 // Magenta dye
+                    LorenzRarity.DIVINE -> 12 // Light blue dye
+                    LorenzRarity.SPECIAL -> 1 // Rose Red - Covering bases for future (?)
+                    else -> return
+                },
+            ) else ItemStack(Items.dye, 8)
+
+            newItemStack.setLore(buildDescriptiveMilestoneLore(stack))
+            newItemStack.setStackDisplayName(stack.displayName)
+            replacementCache[stack.displayName] = newItemStack
+        }
+
         inInventory = true
         if (config.hoppityCollectionStats) {
             display = buildDisplay(event)
@@ -231,6 +239,38 @@ object HoppityCollectionStats {
         }
     }
 
+    private fun buildDescriptiveMilestoneLore(itemStack: ItemStack): List<String> {
+        val existingLore = itemStack.getLore().toMutableList()
+        var replaceIndex: Int? = null
+        var milestoneType: HoppityEggType = HoppityEggType.BREAKFAST
+
+        if (factoryMilestone.anyMatches(existingLore)) {
+            milestoneType = HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
+            replaceIndex = existingLore.indexOfFirst { loreMatch -> factoryMilestone.matches(loreMatch) }
+        } else if (shopMilestone.anyMatches(existingLore)) {
+            milestoneType = HoppityEggType.CHOCOLATE_SHOP_MILESTONE
+            replaceIndex = existingLore.indexOfFirst { loreMatch -> shopMilestone.matches(loreMatch) }
+        }
+
+        replaceIndex?.let {
+            ChocolateFactoryAPI.milestoneByRabbit(itemStack.displayName)?.let {
+                val displayAmount = it.amount.shortFormat()
+                val operationFormat = when (milestoneType) {
+                    HoppityEggType.CHOCOLATE_SHOP_MILESTONE -> "spending"
+                    HoppityEggType.CHOCOLATE_FACTORY_MILESTONE -> "reaching"
+                    else -> "" // Never happens
+                }
+
+                //List indexing is weird
+                existingLore[replaceIndex - 1] = "§7Obtained by $operationFormat §6$displayAmount"
+                existingLore[replaceIndex] = "§7all-time §6Chocolate."
+                return existingLore
+            }
+        }
+
+        return existingLore
+    }
+
     private fun filterRabbitToHighlight(stack: ItemStack) {
         val lore = stack.getLore()
 
@@ -259,6 +299,7 @@ object HoppityCollectionStats {
     fun onInventoryClose(event: InventoryCloseEvent) {
         inInventory = false
         display = emptyList()
+        replacementCache.clear()
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 40cd700c4eb4..112e8a7a7383 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.config.features.inventory.chocolatefactory.Chocolat
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage.ChocolateFactoryStorage
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.jsonobjects.repo.HoppityEggLocationsJson
+import at.hannibal2.skyhanni.data.jsonobjects.repo.MilestoneJson
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats
@@ -80,7 +81,9 @@ object ChocolateFactoryAPI {
     var shrineIndex = 41
     var coachRabbitIndex = 42
     var maxRabbits = 395
-    var chocolateMilestones = TreeSet<Long>()
+    private var chocolateMilestones = TreeSet<Long>()
+    private var chocolateFactoryMilestones: MutableList<MilestoneJson> = mutableListOf()
+    private var chocolateShopMilestones: MutableList<MilestoneJson> = mutableListOf()
     private var maxPrestige = 5
 
     var inChocolateFactory = false
@@ -143,6 +146,8 @@ object ChocolateFactoryAPI {
         maxRabbits = data.maxRabbits
         maxPrestige = data.maxPrestige
         chocolateMilestones = data.chocolateMilestones
+        chocolateFactoryMilestones = data.chocolateFactoryMilestones.toMutableList()
+        chocolateShopMilestones = data.chocolateShopMilestones.toMutableList()
         specialRabbitTextures = data.specialRabbits
 
         ChocolateFactoryUpgrade.updateIgnoredSlots()
@@ -226,4 +231,12 @@ object ChocolateFactoryAPI {
         val basePerSecond = rawChocolatePerSecond * baseMultiplier
         return (needed / basePerSecond + secondsUntilTowerExpires).seconds
     }
+
+    fun milestoneByRabbit(rabbitName: String): MilestoneJson? {
+        return chocolateFactoryMilestones.firstOrNull {
+            it.rabbit.removeColor() == rabbitName.removeColor()
+        } ?: chocolateShopMilestones.firstOrNull {
+            it.rabbit.removeColor() == rabbitName.removeColor()
+        }
+    }
 }

From 19f23335cc4852e8f9c7d56036e7e89c52d230fe Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Fri, 20 Sep 2024 23:32:10 +0200
Subject: [PATCH 504/721] Feature: Inventory - Experiments rework (#2171)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |   2 +-
 .../skyhanni/config/commands/Commands.kt      |   5 +
 .../features/inventory/InventoryConfig.java   |   5 +
 .../ExperimentationTableConfig.java           |  50 ++++
 .../ExperimentsDryStreakConfig.java           |  31 ++
 .../ExperimentsProfitTrackerConfig.java       |  37 +++
 .../inventory/helper/HelperConfig.java        |  26 --
 .../storage/ProfileSpecificStorage.java       |  24 ++
 .../ExperimentationTableAPI.kt                | 157 ++++++++++
 .../ExperimentationTableEnums.kt              |  28 ++
 .../ExperimentsDryStreakDisplay.kt            | 113 ++++++++
 .../ExperimentsProfitTracker.kt               | 258 +++++++++++++++++
 .../GuardianReminder.kt                       |  32 +--
 .../SuperpairExperimentInformationDisplay.kt  | 272 ++++++++++++++++++
 .../SuperpairsClicksAlert.kt                  |   6 +-
 .../UltraRareBookAlert.kt                     |  39 +--
 16 files changed, 1011 insertions(+), 74 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsDryStreakConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsProfitTrackerConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableEnums.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDryStreakDisplay.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
 rename src/main/java/at/hannibal2/skyhanni/features/inventory/{experiments => experimentationtable}/GuardianReminder.kt (78%)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
 rename src/main/java/at/hannibal2/skyhanni/features/inventory/{ => experimentationtable}/SuperpairsClicksAlert.kt (91%)
 rename src/main/java/at/hannibal2/skyhanni/features/inventory/{experiments => experimentationtable}/UltraRareBookAlert.kt (75%)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 8eb47d3949b2..b9f21ca2255c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 58
+    const val CONFIG_VERSION = 59
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 3f2ddace62d2..9b85c2cf9590 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -57,6 +57,7 @@ import at.hannibal2.skyhanni.features.garden.pests.PestFinder
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentsProfitTracker
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker
@@ -276,6 +277,10 @@ object Commands {
             "shresetpestprofittracker",
             "Resets the Pest Profit Tracker",
         ) { PestProfitTracker.resetCommand() }
+        registerCommand(
+            "shresetexperimentsprofittracker",
+            "Resets the Experiments Profit Tracker",
+        ) { ExperimentsProfitTracker.resetCommand() }
         registerCommand(
             "shresetmythologicalcreaturetracker",
             "Resets the Mythological Creature Tracker",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 5c3bf3170920..062f29b30e33 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -4,6 +4,7 @@
 import at.hannibal2.skyhanni.config.HasLegacyId;
 import at.hannibal2.skyhanni.config.features.inventory.chocolatefactory.ChocolateFactoryConfig;
 import at.hannibal2.skyhanni.config.features.inventory.customwardrobe.CustomWardrobeConfig;
+import at.hannibal2.skyhanni.config.features.inventory.experimentationtable.ExperimentationTableConfig;
 import at.hannibal2.skyhanni.config.features.inventory.helper.HelperConfig;
 import at.hannibal2.skyhanni.config.features.itemability.ItemAbilityConfig;
 import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig;
@@ -38,6 +39,10 @@ public class InventoryConfig {
     @Category(name = "Bazaar", desc = "Be smart when buying or selling many items in the Bazaar.")
     public BazaarConfig bazaar = new BazaarConfig();
 
+    @Expose
+    @Category(name = "Experimentation Table", desc = "QOL features for the Experimentation Table.")
+    public ExperimentationTableConfig experimentationTable = new ExperimentationTableConfig();
+
     @Expose
     @Category(name = "Enchant Parsing", desc = "Settings for SkyHanni's Enchant Parsing")
     public EnchantParsingConfig enchantParsing = new EnchantParsingConfig();
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
new file mode 100644
index 000000000000..dfdad248256e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
@@ -0,0 +1,50 @@
+package at.hannibal2.skyhanni.config.features.inventory.experimentationtable;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ExperimentationTableConfig {
+
+    @Expose
+    @ConfigOption(name = "Profit Tracker", desc = "")
+    @Accordion
+    public ExperimentsProfitTrackerConfig experimentsProfitTracker = new ExperimentsProfitTrackerConfig();
+
+    @Expose
+    @ConfigOption(name = "Dry-Streak Display", desc = "")
+    @Accordion
+    public ExperimentsDryStreakConfig dryStreak = new ExperimentsDryStreakConfig();
+
+    @Expose
+    @ConfigOption(name = "Superpair Data", desc = "Shows a display with useful information while doing the Superpair experiment.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean superpairDisplay = false;
+
+    @Expose
+    @ConfigLink(owner = ExperimentationTableConfig.class, field = "superpairDisplay")
+    public Position superpairDisplayPosition = new Position(-372, 161, false, true);
+
+    @Expose
+    @ConfigOption(name = "Superpairs Clicks Alert", desc = "Display an alert when you reach the maximum clicks gained from Chronomatron or Ultrasequencer.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean superpairsClicksAlert = false;
+
+    @Expose
+    @ConfigOption(name = "ULTRA-RARE Book Alert", desc = "Send a chat message, title and sound when you find an ULTRA-RARE book.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean ultraRareBookAlert = false;
+
+    @Expose
+    @ConfigOption(name = "Guardian Reminder", desc = "Sends a warning when opening the Experimentation Table without a §9§lGuardian Pet §7equipped.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean guardianReminder = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsDryStreakConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsDryStreakConfig.java
new file mode 100644
index 000000000000..dfba626a764f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsDryStreakConfig.java
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.config.features.inventory.experimentationtable;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ExperimentsDryStreakConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Display attempts and or XP since your last ULTRA-RARE.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Attempts", desc = "Display Attempts since.")
+    @ConfigEditorBoolean
+    public boolean attemptsSince = true;
+
+    @Expose
+    @ConfigOption(name = "XP", desc = "Display XP since.")
+    @ConfigEditorBoolean
+    public boolean xpSince = true;
+
+    @Expose
+    @ConfigLink(owner = ExperimentsDryStreakConfig.class, field = "enabled")
+    public Position position = new Position(200, -187, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsProfitTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsProfitTrackerConfig.java
new file mode 100644
index 000000000000..62ee4f5407ba
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentsProfitTrackerConfig.java
@@ -0,0 +1,37 @@
+package at.hannibal2.skyhanni.config.features.inventory.experimentationtable;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentMessages;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExperimentsProfitTrackerConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Tracker for drops/XP you get from experiments.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Messages", desc = "Change the messages to be hidden after completing Add-on/Main experiments.")
+    @ConfigEditorDraggableList
+    public List<ExperimentMessages> hideMessages = new ArrayList<>();
+
+    @Expose
+    @ConfigOption(name = "Time displayed", desc = "Time displayed after completing an experiment.")
+    @ConfigEditorSlider(minValue = 5, maxValue = 60, minStep = 1)
+    public int timeDisplayed = 30;
+
+    @Expose
+    @ConfigLink(owner = ExperimentsProfitTrackerConfig.class, field = "enabled")
+    public Position position = new Position(20, 20, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
index 5f54e707d010..717dd76591de 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java
@@ -56,30 +56,4 @@ public static class HarpConfig {
     @ConfigOption(name = "Reforge Helper", desc = "")
     @Accordion
     public ReforgeHelperConfig reforge = new ReforgeHelperConfig();
-
-    @Expose
-    @ConfigOption(name = "Enchanting", desc = "")
-    @Accordion
-    public EnchantingConfig enchanting = new EnchantingConfig();
-
-    public static class EnchantingConfig {
-        @Expose
-        @ConfigOption(name = "Superpairs Clicks Alert", desc = "Display an alert when you reach the maximum clicks gained from Chronomatron or Ultrasequencer.")
-        @ConfigEditorBoolean
-        @FeatureToggle
-        public boolean superpairsClicksAlert = false;
-
-        @Expose
-        @ConfigOption(name = "ULTRA-RARE Book Alert", desc = "Send a chat message, title and sound when you find an ULTRA-RARE book.")
-        @ConfigEditorBoolean
-        @FeatureToggle
-        public boolean ultraRareBookAlert = false;
-
-        @Expose
-        @ConfigOption(name = "Guardian Reminder", desc = "Sends a warning when opening the Experimentation Table without a §9§lGuardian Pet §7equipped.")
-        @ConfigEditorBoolean
-        @FeatureToggle
-        public boolean guardianReminder = false;
-    }
-
 }
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 83e7ea47c254..754eea3bba59 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -31,6 +31,7 @@
 import at.hannibal2.skyhanni.features.garden.pests.VinylType;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker;
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentsProfitTracker;
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
 import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
@@ -65,6 +66,29 @@ private static SimpleTimeMark SimpleTimeMarkFarPast() {
     @Expose
     public String currentPet = "";
 
+    @Expose
+    public ExperimentationStorage experimentation = new ExperimentationStorage();
+
+    public static class ExperimentationStorage {
+
+        @Expose
+        public LorenzVec tablePos = new LorenzVec();
+
+        @Expose
+        public ExperimentsDryStreakStorage dryStreak = new ExperimentsDryStreakStorage();
+
+        public static class ExperimentsDryStreakStorage {
+            @Expose
+            public int attemptsSince = 0;
+
+            @Expose
+            public int xpSince = 0;
+        }
+
+        @Expose
+        public ExperimentsProfitTracker.Data experimentsProfitTracker = new ExperimentsProfitTracker.Data();
+    }
+
     @Expose
     public ChocolateFactoryStorage chocolateFactory = new ChocolateFactoryStorage();
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
new file mode 100644
index 000000000000..80433b68e665
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -0,0 +1,157 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
+import at.hannibal2.skyhanni.utils.InventoryUtils.openInventoryName
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ExperimentationTableAPI {
+
+    private val storage get() = ProfileStorageData.profileSpecific?.experimentation
+
+    val inTable get() = inventoriesPattern.matches(openInventoryName())
+
+    fun inDistanceToTable(vec: LorenzVec, max: Double): Boolean =
+        storage?.tablePos?.let { it.distance(vec) <= max } ?: false
+
+    fun getCurrentExperiment(): Experiment? =
+        superpairsPattern.matchMatcher(openInventoryName()) {
+            Experiment.entries.find { it.nameString == group("experiment") }
+        }
+
+    @SubscribeEvent
+    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
+        if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND || !inTable) return
+
+        val entity = EntityUtils.getEntities<EntityArmorStand>().find { it.hasSkullTexture(experimentationTableSkull) } ?: return
+        val vec = entity.getLorenzVec()
+        if (storage?.tablePos != vec) storage?.tablePos = vec
+    }
+
+    private val experimentationTableSkull =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTUyOWF" +
+            "iYzg4MzA5NTNmNGQ5MWVkZmZmMjQ2OTVhOWY2Mjc1OGZhNGM1MWIyOWFjMjQ2YzM3NDllYWFlODliMyJ9fX0="
+
+    private val patternGroup = RepoPattern.group("enchanting.experiments")
+
+    /**
+     * REGEX-TEST: Superpairs (Metaphysical)
+     */
+    private val superpairsPattern by patternGroup.pattern(
+        "superpairs",
+        "Superpairs \\((?<experiment>\\w+)\\)",
+    )
+
+    /**
+     * REGEX-TEST: Gained +3 Clicks
+     */
+    val powerUpPattern by patternGroup.pattern(
+        "powerups",
+        "Gained \\+\\d Clicks?|Instant Find|\\+\\S* XP",
+    )
+
+    /**
+     * REGEX-TEST: 123k Enchanting Exp
+     * REGEX-TEST: Titanic Experience Bottle
+     */
+    val rewardPattern by patternGroup.pattern(
+        "rewards",
+        "\\d{1,3}k Enchanting Exp|Enchanted Book|(?:Titanic |Grand |\\b)Experience Bottle|Metaphysical Serum|Experiment The Fish",
+    )
+
+    /**
+     * REGEX-TEST: Superpairs (Metaphysical)
+     * REGEX-TEST: Chronomatron (Metaphysical)
+     */
+    val inventoriesPattern by patternGroup.pattern(
+        "inventories",
+        "(?:Superpairs|Chronomatron|Ultrasequencer) (?:\\(.+\\)|➜ Stakes|Rewards)|Experimentation Table",
+    )
+
+    /**
+     * REGEX-TEST:  +42,000 Enchanting Exp
+     */
+    val enchantingExpChatPattern by patternGroup.pattern(
+        "chatexp",
+        "^ \\+(?<amount>\\d+|\\d+,\\d+)k? Enchanting Exp$",
+    )
+
+    /**
+     * REGEX-TEST:  +Smite VII
+     * REGEX-TEST:  +42,000 Enchanting Exp
+     */
+    val experimentsDropPattern by patternGroup.pattern(
+        "drop",
+        "^ \\+(?<reward>.*)\$",
+    )
+
+    /**
+     * REGEX-TEST: You claimed the Superpairs rewards!
+     */
+    val claimMessagePattern by patternGroup.pattern(
+        "claim",
+        "You claimed the \\S+ rewards!",
+    )
+
+    /**
+     * REGEX-TEST: 131k Enchanting Exp
+     * REGEX-TEST: 42,000 Enchanting Exp
+     */
+    val enchantingExpPattern by patternGroup.pattern(
+        "exp",
+        "(?<amount>\\d+|\\d+,\\d+)k? Enchanting Exp",
+    )
+
+    /**
+     * REGEX-TEST: Titanic Experience Bottle
+     */
+    val experienceBottlePattern by patternGroup.pattern(
+        "xpbottle",
+        "(?:Titanic |Grand |\\b)Experience Bottle",
+    )
+
+    /**
+     * REGEX-TEST: ☕ You renewed the experiment table! (1/3)
+     */
+    val experimentRenewPattern by patternGroup.pattern(
+        "renew",
+        "^☕ You renewed the experiment table! \\((?<current>\\d)/3\\)$",
+    )
+
+    /**
+     * REGEX-TEST: §d§kXX§5 ULTRA-RARE BOOK! §d§kXX
+     */
+    val ultraRarePattern by patternGroup.pattern(
+        "ultrarare",
+        "§d§kXX§5 ULTRA-RARE BOOK! §d§kXX",
+    )
+
+    /**
+     * REGEX-TEST: §9Smite VII
+     */
+    val bookPattern by patternGroup.pattern(
+        "book",
+        "§9(?<enchant>.*)",
+    )
+
+    /**
+     * REGEX-TEST: §dGuardian
+     * REGEX-TEST: §9Guardian§e
+     */
+    val petNamePattern by patternGroup.pattern(
+        "guardianpet",
+        "§[956d]Guardian.*",
+    )
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableEnums.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableEnums.kt
new file mode 100644
index 000000000000..0071d3af35fa
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableEnums.kt
@@ -0,0 +1,28 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+enum class ExperimentMessages(private val str: String) {
+    DONE("§eYou claimed the §dSuperpairs §erewards! §8(§7Claim§8)"),
+    EXPERIENCE("§8 +§3141k Experience §8(§7Experience Drops§8)"),
+    ENCHANTMENTS("§8 +§9Smite VII §8(§7Enchantment Drops§8)"),
+    BOTTLES("§8 +§9Titanic Experience Bottle §8(§7Bottle Drops§8)"),
+    MISC("§8 +§5Metaphysical Serum §8(§7Misc Drops§8)");
+
+    override fun toString(): String {
+        return str
+    }
+}
+
+enum class Experiment(val nameString: String, val gridSize: Int, val startSlot: Int, val endSlot: Int, val sideSpace: Int) {
+    NONE("", 0, 0, 0, 0),
+    BEGINNER("Beginner", 14, 18, 35, 1),
+    HIGH("High", 20, 10, 43, 2),
+    GRAND("Grand", 20, 10, 43, 2),
+    SUPREME("Supreme", 28, 9, 44, 1),
+    TRANSCENDENT("Transcendent", 28, 9, 44, 1),
+    METAPHYSICAL("Metaphysical", 28, 9, 44, 1),
+    ;
+
+    override fun toString(): String {
+        return nameString
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDryStreakDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDryStreakDisplay.kt
new file mode 100644
index 000000000000..50d033842792
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDryStreakDisplay.kt
@@ -0,0 +1,113 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryOpenEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.bookPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.ultraRarePattern
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ExperimentsDryStreakDisplay {
+
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable.dryStreak
+    private val storage get() = ProfileStorageData.profileSpecific?.experimentation?.dryStreak
+
+    private var display = emptyList<String>()
+
+    private var didJustFind = false
+
+    @SubscribeEvent
+    fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (!ExperimentationTableAPI.inventoriesPattern.matches(InventoryUtils.openInventoryName())) return
+
+        display = drawDisplay()
+        config.position.renderStrings(
+            display,
+            posLabel = "Experimentation Table Dry Streak",
+        )
+    }
+
+    @SubscribeEvent
+    fun onInventoryOpen(event: InventoryOpenEvent) {
+        if (event.inventoryName == "Experimentation Table" && didJustFind) didJustFind = false
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
+        if (!isEnabled() || didJustFind || ExperimentationTableAPI.getCurrentExperiment() == null) return
+
+        for (lore in event.inventoryItems.map { it.value.getLore() }) {
+            val firstLine = lore.firstOrNull() ?: continue
+            if (!ultraRarePattern.matches(firstLine)) continue
+            val bookNameLine = lore.getOrNull(2) ?: continue
+            bookPattern.matchMatcher(bookNameLine) {
+                val storage = storage ?: return
+                ChatUtils.chat(
+                    "§a§lDRY-STREAK ENDED! §eYou have (finally) " +
+                        "found a §5ULTRA-RARE §eafter §3${storage.xpSince.shortFormat()} Enchanting Exp " +
+                        "§e and §2${storage.attemptsSince} attempts§e!",
+                )
+                storage.attemptsSince = 0
+                storage.xpSince = 0
+                didJustFind = true
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        if (didJustFind || ExperimentationTableAPI.getCurrentExperiment() == null) return
+
+        val storage = storage ?: return
+        storage.attemptsSince += 1
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled() || didJustFind) return
+
+        ExperimentationTableAPI.enchantingExpChatPattern.matchMatcher(event.message.removeColor()) {
+            val storage = storage ?: return
+            storage.xpSince += group("amount").substringBefore(",").toInt() * 1000
+        }
+    }
+
+    private fun drawDisplay() = buildList {
+        val storage = storage ?: return@buildList
+
+        add("§cDry-Streak since last §5ULTRA-RARE")
+
+        val colorPrefix = "§e"
+        val attemptsSince = storage.attemptsSince
+        val xpSince = storage.xpSince.shortFormat()
+        val attemptsSuffix = if (attemptsSince == 1) "" else "s"
+
+        if (config.attemptsSince && config.xpSince) {
+            add("$colorPrefix ├ $attemptsSince Attempt$attemptsSuffix")
+            add("$colorPrefix └ $xpSince XP")
+        } else if (config.attemptsSince) {
+            add("$colorPrefix └ $attemptsSince Attempt$attemptsSuffix")
+        } else {
+            add("$colorPrefix └ $xpSince XP")
+        }
+    }
+
+    private fun isEnabled() =
+        LorenzUtils.inSkyBlock && config.enabled && (config.xpSince || config.attemptsSince)
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
new file mode 100644
index 000000000000..16c0305cbedd
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -0,0 +1,258 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.ItemClickEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.claimMessagePattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.enchantingExpPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experienceBottlePattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experimentRenewPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experimentsDropPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.inventoriesPattern
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPriceOrNull
+import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+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.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.renderables.toSearchable
+import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
+import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
+import com.google.gson.annotations.Expose
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.math.absoluteValue
+
+@SkyHanniModule
+object ExperimentsProfitTracker {
+
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable.experimentsProfitTracker
+
+    private val tracker = SkyHanniItemTracker(
+        "Experiments Profit Tracker",
+        { Data() },
+        { it.experimentation.experimentsProfitTracker },
+    ) { drawDisplay(it) }
+
+    private var lastSplashes = mutableListOf<ItemStack>()
+    private var lastSplashTime = SimpleTimeMark.farPast()
+    private var lastBottlesInInventory = mutableMapOf<NEUInternalName, Int>()
+    private var currentBottlesInInventory = mutableMapOf<NEUInternalName, Int>()
+
+    class Data : ItemTrackerData() {
+        override fun resetItems() {
+            experimentsDone = 0L
+            xpGained = 0L
+            bitCost = 0L
+            startCost = 0L
+        }
+
+        override fun getDescription(timesGained: Long): List<String> {
+            val percentage = timesGained.toDouble() / experimentsDone
+            val dropRate = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0))
+            return listOf(
+                "§7Dropped §e${timesGained.addSeparators()} §7times.",
+                "§7Your drop rate: §c$dropRate.",
+            )
+        }
+
+        override fun getCoinName(item: TrackedItem) = ""
+
+        override fun getCoinDescription(item: TrackedItem) = listOf<String>()
+
+        @Expose
+        var experimentsDone = 0L
+
+        @Expose
+        var xpGained = 0L
+
+        @Expose
+        var bitCost = 0L
+
+        @Expose
+        var startCost = 0L
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        val message = event.message.removeColor()
+        if (claimMessagePattern.matches(message) && ExperimentMessages.DONE.isSelected())
+            event.blockedReason = "CLAIM_MESSAGE"
+
+        experimentsDropPattern.matchMatcher(message) {
+            val reward = group("reward")
+
+            event.blockedReason = when {
+                enchantingExpPattern.matches(reward) && ExperimentMessages.EXPERIENCE.isSelected() -> "EXPERIENCE_DROP"
+                experienceBottlePattern.matches(reward) && ExperimentMessages.BOTTLES.isSelected() -> "BOTTLE_DROP"
+                listOf("Metaphysical Serum", "Experiment The Fish").contains(reward) && ExperimentMessages.MISC.isSelected() -> "MISC_DROP"
+                ExperimentMessages.ENCHANTMENTS.isSelected() -> "ENCHANT_DROP"
+                else -> ""
+            }
+
+            enchantingExpPattern.matchMatcher(reward) {
+                tracker.modify {
+                    it.xpGained += group("amount").substringBefore(",").toInt() * 1000
+                }
+                return
+            }
+
+            val internalName = NEUInternalName.fromItemNameOrNull(reward) ?: return
+            if (!experienceBottlePattern.matches(group("reward"))) tracker.addItem(internalName, 1, false)
+            return
+        }
+
+        experimentRenewPattern.matchMatcher(message) {
+            val increments = mapOf(1 to 150, 2 to 300, 3 to 500)
+            tracker.modify {
+                it.bitCost += increments.getValue(group("current").toInt())
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onItemClick(event: ItemClickEvent) {
+        if (event.clickType == ClickType.RIGHT_CLICK) {
+            val item = event.itemInHand ?: return
+            if (experienceBottlePattern.matches(item.displayName.removeColor())) {
+                lastSplashTime = SimpleTimeMark.now()
+                lastSplashes.add(item)
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdated(event: InventoryUpdatedEvent) {
+        if (!isEnabled()) return
+
+        if (inventoriesPattern.matches(event.inventoryName)) {
+            var startCostTemp = 0
+            val iterator = lastSplashes.iterator()
+            while (iterator.hasNext()) {
+                val item = iterator.next()
+                val internalName = item.getInternalName()
+                val price = internalName.getPrice()
+                val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0
+                val maxPrice = npcPrice.coerceAtLeast(price)
+                startCostTemp += maxPrice.round(0).toInt()
+                iterator.remove()
+            }
+            tracker.modify {
+                it.startCost -= startCostTemp
+            }
+            lastSplashTime = SimpleTimeMark.farPast()
+        }
+
+        handleExpBottles(false)
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        if (!isEnabled()) return
+
+        if (ExperimentationTableAPI.getCurrentExperiment() != null) {
+            tracker.modify {
+                it.experimentsDone++
+            }
+        }
+        if (ExperimentationTableAPI.inTable && InventoryUtils.openInventoryName() == "Superpairs Rewards") {
+            handleExpBottles(true)
+        }
+    }
+
+    private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        addSearchString("§e§lExperiments Profit Tracker")
+        val profit = tracker.drawItems(data, { true }, this) + data.startCost
+
+        val experimentsDone = data.experimentsDone
+        addSearchString("")
+        addSearchString("§eExperiments Done: §a${experimentsDone.addSeparators()}")
+        val startCostFormat = data.startCost.absoluteValue.shortFormat()
+        val bitCostFormat = data.bitCost.shortFormat()
+        add(
+            Renderable.hoverTips(
+                "§eTotal Cost: §c-$startCostFormat§e/§b-$bitCostFormat",
+                listOf(
+                    "§7You paid §c$startCostFormat §7coins and", "§b$bitCostFormat §7bits for starting",
+                    "§7experiments.",
+                ),
+            ).toSearchable(),
+        )
+        add(tracker.addTotalProfit(profit, data.experimentsDone, "experiment"))
+        addSearchString("§eTotal Enchanting Exp: §b${data.xpGained.shortFormat()}")
+
+        tracker.addPriceFromButton(this)
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent) {
+        if (!isEnabled()) return
+
+        tracker.renderDisplay(config.position)
+    }
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        if (event.newIsland == IslandType.PRIVATE_ISLAND) {
+            tracker.firstUpdate()
+        }
+    }
+
+    fun resetCommand() {
+        tracker.resetCommand()
+    }
+
+    private fun handleExpBottles(addToTracker: Boolean) {
+        for (item in InventoryUtils.getItemsInOwnInventory()) {
+            val internalName = item.getInternalNameOrNull() ?: continue
+            if (internalName.asString() !in listOf("EXP_BOTTLE", "GRAND_EXP_BOTTLE", "TITANIC_EXP_BOTTLE")) continue
+            currentBottlesInInventory.addOrPut(internalName, item.stackSize)
+        }
+        for ((internalName, amount) in currentBottlesInInventory) {
+            val lastInInv = lastBottlesInInventory.getOrDefault(internalName, 0)
+            if (lastInInv >= amount) {
+                currentBottlesInInventory[internalName] = 0
+                lastBottlesInInventory[internalName] = amount
+                continue
+            }
+            if (lastInInv == 0) {
+                currentBottlesInInventory[internalName] = 0
+                lastBottlesInInventory[internalName] = amount
+                if (addToTracker) tracker.addItem(internalName, amount, false)
+                continue
+            }
+
+            currentBottlesInInventory[internalName] = 0
+            lastBottlesInInventory[internalName] = amount
+            if (addToTracker) tracker.addItem(internalName, amount - lastInInv, false)
+        }
+    }
+
+    private fun ExperimentMessages.isSelected() = config.hideMessages.contains(this)
+
+    private fun isEnabled() =
+        LorenzUtils.inSkyBlock && config.enabled
+            && ExperimentationTableAPI.inDistanceToTable(LorenzVec.getBlockBelowPlayer(), 5.0)
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
similarity index 78%
rename from src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
rename to src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
index 9ae93f22717f..216cbf7c6ba8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
@@ -1,6 +1,7 @@
-package at.hannibal2.skyhanni.features.inventory.experiments
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -16,7 +17,6 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.client.renderer.GlStateManager
@@ -28,31 +28,16 @@ import kotlin.time.Duration.Companion.seconds
 @SkyHanniModule
 object GuardianReminder {
 
-    private val config get() = SkyHanniMod.feature.inventory.helper.enchanting
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
     private var lastInventoryOpen = SimpleTimeMark.farPast()
     private var lastWarn = SimpleTimeMark.farPast()
     private var lastErrorSound = SimpleTimeMark.farPast()
 
-    private val patternGroup = RepoPattern.group("data.enchanting.inventory.experimentstable")
-    private val inventoryNamePattern by patternGroup.pattern(
-        "mainmenu",
-        "Experimentation Table",
-    )
-
-    /**
-     * REGEX-TEST: §dGuardian
-     * REGEX-TEST: §9Guardian§e
-     */
-    private val petNamePattern by patternGroup.pattern(
-        "guardianpet",
-        "§[956d]Guardian.*",
-    )
-
     @SubscribeEvent
     fun onInventory(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
-        if (!inventoryNamePattern.matches(event.inventoryName)) return
-        if (petNamePattern.matches(PetAPI.currentPet)) return
+        if (event.inventoryName != "Experimentation Table") return
+        if (ExperimentationTableAPI.petNamePattern.matches(PetAPI.currentPet)) return
 
         lastInventoryOpen = SimpleTimeMark.now()
 
@@ -69,7 +54,7 @@ object GuardianReminder {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!isEnabled()) return
-        if (!inventoryNamePattern.matches(InventoryUtils.openInventoryName())) return
+        if (InventoryUtils.openInventoryName() != "Experimentation Table") return
         if (lastInventoryOpen.passedSince() > 2.seconds) return
         val gui = Minecraft.getMinecraft().currentScreen as? GuiContainer ?: return
 
@@ -95,5 +80,10 @@ object GuardianReminder {
         GlStateManager.popMatrix()
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(59, "inventory.helper.enchanting.guardianReminder", "inventory.experimentationTable.guardianReminder")
+    }
+
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.guardianReminder
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
new file mode 100644
index 000000000000..21bc6052e099
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
@@ -0,0 +1,272 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiContainerEvent.SlotClickEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+
+@SkyHanniModule
+object SuperpairExperimentInformationDisplay {
+
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
+
+    private var display = emptyList<String>()
+
+    private var uncoveredAt = 0
+    private var uncoveredItems = mutableListOf<Pair<Int, String>>()
+    private var possiblePairs = 0
+
+    data class Item(val index: Int, val name: String)
+    data class ItemPair(val first: Item, val second: Item)
+
+    private var found = mutableMapOf<Pair<Item?, ItemPair?>, String>()
+
+    private var toCheck = mutableListOf<Pair<Int, Int>>()
+    private var lastClicked = mutableListOf<Pair<Int, Int>>()
+    private var lastClick = SimpleTimeMark.farPast()
+    private var currentExperiment = Experiment.NONE
+    private var instantFind = 0
+
+    private val sideSpaces1 = listOf(17, 18, 26, 27, 35, 36)
+    private val sideSpaces2 = listOf(16, 17, 18, 19, 25, 26, 27, 28, 34, 35, 36, 37)
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        display = emptyList()
+
+        uncoveredAt = 0
+        uncoveredItems.clear()
+        possiblePairs = 0
+
+        found.clear()
+        toCheck.clear()
+        lastClicked.clear()
+        lastClick = SimpleTimeMark.farPast()
+        currentExperiment = Experiment.NONE
+        instantFind = 0
+    }
+
+    @SubscribeEvent
+    fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        config.superpairDisplayPosition.renderStrings(display, posLabel = "Sperpair Experiment Information")
+        display = checkItems(toCheck)
+    }
+
+    @SubscribeEvent
+    fun onSlotClick(event: SlotClickEvent) {
+        if (!isEnabled()) return
+        currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return
+
+        if (isOutOfBounds(event.slotId, currentExperiment)) return
+        val item = event.item ?: return
+        if (item.displayName.removeColor() == "?") return
+        val clicksItem = InventoryUtils.getItemAtSlotIndex(4)
+
+        if (lastClicked.none { it.first == event.slotId && it.second == uncoveredAt } && lastClick.passedSince() > 100.milliseconds) {
+            if (clicksItem != null && clicksItem.displayName.removeColor().split(" ")[1] == "0") return
+            lastClicked.add(Pair(event.slotId, uncoveredAt))
+            lastClick = SimpleTimeMark.now()
+            toCheck.add(event.slotId to uncoveredAt)
+            uncoveredAt += 1
+        }
+    }
+
+    private fun checkItems(check: MutableList<Pair<Int, Int>>): List<String> {
+        currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return listOf()
+        if (check.isEmpty()) return drawDisplay()
+
+        for ((slot, uncovered) in check) {
+            val itemNow = InventoryUtils.getItemAtSlotIndex(slot) ?: return drawDisplay()
+            val itemName = itemNow.displayName.removeColor()
+
+            if (isWaiting(itemName) || isOutOfBounds(slot, currentExperiment)) return drawDisplay()
+
+            val reward = convertToReward(itemNow)
+            if (uncoveredItems.none { it.first == slot }) uncoveredItems.add(Pair(slot, reward))
+
+            when {
+                isPowerUp(reward) -> handlePowerUp(slot, reward)
+                isReward(itemName) -> handleReward(slot, uncovered, reward)
+            }
+
+            possiblePairs = calculatePossiblePairs()
+
+            val since = clicksSinceSeparator(lastClicked)
+
+            if ((since >= 2 || (since == -1 && lastClicked.size >= 2)) && instantFind == 0) {
+                lastClicked.add(-1 to uncoveredAt)
+                uncoveredAt += 1
+            }
+            toCheck.removeIf { it.first == slot }
+
+            return drawDisplay()
+        }
+        possiblePairs = calculatePossiblePairs()
+        return drawDisplay()
+    }
+
+    private fun handlePowerUp(slot: Int, reward: String) {
+        val item = toEither(Item(slot, reward))
+
+        found[item] = "Powerup"
+        possiblePairs--
+        lastClicked.removeIf { it.first == slot }
+        uncoveredAt -= 1
+        if (reward == "Instant Find") instantFind += 1
+    }
+
+    private fun handleReward(slot: Int, uncovered: Int, reward: String) {
+        val lastSlotClicked =
+            if (instantFind == 0 && lastClicked.none { it.first == -1 && it.second == uncovered - 1 } && lastClicked.size != 1) lastClicked.find { it.second == uncovered - 1 }
+                ?: return else lastClicked.find { it.second == uncovered } ?: return
+
+        val lastItem = InventoryUtils.getItemAtSlotIndex(lastSlotClicked.first) ?: return
+        val lastItemName = convertToReward(lastItem)
+
+        if (isWaiting(lastItemName)) return
+
+        when {
+            instantFind >= 1 -> {
+                handleFoundPair(slot, reward, lastSlotClicked.first)
+                instantFind -= 1
+                lastClicked.add(-1 to uncoveredAt)
+                uncoveredAt += 1
+            }
+
+            hasFoundPair(slot, lastSlotClicked.first, reward, lastItemName) -> handleFoundPair(
+                slot,
+                reward,
+                lastSlotClicked.first,
+            )
+
+            hasFoundMatch(slot, reward) -> handleFoundMatch(slot, reward)
+            else -> handleNormalReward(slot, reward)
+        }
+
+    }
+
+    private fun handleFoundPair(
+        slot: Int,
+        reward: String,
+        lastSlotClicked: Int,
+    ) {
+        val pair = toEither(ItemPair(Item(slot, reward), Item(lastSlotClicked, reward)))
+
+        found[pair] = "Pair"
+        found.entries.removeIf {
+            it.value == "Match" && right(it.key).first.name == reward
+        }
+        found.entries.removeIf {
+            it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == lastSlotClicked)
+        }
+    }
+
+    private fun handleFoundMatch(slot: Int, reward: String) {
+        val match = uncoveredItems.find { it.second == reward }?.first ?: return
+        val pair = toEither(ItemPair(Item(slot, reward), Item(match, reward)))
+
+        found[pair] = "Match"
+        found.entries.removeIf {
+            it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == match)
+        }
+    }
+
+    private fun handleNormalReward(slot: Int, reward: String) {
+        val item = toEither(Item(slot, reward))
+
+        if (found.none {
+                listOf("Match", "Pair").contains(it.value) && (right(it.key).first.index == slot || right(it.key).second.index == slot)
+            } && found.none { it.value == "Normal" && left(it.key).index == slot }) found[item] = "Normal"
+    }
+
+    private fun calculatePossiblePairs() =
+        ((currentExperiment.gridSize - 2) / 2) - found.filter { listOf("Pair", "Match", "Normal").contains(it.value) }.size
+
+    private fun drawDisplay() = buildList {
+        add("§6Superpair Experimentation Data")
+        add("")
+
+        val pairs = found.entries.filter { it.value == "Pair" }
+        val matches = found.entries.filter { it.value == "Match" }
+        val powerups = found.entries.filter { it.value == "Powerup" }
+        val normals = found.entries.filter { it.value == "Normal" }
+
+        if (pairs.isNotEmpty()) add("§2Found")
+        for (pair in pairs) {
+            val prefix = determinePrefix(pairs.indexOf(pair), pairs.lastIndex)
+            add(" $prefix §a${right(pair.key).first.name}")
+        }
+        if (matches.isNotEmpty()) add("§eMatched")
+        for (match in matches) {
+            val prefix = determinePrefix(matches.indexOf(match), matches.lastIndex)
+            add(" $prefix §e${right(match.key).first.name}")
+        }
+        if (powerups.isNotEmpty()) add("§bPowerUp")
+        for (powerup in powerups) {
+            val prefix = determinePrefix(powerups.indexOf(powerup), powerups.size - 1)
+            add(" $prefix §b${left(powerup.key).name}")
+        }
+        val toAdd = mutableListOf<String>()
+        if (possiblePairs >= 1) toAdd.add("§ePairs - $possiblePairs")
+        if (2 - powerups.size >= 1) toAdd.add("§bPowerUps - ${2 - powerups.size}")
+        if (normals.isNotEmpty()) toAdd.add("§7Normals - ${normals.size}")
+
+        if (toAdd.isNotEmpty()) {
+            add("")
+            add("§4Not found")
+        }
+        for (string in toAdd) if (string != toAdd.last()) add(" ├ $string") else add(" └ $string")
+    }
+
+    private fun convertToReward(item: ItemStack) = if (item.displayName.removeColor() == "Enchanted Book") item.getLore()[2].removeColor()
+    else item.displayName.removeColor()
+
+    private fun determinePrefix(index: Int, lastIndex: Int) = if (index == lastIndex) "└" else "├"
+
+    private fun hasFoundPair(
+        firstSlot: Int,
+        secondSlot: Int,
+        firstName: String,
+        secondName: String,
+    ) = firstSlot != secondSlot && firstName == secondName
+
+    private fun hasFoundMatch(itemSlot: Int, reward: String) =
+        uncoveredItems.any { (slot, name) -> slot != itemSlot && name == reward } && found.none {
+            listOf("Pair", "Match").contains(it.value) && (right(it.key).first.index == itemSlot || right(it.key).second.index == itemSlot)
+        }
+
+    private fun isPowerUp(reward: String) = ExperimentationTableAPI.powerUpPattern.matches(reward)
+
+    private fun isReward(reward: String) = ExperimentationTableAPI.rewardPattern.matches(reward)
+
+    private fun isWaiting(itemName: String) =
+        listOf("Click any button!", "Click a second button!", "Next button is instantly rewarded!").contains(itemName)
+
+    private fun clicksSinceSeparator(list: MutableList<Pair<Int, Int>>): Int {
+        val lastIndex = list.indexOfLast { it.first == -1 }
+        return if (lastIndex != -1) list.size - 1 - lastIndex else -1
+    }
+
+    private fun isOutOfBounds(slot: Int, experiment: Experiment): Boolean =
+        slot <= experiment.startSlot || slot >= experiment.endSlot || (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2)
+
+    private fun left(it: Pair<Item?, ItemPair?>): Item = it.first ?: Item(-1, "")
+
+    private fun right(it: Pair<Item?, ItemPair?>): ItemPair = it.second ?: ItemPair(Item(-1, ""), Item(-1, ""))
+
+    private fun toEither(it: Any): Pair<Item?, ItemPair?> = if (it is Item) it to null else null to it as ItemPair
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.superpairDisplay && ExperimentationTableAPI.getCurrentExperiment() != null
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
similarity index 91%
rename from src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
rename to src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
index 5c5011c85b1c..ef99c40bab97 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.inventory
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object SuperpairsClicksAlert {
 
-    private val config get() = SkyHanniMod.feature.inventory.helper.enchanting
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
 
     private var roundsNeeded = -1
     private val roundsNeededRegex = Regex("""(?:Chain|Series) of (\d+):""")
@@ -66,5 +66,7 @@ object SuperpairsClicksAlert {
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(46, "misc.superpairsClicksAlert", "inventory.helper.enchanting.superpairsClicksAlert")
+
+        event.move(59, "inventory.helper.enchanting.superpairsClicksAlert", "inventory.experimentationTable.superpairsClicksAlert")
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/UltraRareBookAlert.kt
similarity index 75%
rename from src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt
rename to src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/UltraRareBookAlert.kt
index 1cc849cad60a..e6a9dda426e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/UltraRareBookAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/UltraRareBookAlert.kt
@@ -1,13 +1,15 @@
-package at.hannibal2.skyhanni.features.inventory.experiments
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.bookPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.ultraRarePattern
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
-import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -18,7 +20,6 @@ import at.hannibal2.skyhanni.utils.SoundUtils.createSound
 import at.hannibal2.skyhanni.utils.SoundUtils.playSound
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.client.renderer.GlStateManager
@@ -29,23 +30,9 @@ import kotlin.time.Duration.Companion.seconds
 @SkyHanniModule
 object UltraRareBookAlert {
 
-    private val config get() = SkyHanniMod.feature.inventory.helper.enchanting
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
     private val dragonSound by lazy { createSound("mob.enderdragon.growl", 1f) }
 
-    private val patternGroup = RepoPattern.group("data.enchanting")
-    private val superpairsGui by patternGroup.pattern(
-        "inventory.experimentstable.gui",
-        "Superpairs.*"
-    )
-    private val ultraRarePattern by patternGroup.pattern(
-        "inventory.experimentstable.ultrarare",
-        "§d§kXX§5 ULTRA-RARE BOOK! §d§kXX"
-    )
-    private val bookPattern by patternGroup.pattern(
-        "inventory.experimentstable.book",
-        "§9(?<enchant>.*)"
-    )
-
     private var enchantsFound = false
 
     private var lastNotificationTime = SimpleTimeMark.farPast()
@@ -58,9 +45,7 @@ object UltraRareBookAlert {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!config.ultraRareBookAlert) return
-        if (!superpairsGui.matches(InventoryUtils.openInventoryName())) return
+        if (!isEnabled()) return
         if (lastNotificationTime.passedSince() > 5.seconds) return
         val gui = Minecraft.getMinecraft().currentScreen as? GuiContainer ?: return
 
@@ -80,10 +65,8 @@ object UltraRareBookAlert {
 
     @SubscribeEvent
     fun onInventoryUpdated(event: InventoryUpdatedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!config.ultraRareBookAlert) return
+        if (!isEnabled()) return
         if (enchantsFound) return
-        if (!superpairsGui.matches(event.inventoryName)) return
 
         for (lore in event.inventoryItems.map { it.value.getLore() }) {
             val firstLine = lore.firstOrNull() ?: continue
@@ -101,4 +84,12 @@ object UltraRareBookAlert {
     fun onInventoryClose(event: InventoryCloseEvent) {
         enchantsFound = false
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(59, "inventory.helper.enchanting.ultraRareBookAlert", "inventory.experimentationTable.ultraRareBookAlert")
+    }
+
+    private fun isEnabled() =
+        LorenzUtils.inSkyBlock && config.ultraRareBookAlert && ExperimentationTableAPI.getCurrentExperiment() != null
 }

From 1062c413cc17b0e99ca527b33568edf71642cab5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 00:28:43 +0200
Subject: [PATCH 505/721] Version 0.27 Beta 10

---
 docs/CHANGELOG.md                             | 25 +++++++++++++++++++
 docs/FEATURES.md                              |  7 ++++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a0795097cb22..d351445de428 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -51,6 +51,7 @@
     + Stray rabbits = Dark Aqua.
     + Abi = Dark Green.
 + Added a toggle to highlight found rabbits in Hoppity's Collection menu. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
++ Added the ability to change the color of missing rabbit dyes in Hoppity's Collection to reflect rabbit rarity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2522)
 
 #### The Carnival Features
 
@@ -85,6 +86,12 @@
 + Added Accessory magical power display as stack size. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2243)
     + Only works inside the Accessory Bag and Auction House.
 + Added `/gfs` to fix a broken Piggy Bank. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2150)
++ Added Superpair Display. - ILike2WatchMemes  (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Displays found and matched pairs, power-ups, and missing pairs/normals.
++ Added Experiments Dry-Streak Display. - ILike2WatchMemes  (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Shows attempts and XP since the last ULTRA-RARE.
++ Added Experiments Profit Tracker. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Tracks profits in Coins and Enchanting XP.
 
 #### Chat Features
 
@@ -196,6 +203,8 @@
 
 + Added config option to disable rarity in Compact Hoppity messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2383)
 + Chocolate Factory: Shows "time to next milestone" instead of "max milestone" when you are at Prestige 6. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2503)
++ Added the required chocolate amount to the tooltip of milestone rabbits in Hoppity's Collection. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2523)
++ Improved the responsiveness of Hoppity Chat Compacting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 
 #### Combat Improvements
 
@@ -215,6 +224,7 @@
 + Changed suggested cactus speed to 464 again. - DarkDash (https://github.com/hannibal002/SkyHanni/pull/2424)
     + Since the cactus knife now allows 500 max speed.
 + Made the waypoint to the middle of the plot for Pest Waypoint optional (off by default). - Luna (https://github.com/hannibal002/SkyHanni/pull/2469)
++ Reduced one click for supercrafting visitor materials by using `/viewrecipe` instead of `/recipe` when using the Shopping List button. - Miestiek (https://github.com/hannibal002/SkyHanni/pull/2505)
 
 #### Rift Improvements
 
@@ -235,6 +245,7 @@
 + Added search functionality to some SkyHanni GUIs. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2477)
     + Search works in all SkyHanni Trackers and the Sack Display.
     + In your inventory, hover over the GUI with your mouse, then start typing to search.
++ Improved the performance of pathfinding logic in Area Navigation. - nea (https://github.com/hannibal002/SkyHanni/pull/2537)
 
 ### Fixes
 
@@ -264,6 +275,7 @@
 + Fixed the Auction House Price Comparison appearing in your own inventory as well. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2483)
 + Fixed "click to show tunnel map" from the Glacite Mines commission menu appearing in the inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2485)
 + Fixed Mouse Keys not working as Wardrobe Slot Hotkeys. - j10a1n15, ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2506)
++ Fixed Estimated Item Value incorrectly showing all Kuudra armor as starred. - Luna (https://github.com/hannibal002/SkyHanni/pull/2550)
 
 #### Mining Fixes
 
@@ -278,6 +290,11 @@
 + Fixed blocks mined by Efficient Miner not being detected. - Empa (https://github.com/hannibal002/SkyHanni/pull/2526)
 + Fixed Corpse Tracker resetting items between restarts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2528)
 + Fixed the Corpse Tracker not displaying while in the Mineshaft. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2516)
++ Fixed Hardstone and Tungsten not being properly detected in Mineshafts. - Empa (https://github.com/hannibal002/SkyHanni/pull/2536)
++ Fixed Heart of the Mountain showing outdated perks and powder information. - Tryp0xd (https://github.com/hannibal002/SkyHanni/pull/2543)
++ Fixed Sky Mall perks not being read correctly after the Hypixel update. - Luna (https://github.com/hannibal002/SkyHanni/pull/2551)
++ Fixed Mining Commission Blocks Color not working properly with Connected Textures. - Empa (https://github.com/hannibal002/SkyHanni/pull/2553)
++ Fixed Gemstone Gauntlet item category. - Luna (https://github.com/hannibal002/SkyHanni/pull/2534)
 
 #### Scoreboard Fixes
 
@@ -299,6 +316,7 @@
 + Fixed a Custom Scoreboard error during the Magma Boss Fight and Goblin Raid. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2531)
 + Fixed a Custom Scoreboard error while in the Dojo. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2519)
 + Fixed a Custom Scoreboard error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2510)
++ Fixed Custom Scoreboard error during the Raffle Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2545)
 
 #### Hoppity Fixes
 
@@ -307,6 +325,7 @@
 + Fixed "Highlight Requirement Rabbits" requiring "Hoppity Collection Stats" to function. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2398)
 + Fixed minor formatting issues with Hoppity Event Summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2416)
 + Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
++ Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 
 #### Chat Fixes
 
@@ -360,6 +379,7 @@
 + Fixed "Last Server Joined" spamming the chat. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2495)
 + Fixed lag spikes in Path Finder. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2525)
 + Fixed old mayor perks not being marked as inactive when the mayor changes. - Luna (https://github.com/hannibal002/SkyHanni/pull/2524)
++ Fixed direct GitHub downloads triggering the source checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2548)
 
 ### Technical Details
 
@@ -405,6 +425,11 @@
     + Added more graph node tags; only display certain tags on specific islands in the editor.
     + Added an option to limit the maximum render range of nodes and edges in the Graph Editor for better performance.
 + Hoppity's Collection highlighting now updates on event triggers instead of every frame. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
++ Added `select near look` keybind in Graph Editor. - nea (https://github.com/hannibal002/SkyHanni/pull/2537)
++ Added checks to avoid creating bugs with the area structure in Graph Editor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2537)
++ Added options to the graph node list to hide nodes with certain tags. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2537)
++ Removed the use of `LorenzChatEvent()` for 'manually' adding data to Hoppity Chat Compact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
+    + Now uses `EggFoundEvent()`.
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index cbf3abacf756..e3c68e43d602 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -994,6 +994,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Stray rabbits = Dark Aqua.
     + Abi = Dark Green.
 + Added a toggle to highlight found rabbits in Hoppity's Collection menu. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
++ Added the ability to change the color of missing rabbit dyes in Hoppity's Collection to reflect rabbit rarity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2522)
 
 ### The Carnival
 
@@ -1327,6 +1328,12 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Added to the Item Number list.
 + Added Compact Experimentation Table chat rewards. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2209)
     + Uses a compact chat message of rewards gained from Add-ons/Experiments.
++ Added Superpair Display. - ILike2WatchMemes  (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Displays found and matched pairs, power-ups, and missing pairs/normals.
++ Added Experiments Dry-Streak Display. - ILike2WatchMemes  (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Shows attempts and XP since the last ULTRA-RARE.
++ Added Experiments Profit Tracker. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2171)
+    + Tracks profits in Coins and Enchanting XP.
 + In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
 + Added Beacon Power Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1901)
diff --git a/root.gradle.kts b/root.gradle.kts
index f799ed79d6a1..4c8333a202c6 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.9"
+    version = "0.27.Beta.10"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index cab1b690ffb5..41552ba66982 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.9",
+    version = "0.27.Beta.10",
 )
 class SkyHanniMod {
 

From 1da7050a5b95e6e1cf0111c3a71b042168d3918e Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Sat, 21 Sep 2024 18:31:34 +1000
Subject: [PATCH 506/721] =?UTF-8?q?Make=20Mining=20Commissions=20Blocks=20?=
 =?UTF-8?q?Colour=20actually=20work=20with=20connected=20textures=20instea?=
 =?UTF-8?q?d=20of=20just=20turning=20them=20off=20=F0=9F=99=82=20(#2559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/OptifineConnectedTexturesHook.kt    | 35 +++++++++++++++++++
 .../transformers/MixinOptifineConfig.java     | 18 ----------
 .../MixinOptifineConnectedTextures.java       | 23 ++++++++++++
 3 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
new file mode 100644
index 000000000000..f930e1008ca6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
@@ -0,0 +1,35 @@
+package at.hannibal2.skyhanni.mixins.hooks
+
+import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor
+import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
+import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.replaceBlocksMapCache
+import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import net.minecraft.block.state.IBlockState
+
+fun modifyConnectedTexturesBlockState(state: IBlockState): IBlockState {
+    if (state == null) return state
+    var returnState: IBlockState = state
+
+    if (!LorenzUtils.inSkyBlock) return state
+
+    try {
+        if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
+            returnState = replaceBlocksMapCache.getOrPut(state) {
+                MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
+                    state.isOreType(it.oreType)
+                }?.onColor(state) ?: state
+            }
+        }
+    } catch (e: Exception) {
+        ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
+    }
+
+    if (returnState !== state) {
+
+        return returnState
+    }
+    return state
+}
+
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
deleted file mode 100644
index 97b20f19a621..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package at.hannibal2.skyhanni.mixins.transformers;
-
-import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Pseudo
-@Mixin(targets = "Config", remap = false)
-public class MixinOptifineConfig {
-
-    @Inject(method = {"isConnectedTextures", "isConnectedTexturesFancy"}, at = @At("HEAD"), cancellable = true)
-    private static void isConnectedTextures(CallbackInfoReturnable<Boolean> cir) {
-        if (MiningCommissionsBlocksColor.INSTANCE.getActive()) cir.setReturnValue(false);
-    }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
new file mode 100644
index 000000000000..9f3087e8e0ed
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
@@ -0,0 +1,23 @@
+package at.hannibal2.skyhanni.mixins.transformers;
+
+import at.hannibal2.skyhanni.mixins.hooks.OptifineConnectedTexturesHookKt;
+import net.minecraft.block.state.IBlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Pseudo
+@Mixin(targets = "net.optifine.ConnectedTextures", remap = false)
+public class MixinOptifineConnectedTextures {
+
+    @ModifyArg(method = "getConnectedTexture", at = @At(value = "INVOKE", target = "getConnectedTextureMultiPass"))
+    private static IBlockState modifyGetConnectedTextureMultiPass(IBlockState state) {
+        return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
+    }
+
+    @ModifyArg(method = "getConnectedTexture", at = @At(value = "INVOKE", target = "skipConnectedTexture"))
+    private static IBlockState modifySkipConnectedTexture(IBlockState state) {
+        return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
+    }
+}

From f056eb5a458ae95dff2cdbd84217e491f72a3d06 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 10:32:43 +0200
Subject: [PATCH 507/721] MiningCommissionsBlocksColor.processState

---
 .../mining/MiningCommissionsBlocksColor.kt    | 37 ++++++++++++++-----
 .../hooks/BlockRendererDispatcherHook.kt      | 21 ++---------
 .../hooks/OptifineConnectedTexturesHook.kt    | 28 +-------------
 3 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
index 5eaff2b44604..5de75e5d1364 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningCommissionsBlocksColor.kt
@@ -10,7 +10,10 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
+import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeLimitedSet
@@ -28,8 +31,8 @@ object MiningCommissionsBlocksColor {
 
     private val config get() = SkyHanniMod.feature.mining.commissionsBlocksColor
 
-    var enabled = false
-    var active = false
+    private var enabled = false
+    private var active = false
 
     private val patternGroup = RepoPattern.group("mining.commissions")
 
@@ -41,14 +44,13 @@ object MiningCommissionsBlocksColor {
         "§a§l(?<name>.*) §r§eCommission Complete! Visit the King §r§eto claim your rewards!",
     )
 
-    var color: EnumDyeColor = EnumDyeColor.RED
+    private var color = EnumDyeColor.RED
 
-    private fun glass(state: IBlockState, result: Boolean): IBlockState =
-        if (result) {
-            state.withProperty(BlockCarpet.COLOR, color)
-        } else {
-            state.withProperty(BlockCarpet.COLOR, EnumDyeColor.GRAY)
-        }
+    private fun glass(state: IBlockState, result: Boolean): IBlockState = if (result) {
+        state.withProperty(BlockCarpet.COLOR, color)
+    } else {
+        state.withProperty(BlockCarpet.COLOR, EnumDyeColor.GRAY)
+    }
 
     private fun block(result: Boolean): IBlockState {
         val wool = Blocks.wool.defaultState
@@ -64,7 +66,7 @@ object MiningCommissionsBlocksColor {
     private var dirty = false
     private var forceDirty = false
 
-    var replaceBlocksMapCache = mutableMapOf<IBlockState, IBlockState>()
+    private var replaceBlocksMapCache = mutableMapOf<IBlockState, IBlockState>()
 
     // TODO Commission API
     @SubscribeEvent
@@ -244,4 +246,19 @@ object MiningCommissionsBlocksColor {
                 if (oreType.isGemstone()) glass(state, highlight) else block(highlight)
         }
     }
+
+    fun processState(state: IBlockState?): IBlockState? {
+        if (!enabled || !active) return state
+        if (state == null) return null
+        try {
+            return replaceBlocksMapCache.getOrPut(state) {
+                CommissionBlock.entries.firstOrNull {
+                    state.isOreType(it.oreType)
+                }?.onColor(state) ?: state
+            }
+        } catch (e: Exception) {
+            ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
+            return state
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
index f72d56739d6c..cf4e4ba40bfb 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/BlockRendererDispatcherHook.kt
@@ -1,10 +1,6 @@
 package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor
-import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
-import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.replaceBlocksMapCache
-import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
-import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.block.state.IBlockState
 import net.minecraft.client.renderer.BlockRendererDispatcher
@@ -21,24 +17,13 @@ fun modifyGetModelFromBlockState(
     pos: BlockPos?,
     cir: CallbackInfoReturnable<IBakedModel>,
 ) {
-    if (state == null || pos == null) return
-    var returnState: IBlockState = state
+    if (pos == null) return
 
     if (!LorenzUtils.inSkyBlock) return
 
-    try {
-        if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
-            returnState = replaceBlocksMapCache.getOrPut(state) {
-                MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
-                    state.isOreType(it.oreType)
-                }?.onColor(state) ?: state
-            }
-        }
-    } catch (e: Exception) {
-        ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
-    }
+    val returnState = MiningCommissionsBlocksColor.processState(state)
 
-    if (returnState !== state) {
+    if (returnState != state) {
         cir.returnValue = blockRendererDispatcher.blockModelShapes.getModelForState(returnState)
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
index f930e1008ca6..fe4619cf27f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
@@ -1,35 +1,11 @@
 package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor
-import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
-import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.replaceBlocksMapCache
-import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
-import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.block.state.IBlockState
 
-fun modifyConnectedTexturesBlockState(state: IBlockState): IBlockState {
-    if (state == null) return state
-    var returnState: IBlockState = state
-
+fun modifyConnectedTexturesBlockState(state: IBlockState?): IBlockState? {
     if (!LorenzUtils.inSkyBlock) return state
-
-    try {
-        if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
-            returnState = replaceBlocksMapCache.getOrPut(state) {
-                MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
-                    state.isOreType(it.oreType)
-                }?.onColor(state) ?: state
-            }
-        }
-    } catch (e: Exception) {
-        ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
-    }
-
-    if (returnState !== state) {
-
-        return returnState
-    }
-    return state
+    return MiningCommissionsBlocksColor.processState(state)
 }
 

From 63d2c9e3d491c0e8ad5e4c5c18105668ad100f90 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 10:48:47 +0200
Subject: [PATCH 508/721] improved graph editor bug finder behaviour slightly

---
 .../at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
index aee75ec5faf6..73c55b447426 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.features.misc.IslandAreas.getAreaTag
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
@@ -14,6 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 
 // Trying to find errors in Area Graph for the current graph editor instance
+@SkyHanniModule
 object GraphEditorBugFinder {
     private var errorsInWorld = emptyMap<LorenzVec, String>()
 

From bbbb9c22ad99ac887d1a4d624c594818e81a7189 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 11:04:09 +0200
Subject: [PATCH 509/721] better graph node names and descriptions

---
 .../skyhanni/data/model/GraphNodeTag.kt       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index e70786137bf6..2cdc9e7e0d1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -13,21 +13,21 @@ enum class GraphNodeTag(
     DEV("dev", LorenzColor.WHITE, "Dev", "Intentionally marked as dev."), // E.g. Spawn points, todos, etc
 
     // Everywhere
-    NPC("npc", LorenzColor.YELLOW, "NPC", "A NPC entity."), // also take from neu repo
+    NPC("npc", LorenzColor.YELLOW, "NPC", "A NPC to talk to."), // also take from neu repo
     AREA("area", LorenzColor.DARK_GREEN, "Area", "A big SkyBlock area."),
     SMALL_AREA("small_area", LorenzColor.GREEN, "Small Area", "A small SkyBlock area, e.g. a house."),
-    POI("poi", LorenzColor.WHITE, "PoI", "Point of interest."),
+    POI("poi", LorenzColor.WHITE, "Point of Interest", "A relevant spot or a landmark on the map."),
 //     LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
     TELEPORT("teleport", LorenzColor.BLUE, "Teleport", "A spot from/to teleport."),
 
     // on multiple islands
-    ROMEO("romeo", LorenzColor.WHITE, "Romeo & Juliette Quest", "Blocks related to the Romeo and Juliette/Ring of Love quest line."),
+    ROMEO("romeo", LorenzColor.WHITE, "Romeo & Juliette Quest", "Spots related to the Romeo and Juliette/Ring of Love quest line."),
     RACE("race", LorenzColor.WHITE, "Race Start/Stop", "A race start or stop point."),
-    SLAYER("slayer", LorenzColor.RED, "Slayer", "A Slayer area"),
+    SLAYER("slayer", LorenzColor.RED, "Slayer", "A Slayer area."),
     HOPPITY("hoppity", LorenzColor.AQUA, "Hoppity Egg", "An egg location in Hoppity's Hunt."),
-    GRIND_MOBS("grind_mobs", LorenzColor.RED, "Grind Mobs", "A spot where combat mobs spawn that can be killed."),
-    GRIND_ORES("grind_ores", LorenzColor.DARK_AQUA, "Grind Ores", "A spot where mining ores spawn that can be mines."),
-    GRIND_CROPS("grind_crops", LorenzColor.DARK_GREEN, "Grind Crops", "A spot where farming crops spawn that can be farmed."),
+    GRIND_MOBS("grind_mobs", LorenzColor.RED, "Mob Spawn Area", "An area where mobs spawn that can be killed."),
+    GRIND_ORES("grind_ores", LorenzColor.DARK_AQUA, "Ore Vein", "A regenerating ore vein that can be mined."),
+    GRIND_CROPS("grind_crops", LorenzColor.DARK_GREEN, "Crop Area", "An area where crops grow that can be farmed."),
     // hoppity
 
     // Hub
@@ -41,8 +41,8 @@ enum class GraphNodeTag(
 //     FARMING_CROP("farming_crop", LorenzColor.WHITE, "Farming Crop", "A spot where you can break crops on farming islands."),
 
     // Rift
-    RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the rift.", onlyIsland = IslandType.THE_RIFT),
-    RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Rift Eye", "An Eye in the rift to teleport to.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the Rift.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Rift Eye", "An Eye in the Rift to teleport to.", onlyIsland = IslandType.THE_RIFT),
     RIFT_MONTEZUMA("rift_montezuma", LorenzColor.GRAY, "Montezuma Soul Piece", "A piece of the Montezuma Soul.", onlyIsland = IslandType.THE_RIFT),
     RIFT_EFFIGY("rift_effigy", LorenzColor.RED, "Blood Effigies", "Locations of the Blood Effigies.", onlyIsland = IslandType.THE_RIFT),
 
@@ -50,14 +50,14 @@ enum class GraphNodeTag(
     SPIDER_RELIC("SPIDER_RELIC", LorenzColor.DARK_PURPLE, "Spider's Relic", "An relic in the Spider's Den.", onlyIsland = IslandType.SPIDER_DEN),
 
     // Dwarven Mines
-    MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Mines Emissary", "A Emissary from the king.", onlyIsland = IslandType.DWARVEN_MINES),
+    MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Mines Emissary", "An Emissary to the king.", onlyIsland = IslandType.DWARVEN_MINES),
     // commission areas
 
     // Crimson Isles
-    CRIMSON_MINIBOSS("crimson_miniboss", LorenzColor.RED, "Crimson Miniboss", "Mini bosses in Crimson Isle.", onlyIsland = IslandType.CRIMSON_ISLE),
+    CRIMSON_MINIBOSS("crimson_miniboss", LorenzColor.RED, "Crimson Miniboss", "A Miniboss in the Crimson Isle.", onlyIsland = IslandType.CRIMSON_ISLE),
 
     // The End
-    END_GOLEM("end_golem", LorenzColor.RED, "Golem Spawn", "A spot where the golem in the end spawns", onlyIsland = IslandType.THE_END),
+    END_GOLEM("end_golem", LorenzColor.RED, "Golem Spawn", "A spot where the golem can spawn in the End.", onlyIsland = IslandType.THE_END),
 
     ;
 

From 8a0a2fb1e27ee2a08a0bcb14634ab8ef134ba61b Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sat, 21 Sep 2024 11:06:46 +0200
Subject: [PATCH 510/721] Fix: Totem of Corruption expiry warning sometimes not
 working (#2554)

---
 .../skyhanni/features/fishing/TotemOfCorruption.kt         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
index 0410a04a91d0..c8ff17a9e935 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
@@ -22,6 +22,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawSphereInWorld
 import at.hannibal2.skyhanni.utils.RenderUtils.drawSphereWireframeInWorld
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SoundUtils.playPlingSound
+import at.hannibal2.skyhanni.utils.TimeLimitedSet
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.getLorenzVec
@@ -29,7 +30,9 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.UUID
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
@@ -39,6 +42,7 @@ object TotemOfCorruption {
 
     private var display = emptyList<String>()
     private var totems: List<Totem> = emptyList()
+    private val warnedTotems = TimeLimitedSet<UUID>(2.minutes)
 
     private val patternGroup = RepoPattern.group("fishing.totemofcorruption")
     private val totemNamePattern by patternGroup.pattern(
@@ -154,9 +158,10 @@ object TotemOfCorruption {
             val owner = getOwner(totem) ?: return@mapNotNull null
 
             val timeToWarn = config.warnWhenAboutToExpire.seconds
-            if (timeToWarn > 0.seconds && timeRemaining == timeToWarn) {
+            if (timeToWarn > 0.seconds && timeRemaining <= timeToWarn && !warnedTotems.contains(totem.uniqueID)) {
                 playPlingSound()
                 sendTitle("§c§lTotem of Corruption §eabout to expire!", 5.seconds)
+                warnedTotems.add(totem.uniqueID)
             }
             Totem(totem.getLorenzVec(), timeRemaining, owner)
         }

From 8e71a5e2a2d89ada948ab752f055cb7611b2a219 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 11:07:15 +0200
Subject: [PATCH 511/721] code cleanup

---
 .../at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
index c8ff17a9e935..9896580c6b2b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
@@ -158,7 +158,7 @@ object TotemOfCorruption {
             val owner = getOwner(totem) ?: return@mapNotNull null
 
             val timeToWarn = config.warnWhenAboutToExpire.seconds
-            if (timeToWarn > 0.seconds && timeRemaining <= timeToWarn && !warnedTotems.contains(totem.uniqueID)) {
+            if (timeToWarn > 0.seconds && timeRemaining <= timeToWarn && totem.uniqueID !in warnedTotems) {
                 playPlingSound()
                 sendTitle("§c§lTotem of Corruption §eabout to expire!", 5.seconds)
                 warnedTotems.add(totem.uniqueID)

From c9bb5e1a14f558eb5eb8acc7c46d117a2b62ac0d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 21 Sep 2024 11:07:54 +0200
Subject: [PATCH 512/721] Fix: Mining Stats Reforge (#2555)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index 994ff524e869..182309634f72 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -43,7 +43,14 @@ enum class SkyblockStat(val icon: String) {
     PRISTINE("§5✧"),
     FORAGING_FORTUNE("§☘"),
     FARMING_FORTUNE("§6☘"),
+
+    MINING_SPREAD("§e▚"),
     MINING_FORTUNE("§6☘"),
+    ORE_FORTUNE("§6☘"),
+    DWARVEN_METAL_FORTUNE("§6☘"),
+    BLOCK_FORTUNE("§6☘"),
+    GEMSTONE_FORTUNE("§6☘"),
+
     FEAR("§a☠"),
     HEAT_RESISTANCE("§c♨"),
     ;

From f298d65f6b3029474f6695ccf3cb6ac5f0400e42 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 21 Sep 2024 05:08:42 -0400
Subject: [PATCH 513/721] Fix: Glacite Powder being counted as an item in
 CorpseTracker (#2557)

---
 .../features/mining/glacitemineshaft/CorpseTracker.kt         | 4 +++-
 .../mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
index f1d23185f3e0..3e81a01a9588 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -17,6 +17,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.Searchable
 import at.hannibal2.skyhanni.utils.renderables.toSearchable
@@ -65,9 +66,10 @@ object CorpseTracker {
     private fun addLootedCorpse(type: CorpseType) = tracker.modify { it.corpsesLooted.addOrPut(type, 1) }
 
     @SubscribeEvent
-    fun onCorpseLoot(event: CorpseLootedEvent) {
+    fun onCorpseLooted(event: CorpseLootedEvent) {
         addLootedCorpse(event.corpseType)
         for ((itemName, amount) in event.loot) {
+            if (itemName.removeColor().trim() == "Glacite Powder") continue
             NEUInternalName.fromItemNameOrNull(itemName)?.let { item ->
                 tracker.modify {
                     it.addItem(event.corpseType, item, amount)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
index 7eebeeaab890..78f4b07eda74 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/ProfitPerMineshaftCorpse.kt
@@ -18,7 +18,7 @@ object ProfitPerMineshaftCorpse {
     private val config get() = SkyHanniMod.feature.mining.mineshaft
 
     @SubscribeEvent
-    fun onFossilExcavation(event: CorpseLootedEvent) {
+    fun onCorpseLooted(event: CorpseLootedEvent) {
         if (!config.profitPerCorpseLoot) return
         val loot = event.loot
 

From 208fc04e7db767abda24fdbae141d60898371d61 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 21 Sep 2024 11:18:41 +0200
Subject: [PATCH 514/721] Backend: AreaChangeEvent and Islands in HandleEvent
 (#2535)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/api/event/EventHandler.kt        | 11 ++++++--
 .../skyhanni/api/event/HandleEvent.kt         |  9 ++++++-
 .../at/hannibal2/skyhanni/data/HypixelData.kt |  8 +++++-
 .../skyhanni/data/LocationFixData.kt          | 19 +++++++++-----
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 25 +++++++++++--------
 .../events/skyblock/AreaChangeEvents.kt       |  6 +++++
 .../features/combat/mobs/ArachneSpawnTimer.kt |  2 +-
 .../DungeonShadowAssassinNotification.kt      |  2 +-
 .../diana/GriffinBurrowParticleFinder.kt      |  2 +-
 .../event/diana/InquisitorWaypointShare.kt    |  2 +-
 .../skyhanni/features/garden/GardenAPI.kt     |  2 +-
 .../skyhanni/features/garden/pests/PestAPI.kt |  2 +-
 .../garden/pests/PestParticleWaypoint.kt      |  2 +-
 .../garden/visitor/VisitorListener.kt         |  4 +--
 14 files changed, 66 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/skyblock/AreaChangeEvents.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
index 78769060accf..4b4c008523e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
@@ -130,6 +130,13 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
         val invoker: Consumer<Any>,
         val options: HandleEvent,
         val generic: Class<*>?,
-        val onlyOnIslandTypes: Set<IslandType> = options.onlyOnIslands.toSet(),
-    )
+    ) {
+        val onlyOnIslandTypes: Set<IslandType> = getIslands(options)
+
+        companion object {
+            private fun getIslands(options: HandleEvent): Set<IslandType> =
+                if (options.onlyOnIslands.isEmpty()) setOf(options.onlyOnIsland)
+                else options.onlyOnIslands.toSet()
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt b/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
index c07239dc2ae9..a88f7f33724c 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/HandleEvent.kt
@@ -12,8 +12,15 @@ annotation class HandleEvent(
 
     /**
      * If the event should only be received while on a specific skyblock island.
+     * To specify multiple islands, use [onlyOnIslands] instead.
      */
-    vararg val onlyOnIslands: IslandType = [IslandType.ANY],
+    val onlyOnIsland: IslandType = IslandType.ANY,
+
+    /**
+     * If the event should only be received while being on specific skyblock islands.
+     * To specify only one island, use [onlyOnIsland] instead.
+     */
+    vararg val onlyOnIslands: IslandType = [],
 
     /**
      * The priority of when the event will be called, lower priority will be called first, see the companion object.
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 0cd806f577c7..b48805ef5bf5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent
+import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent
 import at.hannibal2.skyhanni.features.bingo.BingoAPI
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.rift.RiftAPI
@@ -319,8 +320,13 @@ object HypixelData {
             loop@ for (line in ScoreboardData.sidebarLinesFormatted) {
                 skyblockAreaPattern.matchMatcher(line) {
                     val originalLocation = group("area").removeColor()
-                    skyBlockArea = LocationFixData.fixLocation(skyBlockIsland) ?: originalLocation
+                    val area = LocationFixData.fixLocation(skyBlockIsland) ?: originalLocation
                     skyBlockAreaWithSymbol = line.trim()
+                    if (area != skyBlockArea) {
+                        val previousArea = skyBlockArea
+                        skyBlockArea = area
+                        ScoreboardAreaChangeEvent(area, previousArea).post()
+                    }
                     break@loop
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt
index 129e1cd956ec..20dfbb615722 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt
@@ -11,9 +11,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object LocationFixData {
 
-    private var locationFixes = mutableListOf<LocationFix>()
+    private var locationFixes = mutableMapOf<IslandType, List<LocationFix>>()
 
-    class LocationFix(val island: IslandType, val area: AxisAlignedBB, val realLocation: String)
+    private data class LocationFix(val area: AxisAlignedBB, val realLocation: String)
 
     // priority set to low so that IslandType can load their island names from repo earlier
     @SubscribeEvent(priority = EventPriority.LOW)
@@ -26,11 +26,18 @@ object LocationFixData {
             val area = fix.a.axisAlignedTo(fix.b)
             val realLocation = fix.realLocation
 
-            locationFixes.add(LocationFix(island, area, realLocation))
+            val list = locationFixes[island]
+
+            val locationFix = LocationFix(area, realLocation)
+
+            if (list == null) locationFixes[island] = listOf(locationFix)
+            else locationFixes[island] = list + locationFix
         }
     }
 
-    fun fixLocation(skyBlockIsland: IslandType) = locationFixes
-        .firstOrNull { skyBlockIsland == it.island && it.area.isPlayerInside() }
-        ?.realLocation
+    fun fixLocation(skyBlockIsland: IslandType): String? =
+        locationFixes[skyBlockIsland]
+            ?.find { it.area.isPlayerInside() }
+            ?.realLocation
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 758294ffc580..35855fc612d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -1,8 +1,10 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.ColdUpdateEvent
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -11,6 +13,7 @@ import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.mining.OreMinedEvent
 import at.hannibal2.skyhanni.events.player.PlayerDeathEvent
+import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.features.mining.OreBlock
 import at.hannibal2.skyhanni.features.mining.isTitanium
@@ -69,8 +72,6 @@ object MiningAPI {
     var currentAreaOreBlocks = setOf<OreBlock>()
         private set
 
-    private var lastSkyblockArea: String? = null
-
     private val recentClickedBlocks = ConcurrentSet<Pair<LorenzVec, SimpleTimeMark>>()
     private val surroundingMinedBlocks = ConcurrentLinkedQueue<Pair<MinedBlock, LorenzVec>>()
     private val allowedSoundNames = setOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
@@ -203,10 +204,6 @@ object MiningAPI {
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!inCustomMiningIsland()) return
-
-        if (LorenzUtils.lastWorldSwitch.passedSince() < 4.seconds) return
-        updateLocation()
-
         if (currentAreaOreBlocks.isEmpty()) return
 
         // if somehow you take more than 20 seconds to mine a single block, congrats
@@ -219,6 +216,17 @@ object MiningAPI {
         resetOreEvent()
     }
 
+    @HandleEvent
+    fun onAreaChange(event: ScoreboardAreaChangeEvent) {
+        if (!inCustomMiningIsland()) return
+        updateLocation()
+    }
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        updateLocation()
+    }
+
     private fun runEvent() {
         resetOreEvent()
 
@@ -287,11 +295,6 @@ object MiningAPI {
     }
 
     private fun updateLocation() {
-        val currentArea = LorenzUtils.skyBlockArea
-        // TODO add area change event with HypixelData.skyBlockArea instead
-        if (currentArea == lastSkyblockArea) return
-        lastSkyblockArea = currentArea
-
         inGlacite = inGlaciteArea()
         inTunnels = inGlacialTunnels()
         inMineshaft = inMineshaft()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/skyblock/AreaChangeEvents.kt b/src/main/java/at/hannibal2/skyhanni/events/skyblock/AreaChangeEvents.kt
new file mode 100644
index 000000000000..b262ea9fbe44
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/skyblock/AreaChangeEvents.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.skyblock
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+// Detect area changes by looking at the scoreboard.
+class ScoreboardAreaChangeEvent(val area: String, val previousArea: String?) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
index b3c9be188752..2fee0577e8f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
@@ -80,7 +80,7 @@ object ArachneSpawnTimer {
         }
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.SPIDER_DEN], priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIsland = IslandType.SPIDER_DEN, priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {
         if (!saveNextTickParticles) return
         if (searchTime.passedSince() < 3.seconds) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
index abe83df8cbd4..ca888392f35c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonShadowAssassinNotification.kt
@@ -16,7 +16,7 @@ object DungeonShadowAssassinNotification {
 
     private val config get() = SkyHanniMod.feature.dungeon
 
-    @HandleEvent(onlyOnIslands = [IslandType.CATACOMBS])
+    @HandleEvent(onlyOnIsland = IslandType.CATACOMBS)
     fun onWorldBorderChange(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         if (DungeonAPI.dungeonFloor?.contains("3") == true && DungeonAPI.inBossRoom) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 0f0220a76208..80d6ea0e0df9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -58,7 +58,7 @@ object GriffinBurrowParticleFinder {
         }
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.HUB], priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIsland = IslandType.HUB, priority = HandleEvent.LOW, receiveCancelled = true)
     fun onPacketReceive(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         if (!config.burrowsSoopyGuess) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index fbb599d68f90..2d0e2a809e81 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -222,7 +222,7 @@ object InquisitorWaypointShare {
         HypixelCommands.partyChat("x: $x, y: $y, z: $z ")
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.HUB], priority = HandleEvent.LOW, receiveCancelled = true)
+    @HandleEvent(onlyOnIsland = IslandType.HUB, priority = HandleEvent.LOW, receiveCancelled = true)
     fun onFirstChatEvent(event: PacketReceivedEvent) {
         if (!isEnabled()) return
         val packet = event.packet
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index e188dcfd0d56..4e80bdbea678 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -90,7 +90,7 @@ object GardenAPI {
         "BINGHOE",
     )
 
-    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onSendPacket(event: PacketSentEvent) {
         if (event.packet !is C09PacketHeldItemChange) return
         checkItemInHand()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
index 7aefb74cd37c..d49de324c851 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt
@@ -158,7 +158,7 @@ object PestAPI {
         PestUpdateEvent().post()
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onPestSpawn(event: PestSpawnEvent) {
         PestSpawnTimer.lastSpawnTime = SimpleTimeMark.now()
         val plotNames = event.plotNames
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index d3dd8a27ba10..23ead6f911d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -121,7 +121,7 @@ object PestParticleWaypoint {
         ++particles
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onFireWorkSpawn(event: PacketReceivedEvent) {
         if (event.packet !is S0EPacketSpawnObject) return
         if (!config.hideParticles) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
index e709fcda7633..66d03745f372 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
@@ -56,7 +56,7 @@ object VisitorListener {
     }
 
     // TODO make event
-    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onSendEvent(event: PacketSentEvent) {
         val packet = event.packet
         if (packet !is C02PacketUseEntity) return
@@ -136,7 +136,7 @@ object VisitorListener {
         inventory.handleMouseClick_skyhanni(slot, slot.slotIndex, 0, 0)
     }
 
-    @HandleEvent(onlyOnIslands = [IslandType.GARDEN])
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onTooltip(event: ItemHoverEvent) {
         if (!GardenAPI.onBarnPlot) return
         if (!VisitorAPI.inInventory) return

From 1739a5f13194bc136e169a7870a14c2704174be8 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 21 Sep 2024 05:59:58 -0400
Subject: [PATCH 515/721] Feature: Hoppity Duplicate Count (#2556)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../event/hoppity/HoppityEggsConfig.java      |  5 +++++
 .../features/event/hoppity/HoppityAPI.kt      | 20 +++++++++++--------
 .../event/hoppity/HoppityCollectionStats.kt   |  9 +++++++--
 .../event/hoppity/HoppityEggsCompactChat.kt   |  8 +++++++-
 .../event/hoppity/HoppityEggsManager.kt       |  4 ++--
 .../ChocolateFactoryBarnManager.kt            | 12 ++++++++++-
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
index b438d83f5c3b..8bbaa962ca26 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
@@ -197,6 +197,11 @@ public String toString() {
         }
     }
 
+    @Expose
+    @ConfigOption(name = "Show Duplicate Count", desc = "Show the number of previous finds of a duplicate Hoppity rabbit in chat messages.")
+    @ConfigEditorBoolean
+    public boolean showDuplicateNumber = false;
+
     @Expose
     @ConfigOption(
         name = "Rabbit Pet Warning",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 6c42f8a17002..93c9efc04021 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -6,11 +6,11 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.hoppity.EggFoundEvent
 import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPattern
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
-import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
-import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
-import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -35,6 +35,7 @@ object HoppityAPI {
     private var duplicate = false
     private var lastRarity = ""
     private var lastName = ""
+    private var lastNameCache = ""
     private var newRabbit = false
     private var lastMeal: HoppityEggType? = null
     private var lastDuplicateAmount: Long? = null
@@ -51,6 +52,7 @@ object HoppityAPI {
         this.lastDuplicateAmount = null
     }
 
+    fun getLastRabbit(): String = this.lastNameCache
     fun isHoppityEvent() = (SkyblockSeason.currentSeason == SkyblockSeason.SPRING || SkyHanniMod.feature.dev.debug.alwaysHoppitys)
     fun rarityByRabbit(rabbit: String): LorenzRarity? = hoppityRarities.firstOrNull { it.chatColorCode == rabbit.substring(0, 2) }
 
@@ -69,7 +71,7 @@ object HoppityAPI {
      */
     private val sideDishNamePattern by ChocolateFactoryAPI.patternGroup.pattern(
         "rabbit.sidedish",
-        "(?:§.)*?Golden Rabbit (?:§.)?- (?:§.)?Side Dish"
+        "(?:§.)*?Golden Rabbit (?:§.)?- (?:§.)?Side Dish",
     )
 
     /**
@@ -95,12 +97,12 @@ object HoppityAPI {
         if (!ChocolateFactoryAPI.inChocolateFactory) return
         InventoryUtils.getItemsInOpenChest().filter {
             it.stack.hasDisplayName() &&
-            it.stack.getMinecraftId().toString() == "minecraft:skull" &&
-            it.stack.getLore().isNotEmpty()
+                it.stack.getMinecraftId().toString() == "minecraft:skull" &&
+                it.stack.getLore().isNotEmpty()
         }.forEach {
             ChocolateFactoryStrayTracker.strayCaughtPattern.matchMatcher(it.stack.displayName) {
                 ChocolateFactoryStrayTracker.handleStrayClicked(it)
-                when(groupOrNull("name") ?: return@matchMatcher) {
+                when (groupOrNull("name") ?: return@matchMatcher) {
                     "Fish the Rabbit" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
                     "El Dorado" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
                     else -> return@matchMatcher
@@ -140,9 +142,10 @@ object HoppityAPI {
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGH)
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
+
         eggFoundPattern.matchMatcher(event.message) {
             resetRabbitData()
             lastMeal = getEggType(event)
@@ -160,6 +163,7 @@ object HoppityAPI {
 
         HoppityEggsManager.rabbitFoundPattern.matchMatcher(event.message) {
             lastName = group("name")
+            lastNameCache = lastName
             lastRarity = group("rarity")
             attemptFireRabbitFound()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 3782919666dd..7be0913e9fb2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.CollectionUtils.collectWhile
 import at.hannibal2.skyhanni.utils.CollectionUtils.consumeWhile
@@ -449,10 +450,14 @@ object HoppityCollectionStats {
         return table
     }
 
-    fun incrementRabbit(name: String) {
+    fun getRabbitCount(name: String): Int = name.removeColor().run {
+        loggedRabbits[this]?.takeIf { HoppityCollectionData.isKnownRabbit(this) } ?: 0
+    }
+
+    fun incrementRabbitCount(name: String) {
         val rabbit = name.removeColor()
         if (!HoppityCollectionData.isKnownRabbit(rabbit)) return
-        loggedRabbits[rabbit] = (loggedRabbits[rabbit] ?: 0) + 1
+        loggedRabbits.addOrPut(rabbit, 1)
     }
 
     // Gets the found rabbits according to the Hypixel progress bar
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index abbdff1f023b..4a33820d8d55 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -94,9 +94,15 @@ object HoppityEggsCompactChat {
                 ChocolateFactoryAPI.timeUntilNeed(it).format(maxUnits = 2)
             } ?: "?"
 
+            val dupeNumberFormat = if (eventConfig.showDuplicateNumber) {
+                (HoppityCollectionStats.getRabbitCount(this.lastName) - 1).takeIf { it > 1}?.let {
+                    " §7(§b#$it§7)"
+                } ?: ""
+            } else ""
+
             val showDupeRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.DUPE }
             val timeStr = if (config.showDuplicateTime) ", §a+§b$timeFormatted§7" else ""
-            "$mealNameFormat! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName §7(§6+$format Chocolate§7$timeStr)"
+            "$mealNameFormat! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName$dupeNumberFormat §7(§6+$format Chocolate§7$timeStr)"
         } else if (newRabbit) {
             val showNewRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.NEW }
             "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 75b65fdc48ac..b8143d311cf2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -122,7 +122,7 @@ object HoppityEggsManager {
 
     @HandleEvent
     fun onRabbitFound(event: RabbitFoundEvent) {
-        HoppityCollectionStats.incrementRabbit(event.rabbitName)
+        HoppityCollectionStats.incrementRabbitCount(event.rabbitName)
     }
 
     @SubscribeEvent
@@ -233,7 +233,7 @@ object HoppityEggsManager {
         val message = "All $amount Hoppity Eggs are ready to be found!"
         if (config.warpUnclaimedEggs) {
             val (action, actionName) = if (LorenzUtils.inSkyBlock) {
-                { HypixelCommands.warp(config.warpDestination) } to "${"warp to ${config.warpDestination}".trim()}"
+                { HypixelCommands.warp(config.warpDestination) } to "warp to ${config.warpDestination}".trim()
             } else {
                 { HypixelCommands.skyblock() } to "join /skyblock!"
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index ccb6712c0538..a2b264b358f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityAPI
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionData
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsCompactChat
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -15,6 +16,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -40,7 +42,7 @@ object ChocolateFactoryBarnManager {
         if (!LorenzUtils.inSkyBlock) return
 
         HoppityEggsManager.newRabbitFound.matchMatcher(event.message) {
-            val profileStorage = profileStorage ?: return
+            val profileStorage = profileStorage ?: return@matchMatcher
             profileStorage.currentRabbits += 1
             trySendBarnFullMessage(inventory = false)
             HoppityEggsManager.shareWaypointPrompt()
@@ -58,6 +60,14 @@ object ChocolateFactoryBarnManager {
             ChocolateAmount.addToAll(amount)
             HoppityEggsCompactChat.compactChat(event, lastDuplicateAmount = amount)
             HoppityAPI.attemptFireRabbitFound(lastDuplicateAmount = amount)
+
+            if (hoppityConfig.showDuplicateNumber && !hoppityConfig.compactChat) {
+                (HoppityCollectionStats.getRabbitCount(HoppityAPI.getLastRabbit()) - 1).takeIf { it > 1 }?.let {
+                    event.chatComponent = ChatComponentText(
+                        event.message.replace("§7§lDUPLICATE RABBIT!", "§7§lDUPLICATE RABBIT! §7(Duplicate §b#$it§7)§r"),
+                    )
+                }
+            }
         }
 
         rabbitCrashedPattern.matchMatcher(event.message) {

From 1052203d26f8ded5d7a1b1eb25a32e0ce2e6c784 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:03:18 +0200
Subject: [PATCH 516/721] Feature: Carry Tracker (#2185)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigManager.kt          |   1 +
 .../skyhanni/config/commands/Commands.kt      |  23 +-
 .../config/features/misc/MiscConfig.java      |   3 +
 .../skyhanni/data/OtherPlayersSlayerAPI.kt    |  36 ++
 .../data/jsonobjects/repo/CarryTrackerJson.kt |   8 +
 .../events/entity/slayer/SlayerDeathEvent.kt  |   6 +
 .../skyhanni/features/misc/CarryTracker.kt    | 326 ++++++++++++++++++
 7 files changed, 391 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CarryTrackerJson.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/entity/slayer/SlayerDeathEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index 4ac3f7925ce5..bf0f2ba0a4a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -104,6 +104,7 @@ class ConfigManager {
         // commands
         "features.garden.GardenConfig.cropSpeedMeterPos",
         "features.misc.MiscConfig.collectionCounterPos",
+        "features.misc.MiscConfig.carryPosition",
         "features.misc.MiscConfig.lockedMouseDisplay",
 
         // debug features
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 9b85c2cf9590..cf4679e396d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -64,6 +64,7 @@ import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTrac
 import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseTracker
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
+import at.hannibal2.skyhanni.features.misc.CarryTracker
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
 import at.hannibal2.skyhanni.features.misc.LockMouseLook
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
@@ -183,7 +184,6 @@ object Commands {
         registerCommand("shwords", "Opens the config list for modifying visual words") { openVisualWords() }
     }
 
-
     private fun usersNormal() {
         registerCommand(
             "shmarkplayer",
@@ -192,8 +192,7 @@ object Commands {
         registerCommand("shtrackcollection", "Tracks your collection gain over time") { CollectionTracker.command(it) }
         registerCommand(
             "shcroptime",
-            "Calculates with your current crop per second speed " +
-                "how long you need to farm a crop to collect this amount of items",
+            "Calculates with your current crop per second speed how long you need to farm a crop to collect this amount of items",
         ) { GardenCropTimeCommand.onCommand(it) }
         registerCommand(
             "shcropsin",
@@ -250,8 +249,7 @@ object Commands {
         ) { FarmingWeightDisplay.lookUpCommand(it) }
         registerCommand(
             "shcopytranslation",
-            "Copy the English translation of a message in another language to the clipboard.\n" +
-                "Uses a 2 letter language code that can be found at the end of a translation message.",
+            "Copy the English translation of a message in another language to the clipboard.\n" + "Uses a 2 letter language code that can be found at the end of a translation message.",
         ) { Translator.fromEnglish(it) }
         registerCommand(
             "shtranslate",
@@ -367,8 +365,12 @@ object Commands {
         ) { ColorFormattingHelper.printColorCodeList() }
         registerCommand(
             "shtps",
-            "Informs in chat about the server ticks per second (TPS)."
+            "Informs in chat about the server ticks per second (TPS).",
         ) { TpsCounter.tpsCommand() }
+        registerCommand(
+            "shcarry",
+            "Keep track of carries you do.",
+        ) { CarryTracker.onCommand(it) }
     }
 
     private fun usersBugFix() {
@@ -490,7 +492,7 @@ object Commands {
         ) { SkyBlockIslandTest.onCommand(it) }
         registerCommand(
             "shdebugprice",
-            "Debug different price sources for an item."
+            "Debug different price sources for an item.",
         ) { ItemPriceUtils.debugItemPrice(it) }
         registerCommand(
             "shdebugscoreboard",
@@ -585,9 +587,7 @@ object Commands {
         ) { TitleManager.command(it) }
         registerCommand(
             "shresetconfig",
-            "Reloads the config manager and rendering processors of MoulConfig. " +
-                "This §cWILL RESET §7your config, but also updating the java config files " +
-                "(names, description, orderings and stuff).",
+            "Reloads the config manager and rendering processors of MoulConfig. " + "This §cWILL RESET §7your config, but also updating the java config files " + "(names, description, orderings and stuff).",
         ) { SkyHanniDebugsAndTests.resetConfigCommand() }
         registerCommand(
             "shreadcropmilestonefromclipboard",
@@ -664,8 +664,7 @@ object Commands {
             else -> currentStream
         }
 
-        val switchingToBeta = updateStream == UpdateStream.BETA &&
-            (currentStream != UpdateStream.BETA || !UpdateManager.isCurrentlyBeta())
+        val switchingToBeta = updateStream == UpdateStream.BETA && (currentStream != UpdateStream.BETA || !UpdateManager.isCurrentlyBeta())
         if (switchingToBeta) {
             ChatUtils.clickableChat(
                 "Are you sure you want to switch to beta? These versions may be less stable.",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 03b0bf779f61..9d503c3986be 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -144,6 +144,9 @@ public class MiscConfig {
     @Expose
     public Position collectionCounterPos = new Position(10, 10, false, true);
 
+    @Expose
+    public Position carryPosition = new Position(10, 10, false, true);
+
     @Expose
     @ConfigOption(name = "Brewing Stand Overlay", desc = "Display the item names directly inside the Brewing Stand.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt
new file mode 100644
index 000000000000..0401746c4edb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt
@@ -0,0 +1,36 @@
+package at.hannibal2.skyhanni.data
+
+import at.hannibal2.skyhanni.data.mob.Mob
+import at.hannibal2.skyhanni.events.MobEvent
+import at.hannibal2.skyhanni.events.entity.slayer.SlayerDeathEvent
+import at.hannibal2.skyhanni.features.slayer.SlayerType
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object OtherPlayersSlayerAPI {
+
+    @SubscribeEvent
+    fun onMobDespawn(event: MobEvent.DeSpawn.SkyblockMob) {
+        val mob = event.mob
+
+        // no death, rather despawn because too far away
+        if (mob.baseEntity.health != 0f) return
+
+        if (mob.mobType != Mob.Type.SLAYER) return
+
+        val owner = mob.owner?.ownerName
+        val tier = mob.levelOrTier
+        val name = mob.name
+        val slayerType = SlayerType.getByName(name) ?: run {
+            ErrorManager.logErrorStateWithData(
+                "Unknown slayer type found", "unknown slayer",
+                "name" to name,
+            )
+            return
+        }
+
+        SlayerDeathEvent(slayerType, tier, owner).post()
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CarryTrackerJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CarryTrackerJson.kt
new file mode 100644
index 000000000000..1819b36b9517
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CarryTrackerJson.kt
@@ -0,0 +1,8 @@
+package at.hannibal2.skyhanni.data.jsonobjects.repo
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class CarryTrackerJson(
+    @Expose @SerializedName("slayer_names") val slayerNames: Map<String, List<String>>,
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/slayer/SlayerDeathEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/slayer/SlayerDeathEvent.kt
new file mode 100644
index 000000000000..620e4fb3e703
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/entity/slayer/SlayerDeathEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.entity.slayer
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.slayer.SlayerType
+
+class SlayerDeathEvent(val slayerType: SlayerType, val tier: Int, val owner: String?) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
new file mode 100644
index 000000000000..f70fa58b8517
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
@@ -0,0 +1,326 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.data.jsonobjects.repo.CarryTrackerJson
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.events.entity.slayer.SlayerDeathEvent
+import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils.formatNum
+import at.hannibal2.skyhanni.features.slayer.SlayerType
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.KeyboardManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
+import at.hannibal2.skyhanni.utils.NumberUtil.formatDoubleOrUserError
+import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
+import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * TODO more carry features
+ * save on restart
+ * support for Dungeon, Kuudra, crimson minibosses
+ * average spawn time per slayer customer
+ * change customer name color if offline, onlilne, on your island
+ * show time since last boss died next to slayer customer name
+ * highlight slayer bosses for slayer customers
+ * automatically mark customers with /shmarkplaayers
+ * show a line behind them
+ */
+
+@SkyHanniModule
+object CarryTracker {
+    private val config get() = SkyHanniMod.feature.misc
+
+    private val customers = mutableListOf<Customer>()
+    private val carryTypes = mutableMapOf<String, CarryType>()
+    private var slayerNames = emptyMap<SlayerType, List<String>>()
+
+    private var display = listOf<Renderable>()
+
+    private val patternGroup = RepoPattern.group("carry")
+
+    /**
+     * REGEX-TEST:
+     * §6Trade completed with §r§b[MVP§r§c+§r§b] ClachersHD§r§f§r§6!
+     */
+    private val tradeCompletedPattern by patternGroup.pattern(
+        "trade.completed",
+        "§6Trade completed with (?<name>.*)§r§6!",
+    )
+
+    /**
+     * REGEX-TEST:
+     *  §r§a§l+ §r§6500k coins
+     */
+    private val rawNamePattern by patternGroup.pattern(
+        "trade.coins.gained",
+        " §r§a§l\\+ §r§6(?<coins>.*) coins",
+    )
+
+    @HandleEvent
+    fun onSlayerDeath(event: SlayerDeathEvent) {
+        val slayerType = event.slayerType
+        val tier = event.tier
+        val owner = event.owner
+        for (customer in customers) {
+            if (!customer.name.equals(owner, ignoreCase = true)) continue
+            for (carry in customer.carries) {
+                val type = carry.type as? SlayerCarryType ?: return
+                if (type.slayerType != slayerType) continue
+                if (type.tier != tier) continue
+                carry.done++
+                if (carry.done == carry.requested) {
+                    ChatUtils.chat("Carry done for ${customer.name}!")
+                    LorenzUtils.sendTitle("§eCarry done!", 3.seconds)
+                }
+                update()
+            }
+        }
+    }
+
+    // TODO create trade event with player name, coins and items
+    var lastTradedPlayer = ""
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        tradeCompletedPattern.matchMatcher(event.message) {
+            lastTradedPlayer = group("name").cleanPlayerName()
+        }
+
+        rawNamePattern.matchMatcher(event.message) {
+            val coinsGained = group("coins").formatDouble()
+            getCustomer(lastTradedPlayer).alreadyPaid += coinsGained
+            update()
+        }
+    }
+
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        val data = event.getConstant<CarryTrackerJson>("CarryTracker")
+        slayerNames = data.slayerNames.mapKeys { SlayerType.valueOf(it.key) }
+    }
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+
+        config.carryPosition.renderRenderables(display, posLabel = "Carry Tracker")
+    }
+
+    fun onCommand(args: Array<String>) {
+        if (args.size < 2 || args.size > 3) {
+            ChatUtils.userError("Usage:\n§c/shcarry <customer name> <type> <amount requested>\n§c/shcarry <type> <price per>")
+            return
+        }
+        if (args.size == 2) {
+            setPrice(args[0], args[1])
+            return
+        }
+
+        val customerName = args[0]
+
+        val rawType = args[1]
+        val carryType = getCarryType(rawType) ?: return
+
+        val amountRequested = args[2].formatIntOrUserError() ?: return
+
+        val newCarry = Carry(carryType, amountRequested)
+
+        for (customer in customers) {
+            if (!customer.name.equals(customerName, ignoreCase = true)) continue
+            val carries = customer.carries
+            for (carry in carries.toList()) {
+                if (!newCarry.type.sameType(carry.type)) continue
+                val newAmountRequested = carry.requested + amountRequested
+                if (newAmountRequested < 1) {
+                    ChatUtils.userError("New carry amount requested must be positive!")
+                    return
+                }
+                carries.remove(carry)
+                val updatedCarry = Carry(carryType, newAmountRequested)
+                updatedCarry.done = carry.done
+                carries.add(updatedCarry)
+                update()
+                ChatUtils.chat("Updated carry: §b$customerName §8x$newAmountRequested ${newCarry.type}")
+                return
+            }
+        }
+        if (amountRequested < 1) {
+            ChatUtils.userError("Carry amount requested must be positive!")
+            return
+        }
+
+        val customer = getCustomer(customerName)
+        customer.carries.add(newCarry)
+        update()
+        ChatUtils.chat("Started carry: §b$customerName §8x$amountRequested ${newCarry.type}")
+    }
+
+    private fun getCarryType(rawType: String): CarryType? = carryTypes.getOrPut(rawType) {
+        createCarryType(rawType) ?: run {
+            ChatUtils.userError("Unknown carry type: '$rawType'! Use e.g. rev5, sven4, eman3, blaze2..")
+            return null
+        }
+    }
+
+    private fun setPrice(rawType: String, rawPrice: String) {
+        val carryType = getCarryType(rawType) ?: return
+
+        val price = rawPrice.formatDoubleOrUserError() ?: return
+        carryType.pricePer = price
+        update()
+        ChatUtils.chat("Set carry price for $carryType §eto §6${price.formatNum()} coins.")
+    }
+
+    private fun getCustomer(customerName: String): Customer {
+        for (customer in customers) {
+            if (customer.name.equals(customerName, ignoreCase = true)) {
+                return customer
+            }
+        }
+        val customer = Customer(customerName)
+        customers.add(customer)
+        return customer
+    }
+
+    private fun CarryType.sameType(other: CarryType): Boolean = name == other.name && tier == other.tier
+
+    private fun update() {
+        val list = mutableListOf<Renderable>()
+        if (customers.none { it.carries.isNotEmpty() }) {
+            display = emptyList()
+            return
+        }
+        list.addString("§c§lCarries")
+        for (customer in customers) {
+            if (customer.carries.isEmpty()) continue
+            addCustomerName(customer, list)
+
+            val carries = customer.carries
+            for (carry in carries) {
+                val requested = carry.requested
+                val done = carry.done
+                val missing = requested - done
+
+                val color = if (done > requested) "§c" else if (done == requested) "§a" else "§e"
+                val cost = formatCost(carry.type.pricePer?.let { it * requested })
+                val text = "$color$done§8/$color$requested $cost"
+                list.add(
+                    Renderable.clickAndHover(
+                        Renderable.string("  ${carry.type} $text"),
+                        tips = buildList {
+                            add("§b${customer.name}' ${carry.type} §cCarry")
+                            add("")
+                            add("§7Requested: §e$requested")
+                            add("§7Done: §e$done")
+                            add("§7Missing: §e$missing")
+                            add("")
+                            if (cost != "") {
+                                add("§7Total cost: §e${cost}")
+                                add("§7Cost per carry: §e${formatCost(carry.type.pricePer)}")
+                            } else {
+                                add("§cNo price set for this carry!")
+                                add("§7Set a price with §e/shcarry <type> <price>")
+                            }
+                            add("")
+                            add("§eClick to send current progress in the party chat!")
+                            add("§eControl-click to remove this carry!")
+                        },
+                        onClick = {
+                            if (KeyboardManager.isModifierKeyDown()) {
+                                carries.remove(carry)
+                                update()
+                            } else {
+                                HypixelCommands.partyChat(
+                                    "${customer.name} ${carry.type.toString().removeColor()} carry: $done/$requested",
+                                )
+                            }
+                        },
+                    ),
+                )
+            }
+        }
+        display = list
+    }
+
+    private fun addCustomerName(customer: Customer, list: MutableList<Renderable>) {
+        val customerName = customer.name
+        val totalCost = customer.carries.sumOf { it.getCost() ?: 0.0 }
+        val totalCostFormat = formatCost(totalCost)
+        if (totalCostFormat != "") {
+            val paidFormat = "§6${customer.alreadyPaid.formatNum()}"
+            val missingFormat = formatCost(totalCost - customer.alreadyPaid)
+            list.add(
+                Renderable.clickAndHover(
+                    Renderable.string("§b$customerName $paidFormat§8/${totalCostFormat}"),
+                    tips = listOf(
+                        "§7Carries for §b$customerName",
+                        "",
+                        "§7Total cost: $totalCostFormat",
+                        "§7Already paid: $paidFormat",
+                        "§7Still missing: $missingFormat",
+                        "",
+                        "§eClick to send missing coins in party chat!",
+                    ),
+                    onClick = {
+                        HypixelCommands.partyChat(
+                            "$customerName Carry: already paid: ${paidFormat.removeColor()}, " + "still missing: ${missingFormat.removeColor()}",
+                        )
+                    },
+                ),
+            )
+
+        } else {
+            list.addString("§b$customerName$totalCostFormat")
+        }
+    }
+
+    private fun Carry.getCost(): Double? {
+        return type.pricePer?.let {
+            requested * it
+        }?.takeIf { it != 0.0 }
+    }
+
+    private fun formatCost(totalCost: Double?): String = if (totalCost == 0.0 || totalCost == null) "" else "§6${totalCost.formatNum()}"
+
+    private fun createCarryType(input: String): CarryType? {
+        if (input.length == 1) return null
+        val rawName = input.dropLast(1).lowercase()
+        val tier = input.last().digitToIntOrNull() ?: return null
+
+        getSlayerType(rawName)?.let {
+            return SlayerCarryType(it, tier)
+        }
+
+        return null
+    }
+
+    private fun getSlayerType(name: String): SlayerType? = slayerNames.entries.find { name in it.value }?.key
+
+    class Customer(
+        val name: String,
+        var alreadyPaid: Double = 0.0,
+        val carries: MutableList<Carry> = mutableListOf(),
+    )
+
+    class Carry(val type: CarryType, val requested: Int, var done: Int = 0)
+
+    abstract class CarryType(val name: String, val tier: Int, var pricePer: Double? = null) {
+        override fun toString(): String = "§d$name $tier"
+    }
+
+    class SlayerCarryType(val slayerType: SlayerType, tier: Int) : CarryType(slayerType.displayName, tier)
+//     class DungeonCarryType(val floor: DungeonFloor, masterMode: Boolean) : CarryType(floor.name, tier)
+}

From 0aa7a605a23f3b1740a481c39ca58835c53d0650 Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:20:10 +0200
Subject: [PATCH 517/721] Feature: Highlight Active Beacon Effect (#2546)

Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |  6 ++
 .../features/inventory/ActiveBeaconEffect.kt  | 69 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/ActiveBeaconEffect.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 062f29b30e33..510f953ca2f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -292,4 +292,10 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean hexAsColorInLore = true;
+
+    @Expose
+    @ConfigOption(name = "Highlight Active Beacon Effect", desc = "Highlights the currently selected beacon effect in the beacon inventory.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean highlightActiveBeaconEffect = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ActiveBeaconEffect.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ActiveBeaconEffect.kt
new file mode 100644
index 000000000000..d0bc67fde543
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ActiveBeaconEffect.kt
@@ -0,0 +1,69 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ActiveBeaconEffect {
+
+    val config get() = SkyHanniMod.feature.inventory
+
+    private val patternGroup = RepoPattern.group("inventory.activebeaconeffect")
+
+    /**
+     * REGEX-TEST: Profile Stat Upgrades
+     */
+    private val inventoryPattern by patternGroup.pattern(
+        "inventory",
+        "Profile Stat Upgrades",
+    )
+
+    /**
+     * REGEX-TEST: §aActive stat boost!
+     */
+    private val slotPattern by patternGroup.pattern(
+        "slot.active",
+        "§aActive stat boost!",
+    )
+
+    private var slot: Int? = null
+
+    @SubscribeEvent
+    fun onInventoryFullyOpened(event: InventoryFullyOpenedEvent) {
+        if (!isEnabled()) return
+        if (!inventoryPattern.matches(event.inventoryName)) {
+            slot = null
+            return
+        }
+
+        slot = event.inventoryItems.filter { (_, stack) ->
+            stack.getLore().any { slotPattern.matches(it) }
+        }.firstNotNullOfOrNull { it.key }
+    }
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        slot = null
+    }
+
+    @SubscribeEvent
+    fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+        if (!isEnabled()) return
+        val slot = slot ?: return
+
+        event.gui.inventorySlots.getSlot(slot) highlight LorenzColor.GREEN
+    }
+
+    fun isEnabled() = IslandType.PRIVATE_ISLAND.isInIsland() && config.highlightActiveBeaconEffect
+}

From aca98055728de99808e5d07c4ca1aea72773e703 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:24:57 +0200
Subject: [PATCH 518/721] added docs to InventoryFullyOpenedEvent

---
 .../skyhanni/events/InventoryFullyOpenedEvent.kt      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt
index d786445fbf5e..5374b95d3c2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt
@@ -26,6 +26,17 @@ open class InventoryOpenEvent(private val inventory: OtherInventoryData.Inventor
     val fullyOpenedOnce: Boolean get() = inventory.fullyOpenedOnce
 }
 
+/**
+ * This event is getting fired after every slot in the newly opened inventory has item data.
+ *
+ * New inventory data gets first sent as an empty inventory from the server.
+ * Item stack slot information is sent afterwards, sometimes with a short delay.
+ *
+ * This approach is faster than to wait a fix duration after the inventory open packet is detected.
+ *
+ * Since this logic only works via packets, and the player inventory (pressing E) is client side,
+ * this event does not get fired when opening the invenotory via pressingE.
+ */
 class InventoryFullyOpenedEvent(inventory: OtherInventoryData.Inventory) : InventoryOpenEvent(inventory)
 
 class InventoryUpdatedEvent(inventory: OtherInventoryData.Inventory) : InventoryOpenEvent(inventory)

From 824716488f4c73d16458cad82bb13dd5b1008fdd Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:33:00 +0200
Subject: [PATCH 519/721] Feature: Excavator Tooltip Hider (#2539)

---
 .../mining/FossilExcavatorConfig.java         |  8 +++++++
 .../features/inventory/HarpFeatures.kt        |  2 +-
 .../fossilexcavator/ExcavatorTooltipHider.kt  | 22 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
index 176c8f3bda35..8dfb12854232 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
@@ -36,4 +36,12 @@ public class FossilExcavatorConfig {
     @FeatureToggle
     public boolean glacitePowderStack = false;
 
+    @Expose
+    @ConfigOption(
+        name = "Hide Excavator Tooltips",
+        desc = "Hides tooltips of items inside of the Fossil Excavator."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideExcavatorTooltips = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
index 75b1d6ad3cd3..a79a66717320 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
@@ -213,6 +213,6 @@ object HarpFeatures {
         if (!config.hideMelodyTooltip) return
         if (!isHarpGui(InventoryUtils.openInventoryName())) return
         if (event.slot.inventory !is ContainerLocalMenu) return
-            event.cancel()
+        event.cancel()
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt
new file mode 100644
index 000000000000..8b58402cdd63
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt
@@ -0,0 +1,22 @@
+package at.hannibal2.skyhanni.features.mining.fossilexcavator
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import net.minecraft.client.player.inventory.ContainerLocalMenu
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ExcavatorTooltipHider {
+
+    private val config get() = SkyHanniMod.feature.mining.fossilExcavator
+
+    @SubscribeEvent
+    fun onTooltip(event: LorenzToolTipEvent) {
+        if (!isEnabled()) return
+        if (event.slot.inventory !is ContainerLocalMenu) return
+        event.cancel()
+    }
+
+    fun isEnabled() = FossilExcavatorAPI.inInventory && !FossilExcavatorAPI.inExcavatorMenu && config.hideExcavatorTooltips
+}

From 9db106b981b827ea254ca7dbe8cd924dc90375eb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:34:28 +0200
Subject: [PATCH 520/721] formatting

---
 .../skyhanni/features/inventory/HarpFeatures.kt        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
index a79a66717320..d6d79b31a710 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
@@ -44,15 +44,15 @@ object HarpFeatures {
     private val patternGroup = RepoPattern.group("harp")
     private val inventoryTitlePattern by patternGroup.pattern(
         "inventory",
-        "Harp.*"
+        "Harp.*",
     )
     private val menuTitlePattern by patternGroup.pattern(
         "menu",
-        "Melody.*"
+        "Melody.*",
     )
     private val songSelectedPattern by patternGroup.pattern(
         "song.selected",
-        "§aSong is selected!"
+        "§aSong is selected!",
     )
 
     private fun isHarpGui(chestName: String) = inventoryTitlePattern.matches(chestName)
@@ -77,7 +77,7 @@ object HarpFeatures {
                 37 + index,
                 2,
                 3,
-                Minecraft.getMinecraft().thePlayer
+                Minecraft.getMinecraft().thePlayer,
             ) // middle clicks > left clicks
             lastClick = SimpleTimeMark.now()
             break
@@ -181,7 +181,7 @@ object HarpFeatures {
                 it,
                 event.clickedButton,
                 event.clickType,
-                Minecraft.getMinecraft().thePlayer
+                Minecraft.getMinecraft().thePlayer,
             )
         }
     }

From d2072b83949b90bd7c2f5bfa6bd0c08941953879 Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Sat, 21 Sep 2024 22:13:15 +0100
Subject: [PATCH 521/721] Feature: Force locale for Number Formatting (#2563)

---
 .../skyhanni/config/features/dev/DevConfig.java          | 7 +++++++
 src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt  | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
index b62c88efc61f..6daf37cfda74 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
@@ -108,6 +108,13 @@ public class DevConfig {
     @ConfigEditorBoolean
     public boolean fancySbaContributors = false;
 
+    @Expose
+    @ConfigOption(
+        name = "Number Format Override",
+        desc = "Forces the number format to use the en_US locale.")
+    @ConfigEditorBoolean
+    public boolean numberFormatOverride = false;
+
     @Expose
     @Category(name = "Minecraft Console", desc = "Minecraft Console Settings")
     public MinecraftConsoleConfig minecraftConsoles = new MinecraftConsoleConfig();
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index b97298ce43dd..4d5fe0a1dd6f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -1,14 +1,18 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import java.text.NumberFormat
+import java.util.Locale
 import java.util.TreeMap
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
 object NumberUtil {
 
+    private val config get() = SkyHanniMod.feature
+
     private val suffixes = TreeMap<Long, String>().apply {
         this[1000L] = "k"
         this[1000000L] = "M"
@@ -109,7 +113,10 @@ object NumberUtil {
         return this.toString() + this.ordinal()
     }
 
-    fun Number.addSeparators() = NumberFormat.getNumberInstance().format(this)
+    fun Number.addSeparators(): String {
+        return if (!config.dev.numberFormatOverride) NumberFormat.getNumberInstance().format(this)
+        else NumberFormat.getNumberInstance(Locale.US).format(this)
+    }
 
     fun String.romanToDecimalIfNecessary() = toIntOrNull() ?: romanToDecimal()
 

From 1ae2d448cc34c20c34c0aee1a97bdd01801a6b66 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:14:34 +0200
Subject: [PATCH 522/721] Fix: ReforgeAPI fix hard crash for unkown stat
 (#2562)

---
 .../java/at/hannibal2/skyhanni/api/ReforgeAPI.kt   | 14 +++++++++++++-
 .../hannibal2/skyhanni/data/model/SkyblockStat.kt  |  6 ++++++
 .../skyhanni/utils/json/SkyHanniTypeAdapters.kt    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
index 987a864af77e..534d38d47c82 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.model.SkyblockStat
 import at.hannibal2.skyhanni.data.model.SkyblockStatList
 import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
@@ -176,7 +177,18 @@ object ReforgeAPI {
                     while (reader.hasNext()) {
                         val name = reader.nextName()
                         val value = reader.nextDouble()
-                        list[SkyblockStat.valueOf(name.uppercase())] = value
+
+                        val stat = SkyblockStat.getValueOrNull(name.uppercase()) ?: run {
+                            ErrorManager.logErrorStateWithData(
+                                "Unknown stat: '${name.uppercase()}'",
+                                "Stat list could not parse stat",
+                                "failed" to name.uppercase(),
+                                betaOnly = true,
+                            )
+                            continue
+                        }
+
+                        list[stat] = value
                     }
                     reader.endObject()
                     return list
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index 182309634f72..f31c95958659 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -53,6 +53,8 @@ enum class SkyblockStat(val icon: String) {
 
     FEAR("§a☠"),
     HEAT_RESISTANCE("§c♨"),
+
+    UNKNOWN("§c?")
     ;
 
     val capitalizedName = name.lowercase().allLettersFirstUppercase()
@@ -65,6 +67,10 @@ enum class SkyblockStat(val icon: String) {
         val fontSizeOfLargestIcon by lazy {
             entries.maxOf { Minecraft.getMinecraft().fontRendererObj.getStringWidth(it.icon) } + 1
         }
+
+        fun getValueOrNull(string: String): SkyblockStat? = entries.firstOrNull { it.name == string }
+
+        fun getValue(string: String): SkyblockStat = getValueOrNull(string) ?: UNKNOWN
     }
 }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
index 2048be522061..13aec1d92b6a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
@@ -67,7 +67,7 @@ object SkyHanniTypeAdapters {
 
     val SKYBLOCK_STAT: TypeAdapter<SkyblockStat> = SimpleStringTypeAdapter(
         { name.lowercase() },
-        { SkyblockStat.valueOf(this.uppercase()) },
+        { SkyblockStat.getValue(this.uppercase()) },
     )
 
     val TRACKER_DISPLAY_MODE = SimpleStringTypeAdapter.forEnum<SkyHanniTracker.DefaultDisplayMode>()

From fa8096a38e7364f7912361f81df4127ad7a231dd Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sat, 21 Sep 2024 23:37:15 +0200
Subject: [PATCH 523/721] Fix: Experiments Profit Tracker & Superpairs Data
 (#2560)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../ExperimentsProfitTracker.kt               | 54 ++++++++++---------
 .../SuperpairExperimentInformationDisplay.kt  | 19 ++++---
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
index 16c0305cbedd..7b6fa9bc5f1e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.features.inventory.experimentationtable.Experimenta
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
@@ -42,6 +43,7 @@ import com.google.gson.annotations.Expose
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.absoluteValue
+import kotlin.time.Duration.Companion.milliseconds
 
 @SkyHanniModule
 object ExperimentsProfitTracker {
@@ -98,29 +100,12 @@ object ExperimentsProfitTracker {
         if (!isEnabled()) return
 
         val message = event.message.removeColor()
-        if (claimMessagePattern.matches(message) && ExperimentMessages.DONE.isSelected())
+        if (claimMessagePattern.matches(message) && ExperimentMessages.DONE.isSelected()) {
             event.blockedReason = "CLAIM_MESSAGE"
+        }
 
         experimentsDropPattern.matchMatcher(message) {
-            val reward = group("reward")
-
-            event.blockedReason = when {
-                enchantingExpPattern.matches(reward) && ExperimentMessages.EXPERIENCE.isSelected() -> "EXPERIENCE_DROP"
-                experienceBottlePattern.matches(reward) && ExperimentMessages.BOTTLES.isSelected() -> "BOTTLE_DROP"
-                listOf("Metaphysical Serum", "Experiment The Fish").contains(reward) && ExperimentMessages.MISC.isSelected() -> "MISC_DROP"
-                ExperimentMessages.ENCHANTMENTS.isSelected() -> "ENCHANT_DROP"
-                else -> ""
-            }
-
-            enchantingExpPattern.matchMatcher(reward) {
-                tracker.modify {
-                    it.xpGained += group("amount").substringBefore(",").toInt() * 1000
-                }
-                return
-            }
-
-            val internalName = NEUInternalName.fromItemNameOrNull(reward) ?: return
-            if (!experienceBottlePattern.matches(group("reward"))) tracker.addItem(internalName, 1, false)
+            event.handleDrop(group("reward"))
             return
         }
 
@@ -132,6 +117,27 @@ object ExperimentsProfitTracker {
         }
     }
 
+    private fun LorenzChatEvent.handleDrop(reward: String) {
+        blockedReason = when {
+            enchantingExpPattern.matches(reward) && ExperimentMessages.EXPERIENCE.isSelected() -> "EXPERIENCE_DROP"
+            experienceBottlePattern.matches(reward) && ExperimentMessages.BOTTLES.isSelected() -> "BOTTLE_DROP"
+            listOf("Metaphysical Serum", "Experiment The Fish").contains(reward) && ExperimentMessages.MISC.isSelected() -> "MISC_DROP"
+            ExperimentMessages.ENCHANTMENTS.isSelected() -> "ENCHANT_DROP"
+            else -> ""
+        }
+
+        enchantingExpPattern.matchMatcher(reward) {
+            tracker.modify {
+                it.xpGained += group("amount").substringBefore(",").toInt() * 1000
+            }
+            return
+        }
+
+        val internalName = NEUInternalName.fromItemNameOrNull(reward) ?: return
+        if (!experienceBottlePattern.matches(reward)) tracker.addItem(internalName, 1, false)
+        else DelayedRun.runDelayed(100.milliseconds) { handleExpBottles(true) }
+    }
+
     @SubscribeEvent
     fun onItemClick(event: ItemClickEvent) {
         if (event.clickType == ClickType.RIGHT_CLICK) {
@@ -177,9 +183,6 @@ object ExperimentsProfitTracker {
                 it.experimentsDone++
             }
         }
-        if (ExperimentationTableAPI.inTable && InventoryUtils.openInventoryName() == "Superpairs Rewards") {
-            handleExpBottles(true)
-        }
     }
 
     private fun drawDisplay(data: Data): List<Searchable> = buildList {
@@ -230,6 +233,7 @@ object ExperimentsProfitTracker {
             if (internalName.asString() !in listOf("EXP_BOTTLE", "GRAND_EXP_BOTTLE", "TITANIC_EXP_BOTTLE")) continue
             currentBottlesInInventory.addOrPut(internalName, item.stackSize)
         }
+
         for ((internalName, amount) in currentBottlesInInventory) {
             val lastInInv = lastBottlesInInventory.getOrDefault(internalName, 0)
             if (lastInInv >= amount) {
@@ -237,6 +241,7 @@ object ExperimentsProfitTracker {
                 lastBottlesInInventory[internalName] = amount
                 continue
             }
+
             if (lastInInv == 0) {
                 currentBottlesInInventory[internalName] = 0
                 lastBottlesInInventory[internalName] = amount
@@ -253,6 +258,5 @@ object ExperimentsProfitTracker {
     private fun ExperimentMessages.isSelected() = config.hideMessages.contains(this)
 
     private fun isEnabled() =
-        LorenzUtils.inSkyBlock && config.enabled
-            && ExperimentationTableAPI.inDistanceToTable(LorenzVec.getBlockBelowPlayer(), 5.0)
+        LorenzUtils.inSkyBlock && config.enabled && ExperimentationTableAPI.inDistanceToTable(LorenzVec.getBlockBelowPlayer(), 5.0)
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
index 21bc6052e099..86d7fca50ad9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
@@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
 
 @SkyHanniModule
+// TODO important: all use cases of listOf in combination with string needs to be gone. no caching, constant new list creation, and bad design.
 object SuperpairExperimentInformationDisplay {
 
     private val config get() = SkyHanniMod.feature.inventory.experimentationTable
@@ -30,6 +31,7 @@ object SuperpairExperimentInformationDisplay {
     data class Item(val index: Int, val name: String)
     data class ItemPair(val first: Item, val second: Item)
 
+    // TODO remove string. use enum instead! maybe even create new data type instaed of map of pairs
     private var found = mutableMapOf<Pair<Item?, ItemPair?>, String>()
 
     private var toCheck = mutableListOf<Pair<Int, Int>>()
@@ -60,7 +62,7 @@ object SuperpairExperimentInformationDisplay {
     @SubscribeEvent
     fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!isEnabled()) return
-        config.superpairDisplayPosition.renderStrings(display, posLabel = "Sperpair Experiment Information")
+        config.superpairDisplayPosition.renderStrings(display, posLabel = "Superpair Experiment Information")
         display = checkItems(toCheck)
     }
 
@@ -133,6 +135,8 @@ object SuperpairExperimentInformationDisplay {
                 ?: return else lastClicked.find { it.second == uncovered } ?: return
 
         val lastItem = InventoryUtils.getItemAtSlotIndex(lastSlotClicked.first) ?: return
+        val itemClicked = InventoryUtils.getItemAtSlotIndex(slot) ?: return
+
         val lastItemName = convertToReward(lastItem)
 
         if (isWaiting(lastItemName)) return
@@ -145,7 +149,7 @@ object SuperpairExperimentInformationDisplay {
                 uncoveredAt += 1
             }
 
-            hasFoundPair(slot, lastSlotClicked.first, reward, lastItemName) -> handleFoundPair(
+            hasFoundPair(slot, lastSlotClicked.first, reward, lastItemName) && lastItem.itemDamage == itemClicked.itemDamage -> handleFoundPair(
                 slot,
                 reward,
                 lastSlotClicked.first,
@@ -166,7 +170,7 @@ object SuperpairExperimentInformationDisplay {
 
         found[pair] = "Pair"
         found.entries.removeIf {
-            it.value == "Match" && right(it.key).first.name == reward
+            it.value == "Match" && right(it.key).first.index == slot
         }
         found.entries.removeIf {
             it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == lastSlotClicked)
@@ -177,10 +181,10 @@ object SuperpairExperimentInformationDisplay {
         val match = uncoveredItems.find { it.second == reward }?.first ?: return
         val pair = toEither(ItemPair(Item(slot, reward), Item(match, reward)))
 
-        found[pair] = "Match"
-        found.entries.removeIf {
-            it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == match)
-        }
+        if (found.none {
+                listOf("Pair", "Match").contains(it.value) && (right(it.key).first.index == slot)
+            }) found[pair] = "Match"
+        found.entries.removeIf { it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == match) }
     }
 
     private fun handleNormalReward(slot: Int, reward: String) {
@@ -262,6 +266,7 @@ object SuperpairExperimentInformationDisplay {
     private fun isOutOfBounds(slot: Int, experiment: Experiment): Boolean =
         slot <= experiment.startSlot || slot >= experiment.endSlot || (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2)
 
+    // TODO remove left and right, use custom data type instead
     private fun left(it: Pair<Item?, ItemPair?>): Item = it.first ?: Item(-1, "")
 
     private fun right(it: Pair<Item?, ItemPair?>): ItemPair = it.second ?: ItemPair(Item(-1, ""), Item(-1, ""))

From d3c4106dbd1d22b952992eb0c5705ff036a56c96 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sun, 22 Sep 2024 00:30:36 +0200
Subject: [PATCH 524/721] Backend: Renderable Wrapped String Internal
 Alignement (#2372)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/utils/renderables/Renderable.kt  | 33 ++++++++++++-------
 .../utils/renderables/RenderableUtils.kt      |  6 ++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 9a9cc2adc9d2..d161cf2b0eeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -438,23 +438,27 @@ interface Renderable {
             color: Color = Color.WHITE,
             horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
             verticalAlign: VerticalAlignment = VerticalAlignment.CENTER,
+            internalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
         ) = object : Renderable {
 
-            val list by lazy {
-                Minecraft.getMinecraft().fontRendererObj.listFormattedStringToWidth(
+            val fontRenderer by lazy { Minecraft.getMinecraft().fontRendererObj }
+
+            val map by lazy {
+                fontRenderer.listFormattedStringToWidth(
                     text, (width / scale).toInt(),
-                )
+                ).associateWith { fontRenderer.getStringWidth(it) }
             }
 
-            override val width by lazy {
-                if (list.size == 1) {
-                    (Minecraft.getMinecraft().fontRendererObj.getStringWidth(text) * scale).toInt() + 1
-                } else {
-                    width
-                }
+            override val width by lazy { (rawWidth * scale).toInt() + 1 }
+
+            val rawWidth by lazy {
+                if (map.size == 1)
+                    map.entries.first().value
+                else
+                    map.maxOf { it.value }
             }
 
-            override val height by lazy { list.size * ((9 * scale).toInt() + 1) }
+            override val height by lazy { map.size * ((9 * scale).toInt() + 1) }
             override val horizontalAlign = horizontalAlign
             override val verticalAlign = verticalAlign
 
@@ -464,8 +468,13 @@ interface Renderable {
                 val fontRenderer = Minecraft.getMinecraft().fontRendererObj
                 GlStateManager.translate(1.0, 1.0, 0.0)
                 GlStateManager.scale(scale, scale, 1.0)
-                list.forEachIndexed { index, text ->
-                    fontRenderer.drawStringWithShadow(text, 0f, index * 10.0f, color.rgb)
+                map.entries.forEachIndexed { index, (text, size) ->
+                    fontRenderer.drawStringWithShadow(
+                        text,
+                        RenderableUtils.calculateAlignmentXOffset(size, rawWidth, internalAlign).toFloat(),
+                        index * 10.0f,
+                        color.rgb,
+                    )
                 }
                 GlStateManager.scale(inverseScale, inverseScale, 1.0)
                 GlStateManager.translate(-1.0, -1.0, 0.0)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
index 9200b467a20e..64c1d8f86b6a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -39,6 +39,12 @@ internal object RenderableUtils {
         } ?: listOf(yPadding))
     }
 
+    fun calculateAlignmentXOffset(width: Int, xSpace: Int, alignment: HorizontalAlignment) = when (alignment) {
+        HorizontalAlignment.CENTER -> (xSpace - width) / 2
+        HorizontalAlignment.RIGHT -> xSpace - width
+        else -> 0
+    }
+
     private fun calculateAlignmentXOffset(renderable: Renderable, xSpace: Int) = when (renderable.horizontalAlign) {
         HorizontalAlignment.LEFT -> 0
         HorizontalAlignment.CENTER -> (xSpace - renderable.width) / 2

From 857edca75b49a36d73628bbe9b11850ac6233f94 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 22 Sep 2024 00:49:53 +0200
Subject: [PATCH 525/721] Removed: Forge GFS (#2564)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/mining/MiningConfig.java  |  6 --
 .../skyhanni/features/mining/ForgeGfs.kt      | 94 -------------------
 2 files changed, 100 deletions(-)
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 5f242ecd5f47..08c8ec894a71 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -96,10 +96,4 @@ public class MiningConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean highlightYourGoldenGoblin = true;
-
-    @Expose
-    @ConfigOption(name = "Forge GfS", desc = "Get Forge ingredients of a recipe.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean forgeGfs = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
deleted file mode 100644
index 995198674334..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/ForgeGfs.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package at.hannibal2.skyhanni.features.mining
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.api.GetFromSackAPI
-import at.hannibal2.skyhanni.data.SackAPI
-import at.hannibal2.skyhanni.events.GuiContainerEvent
-import at.hannibal2.skyhanni.events.InventoryCloseEvent
-import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
-import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils
-import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.ItemUtils
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NEUInternalName
-import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
-import at.hannibal2.skyhanni.utils.RegexUtils.matches
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraft.client.player.inventory.ContainerLocalMenu
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-@SkyHanniModule
-object ForgeGfs {
-
-    private val patternGroup = RepoPattern.group("mining.forge")
-
-    private val confirmScreenPattern by patternGroup.pattern(
-        "recipe.confirm",
-        "Confirm Process",
-    )
-
-    private val config get() = SkyHanniMod.feature.mining
-
-    private val gfsFakeItem by lazy {
-        ItemUtils.createSkull(
-            displayName = "§aGet items from sacks",
-            uuid = "75ea8094-5152-4457-8c23-1ad9b3c176c0",
-            value = "ewogICJ0aW1lc3RhbXAiIDogMTU5MTMxMDU4NTYwOSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsC" +
-                "iAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogI" +
-                "CJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3" +
-                "RleHR1cmUvODBhMDc3ZTI0OGQxNDI3NzJlYTgwMDg2NGY4YzU3OGI5ZDM2ODg1YjI5ZGFmODM2YjY0YTcwNjg4MmI2ZWMxMCIKICAgIH0KICB9Cn0=",
-            "§8(from SkyHanni)",
-            "§7Click here to try to get all of this",
-            "§7recipe's ingredients from sacks.",
-        )
-    }
-
-    private var showFakeItem = false
-
-    @SubscribeEvent
-    fun onInventoryOpen(event: InventoryUpdatedEvent) {
-        if (!isEnabled()) return
-        if (!confirmScreenPattern.matches(event.inventoryName)) return
-
-        showFakeItem = true
-    }
-
-    @SubscribeEvent
-    fun onInventoryClose(event: InventoryCloseEvent) {
-        showFakeItem = false
-    }
-
-    @SubscribeEvent
-    fun replaceItem(event: ReplaceItemEvent) {
-        if (event.inventory is ContainerLocalMenu && showFakeItem && event.slot == 53) {
-            event.replace(gfsFakeItem)
-        }
-    }
-
-    @SubscribeEvent
-    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
-        if (!isEnabled()) return
-        if (!showFakeItem || event.slotId != 53) return
-
-        event.cancel()
-
-        val itemMap: MutableMap<NEUInternalName, Int> = LinkedHashMap()
-        // Search for the first 4 columns only
-        // Normally would be 3, but the gemstone mixture is the only one that overflows to 4
-
-        for (i in CollectionUtils.takeColumn(0, 53, 0, 4)) {
-            val currentItem = event.container.getSlot(i).stack
-            val currItemInternalName = currentItem.getInternalNameOrNull() ?: continue
-            if (SackAPI.sackListInternalNames.contains(currItemInternalName.asString())) {
-                itemMap.addOrPut(currItemInternalName, currentItem.stackSize)
-            }
-        }
-
-        GetFromSackAPI.getFromSack(itemMap.map { it.key.makePrimitiveStack(it.value) })
-    }
-
-    fun isEnabled() = LorenzUtils.inSkyBlock && config.forgeGfs
-}

From ad247a94a9d7186b670c834ebf88c5426c7b1c88 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 22 Sep 2024 01:03:58 +0200
Subject: [PATCH 526/721] Version 0.27 Beta 11

---
 docs/CHANGELOG.md                             | 19 +++++++++++++++++++
 docs/FEATURES.md                              |  6 ++++++
 root.gradle.kts                               |  2 +-
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d351445de428..5f65761d0f01 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -16,6 +16,7 @@
 + Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
 + Added Tracker for Glacite Corpses. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
     + Tracks overall loot and loot per type.
++ Hides tooltips of items inside the Fossil Excavator in Glacite Tunnels. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2539)
 
 #### Rift Features
 
@@ -122,6 +123,10 @@
 + Added Broodmother spawn alert, countdown and stage change messages. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
     + Countdown will not show until a spawning stage change is observed, and may be off by a few seconds.
 + Added Broodmother support to the Damage Indicator. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
++ Added Carry Tracker. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2185)
+    + Use `/shcarry` to add carries to a customer, and set a price for a slayer boss.
+    + Automatically counts slayer bosses you carry.
+    + Automatically tracks coins received from customers via `/trade`.
 
 #### Fishing Features
 
@@ -145,6 +150,7 @@
 + Added option to hide pet nametag text. - Empa + j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1880)
 + Added Transfer Cooldown Prevention. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/1751)
     + Wait for the transfer cooldown to complete before sending commands like warp/is/hub.
++ Added highlighting for the active Beacon Effect. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2546)
 
 ### Improvements
 
@@ -205,6 +211,7 @@
 + Chocolate Factory: Shows "time to next milestone" instead of "max milestone" when you are at Prestige 6. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2503)
 + Added the required chocolate amount to the tooltip of milestone rabbits in Hoppity's Collection. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2523)
 + Improved the responsiveness of Hoppity Chat Compacting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
++ Added the ability to see how many duplicates you have previously found in Hoppity messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2556)
 
 #### Combat Improvements
 
@@ -246,6 +253,7 @@
     + Search works in all SkyHanni Trackers and the Sack Display.
     + In your inventory, hover over the GUI with your mouse, then start typing to search.
 + Improved the performance of pathfinding logic in Area Navigation. - nea (https://github.com/hannibal002/SkyHanni/pull/2537)
++ Added a toggle to force the `en_US` locale for number formatting. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2563)
 
 ### Fixes
 
@@ -276,6 +284,7 @@
 + Fixed "click to show tunnel map" from the Glacite Mines commission menu appearing in the inventory. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2485)
 + Fixed Mouse Keys not working as Wardrobe Slot Hotkeys. - j10a1n15, ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2506)
 + Fixed Estimated Item Value incorrectly showing all Kuudra armor as starred. - Luna (https://github.com/hannibal002/SkyHanni/pull/2550)
++ Fixed Experiments Profit Tracker & Superpair Data. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2560)
 
 #### Mining Fixes
 
@@ -295,6 +304,8 @@
 + Fixed Sky Mall perks not being read correctly after the Hypixel update. - Luna (https://github.com/hannibal002/SkyHanni/pull/2551)
 + Fixed Mining Commission Blocks Color not working properly with Connected Textures. - Empa (https://github.com/hannibal002/SkyHanni/pull/2553)
 + Fixed Gemstone Gauntlet item category. - Luna (https://github.com/hannibal002/SkyHanni/pull/2534)
++ Fixed Glacite powder being tracked as Glacite in Corpse Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2557)
++ Fixed "Mining Commissions Block Color" disabling OptiFine connected textures. - nopo (https://github.com/hannibal002/SkyHanni/pull/2559)
 
 #### Scoreboard Fixes
 
@@ -380,6 +391,8 @@
 + Fixed lag spikes in Path Finder. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2525)
 + Fixed old mayor perks not being marked as inactive when the mayor changes. - Luna (https://github.com/hannibal002/SkyHanni/pull/2524)
 + Fixed direct GitHub downloads triggering the source checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2548)
++ Fixed reforge display not working with new mining stats. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2555)
++ Fixed Totem of Corruption expiry warning not working in some cases. - Luna (https://github.com/hannibal002/SkyHanni/pull/2554)
 
 ### Technical Details
 
@@ -430,6 +443,10 @@
 + Added options to the graph node list to hide nodes with certain tags. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2537)
 + Removed the use of `LorenzChatEvent()` for 'manually' adding data to Hoppity Chat Compact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
     + Now uses `EggFoundEvent()`.
++ The Renderable Wrapped String now has an option to align text inside the wrapped string box. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2372)
++ Improved handling of unknown stats for ReforgeAPI. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2562)
++ Added `AreaChangeEvent`. - Empa (https://github.com/hannibal002/SkyHanni/pull/2535)
++ Updated `HandleEvent` to allow `onlyOnIsland` usage for a single island without brackets. - Empa (https://github.com/hannibal002/SkyHanni/pull/2535)
 
 ### Removed Features
 
@@ -437,6 +454,8 @@
     + Artist's Abode now sends a lobby-wide message for dye drops, making the notification obsolete.
 + Removed `Only Requirement Not Met` and `Highlight Requirement Rabbits` config options. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
     + Replaced then with a draggable list of different Hoppity collection highlight options.
++ Removed "Forge GfS". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2564)
+    + Hypixel now pulls directly from sacks when using the forge.
 
 ## Version 0.26
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index e3c68e43d602..22223bf303e4 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -864,6 +864,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Option to show the walls also when inside the Nucleus.
 + Fossil Excavator Solver. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1427)
     + Shows where to next click for optimal chance of solving the fossil. If there is a fossil this will find it within 18 moves.
++ Hides tooltips of items inside the Fossil Excavator in Glacite Tunnels. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2539)
 + Excavation Profit Tracker. - hannibal2 + Empa (https://github.com/hannibal002/SkyHanni/pull/1432)
     + Count all drops you gain while excavating in the Fossil Research Center.
     + Track Glacite Powder gained as well (no profit, but progress).
@@ -1337,6 +1338,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892)
     + Useful when using a Prismarine Blade in Stranded Mode.
 + Added Beacon Power Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1901)
++ Added highlighting for the active Beacon Effect. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2546)
 + Added Hide Useless Armor Stands. - Empa (https://github.com/hannibal002/SkyHanni/pull/1962)
     + Hides armor stands that briefly appear on Hypixel.
 + **Custom Wardrobe**, a new look for the wardrobe. - j10an15, Empa (https://github.com/hannibal002/SkyHanni/pull/2039)
@@ -1379,6 +1381,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added option to hide pet nametag text. - Empa + j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1880)
 + Added Transfer Cooldown Prevention. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/1751)
     + Wait for the transfer cooldown to complete before sending commands like warp/is/hub.
++ Added Carry Tracker. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2185)
+    + Use `/shcarry` to add carries to a customer, and set a price for a slayer boss.
+    + Automatically counts slayer bosses you carry.
+    + Automatically tracks coins received from customers via `/trade`.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 4c8333a202c6..84a371098d90 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.10"
+    version = "0.27.Beta.11"
 }
 
 preprocess {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 41552ba66982..35f083580184 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.10",
+    version = "0.27.Beta.11",
 )
 class SkyHanniMod {
 

From e1b9ba327a4569e31728cbcbee217cbf72ec2e8d Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 23 Sep 2024 00:40:07 +0200
Subject: [PATCH 527/721] Fix: Stonks of stonks auction on auction (#2572)

---
 .../skyhanni/features/inventory/StockOfStonkFeature.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt
index 4bc8af1e3e56..f905eb5a532c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/StockOfStonkFeature.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.InventoryOpenEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.transformAt
+import at.hannibal2.skyhanni.utils.ConditionalUtils.transformIf
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -20,7 +21,6 @@ object StockOfStonkFeature {
 
     private val repoGroup = RepoPattern.group("inventory.stockofstonks")
 
-
     /**
      * REGEX-TEST: Stonks Auction
      */
@@ -42,7 +42,7 @@ object StockOfStonkFeature {
      */
     private val topPattern by repoGroup.pattern(
         "top",
-        "§5§o§7§7▶ §c§lTOP (?<rank>[\\d,]+)§7 - §5Stock of Stonks §8x(?<amount>\\d+)",
+        "§5§o§7§.▶ §c§lTOP (?<rank>[\\d,]+)§7 - §5Stock of Stonks §8x(?<amount>\\d+)",
     )
 
     /**
@@ -85,7 +85,7 @@ object StockOfStonkFeature {
             }
             bidPattern.matchMatcher(line) {
                 val cost = group("amount").replace(",", "").toLong()
-                val ratio = cost / stonksReward
+                val ratio = cost / stonksReward.transformIf({ this == 0 }, { 1 })
                 event.toolTip[index - 1] = line + " §7(§6§6${ratio.addSeparators()} §7per)" // double §6 for the replacement at the end
                 if (ratio < bestRatio) {
                     bestValueIndex = index - 1

From e60a7adf98a37ba13ce1caf372f3a6f9895c5da6 Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Mon, 23 Sep 2024 05:15:58 +0100
Subject: [PATCH 528/721] Fix: Great Glacite Lake detection (#2565)

---
 src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt           | 2 +-
 .../skyhanni/features/misc/discordrpc/DiscordLocationKey.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 35855fc612d5..91b7e4b79350 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -41,7 +41,7 @@ import kotlin.time.Duration.Companion.seconds
 object MiningAPI {
 
     private val group = RepoPattern.group("data.miningapi")
-    private val glaciteAreaPattern by group.pattern("area.glacite", "Glacite Tunnels|Glacite Lake")
+    private val glaciteAreaPattern by group.pattern("area.glacite", "Glacite Tunnels|Great Glacite Lake")
     private val dwarvenBaseCampPattern by group.pattern("area.basecamp", "Dwarven Base Camp")
 
     // TODO rename to include suffix "pattern", add regex test
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
index 96759bc7d2e5..895a04688f80 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
@@ -159,7 +159,7 @@ object DiscordLocationKey {
 
         "Dwarven Base Camp" to "glacite-tunnels",
         "Fossil Research Center" to "glacite-tunnels",
-        "Glacite Lake" to "glacite-tunnels",
+        "Great Glacite Lake" to "glacite-tunnels",
         "Glacite Mineshafts" to "glacite-tunnels",
     ) // maps sublocations to their broader image
 

From 4b34113c86f824000bbe9eebb5cc3fcdfe56b9ba Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 23 Sep 2024 00:17:59 -0400
Subject: [PATCH 529/721] Backend: Add Helper Text to `/shtestmessage` (#2568)

---
 .../hannibal2/skyhanni/test/command/TestChatCommand.kt   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
index e9d8d61453cd..fbb28b2724b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TestChatCommand.kt
@@ -12,7 +12,14 @@ object TestChatCommand {
 
     fun command(args: Array<String>) {
         if (args.isEmpty()) {
-            ChatUtils.userError("Specify a chat message to test!")
+            val syntaxStrings = listOf(
+                "§7Syntax: §e/shtestmessage §7<§e-chat message§7> §7[-lines] [-complex] [-clipboard] [-s]",
+                "   §7[-lines]§e: §7Split the message into multiple by newlines",
+                "   §7[-complex]§e: §7Parse the message as a JSON chat component",
+                "   §7[-clipboard]§e: §7Read the message from the clipboard",
+                "   §7[-s]§e: §7Hide the output message",
+            )
+            ChatUtils.userError("Specify a chat message to test!\n${syntaxStrings.joinToString("\n")}")
             return
         }
 

From 8f7b79a0b4953bb64f342ccc21d962c8aacbc169 Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <thatgravyboat@gmail.com>
Date: Mon, 23 Sep 2024 02:51:37 -0230
Subject: [PATCH 530/721] Backend: Add blossom and make source checker show
 version again (#2558)

---
 build.gradle.kts                                           | 7 +++++++
 root.gradle.kts                                            | 1 +
 settings.gradle.kts                                        | 1 +
 src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt         | 2 +-
 .../hannibal2/skyhanni/tweaker/DownloadSourceChecker.java  | 5 ++---
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e8464ada27e8..447387f86a72 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
     kotlin("plugin.power-assert")
     `maven-publish`
     id("moe.nea.shot") version "1.0.0"
+    id("net.kyori.blossom")
 }
 
 val target = ProjectTarget.values().find { it.projectPath == project.path }!!
@@ -312,12 +313,18 @@ if (!MultiVersionStage.activeState.shouldCompile(target)) {
         onlyIf { false }
     }
 }
+
 preprocess {
     vars.put("MC", target.minecraftVersion.versionNumber)
     vars.put("FORGE", if (target.forgeDep != null) 1 else 0)
     vars.put("JAVA", target.minecraftVersion.javaVersion)
     patternAnnotation.set("at.hannibal2.skyhanni.utils.compat.Pattern")
 }
+
+blossom {
+    replaceToken("@MOD_VERSION@", version)
+}
+
 val sourcesJar by tasks.creating(Jar::class) {
     destinationDirectory.set(layout.buildDirectory.dir("badjars"))
     archiveClassifier.set("src")
diff --git a/root.gradle.kts b/root.gradle.kts
index 84a371098d90..627d155ee866 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -3,6 +3,7 @@ import com.replaymod.gradle.preprocess.Node
 
 plugins {
     id("dev.deftu.gradle.preprocess") version "0.6.1"
+    id("net.kyori.blossom") version "1.3.2" apply false
     id("gg.essential.loom") version "1.6.+" apply false
     kotlin("jvm") version "2.0.0" apply false
     kotlin("plugin.power-assert") version "2.0.0" apply false
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aaf0f02cf6d6..adee2acba161 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,6 +14,7 @@ pluginManagement {
         maven("https://repo.nea.moe/releases")
         maven("https://repo.sk1er.club/repository/maven-releases/")
         maven("https://maven.deftu.dev/releases")
+        maven("https://maven.teamresourceful.com/repository/maven-private/") // Blossom
         maven("https://jitpack.io") {
             content {
                 includeGroupByRegex("(com|io)\\.github\\..*")
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 35f083580184..45d02f5445f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.27.Beta.11",
+    version = "@MOD_VERSION@",
 )
 class SkyHanniMod {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
index 5672ee87cd7e..63a92849bc62 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
@@ -14,6 +14,7 @@
 
 public class DownloadSourceChecker {
 
+    private static final String MOD_VERSION = "@MOD_VERSION@";
     private static final String GITHUB_REPO = "511310721";
     private static final String GITHUB_REPO_TEXT = "repo_id=" + GITHUB_REPO;
     private static final String MODRINTH_URL = "/data/byNkmv5G/";
@@ -95,12 +96,10 @@ private static void openMenu(URI host) {
             }
         ));
 
-        // TODO FIX THIS CAUSING CLASS LOADING AND CRASHING
-        //String version = SkyHanniMod.Companion.getVersion();
         JOptionPane.showOptionDialog(
             frame,
             String.format(String.join("\n", SECURITY_POPUP), uriToSimpleString(host)),
-            "SkyHanni Security Error",
+            "SkyHanni " + MOD_VERSION + " Security Error",
             JOptionPane.DEFAULT_OPTION,
             JOptionPane.ERROR_MESSAGE,
             null,

From b0735ffc3ed655838de6d0d0eb6376cde92483d1 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:48:19 +1000
Subject: [PATCH 531/721] Backend: Create and use primitive recipe and
 ingredient (#2460)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/bingo/FirstMinionTier.kt         | 13 +++--
 .../features/bingo/MinionCraftHelper.kt       | 18 +++----
 .../garden/visitor/GardenVisitorFeatures.kt   |  8 +--
 .../garden/visitor/GardenVisitorSupercraft.kt | 10 ++--
 .../inventory/craft/CraftableItemList.kt      |  6 +--
 .../items/EstimatedItemValueCalculator.kt     |  9 ++--
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  2 +-
 .../skyhanni/utils/ItemPriceUtils.kt          |  7 ++-
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 10 ++--
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   | 25 ++++-----
 .../skyhanni/utils/PrimitiveIngredient.kt     | 26 +++++++++
 .../skyhanni/utils/PrimitiveRecipe.kt         | 53 +++++++++++++++++++
 12 files changed, 126 insertions(+), 61 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
index e4bae4f05f8d..e94fb8d840d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt
@@ -1,13 +1,12 @@
 package at.hannibal2.skyhanni.features.bingo
 
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NEUInternalName
-import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getCachedIngredients
+import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+import at.hannibal2.skyhanni.utils.PrimitiveRecipe
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
 
 object FirstMinionTier {
 
@@ -30,20 +29,20 @@ object FirstMinionTier {
     ) {
         for (minionId in tierOneMinionsFiltered) {
             for (recipe in NEUItems.getRecipes(minionId)) {
-                if (recipe !is CraftingRecipe) continue
+                if (!recipe.isCraftingRecipe()) continue
                 checkOne(recipe, help, minions, minionId)
             }
         }
     }
 
     private fun checkOne(
-        recipe: CraftingRecipe,
+        recipe: PrimitiveRecipe,
         help: Map<NEUInternalName, Int>,
         minions: MutableMap<String, NEUInternalName>,
         minionId: NEUInternalName,
     ) {
-        if (recipe.getCachedIngredients().any { help.contains(it.internalItemId.asInternalName()) }) {
-            val name = recipe.output.itemStack.name.removeColor()
+        if (recipe.getCachedIngredients().any { help.contains(it.internalName) }) {
+            val name = recipe.output?.internalName?.getItemStackOrNull()?.displayName?.removeColor() ?: return
             val abc = name.replace(" I", " 0")
             minions[abc] = minionId.replace("_1", "_0")
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index c12bafc39ea3..dbec4ea5788c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -24,7 +24,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
 import net.minecraft.client.Minecraft
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -139,7 +138,7 @@ object MinionCraftHelper {
 
             for (recipe in recipes) {
                 for (ingredient in recipe.getCachedIngredients()) {
-                    val ingredientInternalName = ingredient.internalItemId.asInternalName()
+                    val ingredientInternalName = ingredient.internalName
                     if (ingredientInternalName == internalName) return true
 
                     val ingredientPrimitive = NEUItems.getPrimitiveMultiplier(ingredientInternalName)
@@ -169,10 +168,10 @@ object MinionCraftHelper {
 
             if (internalName.contains("_GENERATOR_")) {
                 for (recipe in NEUItems.getRecipes(internalName)) {
-                    if (recipe !is CraftingRecipe) continue
+                    if (!recipe.isCraftingRecipe()) continue
 
                     for (ingredient in recipe.getCachedIngredients()) {
-                        val id = ingredient.internalItemId.asInternalName()
+                        val id = ingredient.internalName
                         if (!id.contains("_GENERATOR_") && !allIngredients.contains(id)) {
                             allIngredients.add(id)
                         }
@@ -194,13 +193,12 @@ object MinionCraftHelper {
         newDisplay.add(minionName)
         val nextMinionId = minionId.addOneToId()
         for (recipe in NEUItems.getRecipes(nextMinionId)) {
-            if (recipe !is CraftingRecipe) continue
-            val output = recipe.output
-            val internalItemId = output.internalItemId.asInternalName()
-            if (!internalItemId.contains("_GENERATOR_")) continue
+            if (!recipe.isCraftingRecipe()) continue
+            val output = recipe.output ?: continue
+            if (!output.internalName.contains("_GENERATOR_")) continue
             val map = mutableMapOf<NEUInternalName, Int>()
-            for (input in recipe.inputs) {
-                val itemId = input.internalItemId.asInternalName()
+            for (input in recipe.ingredients) {
+                val itemId = input.internalName
                 if (minionId != itemId) {
                     val count = input.count.toInt()
                     val old = map.getOrDefault(itemId, 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index aed4f7e7cffc..2e8d789660ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -46,7 +46,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
-import at.hannibal2.skyhanni.utils.NEUItems.allIngredients
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -250,13 +249,14 @@ object GardenVisitorFeatures {
 
         val ingredients = NEUItems.getRecipes(internalName)
             // TODO describe what this line does
-            .firstOrNull() { !it.allIngredients().first().internalItemId.contains("PEST") }
-            ?.allIngredients() ?: emptySet()
+            .firstOrNull { !it.ingredients.first().internalName.contains("PEST") }
+            ?.ingredients ?: emptySet()
         if (ingredients.isEmpty()) return
 
+        // TODO change key to NEUInternalName
         val requiredIngredients = mutableMapOf<String, Int>()
         for (ingredient in ingredients) {
-            val key = ingredient.internalItemId
+            val key = ingredient.internalName.asString()
             requiredIngredients[key] =
                 requiredIngredients.getOrDefault(key, 0) + ingredient.count.toInt()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
index f441d17ab6a1..26bfa7f26409 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
@@ -8,14 +8,11 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.HypixelCommands
-import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
-import at.hannibal2.skyhanni.utils.NEUItems.allIngredients
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraftforge.fml.common.eventhandler.EventPriority
@@ -74,11 +71,12 @@ object GardenVisitorSupercraft {
     private fun getSupercraftForSacks(internalName: NEUInternalName, amount: Int) {
         val ingredients = NEUItems.getRecipes(internalName)
             // TODO describe what this line does
-            .firstOrNull { !it.allIngredients().first().internalItemId.contains("PEST") }
-            ?.allIngredients() ?: return
+            .firstOrNull { !it.ingredients.first().internalName.contains("PEST") }
+            ?.ingredients ?: return
+        // TODO change key to NEUInternalName
         val ingredientReqs = mutableMapOf<String, Int>()
         for (ingredient in ingredients) {
-            val key = ingredient.internalItemId
+            val key = ingredient.internalName.asString()
             ingredientReqs[key] = ingredientReqs.getOrDefault(key, 0) + ingredient.count.toInt()
         }
         hasIngredients = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
index 6b841f5a40d0..8612c9795cfc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
@@ -20,12 +20,12 @@ import at.hannibal2.skyhanni.utils.NEUItems.isVanillaItem
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.toPrimitiveStackOrNull
+import at.hannibal2.skyhanni.utils.PrimitiveRecipe
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.floor
 
@@ -71,7 +71,7 @@ object CraftableItemList {
 
             val recipes = NEUItems.getRecipes(internalName)
             for (recipe in recipes) {
-                if (recipe !is CraftingRecipe) continue
+                if (!recipe.isCraftingRecipe()) continue
                 val renderable = createItemRenderable(recipe, availableMaterial, pricePer, internalName) ?: continue
                 lines[internalName] = renderable
             }
@@ -79,7 +79,7 @@ object CraftableItemList {
     }
 
     private fun createItemRenderable(
-        recipe: CraftingRecipe,
+        recipe: PrimitiveRecipe,
         availableMaterial: Map<NEUInternalName, Long>,
         pricePer: MutableMap<NEUInternalName, Double>,
         internalName: NEUInternalName,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 953809b963d9..81e12f91349a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -20,13 +20,13 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
-import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getRawCraftCostOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getArmorDye
@@ -58,7 +58,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasJalapenoBook
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.hasWoodSingularity
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
-import io.github.moulberry.notenoughupdates.recipes.Ingredient
 import io.github.notenoughupdates.moulconfig.observer.Property
 import net.minecraft.item.ItemStack
 import java.util.Locale
@@ -889,12 +888,12 @@ object EstimatedItemValueCalculator {
 
             val previousTotal = totalPrice
             for (ingredients in slot.value) {
-                val ingredient = Ingredient(NEUItems.manager, ingredients)
+                val ingredient = PrimitiveIngredient(ingredients)
 
-                totalPrice += if (ingredient.isCoins) {
+                totalPrice += if (ingredient.isCoin()) {
                     ingredient.count
                 } else {
-                    ingredient.internalItemId.asInternalName().getPrice() * ingredient.count
+                    ingredient.internalName.getPrice() * ingredient.count
                 }
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 045ce5bce1c2..32b287cb96a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -449,7 +449,7 @@ object SkyHanniDebugsAndTests {
     }
 
     @SubscribeEvent
-    fun onSHowCraftPrice(event: LorenzToolTipEvent) {
+    fun onShowCraftPrice(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!debugConfig.showCraftPrice) return
         val price = event.itemStack.getInternalNameOrNull()?.getRawCraftCostOrNull() ?: return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
index b12f3640e07f..66775b2d63fb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt
@@ -9,18 +9,17 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getRecipes
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 
 object ItemPriceUtils {
 
     fun NEUInternalName.getPrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ) = getPriceOrNull(priceSource, pastRecipes) ?: 0.0
 
     fun NEUInternalName.getPriceOrNull(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ): Double? {
         when (this) {
             NEUInternalName.JASPER_CRYSTAL -> return 0.0
@@ -60,7 +59,7 @@ object ItemPriceUtils {
     // NEUItems.manager.auctionManager.getCraftCost(asString())?.craftCost
     fun NEUInternalName.getRawCraftCostOrNull(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ): Double? = getRecipes(this).filter { it !in pastRecipes }
         .map { it.getRecipePrice(priceSource, pastRecipes + it) }
         .filter { it >= 0 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index cc1a4362b070..ac35c07418ba 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
-import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -20,7 +19,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import com.google.common.collect.Lists
-import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import io.github.moulberry.notenoughupdates.util.NotificationHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
@@ -463,19 +461,19 @@ object ItemUtils {
         return list
     }
 
-    fun neededItems(recipe: NeuRecipe): Map<NEUInternalName, Int> {
+    fun neededItems(recipe: PrimitiveRecipe): Map<NEUInternalName, Int> {
         val neededItems = mutableMapOf<NEUInternalName, Int>()
         for (ingredient in recipe.ingredients) {
-            val material = ingredient.internalItemId.asInternalName()
+            val material = ingredient.internalName
             val amount = ingredient.count.toInt()
             neededItems.addOrPut(material, amount)
         }
         return neededItems
     }
 
-    fun NeuRecipe.getRecipePrice(
+    fun PrimitiveRecipe.getRecipePrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ): Double = neededItems(this).map {
         it.key.getPrice(priceSource, pastRecipes) * it.value
     }.sum()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 81eb2968cce3..34d491ceea81 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -30,9 +30,6 @@ import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import io.github.moulberry.notenoughupdates.events.ProfileDataLoadedEvent
 import io.github.moulberry.notenoughupdates.overlays.AuctionSearchOverlay
 import io.github.moulberry.notenoughupdates.overlays.BazaarSearchOverlay
-import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
-import io.github.moulberry.notenoughupdates.recipes.Ingredient
-import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
 import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery
 import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
@@ -57,8 +54,8 @@ object NEUItems {
 
     val manager: NEUManager get() = NotEnoughUpdates.INSTANCE.manager
     private val multiplierCache = mutableMapOf<NEUInternalName, PrimitiveItemStack>()
-    private val recipesCache = mutableMapOf<NEUInternalName, Set<NeuRecipe>>()
-    private val ingredientsCache = mutableMapOf<NeuRecipe, Set<Ingredient>>()
+    private val recipesCache = mutableMapOf<NEUInternalName, Set<PrimitiveRecipe>>()
+    private val ingredientsCache = mutableMapOf<PrimitiveRecipe, Set<PrimitiveIngredient>>()
     private val itemIdCache = mutableMapOf<Item, List<NEUInternalName>>()
 
     private val hypixelApiGson by lazy {
@@ -183,7 +180,7 @@ object NEUItems {
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
     fun NEUInternalName.getPrice(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ): Double = getPriceNew(priceSource, pastRecipes)
 
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
@@ -198,11 +195,11 @@ object NEUItems {
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
     fun NEUInternalName.getPriceOrNull(
         priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY,
-        pastRecipes: List<NeuRecipe> = emptyList(),
+        pastRecipes: List<PrimitiveRecipe> = emptyList(),
     ): Double? = this.getPriceOrNullNew(priceSource, pastRecipes)
 
     @Deprecated("Moved to ItemPriceUtils", ReplaceWith(""))
-    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<NeuRecipe> = emptyList()): Double? =
+    fun NEUInternalName.getRawCraftCostOrNull(pastRecipes: List<PrimitiveRecipe> = emptyList()): Double? =
         getRawCraftCostOrNullNew(ItemPriceSource.BAZAAR_INSTANT_BUY, pastRecipes)
 
     fun NEUInternalName.getItemStackOrNull(): ItemStack? = ItemResolutionQuery(manager)
@@ -309,12 +306,12 @@ object NEUItems {
             return internalName.makePrimitiveStack()
         }
         for (recipe in getRecipes(internalName)) {
-            if (recipe !is CraftingRecipe) continue
+            if (!recipe.isCraftingRecipe()) continue
 
             val map = mutableMapOf<NEUInternalName, Int>()
             for (ingredient in recipe.getCachedIngredients()) {
                 val count = ingredient.count.toInt()
-                var internalItemId = ingredient.internalItemId.asInternalName()
+                var internalItemId = ingredient.internalName
                 // ignore cactus green
                 if (internalName == "ENCHANTED_CACTUS_GREEN".asInternalName() && internalItemId == "INK_SACK-2".asInternalName()) {
                     internalItemId = "CACTUS".asInternalName()
@@ -356,13 +353,13 @@ object NEUItems {
         return result
     }
 
-    fun getRecipes(internalName: NEUInternalName): Set<NeuRecipe> {
+    fun getRecipes(internalName: NEUInternalName): Set<PrimitiveRecipe> {
         return recipesCache.getOrPut(internalName) {
-            manager.getRecipesFor(internalName.asString())
+            PrimitiveRecipe.convertMultiple(manager.getRecipesFor(internalName.asString())).toSet()
         }
     }
 
-    fun NeuRecipe.getCachedIngredients() = ingredientsCache.getOrPut(this) { allIngredients() }
+    fun PrimitiveRecipe.getCachedIngredients() = ingredientsCache.getOrPut(this) { ingredients }
 
     fun neuHasFocus(): Boolean {
         if (AuctionSearchOverlay.shouldReplace()) return true
@@ -391,6 +388,4 @@ object NEUItems {
         val jsonObject = ConfigManager.gson.fromJson(jsonString, JsonObject::class.java)
         return manager.jsonToStack(jsonObject, false)
     }
-
-    fun NeuRecipe.allIngredients(): Set<Ingredient> = ingredients
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
new file mode 100644
index 000000000000..e8d1edefcc44
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
@@ -0,0 +1,26 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.SKYBLOCK_COIN
+import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import io.github.moulberry.notenoughupdates.recipes.Ingredient
+
+class PrimitiveIngredient(val internalName: NEUInternalName, val count: Double = 1.0) {
+
+    constructor(internalName: NEUInternalName, count: Int) : this(internalName, count.toDouble())
+
+    constructor(ingredientIdentifier: String) : this(
+        ingredientIdentifier.substringBefore(':').asInternalName(),
+        ingredientIdentifier.substringAfter(':').toDoubleOrNull() ?: 1.0,
+    )
+
+    companion object {
+        fun coinIngredient(count: Double = 1.0) = PrimitiveIngredient(SKYBLOCK_COIN, count)
+
+        fun fromNeuIngredient(neuIngredient: Ingredient) = PrimitiveIngredient(neuIngredient.internalItemId.asInternalName(), neuIngredient.count)
+    }
+
+    fun isCoin() = internalName == SKYBLOCK_COIN
+
+
+    override fun toString() = "$internalName x$count"
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt
new file mode 100644
index 000000000000..f064183ba372
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt
@@ -0,0 +1,53 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.utils.RecipeType.CRAFTING
+import io.github.moulberry.notenoughupdates.recipes.EssenceUpgrades
+import io.github.moulberry.notenoughupdates.recipes.ForgeRecipe
+import io.github.moulberry.notenoughupdates.recipes.ItemShopRecipe
+import io.github.moulberry.notenoughupdates.recipes.KatRecipe
+import io.github.moulberry.notenoughupdates.recipes.MobLootRecipe
+import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
+import io.github.moulberry.notenoughupdates.recipes.VillagerTradeRecipe
+
+data class PrimitiveRecipe(
+    val ingredients: Set<PrimitiveIngredient>,
+    val outputs: Set<PrimitiveIngredient>,
+    val recipeType: RecipeType,
+) {
+
+    val output by lazy { outputs.firstOrNull() }
+
+    companion object {
+        fun fromNeuRecipe(neuRecipe: NeuRecipe): PrimitiveRecipe {
+            val ingredients = neuRecipe.ingredients.map { PrimitiveIngredient.fromNeuIngredient(it) }.toSet()
+            val outputs = neuRecipe.outputs.map { PrimitiveIngredient.fromNeuIngredient(it) }.toSet()
+
+            val recipeType = when (neuRecipe::class.java) {
+                ForgeRecipe::class.java -> RecipeType.FORGE
+                VillagerTradeRecipe::class.java -> RecipeType.TRADE
+                EssenceUpgrades::class.java -> RecipeType.ESSENCE
+                MobLootRecipe::class.java -> RecipeType.MOB_DROP
+                ItemShopRecipe::class.java -> RecipeType.NPC_SHOP
+                KatRecipe::class.java -> RecipeType.KAT_UPGRADE
+                else -> CRAFTING
+            }
+
+            return PrimitiveRecipe(ingredients, outputs, recipeType)
+        }
+
+        fun convertMultiple(neuRecipes: Collection<NeuRecipe>) = neuRecipes.map { fromNeuRecipe(it) }
+    }
+
+    fun isCraftingRecipe() = this.recipeType == CRAFTING
+}
+
+enum class RecipeType {
+    FORGE,
+    TRADE,
+    MOB_DROP,
+    NPC_SHOP,
+    KAT_UPGRADE,
+    ESSENCE,
+    CRAFTING,
+    ;
+}

From 143d1521bc3a5ff02e071e0c771aeb5f74e49db8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 08:26:10 +0200
Subject: [PATCH 532/721] added todo

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index 508296d4974c..a710e4fd0e94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -275,6 +275,7 @@ object DungeonFinderFeatures {
         if (!partyFinderTitlePattern.matches(inventoryName)) return map
         inInventory = true
         for ((slot, stack) in event.inventoryItems) {
+            // TODO use enum
             val classNames = mutableListOf("Healer", "Mage", "Berserk", "Archer", "Tank")
             val toolTip = stack.getLore().toMutableList()
             for ((index, line) in stack.getLore().withIndex()) {

From 91dee900cc7bc40db5e936d2e9f2f18dcbbe870f Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 23 Sep 2024 08:26:32 +0200
Subject: [PATCH 533/721] Internal: Shared Live Templates for common structures
 (#2463)

---
 .gitignore                       |   1 +
 .idea/liveTemplates/SkyHanni.xml | 101 +++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 .idea/liveTemplates/SkyHanni.xml

diff --git a/.gitignore b/.gitignore
index d77f4bd8b6f0..7f4081e02e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 !.idea/icon.svg
 !.idea/dictionaries/default_user.xml
 !.idea/scopes/Mixins.xml
+!.idea/liveTemplates/SkyHanni.xml
 .vscode/
 run/
 build/
diff --git a/.idea/liveTemplates/SkyHanni.xml b/.idea/liveTemplates/SkyHanni.xml
new file mode 100644
index 000000000000..08c6737b5ce2
--- /dev/null
+++ b/.idea/liveTemplates/SkyHanni.xml
@@ -0,0 +1,101 @@
+<templateSet group="SkyHanni">
+  <template name="configColor" value="@Expose&#10;@ConfigOption(name = &quot;$Name$&quot;, desc = &quot;$Desc$.&quot;)&#10;@ConfigEditorColour&#10;public String $internalName$ = &quot;0:245:85:255:85&quot;;" description="Template for color config value" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="Color" alwaysStopAt="true" />
+    <variable name="Desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="camelCase(Name)" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="configBool" value="@Expose&#10;@ConfigOption(name = &quot;$Name$&quot;, desc = &quot;$Desc$.&quot;)&#10;@ConfigEditorBoolean&#10;public boolean $internalName$ = $default$;" description="Template for bool config value" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="Color" alwaysStopAt="true" />
+    <variable name="Desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="camelCase(Name)" defaultValue="" alwaysStopAt="false" />
+    <variable name="default" expression="enum(&quot;true&quot;,&quot;false&quot;)" defaultValue="false" alwaysStopAt="true" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="eFun" value="@SubscribeEvent&#10;fun on$EventPre$(event : $Event$) {&#10;&#10;}" description="A Event Function" toReformat="true" toShortenFQNames="true">
+    <variable name="Event" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <variable name="EventPre" expression="capitalize(regularExpression(Event,&quot;Event|\\.&quot;,&quot;&quot;))" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="KOTLIN_CLASS" value="true" />
+      <option name="KOTLIN_OBJECT_DECLARATION" value="true" />
+      <option name="KOTLIN_STATEMENT" value="true" />
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
+  </template>
+  <template name="enabled" value="fun isEnabled() = LorenzUtils.inSkyBlock &amp;&amp; $condition$" description="isEnabled Function for Skyhanni Feature" toReformat="true" toShortenFQNames="true">
+    <variable name="condition" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="KOTLIN_CLASS" value="true" />
+    </context>
+  </template>
+  <template name="configPosition" value="@Expose&#10;@ConfigLink(owner = $owner$.class, field = &quot;$member$&quot;)&#10;private Position $name$ = new Position(20,20);" description="Template for a position" toReformat="false" toShortenFQNames="true">
+    <variable name="name" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
+    <variable name="member" expression="variableOfType(&quot;boolean&quot;)" defaultValue="enable" alwaysStopAt="true" />
+    <variable name="owner" expression="className()" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="&amp;&amp;" value="§" description="Replace &amp;&amp; with §" toReformat="false" toShortenFQNames="true">
+    <context>
+      <option name="OTHER" value="true" />
+    </context>
+  </template>
+  <template name="configKey" value="@Expose&#10;@ConfigOption(name = &quot;$name$&quot;, desc = &quot;$desc$.&quot;)&#10;@ConfigEditorKeybind(defaultKey = Keyboard.$bind$)&#10;public int $internalName$ = Keyboard.$bind$;" description="Tempalte for Keybind config value" toReformat="false" toShortenFQNames="true">
+    <variable name="name" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="bind" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="camelCase(name)" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="configLink" value="@ConfigLink(owner = $owner$.class, field = &quot;$member$&quot;)" description="Auto fill for config link" toReformat="false" toShortenFQNames="true">
+    <variable name="owner" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="member" expression="" defaultValue="" alwaysStopAt="true" />
+  </template>
+  <template name="configAccordion" value="@Expose&#10;@ConfigOption(name = &quot;$Name$&quot;,desc=&quot;&quot;)&#10;@Accordion&#10;public $Class$ $internalName$ = new $Class$();" description="Template for a config accordion" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="Class" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="decapitalize(regularExpression(Class,&quot;Config&quot;,&quot;&quot;))" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="configCategory" value="@Expose&#10;@Category(name = &quot;$Name$&quot;,desc=&quot;$desc$&quot;)&#10;public $Class$ $internalName$ = new $Class$();" description="Template for a config category" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="Class" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="decapitalize(regularExpression(Class,&quot;Config&quot;,&quot;&quot;))" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="fconfig" value="private val config get() = SkyHanniMod.feature" description="Default declartion of feature config" toReformat="true" toShortenFQNames="true">
+    <context>
+      <option name="KOTLIN_OBJECT_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="configSlider" value="@Expose&#10;@ConfigOption(name = &quot;$Name$&quot;, desc = &quot;$Desc$.&quot;)&#10;@ConfigEditorSlider(minValue = 1f,maxValue = 10f,minStep = 1f)&#10;public float $internalName$ = 1f;" description="Template for config slider" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="Color" alwaysStopAt="true" />
+    <variable name="Desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="camelCase(Name)" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+  <template name="configButton" value="@ConfigOption(name = &quot;$Name$&quot;, desc = &quot;$Desc$.&quot;)&#10;@ConfigEditorButton(buttonText = &quot;$Button$&quot;)&#10;public Runnable $internalName$ = () -&gt; $function$;" description="Template for config button" toReformat="false" toShortenFQNames="true">
+    <variable name="Name" expression="" defaultValue="Color" alwaysStopAt="true" />
+    <variable name="Desc" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="Button" expression="" defaultValue="" alwaysStopAt="true" />
+    <variable name="internalName" expression="camelCase(Name)" defaultValue="" alwaysStopAt="false" />
+    <variable name="function" expression="completeSmart()" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="JAVA_DECLARATION" value="true" />
+    </context>
+  </template>
+</templateSet>
\ No newline at end of file

From 478e5c6ac5f587dbf5f6f45f6489cbe37b05fd2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:10:19 +0200
Subject: [PATCH 534/721] Improvement: Glacite Tunnels Area Navigation (#2544)

Co-authored-by: nea <nea@nea.moe>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/api/event/SkyHanniEvent.kt       |  3 +
 .../hannibal2/skyhanni/data/IslandGraphs.kt   | 77 +++++++++++++++++--
 .../hannibal2/skyhanni/events/LorenzEvent.kt  |  5 ++
 .../skyhanni/features/mining/TunnelsMaps.kt   | 10 ++-
 .../skyhanni/features/misc/IslandAreas.kt     |  4 +-
 5 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvent.kt b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvent.kt
index 4f3685c8bdff..c05b438cde20 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvent.kt
@@ -1,5 +1,8 @@
 package at.hannibal2.skyhanni.api.event
 
+/**
+ * Use @[HandleEvent]
+ */
 abstract class SkyHanniEvent protected constructor() {
 
     var isCancelled: Boolean = false
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index ca3143b952ab..9e4639454361 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
@@ -10,23 +11,29 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent
 import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DPathWithWaypoint
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import java.io.File
 import kotlin.math.abs
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * TODO
@@ -101,26 +108,73 @@ object IslandGraphs {
 
     private var fastestPath: Graph? = null
     private var condition: () -> Boolean = { true }
+    private var inGlaciteTunnels: Boolean? = null
+
+    private val patternGroup = RepoPattern.group("data.island.navigation")
+
+    /**
+     * REGEX-TEST: Dwarven Base Camp
+     * REGEX-TEST: Forge
+     * REGEX-TEST: Fossil Research Center
+     */
+    private val glaciteTunnelsPattern by patternGroup.pattern(
+        "glacitetunnels",
+        "(Glacite Tunnels|Dwarven Base Camp|Great Glacite Lake|Fossil Research Center)",
+    )
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
-        reloadFromJson(LorenzUtils.skyBlockIsland)
+        loadIsland(LorenzUtils.skyBlockIsland)
     }
 
     @SubscribeEvent
     fun onIslandChange(event: IslandChangeEvent) {
-        reloadFromJson(event.newIsland)
+        if (currentIslandGraph != null) return
+        if (event.newIsland == IslandType.NONE) return
+        loadIsland(event.newIsland)
     }
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
+        currentIslandGraph = null
         reset()
     }
 
-    private fun reloadFromJson(newIsland: IslandType) {
-        val islandName = newIsland.name
+    fun isGlaciteTunnelsArea(area: String?): Boolean = glaciteTunnelsPattern.matches(area)
+
+    @HandleEvent
+    fun onAreaChange(event: ScoreboardAreaChangeEvent) {
+        if (!IslandType.DWARVEN_MINES.isInIsland()) {
+            inGlaciteTunnels = null
+            return
+        }
+
+        val now = isGlaciteTunnelsArea(LorenzUtils.skyBlockArea)
+        if (inGlaciteTunnels != now) {
+            inGlaciteTunnels = now
+            loadDwarvenMines()
+        }
+    }
+
+    private fun loadDwarvenMines() {
+        if (isGlaciteTunnelsArea(LorenzUtils.skyBlockArea)) {
+            reloadFromJson("GLACITE_TUNNELS")
+        } else {
+            reloadFromJson("DWARVEN_MINES")
+        }
+    }
+
+    private fun loadIsland(newIsland: IslandType) {
+        if (newIsland == IslandType.DWARVEN_MINES) {
+            loadDwarvenMines()
+        } else {
+            reloadFromJson(newIsland.name)
+        }
+    }
+
+    private fun reloadFromJson(islandName: String) {
         val constant = "island_graphs/$islandName"
         val name = "constants/$constant.json"
         val jsonFile = File(SkyHanniMod.repo.repoLocation, name)
@@ -136,6 +190,13 @@ object IslandGraphs {
     fun setNewGraph(graph: Graph) {
         reset()
         currentIslandGraph = graph
+
+        // calling various update functions to make swtiching between deep caverns and glacite tunnels bareable
+        handleTick()
+        IslandAreas.noteMoved()
+        DelayedRun.runDelayed(150.milliseconds) {
+            IslandAreas.updatePosition()
+        }
     }
 
     private fun reset() {
@@ -143,11 +204,16 @@ object IslandGraphs {
         currentTarget = null
         goal = null
         fastestPath = null
+        IslandAreas.display = null
     }
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!LorenzUtils.inSkyBlock) return
+        handleTick()
+    }
+
+    private fun handleTick() {
         val prevClosed = closedNote
 
         val graph = currentIslandGraph ?: return
@@ -294,8 +360,7 @@ object IslandGraphs {
 
         val nodes = graph.nodes
         val potentialSkip =
-            nodes.lastOrNull { it.position.canBeSeen(maxSkipDistance, -1.0) && abs(it.position.y - playerY) <= 2 }
-                ?: return null
+            nodes.lastOrNull { it.position.canBeSeen(maxSkipDistance, -1.0) && abs(it.position.y - playerY) <= 2 } ?: return null
 
         val angleSkip = if (potentialSkip == nodes.first()) {
             false
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
index c895b1058d7c..4a294a6779ca 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
@@ -12,6 +12,11 @@ import at.hannibal2.skyhanni.utils.system.PlatformUtils
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.eventhandler.Event
 import net.minecraftforge.fml.common.eventhandler.IEventListener
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+/**
+ * Use @[SubscribeEvent]
+ */
 
 @Deprecated("Use SkyHanniEvent instead")
 abstract class LorenzEvent : Event() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 847a3673f5ad..5214ff162eb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -81,6 +81,7 @@ object TunnelsMaps {
     private var active: String = ""
 
     private lateinit var fairySouls: Map<String, GraphNode>
+    // TODO what is this? why is there a difference? can this be replaced with GraphNodeTag.GRIND_ORES?
     private lateinit var newGemstones: Map<String, List<GraphNode>>
     private lateinit var oldGemstones: Map<String, List<GraphNode>>
     private lateinit var normalLocations: Map<String, List<GraphNode>>
@@ -221,7 +222,7 @@ object TunnelsMaps {
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
-        graph = event.getConstant<Graph>("TunnelsGraph", gson = Graph.gson)
+        graph = event.getConstant<Graph>("island_graphs/GLACITE_TUNNELS", gson = Graph.gson)
         possibleLocations = graph.groupBy { it.name }.filterNotNullKeys().mapValues { (_, value) ->
             value
         }
@@ -235,7 +236,12 @@ object TunnelsMaps {
                 key.contains("Fairy") -> fairy[key] = value.first()
                 newGemstonePattern.matches(key) -> newGemstone[key] = value
                 oldGemstonePattern.matches(key) -> oldGemstone[key] = value
-                else -> other[key] = value
+                else -> {
+                    // ignore node names without color codes
+                    if (key.removeColor() != key) {
+                        other[key] = value
+                    }
+                }
             }
         }
         fairySouls = fairy
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index 311af056eab0..d5e57d513380 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -41,7 +41,7 @@ object IslandAreas {
 
     private var nodes = mapOf<GraphNode, Double>()
     private var paths = mapOf<GraphNode, Graph>()
-    private var display: Renderable? = null
+    var display: Renderable? = null
     private var targetNode: GraphNode? = null
     private var currentAreaName = ""
     private val textInput = TextInput()
@@ -103,7 +103,7 @@ object IslandAreas {
         }
     }
 
-    private fun updatePosition() {
+    fun updatePosition() {
         display = buildDisplay().buildSearchBox(textInput)
     }
 

From 4fe133f51a84d49ebc3d7444e010c7de474fecef Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:10:48 +0200
Subject: [PATCH 535/721] removed unnecessary debug

---
 .../features/misc/items/EstimatedItemValueCalculator.kt     | 5 -----
 .../java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt    | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 81e12f91349a..b0fbc2f31f83 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -498,11 +498,6 @@ object EstimatedItemValueCalculator {
                 if (remainingStars <= 0) continue
 
                 val price = getPriceFor(prices, remainingStars) ?: return null
-                println(" ")
-                println("price for $id ($remainingStars)")
-                println("price.itemPrice: ${price.itemPrice}")
-                println("essencePrice: ${price.essencePrice}")
-                println("itemPrice: ${price.itemPrice}")
                 finalPrice = finalPrice?.let { it + price } ?: price
                 remainingStars -= prices.size
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
index c63fb7177a14..b4b9f30b1f2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuEssenceCostJson
 import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -16,11 +15,6 @@ object EssenceItemUtils {
     @SubscribeEvent
     fun onNeuRepoReload(event: NeuRepositoryReloadEvent) {
         val unformattedData = event.getConstant<Map<String, NeuEssenceCostJson>>("essencecosts", NeuEssenceCostJson.TYPE)
-
-        ConfigManager.gson.toJson(unformattedData).let {
-            ChatUtils.debug("saved to clipboard!")
-            OSUtils.copyToClipboard(it)
-        }
         this.itemPrices = reformatData(unformattedData)
     }
 

From c24b433a0cfeb662d5ccaf63ff7e4f6a06f9be4a Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:30:53 +1000
Subject: [PATCH 536/721] Fix: Mining Commissions Blocks Color connected
 textures v2 (#2577)

---
 .../mixins/transformers/MixinOptifineConnectedTextures.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
index 9f3087e8e0ed..47ebe4ea63cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
@@ -16,8 +16,8 @@ private static IBlockState modifyGetConnectedTextureMultiPass(IBlockState state)
         return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
     }
 
-    @ModifyArg(method = "getConnectedTexture", at = @At(value = "INVOKE", target = "skipConnectedTexture"))
-    private static IBlockState modifySkipConnectedTexture(IBlockState state) {
+    @ModifyArg(method = "isNeighbour", at = @At(value = "INVOKE", target = "isNeighbour"), index = 4)
+    private static IBlockState modifyIsNeighbour(IBlockState state) {
         return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
     }
 }

From 8edd0070a55d422e6470aaed09ab72d8bc952578 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:45:21 +0200
Subject: [PATCH 537/721] Improvement: Add Pickobulus support to OreMineEvent
 (#2540)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   | 124 ++++++++++++++++--
 .../skyhanni/events/mining/OreMinedEvent.kt   |   2 +-
 .../features/mining/MineshaftPityDisplay.kt   |   7 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   4 +-
 4 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 91b7e4b79350..9d635b1b9a22 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -24,7 +24,9 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAnyIsland
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 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.format
@@ -44,13 +46,44 @@ object MiningAPI {
     private val glaciteAreaPattern by group.pattern("area.glacite", "Glacite Tunnels|Great Glacite Lake")
     private val dwarvenBaseCampPattern by group.pattern("area.basecamp", "Dwarven Base Camp")
 
-    // TODO rename to include suffix "pattern", add regex test
-    private val coldReset by group.pattern(
+    // TODO add regex test
+    private val coldResetPattern by group.pattern(
         "cold.reset",
-        "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7.",
+        "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7\\.",
     )
 
-    private data class MinedBlock(val ore: OreBlock, var confirmed: Boolean, val time: SimpleTimeMark = SimpleTimeMark.now())
+    private val pickbobulusGroup = group.group("pickobulus")
+
+    /**
+     * REGEX-TEST: §aYou used your §r§6Pickobulus §r§aPickaxe Ability!
+     */
+
+    private val pickobulusUsePattern by pickbobulusGroup.pattern(
+        "use",
+        "§aYou used your §r§6Pickobulus §r§aPickaxe Ability!",
+    )
+
+    // TODO add regex test
+    private val pickobulusEndPattern by pickbobulusGroup.pattern(
+        "end",
+        "§7Your §r§aPickobulus §r§7destroyed §r§e(?<amount>[\\d,.]+) §r§7blocks!",
+    )
+
+    /**
+     * REGEX-TEST: §7Your §r§aPickobulus §r§7didn't destroy any blocks!
+     */
+    private val pickobulusFailPattern by pickbobulusGroup.pattern(
+        "fail",
+        "§7Your §r§aPickobulus §r§7didn't destroy any blocks!"
+    )
+
+    private data class MinedBlock(val ore: OreBlock, var confirmed: Boolean) {
+        val time: SimpleTimeMark = SimpleTimeMark.now()
+    }
+
+    // normal mining
+    private val recentClickedBlocks = ConcurrentSet<Pair<LorenzVec, SimpleTimeMark>>()
+    private val surroundingMinedBlocks = ConcurrentLinkedQueue<Pair<MinedBlock, LorenzVec>>()
 
     private var lastInitSound = SimpleTimeMark.farPast()
 
@@ -60,6 +93,18 @@ object MiningAPI {
     private var waitingForEffMinerSound = false
     private var waitingForEffMinerBlock = false
 
+    // pickobulus
+    private var lastPickobulusUse = SimpleTimeMark.farPast()
+    private var lastPickobulusExplosion = SimpleTimeMark.farPast()
+    private var pickobulusExplosionPos: LorenzVec? = null
+    private val pickobulusMinedBlocks = ConcurrentLinkedQueue<Pair<LorenzVec, OreBlock>>()
+
+    private val pickobulusActive get() = lastPickobulusUse.passedSince() < 2.seconds
+
+    private var pickobulusWaitingForSound = false
+    private var pickobulusWaitingForBlock = false
+
+    // oreblock data
     var inGlacite = false
     var inTunnels = false
     var inMineshaft = false
@@ -72,15 +117,15 @@ object MiningAPI {
     var currentAreaOreBlocks = setOf<OreBlock>()
         private set
 
-    private val recentClickedBlocks = ConcurrentSet<Pair<LorenzVec, SimpleTimeMark>>()
-    private val surroundingMinedBlocks = ConcurrentLinkedQueue<Pair<MinedBlock, LorenzVec>>()
     private val allowedSoundNames = setOf("dig.glass", "dig.stone", "dig.gravel", "dig.cloth", "random.orb")
 
     var cold: Int = 0
         private set
 
     var lastColdUpdate = SimpleTimeMark.farPast()
+        private set
     var lastColdReset = SimpleTimeMark.farPast()
+        private set
 
     fun inGlaciteArea() = inGlacialTunnels() || IslandType.MINESHAFT.isInIsland()
 
@@ -128,10 +173,29 @@ object MiningAPI {
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!inColdIsland()) return
-        if (coldReset.matches(event.message)) {
+        if (coldResetPattern.matches(event.message)) {
             updateCold(0)
             lastColdReset = SimpleTimeMark.now()
+            return
         }
+        if (pickobulusUsePattern.matches(event.message)) {
+            lastPickobulusUse = SimpleTimeMark.now()
+            return
+        }
+        if (pickobulusFailPattern.matches(event.message)) {
+            resetPickobulusEvent()
+            pickobulusMinedBlocks.clear()
+            return
+        }
+        pickobulusEndPattern.matchMatcher(event.message) {
+            val amount = group("amount").formatInt()
+            resetPickobulusEvent()
+            val blocks = pickobulusMinedBlocks.take(amount).countBy { it.second }
+            if (blocks.isNotEmpty()) OreMinedEvent(null, blocks).post()
+            pickobulusMinedBlocks.clear()
+            return
+        }
+
     }
 
     @SubscribeEvent
@@ -145,8 +209,18 @@ object MiningAPI {
     @SubscribeEvent
     fun onPlaySound(event: PlaySoundEvent) {
         if (!inCustomMiningIsland()) return
+        if (event.soundName == "random.explode" && lastPickobulusUse.passedSince() < 5.seconds) {
+            lastPickobulusExplosion = SimpleTimeMark.now()
+            pickobulusExplosionPos = event.location
+            pickobulusWaitingForSound = true
+            return
+        }
         if (event.soundName !in allowedSoundNames) return
-        //println("Sound: ${event.soundName} ${event.pitch} ${event.volume} ${event.location.toCleanString()}")
+        if (pickobulusActive && pickobulusWaitingForSound) {
+            pickobulusWaitingForSound = false
+            pickobulusWaitingForBlock = true
+            return
+        }
         if (waitingForInitSound) {
             if (event.soundName != "random.orb" && event.pitch == 0.7936508f) {
                 val pos = event.location.roundLocationToBlock()
@@ -180,10 +254,19 @@ object MiningAPI {
         if (newBlock != Blocks.air && newBlock != Blocks.bedrock && !isTitanium(newState)) return
 
         val pos = event.location
-        if (pos.distanceToPlayer() > 7) return
-        //println("Block change: $oldState -> $newState ${pos.toCleanString()}")
+        if (pickobulusActive && pickobulusWaitingForBlock) {
+            val explosionPos = pickobulusExplosionPos ?: return
+            if (explosionPos.distance(pos) > 15) return
+            val ore = OreBlock.getByStateOrNull(oldState) ?: return
+            if (pickobulusMinedBlocks.any { it.first == pos }) return
+            pickobulusMinedBlocks += pos to ore
+            pickobulusWaitingForBlock = false
+            pickobulusWaitingForSound = true
+            return
+        }
 
         if (lastInitSound.passedSince() > 100.milliseconds) return
+        if (pos.distanceToPlayer() > 7) return
 
         val ore = OreBlock.getByStateOrNull(oldState) ?: return
 
@@ -210,10 +293,13 @@ object MiningAPI {
         recentClickedBlocks.removeIf { it.second.passedSince() >= 20.seconds }
         surroundingMinedBlocks.removeIf { it.first.time.passedSince() >= 20.seconds }
 
-        if (waitingForInitSound) return
-        if (lastInitSound.passedSince() < 200.milliseconds) return
-        // in case the init block is not found
-        resetOreEvent()
+        if (!waitingForInitSound && lastInitSound.passedSince() > 200.milliseconds) {
+            resetOreEvent()
+        }
+        if (!lastPickobulusUse.isFarPast() && lastPickobulusUse.passedSince() > 5.seconds) {
+            resetPickobulusEvent()
+            pickobulusMinedBlocks.clear()
+        }
     }
 
     @HandleEvent
@@ -252,8 +338,10 @@ object MiningAPI {
         lastColdReset = SimpleTimeMark.now()
         recentClickedBlocks.clear()
         surroundingMinedBlocks.clear()
+        pickobulusMinedBlocks.clear()
         currentAreaOreBlocks = setOf()
         resetOreEvent()
+        resetPickobulusEvent()
     }
 
     private fun resetOreEvent() {
@@ -264,6 +352,14 @@ object MiningAPI {
         waitingForEffMinerBlock = false
     }
 
+    private fun resetPickobulusEvent() {
+        lastPickobulusUse = SimpleTimeMark.farPast()
+        lastPickobulusExplosion = SimpleTimeMark.farPast()
+        pickobulusExplosionPos = null
+        pickobulusWaitingForSound = false
+        pickobulusWaitingForBlock = false
+    }
+
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
         event.title("Mining API")
diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/OreMinedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/OreMinedEvent.kt
index a97402a4179a..d74e65eced2a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/mining/OreMinedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/mining/OreMinedEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.mining
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.mining.OreBlock
 
-class OreMinedEvent(val originalOre: OreBlock, val extraBlocks: Map<OreBlock, Int>) : SkyHanniEvent()
+class OreMinedEvent(val originalOre: OreBlock?, val extraBlocks: Map<OreBlock, Int>) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 8497951febb1..ec9a390edff0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -85,9 +85,12 @@ object MineshaftPityDisplay {
     fun onOreMined(event: OreMinedEvent) {
         if (!MiningAPI.inGlacialTunnels()) return
 
-        event.originalOre.getPityBlock()?.let { it.blocksBroken++ }
+        val originalOre = event.originalOre
+        originalOre?.getPityBlock()?.let { it.blocksBroken++ }
         event.extraBlocks.toMutableMap()
-            .apply { addOrPut(event.originalOre, -1) }
+            .apply {
+                if (originalOre != null) addOrPut(originalOre, -1)
+            }
             .map { (block, amount) ->
                 block.getPityBlock()?.let { it.efficientMiner += amount }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 32b287cb96a2..c0c03b6771ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -597,9 +597,9 @@ object SkyHanniDebugsAndTests {
     @HandleEvent(onlyOnSkyblock = true)
     fun onOreMined(event: OreMinedEvent) {
         if (!debugConfig.oreEventMessages) return
-        val originalOre = event.originalOre
+        val originalOre = event.originalOre?.let { "$it " } ?: ""
         val extraBlocks = event.extraBlocks.map { "${it.key.name}: ${it.value}" }
-        ChatUtils.debug("Mined: $originalOre (${extraBlocks.joinToString()})")
+        ChatUtils.debug("Mined: $originalOre(${extraBlocks.joinToString()})")
     }
 
     @SubscribeEvent

From 74490dcdb619e6eadf1be7665871cdaba4d58ee8 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:45:56 +0200
Subject: [PATCH 538/721] Backend: Carry Tracker Number format depending on
 Custom Scoreboard (#2571)

---
 .../at/hannibal2/skyhanni/features/misc/CarryTracker.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
index f70fa58b8517..bfecbc48f57f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.entity.slayer.SlayerDeathEvent
-import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils.formatNum
 import at.hannibal2.skyhanni.features.slayer.SlayerType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -15,6 +14,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDoubleOrUserError
 import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError
@@ -181,7 +181,7 @@ object CarryTracker {
         val price = rawPrice.formatDoubleOrUserError() ?: return
         carryType.pricePer = price
         update()
-        ChatUtils.chat("Set carry price for $carryType §eto §6${price.formatNum()} coins.")
+        ChatUtils.chat("Set carry price for $carryType §eto §6${price.shortFormat()} coins.")
     }
 
     private fun getCustomer(customerName: String): Customer {
@@ -260,7 +260,7 @@ object CarryTracker {
         val totalCost = customer.carries.sumOf { it.getCost() ?: 0.0 }
         val totalCostFormat = formatCost(totalCost)
         if (totalCostFormat != "") {
-            val paidFormat = "§6${customer.alreadyPaid.formatNum()}"
+	            val paidFormat = "§6${customer.alreadyPaid.shortFormat()}"
             val missingFormat = formatCost(totalCost - customer.alreadyPaid)
             list.add(
                 Renderable.clickAndHover(
@@ -293,7 +293,7 @@ object CarryTracker {
         }?.takeIf { it != 0.0 }
     }
 
-    private fun formatCost(totalCost: Double?): String = if (totalCost == 0.0 || totalCost == null) "" else "§6${totalCost.formatNum()}"
+    private fun formatCost(totalCost: Double?): String = if (totalCost == 0.0 || totalCost == null) "" else "§6${totalCost.shortFormat()}"
 
     private fun createCarryType(input: String): CarryType? {
         if (input.length == 1) return null

From d39f595b150aaa0eee32c7ebacb961ef48095924 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:54:16 +1000
Subject: [PATCH 539/721] Backend: Remove more neu code from SkyHanni (#2419)

---
 .github/workflows/illegal-imports.txt         |   3 +-
 .idea/dictionaries/default_user.xml           |   3 +-
 build.gradle.kts                              |   6 +-
 .../events/NeuRepositoryReloadEvent.kt        |   3 +-
 .../skyhanni/features/chat/ChatFilterGui.kt   |  15 +-
 .../combat/ghostcounter/GhostCounter.kt       |   3 +-
 .../features/combat/ghostcounter/GhostUtil.kt |  56 +++-----
 .../features/garden/GardenNextJacobContest.kt |   2 +-
 .../garden/inventory/plots/GardenPlotIcon.kt  |   4 +-
 .../garden/visitor/GardenVisitorSupercraft.kt |   6 +-
 .../HighlightVisitorsOutsideOfGarden.kt       |   5 +-
 .../AuctionHouseOpenPriceWebsite.kt           |   4 +-
 .../bazaar/BazaarOpenPriceWebsite.kt          |   6 +-
 .../skyhanni/features/mining/ColdOverlay.kt   |   4 +-
 .../features/mining/DeepCavernsGuide.kt       |   4 +-
 .../features/misc/UserLuckBreakdown.kt        |  12 +-
 .../features/misc/limbo/LimboPlaytime.kt      |   4 +-
 .../DefaultConfigOptionGui.kt                 |  21 +--
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |   4 +-
 .../features/skillprogress/SkillType.kt       |   4 +-
 .../test/SkyHanniConfigSearchResetCommand.kt  |   2 +-
 .../skyhanni/utils/GuiRenderUtils.kt          | 132 +++++++++++++-----
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  |  56 +++++++-
 .../at/hannibal2/skyhanni/utils/NEUItems.kt   |   3 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  28 ++--
 .../utils/SkyBlockItemModifierUtils.kt        |   3 +-
 .../skyhanni/utils/json/JsonUtils.kt          |  18 +++
 .../hannibal2/skyhanni/utils/json/Shimmy.kt   |  64 +++++++++
 .../skyhanni/utils/renderables/Renderable.kt  |  27 +---
 .../utils/renderables/RenderableTooltips.kt   |   5 +-
 30 files changed, 338 insertions(+), 169 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/json/Shimmy.kt

diff --git a/.github/workflows/illegal-imports.txt b/.github/workflows/illegal-imports.txt
index f53a5da78e25..83354f622960 100644
--- a/.github/workflows/illegal-imports.txt
+++ b/.github/workflows/illegal-imports.txt
@@ -5,7 +5,8 @@
 
 at/hannibal2/skyhanni/ scala.
 at/hannibal2/skyhanni/ jline.
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
 at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.SlotClickEvent
 at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.ReplaceItemEvent
+at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
+at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Utils
 at/hannibal2/skyhanni/ java.util.function.Supplier
diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index cb91301718f0..a0017ca5e3e0 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -254,6 +254,7 @@
       <w>superpairs</w>
       <w>tablist</w>
       <w>terracottas</w>
+      <w>tessellator</w>
       <w>thaumaturgist</w>
       <w>thaumaturgy</w>
       <w>townsquare</w>
@@ -277,4 +278,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
+</component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 447387f86a72..add2df4e77e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -160,9 +160,9 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    // June 3, 2024, 9:30 PM AEST
-    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.3.0
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.3.0:all") {
+    // August 27, 2024, 4:30 PM AEST
+    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.3.3
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.3.3:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
index c2bd261ca0a1..97a3f580c555 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.data.repo.RepoUtils
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.NEUItems.manager
 import at.hannibal2.skyhanni.utils.json.fromJson
+import at.hannibal2.skyhanni.utils.json.getJson
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonSyntaxException
@@ -15,7 +16,7 @@ import java.lang.reflect.Type
 
 class NeuRepositoryReloadEvent : LorenzEvent() {
     fun getConstant(file: String): JsonObject? {
-        return manager.getJsonFromFile(File(manager.repoLocation, "constants/$file.json"))
+        return File(manager.repoLocation, "constants/$file.json").getJson()
     }
 
     inline fun <reified T : Any> readConstant(file: String, gson: Gson = ConfigManager.gson): T {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
index 0fee71849b4f..6a5f22b6635a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
@@ -5,7 +5,8 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils.stripHypixelMessage
-import io.github.moulberry.notenoughupdates.util.Utils
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableTooltips
 import io.github.notenoughupdates.moulconfig.internal.GlScissorStack
 import io.github.notenoughupdates.moulconfig.internal.RenderUtils
 import net.minecraft.client.Minecraft
@@ -42,7 +43,7 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
         GlStateManager.translate(l + 0.0, t + 0.0, 0.0)
         RenderUtils.drawFloatingRectDark(0, 0, w, h)
         GlStateManager.translate(5.0, 5.0 - scroll, 0.0)
-        var mouseX = originalMouseX - l
+        val mouseX = originalMouseX - l
         val isMouseButtonDown = mouseX in 0..w && originalMouseY in t..(t + h) && Mouse.isButtonDown(0)
         var mouseY = originalMouseY - (t - scroll).toInt()
         val sr = ScaledResolution(mc)
@@ -59,7 +60,7 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
                 drawString(
                     mc.fontRendererObj,
                     "§e§lNEW TEXT",
-                    0, 0, -1
+                    0, 0, -1,
                 )
                 size += drawMultiLineText(
                     msg.modified,
@@ -86,8 +87,8 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
         GlScissorStack.pop(sr)
         wasMouseButtonDown = isMouseButtonDown
         GlStateManager.popMatrix()
-        if (queuedTooltip != null) {
-            Utils.drawHoveringText(queuedTooltip, originalMouseX, originalMouseY, width, height, -1, mc.fontRendererObj)
+        queuedTooltip?.let { tooltip ->
+            RenderableTooltips.setTooltipForRender(tooltip.map { Renderable.string(it) })
         }
         GlStateManager.color(1f, 1f, 1f, 1f)
     }
@@ -98,7 +99,7 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
             w - (ChatManager.ActionKind.maxLength + reasonMaxLength + 10 + 10),
             mc.fontRendererObj,
             false,
-            true
+            true,
         )
     }
 
@@ -121,7 +122,7 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
                 line.formattedText,
                 xPos,
                 0,
-                -1
+                -1,
             )
             GlStateManager.translate(0F, 10F, 0F)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 664acbc976f6..85d5778fe25b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -56,7 +56,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import com.google.gson.JsonPrimitive
-import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.moulberry.notenoughupdates.util.XPInformation
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.apache.commons.io.FilenameUtils
@@ -241,7 +240,7 @@ object GhostCounter {
             }
         }
 
-        addAsSingletonList(Utils.chromaStringByColourCode(textFormatting.titleFormat.replace("&", "§")))
+        addAsSingletonList(textFormatting.titleFormat.replace("&", "§"))
         addAsSingletonList(textFormatting.ghostKilledFormat.formatText(KILLS))
         addAsSingletonList(textFormatting.sorrowsFormat.formatText(Option.SORROWCOUNT))
         addAsSingletonList(textFormatting.ghostSinceSorrowFormat.formatText(Option.GHOSTSINCESORROW.getInt()))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
index 6cf777b48cea..d568fc49288f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
-import io.github.moulberry.notenoughupdates.util.Utils
 import java.io.FileReader
 
 object GhostUtil {
@@ -71,7 +70,7 @@ object GhostUtil {
             }
             val json = ConfigManager.gson.fromJson(
                 FileReader(GhostCounter.ghostCounterV3File),
-                com.google.gson.JsonObject::class.java
+                com.google.gson.JsonObject::class.java,
             )
             GhostData.Option.GHOSTSINCESORROW.add(json["ghostsSinceSorrow"].asDouble)
             GhostData.Option.SORROWCOUNT.add(json["sorrowCount"].asDouble)
@@ -91,34 +90,25 @@ object GhostUtil {
 
     fun String.formatText(option: GhostData.Option) = formatText(option.getInt(), option.getInt(true))
 
-    fun String.formatText(value: Int, session: Int = -1) = Utils.chromaStringByColourCode(
-        this.replace("%value%", value.addSeparators())
-            .replace("%session%", session.addSeparators())
-            .replace("&", "§")
-    )
+    fun String.formatText(value: Int, session: Int = -1) = this.replace("%value%", value.addSeparators())
+        .replace("%session%", session.addSeparators())
+        .replace("&", "§")
 
-    fun String.formatText(t: String) = Utils.chromaStringByColourCode(this.replace("%value%", t).replace("&", "§"))
+    fun String.formatText(t: String) = this.replace("%value%", t).replace("&", "§")
 
     fun String.preFormat(t: String, level: Int, nextLevel: Int) = if (nextLevel == 26) {
-        Utils.chromaStringByColourCode(
-            replace("%value%", t)
-                .replace("%display%", "25")
-        )
+        replace("%value%", t).replace("%display%", "25")
     } else {
-        Utils.chromaStringByColourCode(
-            this.replace("%value%", t)
-                .replace(
-                    "%display%",
-                    "$level->${if (SkyHanniMod.feature.combat.ghostCounter.showMax) "25" else nextLevel}"
-                )
-        )
+        this.replace("%value%", t)
+            .replace(
+                "%display%",
+                "$level->${if (SkyHanniMod.feature.combat.ghostCounter.showMax) "25" else nextLevel}",
+            )
     }
 
-    fun String.formatText(value: Double, session: Double) = Utils.chromaStringByColourCode(
-        this.replace("%value%", value.roundToPrecision(2).addSeparators())
-            .replace("%session%", session.roundToPrecision(2).addSeparators())
-            .replace("&", "§")
-    )
+    fun String.formatText(value: Double, session: Double) = this.replace("%value%", value.roundToPrecision(2).addSeparators())
+        .replace("%session%", session.roundToPrecision(2).addSeparators())
+        .replace("&", "§")
 
     fun String.formatBestiary(currentKill: Int, killNeeded: Int): String {
         val bestiaryNextLevel = GhostCounter.storage?.bestiaryNextLevel
@@ -127,17 +117,15 @@ object GhostUtil {
         val nextLevel = bestiaryNextLevel?.let { if (GhostCounter.config.showMax) "25" else "${it.toInt()}" }
             ?: "§cNo Bestiary Level data!"
 
-        return Utils.chromaStringByColourCode(
-            this.replace(
-                "%currentKill%",
-                if (GhostCounter.config.showMax) GhostCounter.bestiaryCurrentKill.addSeparators() else currentKill.addSeparators()
-            )
-                .replace("%percentNumber%", percent(GhostCounter.bestiaryCurrentKill.toDouble()))
-                .replace("%killNeeded%", killNeeded.shortFormat())
-                .replace("%currentLevel%", currentLevel)
-                .replace("%nextLevel%", nextLevel)
-                .replace("&", "§")
+        return this.replace(
+            "%currentKill%",
+            if (GhostCounter.config.showMax) GhostCounter.bestiaryCurrentKill.addSeparators() else currentKill.addSeparators(),
         )
+            .replace("%percentNumber%", percent(GhostCounter.bestiaryCurrentKill.toDouble()))
+            .replace("%killNeeded%", killNeeded.shortFormat())
+            .replace("%currentLevel%", currentLevel)
+            .replace("%nextLevel%", nextLevel)
+            .replace("&", "§")
     }
 
     private fun percent(number: Double) =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 8c2dc9a95e08..ab8820b40fd6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -32,10 +32,10 @@ import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.json.toJsonArray
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import com.google.gson.Gson
 import com.google.gson.JsonPrimitive
-import io.github.moulberry.notenoughupdates.util.toJsonArray
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt
index 1fc378b7e890..01e9f87fb4df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt
@@ -8,10 +8,10 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.editItemInfo
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
@@ -51,7 +51,7 @@ object GardenPlotIcon {
         for ((index, internalName) in plotList) {
             val old = originalStack[index]!!
             val new = internalName.getItemStack()
-            cachedStack[index] = Utils.editItemStackInfo(new, old.displayName, true, *old.getLore().toTypedArray())
+            cachedStack[index] = new.editItemInfo(old.displayName, true, old.getLore())
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
index 26bfa7f26409..f2e4f80fb8f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
@@ -8,12 +8,12 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -30,11 +30,11 @@ object GardenVisitorSupercraft {
 
     private val superCraftItem by lazy {
         val neuItem = "GOLD_PICKAXE".asInternalName().getItemStack()
-        Utils.createItemStack(
+        ItemUtils.createItemStack(
             neuItem.item,
             "§bSuper Craft",
             "§7You have the items to craft",
-            "§7Click me to open the super crafter!"
+            "§7Click me to open the super crafter!",
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index 88ea75b572b9..8a8c11165564 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.garden.visitor
 
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.VisitorBlockBehaviour
+import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson
 import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenVisitor
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
@@ -19,7 +20,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.toLorenzVec
-import io.github.moulberry.notenoughupdates.util.SBInfo
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
@@ -57,7 +57,8 @@ object HighlightVisitorsOutsideOfGarden {
     }
 
     private fun isVisitor(entity: Entity): Boolean {
-        val mode = SBInfo.getInstance().getLocation()
+        // todo migrate to Skyhanni IslandType
+        val mode = HypixelData.mode
         val possibleJsons = visitorJson[mode] ?: return false
         val skinOrType = getSkinOrTypeFor(entity)
         return possibleJsons.any {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/auctionhouse/AuctionHouseOpenPriceWebsite.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/auctionhouse/AuctionHouseOpenPriceWebsite.kt
index b253e01911f2..7229283ca9c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/auctionhouse/AuctionHouseOpenPriceWebsite.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/auctionhouse/AuctionHouseOpenPriceWebsite.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
@@ -13,7 +14,6 @@ import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.EventPriority
@@ -48,7 +48,7 @@ object AuctionHouseOpenPriceWebsite {
         }
     }
 
-    private fun createDisplayItem() = Utils.createItemStack(
+    private fun createDisplayItem() = ItemUtils.createItemStack(
         "PAPER".asInternalName().getItemStack().item,
         "§bPrice History",
         "§7Click here to open",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt
index 61606346ad9e..216d3e10872a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt
@@ -4,12 +4,12 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -23,12 +23,12 @@ object BazaarOpenPriceWebsite {
 
     private val item by lazy {
         val neuItem = "PAPER".asInternalName().getItemStack()
-        Utils.createItemStack(
+        ItemUtils.createItemStack(
             neuItem.item,
             "§bPrice History",
             "§7Click here to open",
             "§7the price history",
-            "§7on §cskyblock.bz"
+            "§7on §cskyblock.bz",
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt
index 8af757f6e074..58ef41ce7e8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt
@@ -6,8 +6,8 @@ import at.hannibal2.skyhanni.events.ColdUpdateEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.NumberUtil
-import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
@@ -42,7 +42,7 @@ object ColdOverlay {
         GlStateManager.translate(0f, 0f, -500f)
         GlStateManager.color(1f, 1f, 1f, alpha)
 
-        RenderUtils.drawTexturedRect(0f, 0f)
+        GuiRenderUtils.drawTexturedRect(0f, 0f)
         GL11.glDepthMask(true)
 
         GlStateManager.popMatrix()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
index 9600fbc20dd1..a1d8f43a8d5b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsGuide.kt
@@ -16,12 +16,12 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.ParkourHelper
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -37,7 +37,7 @@ object DeepCavernsGuide {
 
     private val startIcon by lazy {
         val neuItem = "MAP".asInternalName().getItemStack()
-        Utils.createItemStack(
+        ItemUtils.createItemStack(
             neuItem.item,
             "§bDeep Caverns Guide",
             "§8(From SkyHanni)",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
index d4532a77527a..7f041bc27f9a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.skillprogress.SkillType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -20,7 +21,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -237,9 +237,11 @@ object UserLuckBreakdown {
     }
 
     private fun createItems() {
-        fillerItem = Utils.createItemStack(
+        fillerItem = ItemUtils.createItemStack(
             fillerID.getItemStack().item,
             fillerName,
+            listOf(),
+            1,
             15,
         )
 
@@ -247,17 +249,17 @@ object UserLuckBreakdown {
         val skillLuck = skillOverflowLuck.values.sum()
         val totalLuck = skillLuck + limboLuck
 
-        mainLuckItem = Utils.createItemStack(
+        mainLuckItem = ItemUtils.createItemStack(
             mainLuckID.getItemStack().item,
             "$mainLuckName §f${tryTruncateFloat(totalLuck)}",
             *createItemLore("mainMenu", totalLuck),
         )
-        limboItem = Utils.createItemStack(
+        limboItem = ItemUtils.createItemStack(
             limboID.getItemStack().item,
             limboName,
             *createItemLore("limbo", limboLuck),
         )
-        skillsItem = Utils.createItemStack(
+        skillsItem = ItemUtils.createItemStack(
             skillsID.getItemStack().item,
             skillsName,
             *createItemLore("skills"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
index 0996701f23ca..666671e9ca3f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.InventoryOpenEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -14,7 +15,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -58,7 +58,7 @@ object LimboPlaytime {
 
         if (lastCreateCooldown.passedSince() > 3.seconds) {
             lastCreateCooldown = SimpleTimeMark.now()
-            limboItem = Utils.createItemStack(
+            limboItem = ItemUtils.createItemStack(
                 itemID.getItemStack().item,
                 itemName,
                 *createItemLore()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
index a68978caec21..bbe40db5cd4a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc.massconfiguration
 
-import io.github.moulberry.notenoughupdates.util.Utils
+import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableTooltips
 import io.github.notenoughupdates.moulconfig.internal.GlScissorStack
 import io.github.notenoughupdates.moulconfig.internal.RenderUtils
 import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils
@@ -66,7 +67,7 @@ class DefaultConfigOptionGui(
             mc.fontRendererObj.FONT_HEIGHT.toFloat(),
             false,
             xSize / 2 - padding,
-            -1
+            -1,
         )
         GlStateManager.popMatrix()
 
@@ -74,7 +75,7 @@ class DefaultConfigOptionGui(
         GlStateManager.translate(
             (width - xSize) / 2F + padding,
             (height + ySize) / 2F - mc.fontRendererObj.FONT_HEIGHT * 2,
-            0F
+            0F,
         )
         var i = 0
         fun button(title: String, tooltip: List<String>, func: () -> Unit) {
@@ -95,7 +96,7 @@ class DefaultConfigOptionGui(
                 2 + i.toFloat(),
                 0F,
                 if (overMouse) 0xFF00FF00.toInt() else -1,
-                overMouse
+                overMouse,
             )
             i += width + 12
         }
@@ -132,12 +133,12 @@ class DefaultConfigOptionGui(
             (height - ySize) / 2 + barSize,
             (width + xSize) / 2,
             (height + ySize) / 2 - barSize,
-            scaledResolution
+            scaledResolution,
         )
         GlStateManager.translate(
             (width - xSize) / 2F + padding,
             (height - ySize) / 2F + barSize - currentScrollOffset,
-            0F
+            0F,
         )
 
         for ((cat) in orderedOptions.entries) {
@@ -157,13 +158,13 @@ class DefaultConfigOptionGui(
                     "§7${cat.description}",
                     "§7Current plan: ${suggestionState.label}",
                     "§aClick to toggle!",
-                    "§7Hold shift to show all options"
+                    "§7Hold shift to show all options",
                 )
 
                 if (isShiftKeyDown()) {
                     hoveringTextToDraw = listOf(
                         "§e${cat.name}",
-                        "§7${cat.description}"
+                        "§7${cat.description}",
                     ) + orderedOptions[cat]!!.map { "§7 - §a" + it.name }
                 }
 
@@ -179,8 +180,8 @@ class DefaultConfigOptionGui(
 
         GlStateManager.popMatrix()
         GlScissorStack.pop(scaledResolution)
-        if (hoveringTextToDraw != null) {
-            Utils.drawHoveringText(hoveringTextToDraw, mouseX, mouseY, width, height, 100, mc.fontRendererObj)
+        hoveringTextToDraw?.let { tooltip ->
+            RenderableTooltips.setTooltipForRender(tooltip.map { Renderable.string(it) })
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index d91b4008d912..2a4613f7a7bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.InventoryUtils.getAllItems
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -24,7 +25,6 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.inventory.ContainerChest
@@ -43,7 +43,7 @@ object EnigmaSoulWaypoints {
 
     private val item by lazy {
         val neuItem = "SKYBLOCK_ENIGMA_SOUL".asInternalName().getItemStack()
-        Utils.createItemStack(
+        ItemUtils.createItemStack(
             neuItem.item,
             "§5Toggle Missing",
             "§7Click here to toggle",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillType.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillType.kt
index bd44a63f39b7..b10bc8cb6c08 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillType.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.features.skillprogress
 
-import io.github.moulberry.notenoughupdates.util.Utils
+import at.hannibal2.skyhanni.utils.ItemUtils
 import net.minecraft.block.Block
 import net.minecraft.init.Blocks
 import net.minecraft.init.Items
@@ -21,7 +21,7 @@ enum class SkillType(val displayName: String, icon: Item) {
 
     constructor(displayName: String, block: Block) : this(displayName, Item.getItemFromBlock(block))
 
-    val item: ItemStack by lazy { Utils.createItemStack(icon, displayName) }
+    val item: ItemStack by lazy { ItemUtils.createItemStack(icon, displayName) }
     val lowercaseName = displayName.lowercase()
     val uppercaseName = displayName.uppercase()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index 8a74510828eb..34bf36b5fbbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -10,8 +10,8 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
+import at.hannibal2.skyhanni.utils.json.Shimmy
 import com.google.gson.JsonElement
-import io.github.moulberry.notenoughupdates.util.Shimmy
 import kotlinx.coroutines.launch
 import java.lang.reflect.Field
 import java.lang.reflect.Modifier
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
index 75eb5087ec7f..ba1081a5f3dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
@@ -7,16 +7,17 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.fractionOf
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.renderables.Renderable
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.FontRenderer
 import net.minecraft.client.gui.GuiScreen
+import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.client.renderer.RenderHelper
 import net.minecraft.client.renderer.Tessellator
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats
 import net.minecraft.item.ItemStack
 import org.lwjgl.opengl.GL11
+import org.lwjgl.opengl.GL14
 import java.awt.Color
 import java.text.DecimalFormat
 import kotlin.math.ceil
@@ -75,7 +76,7 @@ object GuiRenderUtils {
 
     fun drawStringCentered(str: String?, x: Int, y: Int) {
         drawStringCentered(
-            str, Minecraft.getMinecraft().fontRendererObj, x.toFloat(), y.toFloat(), true, 0xffffff
+            str, Minecraft.getMinecraft().fontRendererObj, x.toFloat(), y.toFloat(), true, 0xffffff,
         )
     }
 
@@ -125,25 +126,25 @@ object GuiRenderUtils {
             if (tooltipY + tooltipHeight + 6 > screenHeight) tooltipY = screenHeight - tooltipHeight - 6
             // main background
             GuiScreen.drawRect(
-                tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, -0xfeffff0
+                tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, -0xfeffff0,
             )
 
             // borders
             GuiScreen.drawRect(
-                tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1, tooltipY + tooltipHeight + 3 - 1, borderColor
+                tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1, tooltipY + tooltipHeight + 3 - 1, borderColor,
 
-            )
+                )
 
             GuiScreen.drawRect(
                 tooltipX + tooltipTextWidth + 2,
                 tooltipY - 3 + 1,
                 tooltipX + tooltipTextWidth + 3,
                 tooltipY + tooltipHeight + 3 - 1,
-                borderColor
+                borderColor,
             )
 
             GuiScreen.drawRect(
-                tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, tooltipY - 3 + 1, borderColor
+                tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, tooltipY - 3 + 1, borderColor,
             )
 
             GuiScreen.drawRect(
@@ -151,7 +152,7 @@ object GuiRenderUtils {
                 tooltipY + tooltipHeight + 2,
                 tooltipX + tooltipTextWidth + 3,
                 tooltipY + tooltipHeight + 3,
-                borderColor
+                borderColor,
             )
             GlStateManager.translate(0f, 0f, -100f)
             GlStateManager.disableDepth()
@@ -188,27 +189,33 @@ object GuiRenderUtils {
         val current = currentValue.toDouble().coerceAtLeast(0.0)
         val percent = current.fractionOf(maxValue)
         val scale = textScale.toDouble()
-        return Renderable.hoverTips(Renderable.verticalContainer(
-            listOf(
-                Renderable.string(label, scale = scale),
-                Renderable.fixedSizeLine(
-                    listOf(
-                        Renderable.string(
-                            "§2${DecimalFormat("0.##").format(current)} / ${
-                                DecimalFormat(
-                                    "0.##"
-                                ).format(maxValue)
-                            }☘", scale = scale, horizontalAlign = HorizontalAlignment.LEFT
+        return Renderable.hoverTips(
+            Renderable.verticalContainer(
+                listOf(
+                    Renderable.string(label, scale = scale),
+                    Renderable.fixedSizeLine(
+                        listOf(
+                            Renderable.string(
+                                "§2${DecimalFormat("0.##").format(current)} / ${
+                                    DecimalFormat(
+                                        "0.##",
+                                    ).format(maxValue)
+                                }☘",
+                                scale = scale, horizontalAlign = HorizontalAlignment.LEFT,
+                            ),
+                            Renderable.string(
+                                "§2${(percent * 100).round(1)}%",
+                                scale = scale,
+                                horizontalAlign = HorizontalAlignment.RIGHT,
+                            ),
                         ),
-                        Renderable.string(
-                            "§2${(percent * 100).round(1)}%",
-                            scale = scale,
-                            horizontalAlign = HorizontalAlignment.RIGHT
-                        ),
-                    ), width
-                ), Renderable.progressBar(percent, width = width)
-            )
-        ), tooltip.split('\n').map { Renderable.string(it) })
+                        width,
+                    ),
+                    Renderable.progressBar(percent, width = width),
+                ),
+            ),
+            tooltip.split('\n').map { Renderable.string(it) },
+        )
     }
 
     private fun barColorGradient(double: Double): Int {
@@ -265,16 +272,14 @@ object GuiRenderUtils {
                 Color.LIGHT_GRAY.darker().red / 255f,
                 Color.LIGHT_GRAY.darker().green / 255f,
                 Color.LIGHT_GRAY.darker().blue / 255f,
-                1f
+                1f,
             )
         } else {
             GlStateManager.color(color.darker().red / 255f, color.darker().green / 255f, color.darker().blue / 255f, 1f)
         }
 
-        Utils.drawTexturedRect(x, y, w_2.toFloat(), height, 0f, w_2 / xSize, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST)
-        Utils.drawTexturedRect(
-            x + w_2, y, w_2.toFloat(), height, 1 - w_2 / xSize, 1f, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST
-        )
+        drawTexturedRect(x, y, w_2.toFloat(), height, 0f, w_2 / xSize, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST)
+        drawTexturedRect(x + w_2, y, w_2.toFloat(), height, 1 - w_2 / xSize, 1f, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST)
 
         if (useChroma) {
             GlStateManager.color(Color.WHITE.red / 255f, Color.WHITE.green / 255f, Color.WHITE.blue / 255f, 1f)
@@ -285,9 +290,9 @@ object GuiRenderUtils {
         if (k > 0) {
             val uMax = w_2.toDouble().coerceAtMost(k.toDouble() / xSize).toFloat()
             val width = w_2.coerceAtMost(k).toFloat()
-            Utils.drawTexturedRect(x, y, width, height, 0f, uMax, vMinFilled, vMaxFilled, GL11.GL_NEAREST)
+            drawTexturedRect(x, y, width, height, 0f, uMax, vMinFilled, vMaxFilled, GL11.GL_NEAREST)
             if (completed > 0.5f) {
-                Utils.drawTexturedRect(
+                drawTexturedRect(
                     x + w_2,
                     y,
                     (k - w_2).toFloat(),
@@ -296,7 +301,7 @@ object GuiRenderUtils {
                     1 + (k - w) / xSize,
                     vMinFilled,
                     vMaxFilled,
-                    GL11.GL_NEAREST
+                    GL11.GL_NEAREST,
                 )
             }
         }
@@ -342,4 +347,59 @@ object GuiRenderUtils {
         GlStateManager.enableAlpha()
         GlStateManager.enableTexture2D()
     }
+
+    fun drawTexturedRect(x: Float, y: Float) {
+        with(ScaledResolution(Minecraft.getMinecraft())) {
+            drawTexturedRect(x, y, scaledWidth.toFloat(), scaledHeight.toFloat(), filter = GL11.GL_NEAREST)
+        }
+    }
+
+    fun drawTexturedRect(
+        x: Int,
+        y: Int,
+        width: Int,
+        height: Int,
+        uMin: Float = 0f,
+        uMax: Float = 1f,
+        vMin: Float = 0f,
+        vMax: Float = 1f,
+        filter: Int = GL11.GL_NEAREST,
+    ) {
+        drawTexturedRect(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat(), uMin, uMax, vMin, vMax, filter)
+    }
+
+    // Taken from NEU
+    fun drawTexturedRect(
+        x: Float,
+        y: Float,
+        width: Float,
+        height: Float,
+        uMin: Float = 0f,
+        uMax: Float = 1f,
+        vMin: Float = 0f,
+        vMax: Float = 1f,
+        filter: Int = GL11.GL_NEAREST,
+    ) {
+        GlStateManager.enableTexture2D()
+        GlStateManager.enableBlend()
+        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA)
+        GL14.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA)
+
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, filter)
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, filter)
+
+        val tessellator = Tessellator.getInstance()
+        val worldRenderer = tessellator.worldRenderer
+        worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX)
+        worldRenderer.pos(x.toDouble(), (y + height).toDouble(), 0.0).tex(uMin.toDouble(), vMax.toDouble()).endVertex()
+        worldRenderer.pos((x + width).toDouble(), (y + height).toDouble(), 0.0).tex(uMax.toDouble(), vMax.toDouble()).endVertex()
+        worldRenderer.pos((x + width).toDouble(), y.toDouble(), 0.0).tex(uMax.toDouble(), vMin.toDouble()).endVertex()
+        worldRenderer.pos(x.toDouble(), y.toDouble(), 0.0).tex(uMin.toDouble(), vMin.toDouble()).endVertex()
+        tessellator.draw()
+
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST)
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST)
+
+        GlStateManager.disableBlend()
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index ac35c07418ba..add66cc0adcf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -22,6 +22,7 @@ import com.google.common.collect.Lists
 import io.github.moulberry.notenoughupdates.util.NotificationHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Items
+import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.nbt.NBTTagList
@@ -43,9 +44,11 @@ object ItemUtils {
 
     fun isSack(stack: ItemStack) = stack.getInternalName().endsWith("_SACK") && stack.cleanName().endsWith(" Sack")
 
-    fun ItemStack.getLore(): List<String> {
-        val tagCompound = this.tagCompound ?: return emptyList()
-        val tagList = tagCompound.getCompoundTag("display").getTagList("Lore", 8)
+    fun ItemStack.getLore(): List<String> = this.tagCompound.getLore()
+
+    fun NBTTagCompound?.getLore(): List<String> {
+        this ?: return emptyList()
+        val tagList = this.getCompoundTag("display").getTagList("Lore", 8)
         val list: MutableList<String> = ArrayList()
         for (i in 0 until tagList.tagCount()) {
             list.add(tagList.getStringTagAt(i))
@@ -53,6 +56,13 @@ object ItemUtils {
         return list
     }
 
+    fun getDisplayName(compound: NBTTagCompound?): String? {
+        compound ?: return null
+        val name = compound.getCompoundTag("display").getString("Name")
+        if (name == null || name.isEmpty()) return null
+        return name
+    }
+
     fun ItemStack.setLore(lore: List<String>): ItemStack {
         val tagCompound = this.tagCompound ?: NBTTagCompound()
         val display = tagCompound.getCompoundTag("display")
@@ -67,12 +77,14 @@ object ItemUtils {
     }
 
     var ItemStack.extraAttributes: NBTTagCompound
-        get() = this.tagCompound?.getCompoundTag("ExtraAttributes") ?: NBTTagCompound()
+        get() = this.tagCompound?.extraAttributes ?: NBTTagCompound()
         set(value) {
             val tag = this.tagCompound ?: NBTTagCompound().also { tagCompound = it }
             tag.setTag("ExtraAttributes", value)
         }
 
+    val NBTTagCompound.extraAttributes: NBTTagCompound get() = this.getCompoundTag("ExtraAttributes")
+
     fun ItemStack.overrideId(id: String): ItemStack {
         extraAttributes = extraAttributes.apply { setString("id", id) }
         return this
@@ -183,6 +195,20 @@ object ItemUtils {
         return render
     }
 
+    fun createItemStack(item: Item, displayName: String, vararg lore: String): ItemStack {
+        return createItemStack(item, displayName, lore.toList())
+    }
+
+    // Taken from NEU
+    fun createItemStack(item: Item, displayName: String, lore: List<String>, amount: Int = 1, damage: Int = 0): ItemStack {
+        val stack = ItemStack(item, amount, damage)
+        val tag = NBTTagCompound()
+        addNameAndLore(tag, displayName, *lore.toTypedArray())
+        tag.setInteger("HideFlags", 254)
+        stack.tagCompound = tag
+        return stack
+    }
+
     // Taken from NEU
     private fun addNameAndLore(tag: NBTTagCompound, displayName: String, vararg lore: String) {
         val display = NBTTagCompound()
@@ -315,6 +341,28 @@ object ItemUtils {
             setStackDisplayName(value)
         }
 
+    // Taken from NEU
+    fun ItemStack.editItemInfo(displayName: String, disableNeuTooltips: Boolean, lore: List<String>): ItemStack {
+        val tag = this.tagCompound ?: NBTTagCompound()
+        val display = tag.getCompoundTag("display")
+        val loreList = NBTTagList()
+        for (line in lore) {
+            loreList.appendTag(NBTTagString(line))
+        }
+
+        display.setString("Name", displayName)
+        display.setTag("Lore", loreList)
+
+        tag.setTag("display", display)
+        tag.setInteger("HideFlags", 254)
+        if (disableNeuTooltips) {
+            tag.setBoolean("disableNeuTooltip", true)
+        }
+
+        this.tagCompound = tag
+        return this
+    }
+
     fun isSkyBlockMenuItem(stack: ItemStack?): Boolean = stack?.getInternalName()?.equals("SKYBLOCK_MENU") ?: false
 
     private val itemAmountCache = mutableMapOf<String, Pair<String, Int>>()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 34d491ceea81..198b43a856a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -31,7 +31,6 @@ import io.github.moulberry.notenoughupdates.events.ProfileDataLoadedEvent
 import io.github.moulberry.notenoughupdates.overlays.AuctionSearchOverlay
 import io.github.moulberry.notenoughupdates.overlays.BazaarSearchOverlay
 import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GLAllocation
 import net.minecraft.client.renderer.GlStateManager
@@ -97,7 +96,7 @@ object NEUItems {
     val ignoreItemsFilter = MultiFilter()
 
     private val fallbackItem by lazy {
-        Utils.createItemStack(
+        ItemUtils.createItemStack(
             ItemStack(Blocks.barrier).item,
             "§cMissing Repo Item",
             "§cYour NEU repo seems to be out of date",
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 08532e0c4eec..609ccebae24b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -19,11 +19,11 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.zipWithNext3
 import at.hannibal2.skyhanni.utils.ColorUtils.getFirstColorCode
 import at.hannibal2.skyhanni.utils.LorenzColor.Companion.toLorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils.getCorners
+import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderYAligned
 import at.hannibal2.skyhanni.utils.shader.ShaderManager
-import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.FontRenderer
@@ -41,6 +41,7 @@ import net.minecraft.item.ItemStack
 import net.minecraft.util.AxisAlignedBB
 import net.minecraft.util.MathHelper
 import net.minecraft.util.ResourceLocation
+import org.lwjgl.input.Mouse
 import org.lwjgl.opengl.GL11
 import java.awt.Color
 import java.nio.FloatBuffer
@@ -95,6 +96,15 @@ object RenderUtils {
         highlight(color, x, y)
     }
 
+    fun getMouseX(): Int {
+        return Mouse.getX() * GuiScreenUtils.scaledWindowWidth / Minecraft.getMinecraft().displayWidth
+    }
+
+    fun getMouseY(): Int {
+        val height = GuiScreenUtils.scaledWindowHeight
+        return height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
+    }
+
     fun highlight(color: Color, x: Int, y: Int) {
         GlStateManager.disableLighting()
         GlStateManager.disableDepth()
@@ -504,8 +514,8 @@ object RenderUtils {
     fun Position.transform(): Pair<Int, Int> {
         GlStateManager.translate(getAbsX().toFloat(), getAbsY().toFloat(), 0F)
         GlStateManager.scale(effectiveScale, effectiveScale, 1F)
-        val x = ((Utils.getMouseX() - getAbsX()) / effectiveScale).toInt()
-        val y = ((Utils.getMouseY() - getAbsY()) / effectiveScale).toInt()
+        val x = ((getMouseX() - getAbsX()) / effectiveScale).toInt()
+        val y = ((getMouseY() - getAbsY()) / effectiveScale).toInt()
         return x to y
     }
 
@@ -1712,7 +1722,7 @@ object RenderUtils {
     fun drawRoundTexturedRect(x: Int, y: Int, width: Int, height: Int, filter: Int, radius: Int = 10, smoothness: Int = 1) {
         // if radius is 0 then just draw a normal textured rect
         if (radius <= 0) {
-            Utils.drawTexturedRect(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat(), filter)
+            GuiRenderUtils.drawTexturedRect(x, y, width, height, filter = filter)
             return
         }
 
@@ -1731,7 +1741,7 @@ object RenderUtils {
         GlStateManager.pushMatrix()
         ShaderManager.enableShader(ShaderManager.Shaders.ROUNDED_TEXTURE)
 
-        Utils.drawTexturedRect(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat(), filter)
+        GuiRenderUtils.drawTexturedRect(x, y, width, height, filter = filter)
 
         ShaderManager.disableShader()
         GlStateManager.popMatrix()
@@ -1832,6 +1842,7 @@ object RenderUtils {
         GlStateManager.popMatrix()
     }
 
+    // todo merge with the one in GuiRenderUtils
     fun drawGradientRect(
         left: Int,
         top: Int,
@@ -1871,13 +1882,6 @@ object RenderUtils {
         GlStateManager.enableTexture2D()
     }
 
-    // TODO move off of neu function
-    fun drawTexturedRect(x: Float, y: Float) {
-        with(ScaledResolution(Minecraft.getMinecraft())) {
-            Utils.drawTexturedRect(x, y, scaledWidth.toFloat(), scaledHeight.toFloat(), GL11.GL_NEAREST)
-        }
-    }
-
     fun getAlpha(): Float {
         colorBuffer.clear()
         GlStateManager.getFloat(GL11.GL_CURRENT_COLOR, colorBuffer)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 4d0cf446856f..128b5d11e877 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.mixins.hooks.ItemStackCachedData
+import at.hannibal2.skyhanni.utils.ItemUtils.extraAttributes
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
@@ -272,7 +273,7 @@ object SkyBlockItemModifierUtils {
     private fun ItemStack.getAttributeByte(label: String) =
         getExtraAttributes()?.getByte(label) ?: 0
 
-    fun ItemStack.getExtraAttributes() = tagCompound?.getCompoundTag("ExtraAttributes")
+    fun ItemStack.getExtraAttributes() = tagCompound?.extraAttributes
 
     class GemstoneSlot(val type: GemstoneType, val quality: GemstoneQuality) {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/JsonUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/JsonUtils.kt
index 750bd96aa662..ed4a5fbe6709 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/JsonUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/JsonUtils.kt
@@ -1,9 +1,11 @@
 package at.hannibal2.skyhanni.utils.json
 
+import at.hannibal2.skyhanni.config.ConfigManager
 import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import java.io.File
 import java.io.Reader
 import kotlin.reflect.jvm.javaType
 import kotlin.reflect.typeOf
@@ -15,6 +17,16 @@ inline fun <reified T : Any> Gson.fromJson(jsonElement: JsonElement): T =
 
 inline fun <reified T : Any> Gson.fromJson(reader: Reader): T = this.fromJson(reader, typeOf<T>().javaType)
 
+fun File.getJson(): JsonObject? {
+    return try {
+        this.inputStream().use {
+            ConfigManager.gson.fromJson(it.reader(), JsonObject::class.java)
+        }
+    } catch (e: Exception) {
+        null
+    }
+}
+
 /**
  * Straight forward deep copy. This is included in gson as well, but different versions have it exposed privately instead of publicly,
  * so this reimplementation is here as an always public alternative.
@@ -35,3 +47,9 @@ fun JsonElement.shDeepCopy(): JsonElement {
         else -> this
     }
 }
+
+fun Iterable<JsonElement>.toJsonArray(): JsonArray = JsonArray().also {
+    for (jsonElement in this) {
+        it.add(jsonElement)
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/Shimmy.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/Shimmy.kt
new file mode 100644
index 000000000000..31022da58d19
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/Shimmy.kt
@@ -0,0 +1,64 @@
+package at.hannibal2.skyhanni.utils.json
+
+import at.hannibal2.skyhanni.config.ConfigManager
+import com.google.gson.JsonElement
+import java.lang.reflect.Field
+
+// Copied from NEU
+class Shimmy private constructor(
+    val source: Any,
+    val field: Field,
+) {
+    companion object {
+        private fun shimmy(source: Any?, fieldName: String): Any? {
+            if (source == null) return null
+            return try {
+                val declaredField = source.javaClass.getDeclaredField(fieldName)
+                declaredField.isAccessible = true
+                declaredField.get(source)
+            } catch (e: NoSuchFieldException) {
+                null
+            }
+        }
+
+        @JvmStatic
+        fun makeShimmy(source: Any?, path: List<String>): Shimmy? {
+            if (path.isEmpty())
+                return null
+            var source = source
+            for (part in path.dropLast(1)) {
+                source = shimmy(source, part)
+            }
+            if (source == null) return null
+            val lastName = path.last()
+            return try {
+                val field = source.javaClass.getDeclaredField(lastName)
+                field.isAccessible = true
+                Shimmy(
+                    source,
+                    field,
+                )
+            } catch (e: NoSuchFieldException) {
+                null
+            }
+        }
+
+    }
+
+    val clazz: Class<*> = field.type
+    fun get(): Any? {
+        return field.get(source)
+    }
+
+    fun set(value: Any?) {
+        field.set(source, value)
+    }
+
+    fun getJson(): JsonElement {
+        return ConfigManager.gson.toJsonTree(get())
+    }
+
+    fun setJson(element: JsonElement) {
+        set(ConfigManager.gson.fromJson(element, clazz))
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index d161cf2b0eeb..f3f704f374a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.contains
 import at.hannibal2.skyhanni.utils.ColorUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.addAlpha
 import at.hannibal2.skyhanni.utils.ColorUtils.darker
+import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzLogger
@@ -29,7 +30,6 @@ import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderYAligned
 import at.hannibal2.skyhanni.utils.shader.ShaderManager
-import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.Gui
@@ -1272,18 +1272,9 @@ interface Renderable {
 
             override fun render(posX: Int, posY: Int) {
                 Minecraft.getMinecraft().textureManager.bindTexture(texture)
+
                 GlStateManager.color(1f, 1f, 1f, alpha / 255f)
-                Utils.drawTexturedRect(
-                    0f,
-                    0f,
-                    width.toFloat(),
-                    height.toFloat(),
-                    uMin,
-                    uMax,
-                    vMin,
-                    vMax,
-                    GL11.GL_NEAREST,
-                )
+                GuiRenderUtils.drawTexturedRect(0, 0, width, height, uMin, uMax, vMin, vMax)
                 GlStateManager.color(1f, 1f, 1f, 1f)
 
                 GlStateManager.translate(padding.toFloat(), padding.toFloat(), 0f)
@@ -1312,17 +1303,7 @@ interface Renderable {
             override fun render(posX: Int, posY: Int) {
                 Minecraft.getMinecraft().textureManager.bindTexture(texture)
                 GlStateManager.color(1f, 1f, 1f, alpha / 255f)
-                Utils.drawTexturedRect(
-                    0f,
-                    0f,
-                    width.toFloat(),
-                    height.toFloat(),
-                    uMin,
-                    uMax,
-                    vMin,
-                    vMax,
-                    GL11.GL_NEAREST,
-                )
+                GuiRenderUtils.drawTexturedRect(0, 0, width, height, uMin, uMax, vMin, vMax)
                 GlStateManager.color(1f, 1f, 1f, 1f)
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
index b37c89bb552d..b6c4225ba275 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableTooltips.kt
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
-import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
@@ -44,8 +43,8 @@ object RenderableTooltips {
         val tips = tooltip.tips
         if (tips.isEmpty()) return
 
-        val x = Utils.getMouseX() + 12
-        val y = Utils.getMouseY() - if (tips.size > 1) 1 else -7
+        val x = RenderUtils.getMouseX() + 12
+        val y = RenderUtils.getMouseY() - if (tips.size > 1) 1 else -7
         val borderColorStart = tooltip.getBorderColor()
         val scaled = ScaledResolution(Minecraft.getMinecraft())
         val isSpacedTitle = tooltip.isSpacedTitle()

From f78d580531941d52bbbeca625c3f078beae8996a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:55:25 +0200
Subject: [PATCH 540/721] code cleanup

---
 .../at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
index 97a3f580c555..9feb170c1f08 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt
@@ -15,9 +15,7 @@ import java.io.File
 import java.lang.reflect.Type
 
 class NeuRepositoryReloadEvent : LorenzEvent() {
-    fun getConstant(file: String): JsonObject? {
-        return File(manager.repoLocation, "constants/$file.json").getJson()
-    }
+    fun getConstant(file: String): JsonObject? = File(manager.repoLocation, "constants/$file.json").getJson()
 
     inline fun <reified T : Any> readConstant(file: String, gson: Gson = ConfigManager.gson): T {
         val data = getConstant(file) ?: ErrorManager.skyHanniError("$file failed to load from neu repo!")

From 7c9f889efd9c5d889394f8bf00288ef1c38f8ae4 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 24 Sep 2024 00:11:18 +1000
Subject: [PATCH 541/721] Backend: Add Http Request Patching (#2578)

---
 .../skyhanni/config/commands/Commands.kt      |   4 +-
 .../at/hannibal2/skyhanni/data/MayorAPI.kt    |   4 +-
 .../data/bazaar/HypixelBazaarFetcher.kt       |   4 +-
 .../features/chat/translation/Translator.kt   |   4 +-
 .../features/garden/GardenNextJacobContest.kt |   6 +-
 .../garden/farming/FarmingWeightDisplay.kt    |   8 +--
 .../inventory/bazaar/BazaarDataHolder.kt      |   4 +-
 .../mining/eventtracker/MiningEventTracker.kt |   6 +-
 .../features/misc/update/UpdateManager.kt     |   4 +-
 .../utils/{APIUtil.kt => APIUtils.kt}         |  54 ++++++++++++------
 src/main/resources/mykeystore.jks             | Bin 0 -> 124141 bytes
 11 files changed, 59 insertions(+), 39 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/utils/{APIUtil.kt => APIUtils.kt} (82%)
 create mode 100644 src/main/resources/mykeystore.jks

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index cf4679e396d6..a52852a8193f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -94,7 +94,7 @@ import at.hannibal2.skyhanni.test.command.TestChatCommand
 import at.hannibal2.skyhanni.test.command.TrackParticlesCommand
 import at.hannibal2.skyhanni.test.command.TrackSoundsCommand
 import at.hannibal2.skyhanni.test.graph.GraphEditor
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ExtendedChatColor
 import at.hannibal2.skyhanni.utils.ItemPriceUtils
@@ -382,7 +382,7 @@ object Commands {
         registerCommand(
             "shtogglehypixelapierrors",
             "Show/hide hypixel api error messages in chat",
-        ) { APIUtil.toggleApiErrorMessages() }
+        ) { APIUtils.toggleApiErrorMessages() }
         registerCommand(
             "shclearcropspeed",
             "Reset garden crop speed data and best crop time data",
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index b4fb7eaa2dc8..469c48489245 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.CollectionUtils.put
@@ -216,7 +216,7 @@ object MayorAPI {
 
         SkyHanniMod.coroutineScope.launch {
             val url = "https://api.hypixel.net/v2/resources/skyblock/election"
-            val jsonObject = withContext(dispatcher) { APIUtil.getJSONResponse(url) }
+            val jsonObject = withContext(dispatcher) { APIUtils.getJSONResponse(url) }
             rawMayorData = ConfigManager.gson.fromJson<MayorJson>(jsonObject)
             val data = rawMayorData ?: return@launch
             val map = mutableMapOf<Int, MayorCandidate>()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
index 29a16944c3d3..13044b7c3151 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarData
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -46,7 +46,7 @@ object HypixelBazaarFetcher {
         val fetchType = if (nextFetchIsManual) "manual" else "automatic"
         nextFetchIsManual = false
         try {
-            val jsonResponse = withContext(Dispatchers.IO) { APIUtil.getJSONResponse(URL) }.asJsonObject
+            val jsonResponse = withContext(Dispatchers.IO) { APIUtils.getJSONResponse(URL) }.asJsonObject
             val response = ConfigManager.gson.fromJson<BazaarApiResponseJson>(jsonResponse)
             if (response.success) {
                 latestProductInformation = process(response.products)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
index 389b57fb0fc7..24809faac798 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.ConditionalUtils.transformIf
@@ -112,7 +112,7 @@ object Translator {
      */
 
     private fun getJSONResponse(urlString: String) =
-        APIUtil.getJSONResponseAsElement(urlString, false, "Google Translate API")
+        APIUtils.getJSONResponseAsElement(urlString, false, "Google Translate API")
 
     private fun getTranslationToEnglish(message: String): String {
         val url =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index ab8820b40fd6..4285a24af969 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI.addCropIcon
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
@@ -543,7 +543,7 @@ object GardenNextJacobContest {
     suspend fun fetchUpcomingContests() {
         try {
             val url = "https://api.elitebot.dev/contests/at/now"
-            val result = withContext(dispatcher) { APIUtil.getJSONResponse(url) }.asJsonObject
+            val result = withContext(dispatcher) { APIUtils.getJSONResponse(url) }.asJsonObject
 
             val newContests = mutableMapOf<SimpleTimeMark, FarmingContest>()
 
@@ -613,7 +613,7 @@ object GardenNextJacobContest {
         val url = "https://api.elitebot.dev/contests/at/now"
         val body = Gson().toJson(formatted)
 
-        val result = withContext(dispatcher) { APIUtil.postJSONIsSuccessful(url, body) }
+        val result = withContext(dispatcher) { APIUtils.postJSONIsSuccessful(url, body) }
 
         if (result) {
             ChatUtils.chat("Successfully submitted this years upcoming contests, thank you for helping everyone out!")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 222e75f4f296..1fa4b57e6a56 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -20,7 +20,7 @@ import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
 import at.hannibal2.skyhanni.features.garden.pests.PestType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
@@ -447,7 +447,7 @@ object FarmingWeightDisplay {
         val atRank = if (isEtaEnabled() && goalRank != 10001) "&atRank=$goalRank" else ""
 
         val url = "https://api.elitebot.dev/leaderboard/rank/farmingweight/$uuid/$profileId$includeUpcoming$atRank"
-        val apiResponse = APIUtil.getJSONResponse(url)
+        val apiResponse = APIUtils.getJSONResponse(url)
 
         try {
             val apiData = toEliteLeaderboardJson(apiResponse).data
@@ -477,7 +477,7 @@ object FarmingWeightDisplay {
     private fun loadWeight(localProfile: String) {
         val uuid = LorenzUtils.getPlayerUuid()
         val url = "https://api.elitebot.dev/weight/$uuid"
-        val apiResponse = APIUtil.getJSONResponse(url)
+        val apiResponse = APIUtils.getJSONResponse(url)
 
         var error: Throwable? = null
 
@@ -573,7 +573,7 @@ object FarmingWeightDisplay {
         if (attemptingCropWeightFetch || hasFetchedCropWeights) return
         attemptingCropWeightFetch = true
         val url = "https://api.elitebot.dev/weights/all"
-        val apiResponse = APIUtil.getJSONResponse(url)
+        val apiResponse = APIUtils.getJSONResponse(url)
 
         try {
             val apiData = eliteWeightApiGson.fromJson<EliteWeightsJson>(apiResponse)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt
index 3d7867ad9540..cf9cb6d2ec06 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.data.jsonobjects.other.SkyblockItemsDataJson
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.json.fromJson
@@ -22,7 +22,7 @@ class BazaarDataHolder {
 
     private fun loadNpcPrices(): MutableMap<NEUInternalName, Double> {
         val list = mutableMapOf<NEUInternalName, Double>()
-        val apiResponse = APIUtil.getJSONResponse("https://api.hypixel.net/v2/resources/skyblock/items")
+        val apiResponse = APIUtils.getJSONResponse("https://api.hypixel.net/v2/resources/skyblock/items")
         try {
             val itemsData = ConfigManager.gson.fromJson<SkyblockItemsDataJson>(apiResponse)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
index 97806b6fb0ad..a076ba68f0c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -160,7 +160,7 @@ object MiningEventTracker {
 
     private fun sendData(json: String) {
         val response = try {
-            APIUtil.postJSON("https://api.soopy.dev/skyblock/chevents/set", json)
+            APIUtils.postJSON("https://api.soopy.dev/skyblock/chevents/set", json)
         } catch (e: IOException) {
             if (LorenzUtils.debug) {
                 ErrorManager.logErrorWithData(
@@ -194,7 +194,7 @@ object MiningEventTracker {
         canRequestAt = SimpleTimeMark.now() + defaultCooldown
         SkyHanniMod.coroutineScope.launch {
             val data = try {
-                APIUtil.getJSONResponse("https://api.soopy.dev/skyblock/chevents/get")
+                APIUtils.getJSONResponse("https://api.soopy.dev/skyblock/chevents/get")
             } catch (e: Exception) {
                 apiErrorCount++
                 canRequestAt = SimpleTimeMark.now() + 20.minutes
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
index 040b6741a847..9948d5eeb973 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt
@@ -5,12 +5,12 @@ import at.hannibal2.skyhanni.config.features.About.UpdateStream
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import com.google.gson.JsonElement
-import io.github.moulberry.notenoughupdates.util.ApiUtil
 import io.github.notenoughupdates.moulconfig.observer.Property
 import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor
 import moe.nea.libautoupdate.CurrentVersion
@@ -161,7 +161,7 @@ object UpdateManager {
         context.cleanup()
         UpdateUtils.patchConnection {
             if (it is HttpsURLConnection) {
-                ApiUtil.patchHttpsRequest(it)
+                APIUtils.patchHttpsRequest(it)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
similarity index 82%
rename from src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
rename to src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
index 483bb6d047ab..d28263af6c7d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
@@ -16,17 +16,41 @@ import org.apache.http.impl.client.HttpClientBuilder
 import org.apache.http.impl.client.HttpClients
 import org.apache.http.message.BasicHeader
 import org.apache.http.util.EntityUtils
-import java.io.BufferedReader
-import java.io.File
-import java.io.FileInputStream
-import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets
+import java.security.KeyStore
+import javax.net.ssl.HttpsURLConnection
+import javax.net.ssl.KeyManagerFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManagerFactory
 
-object APIUtil {
+object APIUtils {
 
     private val parser = JsonParser()
     private var showApiErrors = false
 
+    private val ctx: SSLContext? = run {
+        try {
+            val myKeyStore = KeyStore.getInstance("JKS")
+            myKeyStore.load(APIUtils.javaClass.getResourceAsStream("/keystore.jks"), "changeit".toCharArray())
+            val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
+            val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+            kmf.init(myKeyStore, null)
+            tmf.init(myKeyStore)
+            SSLContext.getInstance("TLS").apply {
+                init(kmf.keyManagers, tmf.trustManagers, null)
+            }
+        } catch (e: Exception) {
+            println("Failed to load keystore. A lot of API requests won't work")
+            e.printStackTrace()
+            null
+        }
+    }
+
+    fun patchHttpsRequest(connection: HttpsURLConnection) {
+        ctx?.let {
+            connection.sslSocketFactory = it.socketFactory
+        }
+    }
+
     data class ApiResponse(val success: Boolean, val message: String?, val data: JsonObject)
 
     private val builder: HttpClientBuilder =
@@ -34,19 +58,19 @@ object APIUtil {
             .setDefaultHeaders(
                 mutableListOf(
                     BasicHeader("Pragma", "no-cache"),
-                    BasicHeader("Cache-Control", "no-cache")
-                )
+                    BasicHeader("Cache-Control", "no-cache"),
+                ),
             )
             .setDefaultRequestConfig(
                 RequestConfig.custom()
-                    .build()
+                    .build(),
             )
             .useSystemProperties()
 
     /**
      * TODO
      * make suspend
-     * use withContext(Dispatchers.IO) { APIUtil.getJSONResponse(url) }.asJsonObject
+     * use withContext(Dispatchers.IO) { APIUtils.getJSONResponse(url) }.asJsonObject
      */
     fun getJSONResponse(urlString: String, silentError: Boolean = false) =
         getJSONResponseAsElement(urlString, silentError) as JsonObject
@@ -76,7 +100,7 @@ object APIUtil {
                                 ChatUtils.clickableChat(
                                     "Problems with detecting the Hypixel API. §eClick here to hide this message for now.",
                                     onClick = { toggleApiErrorMessages() },
-                                    "§eClick to run /shtogglehypixelapierrors!"
+                                    "§eClick to run /shtogglehypixelapierrors!",
                                 )
                             }
                             ErrorManager.skyHanniError(
@@ -84,7 +108,7 @@ object APIUtil {
                                 "error message" to "$message(502 Bad Gateway)",
                                 "apiName" to apiName,
                                 "urlString" to urlString,
-                                "returnedData" to retSrc
+                                "returnedData" to retSrc,
                             )
                         } else {
                             ErrorManager.skyHanniError(
@@ -92,7 +116,7 @@ object APIUtil {
                                 "error message" to message,
                                 "apiName" to apiName,
                                 "urlString" to urlString,
-                                "returnedData" to retSrc
+                                "returnedData" to retSrc,
                             )
                         }
                     }
@@ -181,10 +205,6 @@ object APIUtil {
         return false
     }
 
-    fun readFile(file: File): BufferedReader {
-        return BufferedReader(InputStreamReader(FileInputStream(file), StandardCharsets.UTF_8))
-    }
-
     // TODO remove command, use clickable chat message instead
     fun toggleApiErrorMessages() {
         showApiErrors = !showApiErrors
diff --git a/src/main/resources/mykeystore.jks b/src/main/resources/mykeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..75039b79a01089ca19b91d4cb2bc4538236f8157
GIT binary patch
literal 124141
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
Qw$Ze=K%&DCcOky|KMvpAUjP6A

literal 0
HcmV?d00001


From f71458b10781f366d6220b662dba42abe0aa80b3 Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:47:07 +0200
Subject: [PATCH 542/721] Feature: Reindrake Warp Helper (#2569)

---
 .../features/event/winter/WinterConfig.java   |  6 +++
 .../event/winter/ReindrakeWarpHelper.kt       | 42 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
index 837f4c7ea811..550ceaeee0ec 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
@@ -46,4 +46,10 @@ public class WinterConfig {
     @FeatureToggle
     public boolean newYearCakeReminder = true;
 
+    @Expose
+    @ConfigOption(name = "Reindrake Warp Helper", desc = "Sends a clickable message in chat to warp to the Winter Island spawn when a Reindrake spawns.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean reindrakeWarpHelper = true;
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
new file mode 100644
index 000000000000..7131426d42b3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
@@ -0,0 +1,42 @@
+package at.hannibal2.skyhanni.features.event.winter
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ReindrakeWarpHelper {
+
+    private val config get() = SkyHanniMod.feature.event.winter
+
+    private val patternGroup = RepoPattern.group("event.winter.reindrakewarphelper")
+
+    /**
+     * REGEX-TEST: §c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!
+     */
+    private val spawnPattern by patternGroup.pattern(
+        "spawn.message",
+        "§c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!",
+    )
+
+    @SubscribeEvent
+    fun onMessage(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        if (!spawnPattern.matches(event.message)) return
+        ChatUtils.clickToActionOrDisable(
+            "A Reindrake was detected. Click to warp to the Winter Island spawn!",
+            config::reindrakeWarpHelper,
+            actionName = "warp to winter island spawn",
+            action = { HypixelCommands.warp("winter") }
+        )
+    }
+
+    fun isEnabled() = IslandType.WINTER.isInIsland() && config.reindrakeWarpHelper
+}

From 2eed7efac2dab7ec54043d188d814b17052cebdd Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:16:31 +1000
Subject: [PATCH 543/721] Backend: Replace round and roundToPrecision with
 roundTo (#1931)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../core/config/gui/GuiPositionEditor.kt      |  5 ++--
 .../at/hannibal2/skyhanni/data/QuiverAPI.kt   |  4 +--
 .../at/hannibal2/skyhanni/data/model/Graph.kt |  4 +--
 .../skyhanni/events/PlaySoundEvent.kt         |  6 ++---
 .../skyhanni/events/ReceiveParticleEvent.kt   |  4 +--
 .../skyhanni/features/combat/BestiaryData.kt  |  4 +--
 .../damageindicator/DamageIndicatorManager.kt |  4 +--
 .../combat/ghostcounter/GhostCounter.kt       |  4 +--
 .../features/combat/ghostcounter/GhostUtil.kt |  8 +++---
 .../features/event/diana/BurrowWarpHelper.kt  |  8 +++---
 .../event/hoppity/HoppityCollectionStats.kt   |  4 +--
 .../event/hoppity/HoppityEggLocator.kt        |  4 +--
 .../features/garden/FarmingFortuneDisplay.kt  |  4 +--
 .../features/garden/GardenYawAndPitch.kt      |  6 ++---
 .../garden/composter/ComposterOverlay.kt      |  6 ++---
 .../garden/contest/FarmingPersonalBestGain.kt |  4 +--
 .../contest/JacobContestFFNeededDisplay.kt    |  4 +--
 .../contest/JacobContestStatsSummary.kt       |  4 +--
 .../garden/contest/JacobContestTimeNeeded.kt  |  6 ++---
 .../features/garden/farming/CropSpeedMeter.kt |  6 ++---
 .../garden/farming/FarmingWeightDisplay.kt    |  6 ++---
 .../farming/GardenCropMilestoneDisplay.kt     |  6 ++---
 .../farming/lane/FarmingLaneFeatures.kt       |  6 ++---
 .../inventory/GardenCropMilestoneInventory.kt |  4 +--
 .../garden/inventory/SkyMartCopperPrice.kt    |  4 +--
 .../ChocolateFactoryDataLoader.kt             |  8 +++---
 .../ChocolateFactoryTooltip.kt                |  4 +--
 .../abilitycooldown/ItemAbility.kt            |  4 +--
 .../abilitycooldown/ItemAbilityCooldown.kt    |  4 +--
 .../features/mining/MineshaftPityDisplay.kt   |  6 ++---
 .../features/mining/PowderPerHotmPerk.kt      |  4 +--
 .../solver/FossilSolverDisplay.kt             |  4 +--
 .../skyhanni/features/misc/IslandAreas.kt     |  4 +--
 .../features/misc/MovementSpeedDisplay.kt     |  4 +--
 .../skyhanni/features/misc/TpsCounter.kt      |  4 +--
 .../features/misc/UserLuckBreakdown.kt        |  8 +++---
 .../features/misc/limbo/LimboPlaytime.kt      |  4 +--
 .../features/misc/limbo/LimboTimeTracker.kt   | 10 +++----
 .../features/misc/pets/PetExpTooltip.kt       |  6 ++---
 .../livingcave/LivingMetalSuitProgress.kt     |  4 +--
 .../rift/everywhere/CruxTalismanDisplay.kt    |  4 +--
 .../rift/everywhere/motes/RiftMotesOrb.kt     |  4 +--
 .../features/skillprogress/SkillProgress.kt   |  4 +--
 .../features/skillprogress/SkillTooltip.kt    |  6 ++---
 .../at/hannibal2/skyhanni/test/PacketTest.kt  |  4 +--
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 11 ++++----
 .../test/command/TrackParticlesCommand.kt     |  4 +--
 .../test/command/TrackSoundsCommand.kt        |  4 +--
 .../skyhanni/utils/GuiRenderUtils.kt          |  4 +--
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   | 21 ++++-----------
 .../at/hannibal2/skyhanni/utils/LorenzVec.kt  | 10 +++----
 .../at/hannibal2/skyhanni/utils/NumberUtil.kt | 26 +++++++++----------
 52 files changed, 145 insertions(+), 160 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index 3e64d5f5abff..ba3a576754dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -27,11 +27,10 @@ import at.hannibal2.skyhanni.data.OtherInventoryData
 import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
 import at.hannibal2.skyhanni.utils.GuiRenderUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils
 import at.hannibal2.skyhanni.utils.compat.SkyhanniBaseScreen
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.client.renderer.GlStateManager
 import org.lwjgl.input.Keyboard
@@ -100,7 +99,7 @@ class GuiPositionEditor(
         }
 
         val pos = positions[displayPos]
-        val location = "§7x: §e${pos.rawX}§7, y: §e${pos.rawY}§7, scale: §e${pos.scale.round(2)}"
+        val location = "§7x: §e${pos.rawX}§7, y: §e${pos.rawY}§7, scale: §e${pos.scale.roundTo(2)}"
         GuiRenderUtils.drawStringCentered("§b" + pos.internalName, getScaledWidth() / 2, 18)
         GuiRenderUtils.drawStringCentered(location, getScaledWidth() / 2, 28)
         if (pos.canJumpToConfigOptions())
diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
index 88daf40b9520..2f516610ca51 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
@@ -16,10 +16,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getExtraAttributes
@@ -236,7 +236,7 @@ object QuiverAPI {
         }
     }
 
-    fun Int.asArrowPercentage() = ((this.toFloat() / MAX_ARROW_AMOUNT) * 100).round(1)
+    fun Int.asArrowPercentage() = ((this.toFloat() / MAX_ARROW_AMOUNT) * 100).roundTo(1)
 
     fun hasBowInInventory() = hasBow
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index b9ad1251ca8c..bc4be57a16d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.data.model
 
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.json.SkyHanniTypeAdapters.registerTypeAdapter
 import at.hannibal2.skyhanni.utils.json.fromJson
 import com.google.gson.GsonBuilder
@@ -63,7 +63,7 @@ value class Graph(
                     out.beginObject()
                     for ((node, weight) in it.neighbours) {
                         val id = node.id.toString()
-                        out.name(id).value(weight.round(2))
+                        out.name(id).value(weight.roundTo(2))
                     }
                     out.endObject()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
index 2f793ff28860..386167123768 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import net.minecraftforge.fml.common.eventhandler.Cancelable
 
 @Cancelable
@@ -12,9 +12,7 @@ class PlaySoundEvent(val soundName: String, val location: LorenzVec, val pitch:
     val distanceToPlayer by lazy { location.distanceToPlayer() }
     override fun toString(): String {
         return "PlaySoundEvent(soundName='$soundName', pitch=$pitch, volume=$volume, location=${location.round(1)}, distanceToPlayer=${
-            distanceToPlayer.round(
-                1
-            )
+            distanceToPlayer.roundTo(1)
         })"
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
index ef296326da84..7c695c7eec2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.Cancelable
 
@@ -26,7 +26,7 @@ class ReceiveParticleEvent(
                 1
             )
         }, longDistance=$longDistance, particleArgs=${particleArgs.contentToString()}, distanceToPlayer=${
-            distanceToPlayer.round(
+            distanceToPlayer.roundTo(
                 1
             )
         })"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
index 5d056f456818..957f1ecd0b29 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
@@ -20,7 +20,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addButton
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.NumberUtil.toRoman
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -327,7 +327,7 @@ object BestiaryData {
                         DisplayTypeEntry.GLOBAL_NEXT -> mob.killNeededForNextLevel
                         else -> 0
                     }
-                    val percentage = ((currentKill.toDouble() / killNeeded) * 100).roundToPrecision(2)
+                    val percentage = ((currentKill.toDouble() / killNeeded) * 100).roundTo(2)
                     val suffix = if (type == DisplayTypeEntry.GLOBAL_NEXT) "§ato level ${mob.getNextLevel()}" else ""
                     "§7(§b${currentKill.formatNumber()}§7/§b${killNeeded.formatNumber()}§7) §a$percentage§6% $suffix"
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index b7af2d72b2d4..0391e40a3697 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -34,10 +34,10 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
@@ -718,7 +718,7 @@ object DamageIndicatorManager {
                 if (existed > 40) {
                     val end = (20 * 26) - existed
                     val time = end.toDouble() / 20
-                    entityData.nameAbove = "Mania Circles: §b${time.round(1)}s"
+                    entityData.nameAbove = "Mania Circles: §b${time.roundTo(1)}s"
                     return ""
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 85d5778fe25b..b337d58b1487 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -48,7 +48,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
@@ -154,7 +154,7 @@ object GhostCounter {
             0.0 -> "0"
             else -> {
                 val mf = (((storage?.totalMF!! / Option.TOTALDROPS.get()) + Math.ulp(1.0)) * 100) / 100
-                mf.roundToPrecision(2).toString()
+                mf.roundTo(2).toString()
             }
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
index d568fc49288f..36a4edfb3cd4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import java.io.FileReader
 
@@ -106,8 +106,8 @@ object GhostUtil {
             )
     }
 
-    fun String.formatText(value: Double, session: Double) = this.replace("%value%", value.roundToPrecision(2).addSeparators())
-        .replace("%session%", session.roundToPrecision(2).addSeparators())
+    fun String.formatText(value: Double, session: Double) = this.replace("%value%", value.roundTo(2).addSeparators())
+        .replace("%session%", session.roundTo(2).addSeparators())
         .replace("&", "§")
 
     fun String.formatBestiary(currentKill: Int, killNeeded: Int): String {
@@ -129,5 +129,5 @@ object GhostUtil {
     }
 
     private fun percent(number: Double) =
-        100.0.coerceAtMost(((number / 100_000) * 100).roundToPrecision(4)).toString()
+        100.0.coerceAtMost(((number / 100_000) * 100).roundTo(4)).toString()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 34dab01e6ce1..4074b465de33 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -12,8 +12,8 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -104,11 +104,11 @@ object BurrowWarpHelper {
         debug?.add("warpPoint: ${warpPoint.displayName}")
 
         val playerDistance = playerLocation.distance(target)
-        debug?.add("playerDistance: ${playerDistance.round(1)}")
+        debug?.add("playerDistance: ${playerDistance.roundTo(1)}")
         val warpDistance = warpPoint.distance(target)
-        debug?.add("warpDistance: ${warpDistance.round(1)}")
+        debug?.add("warpDistance: ${warpDistance.roundTo(1)}")
         val difference = playerDistance - warpDistance
-        debug?.add("difference: ${difference.round(1)}")
+        debug?.add("difference: ${difference.roundTo(1)}")
         val setWarpPoint = difference > 10
         debug?.add("setWarpPoint: $setWarpPoint")
         currentWarp = if (setWarpPoint) warpPoint else null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 7be0913e9fb2..e84d93dfa6a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -22,11 +22,11 @@ import at.hannibal2.skyhanni.utils.KSerializable
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.anyMatches
 import at.hannibal2.skyhanni.utils.RegexUtils.findMatcher
@@ -435,7 +435,7 @@ object HoppityCollectionStats {
                 add("§7Total Rabbits Found: §a${displayFound + displayDuplicates}")
                 add("")
                 add("§7Chocolate Per Second: §a${displayChocolatePerSecond.addSeparators()}")
-                add("§7Chocolate Multiplier: §a${displayChocolateMultiplier.round(3)}")
+                add("§7Chocolate Multiplier: §a${displayChocolateMultiplier.roundTo(3)}")
             }
             table.add(
                 DisplayTableEntry(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 8e9e68e16731..468fecbcb480 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -19,10 +19,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RecalculatingValue
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
@@ -249,7 +249,7 @@ object HoppityEggLocator {
         }.sortedBy { it.second }
 
         eggLocationWeights = sortedEggs.map {
-            it.second.round(3)
+            it.second.roundTo(3)
         }.take(5)
 
         val filteredEggs = sortedEggs.filter {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
index 29b92f24afd8..55898266e440 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
@@ -17,9 +17,9 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
@@ -167,7 +167,7 @@ object FarmingFortuneDisplay {
         list.add(
             Renderable.string(
                 "§6Farming Fortune§7: §e" + if (!recentlySwitchedTool && farmingFortune != -1.0) {
-                    farmingFortune.round(0).addSeparators()
+                    farmingFortune.roundTo(0).addSeparators()
                 } else "§7" + (displayCrop.getLatestTrueFarmingFortune()?.addSeparators() ?: "?"),
             ),
         )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
index cdbb07963d8d..ad03a7784cf3 100755
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
@@ -41,8 +41,8 @@ object GardenYawAndPitch {
 
         if (!config.showAlways && lastChange.passedSince() > config.timeout.seconds) return
 
-        val yawText = yaw.round(config.yawPrecision).toBigDecimal().toPlainString()
-        val pitchText = pitch.round(config.pitchPrecision).toBigDecimal().toPlainString()
+        val yawText = yaw.roundTo(config.yawPrecision).toBigDecimal().toPlainString()
+        val pitchText = pitch.roundTo(config.pitchPrecision).toBigDecimal().toPlainString()
         val displayList = listOf(
             "§aYaw: §f$yawText",
             "§aPitch: §f$pitchText",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index aee2a93f428f..fa45e579dfa3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -31,7 +31,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.NONE
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -41,6 +40,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -338,10 +338,10 @@ object ComposterOverlay {
         val multiplier = multiDropFactor * timeMultiplier
         val multiplierPreview = multiDropFactorPreview * timeMultiplierPreview
         val compostPerTitlePreview =
-            if (multiplier != multiplierPreview) " §c➜ §e" + multiplierPreview.round(2) else ""
+            if (multiplier != multiplierPreview) " §c➜ §e" + multiplierPreview.roundTo(2) else ""
         val compostPerTitle =
             if (currentTimeType == TimeType.COMPOST) "Compost multiplier" else "Composts per $timeText"
-        newList.addAsSingletonList(" §7$compostPerTitle: §e${multiplier.round(2)}$compostPerTitlePreview")
+        newList.addAsSingletonList(" §7$compostPerTitle: §e${multiplier.roundTo(2)}$compostPerTitlePreview")
 
         val organicMatterPrice = getPrice(organicMatterItem)
         val organicMatterFactor = organicMatterFactors[organicMatterItem]!!
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt
index 7d009629b7c9..a2e8a859f703 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingPersonalBestGain.kt
@@ -6,8 +6,8 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.DelayedRun
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -88,7 +88,7 @@ object FarmingPersonalBestGain {
         val oldFF = oldCollected / collectionPerFF
         val ffDiff = newFF - oldFF
 
-        ChatUtils.chat("This is §6${ffDiff.round(2)}☘ $crop Fortune §emore than previously!")
+        ChatUtils.chat("This is §6${ffDiff.roundTo(2)}☘ $crop Fortune §emore than previously!")
     }
 
     fun isEnabled() = GardenAPI.inGarden() && config.contestPersonalBestIncreaseFF
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
index 963193c4ba74..5d9b7f92f34e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
@@ -12,8 +12,8 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.item.ItemStack
@@ -81,7 +81,7 @@ object JacobContestFFNeededDisplay {
             addAsSingletonList("§cassuming 19.9 instead.")
         } else {
             if (blocksPerSecond < 15.0) {
-                add(listOf("§7Your latest ", crop.icon, "§7blocks/second: §e${blocksPerSecond.round(2)}"))
+                add(listOf("§7Your latest ", crop.icon, "§7blocks/second: §e${blocksPerSecond.roundTo(2)}"))
                 add(listOf("§cThis is too low, showing 19.9 Blocks/second instead!"))
                 blocksPerSecond = 19.9
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
index 3d4fef9a3c66..144abc0c2486 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt
@@ -6,8 +6,8 @@ import at.hannibal2.skyhanni.events.FarmingContestEvent
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -41,7 +41,7 @@ object JacobContestStatsSummary {
 
             FarmingContestPhase.STOP -> {
                 val duration = startTime.passedSince()
-                val blocksPerSecond = (blocksBroken.toDouble() / duration.inWholeSeconds).round(2)
+                val blocksPerSecond = (blocksBroken.toDouble() / duration.inWholeSeconds).roundTo(2)
                 val cropName = event.crop.cropName
                 ChatUtils.chat("Stats for $cropName Contest:")
                 val time = duration.format()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
index 3e99c2683fd2..bb9f9ea21773 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
@@ -11,8 +11,8 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -102,7 +102,7 @@ object JacobContestTimeNeeded {
             return
         }
 
-        val speed = (ff * crop.baseDrops * bps / 100).round(1).toInt()
+        val speed = (ff * crop.baseDrops * bps / 100).roundTo(1).toInt()
 
         renderCrop(speed, crop, averages, sorted, map)
     }
@@ -174,7 +174,7 @@ object JacobContestTimeNeeded {
             add("")
             val latestFF = crop.getLatestTrueFarmingFortune() ?: 0.0
             add("§7Latest FF: §e${(latestFF).addSeparators()}")
-            val bps = crop.getBps()?.round(1) ?: 0
+            val bps = crop.getBps()?.roundTo(1) ?: 0
             add("§7${addBpsTitle()}§e${bps.addSeparators()}")
             addAll(lowBPSWarning)
         })
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
index aa977b65a575..74c59674f580 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
@@ -9,8 +9,8 @@ import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -91,7 +91,7 @@ object CropSpeedMeter {
             currentCrop?.let {
                 val crops = it.getCounter() - startCrops[it]!!
                 val blocks = currentBlocks
-                val cropsPerBlocks = (crops.toDouble() / blocks.toDouble()).round(3)
+                val cropsPerBlocks = (crops.toDouble() / blocks.toDouble()).roundTo(3)
 
                 val list = mutableListOf<String>()
                 list.add("")
@@ -101,7 +101,7 @@ object CropSpeedMeter {
                 list.add(" §7Crops per Block: " + cropsPerBlocks.addSeparators())
 
                 val baseDrops = it.baseDrops
-                val farmingFortune = (cropsPerBlocks * 100 / baseDrops).round(3)
+                val farmingFortune = (cropsPerBlocks * 100 / baseDrops).roundTo(3)
 
                 list.add(" §7Calculated farming Fortune: §e" + farmingFortune.addSeparators())
                 list.add("§cOpen /cropmilestones again to recalculate!")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 1fa4b57e6a56..da461d749604 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -23,8 +23,8 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.APIUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -234,7 +234,7 @@ object FarmingWeightDisplay {
         }
 
         val totalWeight = (localWeight + weight)
-        return "§e" + totalWeight.round(2).addSeparators()
+        return "§e" + totalWeight.roundTo(2).addSeparators()
     }
 
     private fun getRankGoal(): Int {
@@ -326,7 +326,7 @@ object FarmingWeightDisplay {
             " §7(§b$format§7)"
         } else ""
 
-        val weightFormat = weightUntilOvertake.round(2).addSeparators()
+        val weightFormat = weightUntilOvertake.roundTo(2).addSeparators()
         val text = "§e$weightFormat$timeFormat §7behind §b$nextName"
         return if (showRankGoal) {
             Renderable.string(text)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index c37eb41b7cdf..7189199a9987 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -26,8 +26,8 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -187,7 +187,7 @@ object GardenCropMilestoneDisplay {
 
         val farmingFortune = FarmingFortuneDisplay.getCurrentFarmingFortune()
         val speed = GardenCropSpeed.averageBlocksPerSecond
-        val farmingFortuneSpeed = ((100.0 + farmingFortune) * crop.baseDrops * speed / 100).round(1).toInt()
+        val farmingFortuneSpeed = ((100.0 + farmingFortune) * crop.baseDrops * speed / 100).roundTo(1).toInt()
 
         if (farmingFortuneSpeed > 0) {
             crop.setSpeed(farmingFortuneSpeed)
@@ -219,7 +219,7 @@ object GardenCropMilestoneDisplay {
             val hourFormat = (farmingFortuneSpeed * 60 * 60).addSeparators()
             lineMap[MilestoneTextEntry.CROPS_PER_HOUR] = Renderable.string("§7Crops/Hour§8: §e$hourFormat")
 
-            val formatBps = speed.round(config.blocksBrokenPrecision).addSeparators()
+            val formatBps = speed.roundTo(config.blocksBrokenPrecision).addSeparators()
             lineMap[MilestoneTextEntry.BLOCKS_PER_SECOND] = Renderable.string("§7Blocks/Second§8: §e$formatBps")
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
index cb63d40de1d8..e407d0ad4deb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
@@ -14,8 +14,8 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
@@ -76,7 +76,7 @@ object FarmingLaneFeatures {
 
         if (config.distanceDisplay) {
             display = buildList {
-                add("§7Distance until switch: §e${currentDistance.round(1)}")
+                add("§7Distance until switch: §e${currentDistance.roundTo(1)}")
 
                 val normal = movementState == MovementState.NORMAL
                 val color = if (normal) "§b" else "§8"
@@ -152,7 +152,7 @@ object FarmingLaneFeatures {
     private var sameSpeedCounter = 0
 
     private fun calculateSpeed(): Boolean {
-        val speed = MovementSpeedDisplay.speed.round(2)
+        val speed = MovementSpeedDisplay.speed.roundTo(2)
         movementState = calculateMovementState(speed)
         if (movementState != MovementState.NORMAL) return false
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt
index 7a2f8d415584..e0cb070739b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt
@@ -12,8 +12,8 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.indexOfFirst
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.StringUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -35,7 +35,7 @@ object GardenCropMilestoneInventory {
             val tier = GardenCropMilestones.getTierForCropCount(counter, cropType, allowOverflow)
             tiers.add(tier.toDouble())
         }
-        average = (tiers.sum() / CropType.entries.size).round(2)
+        average = (tiers.sum() / CropType.entries.size).roundTo(2)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
index 5ef15090739a..078ef16724d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
@@ -12,12 +12,12 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.loreCosts
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -115,7 +115,7 @@ object SkyMartCopperPrice {
         event.move(3, "garden.skyMartCopperPriceAdvancedStats", "garden.skyMart.copperPriceAdvancedStats")
         event.move(3, "garden.skyMartCopperPricePos", "garden.skyMart.copperPricePos")
         event.transform(32, "garden.skyMart.itemScale") {
-            JsonPrimitive((it.asDouble / 1.851).round(1))
+            JsonPrimitive((it.asDouble / 1.851).roundTo(1))
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
index 3724dbc53576..eebbb19e93a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
@@ -14,11 +14,11 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
 import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -334,7 +334,7 @@ object ChocolateFactoryDataLoader {
         val itemName = item.name.removeColor()
         val lore = item.getLore()
         val upgradeCost = ChocolateFactoryAPI.getChocolateBuyCost(lore)
-        val averageChocolate = ChocolateAmount.averageChocPerSecond().round(2)
+        val averageChocolate = ChocolateAmount.averageChocPerSecond().roundTo(2)
         val isMaxed = upgradeCost == null
 
         if (slotIndex in ChocolateFactoryAPI.rabbitSlots) {
@@ -415,8 +415,8 @@ object ChocolateFactoryDataLoader {
         newAverageChocolate: Double,
         isRabbit: Boolean,
     ) {
-        val extra = (newAverageChocolate - averageChocolate).round(2)
-        val effectiveCost = (upgradeCost!! / extra).round(2)
+        val extra = (newAverageChocolate - averageChocolate).roundTo(2)
+        val effectiveCost = (upgradeCost!! / extra).roundTo(2)
         val upgrade = ChocolateFactoryUpgrade(slotIndex, level, upgradeCost, extra, effectiveCost, isRabbit = isRabbit)
         list.add(upgrade)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
index 8973bc1e4fbe..88ac9d4747ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
@@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.features.inventory.chocolatefactory
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI.profileStorage
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -35,7 +35,7 @@ object ChocolateFactoryTooltip {
 
         if (upgradeInfo.effectiveCost == null) return
 
-        event.toolTip.add("§7Extra: §6${upgradeInfo.extraPerSecond?.round(2) ?: "N/A"} §7choc/s")
+        event.toolTip.add("§7Extra: §6${upgradeInfo.extraPerSecond?.roundTo(2) ?: "N/A"} §7choc/s")
         event.toolTip.add("§7Effective Cost: §6${upgradeInfo.effectiveCost.addSeparators() ?: "N/A"}")
 
         if (slotIndex == ChocolateFactoryAPI.timeTowerIndex) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index de7bc8bdf77f..020feba76976 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -2,10 +2,10 @@ package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown
 
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import kotlin.math.floor
 
 enum class ItemAbility(
@@ -106,7 +106,7 @@ enum class ItemAbility(
             duration /= 100
             var d = duration.toDouble()
             d /= 10.0
-            d.round(1).addSeparators()
+            d.roundTo(1).addSeparators()
         } else {
             duration /= 1000
             duration++
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index 567adb251af5..5748220c5e38 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -23,8 +23,8 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.between
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
@@ -168,7 +168,7 @@ object ItemAbilityCooldown {
                 ItemAbility.STAFF_OF_THE_VOLCANO.sound()
             }
             // Holy Ice
-            event.soundName == "random.drink" && event.pitch.round(1) == 1.8f && event.volume == 1.0f -> {
+            event.soundName == "random.drink" && event.pitch.roundTo(1) == 1.8f && event.volume == 1.0f -> {
                 ItemAbility.HOLY_ICE.sound()
             }
             // Royal Pigeon
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index ec9a390edff0..4415b59f5872 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -17,8 +17,8 @@ import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.PityBlock.Comp
 import at.hannibal2.skyhanni.features.mining.OreType.Companion.getOreType
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -118,7 +118,7 @@ object MineshaftPityDisplay {
                 add("§7Pity Counter: §e$pityCounter")
                 add(
                     "§7Chance: " +
-                        "§e1§6/§e${chance.round(1)} " +
+                        "§e1§6/§e${chance.roundTo(1)} " +
                         "§7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
                 )
                 minedBlocks.forEach {
@@ -214,7 +214,7 @@ object MineshaftPityDisplay {
             MineshaftPityLine.COUNTER to Renderable.string("§3Pity Counter: §e$counterUntilPity§6/§e$MAX_COUNTER"),
             MineshaftPityLine.CHANCE to Renderable.string(
                 "§3Chance: §e1§6/§e${
-                    chance.round(1).addSeparators()
+                    chance.roundTo(1).addSeparators()
                 } §7(§b${((1.0 / chance) * 100).addSeparators()}%§7)",
             ),
             MineshaftPityLine.NEEDED_TO_PITY to neededToPityRenderable,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
index 58fa83753fe9..e268beb16f94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/PowderPerHotmPerk.kt
@@ -6,9 +6,9 @@ import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.fractionOf
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -48,7 +48,7 @@ object PowderPerHotmPerk {
     private fun handlePowderSpend(perk: HotmData): String {
         val currentPowderSpend = perk.calculateTotalCost(perk.rawLevel)
         val maxPowderNeeded = perk.totalCostMaxLevel
-        val percentage = (currentPowderSpend.fractionOf(maxPowderNeeded) * 100).round(2)
+        val percentage = (currentPowderSpend.fractionOf(maxPowderNeeded) * 100).roundTo(2)
 
         return when (config.powderSpentDesign) {
             PowderSpentDesign.NUMBER -> {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
index 82fc73030a45..cb50e3c85459 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
@@ -17,7 +17,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
@@ -218,7 +218,7 @@ object FossilSolverDisplay {
     }
 
     fun nextData(slotToClick: FossilTile, correctPercentage: Double, fossilsRemaining: Int) {
-        val formattedPercentage = (correctPercentage * 100).round(1)
+        val formattedPercentage = (correctPercentage * 100).roundTo(1)
 
         possibleFossilsRemaining = fossilsRemaining
         FossilSolverDisplay.slotToClick = slotToClick.toSlotIndex()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index d5e57d513380..3c1e844a628a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -23,7 +23,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -164,7 +164,7 @@ object IslandAreas {
                 }
             }
 
-            val distance = difference.round(1)
+            val distance = difference.roundTo(1)
             val text = "${coloredName}§7: §e$distance$suffix"
 
             if (!foundCurrentArea) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt
index 50148f031878..685ffa3cdc25 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Blocks
@@ -59,7 +59,7 @@ object MovementSpeedDisplay {
         }
         usingSoulsandSpeed = movingOnSoulsand && soulsandSpeeds.size == 6
         if (isEnabled()) {
-            display = "Movement Speed: ${speed.round(2)}"
+            display = "Movement Speed: ${speed.roundTo(2)}"
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
index 0a3a60295371..01d84daa3fdc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
@@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.concurrent.fixedRateTimer
@@ -55,7 +55,7 @@ object TpsCounter {
                 "§eTPS: §f(${current}s)"
             } else {
                 val sum = tpsList.sum().toDouble()
-                var tps = (sum / tpsList.size).round(1)
+                var tps = (sum / tpsList.size).roundTo(1)
                 if (tps > 20) tps = 20.0
                 val color = getColor(tps)
                 "§eTPS: $color$tps"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
index 7f041bc27f9a..f1fad4e63aca 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
@@ -14,10 +14,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils
 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.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -160,7 +160,7 @@ object UserLuckBreakdown {
             skillCalcCoolDown = SimpleTimeMark.now()
             calcSkillLuck()
         }
-        val limboLuck = storage?.limbo?.userLuck?.round(1) ?: 0.0f
+        val limboLuck = storage?.limbo?.userLuck?.roundTo(1) ?: 0.0f
         when (event.slot.inventory.name) {
             "Your Equipment and Stats" -> equipmentMenuTooltip(event, limboLuck)
             "Your Stats Breakdown" -> statsBreakdownLoreTooltip(event, limboLuck)
@@ -270,7 +270,7 @@ object UserLuckBreakdown {
         calcSkillLuck()
         return when (type) {
             "mainMenu" -> {
-                val luckString = tryTruncateFloat(luckInput.round(2))
+                val luckString = tryTruncateFloat(luckInput.roundTo(2))
                 if (luckInput == 0.0f) {
                     arrayOf(
                         "§7SkyHanni User Luck is the best stat.",
@@ -293,7 +293,7 @@ object UserLuckBreakdown {
             }
 
             "limbo" -> {
-                val luckString = tryTruncateFloat(luckInput.round(2))
+                val luckString = tryTruncateFloat(luckInput.roundTo(2))
                 arrayOf(
                     "§8Action",
                     "",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
index 666671e9ca3f..1c46b40d6529 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
@@ -8,10 +8,10 @@ import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -105,7 +105,7 @@ object LimboPlaytime {
         if ((wholeMinutes % 60) == 0) {
             hoursString = "$wholeHours"
         } else {
-            val minutes: Float = ((wholeMinutes - wholeHours * 60).toFloat() / 60).round(1)
+            val minutes: Float = ((wholeMinutes - wholeHours * 60).toFloat() / 60).roundTo(1)
             hoursString = wholeHours.addSeparators()
             if (findFloatDecimalPlace(minutes) != 0) {
                 val minutesString = minutes.toString()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
index 62f4c46561c6..bfb8ce715d2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -116,7 +116,7 @@ object LimboTimeTracker {
         if (passedSince > currentPB) {
             oldPB = currentPB
             storage?.personalBest = passedSince.toInt(DurationUnit.SECONDS)
-            userLuck = ((storage?.personalBest ?: 0) * USER_LUCK_MULTIPLIER).round(2)
+            userLuck = ((storage?.personalBest ?: 0) * USER_LUCK_MULTIPLIER).roundTo(2)
             if (onFire) userLuck *= FIRE_MULTIPLIER
             ChatUtils.chat("§fYou were in Limbo for §e$duration§f! §d§lPERSONAL BEST§r§f!")
             if (oldPB != 0.seconds) {
@@ -126,9 +126,9 @@ object LimboTimeTracker {
         } else ChatUtils.chat("§fYou were in Limbo for §e$duration§f.")
         if (userLuck > oldLuck) {
             if (onFire) {
-                ChatUtils.chat("§fYour §aPersonal Bests§f perk is now granting you §a+${userLuck.round(2)}§c✴ §aSkyHanni User Luck§f! ")
+                ChatUtils.chat("§fYour §aPersonal Bests§f perk is now granting you §a+${userLuck.roundTo(2)}§c✴ §aSkyHanni User Luck§f! ")
             } else {
-                ChatUtils.chat("§fYour §aPersonal Bests§f perk is now granting you §a+${userLuck.round(2)}✴ SkyHanni User Luck§f!")
+                ChatUtils.chat("§fYour §aPersonal Bests§f perk is now granting you §a+${userLuck.roundTo(2)}✴ SkyHanni User Luck§f!")
             }
             storage?.userLuck = userLuck
         }
@@ -152,7 +152,7 @@ object LimboTimeTracker {
             val currentPB = storage?.personalBest ?: 0
             val userLuck = storage?.userLuck ?: 0f
             val limboPB: Int = if (currentPB < timeInLimbo) timeInLimbo else currentPB
-            var luckString = tryTruncateFloat(userLuck.round(2))
+            var luckString = tryTruncateFloat(userLuck.roundTo(2))
             if (userLuck > 0) luckString = "+$luckString"
             var firstMessage =
                 "§fYour current PB is §e${limboPB.seconds}§f, granting you §a$luckString✴ SkyHanni User Luck§f!"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
index 8e544a3dfefc..e5c3179cc4a9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pets/PetExpTooltip.kt
@@ -11,8 +11,8 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPetExp
@@ -36,7 +36,7 @@ object PetExpTooltip {
         if (!KeyboardManager.isShiftKeyDown() && !config.showAlways) return
 
         val itemStack = event.itemStack
-        val petExperience = itemStack.getPetExp()?.round(1) ?: return
+        val petExperience = itemStack.getPetExp()?.roundTo(1) ?: return
         val name = itemStack.name
         try {
 
@@ -105,7 +105,7 @@ object PetExpTooltip {
         val maxLevel = if (useGoldenDragonLevels) 200 else 100
 
         val maxXp = when {
-            useGoldenDragonLevels -> LEVEL_200_LEGENDARY // lvl 200 legendary
+            useGoldenDragonLevels -> LEVEL_200_LEGENDARY
             petName.contains("Bingo") -> LEVEL_100_COMMON
 
             else -> LEVEL_100_LEGENDARY
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
index b0d4676f2e31..9c65a273e867 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getLivingMetalProgress
 import net.minecraft.item.ItemStack
@@ -39,7 +39,7 @@ object LivingMetalSuitProgress {
 
         if (progressMap.isEmpty()) return@buildList
 
-        val totalProgress = progressMap.values.map { it ?: 1.0 }.average().roundToPrecision(1)
+        val totalProgress = progressMap.values.map { it ?: 1.0 }.average().roundTo(1)
         val formatPercentage = LorenzUtils.formatPercentage(totalProgress)
         addAsSingletonList("§7Living Metal Suit Progress: ${if (isMaxed) "§a§lMAXED!" else "§a$formatPercentage"}")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index ccdb19fc5094..c333550f6349 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -80,7 +80,7 @@ object CruxTalismanDisplay {
                 }
             }
         }
-        percentValue = ((percent.toDouble() / 600) * 100).roundToPrecision(1)
+        percentValue = ((percent.toDouble() / 600) * 100).roundTo(1)
         if (bonusesLine.isNotEmpty() && config.showBonuses.get()) {
             addAsSingletonList("§7Bonuses:")
             bonusesLine.forEach { addAsSingletonList("  $it") }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
index d1ada6a38e98..4fc0ccbf5fce 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
@@ -9,8 +9,8 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
@@ -79,7 +79,7 @@ object RiftMotesOrb {
             val ageInSeconds = (System.currentTimeMillis() - orb.startTime).toDouble() / 1000
             if (ageInSeconds < 0.5) continue
 
-            val particlesPerSecond = (orb.counter.toDouble() / ageInSeconds).round(1)
+            val particlesPerSecond = (orb.counter.toDouble() / ageInSeconds).roundTo(1)
             if (particlesPerSecond < 60 || particlesPerSecond > 90) continue
             orb.isOrb = true
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index 87228447fadc..a16f78b52e45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -23,7 +23,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.interpolate
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.Quad
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
@@ -441,7 +441,7 @@ object SkillProgress {
             val percent = if (currentXpMax == 0L) 100F else 100F * currentXp / currentXpMax
 
             if (config.usePercentage.get())
-                append("§7(§6${percent.roundToPrecision(2)}%§7)")
+                append("§7(§6${percent.roundTo(2)}%§7)")
             else {
                 if (currentXpMax == 0L)
                     append("§7(§6${currentXp.addSeparators()}§7)")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt
index 0a94f9ee8b28..8c1d3f618c29 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt
@@ -10,7 +10,7 @@ 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.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.toRoman
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.StringUtils.isRoman
@@ -40,7 +40,7 @@ object SkillTooltip {
                 val maxReached = "§7§8Max Skill level reached!"
                 if (line.contains(maxReached) && overflowConfig.enableInSkillMenuTooltip) {
                     val progress = (skillInfo.overflowCurrentXp.toDouble() / skillInfo.overflowCurrentXpMax) * 100
-                    val percent = "§e${progress.roundToPrecision(1)}%"
+                    val percent = "§e${progress.roundTo(1)}%"
                     val currentLevel = skillInfo.overflowLevel
 
                     val level = if (useRoman) currentLevel.toRoman() else currentLevel
@@ -74,7 +74,7 @@ object SkillTooltip {
                     val progress = have.toDouble() / need
                     val progressBar = StringUtils.progressBar(progress)
                     val nextLevel = if (useRoman) targetLevel.toRoman() else targetLevel
-                    val percent = "§e${(progress * 100).roundToPrecision(1)}%"
+                    val percent = "§e${(progress * 100).roundTo(1)}%"
                     iterator.add("")
                     iterator.add("§7Progress to Level $nextLevel: $percent")
                     iterator.add("$progressBar §e${have.addSeparators()}§6/§e${need.addSeparators()}")
diff --git a/src/main/java/at/hannibal2/skyhanni/test/PacketTest.kt b/src/main/java/at/hannibal2/skyhanni/test/PacketTest.kt
index 99dd9fcbfc76..a0ab34edee3a 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/PacketTest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/PacketTest.kt
@@ -7,9 +7,9 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.isInt
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.toLorenzVec
@@ -187,7 +187,7 @@ object PacketTest {
     }
 
     private fun getDistance(location: LorenzVec?): Double {
-        return location?.distanceToPlayer()?.round(1) ?: 0.0
+        return location?.distanceToPlayer()?.roundTo(1) ?: 0.0
     }
 
     private fun getLocation(packet: Packet<*>, entity: Entity?): LorenzVec? {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index c0c03b6771ab..156ce82a31c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -38,7 +38,6 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzDebug
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -47,6 +46,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.ReflectionUtils.makeAccessible
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
@@ -324,9 +324,9 @@ object SkyHanniDebugsAndTests {
 
     fun copyLocation(args: Array<String>) {
         val location = LocationUtils.playerLocation()
-        val x = (location.x + 0.001).round(1)
-        val y = (location.y + 0.001).round(1)
-        val z = (location.z + 0.001).round(1)
+        val x = (location.x + 0.001).roundTo(1)
+        val y = (location.y + 0.001).roundTo(1)
+        val z = (location.z + 0.001).roundTo(1)
         if (args.size == 1 && args[0].equals("json", false)) {
             OSUtils.copyToClipboard("\"$x:$y:$z\"")
             return
@@ -576,7 +576,8 @@ object SkyHanniDebugsAndTests {
         }.editCopy {
             this.add(
                 0,
-                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.round(1).toString()) }.toList(),
+                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.roundTo(1).toString()) }
+                    .toList(),
             )
         }
         config.debugItemPos.renderRenderables(
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
index 0892d11252a1..69c16daeb414 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
@@ -116,7 +116,7 @@ object TrackParticlesCommand {
                 event.drawDynamicText(key, "§7§l${particle.type}", 0.8)
                 event.drawDynamicText(
                     key.up(-0.2),
-                    "§7C: §e${particle.count} §7S: §a${particle.speed.round(2)}",
+                    "§7C: §e${particle.count} §7S: §a${particle.speed.roundTo(2)}",
                     scaleMultiplier = 0.8
                 )
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
index 50b0c417dc85..1fadab62da24 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
@@ -123,7 +123,7 @@ object TrackSoundsCommand {
                 event.drawDynamicText(key, "§7§l${sound.soundName}", 0.8)
                 event.drawDynamicText(
                     key.up(-0.2),
-                    "§7P: §e${sound.pitch.round(2)} §7V: $volumeColor${sound.volume.round(2)}",
+                    "§7P: §e${sound.pitch.roundTo(2)} §7V: $volumeColor${sound.volume.roundTo(2)}",
                     scaleMultiplier = 0.8,
                 )
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
index ba1081a5f3dd..121b9cce337a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
@@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.config.features.skillprogress.SkillProgressBarConfig
 import at.hannibal2.skyhanni.features.chroma.ChromaShaderManager
 import at.hannibal2.skyhanni.features.chroma.ChromaType
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NumberUtil.fractionOf
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import net.minecraft.client.Minecraft
@@ -204,7 +204,7 @@ object GuiRenderUtils {
                                 scale = scale, horizontalAlign = HorizontalAlignment.LEFT,
                             ),
                             Renderable.string(
-                                "§2${(percent * 100).round(1)}%",
+                                "§2${(percent * 100).roundTo(1)}%",
                                 scale = scale,
                                 horizontalAlign = HorizontalAlignment.RIGHT,
                             ),
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 1fd5419d9622..cd96121c426d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.test.TestBingo
 import at.hannibal2.skyhanni.utils.ChatUtils.lastButtonClicked
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
 import at.hannibal2.skyhanni.utils.StringUtils.capAtMinecraftLength
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -100,23 +101,11 @@ object LorenzUtils {
         return originalMessage.stripHypixelMessage()
     }
 
-    fun Double.round(decimals: Int): Double {
-        var multiplier = 1.0
-        repeat(decimals) { multiplier *= 10 }
-        val result = kotlin.math.round(this * multiplier) / multiplier
-        val a = result.toString()
-        val b = toString()
-        return if (a.length > b.length) this else result
-    }
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    fun Double.round(decimals: Int) = this.roundTo(decimals)
 
-    fun Float.round(decimals: Int): Float {
-        var multiplier = 1.0
-        repeat(decimals) { multiplier *= 10 }
-        val result = kotlin.math.round(this * multiplier) / multiplier
-        val a = result.toString().length
-        val b = toString().length
-        return if (a > b) this else result.toFloat()
-    }
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    fun Float.round(decimals: Int) = this.roundTo(decimals)
 
     // TODO replace all calls with regex
     @Deprecated("Do not use complicated string operations", ReplaceWith("Regex"))
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index a573ed78daeb..2e5748c6c590 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.entity.Entity
 import net.minecraft.network.play.server.S2APacketParticles
@@ -153,12 +153,12 @@ data class LorenzVec(
         return result
     }
 
-    fun round(decimals: Int) = LorenzVec(x.round(decimals), y.round(decimals), z.round(decimals))
+    fun round(decimals: Int) = LorenzVec(x.roundTo(decimals), y.roundTo(decimals), z.roundTo(decimals))
 
     fun roundLocationToBlock(): LorenzVec {
-        val x = (x - .499999).round(0)
-        val y = (y - .499999).round(0)
-        val z = (z - .499999).round(0)
+        val x = (x - .499999).roundTo(0)
+        val y = (y - .499999).roundTo(0)
+        val z = (z - .499999).roundTo(0)
         return LorenzVec(x, y, z)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index 4d5fe0a1dd6f..58441ecabc4b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -1,13 +1,11 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import java.text.NumberFormat
 import java.util.Locale
 import java.util.TreeMap
 import kotlin.math.pow
-import kotlin.math.roundToInt
 
 object NumberUtil {
 
@@ -83,21 +81,21 @@ object NumberUtil {
      * @link https://stackoverflow.com/a/22186845
      * @author jpdymond
      */
-    fun Double.roundToPrecision(precision: Int): Double { // TODO is this the same as LorenzUtils.round() ?
-        val scale = 10.0.pow(precision).toInt()
-        return (this * scale).roundToInt().toDouble() / scale
+    fun Double.roundTo(precision: Int): Double {
+        val scale = 10.0.pow(precision)
+        return kotlin.math.round(scale) / scale
     }
 
-    /**
-     * This code was unmodified and taken under CC BY-SA 3.0 license
-     * @link https://stackoverflow.com/a/22186845
-     * @author jpdymond
-     */
-    fun Float.roundToPrecision(precision: Int): Float {
-        val scale = 10.0.pow(precision).toInt()
-        return (this * scale).roundToInt().toFloat() / scale
+    fun Float.roundTo(precision: Int): Float {
+        return toDouble().roundTo(precision).toFloat()
     }
 
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    fun Double.roundToPrecision(precision: Int) = this.roundTo(precision)
+
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    fun Float.roundToPrecision(precision: Int) = this.roundTo(precision)
+
     fun Number.ordinal(): String {
         val long = this.toLong()
         if (long % 100 in 11..13) return "th"
@@ -209,7 +207,7 @@ object NumberUtil {
     fun Number.percentWithColorCode(max: Number, round: Int = 1): String {
         val fraction = this.fractionOf(max)
         val color = percentageColor(fraction)
-        val amount = (fraction * 100.0).round(round)
+        val amount = (fraction * 100.0).roundTo(round)
         return "${color.getChatColor()}$amount%"
     }
 

From a8be86761f6302894346498df121a499be3f93ad Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:19:44 +0200
Subject: [PATCH 544/721] fix rounding

---
 .../experimentationtable/ExperimentsProfitTracker.kt        | 4 ++--
 src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt    | 4 ++--
 src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt     | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
index 7b6fa9bc5f1e..6e755d874018 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -25,10 +25,10 @@ import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -162,7 +162,7 @@ object ExperimentsProfitTracker {
                 val price = internalName.getPrice()
                 val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0
                 val maxPrice = npcPrice.coerceAtLeast(price)
-                startCostTemp += maxPrice.round(0).toInt()
+                startCostTemp += maxPrice.roundTo(0).toInt()
                 iterator.remove()
             }
             tracker.modify {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index cd96121c426d..e4e74b0d213f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -101,10 +101,10 @@ object LorenzUtils {
         return originalMessage.stripHypixelMessage()
     }
 
-    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(decimals)"))
     fun Double.round(decimals: Int) = this.roundTo(decimals)
 
-    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(decimals)"))
     fun Float.round(decimals: Int) = this.roundTo(decimals)
 
     // TODO replace all calls with regex
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index 58441ecabc4b..dc7c4828c431 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -83,12 +83,10 @@ object NumberUtil {
      */
     fun Double.roundTo(precision: Int): Double {
         val scale = 10.0.pow(precision)
-        return kotlin.math.round(scale) / scale
+        return kotlin.math.round(this * scale) / scale
     }
 
-    fun Float.roundTo(precision: Int): Float {
-        return toDouble().roundTo(precision).toFloat()
-    }
+    fun Float.roundTo(precision: Int): Float = toDouble().roundTo(precision).toFloat()
 
     @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
     fun Double.roundToPrecision(precision: Int) = this.roundTo(precision)

From 9a3620ea19f08104cc97560bb16feb2092b85847 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:20:03 +0200
Subject: [PATCH 545/721] code cleanup

---
 .../at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
index ad03a7784cf3..171df87e70ab 100755
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
@@ -30,7 +30,7 @@ object GardenYawAndPitch {
         if (GardenAPI.toolInHand == null && !config.showWithoutTool) return
 
         val player = Minecraft.getMinecraft().thePlayer
-        var yaw = LocationUtils.calculatePlayerYaw()
+        val yaw = LocationUtils.calculatePlayerYaw()
         val pitch = player.rotationPitch
 
         if (yaw != lastYaw || pitch != lastPitch) {

From e4821befd023da38f8a054773e38b3f9a6f28210 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:20:33 +0200
Subject: [PATCH 546/721] replacing round to roundTo in LorenzVec

---
 .../java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt     | 2 +-
 .../at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt    | 4 ++--
 .../skyhanni/features/combat/mobs/ArachneSpawnTimer.kt      | 2 +-
 .../skyhanni/features/garden/pests/PestParticleWaypoint.kt  | 4 ++--
 .../features/mining/glacitemineshaft/MineshaftWaypoints.kt  | 2 +-
 .../hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt | 2 +-
 .../at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt    | 2 +-
 src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt      | 6 +++++-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
index 386167123768..96f228a6ba85 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt
@@ -11,7 +11,7 @@ class PlaySoundEvent(val soundName: String, val location: LorenzVec, val pitch:
 
     val distanceToPlayer by lazy { location.distanceToPlayer() }
     override fun toString(): String {
-        return "PlaySoundEvent(soundName='$soundName', pitch=$pitch, volume=$volume, location=${location.round(1)}, distanceToPlayer=${
+        return "PlaySoundEvent(soundName='$soundName', pitch=$pitch, volume=$volume, location=${location.roundTo(1)}, distanceToPlayer=${
             distanceToPlayer.roundTo(1)
         })"
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
index 7c695c7eec2f..75fe8af8a3c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt
@@ -21,8 +21,8 @@ class ReceiveParticleEvent(
     val distanceToPlayer by lazy { location.distanceToPlayer() }
 
     override fun toString(): String {
-        return "ReceiveParticleEvent(type='$type', location=${location.round(1)}, count=$count, speed=$speed, offset=${
-            offset.round(
+        return "ReceiveParticleEvent(type='$type', location=${location.roundTo(1)}, count=$count, speed=$speed, offset=${
+            offset.roundTo(
                 1
             )
         }, longDistance=$longDistance, particleArgs=${particleArgs.contentToString()}, distanceToPlayer=${
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
index 2fee0577e8f6..d2e6f7ed67e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneSpawnTimer.kt
@@ -99,7 +99,7 @@ object ArachneSpawnTimer {
 
         val packet = event.packet
         if (packet is S2APacketParticles) {
-            val location = packet.toLorenzVec().round(2)
+            val location = packet.toLorenzVec().roundTo(2)
             if (arachneAltarLocation.distance(location) > 30) return
             if (packet.particleType == EnumParticleTypes.REDSTONE && packet.particleSpeed == 1.0f) {
                 particleCounter += 1
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index 23ead6f911d0..d07e55816732 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -86,7 +86,7 @@ object PestParticleWaypoint {
         val yellow = LorenzVec(0.8, 0.8, 0.0)
         val redPest = LorenzVec(0.8, 0.4, 0.0)
         val redPlot = LorenzVec(0.8, 0.0, 0.0)
-        isPointingToPest = when (event.offset.round(5)) {
+        isPointingToPest = when (event.offset.roundTo(5)) {
             redPlot -> false
             redPest, yellow, darkYellow -> true
             else -> return
@@ -150,7 +150,7 @@ object PestParticleWaypoint {
             waypoint,
             color,
             3,
-            false
+            false,
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
index 7476e212b455..ae17e783bb16 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
@@ -38,7 +38,7 @@ object MineshaftWaypoints {
     fun onIslandChange(event: IslandChangeEvent) {
         if (event.newIsland != IslandType.MINESHAFT) return
 
-        val playerLocation = LocationUtils.playerLocation().round(0).add(y = -1)
+        val playerLocation = LocationUtils.playerLocation().roundTo(0).add(y = -1)
 
         if (config.mineshaftWaypoints.entranceLocation) {
             waypoints.add(MineshaftWaypoint(waypointType = MineshaftWaypointType.ENTRANCE, location = playerLocation))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt
index 2188cb1744f0..94fefbdf8042 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt
@@ -29,7 +29,7 @@ object TrevorSolver {
     var averageHeight = (minHeight + maxHeight) / 2
 
     fun findMobHeight(height: Int, above: Boolean) {
-        val playerPosition = LocationUtils.playerLocation().round(2)
+        val playerPosition = LocationUtils.playerLocation().roundTo(2)
         val mobHeight = if (above) playerPosition.y + height else playerPosition.y - height
         if (maxHeight == 0.0) {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 156ce82a31c3..cac3349e11bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -606,7 +606,7 @@ object SkyHanniDebugsAndTests {
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
 //        val particleType = event.type
-//        val distance = LocationUtils.playerLocation().distance(event.location).round(2)
+//        val distance = LocationUtils.playerLocation().distance(event.location).roundTo(2)
 //
 //        println("")
 //        println("particleType: $particleType")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 2e5748c6c590..6769210ef26b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -153,7 +153,10 @@ data class LorenzVec(
         return result
     }
 
-    fun round(decimals: Int) = LorenzVec(x.roundTo(decimals), y.roundTo(decimals), z.roundTo(decimals))
+    @Deprecated("Use roundTo instead", ReplaceWith("this.roundTo(precision)"))
+    fun round(precision: Int) = roundTo(precision)
+
+    fun roundTo(precision: Int) = LorenzVec(x.roundTo(precision), y.roundTo(precision), z.roundTo(precision))
 
     fun roundLocationToBlock(): LorenzVec {
         val x = (x - .499999).roundTo(0)
@@ -164,6 +167,7 @@ data class LorenzVec(
 
     fun slope(other: LorenzVec, factor: Double) = this + (other - this).scale(factor)
 
+    // TODO better name. dont confuse with roundTo()
     fun roundLocation(): LorenzVec {
         val x = if (this.x < 0) x.toInt() - 1 else x.toInt()
         val y = y.toInt() - 1

From cf039c7e215b26f78eeb468cd911c5d8f8586115 Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:26:42 +0200
Subject: [PATCH 547/721] Improvement: Option to hide all Tooltips inside of
 Excavator (#2579)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/ExcavatorTooltipHiderConfig.java   | 21 ++++++++++++++
 .../mining/FossilExcavatorConfig.java         | 13 ++++-----
 .../fossilexcavator/ExcavatorTooltipHider.kt  | 28 +++++++++++++++++--
 3 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/ExcavatorTooltipHiderConfig.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/ExcavatorTooltipHiderConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/ExcavatorTooltipHiderConfig.java
new file mode 100644
index 000000000000..b1489ace876a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/ExcavatorTooltipHiderConfig.java
@@ -0,0 +1,21 @@
+package at.hannibal2.skyhanni.config.features.mining;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ExcavatorTooltipHiderConfig {
+
+    @Expose
+    @ConfigOption(name = "Hide Dirt", desc = "Hides tooltips of the Dirt inside of the Fossil Excavator.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideDirt = true;
+
+    @Expose
+    @ConfigOption(name = "Hide Everything", desc = "Hide all tooltips inside of the Fossil Excavator.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hideEverything = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
index 8dfb12854232..8445afe5336a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/FossilExcavatorConfig.java
@@ -18,6 +18,11 @@ public class FossilExcavatorConfig {
     @Accordion
     public ExcavatorProfitTrackerConfig profitTracker = new ExcavatorProfitTrackerConfig();
 
+    @Expose
+    @ConfigOption(name = "Excavator Tooltip Hider", desc = "")
+    @Accordion
+    public ExcavatorTooltipHiderConfig tooltipHider = new ExcavatorTooltipHiderConfig();
+
     @Expose
     @ConfigOption(
         name = "Profit per Excavation",
@@ -36,12 +41,4 @@ public class FossilExcavatorConfig {
     @FeatureToggle
     public boolean glacitePowderStack = false;
 
-    @Expose
-    @ConfigOption(
-        name = "Hide Excavator Tooltips",
-        desc = "Hides tooltips of items inside of the Fossil Excavator."
-    )
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean hideExcavatorTooltips = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt
index 8b58402cdd63..0b0469b91675 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorTooltipHider.kt
@@ -3,20 +3,42 @@ package at.hannibal2.skyhanni.features.mining.fossilexcavator
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
 object ExcavatorTooltipHider {
 
-    private val config get() = SkyHanniMod.feature.mining.fossilExcavator
+    private val config get() = SkyHanniMod.feature.mining.fossilExcavator.tooltipHider
+
+    /**
+     * REGEX-TEST: §6Dirt
+     */
+    private val dirtPattern by RepoPattern.pattern(
+        "excavator.dirt.name",
+        "§6Dirt",
+    )
 
     @SubscribeEvent
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!isEnabled()) return
+
         if (event.slot.inventory !is ContainerLocalMenu) return
-        event.cancel()
+        if (config.hideEverything) {
+            event.cancel()
+            return
+        }
+
+        if (config.hideDirt) {
+            val isDirt = dirtPattern.matches(event.itemStack.name)
+            if (isDirt) {
+                event.cancel()
+            }
+        }
     }
 
-    fun isEnabled() = FossilExcavatorAPI.inInventory && !FossilExcavatorAPI.inExcavatorMenu && config.hideExcavatorTooltips
+    fun isEnabled() = FossilExcavatorAPI.inInventory && !FossilExcavatorAPI.inExcavatorMenu
 }

From 04d2530a67ef9ae2b877a448e15ce16fadd4c25b Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Tue, 24 Sep 2024 10:27:37 +0200
Subject: [PATCH 548/721] Fix: Hard Stone in Crystal Hollows misdetected as
 Mithril (#2580)

---
 src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 8e7cbf0821da..4275a809ca92 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -30,7 +30,7 @@ enum class OreBlock(
     // MITHRIL
     LOW_TIER_MITHRIL(
         checkBlock = ::isLowTierMithril,
-        checkArea = { inDwarvenMines || inCrystalHollows || inGlacite },
+        checkArea = { inDwarvenMines || inGlacite },
     ),
     MID_TIER_MITHRIL(
         checkBlock = { it.block == Blocks.prismarine },

From 1e9764d1d1209177d4a939a9b812931a7d49a926 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:27:50 +0200
Subject: [PATCH 549/721] Backend: PrimitiveIngredient changes and code cleanup
 (#2576)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../skyhanni/features/bingo/MinionCraftHelper.kt |  9 ++++-----
 .../garden/visitor/GardenVisitorFeatures.kt      | 13 ++++++-------
 .../garden/visitor/GardenVisitorSupercraft.kt    | 14 +++++++-------
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt     |  5 ++---
 .../java/at/hannibal2/skyhanni/utils/NEUItems.kt |  9 +++++----
 .../skyhanni/utils/PrimitiveIngredient.kt        | 16 +++++++++++++---
 .../skyhanni/utils/PrimitiveItemStack.kt         |  2 ++
 7 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index dbec4ea5788c..6f7a062f85e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.hasEnchantments
 import at.hannibal2.skyhanni.utils.ItemUtils.itemName
@@ -18,6 +19,7 @@ import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getCachedIngredients
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -197,12 +199,9 @@ object MinionCraftHelper {
             val output = recipe.output ?: continue
             if (!output.internalName.contains("_GENERATOR_")) continue
             val map = mutableMapOf<NEUInternalName, Int>()
-            for (input in recipe.ingredients) {
-                val itemId = input.internalName
+            for ((itemId, count) in recipe.ingredients.toPrimitiveItemStacks()) {
                 if (minionId != itemId) {
-                    val count = input.count.toInt()
-                    val old = map.getOrDefault(itemId, 0)
-                    map[itemId] = old + count
+                    map.addOrPut(itemId, count)
                 }
             }
             var allDone = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 2e8d789660ea..70392bb46d78 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -29,6 +29,7 @@ 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.addAsSingletonList
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
@@ -51,6 +52,7 @@ import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
@@ -253,16 +255,13 @@ object GardenVisitorFeatures {
             ?.ingredients ?: emptySet()
         if (ingredients.isEmpty()) return
 
-        // TODO change key to NEUInternalName
-        val requiredIngredients = mutableMapOf<String, Int>()
-        for (ingredient in ingredients) {
-            val key = ingredient.internalName.asString()
-            requiredIngredients[key] =
-                requiredIngredients.getOrDefault(key, 0) + ingredient.count.toInt()
+        val requiredIngredients = mutableMapOf<NEUInternalName, Int>()
+        for ((key, count) in ingredients.toPrimitiveItemStacks()) {
+            requiredIngredients.addOrPut(key, count)
         }
         var hasIngredients = true
         for ((key, value) in requiredIngredients) {
-            val sackItem = key.asInternalName().getAmountInSacks()
+            val sackItem = key.getAmountInSacks()
             if (sackItem < value * (amount - amountInSacks)) {
                 hasIngredients = false
                 break
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
index f2e4f80fb8f1..9b14483dc476 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt
@@ -7,12 +7,14 @@ import at.hannibal2.skyhanni.events.garden.visitor.VisitorOpenEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.entity.player.InventoryPlayer
 import net.minecraftforge.fml.common.eventhandler.EventPriority
@@ -73,15 +75,13 @@ object GardenVisitorSupercraft {
             // TODO describe what this line does
             .firstOrNull { !it.ingredients.first().internalName.contains("PEST") }
             ?.ingredients ?: return
-        // TODO change key to NEUInternalName
-        val ingredientReqs = mutableMapOf<String, Int>()
-        for (ingredient in ingredients) {
-            val key = ingredient.internalName.asString()
-            ingredientReqs[key] = ingredientReqs.getOrDefault(key, 0) + ingredient.count.toInt()
+        val requiredIngredients = mutableMapOf<NEUInternalName, Int>()
+        for ((key, count) in ingredients.toPrimitiveItemStacks()) {
+            requiredIngredients.addOrPut(key, count)
         }
         hasIngredients = true
-        for ((key, value) in ingredientReqs) {
-            val sackItem = key.asInternalName().getAmountInSacks()
+        for ((key, value) in requiredIngredients) {
+            val sackItem = key.getAmountInSacks()
             lastSuperCraftMaterial = internalName.asString()
             if (sackItem < value * amount) {
                 hasIngredients = false
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index add66cc0adcf..d39b37c8abb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.cachedData
@@ -511,9 +512,7 @@ object ItemUtils {
 
     fun neededItems(recipe: PrimitiveRecipe): Map<NEUInternalName, Int> {
         val neededItems = mutableMapOf<NEUInternalName, Int>()
-        for (ingredient in recipe.ingredients) {
-            val material = ingredient.internalName
-            val amount = ingredient.count.toInt()
+        for ((material, amount) in recipe.ingredients.toPrimitiveItemStacks()) {
             neededItems.addOrPut(material, amount)
         }
         return neededItems
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 198b43a856a6..2f17ea4d1d31 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -9,10 +9,12 @@ import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.isInt
+import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemId
 import at.hannibal2.skyhanni.utils.json.BaseGsonBuilder
@@ -308,8 +310,8 @@ object NEUItems {
             if (!recipe.isCraftingRecipe()) continue
 
             val map = mutableMapOf<NEUInternalName, Int>()
-            for (ingredient in recipe.getCachedIngredients()) {
-                val count = ingredient.count.toInt()
+            for (ingredient in recipe.getCachedIngredients().toPrimitiveItemStacks()) {
+                val amount = ingredient.amount
                 var internalItemId = ingredient.internalName
                 // ignore cactus green
                 if (internalName == "ENCHANTED_CACTUS_GREEN".asInternalName() && internalItemId == "INK_SACK-2".asInternalName()) {
@@ -331,8 +333,7 @@ object NEUItems {
                     continue
                 }
 
-                val old = map.getOrDefault(internalItemId, 0)
-                map[internalItemId] = old + count
+                map.addOrPut(internalItemId, amount)
             }
             if (map.size != 1) continue
             val current = map.iterator().next().toPair()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
index e8d1edefcc44..b1692a119b62 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveIngredient.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.SKYBLOCK_COIN
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import io.github.moulberry.notenoughupdates.recipes.Ingredient
 
 class PrimitiveIngredient(val internalName: NEUInternalName, val count: Double = 1.0) {
@@ -10,17 +11,26 @@ class PrimitiveIngredient(val internalName: NEUInternalName, val count: Double =
 
     constructor(ingredientIdentifier: String) : this(
         ingredientIdentifier.substringBefore(':').asInternalName(),
-        ingredientIdentifier.substringAfter(':').toDoubleOrNull() ?: 1.0,
+        // if second part is blank, the count is assumed to be 1
+        ingredientIdentifier.substringAfter(':', "").let { if (it.isBlank()) 1.0 else it.formatDouble() },
     )
 
     companion object {
         fun coinIngredient(count: Double = 1.0) = PrimitiveIngredient(SKYBLOCK_COIN, count)
 
-        fun fromNeuIngredient(neuIngredient: Ingredient) = PrimitiveIngredient(neuIngredient.internalItemId.asInternalName(), neuIngredient.count)
+        fun fromNeuIngredient(neuIngredient: Ingredient) =
+            PrimitiveIngredient(neuIngredient.internalItemId.asInternalName(), neuIngredient.count)
+
+        fun Set<PrimitiveIngredient>.toPrimitiveItemStacks(): List<PrimitiveItemStack> =
+            map { it.toPrimitiveItemStack() }
     }
 
     fun isCoin() = internalName == SKYBLOCK_COIN
 
-
     override fun toString() = "$internalName x$count"
+
+    fun toPair() = Pair(internalName, count)
+
+    // TODO should maybe throw an error when trying to use with internalName == SKYBLOCK_COIN
+    fun toPrimitiveItemStack() = PrimitiveItemStack(internalName, count.toInt())
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
index 52faaba30066..f9d2b89f7b00 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveItemStack.kt
@@ -15,6 +15,8 @@ data class PrimitiveItemStack(val internalName: NEUInternalName, val amount: Int
 
     val itemName by lazy { internalName.itemName }
 
+    fun toPair() = Pair(internalName, amount)
+
     companion object {
 
         fun NEUInternalName.makePrimitiveStack(amount: Int = 1) = PrimitiveItemStack(this, amount)

From cc8a3dba69e8f1474a33a7e47b32d452f11735fd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:28:06 +0200
Subject: [PATCH 550/721] Feature: /shnavigate (#2575)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |   2 +
 .../skyhanni/data/model/GraphNodeTag.kt       |  28 ++++-
 .../skyhanni/features/commands/HelpCommand.kt |  14 +--
 .../misc/pathfind/NavigationHelper.kt         | 110 ++++++++++++++++++
 .../misc/reminders/ReminderManager.kt         |  16 +--
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   4 +-
 .../test/graph/GraphEditorBugFinder.kt        |  11 ++
 .../skyhanni/test/graph/GraphNodeEditor.kt    |   6 +
 .../at/hannibal2/skyhanni/utils/chat/Text.kt  |   7 ++
 9 files changed, 168 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index a52852a8193f..9f2e3cc3fd71 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -72,6 +72,7 @@ import at.hannibal2.skyhanni.features.misc.TpsCounter
 import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatures
+import at.hannibal2.skyhanni.features.misc.pathfind.NavigationHelper
 import at.hannibal2.skyhanni.features.misc.reminders.ReminderManager
 import at.hannibal2.skyhanni.features.misc.update.UpdateManager
 import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui
@@ -182,6 +183,7 @@ object Commands {
         )
         registerCommand("shremind", "Set a reminder for yourself") { ReminderManager.command(it) }
         registerCommand("shwords", "Opens the config list for modifying visual words") { openVisualWords() }
+        registerCommand("shnavigate", "Using path finder to go to locatons") { NavigationHelper.onCommand(it) }
     }
 
     private fun usersNormal() {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index 2cdc9e7e0d1d..6bf00edafcf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 enum class GraphNodeTag(
     val internalName: String,
     val color: LorenzColor,
-    cleanName: String,
+    val cleanName: String,
     val description: String,
     val onlyIsland: IslandType? = null,
 ) {
@@ -17,7 +17,7 @@ enum class GraphNodeTag(
     AREA("area", LorenzColor.DARK_GREEN, "Area", "A big SkyBlock area."),
     SMALL_AREA("small_area", LorenzColor.GREEN, "Small Area", "A small SkyBlock area, e.g. a house."),
     POI("poi", LorenzColor.WHITE, "Point of Interest", "A relevant spot or a landmark on the map."),
-//     LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
+    //     LAUNCH_PAD("launch", LorenzColor.WHITE, "Launch Pad", "Slime blocks sending you to another server."),
     TELEPORT("teleport", LorenzColor.BLUE, "Teleport", "A spot from/to teleport."),
 
     // on multiple islands
@@ -43,18 +43,36 @@ enum class GraphNodeTag(
     // Rift
     RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the Rift.", onlyIsland = IslandType.THE_RIFT),
     RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Rift Eye", "An Eye in the Rift to teleport to.", onlyIsland = IslandType.THE_RIFT),
-    RIFT_MONTEZUMA("rift_montezuma", LorenzColor.GRAY, "Montezuma Soul Piece", "A piece of the Montezuma Soul.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_MONTEZUMA(
+        "rift_montezuma",
+        LorenzColor.GRAY,
+        "Montezuma Soul Piece",
+        "A piece of the Montezuma Soul.",
+        onlyIsland = IslandType.THE_RIFT,
+    ),
     RIFT_EFFIGY("rift_effigy", LorenzColor.RED, "Blood Effigies", "Locations of the Blood Effigies.", onlyIsland = IslandType.THE_RIFT),
 
     // Spider's Den
-    SPIDER_RELIC("SPIDER_RELIC", LorenzColor.DARK_PURPLE, "Spider's Relic", "An relic in the Spider's Den.", onlyIsland = IslandType.SPIDER_DEN),
+    SPIDER_RELIC(
+        "SPIDER_RELIC",
+        LorenzColor.DARK_PURPLE,
+        "Spider's Relic",
+        "An relic in the Spider's Den.",
+        onlyIsland = IslandType.SPIDER_DEN,
+    ),
 
     // Dwarven Mines
     MINES_EMISSARY("mines_emissary", LorenzColor.GOLD, "Mines Emissary", "An Emissary to the king.", onlyIsland = IslandType.DWARVEN_MINES),
     // commission areas
 
     // Crimson Isles
-    CRIMSON_MINIBOSS("crimson_miniboss", LorenzColor.RED, "Crimson Miniboss", "A Miniboss in the Crimson Isle.", onlyIsland = IslandType.CRIMSON_ISLE),
+    CRIMSON_MINIBOSS(
+        "crimson_miniboss",
+        LorenzColor.RED,
+        "Crimson Miniboss",
+        "A Miniboss in the Crimson Isle.",
+        onlyIsland = IslandType.CRIMSON_ISLE,
+    ),
 
     // The End
     END_GOLEM("end_golem", LorenzColor.RED, "Golem Spawn", "A spot where the golem can spawn in the End.", onlyIsland = IslandType.THE_END),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
index 1890c62930d1..0f07c47f8d14 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
@@ -5,13 +5,10 @@ import at.hannibal2.skyhanni.utils.StringUtils.splitLines
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
 import at.hannibal2.skyhanni.utils.chat.Text.center
-import at.hannibal2.skyhanni.utils.chat.Text.fitToChat
 import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.onClick
 import at.hannibal2.skyhanni.utils.chat.Text.send
-import at.hannibal2.skyhanni.utils.chat.Text.style
 import at.hannibal2.skyhanni.utils.chat.Text.suggest
-import net.minecraft.util.EnumChatFormatting
 import net.minecraft.util.IChatComponent
 import kotlin.math.ceil
 
@@ -20,11 +17,6 @@ object HelpCommand {
     private const val COMMANDS_PER_PAGE = 15
     private const val HELP_ID = -6457563
 
-    private fun createDivider() = Text.HYPHEN.fitToChat().style {
-        strikethrough = true
-        color = EnumChatFormatting.BLUE
-    }
-
     private fun createCommandEntry(command: Commands.CommandInfo): IChatComponent {
         val category = command.category
         val color = category.color
@@ -60,7 +52,7 @@ object HelpCommand {
 
         val text = mutableListOf<IChatComponent>()
 
-        text.add(createDivider())
+        text.add(Text.createDivider())
         text.add(title.asComponent().center())
         text.add(
             Text.join(
@@ -77,7 +69,7 @@ object HelpCommand {
                 } else null,
             ).center(),
         )
-        text.add(createDivider())
+        text.add(Text.createDivider())
 
         if (filtered.isEmpty()) {
             text.add(Text.EMPTY)
@@ -91,7 +83,7 @@ object HelpCommand {
             }
         }
 
-        text.add(createDivider())
+        text.add(Text.createDivider())
 
         Text.multiline(text).send(HELP_ID)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
new file mode 100644
index 000000000000..b27292559d34
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -0,0 +1,110 @@
+package at.hannibal2.skyhanni.features.misc.pathfind
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.GraphNodeTag
+import at.hannibal2.skyhanni.data.model.findShortestDistance
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
+import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.chat.Text
+import at.hannibal2.skyhanni.utils.chat.Text.asComponent
+import at.hannibal2.skyhanni.utils.chat.Text.center
+import at.hannibal2.skyhanni.utils.chat.Text.hover
+import at.hannibal2.skyhanni.utils.chat.Text.onClick
+import at.hannibal2.skyhanni.utils.chat.Text.send
+import kotlinx.coroutines.launch
+import net.minecraft.util.IChatComponent
+
+object NavigationHelper {
+    private val NAVIGATION_CHAT_ID = -6457562
+
+    val allowedTags = listOf(
+        GraphNodeTag.NPC,
+        GraphNodeTag.AREA,
+        GraphNodeTag.SMALL_AREA,
+        GraphNodeTag.POI,
+        GraphNodeTag.SLAYER,
+        GraphNodeTag.GRIND_MOBS,
+        GraphNodeTag.GRIND_ORES,
+        GraphNodeTag.GRIND_CROPS,
+        GraphNodeTag.MINES_EMISSARY,
+        GraphNodeTag.CRIMSON_MINIBOSS,
+    )
+
+    fun onCommand(args: Array<String>) {
+        SkyHanniMod.coroutineScope.launch {
+            doCommandAsync(args)
+        }
+    }
+
+    private fun doCommandAsync(args: Array<String>) {
+        val searchTerm = args.joinToString(" ").lowercase()
+        val distances = calculateDistances(searchTerm)
+        val names = calculateNames(distances)
+
+        val text = mutableListOf<IChatComponent>()
+        text.add(Text.createDivider())
+        text.add("§7Found ${names.size} locations ($searchTerm)".asComponent().center())
+        val goBack = {
+            onCommand(searchTerm.split(" ").toTypedArray())
+            IslandGraphs.stop()
+        }
+        // TODO dont show a too long list, add pages
+        for ((name, node) in names) {
+            val distance = distances[node]!!.round(1)
+            val component = "$name §e$distance".asComponent()
+            component.onClick {
+                IslandGraphs.pathFind(node.position)
+                sendNavigateMessage(name, goBack)
+            }
+            val tag = node.tags.first { it in allowedTags }
+            // TODO include most closest area, if this is no area (type in area = forger in forge)
+            component.hover =
+                ("§eClick to start navigating to\n" + "§7Type: §r${tag.displayName}\n" + "§7Distance: §e$distance blocks").asComponent()
+            text.add(component)
+        }
+        text.add(Text.createDivider())
+        Text.multiline(text).send(NAVIGATION_CHAT_ID)
+    }
+
+    private fun sendNavigateMessage(name: String, goBack: () -> Unit) {
+        val componentText = "§7Navigating to §r$name".asComponent()
+        componentText.onClick(onClick = goBack)
+        componentText.send(NAVIGATION_CHAT_ID)
+    }
+
+    private fun calculateNames(distances: Map<GraphNode, Double>): MutableMap<String, GraphNode> {
+        val names = mutableMapOf<String, GraphNode>()
+        for (node in distances.sorted().keys) {
+            val tag = node.tags.first { it in allowedTags }
+            val name = "${node.name} §7(${tag.displayName}§7)"
+            if (name in names) continue
+            names[name] = node
+        }
+        return names
+    }
+
+    private fun calculateDistances(
+        searchTerm: String,
+    ): Map<GraphNode, Double> {
+        val grapth = IslandGraphs.currentIslandGraph ?: return emptyMap()
+        val closedNote = IslandGraphs.closedNote ?: return emptyMap()
+
+        val nodes = grapth.nodes
+        val distances = mutableMapOf<GraphNode, Double>()
+        for (node in nodes) {
+            val name = node.name ?: continue
+            val remainingTags = node.tags.filter { it in allowedTags }
+            if (remainingTags.isEmpty()) continue
+            if (name.lowercase().contains(searchTerm)) {
+                distances[node] = grapth.findShortestDistance(closedNote, node)
+            }
+            if (remainingTags.size != 1) {
+                println("found node with invalid amount of tags: ${node.name} (${remainingTags.map { it.cleanName }}")
+            }
+        }
+        return distances
+    }
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
index 472aac2de6be..1df878ac9a2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
@@ -13,13 +13,10 @@ import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
 import at.hannibal2.skyhanni.utils.chat.Text.center
 import at.hannibal2.skyhanni.utils.chat.Text.command
-import at.hannibal2.skyhanni.utils.chat.Text.fitToChat
 import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.send
-import at.hannibal2.skyhanni.utils.chat.Text.style
 import at.hannibal2.skyhanni.utils.chat.Text.suggest
 import at.hannibal2.skyhanni.utils.chat.Text.wrap
-import net.minecraft.util.EnumChatFormatting
 import net.minecraft.util.IChatComponent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
@@ -44,11 +41,6 @@ object ReminderManager {
 
     private fun sendMessage(message: String) = Text.join("§e[Reminder]", " ", message).send(REMINDERS_ACTION_ID)
 
-    private fun createDivider() = Text.HYPHEN.fitToChat().style {
-        strikethrough = true
-        color = EnumChatFormatting.BLUE
-    }
-
     private fun parseDuration(text: String): Duration? = try {
         val duration = TimeUtils.getDuration(text)
         if (duration <= 1.seconds) null else duration
@@ -64,7 +56,7 @@ object ReminderManager {
 
         val text: MutableList<IChatComponent> = mutableListOf()
 
-        text.add(createDivider())
+        text.add(Text.createDivider())
 
         text.add(
             Text.join(
@@ -113,7 +105,7 @@ object ReminderManager {
             text.add(Text.EMPTY)
         }
 
-        text.add(createDivider())
+        text.add(Text.createDivider())
 
         Text.join(*text.toTypedArray(), separator = Text.NEWLINE).send(REMINDERS_LIST_ID)
     }
@@ -183,7 +175,7 @@ object ReminderManager {
     }
 
     private fun help() {
-        createDivider().send()
+        Text.createDivider().send()
         "§6SkyHanni Reminder Commands:".asComponent().send()
         "§e/shremind <time> <reminder> - §bCreates a new reminder".asComponent().send()
         "§e/shremind list <page> - §bLists all reminders".asComponent().send()
@@ -191,7 +183,7 @@ object ReminderManager {
         "§e/shremind edit <id> <reminder> - §bEdits a reminder".asComponent().send()
         "§e/shremind move <id> <time> - §bMoves a reminder".asComponent().send()
         "§e/shremind help - §bShows this help message".asComponent().send()
-        createDivider().send()
+        Text.createDivider().send()
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index cac3349e11bd..19ec3c5ce8b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -132,11 +132,11 @@ object SkyHanniDebugsAndTests {
 
     fun testCommand(args: Array<String>) {
         SkyHanniMod.coroutineScope.launch {
-            asyncTest()
+            asyncTest(args)
         }
     }
 
-    private fun asyncTest() {
+    private fun asyncTest(args: Array<String>) {
 
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
index 73c55b447426..2c5656580417 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.features.misc.IslandAreas.getAreaTag
+import at.hannibal2.skyhanni.features.misc.pathfind.NavigationHelper
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.GraphUtils
@@ -30,6 +31,15 @@ object GraphEditorBugFinder {
         val errorsInWorld: MutableMap<LorenzVec, String> = mutableMapOf()
         val nodes = graph.nodes
 
+        for (node in nodes) {
+            if (node.tags.any { it in NavigationHelper.allowedTags }) {
+                val remainingTags = node.tags.filter { it in NavigationHelper.allowedTags }
+                if (remainingTags.size != 1) {
+                    errorsInWorld[node.position] = "§cConflicting tags: $remainingTags"
+                }
+            }
+        }
+
         val nearestArea = mutableMapOf<GraphNode, GraphNode>()
         for (node in nodes) {
             val pathToNearestArea = GraphUtils.findFastestPath(graph, node) { it.getAreaTag(ignoreConfig = true) != null }?.first
@@ -93,5 +103,6 @@ object GraphEditorBugFinder {
             event.drawDynamicText(location, text, 1.5)
         }
     }
+
     fun isEnabled() = GraphEditor.isEnabled()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
index e6c4536d8b84..c4f6a389638d 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.CollectionUtils.addString
+import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -74,7 +75,12 @@ object GraphNodeEditor {
         lastUpdate = SimpleTimeMark.now() + 60.seconds
         nodesDisplay = buildList {
             addString("§eToggle Visible Tags")
+            val map = mutableMapOf<GraphNodeTag, Int>()
             for (tag in GraphNodeTag.entries) {
+                val nodes = GraphEditor.nodes.count { tag in it.tags }
+                map[tag] = nodes
+            }
+            for (tag in map.sortedDesc().keys) {
                 val isVisible = tag in tagsToShow
                 val nodes = GraphEditor.nodes.count { tag in it.tags }
                 val visibilityText = if (isVisible) " §aVisible" else " §7Invisible"
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
index 5bec468670f4..024550ec5d7d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
@@ -6,6 +6,7 @@ import net.minecraft.event.ClickEvent
 import net.minecraft.event.HoverEvent
 import net.minecraft.util.ChatComponentText
 import net.minecraft.util.ChatStyle
+import net.minecraft.util.EnumChatFormatting
 import net.minecraft.util.IChatComponent
 
 object Text {
@@ -97,5 +98,11 @@ object Text {
         val token = ChatClickActionManager.createAction(onClick, expiresAt, oneTime)
         this.command = "/shaction $token"
     }
+
+
+    fun createDivider() = Text.HYPHEN.fitToChat().style {
+        strikethrough = true
+        color = EnumChatFormatting.BLUE
+    }
     
 }

From 624b029f2c7f958c85efcbb6c8963ec1d14df297 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:58:34 +0200
Subject: [PATCH 551/721] hiding no area from navigation

---
 .../skyhanni/features/misc/pathfind/NavigationHelper.kt         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index b27292559d34..3e15e404ca94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -77,6 +77,8 @@ object NavigationHelper {
     private fun calculateNames(distances: Map<GraphNode, Double>): MutableMap<String, GraphNode> {
         val names = mutableMapOf<String, GraphNode>()
         for (node in distances.sorted().keys) {
+            // hiding areas that are none
+            if (node.name == "no_area") continue
             val tag = node.tags.first { it in allowedTags }
             val name = "${node.name} §7(${tag.displayName}§7)"
             if (name in names) continue

From 94e1e1fedf31f3e64856003075379867ebd7c18a Mon Sep 17 00:00:00 2001
From: rdbt <87152661+rdbtCVS@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:37:26 +0100
Subject: [PATCH 552/721] Get rid of the british (#2585)

---
 .../features/dungeon/ObjectHighlighterConfig.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
index 385c162c6623..a1c29cd4482f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHighlighterConfig.java
@@ -14,13 +14,13 @@ public class ObjectHighlighterConfig {
     // TODO move some stuff from DungeonConfig into this
 
     @Expose
-    @ConfigOption(name = "Stared", desc = "")
+    @ConfigOption(name = "Starred Mobs", desc = "")
     @Accordion
     public StarredConfig starred = new StarredConfig();
 
     public static class StarredConfig {
         @Expose
-        @ConfigOption(name = "Highlight Starred", desc = "Highlights all starred mobs in one colour.")
+        @ConfigOption(name = "Highlight Starred", desc = "Highlights starred mobs in a color.")
         @ConfigEditorBoolean
         @FeatureToggle
         public Property<Boolean> highlight = Property.of(true);
@@ -40,7 +40,7 @@ public static class StarredConfig {
         public String info;
 
         @Expose
-        @ConfigOption(name = "Colour", desc = "Color in which the stared mobs are highlighted.")
+        @ConfigOption(name = "Color", desc = "The color used to highlight starred mobs.")
         @ConfigEditorColour
         public Property<String> colour = Property.of("0:60:255:255:0");
     }
@@ -53,18 +53,18 @@ public static class StarredConfig {
     public static class FelConfig {
 
         @Expose
-        @ConfigOption(name = "Highlight Fels Skull", desc = "Highlights fels that are not yet active.")
+        @ConfigOption(name = "Highlight Fels Skull", desc = "Highlights fels that are not active.")
         @ConfigEditorBoolean
         @FeatureToggle
         public Property<Boolean> highlight = Property.of(true);
 
         @Expose
-        @ConfigOption(name = "Draw Line", desc = "Draws a line to fels skulls. Works only if the highlight is enabled.")
+        @ConfigOption(name = "Draw Line", desc = "Draws a line to fels skulls. Requires highlight to be enabled.")
         @ConfigEditorBoolean
         public Boolean line = false;
 
         @Expose
-        @ConfigOption(name = "Colour", desc = "Color for the fel skull and line.")
+        @ConfigOption(name = "Color", desc = "The color used to highlight fel skulls and draw the line.")
         @ConfigEditorColour
         public Property<String> colour = Property.of("0:200:255:0:255");
     }

From f77477f5d22e33b34d1723b0c89dd08244b40f85 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Tue, 24 Sep 2024 18:59:41 +0200
Subject: [PATCH 553/721] Improvement: Make Default GfS always on (#2584)

---
 src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt    | 2 --
 .../config/features/inventory/GetFromSackConfig.java         | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
index 7407dd66053a..89ccfd656f07 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
@@ -173,8 +173,6 @@ object GetFromSackAPI {
         // The last parameter could be "2*3". This does not support ending with ")", but it is good enough
         val argsNull = !args.last().last().isDigit()
         val arguments = if (argsNull) {
-            if (!config.defaultGFS) return CommandResult.WRONG_ARGUMENT to null
-
             args + config.defaultAmountGFS.toString()
         } else args
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
index ee77d6664317..f4b16343fef0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java
@@ -25,11 +25,6 @@ public class GetFromSackConfig {
     @FeatureToggle
     public boolean superCraftGFS = true;
 
-    @Expose
-    @ConfigOption(name = "Default GfS", desc = "If you don't provide an amount, a default one will be used instead. Queued GfS needs to be on in order for this to work.")
-    @ConfigEditorBoolean
-    public boolean defaultGFS = false;
-
     @Expose
     @ConfigOption(name = "Default Amount GfS", desc = "The default amount of items used when an amount isn't provided.")
     @ConfigEditorSlider(minValue = 1, maxValue = 64, minStep = 1)

From 262583b1abec71bcbe16c4cabe1f7fbab9d6bd50 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 25 Sep 2024 05:04:42 +1000
Subject: [PATCH 554/721] Backend:  Add pages to /shnavigate (#2583)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/commands/HelpCommand.kt | 61 +++-----------
 .../misc/pathfind/NavigationHelper.kt         | 39 +++++----
 .../misc/reminders/ReminderManager.kt         | 80 ++++++-------------
 .../at/hannibal2/skyhanni/utils/chat/Text.kt  | 77 +++++++++++++++++-
 4 files changed, 126 insertions(+), 131 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
index 0f07c47f8d14..2eb5dc3fb893 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/HelpCommand.kt
@@ -3,14 +3,9 @@ package at.hannibal2.skyhanni.features.commands
 import at.hannibal2.skyhanni.config.commands.Commands
 import at.hannibal2.skyhanni.utils.StringUtils.splitLines
 import at.hannibal2.skyhanni.utils.chat.Text
-import at.hannibal2.skyhanni.utils.chat.Text.asComponent
-import at.hannibal2.skyhanni.utils.chat.Text.center
 import at.hannibal2.skyhanni.utils.chat.Text.hover
-import at.hannibal2.skyhanni.utils.chat.Text.onClick
-import at.hannibal2.skyhanni.utils.chat.Text.send
 import at.hannibal2.skyhanni.utils.chat.Text.suggest
 import net.minecraft.util.IChatComponent
-import kotlin.math.ceil
 
 object HelpCommand {
 
@@ -35,57 +30,21 @@ object HelpCommand {
         }
     }
 
-    private fun showPage(
-        page: Int,
-        search: String,
-        commands: List<Commands.CommandInfo>,
-    ) {
+    private fun showPage(page: Int, search: String, commands: List<Commands.CommandInfo>) {
         val filtered = commands.filter {
             it.name.contains(search, ignoreCase = true) || it.description.contains(search, ignoreCase = true)
         }
 
-        val maxPage = if (filtered.isNotEmpty()) {
-            ceil(filtered.size.toDouble() / COMMANDS_PER_PAGE).toInt()
-        } else 1
-        val page = page.coerceIn(1, maxPage)
-        val title = if (search.isEmpty()) "§6SkyHanni Commands" else "§6SkyHanni Commands matching '$search'"
+        val title = if (search.isBlank()) "SkyHanni Commands" else "SkyHanni Commands Matching: \"$search\""
 
-        val text = mutableListOf<IChatComponent>()
-
-        text.add(Text.createDivider())
-        text.add(title.asComponent().center())
-        text.add(
-            Text.join(
-                if (page > 1) "§6§l<<".asComponent {
-                    this.hover = "§eClick to view page ${page - 1}".asComponent()
-                    this.onClick { showPage(page - 1, search, commands) }
-                } else null,
-                " ",
-                "§6(Page $page of $maxPage)",
-                " ",
-                if (page < maxPage) "§6§l>>".asComponent {
-                    this.hover = "§eClick to view page ${page + 1}".asComponent()
-                    this.onClick { showPage(page + 1, search, commands) }
-                } else null,
-            ).center(),
-        )
-        text.add(Text.createDivider())
-
-        if (filtered.isEmpty()) {
-            text.add(Text.EMPTY)
-            text.add("§cNo commands found.".asComponent().center())
-            text.add(Text.EMPTY)
-        } else {
-            val start = (page - 1) * COMMANDS_PER_PAGE
-            val end = (page * COMMANDS_PER_PAGE).coerceAtMost(filtered.size)
-            for (i in start until end) {
-                text.add(createCommandEntry(filtered[i]))
-            }
-        }
-
-        text.add(Text.createDivider())
-
-        Text.multiline(text).send(HELP_ID)
+        Text.displayPaginatedList(
+            title,
+            filtered,
+            chatLineId = HELP_ID,
+            emptyMessage = "No commands found.",
+            currentPage = page,
+            maxPerPage = COMMANDS_PER_PAGE,
+        ) { createCommandEntry(it) }
     }
 
     fun onCommand(args: Array<String>, commands: List<Commands.CommandInfo>) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index 3e15e404ca94..7f67dd98c22c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -6,18 +6,16 @@ import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.findShortestDistance
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
-import at.hannibal2.skyhanni.utils.LorenzUtils.round
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
-import at.hannibal2.skyhanni.utils.chat.Text.center
 import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.onClick
 import at.hannibal2.skyhanni.utils.chat.Text.send
 import kotlinx.coroutines.launch
-import net.minecraft.util.IChatComponent
 
 object NavigationHelper {
-    private val NAVIGATION_CHAT_ID = -6457562
+    private const val NAVIGATION_CHAT_ID = -6457562
 
     val allowedTags = listOf(
         GraphNodeTag.NPC,
@@ -41,40 +39,41 @@ object NavigationHelper {
     private fun doCommandAsync(args: Array<String>) {
         val searchTerm = args.joinToString(" ").lowercase()
         val distances = calculateDistances(searchTerm)
-        val names = calculateNames(distances)
+        val locations = calculateNames(distances)
 
-        val text = mutableListOf<IChatComponent>()
-        text.add(Text.createDivider())
-        text.add("§7Found ${names.size} locations ($searchTerm)".asComponent().center())
         val goBack = {
             onCommand(searchTerm.split(" ").toTypedArray())
             IslandGraphs.stop()
         }
-        // TODO dont show a too long list, add pages
-        for ((name, node) in names) {
-            val distance = distances[node]!!.round(1)
+        val title = if (searchTerm.isBlank()) "SkyHanni Navigation Locations" else "SkyHanni Navigation Locations Matching: \"$searchTerm\""
+
+        Text.displayPaginatedList(
+            title,
+            locations,
+            chatLineId = NAVIGATION_CHAT_ID,
+            emptyMessage = "No locations found.",
+        ) { (name, node) ->
+            val distance = distances[node]!!.roundTo(1)
             val component = "$name §e$distance".asComponent()
             component.onClick {
                 IslandGraphs.pathFind(node.position)
                 sendNavigateMessage(name, goBack)
             }
             val tag = node.tags.first { it in allowedTags }
-            // TODO include most closest area, if this is no area (type in area = forger in forge)
             component.hover =
                 ("§eClick to start navigating to\n" + "§7Type: §r${tag.displayName}\n" + "§7Distance: §e$distance blocks").asComponent()
-            text.add(component)
+            component
         }
-        text.add(Text.createDivider())
-        Text.multiline(text).send(NAVIGATION_CHAT_ID)
     }
 
     private fun sendNavigateMessage(name: String, goBack: () -> Unit) {
         val componentText = "§7Navigating to §r$name".asComponent()
         componentText.onClick(onClick = goBack)
+        componentText.hover = "§eClick to stop navigating and return to previous search".asComponent()
         componentText.send(NAVIGATION_CHAT_ID)
     }
 
-    private fun calculateNames(distances: Map<GraphNode, Double>): MutableMap<String, GraphNode> {
+    private fun calculateNames(distances: Map<GraphNode, Double>): List<Pair<String, GraphNode>> {
         val names = mutableMapOf<String, GraphNode>()
         for (node in distances.sorted().keys) {
             // hiding areas that are none
@@ -84,23 +83,23 @@ object NavigationHelper {
             if (name in names) continue
             names[name] = node
         }
-        return names
+        return names.toList()
     }
 
     private fun calculateDistances(
         searchTerm: String,
     ): Map<GraphNode, Double> {
-        val grapth = IslandGraphs.currentIslandGraph ?: return emptyMap()
+        val graph = IslandGraphs.currentIslandGraph ?: return emptyMap()
         val closedNote = IslandGraphs.closedNote ?: return emptyMap()
 
-        val nodes = grapth.nodes
+        val nodes = graph.nodes
         val distances = mutableMapOf<GraphNode, Double>()
         for (node in nodes) {
             val name = node.name ?: continue
             val remainingTags = node.tags.filter { it in allowedTags }
             if (remainingTags.isEmpty()) continue
             if (name.lowercase().contains(searchTerm)) {
-                distances[node] = grapth.findShortestDistance(closedNote, node)
+                distances[node] = graph.findShortestDistance(closedNote, node)
             }
             if (remainingTags.size != 1) {
                 println("found node with invalid amount of tags: ${node.name} (${remainingTags.map { it.cleanName }}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
index 1df878ac9a2f..a4ee7bc6af9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/reminders/ReminderManager.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.TimeUtils.minutes
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
-import at.hannibal2.skyhanni.utils.chat.Text.center
 import at.hannibal2.skyhanni.utils.chat.Text.command
 import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.send
@@ -49,65 +48,34 @@ object ReminderManager {
     }
 
     private fun listReminders(page: Int) {
-        val reminders = getSortedReminders()
-        val maxPage = (reminders.size + REMINDERS_PER_PAGE - 1) / REMINDERS_PER_PAGE
-
-        listPage = page.coerceIn(0, maxPage)
-
-        val text: MutableList<IChatComponent> = mutableListOf()
-
-        text.add(Text.createDivider())
-
-        text.add(
+        Text.displayPaginatedList(
+            "SkyHanni Reminders",
+            getSortedReminders(),
+            chatLineId = REMINDERS_LIST_ID,
+            emptyMessage = "No reminders found.",
+            currentPage = page,
+            maxPerPage = REMINDERS_PER_PAGE,
+        ) { reminderEntry ->
+            val id = reminderEntry.key
+            val reminder = reminderEntry.value
             Text.join(
-                if (listPage > 1) "§6§l<<".asComponent {
-                    hover = "§eClick to view page ${listPage - 1}".asComponent()
-                    command = "/shremind list ${listPage - 1}"
-                } else null,
+                "§c✕".asComponent {
+                    hover = "§7Click to remove".asComponent()
+                    command = "/shremind remove -l $id"
+                }.wrap("§8[", "§8]"),
                 " ",
-                "§6Reminders (Page $listPage of $maxPage)",
+                "§e✎".asComponent {
+                    hover = "§7Click to start editing".asComponent()
+                    suggest = "/shremind edit -l $id ${reminder.reason} "
+                }.wrap("§8[", "§8]"),
                 " ",
-                if (listPage < maxPage) "§6§l>>".asComponent {
-                    hover = "§eClick to view page ${listPage + 1}".asComponent()
-                    command = "/shremind list ${listPage + 1}"
-                } else null,
-            ).center(),
-        )
-
-        if (reminders.isNotEmpty()) {
-            for (i in (listPage - 1) * REMINDERS_PER_PAGE until listPage * REMINDERS_PER_PAGE) {
-                if (i >= reminders.size) break
-                val (id, reminder) = reminders[i]
-
-                text.add(
-                    Text.join(
-                        "§c✕".asComponent {
-                            hover = "§7Click to remove".asComponent()
-                            command = "/shremind remove -l $id"
-                        }.wrap("§8[", "§8]"),
-                        " ",
-                        "§e✎".asComponent {
-                            hover = "§7Click to start editing".asComponent()
-                            suggest = "/shremind edit -l $id ${reminder.reason} "
-                        }.wrap("§8[", "§8]"),
-                        " ",
-                        "§6${reminder.formatShort()}".asComponent {
-                            hover = "§7${reminder.formatFull()}".asComponent()
-                        }.wrap("§8[", "§8]"),
-                        " ",
-                        "§7${reminder.reason}",
-                    ),
-                )
-            }
-        } else {
-            text.add(Text.EMPTY)
-            text.add("§cNo reminders found.".asComponent().center())
-            text.add(Text.EMPTY)
+                "§6${reminder.formatShort()}".asComponent {
+                    hover = "§7${reminder.formatFull()}".asComponent()
+                }.wrap("§8[", "§8]"),
+                " ",
+                "§7${reminder.reason}",
+            )
         }
-
-        text.add(Text.createDivider())
-
-        Text.join(*text.toTypedArray(), separator = Text.NEWLINE).send(REMINDERS_LIST_ID)
     }
 
     private fun createReminder(args: Array<String>) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
index 024550ec5d7d..fe7486d0d541 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
@@ -60,6 +60,7 @@ object Text {
         }
         return this
     }
+
     fun IChatComponent.center(width: Int = Minecraft.getMinecraft().ingameGUI.chatGUI.chatWidth): IChatComponent {
         val textWidth = this.width()
         val spaceWidth = SPACE.width()
@@ -99,10 +100,78 @@ object Text {
         this.command = "/shaction $token"
     }
 
-
-    fun createDivider() = Text.HYPHEN.fitToChat().style {
+    fun createDivider(dividerColor: EnumChatFormatting = EnumChatFormatting.BLUE) = HYPHEN.fitToChat().style {
         strikethrough = true
-        color = EnumChatFormatting.BLUE
+        color = dividerColor
+    }
+
+    /**
+     * Displays a paginated list of entries in the chat.
+     *
+     * @param title The title of the paginated list.
+     * @param list The list of entries to paginate and display.
+     * @param chatLineId The ID of the chat line for message updates.
+     * @param emptyMessage The message to display if the list is empty.
+     * @param currentPage The current page to display.
+     * @param maxPerPage The number of entries to display per page.
+     * @param dividerColor The color of the divider lines.
+     * @param formatter A function to format each entry into an IChatComponent.
+     */
+    fun <T> displayPaginatedList(
+        title: String,
+        list: List<T>,
+        chatLineId: Int,
+        emptyMessage: String,
+        currentPage: Int = 1,
+        maxPerPage: Int = 15,
+        dividerColor: EnumChatFormatting = EnumChatFormatting.BLUE,
+        formatter: (T) -> IChatComponent,
+    ) {
+        val text = mutableListOf<IChatComponent>()
+
+        val totalPages = (list.size + maxPerPage - 1) / maxPerPage
+        val page = if (totalPages == 0) 0 else currentPage
+
+        text.add(createDivider(dividerColor))
+        text.add("§6$title".asComponent().center())
+
+        if (totalPages > 1) {
+            text.add(
+                join(
+                    if (page > 1) "§6§l<<".asComponent {
+                        hover = "§eClick to view page ${page - 1}".asComponent()
+                        onClick {
+                            displayPaginatedList(title, list, chatLineId, emptyMessage, page - 1, maxPerPage, dividerColor, formatter)
+                        }
+                    } else null,
+                    " ",
+                    "§6(Page $page of $totalPages)",
+                    " ",
+                    if (page < totalPages) "§6§l>>".asComponent {
+                        hover = "§eClick to view page ${page + 1}".asComponent()
+                        onClick {
+                            displayPaginatedList(title, list, chatLineId, emptyMessage, page + 1, maxPerPage, dividerColor, formatter)
+                        }
+                    } else null,
+                ).center(),
+            )
+        }
+
+        text.add(createDivider(dividerColor))
+
+        if (list.isNotEmpty()) {
+            val start = (page - 1) * maxPerPage
+            val end = (page * maxPerPage).coerceAtMost(list.size)
+            for (i in start until end) {
+                text.add(formatter(list[i]))
+            }
+        } else {
+            text.add(EMPTY)
+            text.add("§c$emptyMessage".asComponent().center())
+            text.add(EMPTY)
+        }
+
+        text.add(createDivider(dividerColor))
+        multiline(text).send(chatLineId)
     }
-    
 }

From e26f03b0daf1a8992b77f55fbfb1150919e70e7d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:06:20 +0200
Subject: [PATCH 555/721] hiding ChumBucketHider NoSuchElementException error
 messages, reverting not working set wrapping

---
 .../skyhanni/features/fishing/ChumBucketHider.kt       | 10 +++++++++-
 .../java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt |  4 +---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
index 5f64aba8c2d1..0bb98f8e4d34 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
@@ -66,7 +66,15 @@ object ChumBucketHider {
         // Chum Bucket
         if (config.hideBucket.get() && entity.inventory.any { it != null && (it.name == "§fEmpty Chum Bucket" || it.name == "§aEmpty Chumcap Bucket") }) {
             val entityLocation = entity.getLorenzVec()
-            for (title in titleEntity.toSet()) {
+            val toSet = try {
+                titleEntity.toSet()
+            } catch (e: NoSuchElementException) {
+                // Caught an NoSuchElementException in ChumBucketHider at CheckRenderEntityEvent: null
+                // We know this happens, but we cant fix it, apparently.
+                // TODO fix it anyway
+                return
+            }
+            for (title in toSet) {
                 if (entityLocation.equalsIgnoreY(title.getLorenzVec())) {
                     hiddenEntities.add(entity)
                     event.cancel()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
index 4c4a35151bdd..100bbbd10e0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
@@ -27,9 +27,7 @@ class TimeLimitedSet<T : Any>(
 
     fun clear() = cache.clear()
 
-    fun toSet(): Set<T> = cache.keys().let { keys ->
-        if (keys.isEmpty()) emptySet() else keys.toSet()
-    }
+    fun toSet(): Set<T> = cache.keys().toSet()
 
     override fun iterator(): Iterator<T> = toSet().iterator()
 }

From f922ef4f62790c65dd22c94bb3c6a39c678dad3a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:10:27 +0200
Subject: [PATCH 556/721] fixed display flickering on setting new target

---
 src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 9e4639454361..62459b6da06f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -188,6 +188,7 @@ object IslandGraphs {
     }
 
     fun setNewGraph(graph: Graph) {
+        IslandAreas.display = null
         reset()
         currentIslandGraph = graph
 
@@ -204,7 +205,6 @@ object IslandGraphs {
         currentTarget = null
         goal = null
         fastestPath = null
-        IslandAreas.display = null
     }
 
     @SubscribeEvent

From 8195fe5b198019cdef290b433e7d6f1a96e22cc2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:27:28 +0200
Subject: [PATCH 557/721] bunch of small fixes

---
 .../skyhanni/features/event/winter/ReindrakeWarpHelper.kt  | 3 ++-
 .../at/hannibal2/skyhanni/features/misc/IslandAreas.kt     | 2 +-
 .../skyhanni/features/misc/pathfind/NavigationHelper.kt    | 7 +++++--
 .../at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt   | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
index 7131426d42b3..30a1b87e8682 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
@@ -20,10 +20,11 @@ object ReindrakeWarpHelper {
 
     /**
      * REGEX-TEST: §c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!
+     * REGEX-TEST: §c§lWOAH! §r§cA §r§4Reindrake §r§cwas summoned from the depths!
      */
     private val spawnPattern by patternGroup.pattern(
         "spawn.message",
-        "§c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!",
+        "§c§lWOAH! (?:§r)?§cA (?:§r)?§4Reindrake (?:§r)?§cwas summoned from the depths!",
     )
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index 3c1e844a628a..5ece5897c5df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -43,7 +43,7 @@ object IslandAreas {
     private var paths = mapOf<GraphNode, Graph>()
     var display: Renderable? = null
     private var targetNode: GraphNode? = null
-    private var currentAreaName = ""
+    var currentAreaName = ""
     private val textInput = TextInput()
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index 7f67dd98c22c..e753948bca5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.findShortestDistance
+import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.chat.Text
@@ -60,8 +61,8 @@ object NavigationHelper {
                 sendNavigateMessage(name, goBack)
             }
             val tag = node.tags.first { it in allowedTags }
-            component.hover =
-                ("§eClick to start navigating to\n" + "§7Type: §r${tag.displayName}\n" + "§7Distance: §e$distance blocks").asComponent()
+            val d = "Name: $name\n§7Type: §r${tag.displayName}\n§7Distance: §e$distance blocks\n§eClick to start navigating!"
+            component.hover = d.asComponent()
             component
         }
     }
@@ -78,6 +79,8 @@ object NavigationHelper {
         for (node in distances.sorted().keys) {
             // hiding areas that are none
             if (node.name == "no_area") continue
+            // no need to navigate to the current area
+            if (node.name == IslandAreas.currentAreaName) continue
             val tag = node.tags.first { it in allowedTags }
             val name = "${node.name} §7(${tag.displayName}§7)"
             if (name in names) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 19ec3c5ce8b1..4b75b3feaeeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -117,6 +117,7 @@ object SkyHanniDebugsAndTests {
             testLocation = null
             ChatUtils.chat("reset test waypoint")
             IslandGraphs.stop()
+            return
         }
 
         val x = args[0].toDouble()

From 0a06b9d9b9d66228b588d452be25945b8f7d8935 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:38:43 +0200
Subject: [PATCH 558/721] Fix: NoSuchElementException in ChumBucketHider
 (#2587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Linnea Gräf <nea@nea.moe>
---
 .../skyhanni/features/fishing/ChumBucketHider.kt    | 10 +---------
 .../at/hannibal2/skyhanni/utils/TimeLimitedCache.kt | 13 +++++++++++++
 .../at/hannibal2/skyhanni/utils/TimeLimitedSet.kt   |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
index 0bb98f8e4d34..5f64aba8c2d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
@@ -66,15 +66,7 @@ object ChumBucketHider {
         // Chum Bucket
         if (config.hideBucket.get() && entity.inventory.any { it != null && (it.name == "§fEmpty Chum Bucket" || it.name == "§aEmpty Chumcap Bucket") }) {
             val entityLocation = entity.getLorenzVec()
-            val toSet = try {
-                titleEntity.toSet()
-            } catch (e: NoSuchElementException) {
-                // Caught an NoSuchElementException in ChumBucketHider at CheckRenderEntityEvent: null
-                // We know this happens, but we cant fix it, apparently.
-                // TODO fix it anyway
-                return
-            }
-            for (title in toSet) {
+            for (title in titleEntity.toSet()) {
                 if (entityLocation.equalsIgnoreY(title.getLorenzVec())) {
                     hiddenEntities.add(entity)
                     event.cancel()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
index 4c96c9b3c7c9..a88db58e1ac6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
@@ -48,11 +48,24 @@ class TimeLimitedCache<K : Any, V : Any>(
      * Modifications to the returned map are not supported and may lead to unexpected behavior.
      * This method is intended for read-only operations such as iteration or retrieval of values.
      *
+     * This returning map and any view into that map via [Map.keys], [Map.values] or [Map.entries],
+     * may return [Collection.size] values larger than the elements actually present during iteration.
+     * This can lead to problems with kotlins [Iterable.toSet], [Iterable.toList] (etc.) small collection
+     * optimizations. Those methods (and similar ones) have optimizations for single element collections.
+     * Since the [Collection.size] is checked first those methods will then not make any additional
+     * checks when accessing the elements of the collection. This can lead to rare [NoSuchElementException].
+     * Therefore, the direct constructors of [HashSet], [ArrayList] and similar are to be preferred,
+     * since they make no such optimizations.
+     *
      * @return A read-only view of the cache's underlying map.
      */
     private fun getMap(): ConcurrentMap<K, V> {
         val asMap: ConcurrentMap<K, V>
 
+        // TODO: the returned map view here is live and is updated as the underlying cache is.
+        //       the lock here is relatively pointless. i don't know why it was put here, but i
+        //       can't imagine a good reason, since every access to the returned map would also
+        //       need to be guarded by the same lock to be effective.
         cacheLock.readLock().lock()
         try {
             asMap = cache.asMap()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
index 100bbbd10e0b..710e7ee46c49 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedSet.kt
@@ -27,7 +27,7 @@ class TimeLimitedSet<T : Any>(
 
     fun clear() = cache.clear()
 
-    fun toSet(): Set<T> = cache.keys().toSet()
+    fun toSet(): Set<T> = HashSet(cache.keys())
 
     override fun iterator(): Iterator<T> = toSet().iterator()
 }

From 25cb5c1d8afb37447c7be91d6b1a6a10b32b541b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:39:14 +0200
Subject: [PATCH 559/721] removed cacheLock from TimeLimitedCache

---
 .../skyhanni/utils/TimeLimitedCache.kt        | 33 ++-----------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
index a88db58e1ac6..c06c73edd075 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeLimitedCache.kt
@@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.utils
 import com.google.common.cache.CacheBuilder
 import java.util.concurrent.ConcurrentMap
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.time.Duration
 
 class TimeLimitedCache<K : Any, V : Any>(
@@ -11,19 +10,8 @@ class TimeLimitedCache<K : Any, V : Any>(
     private val removalListener: (K?, V?) -> Unit = { _, _ -> },
 ) : Iterable<Map.Entry<K, V>> {
 
-    private val cacheLock = ReentrantReadWriteLock()
-
-    private val cache = CacheBuilder.newBuilder()
-        .expireAfterWrite(expireAfterWrite.inWholeMilliseconds, TimeUnit.MILLISECONDS)
-        .removalListener {
-            cacheLock.writeLock().lock()
-            try {
-                removalListener(it.key, it.value)
-            } finally {
-                cacheLock.writeLock().unlock()
-            }
-        }
-        .build<K, V>()
+    private val cache = CacheBuilder.newBuilder().expireAfterWrite(expireAfterWrite.inWholeMilliseconds, TimeUnit.MILLISECONDS)
+        .removalListener { removalListener(it.key, it.value) }.build<K, V>()
 
     // TODO IntelliJ cant replace this, find another way?
 //     @Deprecated("outdated", ReplaceWith("[key] = value"))
@@ -59,22 +47,7 @@ class TimeLimitedCache<K : Any, V : Any>(
      *
      * @return A read-only view of the cache's underlying map.
      */
-    private fun getMap(): ConcurrentMap<K, V> {
-        val asMap: ConcurrentMap<K, V>
-
-        // TODO: the returned map view here is live and is updated as the underlying cache is.
-        //       the lock here is relatively pointless. i don't know why it was put here, but i
-        //       can't imagine a good reason, since every access to the returned map would also
-        //       need to be guarded by the same lock to be effective.
-        cacheLock.readLock().lock()
-        try {
-            asMap = cache.asMap()
-        } finally {
-            cacheLock.readLock().unlock()
-        }
-
-        return asMap
-    }
+    private fun getMap(): ConcurrentMap<K, V> = cache.asMap()
 
     fun containsKey(key: K): Boolean = cache.getIfPresent(key) != null
 

From 58b70a7818869a33ccf3236e6e45c1cd170f2629 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:25:40 +0200
Subject: [PATCH 560/721] updated island graphs todos

---
 .../at/hannibal2/skyhanni/data/IslandGraphs.kt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 62459b6da06f..1f8e45afb749 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -40,9 +40,8 @@ import kotlin.time.Duration.Companion.milliseconds
  * benefits of every island graphs:
  * global:
  * 	NEU's fairy souls
- * 	point of interest
- * 	slayer area
- * 	NEU's NPC's
+ * 	slayer area (not all there yet)
+ * 	NEU's NPC's (auto acitvate when searching via neu)
  * 	races (end, park, winter, dungeon hub)
  * 	jump pads between servers
  * 	ring of love/romeo juliet quest
@@ -54,7 +53,6 @@ import kotlin.time.Duration.Companion.milliseconds
  * farming:
  * 	pelt farming area
  * rift:
- * 	enigma souls
  * 	eyes
  * 	big quests
  * 	montezuma souls
@@ -77,14 +75,20 @@ import kotlin.time.Duration.Companion.milliseconds
  *  daily quests
  *  intro tutorials with elle
  *  fishing spots
+ * mineshaft
+ *  different types mapped out
+ *  paths to ladder and possible corpse locations, and known corpse locations
  *
- * graph todo:
+ * Additional global things:
+ *  use custom graphs for your island/garden
+ *  suggest using warp points if closer
+ *  support cross island paths (have a list of all node names in all islands)
+ *
+ * Changes in graph editor:
  * 	fix rename not using tick but input event we have (+ create the input event in the first place)
  * 	toggle distance to node by node path lengh, instead of eye of sight lenght
  * 	press test button again to enable "true test mode", with graph math and hiding other stuff
  * 	option to compare two graphs, and store multiple graphs in the edit mode in paralell
- *
- * 	mineshaft + corpse + ladder spot
  */
 
 @SkyHanniModule

From afe82b85de69c177f30c49a7feeea5ba2107ff3c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:36:35 +0200
Subject: [PATCH 561/721] fixed vampire slayer name

---
 .../java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
index 0fc237b0d248..75b1efd34cf7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
@@ -12,7 +12,7 @@ enum class SlayerType(val displayName: String, val rngName: String, val clazz: C
     SVEN("Sven Packmaster", "sven", EntityWolf::class.java),
     VOID("Voidgloom Seraph", "voidgloom", EntityEnderman::class.java),
     INFERNO("Inferno Demonlord", "inferno", EntityBlaze::class.java),
-    VAMPIRE("Riftstalker Bloodfiend", "vampire", EntityZombie::class.java)
+    VAMPIRE("Bloodfiend", "vampire", EntityZombie::class.java) // previously called "Riftstalker Bloodfiend"
     ;
 
     companion object {

From 7c4c48847bb5209dc01edb2ceac0f9d29e1f07b7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:48:25 +0200
Subject: [PATCH 562/721] Version 0.27 Beta 12

---
 docs/CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 docs/FEATURES.md  |  6 ++++++
 root.gradle.kts   |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5f65761d0f01..33d0b77c7433 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -151,6 +151,12 @@
 + Added Transfer Cooldown Prevention. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/1751)
     + Wait for the transfer cooldown to complete before sending commands like warp/is/hub.
 + Added highlighting for the active Beacon Effect. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2546)
++ Added navigation command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2575)
+    + Use `/shnavigate <name>` to find interesting locations on your current SkyBlock island by searching for them.
+    + Displays a pathfinder to the location.
+    + Works with NPCs, points of interest, areas, slayer spots, emissaries, crimson mini-bosses, spots to mine ores, break crops, and kill mobs.
+    + Does not yet work with Spider's Den and Dungeon Hub (still needs to be mapped out).
++ Added a message to warp to Winter Island spawn when a Reindrake spawns. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2569)
 
 ### Improvements
 
@@ -162,6 +168,9 @@
 + Some icons in the Mining Event Display now use the texture of the item they represent. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2425)
     + E.g., Raffle Event -> Raffle Ticket.
 + Changed how Powder Tracker works to account for powder buffs. - Jordyrat + Empa (https://github.com/hannibal002/SkyHanni/pull/2394)
++ Added an option to hide all tooltips inside the Fossil Excavator. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2579)
++ Added support for using the Pickobulus ability for the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2540)
++ Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
 
 #### Diana Improvements
 
@@ -254,6 +263,7 @@
     + In your inventory, hover over the GUI with your mouse, then start typing to search.
 + Improved the performance of pathfinding logic in Area Navigation. - nea (https://github.com/hannibal002/SkyHanni/pull/2537)
 + Added a toggle to force the `en_US` locale for number formatting. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2563)
++ Queued GfS will now always fall back to a default amount if one is not specified. - Luna (https://github.com/hannibal002/SkyHanni/pull/2584)
 
 ### Fixes
 
@@ -285,6 +295,7 @@
 + Fixed Mouse Keys not working as Wardrobe Slot Hotkeys. - j10a1n15, ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2506)
 + Fixed Estimated Item Value incorrectly showing all Kuudra armor as starred. - Luna (https://github.com/hannibal002/SkyHanni/pull/2550)
 + Fixed Experiments Profit Tracker & Superpair Data. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2560)
++ Fixed price per unit for Stonk of Stonks auction not working for the bracket you are in. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2572)
 
 #### Mining Fixes
 
@@ -306,6 +317,9 @@
 + Fixed Gemstone Gauntlet item category. - Luna (https://github.com/hannibal002/SkyHanni/pull/2534)
 + Fixed Glacite powder being tracked as Glacite in Corpse Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2557)
 + Fixed "Mining Commissions Block Color" disabling OptiFine connected textures. - nopo (https://github.com/hannibal002/SkyHanni/pull/2559)
++ Fixed some blocks in the Crystal Hollows being detected as Mithril instead of Hard Stone. - Luna (https://github.com/hannibal002/SkyHanni/pull/2580)
++ Fixed "Mining Commissions Block Color" causing OptiFine connected textures not to connect properly. - nopo (https://github.com/hannibal002/SkyHanni/pull/2577)
++ Fixed the Mineshaft Pity Counter not working in the Great Glacite Lake. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2565)
 
 #### Scoreboard Fixes
 
@@ -374,6 +388,10 @@
 + Fixed two "Catch a Fish" carnival goals not being properly detected from chat. - Luna (https://github.com/hannibal002/SkyHanni/pull/2517)
 + Fixed the bounding box of baby zombies in Zombie Shootout. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2512)
 
+#### Fishing Fixes
+
++ Fixed error messages while using the Chum Bucket Hider feature. - nea89 (https://github.com/hannibal002/SkyHanni/pull/2587)
+
 #### Misc Fixes
 
 + Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
@@ -393,6 +411,7 @@
 + Fixed direct GitHub downloads triggering the source checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2548)
 + Fixed reforge display not working with new mining stats. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2555)
 + Fixed Totem of Corruption expiry warning not working in some cases. - Luna (https://github.com/hannibal002/SkyHanni/pull/2554)
++ Fixed a few typos in the config. - rdbt (https://github.com/hannibal002/SkyHanni/pull/2585)
 
 ### Technical Details
 
@@ -447,6 +466,20 @@
 + Improved handling of unknown stats for ReforgeAPI. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2562)
 + Added `AreaChangeEvent`. - Empa (https://github.com/hannibal002/SkyHanni/pull/2535)
 + Updated `HandleEvent` to allow `onlyOnIsland` usage for a single island without brackets. - Empa (https://github.com/hannibal002/SkyHanni/pull/2535)
++ Created a Text method to display a paginated list. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2583)
+    + Moved existing paged lists in `/shcommands` and `/shremind` to use this.
++ Node Tags filter list in Graph Editor now sorts by nodes per tag. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2575)
++ Additional code cleanup around ingredients. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2576)
++ Removed duplicate rounding functions. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1931)
++ Added HTTP Request Patching. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2578)
++ Removed references to NEU code, especially code from the Utils class in NEU. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2419)
++ Banned importing `io.github.moulberry.notenoughupdates.util.Utils`. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2419)
++ Added common live templates. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2463)
+    + These can be automatically imported via the plugin "Live Templates Sharing".
++ Created and used primitive recipe and ingredient classes. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2460)
+    + These are added as a layer between SkyHanni and NEU so that we are not reliant on NEU functions.
++ Added Blossom Gradle plugin for token replacement in code. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2558)
+    + `@MOD_VERSION@` is now a token that will be replaced.
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 22223bf303e4..0783d9e09f82 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -1157,6 +1157,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Customizable GUI
     + Option to hide the chat messages
 + While on the Winter Island, show a timer until Jerry's Workshop closes. - hannibal2
++ Added a message to warp to Winter Island spawn when a Reindrake spawns. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2569)
 + **Custom Text Box** - CalMWolfs
     + Write fancy text into a gui element to show on your screen at all time
     + Supports color codes
@@ -1375,6 +1376,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Get a title warning when entering an area.
     + See area names in the world.
     + Does not yet work with Spider's Den and Dungeon Hub. Only partial support for Farming Islands and the Rift.
++ Added navigation command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2575)
+    + Use `/shnavigate <name>` to find interesting locations on your current SkyBlock island by searching for them.
+    + Displays a pathfinder to the location.
+    + Works with NPCs, points of interest, areas, slayer spots, emissaries, crimson mini-bosses, spots to mine ores, break crops, and kill mobs.
+    + Does not yet work with Spider's Den and Dungeon Hub (still needs to be mapped out).
 + Added `/gfs` to fix a broken Piggy Bank. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2150)
 + Added Broodmother spawn alert, countdown and stage change messages. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2325)
     + Countdown will not show until a spawning stage change is observed, and may be off by a few seconds.
diff --git a/root.gradle.kts b/root.gradle.kts
index 627d155ee866..5baae39e2ba7 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.11"
+    version = "0.27.Beta.12"
 }
 
 preprocess {

From e90fd65559ef551b29de7d28f4fea3a46cc2a4e6 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Thu, 26 Sep 2024 01:33:53 +0200
Subject: [PATCH 563/721] Fix: Update radius for Sulphur Skitter to 4 blocks
 (#2590)

---
 .../at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
index 388e6bf23c75..1cc54772ec6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt
@@ -29,7 +29,7 @@ object SulphurSkitterBox {
     private val config get() = SkyHanniMod.feature.fishing.trophyFishing.sulphurSkitterBox
     private var spongeBlocks = listOf<BlockPos>()
     private var closestBlock: BlockPos? = null
-    private const val RADIUS = 8
+    private const val RADIUS = 4
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {

From 092a29dd8b13c2b04b0b7c259446ab697201dd5e Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 26 Sep 2024 03:56:44 -0400
Subject: [PATCH 564/721] Backend: Dekekt (#2547)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Linnea Gräf <nea@nea.moe>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../actions/setup-normal-workspace/action.yml |  13 +
 .github/scripts/process_detekt_sarif.sh       |  37 ++
 .github/workflows/build.yml                   |  42 ++-
 .github/workflows/check-style.yaml.disabled   |  16 -
 CONTRIBUTING.md                               |   5 +
 build.gradle.kts                              |  56 +--
 detekt/baseline.xml                           | 339 ++++++++++++++++++
 detekt/build.gradle.kts                       |  13 +
 detekt/detekt.yml                             | 127 +++++++
 .../kotlin/formatting/CustomCommentSpacing.kt |  51 +++
 .../formatting/FormattingRuleSetProvider.kt   |  17 +
 detekt/src/main/kotlin/grammar/AvoidColour.kt |  38 ++
 .../kotlin/grammar/GrammarRuleSetProvider.kt  |  17 +
 detekt/src/main/kotlin/root.kt                |   1 +
 gradle/libs.versions.toml                     |   3 +
 root.gradle.kts                               |  21 ++
 settings.gradle.kts                           |   1 +
 sharedVariables/src/MinecraftVersion.kt       |   3 +
 ...ltipEvent.kt => RenderItemTooltipEvent.kt} |   2 +-
 .../SuperpairExperimentInformationDisplay.kt  |   2 +-
 versions/1.8.9/detekt/baseline.xml            | 339 ++++++++++++++++++
 21 files changed, 1085 insertions(+), 58 deletions(-)
 create mode 100644 .github/actions/setup-normal-workspace/action.yml
 create mode 100644 .github/scripts/process_detekt_sarif.sh
 delete mode 100644 .github/workflows/check-style.yaml.disabled
 create mode 100644 detekt/baseline.xml
 create mode 100644 detekt/build.gradle.kts
 create mode 100644 detekt/detekt.yml
 create mode 100644 detekt/src/main/kotlin/formatting/CustomCommentSpacing.kt
 create mode 100644 detekt/src/main/kotlin/formatting/FormattingRuleSetProvider.kt
 create mode 100644 detekt/src/main/kotlin/grammar/AvoidColour.kt
 create mode 100644 detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
 create mode 100644 detekt/src/main/kotlin/root.kt
 rename src/main/java/at/hannibal2/skyhanni/events/{RenderTooltipEvent.kt => RenderItemTooltipEvent.kt} (97%)
 create mode 100644 versions/1.8.9/detekt/baseline.xml

diff --git a/.github/actions/setup-normal-workspace/action.yml b/.github/actions/setup-normal-workspace/action.yml
new file mode 100644
index 000000000000..a0781d53c46c
--- /dev/null
+++ b/.github/actions/setup-normal-workspace/action.yml
@@ -0,0 +1,13 @@
+name: 'Setup Java, Gradle and check out the source code'
+
+runs:
+    using: composite
+    steps:
+        -   name: Set up JDK 21
+            uses: actions/setup-java@v4
+            with:
+                distribution: 'temurin'
+                java-version: 21
+                cache: gradle
+        -   name: Setup gradle
+            uses: gradle/actions/setup-gradle@v4
diff --git a/.github/scripts/process_detekt_sarif.sh b/.github/scripts/process_detekt_sarif.sh
new file mode 100644
index 000000000000..7fb4f7e4e11f
--- /dev/null
+++ b/.github/scripts/process_detekt_sarif.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# This script processes the Detekt SARIF file and outputs results in a format
+# suitable for annotation in CI/CD systems.
+
+SARIF_FILE="$1"
+
+# Check if SARIF file exists
+if [ ! -f "$SARIF_FILE" ]; then
+    echo "SARIF file not found: $SARIF_FILE"
+    exit 1
+fi
+
+# Define jq command to parse SARIF file
+read -r -d '' jq_command <<'EOF'
+.runs[].results[] |
+{
+    "full_path": .locations[].physicalLocation.artifactLocation.uri | sub("file://$(pwd)/"; ""),
+    "file_name": (.locations[].physicalLocation.artifactLocation.uri | split("/") | last),
+    "l": .locations[].physicalLocation,
+    "level": .level,
+    "message": .message.text,
+    "ruleId": .ruleId
+} |
+(
+    "::" + (.level) +
+    " file=" + (.full_path) +
+    ",line=" + (.l.region.startLine|tostring) +
+    ",title=" + (.ruleId) +
+    ",col=" + (.l.region.startColumn|tostring) +
+    ",endColumn=" + (.l.region.endColumn|tostring) +
+    "::" + (.message.text)
+)
+EOF
+
+# Run jq command to format the output
+jq -r "$jq_command" < "$SARIF_FILE"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c75f0eef805..7e42909ee297 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,15 +18,9 @@ jobs:
         runs-on: ubuntu-latest
         name: "Build and test"
         steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 21
-                uses: actions/setup-java@v3
-                with:
-                    java-version: 21
-                    distribution: temurin
-                    cache: gradle
-            -   name: Setup gradle
-                uses: gradle/gradle-build-action@v2
+            -   name: Checkout code
+                uses: actions/checkout@v4
+            -   uses: ./.github/actions/setup-normal-workspace
             -   name: Build with Gradle
                 run: ./gradlew assemble -x test --stacktrace
             -   uses: actions/upload-artifact@v3
@@ -42,19 +36,31 @@ jobs:
                 with:
                     name: "Test Results"
                     path: versions/1.8.9/build/reports/tests/test/
+    #detekt:
+    #    name: Run detekt
+    #    runs-on: ubuntu-latest
+
+    #    steps:
+    #        -   name: Checkout code
+    #            uses: actions/checkout@v4
+    #        -   uses: ./.github/actions/setup-normal-workspace
+    #        -   name: Run detekt
+    #            run: |
+    #                ./gradlew detekt --stacktrace
+    #        -   name: Annotate detekt failures
+    #            if: ${{ !cancelled() }}
+    #            run: |
+    #                chmod +x .github/scripts/process_detekt_sarif.sh
+    #                ./.github/scripts/process_detekt_sarif.sh versions/1.8.9/build/reports/detekt/detekt.sarif
+    
+
     preprocess:
         runs-on: ubuntu-latest
         name: "Build multi version"
         steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 21
-                uses: actions/setup-java@v3
-                with:
-                    java-version: 21
-                    distribution: temurin
-                    cache: gradle
-            -   name: Setup gradle
-                uses: gradle/gradle-build-action@v2
+            -   name: Checkout code
+                uses: actions/checkout@v4
+            -   uses: ./.github/actions/setup-normal-workspace
             -   name: Enable preprocessor
                 run: |
                     mkdir -p .gradle
diff --git a/.github/workflows/check-style.yaml.disabled b/.github/workflows/check-style.yaml.disabled
deleted file mode 100644
index ff172208f8bc..000000000000
--- a/.github/workflows/check-style.yaml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-name: check-style
-on:
-    - pull_request
-jobs:
-    ktlint:
-        name: Check Style
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v3
-              name: Checkout code
-            - name: ktlint
-              uses: ScaCap/action-ktlint@master
-              with:
-                  github_token: ${{ secrets.github_token }}
-                  reporter: github-pr-check
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fc0f2d5c4f90..d68b88f9fe66 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -97,6 +97,11 @@ format like "- #821" to illustrate the dependency.
 - Follow the [Hypixel Rules](https://hypixel.net/rules).
 - Use the coding conventions for [Kotlin](https://kotlinlang.org/docs/coding-conventions.html)
   and [Java](https://www.oracle.com/java/technologies/javase/codeconventions-contents.html).
+-  **My build is failing due to `detekt`, what do I do?**
+    - `detekt` is our code quality tool. It checks for code smells and style issues.
+    - If you have a build failure stating `Analysis failed with ... weighted issues.`, you can check `versions/[target version]/build/reports/detekt/` for a comprehensive list of issues.
+    - **There are valid reasons to deviate from the norm**
+        - If you have such a case, either use `@Supress("rule_name")`, or re-build the `baseline.xml` file, using `./gradlew detektBaseline`. 
 - Do not copy features from other mods. Exceptions:
     - Mods that are paid to use.
   - Mods that have reached their end of life. (Rip SBA, Dulkir and Soopy).
diff --git a/build.gradle.kts b/build.gradle.kts
index add2df4e77e2..b0e2af2544ed 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,8 @@ import at.skyhanni.sharedvariables.MultiVersionStage
 import at.skyhanni.sharedvariables.ProjectTarget
 import at.skyhanni.sharedvariables.SHVersionInfo
 import at.skyhanni.sharedvariables.versionString
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -18,32 +20,12 @@ plugins {
     kotlin("plugin.power-assert")
     `maven-publish`
     id("moe.nea.shot") version "1.0.0"
+    id("io.gitlab.arturbosch.detekt")
     id("net.kyori.blossom")
 }
 
 val target = ProjectTarget.values().find { it.projectPath == project.path }!!
 
-repositories {
-    mavenCentral()
-    mavenLocal()
-    maven("https://maven.minecraftforge.net") {
-        metadataSources {
-            artifact() // We love missing POMs
-        }
-    }
-    maven("https://repo.spongepowered.org/maven/") // mixin
-    maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") // DevAuth
-    maven("https://jitpack.io") { // NotEnoughUpdates (compiled against)
-        content {
-            includeGroupByRegex("(com|io)\\.github\\..*")
-        }
-    }
-    maven("https://repo.nea.moe/releases") // libautoupdate
-    maven("https://maven.notenoughupdates.org/releases") // NotEnoughUpdates (dev env)
-    maven("https://repo.hypixel.net/repository/Hypixel/") // mod-api
-    maven("https://maven.teamresourceful.com/repository/thatgravyboat/") // DiscordIPC
-}
-
 // Toolchains:
 java {
     toolchain.languageVersion.set(target.minecraftVersion.javaLanguageVersion)
@@ -178,10 +160,14 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
     testImplementation("io.mockk:mockk:1.12.5")
 
     implementation("net.hypixel:mod-api:0.3.1")
+
+    detektPlugins("org.notenoughupdates:detektrules:1.0.0")
+    detektPlugins(project(":detekt"))
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
 }
 
 afterEvaluate {
@@ -350,3 +336,29 @@ publishing.publications {
         }
     }
 }
+
+// Detekt: TODO: Uncomment this when we're ready to enforce
+/*detekt {
+    buildUponDefaultConfig = true // preconfigure defaults
+    config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
+    baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
+    source.setFrom(project.sourceSets.named("main").map { it.allSource })
+}
+
+tasks.withType<Detekt>().configureEach {
+    reports {
+        html.required.set(true) // observe findings in your browser with structure and code snippets
+        xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
+        sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
+        md.required.set(true) // simple Markdown format
+    }
+}
+
+tasks.withType<Detekt>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}
+tasks.withType<DetektCreateBaselineTask>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}*/
diff --git a/detekt/baseline.xml b/detekt/baseline.xml
new file mode 100644
index 000000000000..ac35c2f6d1a8
--- /dev/null
+++ b/detekt/baseline.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
+    <ID>AnnotationOnSeparateLine:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") node.neighbours.map { GraphingEdge( translation[node]!!, translation[it.key]!!, ) }</ID>
+    <ID>AnnotationOnSeparateLine:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") nodes[indexedTable[otherNode.id]!!]</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$arrayOf(npcPrice)</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$arrayOf(sellOffer)</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$Array&lt;Float&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$arrayOf(x, y, z)</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$arrayOf(x.toFloat(), y.toFloat(), z.toFloat())</ID>
+    <ID>CyclomaticComplexMethod:AdvancedPlayerList.kt$AdvancedPlayerList$fun newSorting(original: List&lt;String&gt;): List&lt;String&gt;</ID>
+    <ID>CyclomaticComplexMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun calculateMoneyPerHour(debugList: MutableList&lt;List&lt;Any&gt;&gt;): Map&lt;NEUInternalName, Array&lt;Double&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:DamageIndicatorManager.kt$DamageIndicatorManager$private fun checkThorn(realHealth: Long, realMaxHealth: Long): String?</ID>
+    <ID>CyclomaticComplexMethod:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$private fun addEnchantments(stack: ItemStack, list: MutableList&lt;String&gt;): Double</ID>
+    <ID>CyclomaticComplexMethod:GardenBestCropTime.kt$GardenBestCropTime$fun drawBestDisplay(currentCrop: CropType?): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:GardenCropMilestoneDisplay.kt$GardenCropMilestoneDisplay$private fun drawProgressDisplay(crop: CropType): List&lt;Renderable&gt;</ID>
+    <ID>CyclomaticComplexMethod:GardenVisitorFeatures.kt$GardenVisitorFeatures$private fun readToolTip(visitor: VisitorAPI.Visitor, itemStack: ItemStack?, toolTip: MutableList&lt;String&gt;)</ID>
+    <ID>CyclomaticComplexMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID>
+    <ID>CyclomaticComplexMethod:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>CyclomaticComplexMethod:GraphEditorBugFinder.kt$GraphEditorBugFinder$private fun asyncTest()</ID>
+    <ID>CyclomaticComplexMethod:IslandAreas.kt$IslandAreas$private fun buildDisplay()</ID>
+    <ID>CyclomaticComplexMethod:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>CyclomaticComplexMethod:ItemNameResolver.kt$ItemNameResolver$internal fun getInternalNameOrNull(itemName: String): NEUInternalName?</ID>
+    <ID>CyclomaticComplexMethod:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>CyclomaticComplexMethod:OverviewPage.kt$OverviewPage$private fun getPage(): Pair&lt;List&lt;List&lt;Renderable&gt;&gt;, List&lt;Renderable&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:PacketTest.kt$PacketTest$private fun Packet&lt;*&gt;.print()</ID>
+    <ID>CyclomaticComplexMethod:ParkourHelper.kt$ParkourHelper$fun render(event: LorenzRenderWorldEvent)</ID>
+    <ID>CyclomaticComplexMethod:Renderable.kt$Renderable.Companion$internal fun shouldAllowLink(debug: Boolean = false, bypassChecks: Boolean): Boolean</ID>
+    <ID>CyclomaticComplexMethod:SkillProgress.kt$SkillProgress$private fun drawDisplay()</ID>
+    <ID>CyclomaticComplexMethod:VampireSlayerFeatures.kt$VampireSlayerFeatures$private fun EntityOtherPlayerMP.process()</ID>
+    <ID>CyclomaticComplexMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID>
+    <ID>DestructuringDeclarationWithTooManyEntries:SackDisplay.kt$SackDisplay$val (internalName, rough, flawed, fine, roughPrice, flawedPrice, finePrice) = gem</ID>
+    <ID>Filename:AreaChangeEvents.kt$at.hannibal2.skyhanni.events.skyblock.AreaChangeEvents.kt</ID>
+    <ID>InjectDispatcher:ClipboardUtils.kt$ClipboardUtils$IO</ID>
+    <ID>InjectDispatcher:GardenNextJacobContest.kt$GardenNextJacobContest$IO</ID>
+    <ID>InjectDispatcher:HypixelBazaarFetcher.kt$HypixelBazaarFetcher$IO</ID>
+    <ID>InjectDispatcher:MayorAPI.kt$MayorAPI$IO</ID>
+    <ID>LongMethod:CopyNearbyEntitiesCommand.kt$CopyNearbyEntitiesCommand$fun command(args: Array&lt;String&gt;)</ID>
+    <ID>LongMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>LongMethod:DefaultConfigOptionGui.kt$DefaultConfigOptionGui$override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float)</ID>
+    <ID>LongMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID>
+    <ID>LongMethod:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>LongMethod:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>LongMethod:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>LongMethod:OverviewPage.kt$OverviewPage$private fun getPage(): Pair&lt;List&lt;List&lt;Renderable&gt;&gt;, List&lt;Renderable&gt;&gt;</ID>
+    <ID>LongMethod:RenderableTooltips.kt$RenderableTooltips$private fun drawHoveringText()</ID>
+    <ID>LongMethod:TabListRenderer.kt$TabListRenderer$private fun drawTabList()</ID>
+    <ID>LongMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID>
+    <ID>LoopWithTooManyJumpStatements:AdvancedPlayerList.kt$AdvancedPlayerList$for</ID>
+    <ID>LoopWithTooManyJumpStatements:CropMoneyDisplay.kt$CropMoneyDisplay$for</ID>
+    <ID>LoopWithTooManyJumpStatements:CustomScoreboard.kt$CustomScoreboard$for</ID>
+    <ID>LoopWithTooManyJumpStatements:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$for</ID>
+    <ID>LoopWithTooManyJumpStatements:GardenComposterInventoryFeatures.kt$GardenComposterInventoryFeatures$for</ID>
+    <ID>LoopWithTooManyJumpStatements:GardenVisitorFeatures.kt$GardenVisitorFeatures$for</ID>
+    <ID>LoopWithTooManyJumpStatements:IslandAreas.kt$IslandAreas$for</ID>
+    <ID>LoopWithTooManyJumpStatements:RiftBloodEffigies.kt$RiftBloodEffigies$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SkyBlockItemModifierUtils.kt$SkyBlockItemModifierUtils$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SkyHanniConfigSearchResetCommand.kt$SkyHanniConfigSearchResetCommand$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SuperpairsClicksAlert.kt$SuperpairsClicksAlert$for</ID>
+    <ID>MapGetWithNotNullAssertionOperator:NavigationHelper.kt$NavigationHelper$distances[node]!!</ID>
+    <ID>MatchingDeclarationName:AreaChangeEvents.kt$ScoreboardAreaChangeEvent : SkyHanniEvent</ID>
+    <ID>MaxLineLength:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") nodes[indexedTable[otherNode.id]!!] to node.position.distance(otherNode.position)</ID>
+    <ID>MemberNameEqualsClassName:CaptureFarmingGear.kt$CaptureFarmingGear$fun captureFarmingGear()</ID>
+    <ID>MemberNameEqualsClassName:Commands.kt$Commands$// command -&gt; description private val commands = mutableListOf&lt;CommandInfo&gt;()</ID>
+    <ID>MemberNameEqualsClassName:FameRanks.kt$FameRanks$var fameRanks = emptyMap&lt;String, FameRank&gt;() private set</ID>
+    <ID>MemberNameEqualsClassName:FirstMinionTier.kt$FirstMinionTier$fun firstMinionTier( otherItems: Map&lt;NEUInternalName, Int&gt;, minions: MutableMap&lt;String, NEUInternalName&gt;, tierOneMinions: MutableList&lt;NEUInternalName&gt;, tierOneMinionsDone: MutableSet&lt;NEUInternalName&gt;, )</ID>
+    <ID>MemberNameEqualsClassName:LastServers.kt$LastServers$private val lastServers = mutableMapOf&lt;String, SimpleTimeMark&gt;()</ID>
+    <ID>MemberNameEqualsClassName:PestSpawn.kt$PestSpawn$private fun pestSpawn(amount: Int, plotNames: List&lt;String&gt;, unknownAmount: Boolean)</ID>
+    <ID>MemberNameEqualsClassName:Shimmy.kt$Shimmy.Companion$private fun shimmy(source: Any?, fieldName: String): Any?</ID>
+    <ID>MemberNameEqualsClassName:TestBingo.kt$TestBingo$var testBingo = false</ID>
+    <ID>MemberNameEqualsClassName:Text.kt$Text$fun text(text: String, init: IChatComponent.() -&gt; Unit = {})</ID>
+    <ID>NoNameShadowing:BucketedItemTrackerData.kt$BucketedItemTrackerData${ it.hidden = !it.hidden }</ID>
+    <ID>NoNameShadowing:BurrowWarpHelper.kt$BurrowWarpHelper${ it.startsWith("§bWarp to ") }</ID>
+    <ID>NoNameShadowing:ChunkedStat.kt$ChunkedStat.Companion${ it.showWhen() }</ID>
+    <ID>NoNameShadowing:ContributorManager.kt$ContributorManager${ it.isAllowed() }</ID>
+    <ID>NoNameShadowing:Graph.kt$Graph.Companion${ out.name("Name").value(it) }</ID>
+    <ID>NoNameShadowing:Graph.kt$Graph.Companion${ out.name("Tags") out.beginArray() for (tagName in it) { out.value(tagName) } out.endArray() }</ID>
+    <ID>NoNameShadowing:GraphEditorBugFinder.kt$GraphEditorBugFinder${ it.position.distanceSqToPlayer() }</ID>
+    <ID>NoNameShadowing:GuiOptionEditorUpdateCheck.kt$GuiOptionEditorUpdateCheck$width</ID>
+    <ID>NoNameShadowing:HoppityCollectionStats.kt$HoppityCollectionStats${ val displayAmount = it.amount.shortFormat() val operationFormat = when (milestoneType) { HoppityEggType.CHOCOLATE_SHOP_MILESTONE -&gt; "spending" HoppityEggType.CHOCOLATE_FACTORY_MILESTONE -&gt; "reaching" else -&gt; "" // Never happens } // List indexing is weird existingLore[replaceIndex - 1] = "§7Obtained by $operationFormat §6$displayAmount" existingLore[replaceIndex] = "§7all-time §6Chocolate." return existingLore }</ID>
+    <ID>NoNameShadowing:HotmData.kt$HotmData.Companion${ it.setCurrent(it.getTotal()) }</ID>
+    <ID>NoNameShadowing:LorenzVec.kt$LorenzVec.Companion$pitch</ID>
+    <ID>NoNameShadowing:LorenzVec.kt$LorenzVec.Companion$yaw</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;$posX</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;$posY</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;${ it.value?.contains(textInput.textBox, ignoreCase = true) ?: true }</ID>
+    <ID>NoNameShadowing:RenderableUtils.kt$RenderableUtils${ it != null }</ID>
+    <ID>NoNameShadowing:ReplaceRomanNumerals.kt$ReplaceRomanNumerals${ it.isValidRomanNumeral() &amp;&amp; it.removeFormatting().romanToDecimal() != 2000 }</ID>
+    <ID>NoNameShadowing:RepoManager.kt$RepoManager${ unsuccessfulConstants.add(it) }</ID>
+    <ID>NoNameShadowing:RepoPatternManager.kt$RepoPatternManager${ it == '.' }</ID>
+    <ID>NoNameShadowing:Shimmy.kt$Shimmy.Companion$source</ID>
+    <ID>NoNameShadowing:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker${ ItemPriceSource.entries[it.ordinal] }</ID>
+    <ID>ReturnCount:AnitaMedalProfit.kt$AnitaMedalProfit$private fun readItem(slot: Int, item: ItemStack, table: MutableList&lt;DisplayTableEntry&gt;)</ID>
+    <ID>ReturnCount:BingoNextStepHelper.kt$BingoNextStepHelper$private fun readDescription(description: String): NextStep?</ID>
+    <ID>ReturnCount:BroodmotherFeatures.kt$BroodmotherFeatures$private fun onStageUpdate()</ID>
+    <ID>ReturnCount:ChatPeek.kt$ChatPeek$@JvmStatic fun peek(): Boolean</ID>
+    <ID>ReturnCount:ChestValue.kt$ChestValue$private fun isValidStorage(): Boolean</ID>
+    <ID>ReturnCount:CollectionTracker.kt$CollectionTracker$fun command(args: Array&lt;String&gt;)</ID>
+    <ID>ReturnCount:CompactBingoChat.kt$CompactBingoChat$private fun onSkyBlockLevelUp(message: String): Boolean</ID>
+    <ID>ReturnCount:CrimsonMinibossRespawnTimer.kt$CrimsonMinibossRespawnTimer$private fun updateArea()</ID>
+    <ID>ReturnCount:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>ReturnCount:DamageIndicatorManager.kt$DamageIndicatorManager$private fun checkThorn(realHealth: Long, realMaxHealth: Long): String?</ID>
+    <ID>ReturnCount:DamageIndicatorManager.kt$DamageIndicatorManager$private fun getCustomHealth( entityData: EntityData, health: Long, entity: EntityLivingBase, maxHealth: Long, ): String?</ID>
+    <ID>ReturnCount:EnchantParser.kt$EnchantParser$private fun parseEnchants( loreList: MutableList&lt;String&gt;, enchants: Map&lt;String, Int&gt;, chatComponent: IChatComponent?, )</ID>
+    <ID>ReturnCount:EstimatedItemValue.kt$EstimatedItemValue$private fun draw(stack: ItemStack): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>ReturnCount:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$private fun calculateStarPrice( internalName: NEUInternalName, inputStars: Int, ): Pair&lt;EssenceItemUtils.EssenceUpgradePrice, Pair&lt;Int, Int&gt;&gt;?</ID>
+    <ID>ReturnCount:FishingAPI.kt$FishingAPI$fun seaCreatureCount(entity: EntityArmorStand): Int</ID>
+    <ID>ReturnCount:GardenVisitorFeatures.kt$GardenVisitorFeatures$private fun showGui(): Boolean</ID>
+    <ID>ReturnCount:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>ReturnCount:HideNotClickableItems.kt$HideNotClickableItems$private fun hideSalvage(chestName: String, stack: ItemStack): Boolean</ID>
+    <ID>ReturnCount:IslandGraphs.kt$IslandGraphs$private fun handleTick()</ID>
+    <ID>ReturnCount:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>ReturnCount:ItemNameResolver.kt$ItemNameResolver$internal fun getInternalNameOrNull(itemName: String): NEUInternalName?</ID>
+    <ID>ReturnCount:ItemPriceUtils.kt$ItemPriceUtils$fun NEUInternalName.getPriceOrNull( priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY, pastRecipes: List&lt;PrimitiveRecipe&gt; = emptyList(), ): Double?</ID>
+    <ID>ReturnCount:ItemUtils.kt$ItemUtils$private fun NEUInternalName.grabItemName(): String</ID>
+    <ID>ReturnCount:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>ReturnCount:MiningEventTracker.kt$MiningEventTracker$private fun sendData(eventName: String, time: String?)</ID>
+    <ID>ReturnCount:MobDetection.kt$MobDetection$private fun entitySpawn(entity: EntityLivingBase, roughType: Mob.Type): Boolean</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$internal fun createSkyblockEntity(baseEntity: EntityLivingBase): MobResult</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$private fun armorStandOnlyMobs(baseEntity: EntityLivingBase, armorStand: EntityArmorStand): MobResult?</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$private fun exceptions(baseEntity: EntityLivingBase, nextEntity: EntityLivingBase?): MobResult?</ID>
+    <ID>ReturnCount:MobFinder.kt$MobFinder$private fun tryAddEntitySpider(entity: EntityLivingBase): EntityResult?</ID>
+    <ID>ReturnCount:MobFinder.kt$MobFinder$private fun tryAddRift(entity: EntityLivingBase): EntityResult?</ID>
+    <ID>ReturnCount:MultiFilter.kt$MultiFilter$fun matchResult(string: String): String?</ID>
+    <ID>ReturnCount:PacketTest.kt$PacketTest$private fun Packet&lt;*&gt;.print()</ID>
+    <ID>ReturnCount:PowderMiningChatFilter.kt$PowderMiningChatFilter$@Suppress("CyclomaticComplexMethod") fun block(message: String): String?</ID>
+    <ID>ReturnCount:PurseAPI.kt$PurseAPI$private fun getCause(diff: Double): PurseChangeCause</ID>
+    <ID>ReturnCount:QuestLoader.kt$QuestLoader$private fun addQuest(name: String, state: QuestState, needAmount: Int): Quest</ID>
+    <ID>ReturnCount:ShowFishingItemName.kt$ShowFishingItemName$fun inCorrectArea(): Boolean</ID>
+    <ID>ReturnCount:SkillAPI.kt$SkillAPI$fun onCommand(it: Array&lt;String&gt;)</ID>
+    <ID>ReturnCount:SkyHanniConfigSearchResetCommand.kt$SkyHanniConfigSearchResetCommand$private suspend fun setCommand(args: Array&lt;String&gt;): String</ID>
+    <ID>ReturnCount:TabComplete.kt$TabComplete$private fun customTabComplete(command: String): List&lt;String&gt;?</ID>
+    <ID>SpreadOperator:ItemUtils.kt$ItemUtils$(tag, displayName, *lore.toTypedArray())</ID>
+    <ID>SpreadOperator:LimboPlaytime.kt$LimboPlaytime$( itemID.getItemStack().item, ITEM_NAME, *createItemLore() )</ID>
+    <ID>SpreadOperator:Text.kt$Text$(*component.toTypedArray(), separator = separator)</ID>
+    <ID>TooManyFunctions:CollectionUtils.kt$CollectionUtils</ID>
+    <ID>TooManyFunctions:DailyQuestHelper.kt$DailyQuestHelper</ID>
+    <ID>TooManyFunctions:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator</ID>
+    <ID>TooManyFunctions:GuiRenderUtils.kt$GuiRenderUtils</ID>
+    <ID>TooManyFunctions:HypixelCommands.kt$HypixelCommands</ID>
+    <ID>TooManyFunctions:InventoryUtils.kt$InventoryUtils</ID>
+    <ID>TooManyFunctions:LocationUtils.kt$LocationUtils</ID>
+    <ID>TooManyFunctions:LorenzUtils.kt$LorenzUtils</ID>
+    <ID>TooManyFunctions:LorenzVec.kt$LorenzVec</ID>
+    <ID>TooManyFunctions:MobFinder.kt$MobFinder</ID>
+    <ID>TooManyFunctions:NumberUtil.kt$NumberUtil</ID>
+    <ID>TooManyFunctions:RegexUtils.kt$RegexUtils</ID>
+    <ID>TooManyFunctions:RenderUtils.kt$RenderUtils</ID>
+    <ID>TooManyFunctions:Renderable.kt$Renderable$Companion</ID>
+    <ID>TooManyFunctions:ScoreboardElements.kt$at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardElements.kt</ID>
+    <ID>TooManyFunctions:ScoreboardEvent.kt$at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.kt</ID>
+    <ID>TooManyFunctions:SkyBlockItemModifierUtils.kt$SkyBlockItemModifierUtils</ID>
+    <ID>TooManyFunctions:StringUtils.kt$StringUtils</ID>
+    <ID>UnsafeCallOnNullableType:BasketWaypoints.kt$BasketWaypoints$Basket.entries.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:BasketWaypoints.kt$BasketWaypoints$notFoundBaskets.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:BucketedItemTrackerData.kt$BucketedItemTrackerData$it.value[internalName]?.hidden!!</ID>
+    <ID>UnsafeCallOnNullableType:ChocolateFactoryDataLoader.kt$ChocolateFactoryDataLoader$upgradeCost!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Double::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Float::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Int::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Long::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CombatUtils.kt$CombatUtils$a!!</ID>
+    <ID>UnsafeCallOnNullableType:CompactBestiaryChatMessage.kt$CompactBestiaryChatMessage$it.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:ConfigManager.kt$ConfigManager$file!!</ID>
+    <ID>UnsafeCallOnNullableType:CorpseTracker.kt$CorpseTracker$applicableKeys.first().key!!</ID>
+    <ID>UnsafeCallOnNullableType:CosmeticFollowingLine.kt$CosmeticFollowingLine$latestLocations[b]!!</ID>
+    <ID>UnsafeCallOnNullableType:CosmeticFollowingLine.kt$CosmeticFollowingLine$locations[b]!!</ID>
+    <ID>UnsafeCallOnNullableType:CropMoneyDisplay.kt$CropMoneyDisplay$cropNames[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:DailyMiniBossHelper.kt$DailyMiniBossHelper$getByDisplayName(name)!!</ID>
+    <ID>UnsafeCallOnNullableType:DamageIndicatorManager.kt$DamageIndicatorManager$data.deathLocation!!</ID>
+    <ID>UnsafeCallOnNullableType:DefaultConfigFeatures.kt$DefaultConfigFeatures$resetSuggestionState[cat]!!</ID>
+    <ID>UnsafeCallOnNullableType:DefaultConfigOptionGui.kt$DefaultConfigOptionGui$resetSuggestionState[cat]!!</ID>
+    <ID>UnsafeCallOnNullableType:DicerRngDropTracker.kt$DicerRngDropTracker$event.toolItem!!</ID>
+    <ID>UnsafeCallOnNullableType:DiscordStatus.kt$ownerRegex.find(colorlessLine)!!</ID>
+    <ID>UnsafeCallOnNullableType:DungeonAPI.kt$DungeonAPI$dungeonFloor!!</ID>
+    <ID>UnsafeCallOnNullableType:EasterEggWaypoints.kt$EasterEggWaypoints$EasterEgg.entries.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:EasterEggWaypoints.kt$EasterEggWaypoints$notFoundEggs.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityMovementData.kt$EntityMovementData$entityLocation[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$entityRenderCache.noXrayCache!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$entityRenderCache.xrayCache!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$frameToCopy!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$frameToPaste!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isAntialiasing!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isFastRender!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isShaders!!</ID>
+    <ID>UnsafeCallOnNullableType:FFGuideGUI.kt$FFGuideGUI$currentCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$contestCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$contests[bracket]!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$currentCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingWeightDisplay.kt$FarmingWeightDisplay$weightPerCrop[CropType.CACTUS]!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingWeightDisplay.kt$FarmingWeightDisplay$weightPerCrop[CropType.SUGAR_CANE]!!</ID>
+    <ID>UnsafeCallOnNullableType:FeatureToggleProcessor.kt$FeatureToggleProcessor$latestCategory!!</ID>
+    <ID>UnsafeCallOnNullableType:FeatureTogglesByDefaultAdapter.kt$FeatureTogglesByDefaultAdapter$gson!!</ID>
+    <ID>UnsafeCallOnNullableType:FishingProfitTracker.kt$FishingProfitTracker$itemCategories[currentCategory]!!</ID>
+    <ID>UnsafeCallOnNullableType:FishingProfitTracker.kt$FishingProfitTracker.Data$itemCategories["Trophy Fish"]!!</ID>
+    <ID>UnsafeCallOnNullableType:FortuneUpgrades.kt$FortuneUpgrades$nextTalisman.upgradeCost?.first!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenComposterUpgradesData.kt$GardenComposterUpgradesData$ComposterUpgrade.getByName(name)!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenCropMilestoneDisplay.kt$GardenCropMilestoneDisplay$cultivatingData[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenCropMilestonesCommunityFix.kt$GardenCropMilestonesCommunityFix$map[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenPlotIcon.kt$GardenPlotIcon$originalStack[index]!!</ID>
+    <ID>UnsafeCallOnNullableType:GhostCounter.kt$GhostCounter$storage?.totalMF!!</ID>
+    <ID>UnsafeCallOnNullableType:Graph.kt$Graph.Companion$position!!</ID>
+    <ID>UnsafeCallOnNullableType:Graph.kt$distances.distances[end]!!</ID>
+    <ID>UnsafeCallOnNullableType:GriffinBurrowHelper.kt$GriffinBurrowHelper$particleBurrows[targetLocation]!!</ID>
+    <ID>UnsafeCallOnNullableType:HoppityCallWarning.kt$HoppityCallWarning$acceptUUID!!</ID>
+    <ID>UnsafeCallOnNullableType:IslandGraphs.kt$IslandGraphs$currentTarget!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemBlink.kt$ItemBlink$offsets[item]!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemPickupLog.kt$ItemPickupLog$listToCheckAgainst[key]!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemPickupLog.kt$ItemPickupLog$listToCheckAgainst[key]?.second!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemStackTypeAdapterFactory.kt$ItemStackTypeAdapterFactory$gson!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemUtils.kt$ItemUtils$itemAmountCache[input]!!</ID>
+    <ID>UnsafeCallOnNullableType:JacobContestTimeNeeded.kt$JacobContestTimeNeeded$map[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:KSerializable.kt$KotlinTypeAdapterFactory$kotlinClass.memberProperties.find { it.name == param.name }!!</ID>
+    <ID>UnsafeCallOnNullableType:KSerializable.kt$KotlinTypeAdapterFactory$param.name!!</ID>
+    <ID>UnsafeCallOnNullableType:LorenzEvent.kt$LorenzEvent$this::class.simpleName!!</ID>
+    <ID>UnsafeCallOnNullableType:MinionFeatures.kt$MinionFeatures$newMinion!!</ID>
+    <ID>UnsafeCallOnNullableType:MobFinder.kt$MobFinder$floor6GiantsSeparateDelay[uuid]!!</ID>
+    <ID>UnsafeCallOnNullableType:NavigationHelper.kt$NavigationHelper$distances[node]!!</ID>
+    <ID>UnsafeCallOnNullableType:NumberUtil.kt$NumberUtil$romanSymbols[this]!!</ID>
+    <ID>UnsafeCallOnNullableType:PositionList.kt$PositionList$configLink!!</ID>
+    <ID>UnsafeCallOnNullableType:ReminderManager.kt$ReminderManager$storage[args.drop(1).first()]!!</ID>
+    <ID>UnsafeCallOnNullableType:ReminderManager.kt$ReminderManager$storage[args.first()]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderEntityOutlineEvent.kt$RenderEntityOutlineEvent$entitiesToChooseFrom!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderEntityOutlineEvent.kt$RenderEntityOutlineEvent$entitiesToOutline!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderGlobalHook.kt$RenderGlobalHook$camera!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderLivingEntityHelper.kt$RenderLivingEntityHelper$entityColorCondition[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderLivingEntityHelper.kt$RenderLivingEntityHelper$entityColorMap[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderUtils.kt$RenderUtils$it.name!!</ID>
+    <ID>UnsafeCallOnNullableType:RepoManager.kt$RepoManager$latestRepoCommit!!</ID>
+    <ID>UnsafeCallOnNullableType:RepoUtils.kt$RepoUtils$file!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[2]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[3]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$oldData!!</ID>
+    <ID>UnsafeCallOnNullableType:SimpleCommand.kt$SimpleCommand$tabRunnable!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker$it.get(DisplayMode.SESSION).getItemsProp()[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker$it.get(DisplayMode.TOTAL).getItemsProp()[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniMod.kt$SkyHanniMod.Companion$Loader.instance().indexedModList[MODID]!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$distance!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$distance2!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$firstParticlePoint?.distance(pos)!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$lastParticlePoint2!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$lastParticlePoint2?.distance(particlePoint!!)!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$particlePoint!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$particlePoint?.subtract(lastParticlePoint2!!)!!</ID>
+    <ID>UnsafeCallOnNullableType:SummoningSoulsName.kt$SummoningSoulsName$mobsName.getOrNull(nearestMob)!!</ID>
+    <ID>UnsafeCallOnNullableType:SuperpairsClicksAlert.kt$SuperpairsClicksAlert$match.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:TiaRelayWaypoints.kt$TiaRelayWaypoints$waypointName!!</ID>
+    <ID>UnsafeCallOnNullableType:Translator.kt$Translator$messageContentRegex.find(message)!!</ID>
+    <ID>UnsafeCallOnNullableType:TrevorFeatures.kt$TrevorFeatures$TrevorSolver.currentMob!!</ID>
+    <ID>UnsafeCallOnNullableType:TrevorSolver.kt$TrevorSolver$currentMob!!</ID>
+    <ID>UnsafeCallOnNullableType:TunnelsMaps.kt$TunnelsMaps$campfire.name!!</ID>
+    <ID>UnsafeCallOnNullableType:UpdateManager.kt$UpdateManager$potentialUpdate!!</ID>
+    <ID>UnsafeCallOnNullableType:VisitorRewardWarning.kt$VisitorRewardWarning$visitor.totalPrice!!</ID>
+    <ID>UnsafeCallOnNullableType:VisitorRewardWarning.kt$VisitorRewardWarning$visitor.totalReward!!</ID>
+    <ID>UnusedParameter:SkyHanniDebugsAndTests.kt$SkyHanniDebugsAndTests$args: Array&lt;String&gt;</ID>
+    <ID>UseIsNullOrEmpty:ItemUtils.kt$ItemUtils$name == null || name.isEmpty()</ID>
+    <ID>UseOrEmpty:SkyHanniDebugsAndTests.kt$SkyHanniDebugsAndTests$event.originalOre?.let { "$it " } ?: ""</ID>
+    <ID>VarCouldBeVal:AdvancedPlayerList.kt$AdvancedPlayerList$private var randomOrderCache = TimeLimitedCache&lt;String, Int&gt;(20.minutes)</ID>
+    <ID>VarCouldBeVal:BestiaryData.kt$BestiaryData$private var indexes = listOf( 10, 11, 12, 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, 25, 28, 29, 30, 31, 32, 33, 34, 37, 38, 39, 40, 41, 42, 43 )</ID>
+    <ID>VarCouldBeVal:BucketedItemTrackerData.kt$BucketedItemTrackerData$@Expose private var bucketedItems: MutableMap&lt;E, MutableMap&lt;NEUInternalName, TrackedItem&gt;&gt; = HashMap()</ID>
+    <ID>VarCouldBeVal:CarnivalZombieShootout.kt$CarnivalZombieShootout$private var lastUpdate = Updates(SimpleTimeMark.farPast(), SimpleTimeMark.farPast())</ID>
+    <ID>VarCouldBeVal:ChocolateFactoryStrayTracker.kt$ChocolateFactoryStrayTracker$private var claimedStraysSlots = mutableListOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:CompactBestiaryChatMessage.kt$CompactBestiaryChatMessage$private var bestiaryDescription = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:CompactExperimentRewards.kt$CompactExperimentRewards$private var gainedRewards = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:CraftRoomHolographicMob.kt$CraftRoomHolographicMob$private var entityToHolographicEntity = mapOf( EntityZombie::class.java to HolographicEntities.zombie, EntitySlime::class.java to HolographicEntities.slime, EntityCaveSpider::class.java to HolographicEntities.caveSpider, )</ID>
+    <ID>VarCouldBeVal:CustomWardrobe.kt$CustomWardrobe$private var guiName = "Custom Wardrobe"</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant$@Expose private var goodLevel = 0</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant$@Expose private var maxLevel = 0</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose @Suppress("unused") private var statLabel: String? = null</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose private var nbtNum: String? = null</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose private var stackLevel: TreeSet&lt;Int&gt;? = null</ID>
+    <ID>VarCouldBeVal:ErrorManager.kt$ErrorManager$private var cache = TimeLimitedSet&lt;Pair&lt;String, Int&gt;&gt;(10.minutes)</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var comboPrice = combo.asInternalName().getPriceOrNull()</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var internalName = removeKuudraArmorPrefix(stack.getInternalName().asString().removePrefix("VANQUISHED_"))</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var nameColor = if (!useless) "§9" else "§7"</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var currentBottlesInInventory = mutableMapOf&lt;NEUInternalName, Int&gt;()</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var lastBottlesInInventory = mutableMapOf&lt;NEUInternalName, Int&gt;()</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var lastSplashes = mutableListOf&lt;ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:FarmingWeightDisplay.kt$FarmingWeightDisplay$private var nextPlayers = mutableListOf&lt;UpcomingLeaderboardPlayer&gt;()</ID>
+    <ID>VarCouldBeVal:FlareDisplay.kt$FlareDisplay$private var flares = mutableListOf&lt;Flare&gt;()</ID>
+    <ID>VarCouldBeVal:FontRendererHook.kt$FontRendererHook$private var CHROMA_COLOR: Int = -0x1</ID>
+    <ID>VarCouldBeVal:FontRendererHook.kt$FontRendererHook$private var CHROMA_COLOR_SHADOW: Int = -0xAAAAAB</ID>
+    <ID>VarCouldBeVal:GardenPlotIcon.kt$GardenPlotIcon$private var cachedStack = mutableMapOf&lt;Int, ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:GardenPlotIcon.kt$GardenPlotIcon$private var originalStack = mutableMapOf&lt;Int, ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:GardenPlotMenuHighlighting.kt$GardenPlotMenuHighlighting$private var highlightedPlots = mutableMapOf&lt;GardenPlotAPI.Plot, PlotStatusType&gt;()</ID>
+    <ID>VarCouldBeVal:GardenVisitorColorNames.kt$GardenVisitorColorNames$private var visitorColors = mutableMapOf&lt;String, String&gt;() // name -&gt; color code</ID>
+    <ID>VarCouldBeVal:GhostData.kt$GhostData$private var session = mutableMapOf( Option.KILLS to 0.0, Option.SORROWCOUNT to 0.0, Option.VOLTACOUNT to 0.0, Option.PLASMACOUNT to 0.0, Option.GHOSTLYBOOTS to 0.0, Option.BAGOFCASH to 0.0, Option.TOTALDROPS to 0.0, Option.SCAVENGERCOINS to 0.0, Option.MAXKILLCOMBO to 0.0, Option.SKILLXPGAINED to 0.0 )</ID>
+    <ID>VarCouldBeVal:GraphEditor.kt$GraphEditor$var vector = LocationUtils.calculatePlayerFacingDirection()</ID>
+    <ID>VarCouldBeVal:HoppityCollectionStats.kt$HoppityCollectionStats$private var highlightMap = mutableMapOf&lt;String, LorenzColor&gt;()</ID>
+    <ID>VarCouldBeVal:HoppityEggLocations.kt$HoppityEggLocations$// TODO add gui/command to show total data/missing islands private var collectedEggStorage: MutableMap&lt;IslandType, MutableSet&lt;LorenzVec&gt;&gt; get() = ChocolateFactoryAPI.profileStorage?.collectedEggLocations ?: mutableMapOf() set(value) { ChocolateFactoryAPI.profileStorage?.collectedEggLocations = value }</ID>
+    <ID>VarCouldBeVal:HoppityNpc.kt$HoppityNpc$private var slotsToHighlight = mutableSetOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:IslandAreas.kt$IslandAreas$var suffix = ""</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemList = mutableMapOf&lt;Int, Pair&lt;ItemStack, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemsAddedToInventory = mutableMapOf&lt;Int, PickupEntry&gt;()</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemsRemovedFromInventory = mutableMapOf&lt;Int, PickupEntry&gt;()</ID>
+    <ID>VarCouldBeVal:LocationUtils.kt$LocationUtils$var yaw = LocationUtils.calculatePlayerYaw() + 180</ID>
+    <ID>VarCouldBeVal:LorenzLogger.kt$LorenzLogger.Companion$private var LOG_DIRECTORY = File("config/skyhanni/logs")</ID>
+    <ID>VarCouldBeVal:MobDetection.kt$MobDetection$private var shouldClear: AtomicBoolean = AtomicBoolean(false)</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var floor2summonsDiedOnce = mutableListOf&lt;EntityOtherPlayerMP&gt;()</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var floor6GiantsSeparateDelay = mutableMapOf&lt;UUID, Pair&lt;Long, BossType&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var guardians = mutableListOf&lt;EntityGuardian&gt;()</ID>
+    <ID>VarCouldBeVal:NeuReforgeJson.kt$NeuReforgeJson$private lateinit var itemTypeField: Pair&lt;String, List&lt;NEUInternalName&gt;&gt;</ID>
+    <ID>VarCouldBeVal:PowerStoneGuideFeatures.kt$PowerStoneGuideFeatures$private var missing = mutableMapOf&lt;Int, NEUInternalName&gt;()</ID>
+    <ID>VarCouldBeVal:PunchcardHighlight.kt$PunchcardHighlight$private var playerQueue = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:QuiverWarning.kt$QuiverWarning$private var arrowsInInstance = mutableSetOf&lt;ArrowType&gt;()</ID>
+    <ID>VarCouldBeVal:ReforgeHelper.kt$ReforgeHelper$private var waitForChat = AtomicBoolean(false)</ID>
+    <ID>VarCouldBeVal:ReminderManager.kt$ReminderManager$private var listPage = 1</ID>
+    <ID>VarCouldBeVal:RepoPatternGui.kt$RepoPatternGui$private var searchCache = ObservableList(mutableListOf&lt;RepoPatternInfo&gt;())</ID>
+    <ID>VarCouldBeVal:RepoPatternManager.kt$RepoPatternManager$/** * Map containing all keys and their repo patterns. Used for filling in new regexes after an update, and for * checking duplicate registrations. */ private var usedKeys: NavigableMap&lt;String, CommonPatternInfo&lt;*, *&gt;&gt; = TreeMap()</ID>
+    <ID>VarCouldBeVal:RepoPatternManager.kt$RepoPatternManager$/** * Map containing the exclusive owner of a regex key */ private var exclusivity: MutableMap&lt;String, RepoPatternKeyOwner&gt; = mutableMapOf()</ID>
+    <ID>VarCouldBeVal:SeaCreatureFeatures.kt$SeaCreatureFeatures$private var entityIds = TimeLimitedSet&lt;Int&gt;(6.minutes)</ID>
+    <ID>VarCouldBeVal:SeaCreatureFeatures.kt$SeaCreatureFeatures$private var rareSeaCreatures = TimeLimitedSet&lt;Mob&gt;(6.minutes)</ID>
+    <ID>VarCouldBeVal:ShowFishingItemName.kt$ShowFishingItemName$private var itemsOnGround = TimeLimitedCache&lt;EntityItem, String&gt;(750.milliseconds)</ID>
+    <ID>VarCouldBeVal:SkyblockGuideHighlightFeature.kt$SkyblockGuideHighlightFeature.Companion$private var missing = mutableSetOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:SlayerItemsOnGround.kt$SlayerItemsOnGround$private var itemsOnGround = TimeLimitedCache&lt;EntityItem, String&gt;(2.seconds)</ID>
+    <ID>VarCouldBeVal:SoopyGuessBurrow.kt$SoopyGuessBurrow$private var dingSlope = mutableListOf&lt;Float&gt;()</ID>
+    <ID>VarCouldBeVal:SoopyGuessBurrow.kt$SoopyGuessBurrow$private var locations = mutableListOf&lt;LorenzVec&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$// TODO remove string. use enum instead! maybe even create new data type instead of map of pairs private var found = mutableMapOf&lt;Pair&lt;Item?, ItemPair?&gt;, String&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var lastClicked = mutableListOf&lt;Pair&lt;Int, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var toCheck = mutableListOf&lt;Pair&lt;Int, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var uncoveredItems = mutableListOf&lt;Pair&lt;Int, String&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:TiaRelayHelper.kt$TiaRelayHelper$private var resultDisplay = mutableMapOf&lt;Int, Int&gt;()</ID>
+    <ID>VarCouldBeVal:TiaRelayHelper.kt$TiaRelayHelper$private var sounds = mutableMapOf&lt;Int, Sound&gt;()</ID>
+    <ID>VarCouldBeVal:Translator.kt$Translator$var lang = config.languageCode.get()</ID>
+    <ID>VarCouldBeVal:TrevorFeatures.kt$TrevorFeatures$private var backupTrapperID: Int = 17</ID>
+    <ID>VarCouldBeVal:TrevorFeatures.kt$TrevorFeatures$private var trapperID: Int = 56</ID>
+    <ID>VarCouldBeVal:TrophyFishDisplay.kt$TrophyFishDisplay$private var recentlyDroppedTrophies = TimeLimitedCache&lt;NEUInternalName, TrophyRarity&gt;(5.seconds)</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var fillerID = "STAINED_GLASS_PANE".asInternalName()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var limboID = "ENDER_PEARL".asInternalName()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var skillOverflowLuck = mutableMapOf&lt;SkillType, Int&gt;()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var skillsID = "DIAMOND_SWORD".asInternalName()</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/detekt/build.gradle.kts b/detekt/build.gradle.kts
new file mode 100644
index 000000000000..ce0de9ace8ce
--- /dev/null
+++ b/detekt/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    kotlin("jvm")
+    id("com.google.devtools.ksp")
+}
+
+dependencies {
+    implementation("io.gitlab.arturbosch.detekt:detekt-api:1.23.7")
+    ksp(libs.autoservice.ksp)
+    implementation(libs.autoservice.annotations)
+    implementation("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
+    testImplementation("io.kotest:kotest-assertions-core:5.9.1")
+    testImplementation("io.gitlab.arturbosch.detekt:detekt-test:1.23.7")
+}
diff --git a/detekt/detekt.yml b/detekt/detekt.yml
new file mode 100644
index 000000000000..1b7d3ab05ff8
--- /dev/null
+++ b/detekt/detekt.yml
@@ -0,0 +1,127 @@
+
+config:
+    validation: true
+
+GrammarRules:
+    active: true
+    AvoidColour: # custom rule to prefer color to colour
+        active: true
+
+FormattingRules:
+    active: true
+    CustomCommentSpacing:
+        active: true
+
+
+style:
+    MagicNumber: # I, Linnea Gräf, of sound mind and body, disagree with disabling this rule
+        active: false
+    UnusedParameter:
+        active: true
+        ignoreAnnotated:
+            - 'SubscribeEvent'
+            - 'HandleEvent'
+            - 'Mod.EventHandler'
+    ReturnCount:
+        active: true
+        max: 5
+        excludeGuardClauses: true
+        ignoreAnnotated:
+            - 'SubscribeEvent'
+            - 'HandleEvent'
+            - 'Mod.EventHandler'
+    MaxLineLength:
+        active: true
+        maxLineLength: 140
+        excludeCommentStatements: true
+    LoopWithTooManyJumpStatements:
+        active: true
+        maxJumpCount: 3
+    UnnecessaryAbstractClass: # gets horrendously messed up with Event classes
+        active: false
+    UnusedPrivateMember: # gets tripped up by API methods
+        active: false
+    UnusedPrivateProperty: # loops that don't use their iterator
+        active: true
+        allowedNames: "^(unused|_)$"
+    UseCheckOrError:
+        active: false
+    ForbiddenComment: # every TODO gets flagged
+        active: false
+    DestructuringDeclarationWithTooManyEntries: # too aggressive
+        active: true
+        maxDestructuringEntries: 5
+
+formatting:
+    MaximumLineLength: # ktlint - handled by detekt
+        active: false
+    MultiLineIfElse:
+        active: false
+    ArgumentListWrapping: # ktlint - way too aggressive
+        active: false
+    NoBlankLineBeforeRbrace: # pedantic
+        active: false
+    NoConsecutiveBlankLines: # pedantic
+        active: false
+    NoEmptyFirstLineInMethodBlock: # pedantic
+        active: false
+    ParameterListWrapping: # pedantic, can be useful in compact code
+        active: false
+    CommentSpacing: # handled by custom rule
+        active: false
+    SpacingBetweenDeclarationsWithAnnotations: # nah
+        active: false
+    SpacingBetweenDeclarationsWithComments: # also nah
+        active: false
+
+complexity:
+    CyclomaticComplexMethod: # default threshold of 15, caught almost every complex method
+        active: true
+        threshold: 25
+        ignoreAnnotated:
+            - 'SubscribeEvent'
+            - 'HandleEvent'
+            - 'Mod.EventHandler'
+    LongParameterList: # too aggressive, classes can need a lot of params
+        active: false
+    NestedBlockDepth: # too aggressive
+        active: false
+    TooManyFunctions: # ktlint - also way too aggressive by default (11 on all file types)
+        active: true
+        thresholdInFiles: 15
+        thresholdInClasses: 20
+        thresholdInInterfaces: 20
+        thresholdInObjects: 20
+        thresholdInEnums: 11
+        ignoreAnnotated:
+            - 'SkyHanniModule'
+    ComplexCondition: # aggressive by default, at a complexity of 4
+        active: true
+        threshold: 6
+    LongMethod: # default max length of 60, caught way too much
+        active: true
+        threshold: 100
+        ignoreAnnotated:
+            - 'SubscribeEvent'
+            - 'HandleEvent'
+            - 'Mod.EventHandler'
+
+exceptions:
+    SwallowedException: # there are valid reasons to do this
+        active: false
+    ThrowingExceptionsWithoutMessageOrCause: # again, valid reasons
+        active: false
+    TooGenericExceptionCaught: # sometimes you just need to catch Exception
+        active: false
+    TooGenericExceptionThrown: # we don't have our own custom exceptions
+        active: false
+
+naming:
+    ConstructorParameterNaming: # pedantic
+        active: false
+
+potential-bugs:
+    DoubleMutabilityForCollection: # went crazy about all the mutable collections
+        active: false
+    HasPlatformType: # false positives on config get() methods
+        active: false
diff --git a/detekt/src/main/kotlin/formatting/CustomCommentSpacing.kt b/detekt/src/main/kotlin/formatting/CustomCommentSpacing.kt
new file mode 100644
index 000000000000..aaf7896cfd17
--- /dev/null
+++ b/detekt/src/main/kotlin/formatting/CustomCommentSpacing.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.detektrules.formatting
+
+import io.gitlab.arturbosch.detekt.api.CodeSmell
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.Debt
+import io.gitlab.arturbosch.detekt.api.Entity
+import io.gitlab.arturbosch.detekt.api.Issue
+import io.gitlab.arturbosch.detekt.api.Rule
+import io.gitlab.arturbosch.detekt.api.Severity
+import org.jetbrains.kotlin.com.intellij.psi.PsiComment
+
+class CustomCommentSpacing(config: Config) : Rule(config) {
+    override val issue = Issue(
+        "CustomCommentSpacing",
+        Severity.Style,
+        "Enforces custom spacing rules for comments.",
+        Debt.FIVE_MINS
+    )
+
+    private val allowedPatterns = listOf(
+        "#if",
+        "#else",
+        "#elseif",
+        "#endif",
+        "$$"
+    )
+
+    override fun visitComment(comment: PsiComment) {
+        if (allowedPatterns.any { comment.text.contains(it) }) {
+            return
+        }
+
+        /**
+         * REGEX-TEST: // Test comment
+         * REGEX-TEST: /* Test comment */
+         */
+        val commentRegex = Regex("""^(?:\/{2}|\/\*)(?:\s.*|$)""", RegexOption.DOT_MATCHES_ALL)
+        if (!commentRegex.matches(comment.text)) {
+            report(
+                CodeSmell(
+                    issue,
+                    Entity.from(comment),
+                    "Expected space after opening comment."
+                )
+            )
+        }
+
+        // Fallback to super (ostensibly a no-check)
+        super.visitComment(comment)
+    }
+}
diff --git a/detekt/src/main/kotlin/formatting/FormattingRuleSetProvider.kt b/detekt/src/main/kotlin/formatting/FormattingRuleSetProvider.kt
new file mode 100644
index 000000000000..a0a969bcf503
--- /dev/null
+++ b/detekt/src/main/kotlin/formatting/FormattingRuleSetProvider.kt
@@ -0,0 +1,17 @@
+package at.hannibal2.skyhanni.detektrules.formatting
+
+import com.google.auto.service.AutoService
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.RuleSet
+import io.gitlab.arturbosch.detekt.api.RuleSetProvider
+
+@AutoService(RuleSetProvider::class)
+class FormattingRuleSetProvider : RuleSetProvider {
+    override val ruleSetId: String = "FormattingRules"
+
+    override fun instance(config: Config): RuleSet {
+        return RuleSet(ruleSetId, listOf(
+            CustomCommentSpacing(config)
+        ))
+    }
+}
diff --git a/detekt/src/main/kotlin/grammar/AvoidColour.kt b/detekt/src/main/kotlin/grammar/AvoidColour.kt
new file mode 100644
index 000000000000..754148d36f31
--- /dev/null
+++ b/detekt/src/main/kotlin/grammar/AvoidColour.kt
@@ -0,0 +1,38 @@
+package at.hannibal2.skyhanni.detektrules.grammar
+
+import io.gitlab.arturbosch.detekt.api.CodeSmell
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.Debt
+import io.gitlab.arturbosch.detekt.api.Entity
+import io.gitlab.arturbosch.detekt.api.Issue
+import io.gitlab.arturbosch.detekt.api.Rule
+import io.gitlab.arturbosch.detekt.api.Severity
+import org.jetbrains.kotlin.psi.KtStringTemplateExpression
+
+/**
+ * This rule reports all usages of the word "colour" in the codebase,
+ * preferring the 'American' spelling "color" - this will ignore any
+ * type annotations, i.e., `@ConfigEditorColour` will not be reported.
+ */
+class AvoidColour(config: Config) : Rule(config) {
+    override val issue = Issue(
+        "AvoidColour",
+        Severity.Style,
+        "Avoid using the word 'colour' in code, prefer 'color' instead.",
+        Debt.FIVE_MINS
+    )
+
+    override fun visitStringTemplateExpression(expression: KtStringTemplateExpression) {
+        val text = expression.text // Be aware .getText() returns the entire span of this template, including variable names contained within. This should be rare enough of a problem for us to not care about it.
+        if (text.contains("colour", ignoreCase = true)) {
+            report(
+                CodeSmell(
+                    issue,
+                    Entity.from(expression),
+                    "Avoid using the word 'colour' in code, prefer 'color' instead."
+                )
+            )
+        }
+        super.visitStringTemplateExpression(expression)
+    }
+}
diff --git a/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt b/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
new file mode 100644
index 000000000000..957b20147cee
--- /dev/null
+++ b/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
@@ -0,0 +1,17 @@
+package at.hannibal2.skyhanni.detektrules.grammar
+
+import com.google.auto.service.AutoService
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.RuleSet
+import io.gitlab.arturbosch.detekt.api.RuleSetProvider
+
+@AutoService(RuleSetProvider::class)
+class GrammarRuleSetProvider : RuleSetProvider {
+    override val ruleSetId: String = "GrammarRules"
+
+    override fun instance(config: Config): RuleSet {
+        return RuleSet(ruleSetId, listOf(
+            AvoidColour(config)
+        ))
+    }
+}
diff --git a/detekt/src/main/kotlin/root.kt b/detekt/src/main/kotlin/root.kt
new file mode 100644
index 000000000000..9b95a398f30a
--- /dev/null
+++ b/detekt/src/main/kotlin/root.kt
@@ -0,0 +1 @@
+package at.hannibal2.skyhanni.detektrules
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 634e49064ec5..926ed02850e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,3 +10,6 @@ libautoupdate = { module = "moe.nea:libautoupdate", version.ref = "libautoupdate
 headlessLwjgl = { module = "com.github.3arthqu4ke.HeadlessMc:headlessmc-lwjgl", version.ref = "headlessLwjgl" }
 jbAnnotations = { module = "org.jetbrains:annotations", version.ref = "jbAnnotations" }
 hotswapagentforge = { module = "moe.nea:hotswapagent-forge", version = "1.0.1" }
+autoservice_ksp = {module="dev.zacsweers.autoservice:auto-service-ksp",version="1.1.0"}
+autoservice_annotations = {module="com.google.auto.service:auto-service-annotations",version="1.1.1"}
+
diff --git a/root.gradle.kts b/root.gradle.kts
index 5baae39e2ba7..01039394234d 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -9,11 +9,32 @@ plugins {
     kotlin("plugin.power-assert") version "2.0.0" apply false
     id("com.google.devtools.ksp") version "2.0.0-1.0.24" apply false
     id("dev.architectury.architectury-pack200") version "0.1.3"
+    id("io.gitlab.arturbosch.detekt") version "1.23.7" apply false
 }
 
 allprojects {
     group = "at.hannibal2.skyhanni"
     version = "0.27.Beta.12"
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven("https://maven.minecraftforge.net") {
+            metadataSources {
+                artifact() // We love missing POMs
+            }
+        }
+        maven("https://repo.spongepowered.org/maven/") // mixin
+        maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") // DevAuth
+        maven("https://jitpack.io") { // NotEnoughUpdates (compiled against)
+            content {
+                includeGroupByRegex("(com|io)\\.github\\..*")
+            }
+        }
+        maven("https://repo.nea.moe/releases") // libautoupdate
+        maven("https://maven.notenoughupdates.org/releases") // NotEnoughUpdates (dev env)
+        maven("https://repo.hypixel.net/repository/Hypixel/") // mod-api
+        maven("https://maven.teamresourceful.com/repository/thatgravyboat/") // DiscordIPC
+    }
 }
 
 preprocess {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index adee2acba161..987b70013456 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,6 +38,7 @@ plugins {
 MultiVersionStage.initFrom(file(".gradle/private.properties"))
 
 include("annotation-processors")
+include("detekt")
 rootProject.name = "SkyHanni"
 rootProject.buildFileName = "root.gradle.kts"
 
diff --git a/sharedVariables/src/MinecraftVersion.kt b/sharedVariables/src/MinecraftVersion.kt
index 7384c8fbd49b..796cc0d709a6 100644
--- a/sharedVariables/src/MinecraftVersion.kt
+++ b/sharedVariables/src/MinecraftVersion.kt
@@ -16,6 +16,9 @@ enum class MinecraftVersion(
 
     val javaLanguageVersion = JavaLanguageVersion.of(javaVersion)
 
+    val formattedJavaLanguageVersion: String
+        get() = if (javaVersion <= 8) "1.$javaVersion" else javaVersion.toString()
+
     val versionNumber = run {
         val parts = versionName.split('.').mapTo(mutableListOf()) { it.toInt() }
         if (parts.size == 2) parts.add(0)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderTooltipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt
similarity index 97%
rename from src/main/java/at/hannibal2/skyhanni/events/RenderTooltipEvent.kt
rename to src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt
index ff9e6b448973..f8cb98802b1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RenderTooltipEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import net.minecraft.item.ItemStack
 
-class RenderItemTooltipEvent(val stack: ItemStack) : LorenzEvent()
\ No newline at end of file
+class RenderItemTooltipEvent(val stack: ItemStack) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
index 86d7fca50ad9..b1ee566598b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
@@ -31,7 +31,7 @@ object SuperpairExperimentInformationDisplay {
     data class Item(val index: Int, val name: String)
     data class ItemPair(val first: Item, val second: Item)
 
-    // TODO remove string. use enum instead! maybe even create new data type instaed of map of pairs
+    // TODO remove string. use enum instead! maybe even create new data type instead of map of pairs
     private var found = mutableMapOf<Pair<Item?, ItemPair?>, String>()
 
     private var toCheck = mutableListOf<Pair<Int, Int>>()
diff --git a/versions/1.8.9/detekt/baseline.xml b/versions/1.8.9/detekt/baseline.xml
new file mode 100644
index 000000000000..ac35c2f6d1a8
--- /dev/null
+++ b/versions/1.8.9/detekt/baseline.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
+    <ID>AnnotationOnSeparateLine:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") node.neighbours.map { GraphingEdge( translation[node]!!, translation[it.key]!!, ) }</ID>
+    <ID>AnnotationOnSeparateLine:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") nodes[indexedTable[otherNode.id]!!]</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$arrayOf(npcPrice)</ID>
+    <ID>ArrayPrimitive:CropMoneyDisplay.kt$CropMoneyDisplay$arrayOf(sellOffer)</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$Array&lt;Double&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$Array&lt;Float&gt;</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$arrayOf(x, y, z)</ID>
+    <ID>ArrayPrimitive:LorenzVec.kt$LorenzVec$arrayOf(x.toFloat(), y.toFloat(), z.toFloat())</ID>
+    <ID>CyclomaticComplexMethod:AdvancedPlayerList.kt$AdvancedPlayerList$fun newSorting(original: List&lt;String&gt;): List&lt;String&gt;</ID>
+    <ID>CyclomaticComplexMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun calculateMoneyPerHour(debugList: MutableList&lt;List&lt;Any&gt;&gt;): Map&lt;NEUInternalName, Array&lt;Double&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:DamageIndicatorManager.kt$DamageIndicatorManager$private fun checkThorn(realHealth: Long, realMaxHealth: Long): String?</ID>
+    <ID>CyclomaticComplexMethod:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$private fun addEnchantments(stack: ItemStack, list: MutableList&lt;String&gt;): Double</ID>
+    <ID>CyclomaticComplexMethod:GardenBestCropTime.kt$GardenBestCropTime$fun drawBestDisplay(currentCrop: CropType?): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:GardenCropMilestoneDisplay.kt$GardenCropMilestoneDisplay$private fun drawProgressDisplay(crop: CropType): List&lt;Renderable&gt;</ID>
+    <ID>CyclomaticComplexMethod:GardenVisitorFeatures.kt$GardenVisitorFeatures$private fun readToolTip(visitor: VisitorAPI.Visitor, itemStack: ItemStack?, toolTip: MutableList&lt;String&gt;)</ID>
+    <ID>CyclomaticComplexMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID>
+    <ID>CyclomaticComplexMethod:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>CyclomaticComplexMethod:GraphEditorBugFinder.kt$GraphEditorBugFinder$private fun asyncTest()</ID>
+    <ID>CyclomaticComplexMethod:IslandAreas.kt$IslandAreas$private fun buildDisplay()</ID>
+    <ID>CyclomaticComplexMethod:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>CyclomaticComplexMethod:ItemNameResolver.kt$ItemNameResolver$internal fun getInternalNameOrNull(itemName: String): NEUInternalName?</ID>
+    <ID>CyclomaticComplexMethod:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>CyclomaticComplexMethod:OverviewPage.kt$OverviewPage$private fun getPage(): Pair&lt;List&lt;List&lt;Renderable&gt;&gt;, List&lt;Renderable&gt;&gt;</ID>
+    <ID>CyclomaticComplexMethod:PacketTest.kt$PacketTest$private fun Packet&lt;*&gt;.print()</ID>
+    <ID>CyclomaticComplexMethod:ParkourHelper.kt$ParkourHelper$fun render(event: LorenzRenderWorldEvent)</ID>
+    <ID>CyclomaticComplexMethod:Renderable.kt$Renderable.Companion$internal fun shouldAllowLink(debug: Boolean = false, bypassChecks: Boolean): Boolean</ID>
+    <ID>CyclomaticComplexMethod:SkillProgress.kt$SkillProgress$private fun drawDisplay()</ID>
+    <ID>CyclomaticComplexMethod:VampireSlayerFeatures.kt$VampireSlayerFeatures$private fun EntityOtherPlayerMP.process()</ID>
+    <ID>CyclomaticComplexMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID>
+    <ID>DestructuringDeclarationWithTooManyEntries:SackDisplay.kt$SackDisplay$val (internalName, rough, flawed, fine, roughPrice, flawedPrice, finePrice) = gem</ID>
+    <ID>Filename:AreaChangeEvents.kt$at.hannibal2.skyhanni.events.skyblock.AreaChangeEvents.kt</ID>
+    <ID>InjectDispatcher:ClipboardUtils.kt$ClipboardUtils$IO</ID>
+    <ID>InjectDispatcher:GardenNextJacobContest.kt$GardenNextJacobContest$IO</ID>
+    <ID>InjectDispatcher:HypixelBazaarFetcher.kt$HypixelBazaarFetcher$IO</ID>
+    <ID>InjectDispatcher:MayorAPI.kt$MayorAPI$IO</ID>
+    <ID>LongMethod:CopyNearbyEntitiesCommand.kt$CopyNearbyEntitiesCommand$fun command(args: Array&lt;String&gt;)</ID>
+    <ID>LongMethod:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>LongMethod:DefaultConfigOptionGui.kt$DefaultConfigOptionGui$override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float)</ID>
+    <ID>LongMethod:GhostCounter.kt$GhostCounter$private fun drawDisplay()</ID>
+    <ID>LongMethod:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>LongMethod:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>LongMethod:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>LongMethod:OverviewPage.kt$OverviewPage$private fun getPage(): Pair&lt;List&lt;List&lt;Renderable&gt;&gt;, List&lt;Renderable&gt;&gt;</ID>
+    <ID>LongMethod:RenderableTooltips.kt$RenderableTooltips$private fun drawHoveringText()</ID>
+    <ID>LongMethod:TabListRenderer.kt$TabListRenderer$private fun drawTabList()</ID>
+    <ID>LongMethod:VisualWordGui.kt$VisualWordGui$override fun drawScreen(unusedX: Int, unusedY: Int, partialTicks: Float)</ID>
+    <ID>LoopWithTooManyJumpStatements:AdvancedPlayerList.kt$AdvancedPlayerList$for</ID>
+    <ID>LoopWithTooManyJumpStatements:CropMoneyDisplay.kt$CropMoneyDisplay$for</ID>
+    <ID>LoopWithTooManyJumpStatements:CustomScoreboard.kt$CustomScoreboard$for</ID>
+    <ID>LoopWithTooManyJumpStatements:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$for</ID>
+    <ID>LoopWithTooManyJumpStatements:GardenComposterInventoryFeatures.kt$GardenComposterInventoryFeatures$for</ID>
+    <ID>LoopWithTooManyJumpStatements:GardenVisitorFeatures.kt$GardenVisitorFeatures$for</ID>
+    <ID>LoopWithTooManyJumpStatements:IslandAreas.kt$IslandAreas$for</ID>
+    <ID>LoopWithTooManyJumpStatements:RiftBloodEffigies.kt$RiftBloodEffigies$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SkyBlockItemModifierUtils.kt$SkyBlockItemModifierUtils$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SkyHanniConfigSearchResetCommand.kt$SkyHanniConfigSearchResetCommand$for</ID>
+    <ID>LoopWithTooManyJumpStatements:SuperpairsClicksAlert.kt$SuperpairsClicksAlert$for</ID>
+    <ID>MapGetWithNotNullAssertionOperator:NavigationHelper.kt$NavigationHelper$distances[node]!!</ID>
+    <ID>MatchingDeclarationName:AreaChangeEvents.kt$ScoreboardAreaChangeEvent : SkyHanniEvent</ID>
+    <ID>MaxLineLength:GraphEditor.kt$GraphEditor$@Suppress("MapGetWithNotNullAssertionOperator") nodes[indexedTable[otherNode.id]!!] to node.position.distance(otherNode.position)</ID>
+    <ID>MemberNameEqualsClassName:CaptureFarmingGear.kt$CaptureFarmingGear$fun captureFarmingGear()</ID>
+    <ID>MemberNameEqualsClassName:Commands.kt$Commands$// command -&gt; description private val commands = mutableListOf&lt;CommandInfo&gt;()</ID>
+    <ID>MemberNameEqualsClassName:FameRanks.kt$FameRanks$var fameRanks = emptyMap&lt;String, FameRank&gt;() private set</ID>
+    <ID>MemberNameEqualsClassName:FirstMinionTier.kt$FirstMinionTier$fun firstMinionTier( otherItems: Map&lt;NEUInternalName, Int&gt;, minions: MutableMap&lt;String, NEUInternalName&gt;, tierOneMinions: MutableList&lt;NEUInternalName&gt;, tierOneMinionsDone: MutableSet&lt;NEUInternalName&gt;, )</ID>
+    <ID>MemberNameEqualsClassName:LastServers.kt$LastServers$private val lastServers = mutableMapOf&lt;String, SimpleTimeMark&gt;()</ID>
+    <ID>MemberNameEqualsClassName:PestSpawn.kt$PestSpawn$private fun pestSpawn(amount: Int, plotNames: List&lt;String&gt;, unknownAmount: Boolean)</ID>
+    <ID>MemberNameEqualsClassName:Shimmy.kt$Shimmy.Companion$private fun shimmy(source: Any?, fieldName: String): Any?</ID>
+    <ID>MemberNameEqualsClassName:TestBingo.kt$TestBingo$var testBingo = false</ID>
+    <ID>MemberNameEqualsClassName:Text.kt$Text$fun text(text: String, init: IChatComponent.() -&gt; Unit = {})</ID>
+    <ID>NoNameShadowing:BucketedItemTrackerData.kt$BucketedItemTrackerData${ it.hidden = !it.hidden }</ID>
+    <ID>NoNameShadowing:BurrowWarpHelper.kt$BurrowWarpHelper${ it.startsWith("§bWarp to ") }</ID>
+    <ID>NoNameShadowing:ChunkedStat.kt$ChunkedStat.Companion${ it.showWhen() }</ID>
+    <ID>NoNameShadowing:ContributorManager.kt$ContributorManager${ it.isAllowed() }</ID>
+    <ID>NoNameShadowing:Graph.kt$Graph.Companion${ out.name("Name").value(it) }</ID>
+    <ID>NoNameShadowing:Graph.kt$Graph.Companion${ out.name("Tags") out.beginArray() for (tagName in it) { out.value(tagName) } out.endArray() }</ID>
+    <ID>NoNameShadowing:GraphEditorBugFinder.kt$GraphEditorBugFinder${ it.position.distanceSqToPlayer() }</ID>
+    <ID>NoNameShadowing:GuiOptionEditorUpdateCheck.kt$GuiOptionEditorUpdateCheck$width</ID>
+    <ID>NoNameShadowing:HoppityCollectionStats.kt$HoppityCollectionStats${ val displayAmount = it.amount.shortFormat() val operationFormat = when (milestoneType) { HoppityEggType.CHOCOLATE_SHOP_MILESTONE -&gt; "spending" HoppityEggType.CHOCOLATE_FACTORY_MILESTONE -&gt; "reaching" else -&gt; "" // Never happens } // List indexing is weird existingLore[replaceIndex - 1] = "§7Obtained by $operationFormat §6$displayAmount" existingLore[replaceIndex] = "§7all-time §6Chocolate." return existingLore }</ID>
+    <ID>NoNameShadowing:HotmData.kt$HotmData.Companion${ it.setCurrent(it.getTotal()) }</ID>
+    <ID>NoNameShadowing:LorenzVec.kt$LorenzVec.Companion$pitch</ID>
+    <ID>NoNameShadowing:LorenzVec.kt$LorenzVec.Companion$yaw</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;$posX</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;$posY</ID>
+    <ID>NoNameShadowing:Renderable.kt$Renderable.Companion.&lt;no name provided&gt;${ it.value?.contains(textInput.textBox, ignoreCase = true) ?: true }</ID>
+    <ID>NoNameShadowing:RenderableUtils.kt$RenderableUtils${ it != null }</ID>
+    <ID>NoNameShadowing:ReplaceRomanNumerals.kt$ReplaceRomanNumerals${ it.isValidRomanNumeral() &amp;&amp; it.removeFormatting().romanToDecimal() != 2000 }</ID>
+    <ID>NoNameShadowing:RepoManager.kt$RepoManager${ unsuccessfulConstants.add(it) }</ID>
+    <ID>NoNameShadowing:RepoPatternManager.kt$RepoPatternManager${ it == '.' }</ID>
+    <ID>NoNameShadowing:Shimmy.kt$Shimmy.Companion$source</ID>
+    <ID>NoNameShadowing:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker${ ItemPriceSource.entries[it.ordinal] }</ID>
+    <ID>ReturnCount:AnitaMedalProfit.kt$AnitaMedalProfit$private fun readItem(slot: Int, item: ItemStack, table: MutableList&lt;DisplayTableEntry&gt;)</ID>
+    <ID>ReturnCount:BingoNextStepHelper.kt$BingoNextStepHelper$private fun readDescription(description: String): NextStep?</ID>
+    <ID>ReturnCount:BroodmotherFeatures.kt$BroodmotherFeatures$private fun onStageUpdate()</ID>
+    <ID>ReturnCount:ChatPeek.kt$ChatPeek$@JvmStatic fun peek(): Boolean</ID>
+    <ID>ReturnCount:ChestValue.kt$ChestValue$private fun isValidStorage(): Boolean</ID>
+    <ID>ReturnCount:CollectionTracker.kt$CollectionTracker$fun command(args: Array&lt;String&gt;)</ID>
+    <ID>ReturnCount:CompactBingoChat.kt$CompactBingoChat$private fun onSkyBlockLevelUp(message: String): Boolean</ID>
+    <ID>ReturnCount:CrimsonMinibossRespawnTimer.kt$CrimsonMinibossRespawnTimer$private fun updateArea()</ID>
+    <ID>ReturnCount:CropMoneyDisplay.kt$CropMoneyDisplay$private fun drawDisplay(): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>ReturnCount:DamageIndicatorManager.kt$DamageIndicatorManager$private fun checkThorn(realHealth: Long, realMaxHealth: Long): String?</ID>
+    <ID>ReturnCount:DamageIndicatorManager.kt$DamageIndicatorManager$private fun getCustomHealth( entityData: EntityData, health: Long, entity: EntityLivingBase, maxHealth: Long, ): String?</ID>
+    <ID>ReturnCount:EnchantParser.kt$EnchantParser$private fun parseEnchants( loreList: MutableList&lt;String&gt;, enchants: Map&lt;String, Int&gt;, chatComponent: IChatComponent?, )</ID>
+    <ID>ReturnCount:EstimatedItemValue.kt$EstimatedItemValue$private fun draw(stack: ItemStack): List&lt;List&lt;Any&gt;&gt;</ID>
+    <ID>ReturnCount:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$private fun calculateStarPrice( internalName: NEUInternalName, inputStars: Int, ): Pair&lt;EssenceItemUtils.EssenceUpgradePrice, Pair&lt;Int, Int&gt;&gt;?</ID>
+    <ID>ReturnCount:FishingAPI.kt$FishingAPI$fun seaCreatureCount(entity: EntityArmorStand): Int</ID>
+    <ID>ReturnCount:GardenVisitorFeatures.kt$GardenVisitorFeatures$private fun showGui(): Boolean</ID>
+    <ID>ReturnCount:GraphEditor.kt$GraphEditor$private fun input()</ID>
+    <ID>ReturnCount:HideNotClickableItems.kt$HideNotClickableItems$private fun hideSalvage(chestName: String, stack: ItemStack): Boolean</ID>
+    <ID>ReturnCount:IslandGraphs.kt$IslandGraphs$private fun handleTick()</ID>
+    <ID>ReturnCount:ItemDisplayOverlayFeatures.kt$ItemDisplayOverlayFeatures$private fun getStackTip(item: ItemStack): String?</ID>
+    <ID>ReturnCount:ItemNameResolver.kt$ItemNameResolver$internal fun getInternalNameOrNull(itemName: String): NEUInternalName?</ID>
+    <ID>ReturnCount:ItemPriceUtils.kt$ItemPriceUtils$fun NEUInternalName.getPriceOrNull( priceSource: ItemPriceSource = ItemPriceSource.BAZAAR_INSTANT_BUY, pastRecipes: List&lt;PrimitiveRecipe&gt; = emptyList(), ): Double?</ID>
+    <ID>ReturnCount:ItemUtils.kt$ItemUtils$private fun NEUInternalName.grabItemName(): String</ID>
+    <ID>ReturnCount:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result</ID>
+    <ID>ReturnCount:MiningEventTracker.kt$MiningEventTracker$private fun sendData(eventName: String, time: String?)</ID>
+    <ID>ReturnCount:MobDetection.kt$MobDetection$private fun entitySpawn(entity: EntityLivingBase, roughType: Mob.Type): Boolean</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$internal fun createSkyblockEntity(baseEntity: EntityLivingBase): MobResult</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$private fun armorStandOnlyMobs(baseEntity: EntityLivingBase, armorStand: EntityArmorStand): MobResult?</ID>
+    <ID>ReturnCount:MobFilter.kt$MobFilter$private fun exceptions(baseEntity: EntityLivingBase, nextEntity: EntityLivingBase?): MobResult?</ID>
+    <ID>ReturnCount:MobFinder.kt$MobFinder$private fun tryAddEntitySpider(entity: EntityLivingBase): EntityResult?</ID>
+    <ID>ReturnCount:MobFinder.kt$MobFinder$private fun tryAddRift(entity: EntityLivingBase): EntityResult?</ID>
+    <ID>ReturnCount:MultiFilter.kt$MultiFilter$fun matchResult(string: String): String?</ID>
+    <ID>ReturnCount:PacketTest.kt$PacketTest$private fun Packet&lt;*&gt;.print()</ID>
+    <ID>ReturnCount:PowderMiningChatFilter.kt$PowderMiningChatFilter$@Suppress("CyclomaticComplexMethod") fun block(message: String): String?</ID>
+    <ID>ReturnCount:PurseAPI.kt$PurseAPI$private fun getCause(diff: Double): PurseChangeCause</ID>
+    <ID>ReturnCount:QuestLoader.kt$QuestLoader$private fun addQuest(name: String, state: QuestState, needAmount: Int): Quest</ID>
+    <ID>ReturnCount:ShowFishingItemName.kt$ShowFishingItemName$fun inCorrectArea(): Boolean</ID>
+    <ID>ReturnCount:SkillAPI.kt$SkillAPI$fun onCommand(it: Array&lt;String&gt;)</ID>
+    <ID>ReturnCount:SkyHanniConfigSearchResetCommand.kt$SkyHanniConfigSearchResetCommand$private suspend fun setCommand(args: Array&lt;String&gt;): String</ID>
+    <ID>ReturnCount:TabComplete.kt$TabComplete$private fun customTabComplete(command: String): List&lt;String&gt;?</ID>
+    <ID>SpreadOperator:ItemUtils.kt$ItemUtils$(tag, displayName, *lore.toTypedArray())</ID>
+    <ID>SpreadOperator:LimboPlaytime.kt$LimboPlaytime$( itemID.getItemStack().item, ITEM_NAME, *createItemLore() )</ID>
+    <ID>SpreadOperator:Text.kt$Text$(*component.toTypedArray(), separator = separator)</ID>
+    <ID>TooManyFunctions:CollectionUtils.kt$CollectionUtils</ID>
+    <ID>TooManyFunctions:DailyQuestHelper.kt$DailyQuestHelper</ID>
+    <ID>TooManyFunctions:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator</ID>
+    <ID>TooManyFunctions:GuiRenderUtils.kt$GuiRenderUtils</ID>
+    <ID>TooManyFunctions:HypixelCommands.kt$HypixelCommands</ID>
+    <ID>TooManyFunctions:InventoryUtils.kt$InventoryUtils</ID>
+    <ID>TooManyFunctions:LocationUtils.kt$LocationUtils</ID>
+    <ID>TooManyFunctions:LorenzUtils.kt$LorenzUtils</ID>
+    <ID>TooManyFunctions:LorenzVec.kt$LorenzVec</ID>
+    <ID>TooManyFunctions:MobFinder.kt$MobFinder</ID>
+    <ID>TooManyFunctions:NumberUtil.kt$NumberUtil</ID>
+    <ID>TooManyFunctions:RegexUtils.kt$RegexUtils</ID>
+    <ID>TooManyFunctions:RenderUtils.kt$RenderUtils</ID>
+    <ID>TooManyFunctions:Renderable.kt$Renderable$Companion</ID>
+    <ID>TooManyFunctions:ScoreboardElements.kt$at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardElements.kt</ID>
+    <ID>TooManyFunctions:ScoreboardEvent.kt$at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.kt</ID>
+    <ID>TooManyFunctions:SkyBlockItemModifierUtils.kt$SkyBlockItemModifierUtils</ID>
+    <ID>TooManyFunctions:StringUtils.kt$StringUtils</ID>
+    <ID>UnsafeCallOnNullableType:BasketWaypoints.kt$BasketWaypoints$Basket.entries.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:BasketWaypoints.kt$BasketWaypoints$notFoundBaskets.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:BucketedItemTrackerData.kt$BucketedItemTrackerData$it.value[internalName]?.hidden!!</ID>
+    <ID>UnsafeCallOnNullableType:ChocolateFactoryDataLoader.kt$ChocolateFactoryDataLoader$upgradeCost!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Double::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Float::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Int::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CollectionUtils.kt$CollectionUtils$this.merge(key, number, Long::plus)!!</ID>
+    <ID>UnsafeCallOnNullableType:CombatUtils.kt$CombatUtils$a!!</ID>
+    <ID>UnsafeCallOnNullableType:CompactBestiaryChatMessage.kt$CompactBestiaryChatMessage$it.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:ConfigManager.kt$ConfigManager$file!!</ID>
+    <ID>UnsafeCallOnNullableType:CorpseTracker.kt$CorpseTracker$applicableKeys.first().key!!</ID>
+    <ID>UnsafeCallOnNullableType:CosmeticFollowingLine.kt$CosmeticFollowingLine$latestLocations[b]!!</ID>
+    <ID>UnsafeCallOnNullableType:CosmeticFollowingLine.kt$CosmeticFollowingLine$locations[b]!!</ID>
+    <ID>UnsafeCallOnNullableType:CropMoneyDisplay.kt$CropMoneyDisplay$cropNames[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:DailyMiniBossHelper.kt$DailyMiniBossHelper$getByDisplayName(name)!!</ID>
+    <ID>UnsafeCallOnNullableType:DamageIndicatorManager.kt$DamageIndicatorManager$data.deathLocation!!</ID>
+    <ID>UnsafeCallOnNullableType:DefaultConfigFeatures.kt$DefaultConfigFeatures$resetSuggestionState[cat]!!</ID>
+    <ID>UnsafeCallOnNullableType:DefaultConfigOptionGui.kt$DefaultConfigOptionGui$resetSuggestionState[cat]!!</ID>
+    <ID>UnsafeCallOnNullableType:DicerRngDropTracker.kt$DicerRngDropTracker$event.toolItem!!</ID>
+    <ID>UnsafeCallOnNullableType:DiscordStatus.kt$ownerRegex.find(colorlessLine)!!</ID>
+    <ID>UnsafeCallOnNullableType:DungeonAPI.kt$DungeonAPI$dungeonFloor!!</ID>
+    <ID>UnsafeCallOnNullableType:EasterEggWaypoints.kt$EasterEggWaypoints$EasterEgg.entries.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:EasterEggWaypoints.kt$EasterEggWaypoints$notFoundEggs.minByOrNull { it.waypoint.distanceSqToPlayer() }!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityMovementData.kt$EntityMovementData$entityLocation[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$entityRenderCache.noXrayCache!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$entityRenderCache.xrayCache!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$frameToCopy!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$frameToPaste!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isAntialiasing!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isFastRender!!</ID>
+    <ID>UnsafeCallOnNullableType:EntityOutlineRenderer.kt$EntityOutlineRenderer$isShaders!!</ID>
+    <ID>UnsafeCallOnNullableType:FFGuideGUI.kt$FFGuideGUI$currentCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$contestCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$contests[bracket]!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingContestAPI.kt$FarmingContestAPI$currentCrop!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingWeightDisplay.kt$FarmingWeightDisplay$weightPerCrop[CropType.CACTUS]!!</ID>
+    <ID>UnsafeCallOnNullableType:FarmingWeightDisplay.kt$FarmingWeightDisplay$weightPerCrop[CropType.SUGAR_CANE]!!</ID>
+    <ID>UnsafeCallOnNullableType:FeatureToggleProcessor.kt$FeatureToggleProcessor$latestCategory!!</ID>
+    <ID>UnsafeCallOnNullableType:FeatureTogglesByDefaultAdapter.kt$FeatureTogglesByDefaultAdapter$gson!!</ID>
+    <ID>UnsafeCallOnNullableType:FishingProfitTracker.kt$FishingProfitTracker$itemCategories[currentCategory]!!</ID>
+    <ID>UnsafeCallOnNullableType:FishingProfitTracker.kt$FishingProfitTracker.Data$itemCategories["Trophy Fish"]!!</ID>
+    <ID>UnsafeCallOnNullableType:FortuneUpgrades.kt$FortuneUpgrades$nextTalisman.upgradeCost?.first!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenComposterUpgradesData.kt$GardenComposterUpgradesData$ComposterUpgrade.getByName(name)!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenCropMilestoneDisplay.kt$GardenCropMilestoneDisplay$cultivatingData[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenCropMilestonesCommunityFix.kt$GardenCropMilestonesCommunityFix$map[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:GardenPlotIcon.kt$GardenPlotIcon$originalStack[index]!!</ID>
+    <ID>UnsafeCallOnNullableType:GhostCounter.kt$GhostCounter$storage?.totalMF!!</ID>
+    <ID>UnsafeCallOnNullableType:Graph.kt$Graph.Companion$position!!</ID>
+    <ID>UnsafeCallOnNullableType:Graph.kt$distances.distances[end]!!</ID>
+    <ID>UnsafeCallOnNullableType:GriffinBurrowHelper.kt$GriffinBurrowHelper$particleBurrows[targetLocation]!!</ID>
+    <ID>UnsafeCallOnNullableType:HoppityCallWarning.kt$HoppityCallWarning$acceptUUID!!</ID>
+    <ID>UnsafeCallOnNullableType:IslandGraphs.kt$IslandGraphs$currentTarget!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemBlink.kt$ItemBlink$offsets[item]!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemPickupLog.kt$ItemPickupLog$listToCheckAgainst[key]!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemPickupLog.kt$ItemPickupLog$listToCheckAgainst[key]?.second!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemStackTypeAdapterFactory.kt$ItemStackTypeAdapterFactory$gson!!</ID>
+    <ID>UnsafeCallOnNullableType:ItemUtils.kt$ItemUtils$itemAmountCache[input]!!</ID>
+    <ID>UnsafeCallOnNullableType:JacobContestTimeNeeded.kt$JacobContestTimeNeeded$map[crop]!!</ID>
+    <ID>UnsafeCallOnNullableType:KSerializable.kt$KotlinTypeAdapterFactory$kotlinClass.memberProperties.find { it.name == param.name }!!</ID>
+    <ID>UnsafeCallOnNullableType:KSerializable.kt$KotlinTypeAdapterFactory$param.name!!</ID>
+    <ID>UnsafeCallOnNullableType:LorenzEvent.kt$LorenzEvent$this::class.simpleName!!</ID>
+    <ID>UnsafeCallOnNullableType:MinionFeatures.kt$MinionFeatures$newMinion!!</ID>
+    <ID>UnsafeCallOnNullableType:MobFinder.kt$MobFinder$floor6GiantsSeparateDelay[uuid]!!</ID>
+    <ID>UnsafeCallOnNullableType:NavigationHelper.kt$NavigationHelper$distances[node]!!</ID>
+    <ID>UnsafeCallOnNullableType:NumberUtil.kt$NumberUtil$romanSymbols[this]!!</ID>
+    <ID>UnsafeCallOnNullableType:PositionList.kt$PositionList$configLink!!</ID>
+    <ID>UnsafeCallOnNullableType:ReminderManager.kt$ReminderManager$storage[args.drop(1).first()]!!</ID>
+    <ID>UnsafeCallOnNullableType:ReminderManager.kt$ReminderManager$storage[args.first()]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderEntityOutlineEvent.kt$RenderEntityOutlineEvent$entitiesToChooseFrom!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderEntityOutlineEvent.kt$RenderEntityOutlineEvent$entitiesToOutline!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderGlobalHook.kt$RenderGlobalHook$camera!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderLivingEntityHelper.kt$RenderLivingEntityHelper$entityColorCondition[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderLivingEntityHelper.kt$RenderLivingEntityHelper$entityColorMap[entity]!!</ID>
+    <ID>UnsafeCallOnNullableType:RenderUtils.kt$RenderUtils$it.name!!</ID>
+    <ID>UnsafeCallOnNullableType:RepoManager.kt$RepoManager$latestRepoCommit!!</ID>
+    <ID>UnsafeCallOnNullableType:RepoUtils.kt$RepoUtils$file!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[2]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$match.groups[3]!!</ID>
+    <ID>UnsafeCallOnNullableType:SackAPI.kt$SackAPI$oldData!!</ID>
+    <ID>UnsafeCallOnNullableType:SimpleCommand.kt$SimpleCommand$tabRunnable!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker$it.get(DisplayMode.SESSION).getItemsProp()[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniBucketedItemTracker.kt$SkyHanniBucketedItemTracker$it.get(DisplayMode.TOTAL).getItemsProp()[internalName]!!</ID>
+    <ID>UnsafeCallOnNullableType:SkyHanniMod.kt$SkyHanniMod.Companion$Loader.instance().indexedModList[MODID]!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$distance!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$distance2!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$firstParticlePoint?.distance(pos)!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$lastParticlePoint2!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$lastParticlePoint2?.distance(particlePoint!!)!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$particlePoint!!</ID>
+    <ID>UnsafeCallOnNullableType:SoopyGuessBurrow.kt$SoopyGuessBurrow$particlePoint?.subtract(lastParticlePoint2!!)!!</ID>
+    <ID>UnsafeCallOnNullableType:SummoningSoulsName.kt$SummoningSoulsName$mobsName.getOrNull(nearestMob)!!</ID>
+    <ID>UnsafeCallOnNullableType:SuperpairsClicksAlert.kt$SuperpairsClicksAlert$match.groups[1]!!</ID>
+    <ID>UnsafeCallOnNullableType:TiaRelayWaypoints.kt$TiaRelayWaypoints$waypointName!!</ID>
+    <ID>UnsafeCallOnNullableType:Translator.kt$Translator$messageContentRegex.find(message)!!</ID>
+    <ID>UnsafeCallOnNullableType:TrevorFeatures.kt$TrevorFeatures$TrevorSolver.currentMob!!</ID>
+    <ID>UnsafeCallOnNullableType:TrevorSolver.kt$TrevorSolver$currentMob!!</ID>
+    <ID>UnsafeCallOnNullableType:TunnelsMaps.kt$TunnelsMaps$campfire.name!!</ID>
+    <ID>UnsafeCallOnNullableType:UpdateManager.kt$UpdateManager$potentialUpdate!!</ID>
+    <ID>UnsafeCallOnNullableType:VisitorRewardWarning.kt$VisitorRewardWarning$visitor.totalPrice!!</ID>
+    <ID>UnsafeCallOnNullableType:VisitorRewardWarning.kt$VisitorRewardWarning$visitor.totalReward!!</ID>
+    <ID>UnusedParameter:SkyHanniDebugsAndTests.kt$SkyHanniDebugsAndTests$args: Array&lt;String&gt;</ID>
+    <ID>UseIsNullOrEmpty:ItemUtils.kt$ItemUtils$name == null || name.isEmpty()</ID>
+    <ID>UseOrEmpty:SkyHanniDebugsAndTests.kt$SkyHanniDebugsAndTests$event.originalOre?.let { "$it " } ?: ""</ID>
+    <ID>VarCouldBeVal:AdvancedPlayerList.kt$AdvancedPlayerList$private var randomOrderCache = TimeLimitedCache&lt;String, Int&gt;(20.minutes)</ID>
+    <ID>VarCouldBeVal:BestiaryData.kt$BestiaryData$private var indexes = listOf( 10, 11, 12, 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, 25, 28, 29, 30, 31, 32, 33, 34, 37, 38, 39, 40, 41, 42, 43 )</ID>
+    <ID>VarCouldBeVal:BucketedItemTrackerData.kt$BucketedItemTrackerData$@Expose private var bucketedItems: MutableMap&lt;E, MutableMap&lt;NEUInternalName, TrackedItem&gt;&gt; = HashMap()</ID>
+    <ID>VarCouldBeVal:CarnivalZombieShootout.kt$CarnivalZombieShootout$private var lastUpdate = Updates(SimpleTimeMark.farPast(), SimpleTimeMark.farPast())</ID>
+    <ID>VarCouldBeVal:ChocolateFactoryStrayTracker.kt$ChocolateFactoryStrayTracker$private var claimedStraysSlots = mutableListOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:CompactBestiaryChatMessage.kt$CompactBestiaryChatMessage$private var bestiaryDescription = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:CompactExperimentRewards.kt$CompactExperimentRewards$private var gainedRewards = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:CraftRoomHolographicMob.kt$CraftRoomHolographicMob$private var entityToHolographicEntity = mapOf( EntityZombie::class.java to HolographicEntities.zombie, EntitySlime::class.java to HolographicEntities.slime, EntityCaveSpider::class.java to HolographicEntities.caveSpider, )</ID>
+    <ID>VarCouldBeVal:CustomWardrobe.kt$CustomWardrobe$private var guiName = "Custom Wardrobe"</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant$@Expose private var goodLevel = 0</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant$@Expose private var maxLevel = 0</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose @Suppress("unused") private var statLabel: String? = null</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose private var nbtNum: String? = null</ID>
+    <ID>VarCouldBeVal:Enchant.kt$Enchant.Stacking$@Expose private var stackLevel: TreeSet&lt;Int&gt;? = null</ID>
+    <ID>VarCouldBeVal:ErrorManager.kt$ErrorManager$private var cache = TimeLimitedSet&lt;Pair&lt;String, Int&gt;&gt;(10.minutes)</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var comboPrice = combo.asInternalName().getPriceOrNull()</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var internalName = removeKuudraArmorPrefix(stack.getInternalName().asString().removePrefix("VANQUISHED_"))</ID>
+    <ID>VarCouldBeVal:EstimatedItemValueCalculator.kt$EstimatedItemValueCalculator$var nameColor = if (!useless) "§9" else "§7"</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var currentBottlesInInventory = mutableMapOf&lt;NEUInternalName, Int&gt;()</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var lastBottlesInInventory = mutableMapOf&lt;NEUInternalName, Int&gt;()</ID>
+    <ID>VarCouldBeVal:ExperimentsProfitTracker.kt$ExperimentsProfitTracker$private var lastSplashes = mutableListOf&lt;ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:FarmingWeightDisplay.kt$FarmingWeightDisplay$private var nextPlayers = mutableListOf&lt;UpcomingLeaderboardPlayer&gt;()</ID>
+    <ID>VarCouldBeVal:FlareDisplay.kt$FlareDisplay$private var flares = mutableListOf&lt;Flare&gt;()</ID>
+    <ID>VarCouldBeVal:FontRendererHook.kt$FontRendererHook$private var CHROMA_COLOR: Int = -0x1</ID>
+    <ID>VarCouldBeVal:FontRendererHook.kt$FontRendererHook$private var CHROMA_COLOR_SHADOW: Int = -0xAAAAAB</ID>
+    <ID>VarCouldBeVal:GardenPlotIcon.kt$GardenPlotIcon$private var cachedStack = mutableMapOf&lt;Int, ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:GardenPlotIcon.kt$GardenPlotIcon$private var originalStack = mutableMapOf&lt;Int, ItemStack&gt;()</ID>
+    <ID>VarCouldBeVal:GardenPlotMenuHighlighting.kt$GardenPlotMenuHighlighting$private var highlightedPlots = mutableMapOf&lt;GardenPlotAPI.Plot, PlotStatusType&gt;()</ID>
+    <ID>VarCouldBeVal:GardenVisitorColorNames.kt$GardenVisitorColorNames$private var visitorColors = mutableMapOf&lt;String, String&gt;() // name -&gt; color code</ID>
+    <ID>VarCouldBeVal:GhostData.kt$GhostData$private var session = mutableMapOf( Option.KILLS to 0.0, Option.SORROWCOUNT to 0.0, Option.VOLTACOUNT to 0.0, Option.PLASMACOUNT to 0.0, Option.GHOSTLYBOOTS to 0.0, Option.BAGOFCASH to 0.0, Option.TOTALDROPS to 0.0, Option.SCAVENGERCOINS to 0.0, Option.MAXKILLCOMBO to 0.0, Option.SKILLXPGAINED to 0.0 )</ID>
+    <ID>VarCouldBeVal:GraphEditor.kt$GraphEditor$var vector = LocationUtils.calculatePlayerFacingDirection()</ID>
+    <ID>VarCouldBeVal:HoppityCollectionStats.kt$HoppityCollectionStats$private var highlightMap = mutableMapOf&lt;String, LorenzColor&gt;()</ID>
+    <ID>VarCouldBeVal:HoppityEggLocations.kt$HoppityEggLocations$// TODO add gui/command to show total data/missing islands private var collectedEggStorage: MutableMap&lt;IslandType, MutableSet&lt;LorenzVec&gt;&gt; get() = ChocolateFactoryAPI.profileStorage?.collectedEggLocations ?: mutableMapOf() set(value) { ChocolateFactoryAPI.profileStorage?.collectedEggLocations = value }</ID>
+    <ID>VarCouldBeVal:HoppityNpc.kt$HoppityNpc$private var slotsToHighlight = mutableSetOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:IslandAreas.kt$IslandAreas$var suffix = ""</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemList = mutableMapOf&lt;Int, Pair&lt;ItemStack, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemsAddedToInventory = mutableMapOf&lt;Int, PickupEntry&gt;()</ID>
+    <ID>VarCouldBeVal:ItemPickupLog.kt$ItemPickupLog$private var itemsRemovedFromInventory = mutableMapOf&lt;Int, PickupEntry&gt;()</ID>
+    <ID>VarCouldBeVal:LocationUtils.kt$LocationUtils$var yaw = LocationUtils.calculatePlayerYaw() + 180</ID>
+    <ID>VarCouldBeVal:LorenzLogger.kt$LorenzLogger.Companion$private var LOG_DIRECTORY = File("config/skyhanni/logs")</ID>
+    <ID>VarCouldBeVal:MobDetection.kt$MobDetection$private var shouldClear: AtomicBoolean = AtomicBoolean(false)</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var floor2summonsDiedOnce = mutableListOf&lt;EntityOtherPlayerMP&gt;()</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var floor6GiantsSeparateDelay = mutableMapOf&lt;UUID, Pair&lt;Long, BossType&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:MobFinder.kt$MobFinder$private var guardians = mutableListOf&lt;EntityGuardian&gt;()</ID>
+    <ID>VarCouldBeVal:NeuReforgeJson.kt$NeuReforgeJson$private lateinit var itemTypeField: Pair&lt;String, List&lt;NEUInternalName&gt;&gt;</ID>
+    <ID>VarCouldBeVal:PowerStoneGuideFeatures.kt$PowerStoneGuideFeatures$private var missing = mutableMapOf&lt;Int, NEUInternalName&gt;()</ID>
+    <ID>VarCouldBeVal:PunchcardHighlight.kt$PunchcardHighlight$private var playerQueue = mutableListOf&lt;String&gt;()</ID>
+    <ID>VarCouldBeVal:QuiverWarning.kt$QuiverWarning$private var arrowsInInstance = mutableSetOf&lt;ArrowType&gt;()</ID>
+    <ID>VarCouldBeVal:ReforgeHelper.kt$ReforgeHelper$private var waitForChat = AtomicBoolean(false)</ID>
+    <ID>VarCouldBeVal:ReminderManager.kt$ReminderManager$private var listPage = 1</ID>
+    <ID>VarCouldBeVal:RepoPatternGui.kt$RepoPatternGui$private var searchCache = ObservableList(mutableListOf&lt;RepoPatternInfo&gt;())</ID>
+    <ID>VarCouldBeVal:RepoPatternManager.kt$RepoPatternManager$/** * Map containing all keys and their repo patterns. Used for filling in new regexes after an update, and for * checking duplicate registrations. */ private var usedKeys: NavigableMap&lt;String, CommonPatternInfo&lt;*, *&gt;&gt; = TreeMap()</ID>
+    <ID>VarCouldBeVal:RepoPatternManager.kt$RepoPatternManager$/** * Map containing the exclusive owner of a regex key */ private var exclusivity: MutableMap&lt;String, RepoPatternKeyOwner&gt; = mutableMapOf()</ID>
+    <ID>VarCouldBeVal:SeaCreatureFeatures.kt$SeaCreatureFeatures$private var entityIds = TimeLimitedSet&lt;Int&gt;(6.minutes)</ID>
+    <ID>VarCouldBeVal:SeaCreatureFeatures.kt$SeaCreatureFeatures$private var rareSeaCreatures = TimeLimitedSet&lt;Mob&gt;(6.minutes)</ID>
+    <ID>VarCouldBeVal:ShowFishingItemName.kt$ShowFishingItemName$private var itemsOnGround = TimeLimitedCache&lt;EntityItem, String&gt;(750.milliseconds)</ID>
+    <ID>VarCouldBeVal:SkyblockGuideHighlightFeature.kt$SkyblockGuideHighlightFeature.Companion$private var missing = mutableSetOf&lt;Int&gt;()</ID>
+    <ID>VarCouldBeVal:SlayerItemsOnGround.kt$SlayerItemsOnGround$private var itemsOnGround = TimeLimitedCache&lt;EntityItem, String&gt;(2.seconds)</ID>
+    <ID>VarCouldBeVal:SoopyGuessBurrow.kt$SoopyGuessBurrow$private var dingSlope = mutableListOf&lt;Float&gt;()</ID>
+    <ID>VarCouldBeVal:SoopyGuessBurrow.kt$SoopyGuessBurrow$private var locations = mutableListOf&lt;LorenzVec&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$// TODO remove string. use enum instead! maybe even create new data type instead of map of pairs private var found = mutableMapOf&lt;Pair&lt;Item?, ItemPair?&gt;, String&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var lastClicked = mutableListOf&lt;Pair&lt;Int, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var toCheck = mutableListOf&lt;Pair&lt;Int, Int&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:SuperpairExperimentInformationDisplay.kt$SuperpairExperimentInformationDisplay$private var uncoveredItems = mutableListOf&lt;Pair&lt;Int, String&gt;&gt;()</ID>
+    <ID>VarCouldBeVal:TiaRelayHelper.kt$TiaRelayHelper$private var resultDisplay = mutableMapOf&lt;Int, Int&gt;()</ID>
+    <ID>VarCouldBeVal:TiaRelayHelper.kt$TiaRelayHelper$private var sounds = mutableMapOf&lt;Int, Sound&gt;()</ID>
+    <ID>VarCouldBeVal:Translator.kt$Translator$var lang = config.languageCode.get()</ID>
+    <ID>VarCouldBeVal:TrevorFeatures.kt$TrevorFeatures$private var backupTrapperID: Int = 17</ID>
+    <ID>VarCouldBeVal:TrevorFeatures.kt$TrevorFeatures$private var trapperID: Int = 56</ID>
+    <ID>VarCouldBeVal:TrophyFishDisplay.kt$TrophyFishDisplay$private var recentlyDroppedTrophies = TimeLimitedCache&lt;NEUInternalName, TrophyRarity&gt;(5.seconds)</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var fillerID = "STAINED_GLASS_PANE".asInternalName()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var limboID = "ENDER_PEARL".asInternalName()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var skillOverflowLuck = mutableMapOf&lt;SkillType, Int&gt;()</ID>
+    <ID>VarCouldBeVal:UserLuckBreakdown.kt$UserLuckBreakdown$private var skillsID = "DIAMOND_SWORD".asInternalName()</ID>
+  </CurrentIssues>
+</SmellBaseline>

From 65dde77f6d604faf4a87ddbff2477ee7629bc07f Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:40:07 -0400
Subject: [PATCH 565/721] Backend: Detekt Fixes Part 1 (#2603)

---
 .../skyhanni/config/ConfigGuiForgeInterop.kt       |  1 +
 .../at/hannibal2/skyhanni/config/ConfigManager.kt  |  8 ++++----
 .../config/core/config/gui/GuiPositionEditor.kt    |  2 +-
 .../java/at/hannibal2/skyhanni/data/HypixelData.kt |  2 +-
 .../java/at/hannibal2/skyhanni/data/MiningAPI.kt   |  1 -
 .../hannibal2/skyhanni/features/chat/ChatFilter.kt | 14 +++++++++-----
 .../features/chat/PowderMiningChatFilter.kt        | 12 ++++++------
 .../tabcomplete/GetFromSacksTabComplete.kt         |  2 +-
 .../skyhanni/features/dungeon/DungeonChatFilter.kt | 11 +++++++----
 .../features/dungeon/DungeonRankTabListColor.kt    |  2 +-
 .../event/carnival/CarnivalZombieShootout.kt       |  8 ++++----
 .../event/hoppity/HoppityCollectionStats.kt        |  2 +-
 .../garden/farming/FarmingWeightDisplay.kt         |  4 ++--
 .../garden/fortuneguide/CaptureFarmingGear.kt      |  4 ++--
 .../garden/fortuneguide/pages/OverviewPage.kt      |  2 +-
 .../garden/visitor/GardenVisitorCompactChat.kt     | 12 ++++++------
 .../garden/visitor/GardenVisitorDropStatistics.kt  |  2 +-
 .../skyhanni/features/inventory/ItemPickupLog.kt   |  2 +-
 .../skyhanni/features/inventory/ReforgeHelper.kt   |  2 --
 .../skyhanni/features/inventory/SackDisplay.kt     |  2 +-
 .../ChocolateFactoryCustomReminder.kt              |  6 ++----
 .../ChocolateFactoryStrayTracker.kt                |  4 ++--
 .../features/mining/MineshaftPityDisplay.kt        |  5 -----
 .../hannibal2/skyhanni/features/mining/OreBlock.kt |  2 +-
 .../skyhanni/features/minion/MinionFeatures.kt     |  2 +-
 .../misc/items/EstimatedItemValueCalculator.kt     |  2 +-
 .../features/misc/items/enchants/Enchant.kt        |  3 +--
 .../massconfiguration/FeatureToggleProcessor.kt    |  8 ++++----
 .../skyhanni/features/rift/everywhere/RiftTimer.kt |  2 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt        |  9 ++++-----
 .../hannibal2/skyhanni/test/graph/GraphEditor.kt   |  2 +-
 .../at/hannibal2/skyhanni/utils/LorenzLogger.kt    |  1 +
 .../java/at/hannibal2/skyhanni/utils/NEUItems.kt   |  1 +
 .../at/hannibal2/skyhanni/utils/NEUVersionCheck.kt |  1 +
 .../at/hannibal2/skyhanni/utils/StringUtils.kt     |  2 +-
 .../skyhanni/utils/compat/GuiScreenUtils.kt        |  2 +-
 .../skyhanni/utils/compat/SkyhanniBaseScreen.kt    |  3 +--
 37 files changed, 74 insertions(+), 76 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
index 0c112d73a307..3f2d398368d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
@@ -12,6 +12,7 @@ import java.io.IOException
 @Suppress("unused")
 class ConfigGuiForgeInterop : IModGuiFactory {
 
+    @Suppress("EmptyFunctionBlock")
     override fun initialize(minecraft: Minecraft) {}
     override fun mainConfigGuiClass() = WrappedSkyHanniConfig::class.java
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index bf0f2ba0a4a4..da4b54942dfd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -182,7 +182,7 @@ class ConfigManager {
                         try {
                             run()
                         } catch (e: Throwable) {
-                            e.printStackTrace()
+                            logger.log(e.stackTraceToString())
                             LorenzUtils.shutdownMinecraft("Config is corrupt inside development environment.")
                         }
                     } else {
@@ -194,7 +194,7 @@ class ConfigManager {
 
                 logger.log("Loaded $fileName from file")
             } catch (e: Exception) {
-                e.printStackTrace()
+                logger.log(e.stackTraceToString())
                 val backupFile = file.resolveSibling("$fileName-${SimpleTimeMark.now().toMillis()}-backup.json")
                 logger.log("Exception while reading $file. Will load blank $fileName and save backup to $backupFile")
                 logger.log("Exception was $e")
@@ -202,7 +202,7 @@ class ConfigManager {
                     file.copyTo(backupFile)
                 } catch (e: Exception) {
                     logger.log("Could not create backup for $fileName file")
-                    e.printStackTrace()
+                    logger.log(e.stackTraceToString())
                 }
             }
         }
@@ -239,7 +239,7 @@ class ConfigManager {
             move(unit, file, reason)
         } catch (e: IOException) {
             logger.log("Could not save $fileName file to $file")
-            e.printStackTrace()
+            logger.log(e.stackTraceToString())
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index ba3a576754dc..0adf1bed5e56 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -57,7 +57,7 @@ class GuiPositionEditor(
     }
 
     override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float) {
-        //Items aren't drawn due to a bug in neu rendering
+        // Items aren't drawn due to a bug in neu rendering
         drawDefaultBackground()
         if (oldScreen != null) {
             val accessor = oldScreen as AccessorGuiContainer
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index b48805ef5bf5..039bd7d28afd 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -218,7 +218,7 @@ object HypixelData {
     // This code is modified from NEU, and depends on NEU (or another mod) sending /locraw.
     private val jsonBracketPattern = "^\\{.+}".toPattern()
 
-    //todo convert to proper json object
+    // todo convert to proper json object
     fun checkForLocraw(message: String) {
         jsonBracketPattern.matchMatcher(message.removeColor()) {
             try {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 9d635b1b9a22..45aec43d3c72 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -165,7 +165,6 @@ object MiningAPI {
     fun onBlockClick(event: BlockClickEvent) {
         if (!inCustomMiningIsland()) return
         if (event.clickType != ClickType.LEFT_CLICK) return
-        //println(event.getBlockState.properties)
         if (OreBlock.getByStateOrNull(event.getBlockState) == null) return
         recentClickedBlocks += event.position to SimpleTimeMark.now()
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 964b255735af..d058ddc50ce1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -27,7 +27,7 @@ object ChatFilter {
     private val config get() = SkyHanniMod.feature.chat.filterType
     private val dungeonConfig get() = SkyHanniMod.feature.dungeon.messageFilter
 
-    /// <editor-fold desc="Regex Patterns & Messages">
+    // <editor-fold desc="Regex Patterns & Messages">
     // Lobby Messages
     private val lobbyPatterns = listOf(
         // player join
@@ -89,15 +89,19 @@ object ChatFilter {
     )
 
     // Guild EXP
+    /**
+     * REGEX-TEST: §aYou earned §r§22 GEXP §r§afrom playing SkyBlock!
+     * REGEX-TEST: §aYou earned §r§22 GEXP §r§a+ §r§c210 Event EXP §r§afrom playing SkyBlock!
+     */
     private val guildExpPatterns = listOf(
-        // §aYou earned §r§22 GEXP §r§afrom playing SkyBlock!
-        // §aYou earned §r§22 GEXP §r§a+ §r§c210 Event EXP §r§afrom playing SkyBlock!
         "§aYou earned §r§2.* GEXP (§r§a\\+ §r§.* Event EXP )?§r§afrom playing SkyBlock!".toPattern(),
     )
 
     // Kill Combo
+    /**
+     * REGEX-TEST: §a§l+5 Kill Combo §r§8+§r§b3% §r§b? Magic Find
+     */
     private val killComboPatterns = listOf(
-        //§a§l+5 Kill Combo §r§8+§r§b3% §r§b? Magic Find
         "§.§l\\+(.*) Kill Combo (.*)".toPattern(),
         "§cYour Kill Combo has expired! You reached a (.*) Kill Combo!".toPattern(),
     )
@@ -500,7 +504,7 @@ object ChatFilter {
         "slayer" to slayerMessageStartWith,
         "profile_join" to profileJoinMessageStartsWith,
     )
-    /// </editor-fold>
+    // </editor-fold>
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 9c100ef47ead..698a671141da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -275,7 +275,7 @@ object PowderMiningChatFilter {
         // To simplify regex statements, this check is done outside
         val ssMessage = message.takeIf { it.startsWith("    ") }?.substring(4) ?: return null
 
-        //Powder
+        // Powder
         powderRewardPattern.matchMatcher(ssMessage) {
             if (config.powderFilterThreshold == 60000) return "powder_mining_powder"
             val amountStr = groupOrNull("amount") ?: "1"
@@ -286,7 +286,7 @@ object PowderMiningChatFilter {
             }
         }
 
-        //Essence
+        // Essence
         essenceRewardPattern.matchMatcher(ssMessage) {
             if (config.essenceFilterThreshold == 20) return "powder_mining_essence"
             val amountStr = groupOrNull("amount") ?: "1"
@@ -301,11 +301,11 @@ object PowderMiningChatFilter {
         blockGoblinEggs(ssMessage)?.let { return it }
         blockGemstones(ssMessage)?.let { return it }
 
-        //Fallback default
+        // Fallback default
         return null
     }
 
-    var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap()
+    private var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap()
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRepoReload(event: RepositoryReloadEvent) {
@@ -339,7 +339,7 @@ object PowderMiningChatFilter {
             if (config.goblinEggs == PowderMiningFilterConfig.GoblinEggFilterEntry.HIDE_ALL) return "powder_mining_goblin_eggs"
 
             return when (val colorStr = groupOrNull("color")?.lowercase()) {
-                //'Colorless', base goblin eggs will never be shown in this code path
+                // 'Colorless', base goblin eggs will never be shown in this code path
                 null -> "powder_mining_goblin_eggs"
                 "green" -> if (config.goblinEggs > PowderMiningFilterConfig.GoblinEggFilterEntry.GREEN_UP) {
                     "powder_mining_goblin_eggs"
@@ -380,7 +380,7 @@ object PowderMiningChatFilter {
                 "amethyst" -> gemstoneConfig.amethystGemstones
                 "jade" -> gemstoneConfig.jadeGemstones
                 "topaz" -> gemstoneConfig.topazGemstones
-                //Failure case that should never be reached
+                // Failure case that should never be reached
                 else -> return "no_filter"
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt
index d6c2e85c23eb..39a1f096acff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt
@@ -19,7 +19,7 @@ object GetFromSacksTabComplete {
         return GetFromSackAPI.sackListNames.map { it.replace(" ", "_") }
     }
 
-    //No subscribe since it needs to be called from the GetFromSackAPI
+    // No subscribe since it needs to be called from the GetFromSackAPI
     fun handleUnderlineReplace(event: MessageSendToServerEvent): MessageSendToServerEvent {
         if (!isEnabled()) return event
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
index a49369d83f74..1a566c22579d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -16,7 +16,7 @@ object DungeonChatFilter {
 
     private val config get() = SkyHanniMod.feature.chat
 
-    /// <editor-fold desc="Patterns, Messages, and Maps">
+    // <editor-fold desc="Patterns, Messages, and Maps">
     // TODO USE SH-REPO
     private val endPatterns = listOf(
         "(.*) §r§eunlocked §r§d(.*) Essence §r§8x(.*)§r§e!".toPattern(),
@@ -140,9 +140,12 @@ object DungeonChatFilter {
     private val pickupMessages = listOf(
         "§fYou found a §r§dWither Essence§r§f! Everyone gains an extra essence!"
     )
+
+    /**
+     * REGEX-TEST: §a[Berserk] §r§fMelee Damage §r§c48%§r§f -> §r§a88%
+     * REGEX-TEST: §a[Berserk] §r§fWalk Speed §r§c38§r§f -> §r§a68
+     */
     private val startPatterns = listOf(
-        //§a[Berserk] §r§fMelee Damage §r§c48%§r§f -> §r§a88%
-        //§a[Berserk] §r§fWalk Speed §r§c38§r§f -> §r§a68
         "§a(.*) §r§f(.*) §r§c(.*)§r§f -> §r§a(.*)".toPattern()
     )
     private val startMessages = listOf(
@@ -188,7 +191,7 @@ object DungeonChatFilter {
     private val messagesEndsWithMap: Map<MessageTypes, List<String>> = mapOf(
         MessageTypes.END to endMessagesEndWith,
     )
-    /// </editor-fold>
+    // </editor-fold>
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt
index 80a60ba4b8f1..3968a3d18a87 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonRankTabListColor.kt
@@ -34,7 +34,7 @@ object DungeonRankTabListColor {
             val sbLevel = group("sbLevel")
             val rank = groupOrNull("rank") ?: ""
             val playerName = group("playerName")
-            //val symbols = group("symbols")
+            // val symbols = group("symbols")
             val className = group("className")
             val classLevel = group("classLevel")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index ec18d016b561..b49eb0642604 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -61,10 +61,10 @@ object CarnivalZombieShootout {
     )
 
     enum class ZombieType(val points: Int, val helmet: String, val color: Color) {
-        LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown
-        IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver
-        GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold
-        DIAMOND(120, "Diamond Helmet", Color(44, 214, 250)) //Diamond
+        LEATHER(30, "Leather Cap", Color(165, 42, 42)), // Brown
+        IRON(50, "Iron Helmet", Color(192, 192, 192)), // Silver
+        GOLD(80, "Golden Helmet", Color(255, 215, 0)), // Gold
+        DIAMOND(120, "Diamond Helmet", Color(44, 214, 250)) // Diamond
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index e84d93dfa6a3..9fbb3e527dc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -262,7 +262,7 @@ object HoppityCollectionStats {
                     else -> "" // Never happens
                 }
 
-                //List indexing is weird
+                // List indexing is weird
                 existingLore[replaceIndex - 1] = "§7Obtained by $operationFormat §6$displayAmount"
                 existingLore[replaceIndex] = "§7all-time §6Chocolate."
                 return existingLore
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index da461d749604..24edf8d4352b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -372,8 +372,8 @@ object FarmingWeightDisplay {
     private fun isEtaEnabled() = config.overtakeETA
 
     fun addCrop(crop: CropType, addedCounter: Int) {
-        //Prevent div-by-0 errors
-        if (addedCounter == 0) return;
+        // Prevent div-by-0 errors
+        if (addedCounter == 0) return
 
         val before = getExactWeight()
         localCounter[crop] = crop.getLocalCounter() + addedCounter
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index 959ab43e4b13..e8b2d55e4310 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -112,8 +112,8 @@ object CaptureFarmingGear {
         val currentCrop = itemStack.getCropType()
 
         if (currentCrop == null) {
-            //todo better fall back items
-            //todo Daedalus axe
+            // todo better fall back items
+            // todo Daedalus axe
         } else {
             currentCrop.farmingItem.setItem(itemStack)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index c002284ab072..b05acf95999b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -21,7 +21,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
         update(content, footer)
     }
 
-    //TODO split up this 240 lines function
+    // TODO split up this 240 lines function
     fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> {
         val content = mutableListOf<MutableList<Renderable>>()
         val footer = mutableListOf<Renderable>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
index c1b6a3d8fe6a..52e49d26fe18 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
@@ -82,10 +82,10 @@ object GardenVisitorCompactChat {
             visitorNameFormatted = "$visitorColor$visitorName"
         }
 
-        //If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this.
-        if (visitorNameFormatted.isBlank()) return;
+        // If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this.
+        if (visitorNameFormatted.isBlank()) return
 
-        //Match rewards and transform
+        // Match rewards and transform
         visitorRewardPattern.matchMatcher(transformedMessage) {
             val rewardColor = groupOrNull("rewardcolor")
             val amountColor = groupOrNull("amountcolor")
@@ -105,7 +105,7 @@ object GardenVisitorCompactChat {
                 if (altAmount == null) "" else "$altAmount "
             }
 
-            //Don't add name for copper, farming XP, garden XP, or bits
+            // Don't add name for copper, farming XP, garden XP, or bits
             val rewardString = if (discardRewardNamePattern.matcher(reward).matches()) "" else reward
 
             rewardsList.add(
@@ -127,8 +127,8 @@ object GardenVisitorCompactChat {
     }
 
     private fun sendCompact() {
-        //This prevents commission rewards, crop milestone data, etc. from triggering incorrectly
-        if (visitorNameFormatted.isBlank()) return;
+        // This prevents commission rewards, crop milestone data, etc. from triggering incorrectly
+        if (visitorNameFormatted.isBlank()) return
 
         if (visitorAcceptedChat.isNotEmpty()) {
             ChatUtils.hoverableChat(createCompactVisitorMessage(), hover = visitorAcceptedChat, prefix = false)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
index 6b3620c184c4..152fc1b7c23a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
@@ -228,7 +228,7 @@ object GardenVisitorDropStatistics {
         return "$amount"
     }
 
-    //todo this should just save when changed not once a second
+    // todo this should just save when changed not once a second
     @SubscribeEvent
     fun onSecondPassed(event: SecondPassedEvent) {
         saveAndUpdate()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 05aaeba80703..0247a4547705 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -148,7 +148,7 @@ object ItemPickupLog {
 
             if (cursorItem != null) {
                 val hash = cursorItem.hash()
-                //this prevents items inside hypixel guis counting when picked up
+                // this prevents items inside hypixel guis counting when picked up
                 if (oldItemList.contains(hash)) {
                     inventoryItems.add(cursorItem)
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
index fcd940d02767..2854b47dfbef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
@@ -379,8 +379,6 @@ object ReforgeHelper {
                 colorReforgeStone(hoverColor, hoveredReforge?.rawReforgeStoneName ?: "Random Basic Reforge")
             } else {
                 inventoryContainer?.getSlot(reforgeItem)?.highlight(hoverColor)
-
-                //?.get(reforgeItem)?. = hoverColor
             }
             hoveredReforge = null
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index eb15f6165645..26de0fa1c8ec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -153,7 +153,7 @@ object SackDisplay {
                             ),
                         )
                     )
-                    //TOOD add cache
+                    // TODO add cache
                     addItemStack("MAGMA_FISH".asInternalName())
                 }
                 if (config.showPrice && price != 0L) addAlignedNumber("§6${format(price)}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
index b96dc02992fc..8023de822cd1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryCustomReminder.kt
@@ -61,6 +61,8 @@ object ChocolateFactoryCustomReminder {
 
     /**
      * REGEX-TEST: §cYou don't have enough Chocolate!
+     * REGEX-TEST: §cYou don't have the required items!
+     * REGEX-TEST: §cYou must collect 300B all-time Chocolate!
      */
     private val chatMessagePattern by patternGroup.list(
         "chat.hide",
@@ -74,11 +76,7 @@ object ChocolateFactoryCustomReminder {
         if (!isEnabled()) return
         if (!ChocolateFactoryAPI.inChocolateFactory) return
         if (configReminder.hideChat) {
-
             if (chatMessagePattern.matches(event.message)) {
-                //§cYou don't have the required items!
-                //§cYou must collect 300B all-time Chocolate!
-//             if (event.message == "§cYou don't have enough Chocolate!") {
                 event.blockedReason = "custom_reminder"
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 805d2c8617b2..ed7e35691b25 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -204,14 +204,14 @@ object ChocolateFactoryStrayTracker {
 
         // "Base" strays - Common -> Epic, raw choc only reward.
         strayLorePattern.matchMatcher(loreLine) {
-            //Pretty sure base strays max at Epic, but...
+            // Pretty sure base strays max at Legendary, but...
             val rarity = HoppityAPI.rarityByRabbit(group("rabbit")) ?: return@matchMatcher
             incrementRarity(rarity, group("amount").formatLong())
         }
 
         // Fish the Rabbit
         fishTheRabbitPattern.matchMatcher(loreLine) {
-            //Also fairly sure that Fish maxes out at Rare, but...
+            // Also fairly sure that Fish maxes out at Rare, but...
             val rarity = HoppityAPI.rarityByRabbit(group("color")) ?: return@matchMatcher
             incrementRarity(rarity, group("amount").formatLong())
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 4415b59f5872..72f3d13d4138 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -301,11 +301,6 @@ object MineshaftPityDisplay {
 
         GEMSTONE(
             "Gemstone",
-            /*listOf(
-                OreType.RUBY, OreType.AMBER, OreType.AMETHYST, OreType.JADE,
-                OreType.SAPPHIRE, OreType.TOPAZ, OreType.JASPER, OreType.OPAL,
-                OreType.AQUAMARINE, OreType.CITRINE, OreType.ONYX, OreType.PERIDOT,
-            ),*/
             OreType.entries.filter { it.isGemstone() },
             4,
             ItemStack(Blocks.stained_glass, 1, EnumDyeColor.BLUE.metadata),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
index 4275a809ca92..a9e1c18920ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreBlock.kt
@@ -117,7 +117,7 @@ enum class OreBlock(
         checkArea = { inSpidersDen },
     ),
 
-    //END
+    // END
     END_STONE(
         checkBlock = { it.block == Blocks.end_stone },
         checkArea = { inEnd },
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index c0a9c1212d31..3908155724be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -298,7 +298,7 @@ object MinionFeatures {
             System.currentTimeMillis() - lastClicked
         } ?: return "§cCan't calculate coins/day: No time data available!"
 
-        //§7Held Coins: §b151,389
+        // §7Held Coins: §b151,389
         // TODO use regex
         val coins = line.split(": §b")[1].formatDouble()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index b0fbc2f31f83..fddb5bbda722 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -738,7 +738,7 @@ object EstimatedItemValueCalculator {
         var totalPrice = 0.0
         val map = mutableMapOf<String, Double>()
 
-        //todo use repo
+        // todo use repo
         val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb", "toxophilite")
         val onlyTierOnePrices = listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
         val onlyTierFivePrices = listOf("ferocious_mana", "hardened_mana", "mana_vampire", "strong_mana")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
index 286560c73fea..244cc54bedf8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
@@ -94,8 +94,7 @@ open class Enchant : Comparable<Enchant> {
         return if (this.isUltimate()) -1 else 1
     }
 
-    class Normal : Enchant() {
-    }
+    class Normal : Enchant()
 
     class Ultimate : Enchant() {
         override fun getFormat(level: Int, itemStack: ItemStack?) = "§d§l"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt
index 2b33885c1e2a..020004648531 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt
@@ -24,8 +24,8 @@ class FeatureToggleProcessor : ConfigStructureReader {
         latestCategory = Category(name, description)
     }
 
-    override fun endCategory() {
-    }
+    @Suppress("EmptyFunctionBlock")
+    override fun endCategory() {}
 
     override fun beginAccordion(baseObject: Any?, field: Field?, o: ConfigOption?, id: Int) {
         val option = o ?: return
@@ -86,6 +86,6 @@ class FeatureToggleProcessor : ConfigStructureReader {
         )
     }
 
-    override fun emitGuiOverlay(baseObject: Any?, field: Field?, option: ConfigOption?) {
-    }
+    @Suppress("EmptyFunctionBlock")
+    override fun emitGuiOverlay(baseObject: Any?, field: Field?, option: ConfigOption?) {}
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
index 21f13c1560ee..403a786869cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
@@ -53,7 +53,7 @@ object RiftTimer {
         currentTime = 0.seconds
     }
 
-    //todo use ActionBarValueUpdateEvent
+    // todo use ActionBarValueUpdateEvent
     @SubscribeEvent
     fun onActionBarUpdate(event: ActionBarUpdateEvent) {
         if (!isEnabled()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 4b75b3feaeeb..12791115c98c 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -137,9 +137,8 @@ object SkyHanniDebugsAndTests {
         }
     }
 
-    private fun asyncTest(args: Array<String>) {
-
-    }
+    @Suppress("EmptyFunctionBlock")
+    private fun asyncTest(args: Array<String>) {}
 
     fun findNullConfig(args: Array<String>) {
         println("start null finder")
@@ -487,8 +486,8 @@ object SkyHanniDebugsAndTests {
     }
 
     @SubscribeEvent
-    fun onChat(event: LorenzChatEvent) {
-    }
+    @Suppress("EmptyFunctionBlock")
+    fun onChat(event: LorenzChatEvent) {}
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
index 1aefeda52925..162386d4315d 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
@@ -600,7 +600,7 @@ object GraphEditor {
         ghostPosition = null
     }
 
-    private fun prune() { //TODO fix
+    private fun prune() { // TODO fix
         val hasNeighbours = nodes.associateWith { false }.toMutableMap()
         edges.forEach {
             hasNeighbours[it.node1] = true
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt
index 26f56fcca18f..721b7e79bf4f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt
@@ -43,6 +43,7 @@ class LorenzLogger(filePath: String) {
         return initLogger
     }
 
+    @Suppress("PrintStackTrace")
     private fun initLogger(): Logger {
         val logger = Logger.getLogger("Lorenz-Logger-" + System.nanoTime())
         try {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 2f17ea4d1d31..a7abe6527bdc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -64,6 +64,7 @@ object NEUItems {
             .registerTypeAdapter(
                 HypixelApiTrophyFish::class.java,
                 object : TypeAdapter<HypixelApiTrophyFish>() {
+                    @Suppress("EmptyFunctionBlock")
                     override fun write(out: JsonWriter, value: HypixelApiTrophyFish) {}
 
                     override fun read(reader: JsonReader): HypixelApiTrophyFish {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
index ef2bf5591fbf..68abf84f7744 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUVersionCheck.kt
@@ -52,6 +52,7 @@ object NEUVersionCheck {
     /**
      * Taken and modified from Skytils
      */
+    @Suppress("PrintStackTrace")
     private fun openPopupWindow(errorMessage: String, vararg options: Pair<String, String>) {
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName())
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index f3076284d3e1..f118d5d665c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -270,7 +270,7 @@ object StringUtils {
     }
 
     fun progressBar(percentage: Double, steps: Int = 24): Any {
-        //'§5§o§2§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §f§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §r §e348,144.3§6/§e936k'
+        // '§5§o§2§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §f§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §r §e348,144.3§6/§e936k'
         val prefix = "§5§o§2"
         val step = "§l§m "
         val missing = "§f"
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
index 0cec5aeb22ae..376ecec74b8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/GuiScreenUtils.kt
@@ -47,7 +47,7 @@ object GuiScreenUtils {
     val mouseY: Int
         get() {
             val height = this.scaledWindowHeight
-            //TODO: in later versions the height - factor is removed, i think
+            // TODO: in later versions the height - factor is removed, i think
             val y = globalMouseY * height / displayHeight
 //#if MC < 1.16
             return height - y - 1
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
index e9b8233eafb5..11327f15d6ef 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/SkyhanniBaseScreen.kt
@@ -6,5 +6,4 @@ abstract class SkyhanniBaseScreen : GuiScreen(
     //#if MC > 1.12
     //$$ net.minecraft.network.chat.TextComponent.EMPTY
     //#endif
-) {
-}
+)

From c4b7ec8846432946fdc8e648a98c0aebaf613c53 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:23:45 +1000
Subject: [PATCH 566/721] Backend: Explain double baseline.xml file (#2609)

---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d68b88f9fe66..90fcd025049d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,7 +101,9 @@ format like "- #821" to illustrate the dependency.
     - `detekt` is our code quality tool. It checks for code smells and style issues.
     - If you have a build failure stating `Analysis failed with ... weighted issues.`, you can check `versions/[target version]/build/reports/detekt/` for a comprehensive list of issues.
     - **There are valid reasons to deviate from the norm**
-        - If you have such a case, either use `@Supress("rule_name")`, or re-build the `baseline.xml` file, using `./gradlew detektBaseline`. 
+        - If you have such a case, either use `@Supress("rule_name")`, or re-build the `baseline.xml` file, using `./gradlew detektBaselineMain`.
+      After running detektBaselineMain, you should find a file called `baseline-main.xml` in the `version/1.8.9` folder, rename the file to
+     `baseline.xml` replacing the old one. You also should copy the new contents of this file to the [main baseline file](detekt/baseline.xml)
 - Do not copy features from other mods. Exceptions:
     - Mods that are paid to use.
   - Mods that have reached their end of life. (Rip SBA, Dulkir and Soopy).

From 122d6c830ba94fcd7c512960d5c5ab11d75fd1d5 Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:44:15 +0200
Subject: [PATCH 567/721] Fix: Item category detection (#2608)

---
 .../hannibal2/skyhanni/utils/UtilsPatterns.kt | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
index 9ce7a32c5feb..efe1ddf95e68 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
@@ -10,9 +10,9 @@ object UtilsPatterns {
     private val patternGroup = RepoPattern.group("utils")
 
     /** Examples:
-    §d§l§ka§r §d§l§d§lMYTHIC ACCESSORY §d§l§ka
-    §d§l§ka§r §d§l§d§lSHINY MYTHIC DUNGEON CHESTPLATE §d§l§ka
-    §c§l§ka§r §c§l§c§lVERY SPECIAL HATCESSORY §c§l§ka
+    §d§l§ka§r §d§lMYTHIC ACCESSORY §d§l§ka
+    §d§l§ka§r §d§lSHINY MYTHIC DUNGEON CHESTPLATE §d§l§ka
+    §c§l§ka§r §c§lVERY SPECIAL HATCESSORY §c§l§ka
     §6§lSHINY LEGENDARY DUNGEON BOOTS
     §6§lLEGENDARY DUNGEON BOOTS
     §5§lEPIC BOOTS
@@ -20,14 +20,14 @@ object UtilsPatterns {
      **/
     val rarityLoreLinePattern by patternGroup.pattern(
         "item.lore.rarity.line",
-        "^(?:§.){2,3}(?:.§. (?:§.){4})?(?:SHINY )?(?<rarity>" +
+        "^(?:§.){2,3}(?:.§. (?:§.){2})?(?:SHINY )?(?<rarity>" +
             enumJoinToPattern<LorenzRarity> { it.name.replace("_", " ") } +
-            ") ?(?:DUNGEON )?(?<itemCategory>[^§]*)(?: (?:§.){3}.)?$"
+            ") ?(?:DUNGEON )?(?<itemCategory>[^§]*)(?: (?:§.){3}.)?$",
     )
 
     val abiPhonePattern by patternGroup.pattern(
         "item.name.abiphone",
-        ".{2}Abiphone .*"
+        ".{2}Abiphone .*",
     )
 
     /**
@@ -36,17 +36,17 @@ object UtilsPatterns {
      */
     val enchantedBookPattern by patternGroup.pattern(
         "item.name.enchanted.book",
-        "(?:§.)+Enchanted Book"
+        "(?:§.)+Enchanted Book",
     )
 
     val baitPattern by patternGroup.pattern(
         "item.name.bait",
-        "^(Obfuscated.*|.* Bait)$"
+        "^(Obfuscated.*|.* Bait)$",
     )
 
     val enchantmentNamePattern by patternGroup.pattern(
         "item.neuitems.enchantmentname",
-        "^(?<format>(?:§.)*)(?<name>[^§]+) (?<level>[IVXL]+)(?: Book)?$"
+        "^(?<format>(?:§.)*)(?<name>[^§]+) (?<level>[IVXL]+)(?: Book)?$",
     )
 
     /**
@@ -56,61 +56,61 @@ object UtilsPatterns {
      */
     val cleanEnchantedNamePattern by patternGroup.pattern(
         "item.enchantment.clean.name",
-        "(?i)(?<name>.*) (?<level>[IVXL]+|[0-9]+)"
+        "(?i)(?<name>.*) (?<level>[IVXL]+|[0-9]+)",
     )
 
     val potionPattern by patternGroup.pattern(
         "item.name.potion",
-        ".*Potion"
+        ".*Potion",
     )
     val readAmountBeforePattern by patternGroup.pattern(
         "item.amount.front",
-        "(?: +§8(?:\\+§.)?(?<amount>[\\d.,]+[km]?)x? )?(?<name>.*)"
+        "(?: +§8(?:\\+§.)?(?<amount>[\\d.,]+[km]?)x? )?(?<name>.*)",
     )
     val readAmountAfterPattern by patternGroup.pattern(
         "item.amount.behind",
-        "(?<name>(?:§.)*(?:[^§] ?)+)(?:§8x(?<amount>[\\d,]+))?"
+        "(?<name>(?:§.)*(?:[^§] ?)+)(?:§8x(?<amount>[\\d,]+))?",
     )
     val costLinePattern by patternGroup.pattern(
         "item.cost.line",
-        "(?:§5§o)?§7Cost.*"
+        "(?:§5§o)?§7Cost.*",
     )
 
     val timeAmountPattern by patternGroup.pattern(
         "time.amount",
-        "(?:(?<y>\\d+) ?y(?:\\w* ?)?)?(?:(?<d>\\d+) ?d(?:\\w* ?)?)?(?:(?<h>\\d+) ?h(?:\\w* ?)?)?(?:(?<m>\\d+) ?m(?:\\w* ?)?)?(?:(?<s>\\d+) ?s(?:\\w* ?)?)?"
+        "(?:(?<y>\\d+) ?y(?:\\w* ?)?)?(?:(?<d>\\d+) ?d(?:\\w* ?)?)?(?:(?<h>\\d+) ?h(?:\\w* ?)?)?(?:(?<m>\\d+) ?m(?:\\w* ?)?)?(?:(?<s>\\d+) ?s(?:\\w* ?)?)?",
     )
 
     val playerChatPattern by patternGroup.pattern(
         "string.playerchat",
-        "(?<important>.*?)(?:§[f7r])*: .*"
+        "(?<important>.*?)(?:§[f7r])*: .*",
     )
     val chatUsernamePattern by patternGroup.pattern(
         "string.chatusername",
-        "^(?:§\\w\\[§\\w\\d+§\\w] )?(?:(?:§\\w)+\\S )?(?<rankedName>(?:§\\w\\[\\w.+] )?(?:§\\w)?(?<username>\\w+))(?: (?:§\\w)?\\[.+?])?"
+        "^(?:§\\w\\[§\\w\\d+§\\w] )?(?:(?:§\\w)+\\S )?(?<rankedName>(?:§\\w\\[\\w.+] )?(?:§\\w)?(?<username>\\w+))(?: (?:§\\w)?\\[.+?])?",
     )
     val isRomanPattern by RepoPattern.pattern(
         "string.isroman",
-        "^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})"
+        "^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})",
     )
 
     val sackPattern by patternGroup.pattern(
         "item.sack",
-        ".*Sack"
+        ".*Sack",
     )
 
     val seasonPattern by patternGroup.pattern(
         "skyblocktime.season",
-        "(?:Early |Late )?(?<season>Spring|Summer|Autumn|Winter)"
+        "(?:Early |Late )?(?<season>Spring|Summer|Autumn|Winter)",
     )
 
     val tabListProfilePattern by patternGroup.pattern(
         "tablist.profile",
-        "(?:§.)+Profile: §r§a(?<profile>[\\w\\s]+[^ §]).*"
+        "(?:§.)+Profile: §r§a(?<profile>[\\w\\s]+[^ §]).*",
     )
 
     val shopOptionsPattern by patternGroup.pattern(
         "inventory.shopoptions",
-        "Shop Trading Options"
+        "Shop Trading Options",
     )
 }

From 633b8f0bdd9b05f553b1bc521a83b4b7de238125 Mon Sep 17 00:00:00 2001
From: Fazfoxy <78978526+Fazfoxy@users.noreply.github.com>
Date: Sat, 28 Sep 2024 12:52:56 +0100
Subject: [PATCH 568/721] Fix: Diamond/Golden heads + Master Skulls using Name
 not ID causing an incompatibility with NEURenamed items (#2611)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../inventory/ItemDisplayOverlayFeatures.kt   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 1af2c8c88e67..43a598839256 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -66,11 +66,11 @@ object ItemDisplayOverlayFeatures {
     private val config get() = SkyHanniMod.feature.inventory
 
     private val patternGroup = RepoPattern.group("inventory.item.overlay")
-    private val masterSkullPattern by patternGroup.pattern(
-        "masterskull",
-        "(.*)Master Skull - Tier .",
+    private val masterSkullIDPattern by patternGroup.pattern(
+        "masterskull.id",
+        "MASTER_SKULL_TIER_(?<tier>\\d)",
     )
-    private val gardenVacuumPatterm by patternGroup.pattern(
+    private val gardenVacuumPattern by patternGroup.pattern(
         "vacuum",
         "§7Vacuum Bag: §6(?<amount>\\d*) Pests?",
     )
@@ -131,20 +131,20 @@ object ItemDisplayOverlayFeatures {
         }
 
         if (MASTER_SKULL_TIER.isSelected()) {
-            masterSkullPattern.matchMatcher(itemName) {
-                return itemName.substring(itemName.length - 1)
+            masterSkullIDPattern.matchMatcher(internalName.asString()) {
+                return group("tier")
             }
         }
 
-        if (DUNGEON_HEAD_FLOOR_NUMBER.isSelected() && (itemName.contains("Golden ") || itemName.contains("Diamond "))) {
+        if (DUNGEON_HEAD_FLOOR_NUMBER.isSelected() && (internalName.contains("GOLD_") || internalName.contains("DIAMOND_"))) {
             when {
-                itemName.contains("Bonzo") -> return "1"
-                itemName.contains("Scarf") -> return "2"
-                itemName.contains("Professor") -> return "3"
-                itemName.contains("Thorn") -> return "4"
-                itemName.contains("Livid") -> return "5"
-                itemName.contains("Sadan") -> return "6"
-                itemName.contains("Necron") -> return "7"
+                internalName.contains("BONZO") -> return "1"
+                internalName.contains("SCARF") -> return "2"
+                internalName.contains("PROFESSOR") -> return "3"
+                internalName.contains("THORN") -> return "4"
+                internalName.contains("LIVID") -> return "5"
+                internalName.contains("SADAN") -> return "6"
+                internalName.contains("NECRON") -> return "7"
             }
         }
 
@@ -252,7 +252,7 @@ object ItemDisplayOverlayFeatures {
         }
 
         if (VACUUM_GARDEN.isSelected() && internalName in PestAPI.vacuumVariants && isOwnItem(lore)) {
-            lore.matchFirst(gardenVacuumPatterm) {
+            lore.matchFirst(gardenVacuumPattern) {
                 val pests = group("amount").formatLong()
                 return if (config.vacuumBagCap) {
                     if (pests > 39) "§640+" else "$pests"

From 2178deb82a1cc3305113db1fbeee939cd7272d2e Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:23:23 -0400
Subject: [PATCH 569/721] Backend: Detekt Fixes Part 3 (#2606)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigManager.kt          |   3 +-
 .../skyhanni/config/commands/Commands.kt      |   2 +
 .../skyhanni/data/mob/MobDetection.kt         |  14 +-
 ...lockEvent.kt => DungeonBlockClickEvent.kt} |   0
 .../skyhanni/features/chat/ChatFilter.kt      |   1 +
 .../features/chat/PowderMiningChatFilter.kt   |   1 +
 .../skyhanni/features/combat/BestiaryData.kt  |   4 +-
 .../damageindicator/DamageIndicatorManager.kt |   5 +-
 .../combat/damageindicator/MobFinder.kt       |  14 +-
 .../features/dungeon/DungeonCleanEnd.kt       |  10 +-
 .../waypoints/easter/EasterEggWaypoints.kt    |   2 +-
 .../fishing/trophy/TrophyFishMessages.kt      |   4 +-
 .../garden/composter/ComposterOverlay.kt      |  24 +-
 .../garden/fortuneguide/pages/OverviewPage.kt |   5 +-
 .../HighlightVisitorsOutsideOfGarden.kt       |   4 +-
 .../skyhanni/features/gui/MovableHotBar.kt    |   4 +-
 .../customscoreboard/ScoreboardElements.kt    |   4 +-
 .../gui/customscoreboard/ScoreboardEvent.kt   |  66 ++---
 .../customscoreboard/UnknownLinesHandler.kt   | 234 +++++++++---------
 .../SuperpairExperimentInformationDisplay.kt  |   2 +-
 .../SuperpairsClicksAlert.kt                  |  11 +-
 .../abilitycooldown/ItemAbilityCooldown.kt    |   4 +-
 .../features/mining/KingTalismanHelper.kt     |   4 +-
 .../features/misc/MarkedPlayerManager.kt      |   4 +-
 .../items/EstimatedItemValueCalculator.kt     |  15 +-
 .../DefaultConfigOptionGui.kt                 |   4 +-
 .../misc/visualwords/ModifyVisualWords.kt     |   2 +-
 .../rift/area/dreadfarm/VoltHighlighter.kt    |   4 +-
 .../test/SkyHanniConfigSearchResetCommand.kt  |   1 +
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   6 +-
 .../skyhanni/utils/InventoryUtils.kt          |   4 +-
 .../skyhanni/utils/ItemNameResolver.kt        |   6 +-
 .../skyhanni/utils/MinecraftConsoleFilter.kt  |   1 +
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |   1 +
 ...pter.kt => ItemStackTypeAdapterFactory.kt} |   0
 35 files changed, 246 insertions(+), 224 deletions(-)
 rename src/main/java/at/hannibal2/skyhanni/events/{DungeonClickedBlockEvent.kt => DungeonBlockClickEvent.kt} (100%)
 rename src/main/java/at/hannibal2/skyhanni/utils/json/{ItemStackTypeAdapter.kt => ItemStackTypeAdapterFactory.kt} (100%)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index da4b54942dfd..b00fc7a8f749 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -66,7 +66,8 @@ class ConfigManager {
 
     private fun setConfigHolder(type: ConfigFileType, value: Any) {
         require(value.javaClass == type.clazz)
-        @Suppress("UNCHECKED_CAST") (type.property as KMutableProperty0<Any>).set(value)
+        @Suppress("UNCHECKED_CAST")
+        (type.property as KMutableProperty0<Any>).set(value)
         (jsonHolder as MutableMap<ConfigFileType, Any>)[type] = value
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 9f2e3cc3fd71..4974c80f2d51 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -186,6 +186,7 @@ object Commands {
         registerCommand("shnavigate", "Using path finder to go to locatons") { NavigationHelper.onCommand(it) }
     }
 
+    @Suppress("LongMethod")
     private fun usersNormal() {
         registerCommand(
             "shmarkplayer",
@@ -502,6 +503,7 @@ object Commands {
         ) { ScoreboardData.toggleMonitor() }
     }
 
+    @Suppress("LongMethod")
     private fun developersCodingHelp() {
         registerCommand("shrepopatterns", "See where regexes are loaded from") { RepoPatternGui.open() }
         registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 9b7ba2cfd5e1..a763961f8b54 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -302,13 +302,13 @@ object MobDetection {
             val entity = retry.entity
             if (retry.times == MAX_RETRIES) {
                 MobData.logger.log(
-                    "`${retry.entity.name}`${retry.entity.entityId} missed {\n "
-                        + "is already Found: ${MobData.entityToMob[retry.entity] != null})."
-                        + "\n Position: ${retry.entity.getLorenzVec()}\n "
-                        + "DistanceC: ${
-                        entity.getLorenzVec().distanceChebyshevIgnoreY(LocationUtils.playerLocation())
-                    }\n"
-                        + "Relative Position: ${entity.getLorenzVec() - LocationUtils.playerLocation()}\n " +
+                    "`${retry.entity.name}`${retry.entity.entityId} missed {\n " +
+                        "is already Found: ${MobData.entityToMob[retry.entity] != null})." +
+                        "\n Position: ${retry.entity.getLorenzVec()}\n " +
+                        "DistanceC: ${
+                            entity.getLorenzVec().distanceChebyshevIgnoreY(LocationUtils.playerLocation())
+                        }\n" +
+                        "Relative Position: ${entity.getLorenzVec() - LocationUtils.playerLocation()}\n " +
                         "}",
                 )
                 // Uncomment this to make it closed a loop
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt
similarity index 100%
rename from src/main/java/at/hannibal2/skyhanni/events/DungeonClickedBlockEvent.kt
rename to src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index d058ddc50ce1..4d9af4c9d042 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -519,6 +519,7 @@ object ChatFilter {
      * @param message The message to check
      * @return The reason why the message was blocked, empty if not blocked
      */
+    @Suppress("CyclomaticComplexMethod")
     private fun block(message: String): String? = when {
         config.hypixelHub && message.isPresent("lobby") -> "lobby"
         config.empty && StringUtils.isEmpty(message) -> "empty"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 698a671141da..25c1c04cb0db 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -252,6 +252,7 @@ object PowderMiningChatFilter {
         "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine|Flawless) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
     )
 
+    @Suppress("CyclomaticComplexMethod")
     fun block(message: String): String? {
         // Generic "you uncovered a chest" message
         if (uncoverChestPattern.matches(message)) return "powder_mining_chest"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
index 957f1ecd0b29..3b2b936802c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
@@ -441,8 +441,8 @@ object BestiaryData {
             return true
         } else if (name == "Search Results") {
             val loreList = stack.getLore()
-            if (loreList.size >= 2 && loreList[0].startsWith("§7Query: §a")
-                && loreList[1].startsWith("§7Results: §a")
+            if (loreList.size >= 2 && loreList[0].startsWith("§7Query: §a") &&
+                loreList[1].startsWith("§7Results: §a")
             ) {
                 return true
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index 0391e40a3697..4f0dad4b84be 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -67,6 +67,8 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
+// TODO cut class into smaller pieces
+@Suppress("LargeClass")
 object DamageIndicatorManager {
 
     private var mobFinder: MobFinder? = null
@@ -75,7 +77,6 @@ object DamageIndicatorManager {
 
     private val enderSlayerHitsNumberPattern = ".* §[5fd]§l(?<hits>\\d+) Hits?".toPattern()
 
-
     private var data = mapOf<UUID, EntityData>()
     private val damagePattern = "[✧✯]?(\\d+[⚔+✧❤♞☄✷ﬗ✯]*)".toPattern()
 
@@ -288,7 +289,7 @@ object DamageIndicatorManager {
             BossType.SLAYER_BLAZE_QUAZII_3,
             BossType.SLAYER_BLAZE_QUAZII_4,
 
-                // TODO f3/m3 4 guardians, f2/m2 4 boss room fighters
+            // TODO f3/m3 4 guardians, f2/m2 4 boss room fighters
             -> true
 
             else -> false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
index 975e3b4f8457..399040179934 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
@@ -88,11 +88,11 @@ class MobFinder {
         else -> {
             when (entity) {
                 /*
-                     * Note that the order does matter here.
-                     * For example, if you put EntityZombie before EntityPigZombie,
-                     * EntityPigZombie will never be reached because EntityPigZombie extends EntityZombie.
-                     * Please take this into consideration if you are to modify this.
-                    */
+                 * Note that the order does matter here.
+                 * For example, if you put EntityZombie before EntityPigZombie,
+                 * EntityPigZombie will never be reached because EntityPigZombie extends EntityZombie.
+                 * Please take this into consideration if you are to modify this.
+                 */
                 is EntityOtherPlayerMP -> tryAddEntityOtherPlayerMP(entity)
                 is EntityIronGolem -> tryAddEntityIronGolem(entity)
                 is EntityPigZombie -> tryAddEntityPigZombie(entity)
@@ -392,8 +392,8 @@ class MobFinder {
     }
 
     private fun tryAddEntityMagmaCube(entity: EntityLivingBase) = when {
-        entity.hasNameTagWith(15, "§e﴾ §8[§7Lv500§8] §l§4§lMagma Boss§r ")
-            && entity.hasMaxHealth(200_000_000, true) -> {
+        entity.hasNameTagWith(15, "§e﴾ §8[§7Lv500§8] §l§4§lMagma Boss§r ") &&
+            entity.hasMaxHealth(200_000_000, true) -> {
             EntityResult(bossType = BossType.NETHER_MAGMA_BOSS, ignoreBlocks = true)
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index eca75bc7014b..308a5b14438f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -99,11 +99,11 @@ object DungeonCleanEnd {
 
         if (entity == Minecraft.getMinecraft().thePlayer) return
 
-        if (config.F3IgnoreGuardians
-            && DungeonAPI.isOneOf("F3", "M3")
-            && entity is EntityGuardian
-            && entity.entityId != lastBossId
-            && Minecraft.getMinecraft().thePlayer.isSneaking
+        if (config.F3IgnoreGuardians &&
+            DungeonAPI.isOneOf("F3", "M3") &&
+            entity is EntityGuardian &&
+            entity.entityId != lastBossId &&
+            Minecraft.getMinecraft().thePlayer.isSneaking
         ) {
             return
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
index 2df035702f8c..6831f1440115 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
@@ -106,7 +106,7 @@ object EasterEggWaypoints {
         'Easter Eggs: §a0/§a30'
         '             '
         '§ewww.hypixel.net'
-    */
+     */
     private fun checkScoreboardEasterSpecific(): Boolean {
         val a = ScoreboardData.sidebarLinesFormatted.any { it.contains("Hypixel Level") }
         val b = ScoreboardData.sidebarLinesFormatted.any { it.contains("Easter") }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
index 7068ef8aa7b4..f97bd56c9466 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
@@ -91,8 +91,8 @@ object TrophyFishMessages {
     }
 
     private fun shouldBlockTrophyFish(rarity: TrophyRarity, amount: Int) =
-        config.bronzeHider && rarity == TrophyRarity.BRONZE && amount != 1
-            || config.silverHider && rarity == TrophyRarity.SILVER && amount != 1
+        config.bronzeHider && rarity == TrophyRarity.BRONZE && amount != 1 ||
+            config.silverHider && rarity == TrophyRarity.SILVER && amount != 1
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index fa45e579dfa3..6faa7746a797 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -564,18 +564,24 @@ object ComposterOverlay {
         }
     }
 
+    private val blockedItems = listOf(
+        "POTION_AFFINITY_TALISMAN",
+        "CROPIE_TALISMAN",
+        "SPEED_TALISMAN",
+        "SIMPLE_CARROT_CANDY",
+    )
+
+    private fun isBlockedArmor(internalName: String): Boolean {
+        return internalName.endsWith("_BOOTS") ||
+            internalName.endsWith("_HELMET") ||
+            internalName.endsWith("_CHESTPLATE") ||
+            internalName.endsWith("_LEGGINGS")
+    }
+
     private fun updateOrganicMatterFactors(baseValues: Map<NEUInternalName, Double>): Map<NEUInternalName, Double> {
         val map = mutableMapOf<NEUInternalName, Double>()
         for ((internalName, _) in NEUItems.allNeuRepoItems()) {
-            if (internalName == "POTION_AFFINITY_TALISMAN"
-                || internalName == "CROPIE_TALISMAN"
-                || internalName.endsWith("_BOOTS")
-                || internalName.endsWith("_HELMET")
-                || internalName.endsWith("_CHESTPLATE")
-                || internalName.endsWith("_LEGGINGS")
-                || internalName == "SPEED_TALISMAN"
-                || internalName == "SIMPLE_CARROT_CANDY"
-            ) continue
+            if (blockedItems.contains(internalName) || isBlockedArmor(internalName)) continue
 
             var (newId, amount) = NEUItems.getPrimitiveMultiplier(internalName.asInternalName())
             if (amount <= 9) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index b05acf95999b..00e994f7d4f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -21,8 +21,9 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
         update(content, footer)
     }
 
-    // TODO split up this 240 lines function
-    fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> {
+    // TODO split up this 240 lines function - remove suppression when done
+    @Suppress("CyclomaticComplexMethod", "LongMethod")
+    private fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> {
         val content = mutableListOf<MutableList<Renderable>>()
         val footer = mutableListOf<Renderable>()
         val timeUntilCakes = FFStats.cakeExpireTime.timeUntil().format(TimeUnit.HOUR, maxUnits = 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index 8a8c11165564..a413f295ab27 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -62,8 +62,8 @@ object HighlightVisitorsOutsideOfGarden {
         val possibleJsons = visitorJson[mode] ?: return false
         val skinOrType = getSkinOrTypeFor(entity)
         return possibleJsons.any {
-            (it.position == null || it.position.distance(entity.position.toLorenzVec()) < 1)
-                && it.skinOrType == skinOrType
+            (it.position == null || it.position.distance(entity.position.toLorenzVec()) < 1) &&
+                it.skinOrType == skinOrType
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/MovableHotBar.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/MovableHotBar.kt
index cf49749b27e9..bee90a69694b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/MovableHotBar.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/MovableHotBar.kt
@@ -39,6 +39,6 @@ object MovableHotBar {
     }
 
     fun isEnabled(): Boolean =
-        (LorenzUtils.inSkyBlock || (Minecraft.getMinecraft().thePlayer != null && config.showOutsideSkyblock))
-            && config.editable
+        (LorenzUtils.inSkyBlock || (Minecraft.getMinecraft().thePlayer != null && config.showOutsideSkyblock)) &&
+            config.editable
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 7636d43ebabf..0289a3c81862 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -491,8 +491,8 @@ private fun getHeatDisplayPair(): List<ScoreboardElementType> {
     )
 }
 
-private fun getHeatShowWhen() = inAnyIsland(IslandType.CRYSTAL_HOLLOWS)
-    && CustomScoreboard.activeLines.any { ScoreboardPattern.heatPattern.matches(it) }
+private fun getHeatShowWhen() = inAnyIsland(IslandType.CRYSTAL_HOLLOWS) &&
+    CustomScoreboard.activeLines.any { ScoreboardPattern.heatPattern.matches(it) }
 
 private fun getColdDisplayPair(): List<ScoreboardElementType> {
     val cold = -MiningAPI.cold
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 9f3c009e57f6..3b3b6448b368 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -372,9 +372,9 @@ private fun getWinterLines() = buildList {
 }
 
 private fun getWinterShowWhen(): Boolean = getSbLines().any {
-    ScoreboardPattern.winterEventStartPattern.matches(it)
-        || (ScoreboardPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!"))
-        || ScoreboardPattern.winterWavePattern.matches(it)
+    ScoreboardPattern.winterEventStartPattern.matches(it) ||
+        (ScoreboardPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!")) ||
+        ScoreboardPattern.winterWavePattern.matches(it)
 }
 
 private fun getNewYearLines() = listOf(getSbLines().first { SbPattern.newYearPattern.matches(it) })
@@ -444,8 +444,8 @@ private fun getBroodmotherLines(): List<String> =
 
 private fun getMiningEventsLines() = buildList {
     // Wind
-    if (getSbLines().any { SbPattern.windCompassPattern.matches(it) }
-        && getSbLines().any { SbPattern.windCompassArrowPattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.windCompassPattern.matches(it) } &&
+        getSbLines().any { SbPattern.windCompassArrowPattern.matches(it) }) {
         add(getSbLines().first { SbPattern.windCompassPattern.matches(it) })
         add("| ${getSbLines().first { SbPattern.windCompassArrowPattern.matches(it) }} §f|")
     }
@@ -457,15 +457,15 @@ private fun getMiningEventsLines() = buildList {
     }
 
     // Zone Events
-    if (getSbLines().any { SbPattern.miningEventPattern.matches(it) }
-        && getSbLines().any { SbPattern.miningEventZonePattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.miningEventPattern.matches(it) } &&
+        getSbLines().any { SbPattern.miningEventZonePattern.matches(it) }) {
         add(getSbLines().first { SbPattern.miningEventPattern.matches(it) }.removePrefix("Event: "))
         add("in ${getSbLines().first { SbPattern.miningEventZonePattern.matches(it) }.removePrefix("Zone: ")}")
     }
 
     // Zone Events but no Zone Line
-    if (getSbLines().any { SbPattern.miningEventPattern.matches(it) }
-        && getSbLines().none { SbPattern.miningEventZonePattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.miningEventPattern.matches(it) } &&
+        getSbLines().none { SbPattern.miningEventZonePattern.matches(it) }) {
         add(
             getSbLines().first { SbPattern.miningEventPattern.matches(it) }
                 .removePrefix("Event: "),
@@ -473,22 +473,22 @@ private fun getMiningEventsLines() = buildList {
     }
 
     // Mithril Gourmand
-    if (getSbLines().any { SbPattern.mithrilRemainingPattern.matches(it) }
-        && getSbLines().any { SbPattern.mithrilYourMithrilPattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.mithrilRemainingPattern.matches(it) } &&
+        getSbLines().any { SbPattern.mithrilYourMithrilPattern.matches(it) }) {
         add(getSbLines().first { SbPattern.mithrilRemainingPattern.matches(it) })
         add(getSbLines().first { SbPattern.mithrilYourMithrilPattern.matches(it) })
     }
 
     // Raffle
-    if (getSbLines().any { SbPattern.raffleTicketsPattern.matches(it) }
-        && getSbLines().any { SbPattern.rafflePoolPattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.raffleTicketsPattern.matches(it) } &&
+        getSbLines().any { SbPattern.rafflePoolPattern.matches(it) }) {
         add(getSbLines().first { SbPattern.raffleTicketsPattern.matches(it) })
         add(getSbLines().first { SbPattern.rafflePoolPattern.matches(it) })
     }
 
     // Raid
-    if (getSbLines().any { SbPattern.yourGoblinKillsPattern.matches(it) }
-        && getSbLines().any { SbPattern.remainingGoblinPattern.matches(it) }) {
+    if (getSbLines().any { SbPattern.yourGoblinKillsPattern.matches(it) } &&
+        getSbLines().any { SbPattern.remainingGoblinPattern.matches(it) }) {
         add(getSbLines().first { SbPattern.yourGoblinKillsPattern.matches(it) })
         add(getSbLines().first { SbPattern.remainingGoblinPattern.matches(it) })
     }
@@ -509,17 +509,17 @@ private fun getDamageLines(): List<String> =
         (getSbLines().first { SbPattern.bossDamagePattern.matches(it) })
 
 private fun getDamageShowWhen(): Boolean =
-    getSbLines().any { SbPattern.bossHPPattern.matches(it) }
-        && getSbLines().any { SbPattern.bossDamagePattern.matches(it) }
+    getSbLines().any { SbPattern.bossHPPattern.matches(it) } &&
+        getSbLines().any { SbPattern.bossDamagePattern.matches(it) }
 
 private fun getMagmaBossLines() = getSbLines().filter { line ->
-    SbPattern.magmaBossPattern.matches(line)
-        || SbPattern.damageSoakedPattern.matches(line)
-        || SbPattern.killMagmasPattern.matches(line)
-        || SbPattern.killMagmasDamagedSoakedBarPattern.matches(line)
-        || SbPattern.reformingPattern.matches(line)
-        || SbPattern.bossHealthPattern.matches(line)
-        || SbPattern.bossHealthBarPattern.matches(line)
+    SbPattern.magmaBossPattern.matches(line) ||
+        SbPattern.damageSoakedPattern.matches(line) ||
+        SbPattern.killMagmasPattern.matches(line) ||
+        SbPattern.killMagmasDamagedSoakedBarPattern.matches(line) ||
+        SbPattern.reformingPattern.matches(line) ||
+        SbPattern.bossHealthPattern.matches(line) ||
+        SbPattern.bossHealthBarPattern.matches(line)
 }
 
 private fun getMagmaBossShowWhen(): Boolean = SbPattern.magmaChamberPattern.matches(HypixelData.skyBlockArea)
@@ -542,15 +542,15 @@ private fun getCarnivalLines() = listOf(
 private fun getCarnivalShowWhen(): Boolean = SbPattern.carnivalPattern.anyMatches(getSbLines())
 
 private fun getRiftLines() = getSbLines().filter { line ->
-    RiftBloodEffigies.heartsPattern.matches(line)
-        || SbPattern.riftHotdogTitlePattern.matches(line)
-        || SbPattern.timeLeftPattern.matches(line)
-        || SbPattern.riftHotdogEatenPattern.matches(line)
-        || SbPattern.riftAveikxPattern.matches(line)
-        || SbPattern.riftHayEatenPattern.matches(line)
-        || SbPattern.cluesPattern.matches(line)
-        || SbPattern.barryProtestorsQuestlinePattern.matches(line)
-        || SbPattern.barryProtestorsHandledPattern.matches(line)
+    RiftBloodEffigies.heartsPattern.matches(line) ||
+        SbPattern.riftHotdogTitlePattern.matches(line) ||
+        SbPattern.timeLeftPattern.matches(line) ||
+        SbPattern.riftHotdogEatenPattern.matches(line) ||
+        SbPattern.riftAveikxPattern.matches(line) ||
+        SbPattern.riftHayEatenPattern.matches(line) ||
+        SbPattern.cluesPattern.matches(line) ||
+        SbPattern.barryProtestorsQuestlinePattern.matches(line) ||
+        SbPattern.barryProtestorsHandledPattern.matches(line)
 }
 
 private fun getEssenceLines(): List<String> = listOf(getSbLines().first { SbPattern.essencePattern.matches(it) })
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index fa693f648dbc..38612f29703b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -16,128 +16,130 @@ object UnknownLinesHandler {
 
     internal lateinit var remoteOnlyPatterns: Array<Pattern>
 
+    /**
+     * Remove known lines with patterns
+     **/
+    private val patternsToExclude = mutableListOf(
+        PurseAPI.coinsPattern,
+        SbPattern.motesPattern,
+        BitsAPI.bitsScoreboardPattern,
+        SbPattern.heatPattern,
+        SbPattern.copperPattern,
+        SbPattern.locationPattern,
+        SbPattern.lobbyCodePattern,
+        SbPattern.datePattern,
+        SbPattern.timePattern,
+        SbPattern.footerPattern,
+        SbPattern.yearVotesPattern,
+        SbPattern.votesPattern,
+        SbPattern.waitingForVotePattern,
+        SbPattern.northstarsPattern,
+        SbPattern.profileTypePattern,
+        SbPattern.autoClosingPattern,
+        SbPattern.startingInPattern,
+        SbPattern.timeElapsedPattern,
+        SbPattern.instanceShutdownPattern,
+        SbPattern.keysPattern,
+        SbPattern.clearedPattern,
+        SbPattern.soloPattern,
+        SbPattern.teammatesPattern,
+        SbPattern.floor3GuardiansPattern,
+        SbPattern.m7dragonsPattern,
+        SbPattern.wavePattern,
+        SbPattern.tokensPattern,
+        SbPattern.submergesPattern,
+        SbPattern.medalsPattern,
+        SbPattern.lockedPattern,
+        SbPattern.cleanUpPattern,
+        SbPattern.pastingPattern,
+        SbPattern.peltsPattern,
+        SbPattern.mobLocationPattern,
+        SbPattern.jacobsContestPattern,
+        SbPattern.plotPattern,
+        SbPattern.powderGreedyPattern,
+        SbPattern.windCompassPattern,
+        SbPattern.windCompassArrowPattern,
+        SbPattern.miningEventPattern,
+        SbPattern.miningEventZonePattern,
+        SbPattern.raffleUselessPattern,
+        SbPattern.raffleTicketsPattern,
+        SbPattern.rafflePoolPattern,
+        SbPattern.mithrilUselessPattern,
+        SbPattern.mithrilRemainingPattern,
+        SbPattern.mithrilYourMithrilPattern,
+        SbPattern.nearbyPlayersPattern,
+        SbPattern.uselessGoblinPattern,
+        SbPattern.remainingGoblinPattern,
+        SbPattern.yourGoblinKillsPattern,
+        SbPattern.magmaBossPattern,
+        SbPattern.damageSoakedPattern,
+        SbPattern.killMagmasPattern,
+        SbPattern.killMagmasDamagedSoakedBarPattern,
+        SbPattern.reformingPattern,
+        SbPattern.bossHealthPattern,
+        SbPattern.bossHealthBarPattern,
+        SbPattern.broodmotherPattern,
+        SbPattern.bossHPPattern,
+        SbPattern.bossDamagePattern,
+        SbPattern.slayerQuestPattern,
+        SbPattern.essencePattern,
+        SbPattern.redstonePattern,
+        SbPattern.anniversaryPattern,
+        SbPattern.visitingPattern,
+        SbPattern.flightDurationPattern,
+        SbPattern.dojoChallengePattern,
+        SbPattern.dojoDifficultyPattern,
+        SbPattern.dojoPointsPattern,
+        SbPattern.dojoTimePattern,
+        SbPattern.objectivePattern,
+        ServerRestartTitle.restartingGreedyPattern,
+        SbPattern.travelingZooPattern,
+        SbPattern.newYearPattern,
+        SbPattern.spookyPattern,
+        SbPattern.winterEventStartPattern,
+        SbPattern.winterNextWavePattern,
+        SbPattern.winterWavePattern,
+        SbPattern.winterMagmaLeftPattern,
+        SbPattern.winterTotalDmgPattern,
+        SbPattern.winterCubeDmgPattern,
+        SbPattern.riftDimensionPattern,
+        RiftBloodEffigies.heartsPattern,
+        SbPattern.wtfAreThoseLinesPattern,
+        SbPattern.timeLeftPattern,
+        SbPattern.darkAuctionCurrentItemPattern,
+        SbPattern.coldPattern,
+        SbPattern.riftHotdogTitlePattern,
+        SbPattern.riftHotdogEatenPattern,
+        SbPattern.mineshaftNotStartedPattern,
+        SbPattern.queuePattern,
+        SbPattern.queueTierPattern,
+        SbPattern.queuePositionPattern,
+        SbPattern.fortunateFreezingBonusPattern,
+        SbPattern.riftAveikxPattern,
+        SbPattern.riftHayEatenPattern,
+        SbPattern.fossilDustPattern,
+        SbPattern.cluesPattern,
+        SbPattern.barryProtestorsQuestlinePattern,
+        SbPattern.barryProtestorsHandledPattern,
+        SbPattern.carnivalPattern,
+        SbPattern.carnivalTasksPattern,
+        SbPattern.carnivalTokensPattern,
+        SbPattern.carnivalFruitsPattern,
+        SbPattern.carnivalScorePattern,
+        SbPattern.carnivalCatchStreakPattern,
+        SbPattern.carnivalAccuracyPattern,
+        SbPattern.carnivalKillsPattern,
+    )
+    private var remoteOnlyPatternsAdded = false
+
     fun handleUnknownLines() {
         val sidebarLines = CustomScoreboard.activeLines
 
         var unknownLines = sidebarLines.map { it.removeResets() }.filter { it.isNotBlank() }.filter { it.trim().length > 3 }
 
-        /**
-         * Remove known lines with patterns
-         **/
-        val patternsToExclude = mutableListOf(
-            PurseAPI.coinsPattern,
-            SbPattern.motesPattern,
-            BitsAPI.bitsScoreboardPattern,
-            SbPattern.heatPattern,
-            SbPattern.copperPattern,
-            SbPattern.locationPattern,
-            SbPattern.lobbyCodePattern,
-            SbPattern.datePattern,
-            SbPattern.timePattern,
-            SbPattern.footerPattern,
-            SbPattern.yearVotesPattern,
-            SbPattern.votesPattern,
-            SbPattern.waitingForVotePattern,
-            SbPattern.northstarsPattern,
-            SbPattern.profileTypePattern,
-            SbPattern.autoClosingPattern,
-            SbPattern.startingInPattern,
-            SbPattern.timeElapsedPattern,
-            SbPattern.instanceShutdownPattern,
-            SbPattern.keysPattern,
-            SbPattern.clearedPattern,
-            SbPattern.soloPattern,
-            SbPattern.teammatesPattern,
-            SbPattern.floor3GuardiansPattern,
-            SbPattern.m7dragonsPattern,
-            SbPattern.wavePattern,
-            SbPattern.tokensPattern,
-            SbPattern.submergesPattern,
-            SbPattern.medalsPattern,
-            SbPattern.lockedPattern,
-            SbPattern.cleanUpPattern,
-            SbPattern.pastingPattern,
-            SbPattern.peltsPattern,
-            SbPattern.mobLocationPattern,
-            SbPattern.jacobsContestPattern,
-            SbPattern.plotPattern,
-            SbPattern.powderGreedyPattern,
-            SbPattern.windCompassPattern,
-            SbPattern.windCompassArrowPattern,
-            SbPattern.miningEventPattern,
-            SbPattern.miningEventZonePattern,
-            SbPattern.raffleUselessPattern,
-            SbPattern.raffleTicketsPattern,
-            SbPattern.rafflePoolPattern,
-            SbPattern.mithrilUselessPattern,
-            SbPattern.mithrilRemainingPattern,
-            SbPattern.mithrilYourMithrilPattern,
-            SbPattern.nearbyPlayersPattern,
-            SbPattern.uselessGoblinPattern,
-            SbPattern.remainingGoblinPattern,
-            SbPattern.yourGoblinKillsPattern,
-            SbPattern.magmaBossPattern,
-            SbPattern.damageSoakedPattern,
-            SbPattern.killMagmasPattern,
-            SbPattern.killMagmasDamagedSoakedBarPattern,
-            SbPattern.reformingPattern,
-            SbPattern.bossHealthPattern,
-            SbPattern.bossHealthBarPattern,
-            SbPattern.broodmotherPattern,
-            SbPattern.bossHPPattern,
-            SbPattern.bossDamagePattern,
-            SbPattern.slayerQuestPattern,
-            SbPattern.essencePattern,
-            SbPattern.redstonePattern,
-            SbPattern.anniversaryPattern,
-            SbPattern.visitingPattern,
-            SbPattern.flightDurationPattern,
-            SbPattern.dojoChallengePattern,
-            SbPattern.dojoDifficultyPattern,
-            SbPattern.dojoPointsPattern,
-            SbPattern.dojoTimePattern,
-            SbPattern.objectivePattern,
-            ServerRestartTitle.restartingGreedyPattern,
-            SbPattern.travelingZooPattern,
-            SbPattern.newYearPattern,
-            SbPattern.spookyPattern,
-            SbPattern.winterEventStartPattern,
-            SbPattern.winterNextWavePattern,
-            SbPattern.winterWavePattern,
-            SbPattern.winterMagmaLeftPattern,
-            SbPattern.winterTotalDmgPattern,
-            SbPattern.winterCubeDmgPattern,
-            SbPattern.riftDimensionPattern,
-            RiftBloodEffigies.heartsPattern,
-            SbPattern.wtfAreThoseLinesPattern,
-            SbPattern.timeLeftPattern,
-            SbPattern.darkAuctionCurrentItemPattern,
-            SbPattern.coldPattern,
-            SbPattern.riftHotdogTitlePattern,
-            SbPattern.riftHotdogEatenPattern,
-            SbPattern.mineshaftNotStartedPattern,
-            SbPattern.queuePattern,
-            SbPattern.queueTierPattern,
-            SbPattern.queuePositionPattern,
-            SbPattern.fortunateFreezingBonusPattern,
-            SbPattern.riftAveikxPattern,
-            SbPattern.riftHayEatenPattern,
-            SbPattern.fossilDustPattern,
-            SbPattern.cluesPattern,
-            SbPattern.barryProtestorsQuestlinePattern,
-            SbPattern.barryProtestorsHandledPattern,
-            SbPattern.carnivalPattern,
-            SbPattern.carnivalTasksPattern,
-            SbPattern.carnivalTokensPattern,
-            SbPattern.carnivalFruitsPattern,
-            SbPattern.carnivalScorePattern,
-            SbPattern.carnivalCatchStreakPattern,
-            SbPattern.carnivalAccuracyPattern,
-            SbPattern.carnivalKillsPattern,
-        )
-
-        if (::remoteOnlyPatterns.isInitialized) {
+        if (::remoteOnlyPatterns.isInitialized && !remoteOnlyPatternsAdded) {
             patternsToExclude.addAll(remoteOnlyPatterns)
+            remoteOnlyPatternsAdded = true
         }
 
         unknownLines = unknownLines.filterNot { line ->
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
index b1ee566598b3..cb3102ca8eed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
@@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
 
-@SkyHanniModule
 // TODO important: all use cases of listOf in combination with string needs to be gone. no caching, constant new list creation, and bad design.
+@SkyHanniModule
 object SuperpairExperimentInformationDisplay {
 
     private val config get() = SkyHanniMod.feature.inventory.experimentationTable
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
index ef99c40bab97..6c35eb5b1e8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
@@ -47,13 +47,12 @@ object SuperpairsClicksAlert {
         if (!targetInventoryNames.any { event.inventoryName.contains(it) }) return
 
         if ( // checks if we have succeeded in either minigame
-            (event.inventoryName.contains("Chronomatron")
-                && ((event.inventoryItems[4]?.displayName?.removeColor()
+            (event.inventoryName.contains("Chronomatron") &&
+                ((event.inventoryItems[4]?.displayName?.removeColor()
                 ?.let { currentRoundRegex.find(it) }
-                ?.groups?.get(1)?.value?.toInt() ?: -1) > roundsNeeded))
-
-            || (event.inventoryName.contains("Ultrasequencer")
-                && event.inventoryItems.entries
+                ?.groups?.get(1)?.value?.toInt() ?: -1) > roundsNeeded)) ||
+            (event.inventoryName.contains("Ultrasequencer") &&
+                event.inventoryItems.entries
                 .filter { it.key < 45 }
                 .any { it.value.stackSize > roundsNeeded })
         ) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index 5748220c5e38..5abf8679a9fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -364,8 +364,8 @@ object ItemAbilityCooldown {
         if (message == "§dCreeper Veil §r§aActivated!") {
             ItemAbility.WITHER_CLOAK.activate(LorenzColor.LIGHT_PURPLE)
         }
-        if (message == "§dCreeper Veil §r§cDe-activated! §r§8(Expired)"
-            || message == "§cNot enough mana! §r§dCreeper Veil §r§cDe-activated!"
+        if (message == "§dCreeper Veil §r§cDe-activated! §r§8(Expired)" ||
+            message == "§cNot enough mana! §r§dCreeper Veil §r§cDe-activated!"
         ) {
             ItemAbility.WITHER_CLOAK.activate()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
index 94b292fdf511..057d2f476948 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
@@ -103,8 +103,8 @@ object KingTalismanHelper {
         skyblockYear = SkyBlockTime.now().year
     }
 
-    fun isEnabled() = config.enabled && LorenzUtils.inSkyBlock
-        && (IslandType.DWARVEN_MINES.isInIsland() || config.outsideMines)
+    fun isEnabled() = config.enabled && LorenzUtils.inSkyBlock &&
+        (IslandType.DWARVEN_MINES.isInIsland() || config.outsideMines)
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 05b1eaf35853..d5129a5fb420 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -78,8 +78,8 @@ object MarkedPlayerManager {
 
     fun isMarkedPlayer(player: String): Boolean = player.lowercase() in playerNamesToMark
 
-    private fun isEnabled() = (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected())
-        && config.highlightInWorld
+    private fun isEnabled() = (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected()) &&
+        config.highlightInWorld
 
     fun replaceInChat(string: String): String {
         if (!config.highlightInChat) return string
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index fddb5bbda722..3f56230c476e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -62,6 +62,8 @@ import io.github.notenoughupdates.moulconfig.observer.Property
 import net.minecraft.item.ItemStack
 import java.util.Locale
 
+// TODO split into smaler sub classes
+@Suppress("LargeClass")
 object EstimatedItemValueCalculator {
 
     private val config get() = SkyHanniMod.feature.inventory.estimatedItemValues
@@ -129,12 +131,13 @@ object EstimatedItemValueCalculator {
         return Pair(totalPrice, basePrice)
     }
 
-    private fun isKuudraSet(internalName: String) = (kuudraSets.any { internalName.contains(it) } && listOf(
-        "CHESTPLATE",
-        "LEGGINGS",
-        "HELMET",
-        "BOOTS",
-    ).any { internalName.endsWith(it) })
+    private fun isKuudraSet(internalName: String) = (kuudraSets.any { internalName.contains(it) } &&
+        listOf(
+            "CHESTPLATE",
+            "LEGGINGS",
+            "HELMET",
+            "BOOTS",
+        ).any { internalName.endsWith(it) })
 
     private fun addAttributeCost(stack: ItemStack, list: MutableList<String>): Double {
         val attributes = stack.getAttributes() ?: return 0.0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
index bbe40db5cd4a..1ebbaed684cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
@@ -81,8 +81,8 @@ class DefaultConfigOptionGui(
         fun button(title: String, tooltip: List<String>, func: () -> Unit) {
             val width = mc.fontRendererObj.getStringWidth(title)
             var overMouse = false
-            if (mouseX - ((this.width - xSize) / 2 + padding) in i..(i + width)
-                && mouseY - (height + ySize) / 2 in -barSize..0
+            if (mouseX - ((this.width - xSize) / 2 + padding) in i..(i + width) &&
+                mouseY - (height + ySize) / 2 in -barSize..0
             ) {
                 overMouse = true
                 hoveringTextToDraw = tooltip
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt
index 8999ba074941..8f7551573665 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/ModifyVisualWords.kt
@@ -54,7 +54,7 @@ object ModifyVisualWords {
                     it.groupValues[1] + it.groupValues[2].reversed()
                 }
             }
-            */
+             */
             modifiedText
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 4ff57d73d263..77807e5bf176 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -38,8 +38,8 @@ object VoltHighlighter {
     fun onArmorChange(event: EntityEquipmentChangeEvent) {
         if (!RiftAPI.inRift() || !config.voltWarning) return
         val player = Minecraft.getMinecraft().thePlayer ?: return
-        if (event.isHead && getVoltState(event.entity) == VoltState.DOING_LIGHTNING
-            && event.entity.positionVector.squareDistanceTo(player.positionVector) <= LIGHTNING_DISTANCE * LIGHTNING_DISTANCE
+        if (event.isHead && getVoltState(event.entity) == VoltState.DOING_LIGHTNING &&
+            event.entity.positionVector.squareDistanceTo(player.positionVector) <= LIGHTNING_DISTANCE * LIGHTNING_DISTANCE
         ) {
             chargingSince = chargingSince.editCopy {
                 this[event.entity] = SimpleTimeMark.now()
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index 34bf36b5fbbf..32cacc6292e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -274,6 +274,7 @@ object SkyHanniConfigSearchResetCommand {
             val fieldName = "$parentName.$name"
             val newObj = field.makeAccessible().get(obj)
             map[fieldName] = newObj
+            @Suppress("ComplexCondition")
             if (newObj != null && newObj !is Boolean && newObj !is String && newObj !is Long && newObj !is Int && newObj !is Double && newObj !is Position && !newObj.javaClass.isEnum) {
                 map.putAll(loadAllFields(fieldName, newObj, depth + 1))
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 12791115c98c..540dc7fa2b62 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -493,7 +493,8 @@ object SkyHanniDebugsAndTests {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
-        @Suppress("ConstantConditionIf") if (false) {
+        @Suppress("ConstantConditionIf")
+        if (false) {
             itemRenderDebug()
         }
 
@@ -528,7 +529,8 @@ object SkyHanniDebugsAndTests {
 
     @SubscribeEvent
     fun onGuiRenderChestGuiOverlayRender(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
-        @Suppress("ConstantConditionIf") if (false) {
+        @Suppress("ConstantConditionIf")
+        if (false) {
             dragAbleTest()
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index fd240b1457b9..7ff17f96506b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -61,8 +61,8 @@ object InventoryUtils {
         getItemsInOwnInventory().filter { predicate(it) }.sumOf { it.stackSize }
 
     fun inStorage() = openInventoryName().let {
-        (it.contains("Storage") && !it.contains("Rift Storage"))
-            || it.contains("Ender Chest") || it.contains("Backpack")
+        (it.contains("Storage") && !it.contains("Rift Storage")) ||
+            it.contains("Ender Chest") || it.contains("Backpack")
     }
 
     fun getItemInHand(): ItemStack? = Minecraft.getMinecraft().thePlayer.heldItem
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
index 996d19a938ed..e3776308f246 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
@@ -100,9 +100,9 @@ object ItemNameResolver {
         UtilsPatterns.enchantmentNamePattern.matchMatcher(enchantmentName) {
             val name = group("name").trim { it <= ' ' }
             val ultimate = group("format").lowercase().contains("§l")
-                ((if (ultimate && name != "Ultimate Wise" && name != "Ultimate Jerry") "ULTIMATE_" else "")
-                + turboCheck(name).replace(" ", "_").replace("-", "_").uppercase()
-                + ";" + group("level").romanToDecimal())
+                ((if (ultimate && name != "Ultimate Wise" && name != "Ultimate Jerry") "ULTIMATE_" else "") +
+                    turboCheck(name).replace(" ", "_").replace("-", "_").uppercase() +
+                    ";" + group("level").romanToDecimal())
         }
 
     private fun turboCheck(text: String): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
index dde61c7c1917..19e912215df2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
@@ -14,6 +14,7 @@ import org.apache.logging.log4j.core.LoggerContext
 import org.apache.logging.log4j.core.filter.AbstractFilter
 import org.apache.logging.log4j.message.Message
 
+@Suppress("CommentWrapping")
 class MinecraftConsoleFilter(private val loggerConfigName: String) : AbstractFilter(
     /* onMatch = */ Filter.Result.ACCEPT,
     /* onMismatch = */ Filter.Result.DENY,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 609ccebae24b..805db90f5313 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -52,6 +52,7 @@ import kotlin.math.sqrt
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
 
+@Suppress("LargeClass")
 object RenderUtils {
 
     enum class HorizontalAlignment(private val value: String) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/ItemStackTypeAdapter.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/ItemStackTypeAdapterFactory.kt
similarity index 100%
rename from src/main/java/at/hannibal2/skyhanni/utils/json/ItemStackTypeAdapter.kt
rename to src/main/java/at/hannibal2/skyhanni/utils/json/ItemStackTypeAdapterFactory.kt

From a610f68b510837789e6e375749e3a1afa324efcb Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:36:00 +0200
Subject: [PATCH 570/721] Improvement: Blaze Slayer Flares cooldown (#2601)

---
 .../abilitycooldown/ItemAbility.kt            |  4 ++-
 .../abilitycooldown/ItemAbilityCooldown.kt    | 25 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index 020feba76976..68f9798c309b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -29,6 +29,8 @@ enum class ItemAbility(
     ATOMSPLIT_KATANA(4, "VORPAL_KATANA", "VOIDEDGE_KATANA", ignoreMageCooldownReduction = true),
     RAGNAROCK_AXE(20),
     WAND_OF_ATONEMENT(7, "WAND_OF_HEALING", "WAND_OF_MENDING", "WAND_OF_RESTORATION"),
+    SOS_FLARE(10),
+    ALERT_FLARE(20, "WARNING_FLARE"),
 
     GOLEM_SWORD(3),
     END_STONE_SWORD(5),
@@ -75,7 +77,7 @@ enum class ItemAbility(
         cooldownInSeconds,
         actionBarDetection = false,
         alternativePosition = alternativePosition,
-        ignoreMageCooldownReduction = ignoreMageCooldownReduction
+        ignoreMageCooldownReduction = ignoreMageCooldownReduction,
     ) {
         newVariant = true
         alternateInternalNames.forEach {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index 5abf8679a9fe..7715f7456055 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -44,11 +44,11 @@ object ItemAbilityCooldown {
     private val patternGroup = RepoPattern.group("item.abilities.cooldown")
     private val youAlignedOthersPattern by patternGroup.pattern(
         "alignedother",
-        "§eYou aligned §r§a.* §r§eother player(s)?!"
+        "§eYou aligned §r§a.* §r§eother player(s)?!",
     )
     private val youBuffedYourselfPattern by patternGroup.pattern(
         "buffedyourself",
-        "§aYou buffed yourself for §r§c\\+\\d+❁ Strength"
+        "§aYou buffed yourself for §r§c\\+\\d+❁ Strength",
     )
 
     private var lastAbility = ""
@@ -57,6 +57,10 @@ object ItemAbilityCooldown {
     private val WEIRD_TUBA = "WEIRD_TUBA".asInternalName()
     private val WEIRDER_TUBA = "WEIRDER_TUBA".asInternalName()
     private val VOODOO_DOLL_WILTED = "VOODOO_DOLL_WILTED".asInternalName()
+    private val WARNING_FLARE = "WARNING_FLARE".asInternalName()
+    private val ALERT_FLARE = "ALERT_FLARE".asInternalName()
+    private val SOS_FLARE = "SOS_FLARE".asInternalName()
+
 
     @SubscribeEvent
     fun onPlaySound(event: PlaySoundEvent) {
@@ -87,7 +91,7 @@ object ItemAbilityCooldown {
                     val internalName = InventoryUtils.getItemInHand()?.getInternalName() ?: return
                     if (!internalName.equalsOneOf(
                             "SHADOW_FURY".asInternalName(),
-                            "STARRED_SHADOW_FURY".asInternalName()
+                            "STARRED_SHADOW_FURY".asInternalName(),
                         )
                     ) return
 
@@ -175,7 +179,7 @@ object ItemAbilityCooldown {
             event.soundName == "mob.bat.idle" && event.pitch == 0.4920635f && event.volume == 1.0f -> {
                 ItemAbility.ROYAL_PIGEON.sound()
             }
-
+            // Wand of Strength
             event.soundName == "random.eat" && event.pitch == 0.4920635f && event.volume == 1.0f -> {
                 ItemAbility.WAND_OF_STRENGTH.sound()
             }
@@ -183,9 +187,20 @@ object ItemAbilityCooldown {
             event.soundName == "fire.ignite" && event.pitch == 0.74603176f && event.volume == 1.0f -> {
                 ItemAbility.TACTICAL_INSERTION.activate(LorenzColor.DARK_PURPLE, 3_000)
             }
+
             event.soundName == "mob.zombie.remedy" && event.pitch == 1.8888888f && event.volume == 0.7f -> {
                 ItemAbility.TACTICAL_INSERTION.activate(null, 17_000)
             }
+            // Blaze Slayer Flares
+            event.soundName == "fireworks.launch" && event.pitch == 1.0f && event.volume == 3.0f -> {
+                val recent = InventoryUtils.recentItemsInHand.values
+                if (WARNING_FLARE in recent || ALERT_FLARE in recent) {
+                    ItemAbility.ALERT_FLARE.sound()
+                }
+                if (SOS_FLARE in recent) {
+                    ItemAbility.SOS_FLARE.sound()
+                }
+            }
         }
     }
 
@@ -276,7 +291,7 @@ object ItemAbilityCooldown {
         items = abilityItems.entries.associateByTo(
             mutableMapOf(),
             { it.key.getIdentifier() },
-            { kp -> kp.value.map { createItemText(it) } }
+            { kp -> kp.value.map { createItemText(it) } },
         ).mapKeysNotNull { it.key }
 
     }

From f4419b8c77926fd160a04e5b888864e91ee17b0d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:38:11 +0200
Subject: [PATCH 571/721] abstracted navigation rerouting (#2597)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/data/IslandGraphs.kt   | 228 +++++++++++++++---
 .../at/hannibal2/skyhanni/data/model/Graph.kt |  76 +-----
 .../event/hoppity/HoppityEggLocator.kt        |   4 +-
 .../features/event/hoppity/HoppityNpc.kt      |   5 +-
 .../skyhanni/features/mining/TunnelsMaps.kt   |  11 +-
 .../skyhanni/features/misc/IslandAreas.kt     |  18 +-
 .../misc/pathfind/NavigationHelper.kt         |   8 +-
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |   3 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   2 +-
 .../skyhanni/test/graph/GraphEditor.kt        |   5 +-
 .../test/graph/GraphEditorBugFinder.kt        |  27 ++-
 .../at/hannibal2/skyhanni/utils/GraphUtils.kt |  71 +++++-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  16 +-
 13 files changed, 332 insertions(+), 142 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 1f8e45afb749..bd417e5f75ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -4,8 +4,8 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
-import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
 import at.hannibal2.skyhanni.data.repo.RepoUtils
+import at.hannibal2.skyhanni.events.EntityMoveEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -14,8 +14,10 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent
 import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
@@ -24,11 +26,16 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DPathWithWaypoint
-import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.chat.Text.asComponent
+import at.hannibal2.skyhanni.utils.chat.Text.hover
+import at.hannibal2.skyhanni.utils.chat.Text.onClick
+import at.hannibal2.skyhanni.utils.chat.Text.send
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import java.io.File
@@ -98,9 +105,16 @@ object IslandGraphs {
     val existsForThisIsland get() = currentIslandGraph != null
 
     var closedNote: GraphNode? = null
+    var secondClosedNote: GraphNode? = null
 
     private var currentTarget: LorenzVec? = null
+    private var currentTargetNode: GraphNode? = null
+    private var label = ""
+    private var distanceViaNodes = 0.0
+    private var distanceToNextNode = 0.0
+    private var totalDistance = 0.0
     private var color = Color.WHITE
+    private var shouldAllowRerouting = false
     private var showGoalExact = false
     private var onFound: () -> Unit = {}
     private var goal: GraphNode? = null
@@ -143,6 +157,9 @@ object IslandGraphs {
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
         currentIslandGraph = null
+        if (currentTarget != null) {
+            "§e[SkyHanni] Navigation stopped because of world switch!".asComponent().send(PATHFIND_ID)
+        }
         reset()
     }
 
@@ -188,11 +205,11 @@ object IslandGraphs {
         }
 
         val graph = RepoUtils.getConstant(SkyHanniMod.repo.repoLocation, constant, Graph.gson, Graph::class.java)
+        IslandAreas.display = null
         setNewGraph(graph)
     }
 
     fun setNewGraph(graph: Graph) {
-        IslandAreas.display = null
         reset()
         currentIslandGraph = graph
 
@@ -205,26 +222,26 @@ object IslandGraphs {
     }
 
     private fun reset() {
+        stop()
         closedNote = null
-        currentTarget = null
-        goal = null
-        fastestPath = null
     }
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!LorenzUtils.inSkyBlock) return
         handleTick()
+        if (event.isMod(2)) {
+            checkMoved()
+        }
     }
 
     private fun handleTick() {
         val prevClosed = closedNote
 
-        val graph = currentIslandGraph ?: return
-
         currentTarget?.let {
             if (it.distanceToPlayer() < 3) {
                 onFound()
+                "§e[SkyHanni] Navigation reached §r$label§e!".asComponent().send(PATHFIND_ID)
                 reset()
             }
             if (!condition()) {
@@ -232,17 +249,44 @@ object IslandGraphs {
             }
         }
 
-        val newClosest = if (SkyHanniDebugsAndTests.c == 0.0) {
-            graph.minBy { it.position.distanceSqToPlayer() }
-        } else null
+        val graph = currentIslandGraph ?: return
+        val sortedNodes = graph.sortedBy { it.position.distanceSqToPlayer() }
+        val newClosest = sortedNodes.first()
         if (closedNote == newClosest) return
+        if (onCurrentPath()) return
+
         closedNote = newClosest
+        secondClosedNote = sortedNodes.getOrNull(1)
         onNewNote()
+        hasMoved = false
+        if (newClosest == prevClosed) return
+        findNewPath()
+    }
+
+    private fun onCurrentPath(): Boolean {
+        val path = fastestPath ?: return false
+        val closest = path.nodes.minBy { it.position.distanceSqToPlayer() }
+        val distance = closest.position.distanceToPlayer()
+        if (distance > 5) return false
+
+        if (distance < 3) {
+            val index = path.nodes.indexOf(closest)
+            val newNodes = path.drop(index)
+            val newGraph = Graph(newNodes)
+            fastestPath = newGraph
+            newNodes.getOrNull(1)?.let {
+                secondClosedNote = it
+            }
+            setFastestPath(newGraph to newGraph.totalLenght(), setPath = false)
+        }
+        return true
+    }
+
+    private fun findNewPath() {
+        val goal = IslandGraphs.goal ?: return
         val closest = closedNote ?: return
-        val goal = goal ?: return
-        if (closest == prevClosed) return
 
-        val (path, distance) = graph.findShortestPathAsGraphWithDistance(closest, goal)
+        val (path, distance) = GraphUtils.findShortestPathAsGraphWithDistance(closest, goal)
         val first = path.firstOrNull()
         val second = path.getOrNull(1)
 
@@ -260,64 +304,194 @@ object IslandGraphs {
         setFastestPath(path to (distance + nodeDistance))
     }
 
-    private fun setFastestPath(path: Pair<Graph, Double>) {
-        fastestPath = path.takeIf { it.first.isNotEmpty() }?.first
+    private fun Graph.totalLenght(): Double = nodes.zipWithNext().sumOf { (a, b) -> a.position.distance(b.position) }
+
+    private fun handlePositionChange() {
+        val secondClosestNode = secondClosedNote ?: return
+        distanceToNextNode = secondClosestNode.position.distanceToPlayer()
+        updateChat()
+    }
+
+    private var hasMoved = false
 
-        fastestPath?.let {
-            fastestPath = Graph(cutByMaxDistance(it.nodes, 3.0))
+    private fun checkMoved() {
+        if (hasMoved) {
+            hasMoved = false
+            if (goal != null) {
+                handlePositionChange()
+            }
         }
     }
 
+    @SubscribeEvent
+    fun onPlayerMove(event: EntityMoveEvent) {
+        if (LorenzUtils.inSkyBlock && event.entity == Minecraft.getMinecraft().thePlayer) {
+            hasMoved = true
+        }
+    }
+
+    private fun setFastestPath(path: Pair<Graph, Double>, setPath: Boolean = true) {
+        val (fastestPath, distance) = path.takeIf { it.first.isNotEmpty() } ?: return
+        val nodes = fastestPath.nodes.toMutableList()
+        if (Minecraft.getMinecraft().thePlayer.onGround) {
+            nodes.add(0, GraphNode(0, LocationUtils.playerLocation()))
+        }
+        if (setPath) {
+            this.fastestPath = Graph(cutByMaxDistance(nodes, 3.0))
+        }
+
+        val diff = fastestPath.getOrNull(1)?.let {
+            fastestPath.first().position.distance(it.position)
+        } ?: 0.0
+        this.distanceViaNodes = distance - diff
+        updateChat()
+    }
+
     private fun onNewNote() {
         // TODO create an event
         IslandAreas.noteMoved()
+        if (shouldAllowRerouting) {
+            tryRerouting()
+        }
+    }
+
+    private fun tryRerouting() {
+        val target = currentTargetNode ?: return
+        val closest = closedNote ?: return
+        val map = GraphUtils.findAllShortestDistances(closest).distances.filter { it.key.sameNameAndTags(target) }
+        val newTarget = map.sorted().keys.firstOrNull() ?: return
+        if (newTarget != target) {
+            ChatUtils.debug("Rerouting navigation..")
+            newTarget.pathFind(label, color, onFound, allowRerouting = true, condition)
+        }
     }
 
     fun stop() {
         currentTarget = null
         goal = null
         fastestPath = null
+        currentTargetNode = null
+        label = ""
+        distanceToNextNode = 0.0
+        distanceViaNodes = 0.0
+        totalDistance = 0.0
+    }
+
+    /**
+     * Activates pathfinding, with this graph node as goal.
+     *
+     * @param label The name of the naviation goal in chat.
+     * @param color The color of the lines in world.
+     * @param onFound The callback that gets fired when the goal is reached.
+     * @param allowRerouting When a different node with same name and tags as the origianl goal is closer to the player, starts routing to this instead.
+     * @param condition The pathfinding stops when the condition is no longer valid.
+     */
+    fun GraphNode.pathFind(
+        label: String,
+        color: Color = LorenzColor.WHITE.toColor(),
+        onFound: () -> Unit = {},
+        allowRerouting: Boolean = false,
+        condition: () -> Boolean = { true },
+    ) {
+        reset()
+        currentTargetNode = this
+        shouldAllowRerouting = allowRerouting
+        pathFind0(location = position, label, color, onFound, showGoalExact = false, condition)
     }
 
+    /**
+     * Activates pathfinding to a location in the island.
+     *
+     * @param location The goal of the pathfinder.
+     * @param label The name of the naviation goal in chat.
+     * @param color The color of the lines in world.
+     * @param onFound The callback that gets fired when the goal is reached.
+     * @param showGoalExact Wether the exact location should be shown as a waypoint, as well as shwoing a line from last node to the goal location.
+     * @param condition The pathfinding stops when the condition is no longer valid.
+     */
     fun pathFind(
         location: LorenzVec,
+        label: String,
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
         showGoalExact: Boolean = false,
         condition: () -> Boolean = { true },
     ) {
         reset()
+        shouldAllowRerouting = false
+        pathFind0(location, label, color, onFound, showGoalExact, condition)
+    }
+
+    private fun pathFind0(
+        location: LorenzVec,
+        label: String,
+        color: Color = LorenzColor.WHITE.toColor(),
+        onFound: () -> Unit = {},
+        showGoalExact: Boolean = false,
+        condition: () -> Boolean = { true },
+    ) {
         currentTarget = location
+        this.label = label
         this.color = color
         this.onFound = onFound
         this.showGoalExact = showGoalExact
         this.condition = condition
         val graph = currentIslandGraph ?: return
         goal = graph.minBy { it.position.distance(currentTarget!!) }
+        updateChat()
+    }
+
+    private const val PATHFIND_ID = -6457563
+
+    private fun updateChat() {
+        if (label == "") return
+        val finalDistance = distanceViaNodes + distanceToNextNode
+        if (finalDistance == 0.0) return
+        val distance = finalDistance.roundTo(1)
+        if (totalDistance == 0.0 || distance > totalDistance) {
+            totalDistance = distance
+        }
+        sendChatDistance(distance)
+    }
+
+    private fun sendChatDistance(distance: Double) {
+        val percentage = (1 - (distance / totalDistance)) * 100
+        val componentText = "§e[SkyHanni] Navigating to §r$label §f[§e$distance§f] §f(§c${percentage.roundTo(1)}%§f)".asComponent()
+        componentText.onClick(
+            onClick = {
+                stop()
+                "§e[SkyHanni] Navigation manually stopped!".asComponent().send(PATHFIND_ID)
+            },
+        )
+        componentText.hover = "§eClick to stop navigating!".asComponent()
+        componentText.send(PATHFIND_ID)
     }
 
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        val path = fastestPath ?: return
+        var path = fastestPath ?: return
 
-        var graph = path
-        graph = skipNodes(graph) ?: graph
+        if (path.nodes.size > 1) {
+            val hideNearby = if (Minecraft.getMinecraft().thePlayer.onGround) 5 else 7
+            path = Graph(path.nodes.takeLastWhile { it.position.distanceToPlayer() > hideNearby })
+        }
+//         graph = skipNodes(graph) ?: graph
 
         event.draw3DPathWithWaypoint(
-            graph,
+            path,
             color,
             6,
             true,
             bezierPoint = 2.0,
             textSize = 1.0,
+            markLastBlock = showGoalExact,
         )
-        val lastNode = graph.nodes.last().position
-        val targetLocation = currentTarget ?: return
-        event.draw3DLine(lastNode.add(0.5, 0.5, 0.5), targetLocation.add(0.5, 0.5, 0.5), color, 4, true)
 
         if (showGoalExact) {
-            event.drawWaypointFilled(targetLocation, color)
+            val targetLocation = currentTarget ?: return
+            val lastNode = path.nodes.last().position
+            event.draw3DLine(lastNode.add(0.5, 0.5, 0.5), targetLocation.add(0.5, 0.5, 0.5), color, 4, true)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index bc4be57a16d4..6e1f1d07f0a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data.model
 
+import at.hannibal2.skyhanni.features.misc.pathfind.NavigationHelper
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.json.SkyHanniTypeAdapters.registerTypeAdapter
@@ -8,7 +9,6 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonElement
 import com.google.gson.annotations.Expose
 import com.google.gson.stream.JsonToken
-import java.util.PriorityQueue
 
 // TODO: This class should be disambiguated into a NodePath and a Graph class
 @JvmInline
@@ -138,6 +138,10 @@ value class Graph(
         fun fromJson(json: String): Graph = gson.fromJson<Graph>(json)
         fun fromJson(json: JsonElement): Graph = gson.fromJson<Graph>(json)
     }
+
+    fun toPositionsList() = this.map { it.position }
+
+    fun toJson(): String = gson.toJson(this)
 }
 
 // The node object that gets parsed from/to json
@@ -164,9 +168,11 @@ class GraphNode(val id: Int, val position: LorenzVec, val name: String? = null,
 
         return true
     }
-}
 
-fun Graph.findShortestPathAsGraph(start: GraphNode, end: GraphNode): Graph = this.findShortestPathAsGraphWithDistance(start, end).first
+    fun sameNameAndTags(other: GraphNode): Boolean = name == other.name && allowedTags == other.allowedTags
+
+    private val allowedTags get() = tags.filter { it in NavigationHelper.allowedTags }
+}
 
 data class DijkstraTree(
     val origin: GraphNode,
@@ -188,57 +194,6 @@ data class DijkstraTree(
     val lastVisitedNode: GraphNode,
 )
 
-/**
- * Find a tree of distances to the [start] node using dijkstra's algorithm.
- */
-fun Graph.findDijkstraDistances(
-    start: GraphNode,
-    /**
-     * Bail out early before collecting all the distances to all nodes in the graph. This will not collect valid distance data for *all*
-     * nodes for which bailout matches, but only the closest one.
-     */
-    bailout: (GraphNode) -> Boolean,
-): DijkstraTree {
-    val distances = mutableMapOf<GraphNode, Double>()
-    val previous = mutableMapOf<GraphNode, GraphNode>()
-    val visited = mutableSetOf<GraphNode>()
-    val queue = PriorityQueue<GraphNode>(compareBy { distances.getOrDefault(it, Double.MAX_VALUE) })
-    var lastVisitedNode: GraphNode = start
-
-    distances[start] = 0.0
-    queue.add(start)
-
-    while (queue.isNotEmpty()) {
-        val current = queue.poll()
-        lastVisitedNode = current
-        if (bailout(current)) break
-
-        visited.add(current)
-
-        current.neighbours.forEach { (neighbour, weight) ->
-            if (neighbour !in visited) {
-                val newDistance = distances.getValue(current) + weight
-                if (newDistance < distances.getOrDefault(neighbour, Double.MAX_VALUE)) {
-                    distances[neighbour] = newDistance
-                    previous[neighbour] = current
-                    queue.add(neighbour)
-                }
-            }
-        }
-    }
-
-    return DijkstraTree(
-        start,
-        distances,
-        previous,
-        lastVisitedNode,
-    )
-}
-
-fun Graph.findAllShortestDistances(start: GraphNode): DijkstraTree {
-    return findDijkstraDistances(start) { false }
-}
-
 fun DijkstraTree.findPathToDestination(end: GraphNode): Pair<Graph, Double> {
     val distances = this
     val reversePath = buildList {
@@ -251,16 +206,3 @@ fun DijkstraTree.findPathToDestination(end: GraphNode): Pair<Graph, Double> {
     }
     return Graph(reversePath.reversed()) to distances.distances[end]!!
 }
-
-fun Graph.findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode): Pair<Graph, Double> {
-    val distances = findDijkstraDistances(start) { it == end }
-    return distances.findPathToDestination(end)
-}
-
-fun Graph.findShortestPath(start: GraphNode, end: GraphNode): List<LorenzVec> = this.findShortestPathAsGraph(start, end).toPositionsList()
-
-fun Graph.findShortestDistance(start: GraphNode, end: GraphNode): Double = this.findShortestPathAsGraphWithDistance(start, end).second
-
-fun Graph.toPositionsList() = this.map { it.position }
-
-fun Graph.toJson(): String = Graph.gson.toJson(this)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 468fecbcb480..dbe06fbf991f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -280,7 +280,7 @@ object HoppityEggLocator {
 
         val color = config.waypointColor.toChromaColor()
 
-        IslandGraphs.pathFind(location, color, condition = { config.showPathFinder })
+        IslandGraphs.pathFind(location, "Hoppity Egg", color, condition = { config.showPathFinder })
     }
 
     fun isValidEggLocation(location: LorenzVec): Boolean = HoppityEggLocations.islandLocations.any { it.distance(location) < 5.0 }
@@ -333,7 +333,7 @@ object HoppityEggLocator {
         HoppityEggLocations.apiEggLocations[LorenzUtils.skyBlockIsland]?.let {
             for ((i, location) in it.values.withIndex()) {
                 if (i == target) {
-                    IslandGraphs.pathFind(location)
+                    IslandGraphs.pathFind(location, "Hoppity Test")
                     return
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index 70e148aa9732..c120c3d649fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -58,7 +58,10 @@ object HoppityNpc {
             "New rabbits are available at §aHoppity's Shop§e!",
             config::hoppityShopReminder,
             actionName = "warp to hub",
-            action = { HypixelCommands.warp("hub") },
+            action = {
+                HypixelCommands.warp("hub")
+                //afterNextIslandwarpTtp hub: IslandGraphs.pathFind(hoppity)
+            },
         )
 
         lastReminderSent = SimpleTimeMark.now()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 5214ff162eb5..eb89da6963e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -5,8 +5,6 @@ import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
-import at.hannibal2.skyhanni.data.model.findShortestDistance
-import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -28,6 +26,7 @@ import at.hannibal2.skyhanni.utils.ColorUtils.getFirstColorCode
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
 import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -81,6 +80,7 @@ object TunnelsMaps {
     private var active: String = ""
 
     private lateinit var fairySouls: Map<String, GraphNode>
+
     // TODO what is this? why is there a difference? can this be replaced with GraphNodeTag.GRIND_ORES?
     private lateinit var newGemstones: Map<String, List<GraphNode>>
     private lateinit var oldGemstones: Map<String, List<GraphNode>>
@@ -98,7 +98,7 @@ object TunnelsMaps {
         val list = possibleLocations[name] ?: return null
 
         val offCooldown = list.filter { cooldowns[it]?.isInPast() != false }
-        val best = offCooldown.minByOrNull { graph.findShortestDistance(closed, it) } ?: list.minBy {
+        val best = offCooldown.minByOrNull { GraphUtils.findShortestDistance(closed, it) } ?: list.minBy {
             cooldowns[it] ?: SimpleTimeMark.farPast()
         }
         if (cooldowns[best]?.isInPast() != false) {
@@ -249,7 +249,8 @@ object TunnelsMaps {
         this.oldGemstones = oldGemstone
         normalLocations = other
         translateTable.clear()
-        DelayedRun.runNextTick { // Needs to be delayed since the config may not be loaded
+        DelayedRun.runNextTick {
+            // Needs to be delayed since the config may not be loaded
             locationDisplay = generateLocationsDisplay()
         }
     }
@@ -398,7 +399,7 @@ object TunnelsMaps {
         val closest = closedNote ?: return
         val goal = goal ?: return
         if (closest == prevClosed && goal == prevGoal) return
-        val (path, distance) = graph.findShortestPathAsGraphWithDistance(closest, goal)
+        val (path, distance) = GraphUtils.findShortestPathAsGraphWithDistance(closest, goal)
         val first = path.firstOrNull()
         val second = path.getOrNull(1)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index 5ece5897c5df..cddbd201db57 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.IslandGraphs.pathFind
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
@@ -13,7 +14,6 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
@@ -81,7 +81,7 @@ object IslandAreas {
         nodes = finalNodes
     }
 
-    var hasMoved = false
+    private var hasMoved = false
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -144,11 +144,6 @@ object IslandAreas {
             val isTarget = node.name == targetNode?.name
             val color = if (isTarget) LorenzColor.GOLD else tag.color
 
-            // trying to find a faster path to the existing target
-            if (isTarget && node != targetNode) {
-                ChatUtils.debug("Found a faster node, rerouting...")
-                setTarget(node)
-            }
             val coloredName = "${color.getChatColor()}${name}"
 
             var suffix = ""
@@ -159,6 +154,7 @@ object IslandAreas {
                 passedAreas.remove("null")
                 passedAreas.remove(currentAreaName)
                 // so show areas needed to pass thorough
+                // TODO show this pass through in the /shnavigate command
                 if (passedAreas.isNotEmpty()) {
 //                     suffix = " §7${passedAreas.joinToString(", ")}"
                 }
@@ -268,9 +264,13 @@ object IslandAreas {
 
     private fun setTarget(node: GraphNode) {
         targetNode = node
+        val tag = node.getAreaTag() ?: return
+        val displayName = tag.color.getChatColor() + node.name
         val color = config.pathfinder.color.get().toChromaColor()
-        IslandGraphs.pathFind(
-            node.position, color,
+        node.pathFind(
+            displayName,
+            color,
+            allowRerouting = true,
             onFound = {
                 targetNode = null
                 updatePosition()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index e753948bca5e..48719e63e2a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -2,11 +2,12 @@ package at.hannibal2.skyhanni.features.misc.pathfind
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.IslandGraphs.pathFind
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
-import at.hannibal2.skyhanni.data.model.findShortestDistance
 import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
+import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.chat.Text.asComponent
@@ -57,7 +58,8 @@ object NavigationHelper {
             val distance = distances[node]!!.roundTo(1)
             val component = "$name §e$distance".asComponent()
             component.onClick {
-                IslandGraphs.pathFind(node.position)
+//                 node.pathFind(label = node.name!!, allowRerouting = true)
+                node.pathFind(label = name, allowRerouting = true)
                 sendNavigateMessage(name, goBack)
             }
             val tag = node.tags.first { it in allowedTags }
@@ -102,7 +104,7 @@ object NavigationHelper {
             val remainingTags = node.tags.filter { it in allowedTags }
             if (remainingTags.isEmpty()) continue
             if (name.lowercase().contains(searchTerm)) {
-                distances[node] = graph.findShortestDistance(closedNote, node)
+                distances[node] = GraphUtils.findShortestDistance(closedNote, node)
             }
             if (remainingTags.size != 1) {
                 println("found node with invalid amount of tags: ${node.name} (${remainingTags.map { it.cleanName }}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index 2a4613f7a7bc..41ad12763496 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -111,7 +111,8 @@ object EnigmaSoulWaypoints {
             ChatUtils.chat("§5Tracking the $name Enigma Soul!", prefixColor = "§5")
             if (config.showPathFinder) {
                 soulLocations[name]?.let {
-                    IslandGraphs.pathFind(it, config.color.toChromaColor(), condition = { config.showPathFinder })
+
+                    IslandGraphs.pathFind(it, "$name Enigma Soul", config.color.toChromaColor(), condition = { config.showPathFinder })
                 }
             }
             trackedSouls.add(name)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 540dc7fa2b62..55f88d2bf864 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -126,7 +126,7 @@ object SkyHanniDebugsAndTests {
         val location = LorenzVec(x, y, z)
         testLocation = location
         if (args.getOrNull(3) == "pathfind") {
-            IslandGraphs.pathFind(location)
+            IslandGraphs.pathFind(location, "/shtestwaypoint", showGoalExact = true)
         }
         ChatUtils.chat("set test waypoint")
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
index 162386d4315d..9c9b5bb0693c 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
@@ -6,8 +6,6 @@ import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.TextInput
-import at.hannibal2.skyhanni.data.model.findShortestPathAsGraph
-import at.hannibal2.skyhanni.data.model.toJson
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -15,6 +13,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils
+import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
@@ -581,7 +580,7 @@ object GraphEditor {
         val current = compiled.firstOrNull { it.position == savedCurrent.position } ?: return
         val goal = compiled.firstOrNull { it.position == savedActive.position } ?: return
 
-        val path = compiled.findShortestPathAsGraph(current, goal)
+        val path = GraphUtils.findShortestPathAsGraph(current, goal)
 
         val inGraph = path.map { nodes[it.id] }
         highlightedNodes.addAll(inGraph)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
index 2c5656580417..75d8c3ea2914 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.test.graph
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.IslandGraphs.pathFind
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.features.misc.IslandAreas.getAreaTag
@@ -9,7 +10,6 @@ import at.hannibal2.skyhanni.features.misc.pathfind.NavigationHelper
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.graph.GraphEditor.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.GraphUtils
-import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import kotlinx.coroutines.launch
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -18,7 +18,7 @@ import java.awt.Color
 // Trying to find errors in Area Graph for the current graph editor instance
 @SkyHanniModule
 object GraphEditorBugFinder {
-    private var errorsInWorld = emptyMap<LorenzVec, String>()
+    private var errorsInWorld = emptyMap<GraphNode, String>()
 
     fun runTests() {
         SkyHanniMod.coroutineScope.launch {
@@ -28,21 +28,22 @@ object GraphEditorBugFinder {
 
     private fun asyncTest() {
         val graph = IslandGraphs.currentIslandGraph ?: return
-        val errorsInWorld: MutableMap<LorenzVec, String> = mutableMapOf()
+        val errorsInWorld: MutableMap<GraphNode, String> = mutableMapOf()
         val nodes = graph.nodes
 
         for (node in nodes) {
             if (node.tags.any { it in NavigationHelper.allowedTags }) {
                 val remainingTags = node.tags.filter { it in NavigationHelper.allowedTags }
                 if (remainingTags.size != 1) {
-                    errorsInWorld[node.position] = "§cConflicting tags: $remainingTags"
+                    errorsInWorld[node] = "§cConflicting tags: $remainingTags"
                 }
             }
         }
 
+
         val nearestArea = mutableMapOf<GraphNode, GraphNode>()
         for (node in nodes) {
-            val pathToNearestArea = GraphUtils.findFastestPath(graph, node) { it.getAreaTag(ignoreConfig = true) != null }?.first
+            val pathToNearestArea = GraphUtils.findFastestPath(node) { it.getAreaTag(ignoreConfig = true) != null }?.first
             if (pathToNearestArea == null) {
                 continue
             }
@@ -57,7 +58,7 @@ object GraphEditorBugFinder {
                 if (neighbouringAreaNode == areaNode) continue
                 if ((null == node.getAreaTag(ignoreConfig = true))) {
                     bugs++
-                    errorsInWorld[node.position] = "§cConflicting areas $areaNode and $neighbouringAreaNode"
+                    errorsInWorld[node] = "§cConflicting areas $areaNode and $neighbouringAreaNode"
                 }
             }
         }
@@ -65,11 +66,11 @@ object GraphEditorBugFinder {
             val nameNull = node.name.isNullOrBlank()
             val tagsEmpty = node.tags.isEmpty()
             if (nameNull > tagsEmpty) {
-                errorsInWorld[node.position] = "§cMissing name despite having tags"
+                errorsInWorld[node] = "§cMissing name despite having tags"
                 bugs++
             }
             if (tagsEmpty > nameNull) {
-                errorsInWorld[node.position] = "§cMissing tags despite having name"
+                errorsInWorld[node] = "§cMissing tags despite having name"
                 bugs++
             }
         }
@@ -80,18 +81,18 @@ object GraphEditorBugFinder {
             val foreignClusters = clusters.filter { it !== closestCluster }
             val closestForeignNodes = foreignClusters.map { network -> network.minBy { it.position.distanceSqToPlayer() } }
             closestForeignNodes.forEach {
-                errorsInWorld[it.position] = "§cDisjoint node network"
+                errorsInWorld[it] = "§cDisjoint node network"
                 bugs++
             }
             val closestForeignNode = closestForeignNodes.minBy { it.position.distanceSqToPlayer() }
             val closestNodeToForeignNode = closestCluster.minBy { it.position.distanceSq(closestForeignNode.position) }
-            IslandGraphs.pathFind(closestNodeToForeignNode.position, Color.RED)
+            closestNodeToForeignNode.pathFind("Graph Editor Bug", Color.RED)
         }
 
         println("found $bugs bugs!")
         this.errorsInWorld = errorsInWorld
         if (clusters.size <= 1) {
-            IslandGraphs.pathFind(errorsInWorld.keys.minByOrNull { it.distanceSqToPlayer() } ?: return, Color.RED)
+            errorsInWorld.keys.minByOrNull { it.position.distanceSqToPlayer() }?.pathFind("Graph Editor Bug", Color.RED)
         }
     }
 
@@ -99,8 +100,8 @@ object GraphEditorBugFinder {
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
 
-        for ((location, text) in errorsInWorld) {
-            event.drawDynamicText(location, text, 1.5)
+        for ((node, text) in errorsInWorld) {
+            event.drawDynamicText(node.position, text, 1.5)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
index 4a245a894252..0d15b99ed641 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GraphUtils.kt
@@ -1,10 +1,10 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.data.model.DijkstraTree
 import at.hannibal2.skyhanni.data.model.Graph
 import at.hannibal2.skyhanni.data.model.GraphNode
-import at.hannibal2.skyhanni.data.model.findAllShortestDistances
-import at.hannibal2.skyhanni.data.model.findDijkstraDistances
 import at.hannibal2.skyhanni.data.model.findPathToDestination
+import java.util.PriorityQueue
 import java.util.Stack
 
 object GraphUtils {
@@ -12,11 +12,10 @@ object GraphUtils {
      * Find the fastest path from [closestNode] to *any* node that matches [condition].
      */
     fun findFastestPath(
-        graph: Graph,
         closestNode: GraphNode,
         condition: (GraphNode) -> Boolean,
     ): Pair<Graph, Double>? {
-        val distances = graph.findDijkstraDistances(closestNode, condition)
+        val distances = findDijkstraDistances(closestNode, condition)
         val entry = distances.lastVisitedNode.takeIf(condition)
         return entry?.let {
             distances.findPathToDestination(it)
@@ -34,7 +33,7 @@ object GraphUtils {
         val paths = mutableMapOf<GraphNode, Graph>()
 
         val map = mutableMapOf<GraphNode, Double>()
-        val distances = graph.findAllShortestDistances(closestNode)
+        val distances = findAllShortestDistances(closestNode)
         for (graphNode in graph.nodes) {
             if (!condition(graphNode)) continue
             val (path, distance) = distances.findPathToDestination(graphNode)
@@ -65,4 +64,66 @@ object GraphUtils {
         }
         return allClusters
     }
+
+    fun findShortestPathAsGraph(start: GraphNode, end: GraphNode): Graph = findShortestPathAsGraphWithDistance(start, end).first
+
+    /**
+     * Find a tree of distances to the [start] node using dijkstra's algorithm.
+     */
+    fun findDijkstraDistances(
+        start: GraphNode,
+        /**
+         * Bail out early before collecting all the distances to all nodes in the graph. This will not collect valid distance data for *all*
+         * nodes for which bailout matches, but only the closest one.
+         */
+        bailout: (GraphNode) -> Boolean,
+    ): DijkstraTree {
+        val distances = mutableMapOf<GraphNode, Double>()
+        val previous = mutableMapOf<GraphNode, GraphNode>()
+        val visited = mutableSetOf<GraphNode>()
+        val queue = PriorityQueue<GraphNode>(compareBy { distances.getOrDefault(it, Double.MAX_VALUE) })
+        var lastVisitedNode: GraphNode = start
+
+        distances[start] = 0.0
+        queue.add(start)
+
+        while (queue.isNotEmpty()) {
+            val current = queue.poll()
+            lastVisitedNode = current
+            if (bailout(current)) break
+
+            visited.add(current)
+
+            current.neighbours.forEach { (neighbour, weight) ->
+                if (neighbour !in visited) {
+                    val newDistance = distances.getValue(current) + weight
+                    if (newDistance < distances.getOrDefault(neighbour, Double.MAX_VALUE)) {
+                        distances[neighbour] = newDistance
+                        previous[neighbour] = current
+                        queue.add(neighbour)
+                    }
+                }
+            }
+        }
+
+        return DijkstraTree(
+            start,
+            distances,
+            previous,
+            lastVisitedNode,
+        )
+    }
+
+    fun findAllShortestDistances(start: GraphNode): DijkstraTree {
+        return findDijkstraDistances(start) { false }
+    }
+
+    fun findShortestPathAsGraphWithDistance(start: GraphNode, end: GraphNode): Pair<Graph, Double> {
+        val distances = findDijkstraDistances(start) { it == end }
+        return distances.findPathToDestination(end)
+    }
+
+    fun findShortestPath(start: GraphNode, end: GraphNode): List<LorenzVec> = findShortestPathAsGraph(start, end).toPositionsList()
+
+    fun findShortestDistance(start: GraphNode, end: GraphNode): Double = findShortestPathAsGraphWithDistance(start, end).second
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 805db90f5313..d22ecc85e12c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.data.GuiEditManager
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsX
 import at.hannibal2.skyhanni.data.GuiEditManager.getAbsY
 import at.hannibal2.skyhanni.data.model.Graph
-import at.hannibal2.skyhanni.data.model.toPositionsList
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -1280,7 +1279,8 @@ object RenderUtils {
         waypointColor: Color =
             (path.lastOrNull()?.name?.getFirstColorCode()?.toLorenzColor() ?: LorenzColor.WHITE).toColor(),
         bezierPoint: Double = 1.0,
-        showNoteNames: Boolean = false
+        showNoteNames: Boolean = false,
+        markLastBlock: Boolean = true,
     ) {
         if (path.isEmpty()) return
         val points = if (startAtEye) {
@@ -1307,8 +1307,10 @@ object RenderUtils {
                 this.drawDynamicText(it.position, it.name!!, textSize)
             }
         }
-        val last = path.last()
-        drawWaypointFilled(last.position, waypointColor, seeThroughBlocks = true)
+        if (markLastBlock) {
+            val last = path.last()
+            drawWaypointFilled(last.position, waypointColor, seeThroughBlocks = true)
+        }
     }
 
     class LineDrawer @PublishedApi internal constructor(val tessellator: Tessellator) {
@@ -1586,7 +1588,11 @@ object RenderUtils {
 
     // TODO nea please merge with 'draw3DLine'
     fun LorenzRenderWorldEvent.draw3DLine_nea(
-        p1: LorenzVec, p2: LorenzVec, color: Color, lineWidth: Int, depth: Boolean,
+        p1: LorenzVec,
+        p2: LorenzVec,
+        color: Color,
+        lineWidth: Int,
+        depth: Boolean,
     ) {
         GlStateManager.disableCull()
 

From a5354da4083b554009b900f73d502149db91cbfe Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:43:30 +0100
Subject: [PATCH 572/721] Fix: Broodmother countdown when imminent (#2602)

---
 .../features/combat/BroodmotherFeatures.kt    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
index dd7c088b0b7e..e98c75a0bc8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
@@ -50,7 +50,7 @@ object BroodmotherFeatures {
     fun onTabListUpdate(event: WidgetUpdateEvent) {
         if (!event.isWidget(TabWidget.BROODMOTHER)) return
         val newStage = event.widget.matchMatcherFirstLine { group("stage") } ?: ""
-        if (newStage.isNotEmpty()) {
+        if (newStage.isNotEmpty() && newStage != lastStage.toString()) {
             lastStage = currentStage
             currentStage = StageEntry.valueOf(newStage.replace("!", "").uppercase())
             onStageUpdate()
@@ -60,7 +60,7 @@ object BroodmotherFeatures {
     private fun onStageUpdate() {
         ChatUtils.debug("New Broodmother stage: $currentStage")
 
-        if (lastStage == null && onServerJoin()) return
+        if (onServerJoin()) return
 
         // ignore Hypixel bug where the stage may temporarily revert to Imminent after the Broodmother's death
         if (currentStage == StageEntry.IMMINENT && lastStage == StageEntry.ALIVE) return
@@ -70,15 +70,15 @@ object BroodmotherFeatures {
             return
         }
 
+        val lastStage = lastStage ?: return
+        val timeUntilSpawn = currentStage?.minutes?.minutes ?: return
+        broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn
+
         if (currentStage == StageEntry.IMMINENT && config.imminentWarning) {
             playImminentWarning()
             return
         }
 
-        val lastStage = lastStage ?: return
-        val timeUntilSpawn = currentStage?.minutes?.minutes ?: return
-        broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn
-
         if (currentStage !in config.stages) return
         if (currentStage == StageEntry.SLAIN) {
             onBroodmotherSlain()
@@ -91,9 +91,10 @@ object BroodmotherFeatures {
     }
 
     private fun onServerJoin(): Boolean {
+        if (lastStage != null || !config.stageOnJoin) return false
         // don't send if user has config enabled for either of the alive messages
         // this is so that two messages aren't immediately sent upon joining a server
-        if (config.stageOnJoin && !(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
+        if (!(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
             val pluralize = StringUtils.pluralize(currentStage?.minutes ?: 0, "minute")
             var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
             if (currentStage?.minutes != 0) {
@@ -101,9 +102,8 @@ object BroodmotherFeatures {
             }
             ChatUtils.chat(message)
             return true
-        } else {
-            return false
         }
+        return false
     }
 
     private fun onBroodmotherSpawn() {
@@ -150,6 +150,9 @@ object BroodmotherFeatures {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isCountdownEnabled()) return
         if (display.isEmpty()) return
+        if (broodmotherSpawnTime.isInPast() && !broodmotherSpawnTime.isFarPast()) {
+            display = "§4Broodmother spawning now!"
+        }
 
         config.countdownPosition.renderString(display, posLabel = "Broodmother Countdown")
     }
@@ -159,7 +162,7 @@ object BroodmotherFeatures {
         if (!isCountdownEnabled()) return
 
         if (broodmotherSpawnTime.isFarPast()) {
-            if (lastStage != null && currentStage == StageEntry.ALIVE) {
+            if (currentStage == StageEntry.ALIVE) {
                 display = "§4Broodmother spawned!"
             }
         } else {

From bfee3e4897e4bb08a0e158e188d1d89cd706955e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:43:53 +0200
Subject: [PATCH 573/721] save minutes as duration

---
 .../features/combat/BroodmotherFeatures.kt    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
index e98c75a0bc8f..4020e26d36d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.reflect.KMutableProperty0
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.DurationUnit
@@ -27,13 +28,13 @@ import kotlin.time.DurationUnit
 @SkyHanniModule
 object BroodmotherFeatures {
 
-    enum class StageEntry(private val str: String, val minutes: Int) {
-        SLAIN("§eSlain", 10),
-        DORMANT("§eDormant", 9),
-        SOON("§6Soon", 6),
-        AWAKENING("§6Awakening", 3),
-        IMMINENT("§4Imminent", 1),
-        ALIVE("§4Alive!", 0);
+    enum class StageEntry(private val str: String, val duration: Duration) {
+        SLAIN("§eSlain", 10.minutes),
+        DORMANT("§eDormant", 9.minutes),
+        SOON("§6Soon", 6.minutes),
+        AWAKENING("§6Awakening", 3.minutes),
+        IMMINENT("§4Imminent", 1.minutes),
+        ALIVE("§4Alive!", 0.minutes);
 
         override fun toString() = str
     }
@@ -71,7 +72,7 @@ object BroodmotherFeatures {
         }
 
         val lastStage = lastStage ?: return
-        val timeUntilSpawn = currentStage?.minutes?.minutes ?: return
+        val timeUntilSpawn = currentStage?.duration ?: return
         broodmotherSpawnTime = SimpleTimeMark.now() + timeUntilSpawn
 
         if (currentStage == StageEntry.IMMINENT && config.imminentWarning) {
@@ -95,10 +96,12 @@ object BroodmotherFeatures {
         // don't send if user has config enabled for either of the alive messages
         // this is so that two messages aren't immediately sent upon joining a server
         if (!(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
-            val pluralize = StringUtils.pluralize(currentStage?.minutes ?: 0, "minute")
+            val duration = currentStage?.duration
+            val minutes = duration?.inWholeMinutes?.toInt() ?: 0
+            val pluralize = StringUtils.pluralize(minutes, "minute")
             var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
-            if (currentStage?.minutes != 0) {
-                message += " It will spawn §bwithin ${currentStage?.minutes} $pluralize§e."
+            if (duration != 0.minutes) {
+                message += " It will spawn §bwithin $duration $pluralize§e."
             }
             ChatUtils.chat(message)
             return true

From 533e0448f08d32bc2f6b67775631b47f048bf9ef Mon Sep 17 00:00:00 2001
From: Fazfoxy <78978526+Fazfoxy@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:44:58 +0100
Subject: [PATCH 574/721] Fix: add Kuudra + Dungeon items that replace the SB
 Menu to banned items (#2599)

---
 .../at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 0247a4547705..9ed2621bb7bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -97,6 +97,9 @@ object ItemPickupLog {
         "SKYBLOCK_MENU",
         "CANCEL_PARKOUR_ITEM",
         "CANCEL_RACE_ITEM",
+        "MAXOR_ENERGY_CRYSTAL",
+        "ELLE_SUPPLIES",
+        "ELLE_FUEL_CELL",
     )
     private val bannedItemsConverted = bannedItemsPattern.map { it.toString().asInternalName() }
 

From 4ce974d559a080ac8ac95c8cae9147938fc97123 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:48:48 -0400
Subject: [PATCH 575/721] Fix: Race Condition in Hoppity Duplicate Number &
 Stray no-fire (#2595)

---
 .../skyhanni/features/event/hoppity/HoppityAPI.kt | 15 +++++++++++++--
 .../event/hoppity/HoppityEggsCompactChat.kt       |  2 +-
 .../features/event/hoppity/HoppityEggsManager.kt  |  7 +++++--
 .../ChocolateFactoryBarnManager.kt                |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 93c9efc04021..881b8b5e7432 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.hoppity.RabbitFoundEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_FACTORY_MILESTONE
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.CHOCOLATE_SHOP_MILESTONE
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.SIDE_DISH
+import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType.STRAY
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundPattern
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
@@ -103,8 +104,18 @@ object HoppityAPI {
             ChocolateFactoryStrayTracker.strayCaughtPattern.matchMatcher(it.stack.displayName) {
                 ChocolateFactoryStrayTracker.handleStrayClicked(it)
                 when (groupOrNull("name") ?: return@matchMatcher) {
-                    "Fish the Rabbit" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
-                    "El Dorado" -> EggFoundEvent(HoppityEggType.STRAY, it.slotNumber, null).post()
+                    "Fish the Rabbit" -> {
+                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        lastName = "§9Fish the Rabbit"
+                        lastMeal = STRAY
+                        attemptFireRabbitFound()
+                    }
+                    "El Dorado" -> {
+                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        lastName = "§6El Dorado"
+                        lastMeal = STRAY
+                        attemptFireRabbitFound()
+                    }
                     else -> return@matchMatcher
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index 4a33820d8d55..0803cd0eae9c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -95,7 +95,7 @@ object HoppityEggsCompactChat {
             } ?: "?"
 
             val dupeNumberFormat = if (eventConfig.showDuplicateNumber) {
-                (HoppityCollectionStats.getRabbitCount(this.lastName) - 1).takeIf { it > 1}?.let {
+                (HoppityCollectionStats.getRabbitCount(this.lastName)).takeIf { it > 0 }?.let {
                     " §7(§b#$it§7)"
                 } ?: ""
             } else ""
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index b8143d311cf2..bdbe4cd7e10b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.now
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
 import kotlin.time.Duration.Companion.minutes
@@ -120,9 +121,11 @@ object HoppityEggsManager {
         lastNote = event.note
     }
 
-    @HandleEvent
+    @HandleEvent(priority = HandleEvent.LOWEST)
     fun onRabbitFound(event: RabbitFoundEvent) {
-        HoppityCollectionStats.incrementRabbitCount(event.rabbitName)
+        DelayedRun.runDelayed(1.seconds) {
+            HoppityCollectionStats.incrementRabbitCount(event.rabbitName)
+        }
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index a2b264b358f5..8ce0047d0aec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -62,7 +62,7 @@ object ChocolateFactoryBarnManager {
             HoppityAPI.attemptFireRabbitFound(lastDuplicateAmount = amount)
 
             if (hoppityConfig.showDuplicateNumber && !hoppityConfig.compactChat) {
-                (HoppityCollectionStats.getRabbitCount(HoppityAPI.getLastRabbit()) - 1).takeIf { it > 1 }?.let {
+                (HoppityCollectionStats.getRabbitCount(HoppityAPI.getLastRabbit())).takeIf { it > 0 }?.let {
                     event.chatComponent = ChatComponentText(
                         event.message.replace("§7§lDUPLICATE RABBIT!", "§7§lDUPLICATE RABBIT! §7(Duplicate §b#$it§7)§r"),
                     )

From 8a67b06c948ea35fee18853b7b19e2b0d064f60f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:49:06 +0200
Subject: [PATCH 576/721] using default parameters

---
 .../skyhanni/events/hoppity/EggFoundEvent.kt       |  4 ++--
 .../skyhanni/features/event/hoppity/HoppityAPI.kt  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
index 2cd81811f272..30cd282ac8b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/hoppity/EggFoundEvent.kt
@@ -5,6 +5,6 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggType
 
 class EggFoundEvent(
     val type: HoppityEggType,
-    val slotIndex: Int?,
-    val note: String?,
+    val slotIndex: Int? = null,
+    val note: String? = null,
 ) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 881b8b5e7432..09c0dedf9b29 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -105,13 +105,13 @@ object HoppityAPI {
                 ChocolateFactoryStrayTracker.handleStrayClicked(it)
                 when (groupOrNull("name") ?: return@matchMatcher) {
                     "Fish the Rabbit" -> {
-                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§9Fish the Rabbit"
                         lastMeal = STRAY
                         attemptFireRabbitFound()
                     }
                     "El Dorado" -> {
-                        EggFoundEvent(STRAY, it.slotNumber, null).post()
+                        EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§6El Dorado"
                         lastMeal = STRAY
                         attemptFireRabbitFound()
@@ -132,7 +132,7 @@ object HoppityAPI {
         val nameText = (if (clickedStack.hasDisplayName()) clickedStack.displayName else clickedStack.itemName)
 
         sideDishNamePattern.matchMatcher(nameText) {
-            EggFoundEvent(SIDE_DISH, index, null).post()
+            EggFoundEvent(SIDE_DISH, index).post()
             lastMeal = SIDE_DISH
             attemptFireRabbitFound()
         }
@@ -140,12 +140,12 @@ object HoppityAPI {
             clickedStack.getLore().let {
                 if (!it.any { line -> line == "§eClick to claim!" }) return
                 allTimeLorePattern.firstMatcher(it) {
-                    EggFoundEvent(CHOCOLATE_FACTORY_MILESTONE, index, null).post()
+                    EggFoundEvent(CHOCOLATE_FACTORY_MILESTONE, index).post()
                     lastMeal = CHOCOLATE_FACTORY_MILESTONE
                     attemptFireRabbitFound()
                 }
                 shopLorePattern.firstMatcher(it) {
-                    EggFoundEvent(CHOCOLATE_SHOP_MILESTONE, index, null).post()
+                    EggFoundEvent(CHOCOLATE_SHOP_MILESTONE, index).post()
                     lastMeal = CHOCOLATE_SHOP_MILESTONE
                     attemptFireRabbitFound()
                 }
@@ -160,14 +160,14 @@ object HoppityAPI {
         eggFoundPattern.matchMatcher(event.message) {
             resetRabbitData()
             lastMeal = getEggType(event)
-            lastMeal?.let { EggFoundEvent(it, null, groupOrNull("note")).post() }
+            lastMeal?.let { EggFoundEvent(it, note = groupOrNull("note")).post() }
             attemptFireRabbitFound()
         }
 
         HoppityEggsManager.eggBoughtPattern.matchMatcher(event.message) {
             if (group("rabbitname").equals(lastName)) {
                 lastMeal = HoppityEggType.BOUGHT
-                EggFoundEvent(HoppityEggType.BOUGHT, null, null).post()
+                EggFoundEvent(HoppityEggType.BOUGHT).post()
                 attemptFireRabbitFound()
             }
         }

From c9938504234a1291ee53515bd296e75daeecbd3d Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:54:47 +0200
Subject: [PATCH 577/721] Fix: Custom Scoreboard Active Tablist Event (#2592)

---
 .../gui/customscoreboard/ScoreboardEvent.kt   | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 3b3b6448b368..68dba3eee2bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig
@@ -13,6 +14,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAdvancedMiningIsland
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.RegexUtils.anyMatches
+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.StringUtils.removeColor
@@ -411,12 +413,9 @@ private fun getActiveEventLine(): List<String> {
     val blockedEvents = listOf("Spooky Festival", "Carnival", "5th SkyBlock Anniversary", "New Year Celebration")
     if (blockedEvents.contains(currentActiveEvent.removeColor())) return emptyList()
 
-    val currentActiveEventTime = TabListData.getTabList().firstOrNull { SbPattern.eventTimeEndsPattern.matches(it) }
-        ?.let {
-            SbPattern.eventTimeEndsPattern.matchMatcher(it) {
-                group("time")
-            }
-        }
+    val currentActiveEventTime = ScoreboardPattern.eventTimeEndsPattern.firstMatcher(TabWidget.EVENT.lines) {
+        group("time")
+    } ?: return emptyList()
 
     return listOf(currentActiveEvent, " Ends in: §e$currentActiveEventTime")
 }
@@ -426,12 +425,9 @@ private fun getActiveEventShowWhen(): Boolean =
 
 private fun getSoonEventLine(): List<String> {
     val soonActiveEvent = getTablistEvent() ?: return emptyList()
-    val soonActiveEventTime = TabListData.getTabList().firstOrNull { SbPattern.eventTimeStartsPattern.matches(it) }
-        ?.let {
-            SbPattern.eventTimeStartsPattern.matchMatcher(it) {
-                group("time")
-            }
-        }
+    val soonActiveEventTime = ScoreboardPattern.eventTimeStartsPattern.firstMatcher(TabWidget.EVENT.lines) {
+        group("time")
+    } ?: return emptyList()
 
     return listOf(soonActiveEvent, " Starts in: §e$soonActiveEventTime")
 }

From b86997bbd7223226609728fbe7b069650527aa44 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:09:52 +0200
Subject: [PATCH 578/721] Fix: Powder Tracker (#2591)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../mining/powdertracker/PowderTracker.kt     | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index a90b980d9a60..fcf876c2169e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.features.mining.powdertracker
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.HotmAPI
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
 import at.hannibal2.skyhanni.data.BossbarData
@@ -12,7 +14,9 @@ import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.events.mining.PowderGainEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
 import at.hannibal2.skyhanni.utils.ConfigUtils
@@ -33,6 +37,7 @@ import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object PowderTracker {
@@ -193,13 +198,11 @@ object PowderTracker {
         }
 
         for (reward in PowderChestReward.entries) {
+            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) return
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
-                    var amount = groupOrNull("amount")?.formatLong() ?: 1
-                    if ((reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) && doublePowder) {
-                        amount *= 2
-                    }
+                    val amount = groupOrNull("amount")?.formatLong() ?: 1
                     it.rewards[reward] = count + amount
                 }
             }
@@ -207,6 +210,19 @@ object PowderTracker {
         tracker.update()
     }
 
+    @HandleEvent(onlyOnIsland = IslandType.CRYSTAL_HOLLOWS)
+    fun onPowderGain(event: PowderGainEvent) {
+        if (lastChestPicked.passedSince() > 5.seconds) return
+        tracker.modify {
+            val reward = when (event.powder) {
+                HotmAPI.PowderType.GEMSTONE -> PowderChestReward.GEMSTONE_POWDER
+                HotmAPI.PowderType.MITHRIL -> PowderChestReward.MITHRIL_POWDER
+                else -> return@modify
+            }
+            it.rewards.addOrPut(reward, event.amount)
+        }
+    }
+
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
         config.textFormat.afterChange {

From f332c375c5865e4266b0e831c7b6b54ae5f701c4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:17:02 +0200
Subject: [PATCH 579/721] downgrading was the solution for me, maybe it is for
 others as well

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 90fcd025049d..fe6410c9d11e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,6 +13,7 @@ We use [IntelliJ](https://www.jetbrains.com/idea/) as an example.
 
 - Download IntelliJ from the [JetBrains Website](https://www.jetbrains.com/idea/download/).
     - Use the Community Edition. (Scroll down a bit.)
+- When you encounter any bug with IntelliJ, please make sure to use the version `2024.1.6`, not `2024.2.x` or above.
 
 ### Cloning the project
 
@@ -30,6 +31,7 @@ We use [IntelliJ](https://www.jetbrains.com/idea/) as an example.
 
 ### Setting up IntelliJ
 
+
 Once your project is imported into IntelliJ from the previous step, all dependencies like Minecraft, NEU, and so on should be automatically
 downloaded. If not, you might need to link the Gradle project in the Gradle tab (little elephant) on the right.
 

From aa5b07a6a2686d7fc100ca8f1de9afcff2c67add Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 29 Sep 2024 06:36:18 +1000
Subject: [PATCH 580/721] Backend: Change the detekt rule to be more
 generalised (#2600)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 detekt/detekt.yml                             |  2 +-
 .../kotlin/grammar/AvoidBritishSpelling.kt    | 46 +++++++++++++++++++
 detekt/src/main/kotlin/grammar/AvoidColour.kt | 38 ---------------
 .../kotlin/grammar/GrammarRuleSetProvider.kt  |  9 ++--
 4 files changed, 53 insertions(+), 42 deletions(-)
 create mode 100644 detekt/src/main/kotlin/grammar/AvoidBritishSpelling.kt
 delete mode 100644 detekt/src/main/kotlin/grammar/AvoidColour.kt

diff --git a/detekt/detekt.yml b/detekt/detekt.yml
index 1b7d3ab05ff8..ac5c9de53bcc 100644
--- a/detekt/detekt.yml
+++ b/detekt/detekt.yml
@@ -4,7 +4,7 @@ config:
 
 GrammarRules:
     active: true
-    AvoidColour: # custom rule to prefer color to colour
+    AvoidBritishSpelling: # custom rule to prefer american spellings over british ones
         active: true
 
 FormattingRules:
diff --git a/detekt/src/main/kotlin/grammar/AvoidBritishSpelling.kt b/detekt/src/main/kotlin/grammar/AvoidBritishSpelling.kt
new file mode 100644
index 000000000000..6a4ea3d61eb4
--- /dev/null
+++ b/detekt/src/main/kotlin/grammar/AvoidBritishSpelling.kt
@@ -0,0 +1,46 @@
+package at.hannibal2.skyhanni.detektrules.grammar
+
+import io.gitlab.arturbosch.detekt.api.CodeSmell
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.Debt
+import io.gitlab.arturbosch.detekt.api.Entity
+import io.gitlab.arturbosch.detekt.api.Issue
+import io.gitlab.arturbosch.detekt.api.Rule
+import io.gitlab.arturbosch.detekt.api.Severity
+import org.jetbrains.kotlin.psi.KtStringTemplateExpression
+
+/**
+ * This rule reports all usages of the british spelling over the american spelling in the codebase,
+ * this will ignore any type annotations, i.e., `@ConfigEditorColour` will not be reported.
+ */
+class AvoidBritishSpelling(config: Config) : Rule(config) {
+    override val issue = Issue(
+        "AvoidBritishSpelling",
+        Severity.Style,
+        "Avoid using the word british spelling over american spelling.",
+        Debt.FIVE_MINS,
+    )
+
+    private val scannedWords = mapOf(
+        "colour" to "color",
+        "armour" to "armor",
+    )
+
+    override fun visitStringTemplateExpression(expression: KtStringTemplateExpression) {
+        val text =
+            expression.text // Be aware .getText() returns the entire span of this template, including variable names contained within. This should be rare enough of a problem for us to not care about it.
+
+        for (word in scannedWords) {
+            if (text.contains(word.key, ignoreCase = true)) {
+                report(
+                    CodeSmell(
+                        issue,
+                        Entity.from(expression),
+                        "Avoid using the word '${word.key}' in code, '${word.value}' is preferred instead.",
+                    ),
+                )
+            }
+        }
+        super.visitStringTemplateExpression(expression)
+    }
+}
diff --git a/detekt/src/main/kotlin/grammar/AvoidColour.kt b/detekt/src/main/kotlin/grammar/AvoidColour.kt
deleted file mode 100644
index 754148d36f31..000000000000
--- a/detekt/src/main/kotlin/grammar/AvoidColour.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.hannibal2.skyhanni.detektrules.grammar
-
-import io.gitlab.arturbosch.detekt.api.CodeSmell
-import io.gitlab.arturbosch.detekt.api.Config
-import io.gitlab.arturbosch.detekt.api.Debt
-import io.gitlab.arturbosch.detekt.api.Entity
-import io.gitlab.arturbosch.detekt.api.Issue
-import io.gitlab.arturbosch.detekt.api.Rule
-import io.gitlab.arturbosch.detekt.api.Severity
-import org.jetbrains.kotlin.psi.KtStringTemplateExpression
-
-/**
- * This rule reports all usages of the word "colour" in the codebase,
- * preferring the 'American' spelling "color" - this will ignore any
- * type annotations, i.e., `@ConfigEditorColour` will not be reported.
- */
-class AvoidColour(config: Config) : Rule(config) {
-    override val issue = Issue(
-        "AvoidColour",
-        Severity.Style,
-        "Avoid using the word 'colour' in code, prefer 'color' instead.",
-        Debt.FIVE_MINS
-    )
-
-    override fun visitStringTemplateExpression(expression: KtStringTemplateExpression) {
-        val text = expression.text // Be aware .getText() returns the entire span of this template, including variable names contained within. This should be rare enough of a problem for us to not care about it.
-        if (text.contains("colour", ignoreCase = true)) {
-            report(
-                CodeSmell(
-                    issue,
-                    Entity.from(expression),
-                    "Avoid using the word 'colour' in code, prefer 'color' instead."
-                )
-            )
-        }
-        super.visitStringTemplateExpression(expression)
-    }
-}
diff --git a/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt b/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
index 957b20147cee..8001fe42b5b2 100644
--- a/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
+++ b/detekt/src/main/kotlin/grammar/GrammarRuleSetProvider.kt
@@ -10,8 +10,11 @@ class GrammarRuleSetProvider : RuleSetProvider {
     override val ruleSetId: String = "GrammarRules"
 
     override fun instance(config: Config): RuleSet {
-        return RuleSet(ruleSetId, listOf(
-            AvoidColour(config)
-        ))
+        return RuleSet(
+            ruleSetId,
+            listOf(
+                AvoidBritishSpelling(config),
+            ),
+        )
     }
 }

From 165da3678414e937d6ac570a71deae377037e4a4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:39:51 +0200
Subject: [PATCH 581/721] code cleanup in build.gradle.kts

---
 build.gradle.kts | 75 ++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b0e2af2544ed..71a882ac96bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,8 +3,6 @@ import at.skyhanni.sharedvariables.MultiVersionStage
 import at.skyhanni.sharedvariables.ProjectTarget
 import at.skyhanni.sharedvariables.SHVersionInfo
 import at.skyhanni.sharedvariables.versionString
-import io.gitlab.arturbosch.detekt.Detekt
-import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -39,11 +37,15 @@ val runDirectory = rootProject.file("run")
 runDirectory.mkdirs()
 // Minecraft configuration:
 loom {
-    if (this.isForgeLike)
+    if (this.isForgeLike) {
         forge {
-            pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
+            pack200Provider.set(
+                dev.architectury.pack200.java
+                    .Pack200Adapter(),
+            )
             mixinConfig("mixins.skyhanni.json")
         }
+    }
     mixin {
         useLegacyMixinAp.set(true)
         defaultRefmapName.set("mixins.skyhanni.refmap.json")
@@ -67,11 +69,12 @@ loom {
     }
 }
 
-if (target == ProjectTarget.MAIN)
+if (target == ProjectTarget.MAIN) {
     sourceSets.main {
         resources.destinationDirectory.set(kotlin.destinationDirectory)
         output.setResourcesDir(kotlin.destinationDirectory)
     }
+}
 
 val shadowImpl: Configuration by configurations.creating {
     configurations.implementation.get().extendsFrom(this)
@@ -91,9 +94,11 @@ val headlessLwjgl by configurations.creating {
     isVisible = false
 }
 tasks.runClient {
-    this.javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(target.minecraftVersion.javaLanguageVersion)
-    })
+    this.javaLauncher.set(
+        javaToolchains.launcherFor {
+            languageVersion.set(target.minecraftVersion.javaLanguageVersion)
+        },
+    )
 }
 val shot = shots.shot("minecraft", rootProject.file("shots.txt"))
 
@@ -104,8 +109,9 @@ dependencies {
     } else {
         mappings(target.mappingDependency)
     }
-    if (target.forgeDep != null)
+    if (target.forgeDep != null) {
         "forge"(target.forgeDep!!)
+    }
 
     // Discord RPC client
     shadowImpl("com.jagrosh:DiscordIPC:0.5.3") {
@@ -218,10 +224,11 @@ if (target == ProjectTarget.MAIN) {
     }
 }
 
-if (target == ProjectTarget.MAIN)
+if (target == ProjectTarget.MAIN) {
     tasks.compileJava {
         dependsOn(tasks.processResources)
     }
+}
 
 if (target.parent == ProjectTarget.MAIN) {
     val mainRes = project(ProjectTarget.MAIN.projectPath).tasks.getAt("processResources")
@@ -338,27 +345,27 @@ publishing.publications {
 }
 
 // Detekt: TODO: Uncomment this when we're ready to enforce
-/*detekt {
-    buildUponDefaultConfig = true // preconfigure defaults
-    config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
-    baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
-    source.setFrom(project.sourceSets.named("main").map { it.allSource })
-}
-
-tasks.withType<Detekt>().configureEach {
-    reports {
-        html.required.set(true) // observe findings in your browser with structure and code snippets
-        xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
-        sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
-        md.required.set(true) // simple Markdown format
-    }
-}
-
-tasks.withType<Detekt>().configureEach {
-    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-    outputs.cacheIf { false } // Custom rules won't work if cached
-}
-tasks.withType<DetektCreateBaselineTask>().configureEach {
-    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-    outputs.cacheIf { false } // Custom rules won't work if cached
-}*/
+// detekt {
+//     buildUponDefaultConfig = true // preconfigure defaults
+//     config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
+//     baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
+//     source.setFrom(project.sourceSets.named("main").map { it.allSource })
+// }
+//
+// tasks.withType<Detekt>().configureEach {
+//     reports {
+//         html.required.set(true) // observe findings in your browser with structure and code snippets
+//         xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
+//         sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
+//         md.required.set(true) // simple Markdown format
+//     }
+// }
+//
+// tasks.withType<Detekt>().configureEach {
+//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+//     outputs.cacheIf { false } // Custom rules won't work if cached
+// }
+// tasks.withType<DetektCreateBaselineTask>().configureEach {
+//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+//     outputs.cacheIf { false } // Custom rules won't work if cached
+// }

From 3fb3b0598ee05b90b610b7691985ca073eae9eb3 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:49:05 +0200
Subject: [PATCH 582/721] code cleanup in build.gradle.kts v2

---
 root.gradle.kts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/root.gradle.kts b/root.gradle.kts
index 01039394234d..79dbe9ffba6f 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -25,7 +25,8 @@ allprojects {
         }
         maven("https://repo.spongepowered.org/maven/") // mixin
         maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") // DevAuth
-        maven("https://jitpack.io") { // NotEnoughUpdates (compiled against)
+        maven("https://jitpack.io") {
+            // NotEnoughUpdates (compiled against)
             content {
                 includeGroupByRegex("(com|io)\\.github\\..*")
             }
@@ -42,8 +43,9 @@ preprocess {
     ProjectTarget.activeVersions().forEach { target ->
         nodes[target] = createNode(target.projectName, target.minecraftVersion.versionNumber, target.mappingStyle.identifier)
         val p = project(target.projectPath)
-        if (target.isForge)
+        if (target.isForge) {
             p.extra.set("loom.platform", "forge")
+        }
     }
     ProjectTarget.activeVersions().forEach { child ->
         val parent = child.linkTo ?: return@forEach

From c63224fc1185ba15be71289e92ff32ce2e6d7513 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 29 Sep 2024 03:40:09 -0400
Subject: [PATCH 583/721] Backend: `detekt` -> `detektMain` (#2613)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .github/workflows/build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e42909ee297..143c59466cd1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,14 +44,15 @@ jobs:
     #        -   name: Checkout code
     #            uses: actions/checkout@v4
     #        -   uses: ./.github/actions/setup-normal-workspace
-    #        -   name: Run detekt
+    #        # detektMain is a LOT slower than detekt, but it does type analysis
+    #        -   name: Run detekt main (w/typing analysis)
     #            run: |
-    #                ./gradlew detekt --stacktrace
+    #                ./gradlew detektMain --stacktrace
     #        -   name: Annotate detekt failures
     #            if: ${{ !cancelled() }}
     #            run: |
     #                chmod +x .github/scripts/process_detekt_sarif.sh
-    #                ./.github/scripts/process_detekt_sarif.sh versions/1.8.9/build/reports/detekt/detekt.sarif
+    #                ./.github/scripts/process_detekt_sarif.sh versions/1.8.9/build/reports/detekt/main.sarif
     
 
     preprocess:

From b2adc637fc55355fb107b286c4fda2d9ef351851 Mon Sep 17 00:00:00 2001
From: ReyMaratov <77993433+ReyMaratov@users.noreply.github.com>
Date: Sun, 29 Sep 2024 09:45:23 +0200
Subject: [PATCH 584/721] Feature: Popup for Gold/Diamond Trophy Fishe Catches
 (#2615)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../trophyfishing/ChatMessagesConfig.java     | 15 +++++++++++
 .../fishing/trophy/TrophyFishMessages.kt      | 27 ++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/ChatMessagesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/ChatMessagesConfig.java
index 0fab8615645c..c5a4dc341307 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/ChatMessagesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/ChatMessagesConfig.java
@@ -82,4 +82,19 @@ public String toString() {
     @ConfigOption(name = "Silver Duplicates", desc = "Hide duplicate messages for silver Trophy Fishes from chat.")
     @ConfigEditorBoolean
     public boolean silverHider = false;
+
+    @Expose
+    @ConfigOption(name = "Gold Alert", desc = "Send an alert upon catching a gold Trophy Fish.")
+    @ConfigEditorBoolean
+    public boolean goldAlert = false;
+
+    @Expose
+    @ConfigOption(name = "Diamond Alert", desc = "Send an alert upon catching a diamond Trophy Fish.")
+    @ConfigEditorBoolean
+    public boolean diamondAlert = false;
+
+    @Expose
+    @ConfigOption(name = "Play Sound Alert", desc = "Play a sound effect when rare trophy fishes are caught.")
+    @ConfigEditorBoolean
+    public boolean playSound = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
index f97bd56c9466..66ddde50b939 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
@@ -14,10 +14,12 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.ordinal
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object TrophyFishMessages {
@@ -38,8 +40,7 @@ object TrophyFishMessages {
         } ?: return
 
         val internalName = getInternalName(displayName)
-        val rawRarity = displayRarity.lowercase().removeColor()
-        val rarity = TrophyRarity.getByName(rawRarity) ?: return
+        val rarity = TrophyRarity.getByName(displayRarity.lowercase().removeColor()) ?: return
 
         val trophyFishes = TrophyFishManager.fish ?: return
         val trophyFishCounts = trophyFishes.getOrPut(internalName) { mutableMapOf() }
@@ -50,6 +51,15 @@ object TrophyFishMessages {
             event.blockedReason = "low_trophy_fish"
             return
         }
+        if (config.goldAlert && rarity == TrophyRarity.GOLD) {
+            sendTitle(displayName, displayRarity, amount)
+            if (config.playSound) SoundUtils.playBeepSound()
+        }
+
+        if (config.diamondAlert && rarity == TrophyRarity.DIAMOND) {
+            sendTitle(displayName, displayRarity, amount)
+            if (config.playSound) SoundUtils.playBeepSound()
+        }
 
         val original = event.chatComponent
         var edited = original
@@ -85,14 +95,23 @@ object TrophyFishMessages {
         }
     }
 
+    private fun sendTitle(displayName: String, displayRarity: String?, amount: Int) {
+        val text = "$displayName\n$displayRarity $amount!"
+        LorenzUtils.sendTitle(text, 3.seconds, 2.8, 7f)
+    }
+
     fun getInternalName(displayName: String): String {
         return displayName.replace("Obfuscated", "Obfuscated Fish")
             .replace("[- ]".toRegex(), "").lowercase().removeColor()
     }
 
     private fun shouldBlockTrophyFish(rarity: TrophyRarity, amount: Int) =
-        config.bronzeHider && rarity == TrophyRarity.BRONZE && amount != 1 ||
-            config.silverHider && rarity == TrophyRarity.SILVER && amount != 1
+        config.bronzeHider &&
+            rarity == TrophyRarity.BRONZE &&
+            amount != 1 ||
+            config.silverHider &&
+            rarity == TrophyRarity.SILVER &&
+            amount != 1
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {

From 270e885ea9a7fc2efe40b9d91fa8de488c7bff53 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sun, 29 Sep 2024 10:03:15 +0200
Subject: [PATCH 585/721] Fix: Experiments Profit Tracker bottle counting +
 edit tracker (#2594)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../ExperimentationTableAPI.kt                | 10 +++-
 .../ExperimentsProfitTracker.kt               | 59 ++++++++++++++-----
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
index 80433b68e665..0c7fc1a73d4e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -117,9 +117,17 @@ object ExperimentationTableAPI {
     /**
      * REGEX-TEST: Titanic Experience Bottle
      */
+    val experienceBottleChatPattern by patternGroup.pattern(
+        "chat.xpbottle",
+        "(?:Colossal |Titanic |Grand |\\b)Experience Bottle",
+    )
+
+    /**
+     * REGEX-TEST: TITANIC_EXP_BOTTLE
+     */
     val experienceBottlePattern by patternGroup.pattern(
         "xpbottle",
-        "(?:Titanic |Grand |\\b)Experience Bottle",
+        "(?:COLOSSAL_|TITANIC_|GRAND_|\\b)EXP_BOTTLE",
     )
 
     /**
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
index 6e755d874018..ac1e8105ef25 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -3,14 +3,18 @@ package at.hannibal2.skyhanni.features.inventory.experimentationtable
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ItemAddManager
+import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.ItemAddEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.claimMessagePattern
 import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.enchantingExpPattern
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experienceBottleChatPattern
 import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experienceBottlePattern
 import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experimentRenewPattern
 import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.experimentsDropPattern
@@ -28,7 +32,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -56,7 +59,7 @@ object ExperimentsProfitTracker {
         { it.experimentation.experimentsProfitTracker },
     ) { drawDisplay(it) }
 
-    private var lastSplashes = mutableListOf<ItemStack>()
+    private val lastSplashes = mutableListOf<ItemStack>()
     private var lastSplashTime = SimpleTimeMark.farPast()
     private var lastBottlesInInventory = mutableMapOf<NEUInternalName, Int>()
     private var currentBottlesInInventory = mutableMapOf<NEUInternalName, Int>()
@@ -95,6 +98,13 @@ object ExperimentsProfitTracker {
         var startCost = 0L
     }
 
+    @SubscribeEvent
+    fun onItemAdd(event: ItemAddEvent) {
+        if (!isEnabled() || event.source != ItemAddManager.Source.COMMAND) return
+
+        tracker.addItem(event.internalName, event.amount, command = true)
+    }
+
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
@@ -120,7 +130,7 @@ object ExperimentsProfitTracker {
     private fun LorenzChatEvent.handleDrop(reward: String) {
         blockedReason = when {
             enchantingExpPattern.matches(reward) && ExperimentMessages.EXPERIENCE.isSelected() -> "EXPERIENCE_DROP"
-            experienceBottlePattern.matches(reward) && ExperimentMessages.BOTTLES.isSelected() -> "BOTTLE_DROP"
+            experienceBottleChatPattern.matches(reward) && ExperimentMessages.BOTTLES.isSelected() -> "BOTTLE_DROP"
             listOf("Metaphysical Serum", "Experiment The Fish").contains(reward) && ExperimentMessages.MISC.isSelected() -> "MISC_DROP"
             ExperimentMessages.ENCHANTMENTS.isSelected() -> "ENCHANT_DROP"
             else -> ""
@@ -134,37 +144,49 @@ object ExperimentsProfitTracker {
         }
 
         val internalName = NEUInternalName.fromItemNameOrNull(reward) ?: return
-        if (!experienceBottlePattern.matches(reward)) tracker.addItem(internalName, 1, false)
+        if (!experienceBottleChatPattern.matches(reward)) tracker.addItem(internalName, 1, false)
         else DelayedRun.runDelayed(100.milliseconds) { handleExpBottles(true) }
     }
 
+    @SubscribeEvent
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!isEnabled() ||
+            InventoryUtils.openInventoryName() != "Bottles of Enchanting" ||
+            !listOf(11, 12, 14, 15).contains(event.slotId)
+        ) return
+        val stack = event.slot?.stack ?: return
+
+        val internalName = stack.getInternalName()
+        if (internalName.isExpBottle()) {
+            tracker.modify {
+                it.startCost -= calculateBottlePrice(internalName)
+            }
+        }
+    }
+
     @SubscribeEvent
     fun onItemClick(event: ItemClickEvent) {
-        if (event.clickType == ClickType.RIGHT_CLICK) {
+        if (isEnabled() && event.clickType == ClickType.RIGHT_CLICK) {
             val item = event.itemInHand ?: return
-            if (experienceBottlePattern.matches(item.displayName.removeColor())) {
+            if (item.getInternalName().isExpBottle()) {
                 lastSplashTime = SimpleTimeMark.now()
                 lastSplashes.add(item)
             }
         }
     }
 
+    private fun NEUInternalName.isExpBottle() = experienceBottlePattern.matches(asString())
+
     @SubscribeEvent
     fun onInventoryUpdated(event: InventoryUpdatedEvent) {
         if (!isEnabled()) return
 
         if (inventoriesPattern.matches(event.inventoryName)) {
             var startCostTemp = 0
-            val iterator = lastSplashes.iterator()
-            while (iterator.hasNext()) {
-                val item = iterator.next()
-                val internalName = item.getInternalName()
-                val price = internalName.getPrice()
-                val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0
-                val maxPrice = npcPrice.coerceAtLeast(price)
-                startCostTemp += maxPrice.roundTo(0).toInt()
-                iterator.remove()
+            for (item in lastSplashes) {
+                startCostTemp += calculateBottlePrice(item.getInternalName())
             }
+            lastSplashes.clear()
             tracker.modify {
                 it.startCost -= startCostTemp
             }
@@ -174,6 +196,13 @@ object ExperimentsProfitTracker {
         handleExpBottles(false)
     }
 
+    private fun calculateBottlePrice(internalName: NEUInternalName): Int {
+        val price = internalName.getPrice()
+        val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0
+        val maxPrice = npcPrice.coerceAtLeast(price)
+        return maxPrice.toInt()
+    }
+
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
         if (!isEnabled()) return

From 1f4ce6c4207fe6ef6eaff48a35f61b18a524a429 Mon Sep 17 00:00:00 2001
From: Stella <stellaarnott1@gmail.com>
Date: Sun, 29 Sep 2024 01:06:40 -0700
Subject: [PATCH 586/721] Fix: Flare Display negative values in chat with lag
 (#2567)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/features/combat/FlareDisplay.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
index fd2b513cf561..5a67e1d3405f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
@@ -48,7 +48,7 @@ object FlareDisplay {
         "ewogICJ0aW1lc3RhbXAiIDogMTY0NjY4NzMyNjQzMiwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQyYmY5ODY0NzIwZDg3ZmQwNmI4NGVmYTgwYjc5NWM0OGVkNTM5YjE2NTIzYzNiMWYxOTkwYjQwYzAwM2Y2YiIKICAgIH0KICB9Cn0="
             to FlareType.ALERT,
         "ewogICJ0aW1lc3RhbXAiIDogMTY0NjY4NzM0NzQ4OSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAwNjJjYzk4ZWJkYTcyYTZhNGI4OTc4M2FkY2VmMjgxNWI0ODNhMDFkNzNlYTg3YjNkZjc2MDcyYTg5ZDEzYiIKICAgIH0KICB9Cn0="
-            to FlareType.SOS
+            to FlareType.SOS,
     )
 
     @SubscribeEvent
@@ -92,7 +92,8 @@ object FlareDisplay {
             val name = type.displayName
             if (newDisplay == null) {
                 newDisplay = buildList {
-                    add(Renderable.string("$name: §b${remainingTime.format()}"))
+                    val displayTime = if (remainingTime.isNegative()) "§eSoon" else "§b${remainingTime.format()}"
+                    add(Renderable.string("$name: $displayTime"))
                     if (config.showManaBuff) {
                         type.manaBuff?.let {
                             add(Renderable.string(" §b$it §7mana regen"))
@@ -100,7 +101,7 @@ object FlareDisplay {
                     }
                 }
             }
-            if (remainingTime > 5.seconds) continue
+            if (remainingTime !in 5.seconds..0.seconds) continue
             val message = "$name §eexpires in: §b${remainingTime.inWholeSeconds}s"
             when (config.alertType) {
                 FlareConfig.AlertType.CHAT -> {
@@ -194,7 +195,6 @@ object FlareDisplay {
         SOS("§5SOS Flare", "+125%"),
         ALERT("§9Alert Flare", "+50%"),
         WARNING("§aWarning Flare", null),
-        ;
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled

From 37a186a932fcd81cfed66642e6a7833937f43b3a Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:10:12 +1000
Subject: [PATCH 587/721] Backend: Detekt Fixes Part 2 (#2607)

---
 .../at/hannibal2/skyhanni/api/GetFromSackAPI.kt   |  2 +-
 .../java/at/hannibal2/skyhanni/api/HotmAPI.kt     |  2 +-
 .../data/hypixel/chat/PlayerNameFormatter.kt      |  2 +-
 .../data/hypixel/chat/event/PartyChatEvent.kt     |  2 +-
 .../skyhanni/events/BossHealthChangeEvent.kt      |  3 +--
 .../skyhanni/events/BurrowDetectEvent.kt          |  2 +-
 .../hannibal2/skyhanni/events/BurrowDugEvent.kt   |  2 +-
 .../skyhanni/events/CollectionUpdateEvent.kt      |  2 +-
 .../hannibal2/skyhanni/events/ConfigLoadEvent.kt  |  2 +-
 .../skyhanni/events/CropMilestoneUpdateEvent.kt   |  2 +-
 .../skyhanni/events/DamageIndicatorDeathEvent.kt  |  1 +
 .../events/DamageIndicatorDetectedEvent.kt        |  2 +-
 .../events/DamageIndicatorFinalBossEvent.kt       |  2 +-
 .../skyhanni/events/DrawScreenAfterEvent.kt       |  2 +-
 .../skyhanni/events/DungeonBlockClickEvent.kt     |  1 +
 .../skyhanni/events/DungeonBossRoomEnterEvent.kt  |  2 +-
 .../skyhanni/events/DungeonEnterEvent.kt          |  2 +-
 .../skyhanni/events/DungeonStartEvent.kt          |  2 +-
 .../skyhanni/events/EntityHealthUpdateEvent.kt    |  2 +-
 .../skyhanni/events/EntityMaxHealthUpdateEvent.kt |  2 +-
 .../skyhanni/events/FarmingContestEvent.kt        |  2 +-
 .../skyhanni/events/GardenToolChangeEvent.kt      |  2 +-
 .../hannibal2/skyhanni/events/GuiRenderEvent.kt   |  2 +-
 .../hannibal2/skyhanni/events/HypixelJoinEvent.kt |  2 +-
 .../skyhanni/events/IslandChangeEvent.kt          |  2 +-
 .../skyhanni/events/LorenzKeyPressEvent.kt        |  2 +-
 .../skyhanni/events/LorenzRenderWorldEvent.kt     |  2 +-
 .../skyhanni/events/LorenzWorldChangeEvent.kt     |  2 +-
 .../skyhanni/events/RenderBlockInWorldEvent.kt    |  3 +--
 .../events/RenderInventoryItemTipEvent.kt         |  2 +-
 .../skyhanni/events/SlayerChangeEvent.kt          |  2 +-
 .../skyhanni/events/SlayerProgressChangeEvent.kt  |  2 +-
 .../skyhanni/events/SlayerQuestCompleteEvent.kt   |  2 +-
 .../skyhanni/events/TabListLineRenderEvent.kt     |  2 +-
 .../skyhanni/events/TabListUpdateEvent.kt         |  2 +-
 .../skyhanni/events/TitleReceivedEvent.kt         |  2 +-
 .../events/garden/visitor/VisitorAcceptEvent.kt   |  2 +-
 .../events/garden/visitor/VisitorAcceptedEvent.kt |  2 +-
 .../events/garden/visitor/VisitorArrivalEvent.kt  |  2 +-
 .../events/garden/visitor/VisitorLeftEvent.kt     |  2 +-
 .../events/garden/visitor/VisitorOpenEvent.kt     |  2 +-
 .../events/garden/visitor/VisitorRefusedEvent.kt  |  2 +-
 .../events/garden/visitor/VisitorRenderEvent.kt   |  3 +--
 .../features/chat/PowderMiningChatFilter.kt       |  2 +-
 .../features/combat/damageindicator/OldDamage.kt  |  2 +-
 .../skyhanni/features/commands/WikiManager.kt     |  2 +-
 .../features/dungeon/DungeonFinderFeatures.kt     |  2 +-
 .../features/dungeon/DungeonLividFinder.kt        |  2 +-
 .../event/carnival/CarnivalZombieShootout.kt      |  2 +-
 .../event/hoppity/HoppityEggsCompactChat.kt       |  2 +-
 .../features/fishing/trophy/GoldenFishTimer.kt    |  2 --
 .../skyhanni/features/garden/AnitaMedalProfit.kt  |  2 +-
 .../features/garden/GardenNextJacobContest.kt     |  2 +-
 .../features/garden/composter/ComposterOverlay.kt |  4 ++--
 .../features/garden/contest/FarmingContest.kt     |  2 +-
 .../garden/contest/FarmingContestPhase.kt         |  2 +-
 .../features/garden/farming/GardenCropSpeed.kt    |  1 -
 .../garden/inventory/SkyMartCopperPrice.kt        |  4 ++--
 .../garden/visitor/GardenVisitorFeatures.kt       |  2 +-
 .../gui/customscoreboard/ScoreboardEvent.kt       | 15 +++++++--------
 .../skyhanni/features/inventory/ItemPickupLog.kt  |  2 +-
 .../skyhanni/features/inventory/SackDisplay.kt    |  2 +-
 .../ChocolateFactoryStrayTracker.kt               |  4 ++--
 .../chocolatefactory/ChocolateShopPrice.kt        |  2 +-
 .../skyhanni/features/mining/TunnelsMaps.kt       |  2 +-
 .../mining/powdertracker/PowderTracker.kt         |  2 +-
 .../skyhanni/features/misc/CarryTracker.kt        |  6 +++---
 .../skyhanni/features/misc/IslandAreas.kt         |  4 ++--
 .../skyhanni/features/misc/MagicalPowerDisplay.kt |  2 +-
 .../skyhanni/features/misc/MiscFeatures.kt        |  1 -
 .../misc/RoundedRectangleOutlineShader.kt         |  2 +-
 .../features/misc/compacttablist/TabLine.kt       |  2 +-
 .../misc/items/EstimatedItemValueCalculator.kt    |  4 ++--
 .../features/misc/items/enchants/Enchant.kt       |  4 ++--
 .../features/misc/items/enchants/EnchantParser.kt |  1 -
 .../features/misc/massconfiguration/Category.kt   |  2 +-
 .../massconfiguration/ResetSuggestionState.kt     |  2 +-
 .../misc/update/GuiOptionEditorUpdateCheck.kt     |  2 +-
 .../nether/reputationhelper/FactionType.kt        |  2 +-
 .../dailyquest/quest/MiniBossQuest.kt             |  2 +-
 .../dailyquest/quest/QuestCategory.kt             |  2 +-
 .../dailyquest/quest/QuestState.kt                |  2 +-
 .../features/skillprogress/SkillProgress.kt       |  2 +-
 .../features/slayer/SlayerRngMeterDisplay.kt      |  2 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt       |  4 ++--
 .../skyhanni/test/command/CopyItemCommand.kt      |  4 ++--
 .../at/hannibal2/skyhanni/utils/EntityUtils.kt    |  1 -
 .../utils/tracker/SkyHanniBucketedItemTracker.kt  |  2 +-
 .../skyhanni/utils/tracker/SkyHanniItemTracker.kt |  2 +-
 89 files changed, 100 insertions(+), 108 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
index 89ccfd656f07..9da50e13eaba 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
@@ -163,7 +163,7 @@ object GetFromSackAPI {
     }
 
     private fun bazaarMessage(item: String, amount: Int, isRemaining: Boolean = false) = ChatUtils.clickableChat(
-        "§lCLICK §r§eto get the ${if (isRemaining) "remaining " else ""}§ax${amount} §9$item §efrom bazaar",
+        "§lCLICK §r§eto get the ${if (isRemaining) "remaining " else ""}§ax$amount §9$item §efrom bazaar",
         onClick = { HypixelCommands.bazaar(item.removeColor()) }, "§eClick to find on the bazaar!",
     )
 
diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
index 6217c56c21d0..f2b2756554a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
@@ -74,7 +74,7 @@ object HotmAPI {
 
         /** Use when new powder gets collected*/
         fun gain(difference: Long) {
-            ChatUtils.debug("Gained §a${difference.addSeparators()} §e${displayName} Powder")
+            ChatUtils.debug("Gained §a${difference.addSeparators()} §e$displayName Powder")
             addTotal(difference)
             addCurrent(difference)
             PowderGainEvent(this, difference).post()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
index 94bc665b6202..edc4f65b0388 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
@@ -214,7 +214,7 @@ object PlayerNameFormatter {
         val color = rawColor ?: return null
         val level = rawLevel?.getText() ?: error("level is null, color is not null")
         val levelData = "$color$level"
-        val result = if (config.hideLevelBrackets) levelData else "§8[${levelData}§8]"
+        val result = if (config.hideLevelBrackets) levelData else "§8[$levelData§8]"
         return result.applyFormattingFrom(rawLevel)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt
index a26af584b8a6..e2b9e04ef3ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.data.hypixel.chat.event
 
-import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
 import at.hannibal2.skyhanni.utils.ComponentSpan
+import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
 import net.minecraft.util.IChatComponent
 
 class PartyChatEvent(
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt
index 10efc2823f20..42a827123411 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt
@@ -2,5 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData
 
-class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) :
-    LorenzEvent()
\ No newline at end of file
+class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt
index cca221932138..26e13c42daa6 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events
 import at.hannibal2.skyhanni.features.event.diana.BurrowType
 import at.hannibal2.skyhanni.utils.LorenzVec
 
-class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : LorenzEvent()
\ No newline at end of file
+class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt
index d362cca0901b..3f601fd2bb31 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.utils.LorenzVec
 
-class BurrowDugEvent(val burrowLocation: LorenzVec) : LorenzEvent()
\ No newline at end of file
+class BurrowDugEvent(val burrowLocation: LorenzVec) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt
index b62dcb14925c..f4c46d0b75d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class CollectionUpdateEvent : LorenzEvent()
\ No newline at end of file
+class CollectionUpdateEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt
index b5afff5477b9..4f1efeb9c246 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class ConfigLoadEvent : LorenzEvent()
\ No newline at end of file
+class ConfigLoadEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt
index 9ca3bd56b843..8da8b20f75ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class CropMilestoneUpdateEvent : LorenzEvent()
\ No newline at end of file
+class CropMilestoneUpdateEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt
index 141f293a388d..95b08ec51926 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt
@@ -4,3 +4,4 @@ import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData
 import net.minecraft.entity.EntityLivingBase
 
 class DamageIndicatorDeathEvent(val entity: EntityLivingBase, val data: EntityData) : LorenzEvent()
+
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt
index dbf2fd130e9a..2ca276e4c884 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData
 
-class DamageIndicatorDetectedEvent(val entityData: EntityData) : LorenzEvent()
\ No newline at end of file
+class DamageIndicatorDetectedEvent(val entityData: EntityData) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt
index 88e41538afb3..0d2564005091 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class DamageIndicatorFinalBossEvent(val id: Int) : LorenzEvent()
\ No newline at end of file
+class DamageIndicatorFinalBossEvent(val id: Int) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt
index ba278df24643..822b80419983 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
 
-class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : LorenzEvent()
\ No newline at end of file
+class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt
index 9a7f5119aa64..84d1b822f6b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt
@@ -5,3 +5,4 @@ import at.hannibal2.skyhanni.data.ClickedBlockType
 import at.hannibal2.skyhanni.utils.LorenzVec
 
 class DungeonBlockClickEvent(val position: LorenzVec, val blockType: ClickedBlockType) : SkyHanniEvent()
+
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt
index 243268181e41..9f372d5c31c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class DungeonBossRoomEnterEvent : LorenzEvent()
\ No newline at end of file
+class DungeonBossRoomEnterEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt
index b980c75953f1..3b0f09c4a096 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class DungeonEnterEvent(dungeonFloor: String) : LorenzEvent()
\ No newline at end of file
+class DungeonEnterEvent(dungeonFloor: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt
index b4de1e6c90ba..a2b127371089 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class DungeonStartEvent(dungeonFloor: String) : LorenzEvent()
\ No newline at end of file
+class DungeonStartEvent(dungeonFloor: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt
index 5fbcfb9d7c8a..162efd9caa59 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import net.minecraft.entity.EntityLivingBase
 
-class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : LorenzEvent()
\ No newline at end of file
+class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt
index 116e81797590..943a11cc3720 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import net.minecraft.entity.EntityLivingBase
 
-class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : LorenzEvent()
\ No newline at end of file
+class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt
index 75521bacd506..5a4a83c1f829 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events
 import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.features.garden.contest.FarmingContestPhase
 
-class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : LorenzEvent()
\ No newline at end of file
+class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt
index 742dac58df46..2ad07aad8975 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events
 import at.hannibal2.skyhanni.features.garden.CropType
 import net.minecraft.item.ItemStack
 
-class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : LorenzEvent()
\ No newline at end of file
+class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt
index a9d190f89eba..954bd0733391 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events
 open class GuiRenderEvent : LorenzEvent() {
     class ChestGuiOverlayRenderEvent : GuiRenderEvent()
     class GuiOverlayRenderEvent : GuiRenderEvent()
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt
index 044d63daae37..6f7711118be6 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class HypixelJoinEvent : LorenzEvent()
\ No newline at end of file
+class HypixelJoinEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt
index 291ccd995db9..ae22a4c751ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.data.IslandType
 
-class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : LorenzEvent()
\ No newline at end of file
+class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt
index 70997f0c1abb..e5af23d22ab6 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class LorenzKeyPressEvent(val keyCode: Int) : LorenzEvent()
\ No newline at end of file
+class LorenzKeyPressEvent(val keyCode: Int) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt
index 5ce44df0db15..f61f0e16d35d 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class LorenzRenderWorldEvent(val partialTicks: Float) : LorenzEvent()
\ No newline at end of file
+class LorenzRenderWorldEvent(val partialTicks: Float) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt
index c815e96302fd..de67180273b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class LorenzWorldChangeEvent : LorenzEvent()
\ No newline at end of file
+class LorenzWorldChangeEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt
index 4aa3ef9dc4e7..395d1be2db0c 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt
@@ -6,5 +6,4 @@ import net.minecraft.world.IBlockAccess
 import net.minecraftforge.fml.common.eventhandler.Cancelable
 
 @Cancelable
-data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) :
-    LorenzEvent()
\ No newline at end of file
+data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt
index 7bb4692ece5a..0f16dad2a4a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt
@@ -11,4 +11,4 @@ class RenderInventoryItemTipEvent(
     var offsetX: Int = 0,
     var offsetY: Int = 0,
     var alignLeft: Boolean = true,
-) : LorenzEvent()
\ No newline at end of file
+) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt
index 7c70dde5d53e..c7da7f7bd7d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent()
\ No newline at end of file
+class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt
index 95ecf447f706..b87a854e1922 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent()
\ No newline at end of file
+class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt
index 8c7aa753ee8b..b7e0edfedd59 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerQuestCompleteEvent : LorenzEvent()
\ No newline at end of file
+class SlayerQuestCompleteEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt
index 8916c55faa4c..47478959291d 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class TabListLineRenderEvent(var text: String) : LorenzEvent()
\ No newline at end of file
+class TabListLineRenderEvent(var text: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt
index b3ab18bab956..a1b36a667fb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class TabListUpdateEvent(val tabList: List<String>) : LorenzEvent()
\ No newline at end of file
+class TabListUpdateEvent(val tabList: List<String>) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt
index 2576809cc93e..912a4d8d6564 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events
 import net.minecraftforge.fml.common.eventhandler.Cancelable
 
 @Cancelable
-class TitleReceivedEvent(val title: String) : LorenzEvent()
\ No newline at end of file
+class TitleReceivedEvent(val title: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt
index 4a494f35314f..41a429cfd372 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt
index e3bffed8b923..5b894768fb39 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt
index 673f45e201b6..f26dbb971275 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.Visitor
 
-class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt
index f906364ced2b..f5673decd0e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt
index 6abec9865725..c2e7a40b0c3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt
index fea24fba9bb8..94de16081b04 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt
@@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor
 import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt
index 7cbdc8224fb0..9282d3e04fe6 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt
@@ -5,5 +5,4 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 import at.hannibal2.skyhanni.utils.LorenzVec
 
-class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) :
-    LorenzEvent()
\ No newline at end of file
+class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 25c1c04cb0db..d6e992738c67 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -359,7 +359,7 @@ object PowderMiningChatFilter {
                 else -> {
                     ErrorManager.logErrorWithData(
                         NoSuchElementException(),
-                        "Unknown Goblin Egg color detected in Powder Mining Filter: '${colorStr}' - please report this in the Discord!",
+                        "Unknown Goblin Egg color detected in Powder Mining Filter: '$colorStr' - please report this in the Discord!",
                         noStackTrace = true,
                     )
                     "no_filter"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt
index 77ca2c6c9ee4..5067bac01396 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.features.combat.damageindicator
 
-class OldDamage(val time: Long, val damage: Long, val healing: Long)
\ No newline at end of file
+class OldDamage(val time: Long, val damage: Long, val healing: Long)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
index b8e14d280588..af56be8e7ba4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
@@ -84,7 +84,7 @@ object WikiManager {
         }
 
         var search = ""
-        for (arg in args) search = "$search${arg}"
+        for (arg in args) search = "$search$arg"
 
         if (wikithis) {
             val itemInHand = InventoryUtils.getItemInHand() ?: run {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index a710e4fd0e94..9151c1d9eee2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -291,7 +291,7 @@ object DungeonFinderFeatures {
             val name = stack.getLore().firstOrNull()?.removeColor()
             if (config.showMissingClasses && dungeonFloorPattern.matches(name)) {
                 if (classNames.contains(selectedClass)) {
-                    classNames[classNames.indexOf(selectedClass)] = "§a${selectedClass}§7"
+                    classNames[classNames.indexOf(selectedClass)] = "§a$selectedClass§7"
                 }
                 toolTip.add("")
                 toolTip.add("§cMissing: §7" + classNames.createCommaSeparatedList())
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
index e1e8fbaf98eb..474e8367f6dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@@ -59,7 +59,7 @@ object DungeonLividFinder {
         val chatColor = color.getChatColor()
 
         lividArmorStand = EntityUtils.getEntities<EntityArmorStand>()
-            .firstOrNull { it.name.startsWith("${chatColor}﴾ ${chatColor}§lLivid") }
+            .firstOrNull { it.name.startsWith("$chatColor﴾ $chatColor§lLivid") }
 
         if (event.isMod(20)) {
             if (lividArmorStand == null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index b49eb0642604..9edf05b7bdfe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -127,7 +127,7 @@ object CarnivalZombieShootout {
             content = Renderable.horizontalContainer(
                 listOf(
                     Renderable.itemStack(lamp),
-                    Renderable.string("§6Disappears in $prefix${timer}"),
+                    Renderable.string("§6Disappears in $prefix$timer"),
                 ),
                 spacing = 1,
                 verticalAlign = RenderUtils.VerticalAlignment.CENTER,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
index 0803cd0eae9c..9b9276420efe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt
@@ -105,7 +105,7 @@ object HoppityEggsCompactChat {
             "$mealNameFormat! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName$dupeNumberFormat §7(§6+$format Chocolate§7$timeStr)"
         } else if (newRabbit) {
             val showNewRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.NEW }
-            "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)"
+            "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7($lastProfit§7)"
         } else "?"
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt
index 7a0e2d65f822..b7c67034feab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt
@@ -35,9 +35,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
-import at.hannibal2.skyhanni.utils.TimeLimitedSet
 import at.hannibal2.skyhanni.utils.TimeUtils.format
-import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.entity.EntityLivingBase
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
index 3c34c262c1e1..26e41f7eea89 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
@@ -106,7 +106,7 @@ object AnitaMedalProfit {
             "§7Item price: §6${itemPrice.shortFormat()} ",
             // TODO add more exact material cost breakdown
             "§7Material cost: §6${fullCost.shortFormat()} ",
-            "§7Final profit: §6${profitFormat} ",
+            "§7Final profit: §6$profitFormat ",
         )
         table.add(
             DisplayTableEntry(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 4285a24af969..c79bbb46147b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -441,7 +441,7 @@ object GardenNextJacobContest {
             SkyHanniMod.coroutineScope.launch {
                 openPopupWindow(
                     "<html>Farming Contest soon!<br />" +
-                        "Crops: ${cropTextNoColor}</html>"
+                        "Crops: $cropTextNoColor</html>"
                 )
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 6faa7746a797..22e9c12f7990 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -39,8 +39,8 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
-import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -488,7 +488,7 @@ object ComposterOverlay {
         }
         val havingInInventory = internalName.getAmountInInventory()
         if (havingInInventory >= itemsNeeded) {
-            ChatUtils.chat("$itemName §8x${itemsNeeded} §ealready found in inventory!")
+            ChatUtils.chat("$itemName §8x$itemsNeeded §ealready found in inventory!")
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt
index 5bf2da85c7c7..d3bdcf071913 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.features.garden.contest
 
 import at.hannibal2.skyhanni.features.garden.CropType
 
-data class FarmingContest(val time: Long, val crop: CropType, val brackets: Map<ContestBracket, Int>)
\ No newline at end of file
+data class FarmingContest(val time: Long, val crop: CropType, val brackets: Map<ContestBracket, Int>)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt
index 5d280a960eb3..e1667a20b4c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt
@@ -4,4 +4,4 @@ enum class FarmingContestPhase {
     START,
     STOP,
     CHANGE
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
index 141c93ff102c..0ef02361f855 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
 import at.hannibal2.skyhanni.data.GardenCropMilestones.setCounter
-import at.hannibal2.skyhanni.data.Perk
 import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson
 import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerType
 import at.hannibal2.skyhanni.events.CropClickEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
index 078ef16724d2..ea893ecd1b5b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt
@@ -16,8 +16,8 @@ import at.hannibal2.skyhanni.utils.NEUItems.getPrice
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
-import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -72,7 +72,7 @@ object SkyMartCopperPrice {
                     add("§7Profit per purchase: §6${profit.shortFormat()} ")
                     add("")
                     add("§7Copper amount: §c${copper.addSeparators()} ")
-                    add("§7Profit per copper: §6${perFormat} ")
+                    add("§7Profit per copper: §6$perFormat ")
                 }
                 table.add(
                     DisplayTableEntry(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 70392bb46d78..9fc0e7664aa1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -682,7 +682,7 @@ object GardenVisitorFeatures {
                     add("shoppingList: '${visitor.shoppingList}'")
                 }
                 visitor.offer?.offerItem?.getInternalName()?.let {
-                    add("offer: '${it}'")
+                    add("offer: '$it'")
                 }
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 68dba3eee2bb..ce4b5a4fafa9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.VOTING
-import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.features.misc.ServerRestartTitle
 import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigies
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
@@ -347,7 +346,7 @@ private fun getTrapperLines() = buildList {
 }
 
 private fun getTrapperShowWhen(): Boolean =
-    getSbLines().any { ScoreboardPattern.peltsPattern.matches(it) || ScoreboardPattern.mobLocationPattern.matches(it) }
+    getSbLines().any { SbPattern.peltsPattern.matches(it) || SbPattern.mobLocationPattern.matches(it) }
 
 private fun getGardenCleanUpLines(): List<String> =
     listOf(getSbLines().first { SbPattern.cleanUpPattern.matches(it) }.trim())
@@ -374,9 +373,9 @@ private fun getWinterLines() = buildList {
 }
 
 private fun getWinterShowWhen(): Boolean = getSbLines().any {
-    ScoreboardPattern.winterEventStartPattern.matches(it) ||
-        (ScoreboardPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!")) ||
-        ScoreboardPattern.winterWavePattern.matches(it)
+    SbPattern.winterEventStartPattern.matches(it)
+        || (SbPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!"))
+        || SbPattern.winterWavePattern.matches(it)
 }
 
 private fun getNewYearLines() = listOf(getSbLines().first { SbPattern.newYearPattern.matches(it) })
@@ -395,7 +394,7 @@ private fun getSpookyLines() = buildList {
     ) // Candy
 }
 
-private fun getSpookyShowWhen(): Boolean = getSbLines().any { ScoreboardPattern.spookyPattern.matches(it) }
+private fun getSpookyShowWhen(): Boolean = getSbLines().any { SbPattern.spookyPattern.matches(it) }
 
 private fun getTablistEvent(): String? =
     TabListData.getTabList().firstOrNull { SbPattern.eventNamePattern.matches(it) }
@@ -413,7 +412,7 @@ private fun getActiveEventLine(): List<String> {
     val blockedEvents = listOf("Spooky Festival", "Carnival", "5th SkyBlock Anniversary", "New Year Celebration")
     if (blockedEvents.contains(currentActiveEvent.removeColor())) return emptyList()
 
-    val currentActiveEventTime = ScoreboardPattern.eventTimeEndsPattern.firstMatcher(TabWidget.EVENT.lines) {
+    val currentActiveEventTime = SbPattern.eventTimeEndsPattern.firstMatcher(TabWidget.EVENT.lines) {
         group("time")
     } ?: return emptyList()
 
@@ -425,7 +424,7 @@ private fun getActiveEventShowWhen(): Boolean =
 
 private fun getSoonEventLine(): List<String> {
     val soonActiveEvent = getTablistEvent() ?: return emptyList()
-    val soonActiveEventTime = ScoreboardPattern.eventTimeStartsPattern.firstMatcher(TabWidget.EVENT.lines) {
+    val soonActiveEventTime = SbPattern.eventTimeStartsPattern.firstMatcher(TabWidget.EVENT.lines) {
         group("time")
     } ?: return emptyList()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
index 9ed2621bb7bc..78e6063ee542 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt
@@ -42,7 +42,7 @@ object ItemPickupLog {
             "§a+256",
             { entry, prefix ->
                 val formattedAmount = if (config.shorten) entry.amount.shortFormat() else entry.amount.addSeparators()
-                Renderable.string("${prefix}${formattedAmount}")
+                Renderable.string("$prefix$formattedAmount")
             },
         ),
         ICON(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 26de0fa1c8ec..4856c65c10b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -143,7 +143,7 @@ object SackDisplay {
                     add(
                         Renderable.hoverTips(
                             Renderable.string(
-                                "§d${magmaFish}",
+                                "§d$magmaFish",
                                 horizontalAlign = config.alignment
                             ),
                             listOf(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index ed7e35691b25..52a3c5f1bb3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -152,7 +152,7 @@ object ChocolateFactoryStrayTracker {
         add(
             Renderable.hoverTips(
                 "§6§lStray Tracker",
-                tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"),
+                tips = listOf("§a+§b$formattedExtraTime §afrom strays§7"),
             ).toSearchable(),
         )
         HoppityAPI.hoppityRarities.forEach { rarity ->
@@ -169,7 +169,7 @@ object ChocolateFactoryStrayTracker {
 
         val colorCode = rarity.chatColorCode
         val lineHeader = "$colorCode${rarity.toString().lowercase().replaceFirstChar { it.uppercase() }}§7: §r$colorCode"
-        val lineFormat = "${lineHeader}${caughtString}"
+        val lineFormat = "$lineHeader$caughtString"
 
         val renderable = rarityExtraChocMs?.let {
             var tip = "§a+§b$extraChocFormat §afrom $colorCode${rarity.toString().lowercase()} strays§7"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
index 277532aaa667..13757d1b39ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt
@@ -132,7 +132,7 @@ object ChocolateShopPrice {
                 add("§7Profit per purchase: §6${profit.shortFormat()} ")
                 add("")
                 add("§7Chocolate amount: §c${product.chocolate.shortFormat()} ")
-                add("§7Profit per million chocolate: §6${perFormat} ")
+                add("§7Profit per million chocolate: §6$perFormat ")
                 add("")
                 val formattedTimeUntilGoal = ChocolateAmount.CURRENT.formattedTimeUntilGoal(product.chocolate)
                 add("§7Time until affordable: §6$formattedTimeUntilGoal ")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index eb89da6963e3..19383d4fad14 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -330,7 +330,7 @@ object TunnelsMaps {
                     Renderable.horizontalContainer(
                         listOf(Renderable.string("§dFairy Souls")) + fairySouls.map {
                             val name = it.key.removePrefix("§dFairy Soul ")
-                            Renderable.clickable(Renderable.string("§d[${name}]"), onClick = guiSetActive(it.key))
+                            Renderable.clickable(Renderable.string("§d[$name]"), onClick = guiSetActive(it.key))
                         },
                     ),
                     Renderable.string("§dFairy Souls"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index fcf876c2169e..2749404bef59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -333,7 +333,7 @@ object PowderTracker {
             }
 
             val (flawless, fine, flawed, rough) = convert(totalGemstone)
-            addSearchString("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone", "Gemstone")
+            addSearchString("§5$flawless§7-§9$fine§7-§a$flawed§f-$rough $color$gem Gemstone", "Gemstone")
         }
 
         var totalParts = 0L
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
index bfecbc48f57f..a5062ee1d388 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
@@ -14,10 +14,10 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addString
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble
 import at.hannibal2.skyhanni.utils.NumberUtil.formatDoubleOrUserError
 import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError
+import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
@@ -228,7 +228,7 @@ object CarryTracker {
                             add("§7Missing: §e$missing")
                             add("")
                             if (cost != "") {
-                                add("§7Total cost: §e${cost}")
+                                add("§7Total cost: §e$cost")
                                 add("§7Cost per carry: §e${formatCost(carry.type.pricePer)}")
                             } else {
                                 add("§cNo price set for this carry!")
@@ -264,7 +264,7 @@ object CarryTracker {
             val missingFormat = formatCost(totalCost - customer.alreadyPaid)
             list.add(
                 Renderable.clickAndHover(
-                    Renderable.string("§b$customerName $paidFormat§8/${totalCostFormat}"),
+                    Renderable.string("§b$customerName $paidFormat§8/$totalCostFormat"),
                     tips = listOf(
                         "§7Carries for §b$customerName",
                         "",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index cddbd201db57..faf3130b5ad8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -144,7 +144,7 @@ object IslandAreas {
             val isTarget = node.name == targetNode?.name
             val color = if (isTarget) LorenzColor.GOLD else tag.color
 
-            val coloredName = "${color.getChatColor()}${name}"
+            val coloredName = "${color.getChatColor()}$name"
 
             var suffix = ""
             paths[node]?.let { path ->
@@ -161,7 +161,7 @@ object IslandAreas {
             }
 
             val distance = difference.roundTo(1)
-            val text = "${coloredName}§7: §e$distance$suffix"
+            val text = "$coloredName§7: §e$distance$suffix"
 
             if (!foundCurrentArea) {
                 foundCurrentArea = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt
index e7b8ea26c3c8..dedfe3473e90 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt
@@ -93,7 +93,7 @@ object MagicalPowerDisplay {
             else -> if (internalName.isAbicase()) endMP += (contactAmount ?: 0) / 2
         }
 
-        event.stackTip = "${if (config.colored) rarity.chatColorCode else "§7"}${endMP}"
+        event.stackTip = "${if (config.colored) rarity.chatColorCode else "§7"}$endMP"
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
index c34a49a7d83a..98d4205256e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.client.event.RenderBlockOverlayEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt
index ea8770081c78..2a5e131fa0da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt
@@ -27,4 +27,4 @@ object RoundedRectangleOutlineShader : Shader("rounded_rect_outline", "rounded_r
         registerUniform(Uniform.UniformType.FLOAT, "borderThickness") { borderThickness }
         registerUniform(Uniform.UniformType.FLOAT, "borderBlur") { borderBlur }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt
index 96b89ce17a6d..a2c227bd776c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt
@@ -35,4 +35,4 @@ class TabLine(val text: String, val type: TabStringType, val customName: String
         this.entity = entity
         return entity
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 3f56230c476e..2f58a4fd191f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -920,11 +920,11 @@ object EstimatedItemValueCalculator {
 
     fun Pair<String, Int>.getAttributeName(): String {
         val name = first.fixMending().allLettersFirstUppercase()
-        return "§b$name ${second} Shard"
+        return "§b$name $second Shard"
     }
 
     fun Pair<String, Int>.getAttributePrice(): Double? = EstimatedItemValueCalculator.getPriceOrCompositePriceForAttribute(
-        "ATTRIBUTE_SHARD+ATTRIBUTE_" + first,
+        "ATTRIBUTE_SHARD+ATTRIBUTE_$first",
         second,
     )
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
index 244cc54bedf8..6432be2f6572 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt
@@ -10,8 +10,8 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.annotations.Expose
 import io.github.notenoughupdates.moulconfig.observer.Property
-import java.util.TreeSet
 import net.minecraft.item.ItemStack
+import java.util.TreeSet
 
 open class Enchant : Comparable<Enchant> {
     @Expose
@@ -110,7 +110,7 @@ open class Enchant : Comparable<Enchant> {
         @Expose
         private var stackLevel: TreeSet<Int>? = null
 
-        override fun toString() = "$nbtNum ${stackLevel.toString()} ${super.toString()}"
+        override fun toString() = "$nbtNum $stackLevel ${super.toString()}"
     }
 
     class Dummy(name: String) : Enchant() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
index 66c4c040716a..162d2adee0e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt
@@ -22,7 +22,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getExtraAttributes
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import java.lang.ArithmeticException
 import net.minecraft.event.HoverEvent
 import net.minecraft.item.ItemStack
 import net.minecraft.util.ChatComponentText
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt
index 3172df6e05db..b69e5913db45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.features.misc.massconfiguration
 
-data class Category(val name: String, val description: String)
\ No newline at end of file
+data class Category(val name: String, val description: String)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt
index 30a78a7b2928..60d809633fa6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt
@@ -7,4 +7,4 @@ enum class ResetSuggestionState(val label: String) {
     ;
 
     val next get() = entries[(ordinal + 1) % entries.size]
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
index f56185aba310..84d86615da3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
@@ -49,7 +49,7 @@ class GuiOptionEditorUpdateCheck(option: ProcessedOption) : GuiOptionEditor(opti
         val sameVersion = currentVersion.equals(nextVersion, true)
         TextRenderUtils.drawStringCenteredScaledMaxWidth(
             "${if (UpdateManager.updateState == UpdateManager.UpdateState.NONE) GREEN else RED}$currentVersion" +
-                if (nextVersion != null && !sameVersion) "➜ ${GREEN}${nextVersion}" else "",
+                if (nextVersion != null && !sameVersion) "➜ $GREEN$nextVersion" else "",
             fr,
             widthRemaining / 4F,
             10F,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt
index 389f1ccc084b..d531aa8f4996 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt
@@ -5,4 +5,4 @@ enum class FactionType {
     MAGE,
 
     NONE
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt
index 914f1e92180f..609a22a0ff55 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt
@@ -10,4 +10,4 @@ class MiniBossQuest(val miniBoss: CrimsonMiniBoss, state: QuestState, needAmount
         miniBoss.displayName,
         state,
         needAmount
-    )
\ No newline at end of file
+    )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt
index f9987fe1c70b..379f0c26b02d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt
@@ -9,4 +9,4 @@ enum class QuestCategory(val displayName: String) {
     KUUDRA("Kuudra Kill"),
 
     UNKNOWN("§4Unknown"),
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt
index acde3785d5b4..f98514a6644e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt
@@ -5,4 +5,4 @@ enum class QuestState(val displayName: String, val color: String) {
     ACCEPTED("Accepted", "§b"),
     READY_TO_COLLECT("Ready to collect", "§a"),
     COLLECTED("Collected", "§7"),
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index a16f78b52e45..9a01a97298f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -291,7 +291,7 @@ object SkillProgress {
                 )
             } else {
                 val tips = buildList {
-                    add("§6Level: §b${level}")
+                    add("§6Level: §b$level")
                     add("§6Current XP: §b${currentXp.addSeparators()}")
                     add("§6Needed XP: §b${currentXpMax.addSeparators()}")
                     add("§6Total XP: §b${totalXp.addSeparators()}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
index 6396b287610e..d2c161eba813 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -123,7 +123,7 @@ object SlayerRngMeterDisplay {
                 var rawPercentage = old.toDouble() / storage.goalNeeded
                 if (rawPercentage > 1) rawPercentage = 1.0
                 val percentage = LorenzUtils.formatPercentage(rawPercentage)
-                ChatUtils.chat("§dRNG Meter §7dropped at §e$percentage §7XP ($from/${to}§7)")
+                ChatUtils.chat("§dRNG Meter §7dropped at §e$percentage §7XP ($from/$to§7)")
                 lastItemDroppedTime = SimpleTimeMark.now()
             }
             if (blockChat) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 55f88d2bf864..3fc4e265d847 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -378,7 +378,7 @@ object SkyHanniDebugsAndTests {
                 add("§eitem name -> internalName: '§7${internalName.asString()}§e'")
                 add("  §eitemName: '${internalName.itemName}§e'")
                 val price = internalName.getPriceOrNull()?.let { "§6" + it.addSeparators() } ?: "§7null"
-                add("  §eprice: '§6${price}§e'")
+                add("  §eprice: '§6$price§e'")
                 return@buildList
             }
 
@@ -388,7 +388,7 @@ object SkyHanniDebugsAndTests {
                 add("§einternal name: §7${internalName.asString()}")
                 add("§einternal name -> item name: '$itemName§e'")
                 val price = internalName.getPriceOrNull()?.let { "§6" + it.addSeparators() } ?: "§7null"
-                add("  §eprice: '§6${price}§e'")
+                add("  §eprice: '§6$price§e'")
                 return@buildList
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
index d038d7759a4f..9b23b47a93e7 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
@@ -26,10 +26,10 @@ object CopyItemCommand {
             val tag = compound.getTag(s)
 
             if (tag !is NBTTagCompound) {
-                list.add("${text}${s}: $tag")
+                list.add("$text$s: $tag")
             } else {
                 val element = compound.getCompoundTag(s)
-                list.add("${text}${s}:")
+                list.add("$text$s:")
                 recurseTag(element, "$text  ", list)
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 5f52508f2141..198f7c0a00d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -27,7 +27,6 @@ import net.minecraft.entity.monster.EntityEnderman
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.potion.Potion
-import net.minecraft.scoreboard.ScorePlayerTeam
 import net.minecraft.tileentity.TileEntity
 import net.minecraft.util.AxisAlignedBB
 import net.minecraftforge.client.event.RenderLivingEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
index 2975d57e2461..cd85646341fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
@@ -193,7 +193,7 @@ class SkyHanniBucketedItemTracker<E : Enum<E>, BucketedData : BucketedItemTracke
         add("§eControl + Click to remove this item!")
         if (SkyHanniMod.feature.dev.debug.enabled) {
             add("")
-            add("§7${internalName}")
+            add("§7$internalName")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 3cadd767b5a9..3295880b9c85 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -189,7 +189,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
 
         if (SkyHanniMod.feature.dev.debug.enabled) {
             add("")
-            add("§7${internalName}")
+            add("§7$internalName")
         }
     }
 

From e70a67bd5f4e0f0ca17bb1dd836a857b03c30cca Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 29 Sep 2024 10:20:56 +0200
Subject: [PATCH 588/721] Feature: Ultimate Enchant Star (#2612)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../features/inventory/InventoryConfig.java   |  6 ++++
 .../features/inventory/UltimateEnchantStar.kt | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/UltimateEnchantStar.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 510f953ca2f9..6e064ced6420 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -231,6 +231,12 @@ public String toString() {
     @FeatureToggle
     public boolean itemStars = false;
 
+    @Expose
+    @ConfigOption(name = "Ultimate Enchant Star", desc = "Show a star on Enchanted Books with an Ultimate Enchant.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean ultimateEnchantStar = false;
+
     @Expose
     @ConfigOption(name = "Missing Tasks", desc = "Highlight missing tasks in the SkyBlock Level Guide inventory.")
     // TODO move( , "inventory.highlightMissingSkyBlockLevelGuide", "inventory.skyblockGuideConfig.highlightMissingSkyBlockLevelGuide")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/UltimateEnchantStar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/UltimateEnchantStar.kt
new file mode 100644
index 000000000000..315d9822b7ba
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/UltimateEnchantStar.kt
@@ -0,0 +1,28 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.RenderItemTipEvent
+import at.hannibal2.skyhanni.events.RenderObject
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
+import net.minecraft.init.Items
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object UltimateEnchantStar {
+
+    private val config get() = SkyHanniMod.feature.inventory
+
+    @SubscribeEvent
+    fun onRenderItemTip(event: RenderItemTipEvent) {
+        if (!isEnabled()) return
+        if (event.stack.item != Items.enchanted_book) return
+        val enchants = event.stack.getEnchantments() ?: return
+        if (enchants.size != 1 || !enchants.keys.first().startsWith("ultimate_")) return
+        event.renderObjects += RenderObject("§d✦", -10, -10)
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.ultimateEnchantStar
+
+}

From 3569dec0ab32c357eb34cff79c200f379f3d19ce Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:14:10 +0200
Subject: [PATCH 589/721] made path find condition not optional

---
 src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt   | 6 +++---
 .../skyhanni/features/event/hoppity/HoppityEggLocator.kt   | 2 +-
 .../skyhanni/features/misc/pathfind/NavigationHelper.kt    | 7 +++----
 .../at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt   | 2 +-
 .../hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt  | 6 ++++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index bd417e5f75ea..73915c22d183 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -391,7 +391,7 @@ object IslandGraphs {
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
         allowRerouting: Boolean = false,
-        condition: () -> Boolean = { true },
+        condition: () -> Boolean,
     ) {
         reset()
         currentTargetNode = this
@@ -415,7 +415,7 @@ object IslandGraphs {
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
         showGoalExact: Boolean = false,
-        condition: () -> Boolean = { true },
+        condition: () -> Boolean,
     ) {
         reset()
         shouldAllowRerouting = false
@@ -428,7 +428,7 @@ object IslandGraphs {
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
         showGoalExact: Boolean = false,
-        condition: () -> Boolean = { true },
+        condition: () -> Boolean,
     ) {
         currentTarget = location
         this.label = label
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index dbe06fbf991f..7a5e726d2f06 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -333,7 +333,7 @@ object HoppityEggLocator {
         HoppityEggLocations.apiEggLocations[LorenzUtils.skyBlockIsland]?.let {
             for ((i, location) in it.values.withIndex()) {
                 if (i == target) {
-                    IslandGraphs.pathFind(location, "Hoppity Test")
+                    IslandGraphs.pathFind(location, "Hoppity Test", condition = { true })
                     return
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index 48719e63e2a6..f3dc20df66e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -58,13 +58,12 @@ object NavigationHelper {
             val distance = distances[node]!!.roundTo(1)
             val component = "$name §e$distance".asComponent()
             component.onClick {
-//                 node.pathFind(label = node.name!!, allowRerouting = true)
-                node.pathFind(label = name, allowRerouting = true)
+                node.pathFind(label = name, allowRerouting = true, condition = { true })
                 sendNavigateMessage(name, goBack)
             }
             val tag = node.tags.first { it in allowedTags }
-            val d = "Name: $name\n§7Type: §r${tag.displayName}\n§7Distance: §e$distance blocks\n§eClick to start navigating!"
-            component.hover = d.asComponent()
+            val hoverText = "Name: $name\n§7Type: §r${tag.displayName}\n§7Distance: §e$distance blocks\n§eClick to start navigating!"
+            component.hover = hoverText.asComponent()
             component
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 3fc4e265d847..6c34feddaf1f 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -126,7 +126,7 @@ object SkyHanniDebugsAndTests {
         val location = LorenzVec(x, y, z)
         testLocation = location
         if (args.getOrNull(3) == "pathfind") {
-            IslandGraphs.pathFind(location, "/shtestwaypoint", showGoalExact = true)
+            IslandGraphs.pathFind(location, "/shtestwaypoint", showGoalExact = true, condition = { true })
         }
         ChatUtils.chat("set test waypoint")
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
index 75d8c3ea2914..ca65ae87f113 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditorBugFinder.kt
@@ -86,13 +86,15 @@ object GraphEditorBugFinder {
             }
             val closestForeignNode = closestForeignNodes.minBy { it.position.distanceSqToPlayer() }
             val closestNodeToForeignNode = closestCluster.minBy { it.position.distanceSq(closestForeignNode.position) }
-            closestNodeToForeignNode.pathFind("Graph Editor Bug", Color.RED)
+            closestNodeToForeignNode.pathFind("Graph Editor Bug", Color.RED, condition = { isEnabled() })
         }
 
         println("found $bugs bugs!")
         this.errorsInWorld = errorsInWorld
         if (clusters.size <= 1) {
-            errorsInWorld.keys.minByOrNull { it.position.distanceSqToPlayer() }?.pathFind("Graph Editor Bug", Color.RED)
+            errorsInWorld.keys.minByOrNull {
+                it.position.distanceSqToPlayer()
+            }?.pathFind("Graph Editor Bug", Color.RED, condition = { isEnabled() })
         }
     }
 

From 8988f7d34d706b909012dceea8bad65b4863ea44 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 29 Sep 2024 19:41:58 +1000
Subject: [PATCH 590/721] Backend: Detekt Fixes Part 4 (#2610)

---
 .../hannibal2/skyhanni/api/DataWatcherAPI.kt  |  2 +-
 .../nextstephelper/BingoNextStepHelper.kt     | 10 ++++-----
 .../UniqueGiftingOpportunitiesFeatures.kt     |  6 ++---
 .../event/hoppity/MythicRabbitPetWarning.kt   |  6 ++---
 .../fishing/tracker/FishingProfitTracker.kt   | 10 ++++-----
 .../fishing/tracker/SeaCreatureTracker.kt     | 10 ++++-----
 .../skyhanni/features/gui/BeaconPower.kt      |  4 ++--
 .../gui/customscoreboard/CustomScoreboard.kt  |  6 ++---
 .../SkyblockGuideHighlightFeature.kt          | 18 +++++++--------
 .../ExperimentationTableAPI.kt                |  5 +++--
 .../features/misc/UserLuckBreakdown.kt        | 22 +++++++++----------
 .../features/misc/limbo/LimboPlaytime.kt      |  4 ++--
 .../rift/everywhere/CruxTalismanDisplay.kt    |  4 ++--
 .../features/slayer/VampireSlayerFeatures.kt  | 16 ++++++++------
 .../skyhanni/utils/guide/GuideGUI.kt          | 18 +++++++--------
 .../skyhanni/utils/guide/GuideTab.kt          | 12 +++++-----
 .../skyhanni/utils/renderables/Searchable.kt  |  8 +++----
 17 files changed, 82 insertions(+), 79 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt
index 94931dd8caf8..e7e7fd2b5ac3 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt
@@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 @SkyHanniModule
 object DataWatcherAPI {
 
-    private val DATA_VALUE_CUSTOM_NAME = 2
+    private const val DATA_VALUE_CUSTOM_NAME = 2
 
     @SubscribeEvent
     fun onDataWatcherUpdate(event: DataWatcherUpdatedEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
index 427fbb902b71..2e56a536bc68 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
@@ -61,7 +61,7 @@ object BingoNextStepHelper {
     private val itemIslandRequired = mutableMapOf<String, IslandVisitStep>()
     private val itemPreconditions = mutableMapOf<String, NextStep>()
     private val islands = mutableMapOf<IslandType, IslandVisitStep>()
-    private val rhysTaskName = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)"
+    private const val RHYS_TASK_NAME = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)"
 
     private val finalSteps = mutableListOf<NextStep>()
     private var currentSteps = emptyList<NextStep>()
@@ -167,7 +167,7 @@ object BingoNextStepHelper {
                     }
                 }
             }
-            if (currentStep is PartialProgressItemsStep && currentStep.displayName == rhysTaskName && event.message == "§e[NPC] §dRhys§f: §rThank you for the items!§r") {
+            if (currentStep is PartialProgressItemsStep && currentStep.displayName == RHYS_TASK_NAME && event.message == "§e[NPC] §dRhys§f: §rThank you for the items!§r") {
                 currentStep.amountHavingHidden -= 10
             }
         }
@@ -365,7 +365,7 @@ object BingoNextStepHelper {
 
     private fun rhys() {
         val redstoneForRhys = PartialProgressItemsStep(
-            rhysTaskName,
+            RHYS_TASK_NAME,
             "Redstone",
             160 * 10,
             mapOf("Redstone" to 1, "Enchanted Redstone" to 160)
@@ -373,7 +373,7 @@ object BingoNextStepHelper {
         redstoneForRhys requires IslandType.DEEP_CAVERNS.getStep()
 
         val lapisForRhys = PartialProgressItemsStep(
-            rhysTaskName,
+            RHYS_TASK_NAME,
             "Lapis Lazuli",
             160 * 10,
             mapOf("Lapis Lazuli" to 1, "Enchanted Lapis Lazuli" to 160)
@@ -381,7 +381,7 @@ object BingoNextStepHelper {
         lapisForRhys requires IslandType.DEEP_CAVERNS.getStep()
 
         val coalForRhys = PartialProgressItemsStep(
-            rhysTaskName,
+            RHYS_TASK_NAME,
             "Coal",
             160 * 10,
             mapOf("Coal" to 1, "Enchanted Coal" to 160)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
index e24a66594edb..b1939a793bf3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt
@@ -57,12 +57,12 @@ object UniqueGiftingOpportunitiesFeatures {
 
     private fun isEnabled() = holdingGift
 
-    private val hasNotGiftedNametag = "§a§lꤥ"
-    private val hasGiftedNametag = "§c§lꤥ"
+    private const val HAS_NOT_GIFTED_NAMETAG = "§a§lꤥ"
+    private const val HAS_GIFTED_NAMETAG = "§c§lꤥ"
 
     private fun analyzeArmorStand(entity: EntityArmorStand) {
         if (!config.useArmorStandDetection) return
-        if (entity.name != hasGiftedNametag) return
+        if (entity.name != HAS_GIFTED_NAMETAG) return
 
         val matchedPlayer = EntityUtils.getEntitiesNearby<EntityPlayer>(entity.getLorenzVec(), 2.0)
             .singleOrNull { !it.isNPC() } ?: return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/MythicRabbitPetWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/MythicRabbitPetWarning.kt
index 8162f3a05e86..833583ad05bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/MythicRabbitPetWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/MythicRabbitPetWarning.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import kotlin.time.Duration.Companion.seconds
 
 object MythicRabbitPetWarning {
-    val mythicRabbit = "§dRabbit"
-    var lastCheck = SimpleTimeMark.farPast()
+    private const val MYTHIC_RABBIT_DISPLAY_NAME = "§dRabbit"
+    private var lastCheck = SimpleTimeMark.farPast()
 
     fun check() {
         if (!HoppityEggsManager.config.petWarning) return
@@ -21,7 +21,7 @@ object MythicRabbitPetWarning {
         }
     }
 
-    fun correctPet() = PetAPI.isCurrentPet(mythicRabbit)
+    fun correctPet() = PetAPI.isCurrentPet(MYTHIC_RABBIT_DISPLAY_NAME)
 
     private fun warn() {
         ChatUtils.chat("Use a §dMythic Rabbit Pet §efor more chocolate!")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index 12f3accd1de1..a3e86908762f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -98,8 +98,8 @@ object FishingProfitTracker {
 
     private val MAGMA_FISH by lazy { "MAGMA_FISH".asInternalName() }
 
-    private val nameAll: CategoryName = "All"
-    private var currentCategory: CategoryName = nameAll
+    private const val NAME_ALL: CategoryName = "All"
+    private var currentCategory: CategoryName = NAME_ALL
 
     private var itemCategories = mapOf<String, List<NEUInternalName>>()
 
@@ -110,7 +110,7 @@ object FishingProfitTracker {
 
     private fun getCurrentCategories(data: Data): Map<CategoryName, Int> {
         val map = mutableMapOf<CategoryName, Int>()
-        map[nameAll] = data.items.size
+        map[NAME_ALL] = data.items.size
         for ((name, items) in itemCategories) {
             val amount = items.count { it in data.items }
             if (amount > 0) {
@@ -145,7 +145,7 @@ object FishingProfitTracker {
         checkMissingItems(data)
         val list = amounts.keys.toList()
         if (currentCategory !in list) {
-            currentCategory = nameAll
+            currentCategory = NAME_ALL
         }
 
         if (tracker.isInventoryOpen()) {
@@ -160,7 +160,7 @@ object FishingProfitTracker {
             )
         }
 
-        val filter: (NEUInternalName) -> Boolean = if (currentCategory == nameAll) {
+        val filter: (NEUInternalName) -> Boolean = if (currentCategory == NAME_ALL) {
             { true }
         } else {
             val items = itemCategories[currentCategory]!!
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index b293c2736fbf..f050e56cdf95 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -55,12 +55,12 @@ object SeaCreatureTracker {
         }
     }
 
-    private val nameAll: CategoryName = "All"
-    private var currentCategory: CategoryName = nameAll
+    private const val NAME_ALL: CategoryName = "All"
+    private var currentCategory: CategoryName = NAME_ALL
 
     private fun getCurrentCategories(data: Data): Map<CategoryName, Int> {
         val map = mutableMapOf<CategoryName, Int>()
-        map[nameAll] = data.amount.size
+        map[NAME_ALL] = data.amount.size
         for ((category, names) in SeaCreatureManager.allVariants) {
             val amount = names.count { it in data.amount }
             if (amount > 0) {
@@ -103,7 +103,7 @@ object SeaCreatureTracker {
         val amounts = getCurrentCategories(data)
         val list = amounts.keys.toList()
         if (currentCategory !in list) {
-            currentCategory = nameAll
+            currentCategory = NAME_ALL
         }
 
         if (tracker.isInventoryOpen()) {
@@ -118,7 +118,7 @@ object SeaCreatureTracker {
             )
         }
 
-        return if (currentCategory == nameAll) {
+        return if (currentCategory == NAME_ALL) {
             { true }
         } else filterCurrentCategory()
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
index 76990b37ad98..8c68dc2c100b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt
@@ -58,8 +58,8 @@ object BeaconPower {
 
     private var display = ""
 
-    private val BEACON_POWER_SLOT = 22
-    private val STATS_SLOT = 23
+    private const val BEACON_POWER_SLOT = 22
+    private const val STATS_SLOT = 23
 
     @SubscribeEvent
     fun onInventoryUpdate(event: InventoryUpdatedEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index a3da970c660f..c9fb4b15f821 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -48,7 +48,7 @@ object CustomScoreboard {
 
     private var display = emptyList<ScoreboardElementType>()
     private var cache = emptyList<ScoreboardElementType>()
-    private val guiName = "Custom Scoreboard"
+    private const val GUI_NAME = "Custom Scoreboard"
 
     // Cached scoreboard data, only update after no change for 300ms
     var activeLines = emptyList<String>()
@@ -80,12 +80,12 @@ object CustomScoreboard {
 
         RenderBackground.updatePosition(finalRenderable)
 
-        config.position.renderRenderable(finalRenderable, posLabel = guiName)
+        config.position.renderRenderable(finalRenderable, posLabel = GUI_NAME)
     }
 
     @SubscribeEvent
     fun onGuiPositionMoved(event: GuiPositionMovedEvent) {
-        if (event.guiName == guiName) {
+        if (event.guiName == GUI_NAME) {
             with(alignmentConfig) {
                 if (horizontalAlignment != HorizontalAlignment.DONT_ALIGN ||
                     verticalAlignment != VerticalAlignment.DONT_ALIGN
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
index c34b0812538a..e0d7e207cc11 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
@@ -21,8 +21,8 @@ import org.intellij.lang.annotations.Language
 
 val patternGroup = RepoPattern.group("skyblockguide.highlight")
 
-private const val keyPrefixInventory = "inventory"
-private const val keyPrefixCondition = "condition"
+private const val KEY_PREFIX_INVENTORY = "inventory"
+private const val KEY_PREFIX_CONDITION = "condition"
 
 class SkyblockGuideHighlightFeature private constructor(
     private val config: () -> Boolean,
@@ -44,8 +44,8 @@ class SkyblockGuideHighlightFeature private constructor(
         onTooltip: (LorenzToolTipEvent) -> Unit = {},
     ) : this(
         config,
-        patternGroup.pattern("$key.$keyPrefixInventory", inventory),
-        patternGroup.pattern("$key.$keyPrefixCondition", loreCondition),
+        patternGroup.pattern("$key.$KEY_PREFIX_INVENTORY", inventory),
+        patternGroup.pattern("$key.$KEY_PREFIX_CONDITION", loreCondition),
         onSlotClicked,
         onTooltip
     )
@@ -59,7 +59,7 @@ class SkyblockGuideHighlightFeature private constructor(
         onTooltip: (LorenzToolTipEvent) -> Unit = {},
     ) : this(
         config,
-        patternGroup.pattern("$key.$keyPrefixInventory", inventory),
+        patternGroup.pattern("$key.$KEY_PREFIX_INVENTORY", inventory),
         loreCondition,
         onSlotClicked,
         onTooltip
@@ -132,13 +132,13 @@ class SkyblockGuideHighlightFeature private constructor(
         }
 
         private val taskOnlyCompleteOncePattern =
-            patternGroup.pattern("$keyPrefixCondition.once", "§7§eThis task can only be completed once!")
-        private val xPattern = patternGroup.pattern("$keyPrefixCondition.x", "§c ?✖.*")
+            patternGroup.pattern("$KEY_PREFIX_CONDITION.once", "§7§eThis task can only be completed once!")
+        private val xPattern = patternGroup.pattern("$KEY_PREFIX_CONDITION.x", "§c ?✖.*")
         private val totalProgressPattern =
-            patternGroup.pattern("$keyPrefixCondition.total", "§7Total Progress: §3\\d{1,2}(?:\\.\\d)?%")
+            patternGroup.pattern("$KEY_PREFIX_CONDITION.total", "§7Total Progress: §3\\d{1,2}(?:\\.\\d)?%")
         private val categoryProgressPattern =
             patternGroup.pattern(
-                "$keyPrefixCondition.category",
+                "$KEY_PREFIX_CONDITION.category",
                 "§7Progress to Complete Category: §6\\d{1,2}(?:\\.\\d)?%"
             )
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
index 0c7fc1a73d4e..25abb16ed82f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -35,12 +35,13 @@ object ExperimentationTableAPI {
     fun onInventoryUpdated(event: InventoryUpdatedEvent) {
         if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND || !inTable) return
 
-        val entity = EntityUtils.getEntities<EntityArmorStand>().find { it.hasSkullTexture(experimentationTableSkull) } ?: return
+        val entity = EntityUtils.getEntities<EntityArmorStand>().find { it.hasSkullTexture(EXPERIMENTATION_TABLE_SKULL) } ?: return
         val vec = entity.getLorenzVec()
         if (storage?.tablePos != vec) storage?.tablePos = vec
     }
 
-    private val experimentationTableSkull =
+    // TODO: Add to repo
+    private const val EXPERIMENTATION_TABLE_SKULL =
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTUyOWF" +
             "iYzg4MzA5NTNmNGQ5MWVkZmZmMjQ2OTVhOWY2Mjc1OGZhNGM1MWIyOWFjMjQ2YzM3NDllYWFlODliMyJ9fX0="
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
index f1fad4e63aca..63d64bbb01b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/UserLuckBreakdown.kt
@@ -38,19 +38,19 @@ object UserLuckBreakdown {
 
     private lateinit var mainLuckItem: ItemStack
     private val mainLuckID = "ENDER_PEARL".asInternalName()
-    private val mainLuckName = "§a✴ SkyHanni User Luck"
+    private const val MAIN_LUCK_NAME = "§a✴ SkyHanni User Luck"
 
     private lateinit var fillerItem: ItemStack
     private var fillerID = "STAINED_GLASS_PANE".asInternalName()
-    private val fillerName = " "
+    private const val FILLER_NAME = " "
 
     private lateinit var limboItem: ItemStack
     private var limboID = "ENDER_PEARL".asInternalName()
-    private val limboName = "§a✴ Limbo Personal Best"
+    private const val LIMBO_NAME = "§a✴ Limbo Personal Best"
 
     private lateinit var skillsItem: ItemStack
     private var skillsID = "DIAMOND_SWORD".asInternalName()
-    private val skillsName = "§a✴ Category: Skills"
+    private const val SKILLS_NAME = "§a✴ Category: Skills"
 
     private var showAllStats = true
 
@@ -63,7 +63,7 @@ object UserLuckBreakdown {
         "§7Show all stats: §.(?<toggle>.*)",
     )
 
-    private val luckTooltipString = "§5§o §a✴ SkyHanni User Luck §f"
+    private const val LUCK_TOOLTIP = "§5§o §a✴ SkyHanni User Luck §f"
     private var inCustomBreakdown = false
 
     private val validItemSlots = (10..53).filter { it !in listOf(17, 18, 26, 27, 35, 36) && it !in 44..53 }
@@ -178,7 +178,7 @@ object UserLuckBreakdown {
         if (lastIndex == -1) return
 
         val luckString = tryTruncateFloat(totalLuck)
-        event.toolTip.add(lastIndex, "$luckTooltipString$luckString")
+        event.toolTip.add(lastIndex, "$LUCK_TOOLTIP$luckString")
     }
 
     private fun statsBreakdownLoreTooltip(event: LorenzToolTipEvent, limboLuck: Float) {
@@ -205,7 +205,7 @@ object UserLuckBreakdown {
         if (totalLuck == 0f) return
 
         val luckString = tryTruncateFloat(totalLuck)
-        event.toolTip.add(lastIndex, "$luckTooltipString$luckString")
+        event.toolTip.add(lastIndex, "$LUCK_TOOLTIP$luckString")
     }
 
     private fun tryTruncateFloat(input: Float): String {
@@ -239,7 +239,7 @@ object UserLuckBreakdown {
     private fun createItems() {
         fillerItem = ItemUtils.createItemStack(
             fillerID.getItemStack().item,
-            fillerName,
+            FILLER_NAME,
             listOf(),
             1,
             15,
@@ -251,17 +251,17 @@ object UserLuckBreakdown {
 
         mainLuckItem = ItemUtils.createItemStack(
             mainLuckID.getItemStack().item,
-            "$mainLuckName §f${tryTruncateFloat(totalLuck)}",
+            "$MAIN_LUCK_NAME §f${tryTruncateFloat(totalLuck)}",
             *createItemLore("mainMenu", totalLuck),
         )
         limboItem = ItemUtils.createItemStack(
             limboID.getItemStack().item,
-            limboName,
+            LIMBO_NAME,
             *createItemLore("limbo", limboLuck),
         )
         skillsItem = ItemUtils.createItemStack(
             skillsID.getItemStack().item,
-            skillsName,
+            SKILLS_NAME,
             *createItemLore("skills"),
         )
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
index 1c46b40d6529..443f5c80b2ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt
@@ -43,7 +43,7 @@ object LimboPlaytime {
     private val enabled get() = SkyHanniMod.feature.misc.showLimboTimeInPlaytimeDetailed
 
     private val itemID = "ENDER_PEARL".asInternalName()
-    private val itemName = "§aLimbo"
+    private const val ITEM_NAME = "§aLimbo"
     private lateinit var limboItem: ItemStack
     private var lastCreateCooldown = SimpleTimeMark.farPast()
 
@@ -60,7 +60,7 @@ object LimboPlaytime {
             lastCreateCooldown = SimpleTimeMark.now()
             limboItem = ItemUtils.createItemStack(
                 itemID.getItemStack().item,
-                itemName,
+                ITEM_NAME,
                 *createItemLore()
             )
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index c333550f6349..9e92b0807129 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -28,7 +28,7 @@ object CruxTalismanDisplay {
         ".*(?<tier>§[0-9a-z][IV1-4-]+)\\s+(?<name>§[0-9a-z]\\w+)§[0-9a-z]:\\s*(?<progress>§[0-9a-z](?:§[0-9a-z])?MAXED|§[0-9a-z]\\d+§[0-9a-z]/§[0-9a-z]\\d+).*"
     )
 
-    private val partialName = "CRUX_TALISMAN"
+    private const val PARTIAL_NAME = "CRUX_TALISMAN"
     private var display = emptyList<List<Any>>()
     private val displayLine = mutableListOf<Crux>()
     private val bonusesLine = mutableListOf<String>()
@@ -91,7 +91,7 @@ object CruxTalismanDisplay {
     fun onSecondPassed(event: SecondPassedEvent) {
         if (!isEnabled()) return
         if (!event.repeatSeconds(2)) return
-        if (!InventoryUtils.getItemsInOwnInventory().any { it.getInternalName().startsWith(partialName) }) return
+        if (!InventoryUtils.getItemsInOwnInventory().any { it.getInternalName().startsWith(PARTIAL_NAME) }) return
 
         displayLine.clear()
         bonusesLine.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
index f60517e4c959..57aa65e53527 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
@@ -60,9 +60,11 @@ object VampireSlayerFeatures {
     // Nicked support
     private val username
         get() = EntityUtils.getEntities<EntityPlayerSP>().firstOrNull()?.name ?: error("own player is null")
-    private val bloodIchorTexture =
+
+    // TODO: Add to repo
+    private const val BLOOD_ICHOR_TEXTURE =
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAzNDA5MjNhNmRlNDgyNWExNzY4MTNkMTMzNTAzZWZmMTg2ZGIwODk2ZTMyYjY3MDQ5MjhjMmEyYmY2ODQyMiJ9fX0="
-    private val killerSpringTexture =
+    private const val KILLER_SPRING_TEXTURE =
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzdmN2E3YmM4YWM4NmYyM2NhN2JmOThhZmViNzY5NjAyMjdlMTgzMmZlMjA5YTMwMjZmNmNlYjhiZGU3NGY1NCJ9fX0="
     private var nextClawSend = 0L
 
@@ -82,8 +84,8 @@ object VampireSlayerFeatures {
             for (stand in EntityUtils.getEntities<EntityArmorStand>()) {
                 val vec = stand.position.toLorenzVec()
                 val distance = start.distance(vec)
-                val isIchor = stand.hasSkullTexture(bloodIchorTexture)
-                if (isIchor || stand.hasSkullTexture(killerSpringTexture)) {
+                val isIchor = stand.hasSkullTexture(BLOOD_ICHOR_TEXTURE)
+                if (isIchor || stand.hasSkullTexture(KILLER_SPRING_TEXTURE)) {
                     val color = (if (isIchor) configBloodIchor.color else configKillerSpring.color)
                         .toChromaColor().withAlpha(config.withAlpha)
                     if (distance <= 15) {
@@ -275,8 +277,8 @@ object VampireSlayerFeatures {
         for (stand in Minecraft.getMinecraft().theWorld.loadedEntityList.filterIsInstance<EntityArmorStand>()) {
             val vec = stand.position.toLorenzVec()
             val distance = start.distance(vec)
-            val isIchor = stand.hasSkullTexture(bloodIchorTexture)
-            val isSpring = stand.hasSkullTexture(killerSpringTexture)
+            val isIchor = stand.hasSkullTexture(BLOOD_ICHOR_TEXTURE)
+            val isSpring = stand.hasSkullTexture(KILLER_SPRING_TEXTURE)
             if (!(isIchor && config.bloodIchor.highlight) && !(isSpring && config.killerSpring.highlight)) continue
             val color = (if (isIchor) configBloodIchor.color else configKillerSpring.color)
                 .toChromaColor().withAlpha(config.withAlpha)
@@ -336,7 +338,7 @@ object VampireSlayerFeatures {
         for (player in EntityUtils.getEntitiesNearby<EntityOtherPlayerMP>(loc, 3.0)) {
             if (!player.isHighlighted() || event.type != EnumParticleTypes.ENCHANTMENT_TABLE) continue
             for (stand in EntityUtils.getEntitiesNearby<EntityArmorStand>(event.location, 3.0)) {
-                if (stand.hasSkullTexture(killerSpringTexture) || stand.hasSkullTexture(bloodIchorTexture)) {
+                if (stand.hasSkullTexture(KILLER_SPRING_TEXTURE) || stand.hasSkullTexture(BLOOD_ICHOR_TEXTURE)) {
                     standList = standList.editCopy { this[stand] = player }
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideGUI.kt b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideGUI.kt
index 944a3201a797..4e06b22ea695 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideGUI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideGUI.kt
@@ -8,11 +8,11 @@ import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.item.ItemStack
 
-const val selectedColor = 0x50000000
-const val notSelectedColor = 0x50303030
-const val tabSpacing = 5
-const val tabShortSide = 25
-const val tabLongSide = 28
+const val SELECTED_COLOR = 0x50000000
+const val NOT_SELECTED_COLOR = 0x50303030
+const val TAB_SPACING = 5
+const val TAB_SHORT_SIDE = 25
+const val TAB_LONG_SIDE = 28
 
 abstract class GuideGUI<pageEnum : Enum<*>>(defaultScreen: pageEnum) : GuiScreen() {
 
@@ -50,11 +50,11 @@ abstract class GuideGUI<pageEnum : Enum<*>>(defaultScreen: pageEnum) : GuiScreen
     }
 
     private fun renderHorizontalTabs() {
-        var offset = Pair(tabSpacing.toFloat() * 3f, -tabLongSide.toFloat())
+        var offset = Pair(TAB_SPACING.toFloat() * 3f, -TAB_LONG_SIDE.toFloat())
         GlStateManager.translate(offset.first, offset.second, 0f)
         for (tab in horizontalTabs) {
             tab.render(offset.first.toInt(), offset.second.toInt())
-            val xShift = (tabShortSide + tabSpacing).toFloat()
+            val xShift = (TAB_SHORT_SIDE + TAB_SPACING).toFloat()
             offset = offset.first + xShift to offset.second
             GlStateManager.translate(xShift, 0f, 0f)
         }
@@ -62,11 +62,11 @@ abstract class GuideGUI<pageEnum : Enum<*>>(defaultScreen: pageEnum) : GuiScreen
     }
 
     private fun renderVerticalTabs() {
-        var offset = Pair(-tabLongSide.toFloat(), tabSpacing.toFloat() * 3f)
+        var offset = Pair(-TAB_LONG_SIDE.toFloat(), TAB_SPACING.toFloat() * 3f)
         GlStateManager.translate(offset.first, offset.second, 0f)
         for (tab in verticalTabs) {
             tab.render(offset.first.toInt(), offset.second.toInt())
-            val yShift = (tabShortSide + tabSpacing).toFloat()
+            val yShift = (TAB_SHORT_SIDE + TAB_SPACING).toFloat()
             offset = offset.first to offset.second + yShift
             GlStateManager.translate(0f, yShift, 0f)
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
index acc69c8cccab..231402d330f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
@@ -28,19 +28,19 @@ class GuideTab(
     }
 
     fun select() {
-        selectColor = selectedColor
+        selectColor = SELECTED_COLOR
     }
 
     fun unSelect() {
-        selectColor = notSelectedColor
+        selectColor = NOT_SELECTED_COLOR
     }
 
-    fun isSelected() = selectColor == selectedColor
+    fun isSelected() = selectColor == SELECTED_COLOR
 
-    val width = if (isVertical) tabLongSide else tabShortSide
-    val height = if (isVertical) tabShortSide else tabLongSide
+    val width = if (isVertical) TAB_LONG_SIDE else TAB_SHORT_SIDE
+    val height = if (isVertical) TAB_SHORT_SIDE else TAB_LONG_SIDE
 
-    private var selectColor = notSelectedColor
+    private var selectColor = NOT_SELECTED_COLOR
 
     private val renderable = Renderable.clickAndHover(object : Renderable {
         override val width = this@GuideTab.width
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
index 4a81830a8728..d2191462f40a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Searchable.kt
@@ -9,14 +9,14 @@ fun Renderable.toSearchable(searchText: String? = null) = Searchable(this, searc
 fun Searchable.toRenderable() = renderable
 fun List<Searchable>.toRenderable() = map { it.toRenderable() }
 fun List<Searchable>.toMap() = associate { it.renderable to it.string }
-val searchPrefix = "§eSearch: §7"
+const val SEARCH_PREFIX = "§eSearch: §7"
 fun List<Searchable>.buildSearchBox(
     textInput: TextInput,
 ): Renderable {
     val key = 0
     return Renderable.searchBox(
         Renderable.verticalSearchableContainer(toMap(), textInput = textInput, key = key + 1),
-        searchPrefix,
+        SEARCH_PREFIX,
         onUpdateSize = { println("onUpdateSize") },
         textInput = textInput,
         key = key,
@@ -39,7 +39,7 @@ fun List<Searchable>.buildSearchableScrollable(
             scrollValue = scrollValue,
             velocity = velocity,
         ),
-        searchPrefix,
+        SEARCH_PREFIX,
         onUpdateSize = { println("onUpdateSize") },
         textInput = textInput,
         key = key,
@@ -51,7 +51,7 @@ fun Map<List<Renderable>, String?>.buildSearchableTable(): Renderable {
     val key = 0
     return Renderable.searchBox(
         Renderable.searchableTable(toMap(), textInput = textInput, key = key + 1),
-        searchPrefix,
+        SEARCH_PREFIX,
         onUpdateSize = { println("onUpdateSize") },
         textInput = textInput,
         key = key,

From 81bf379423633cbfa4f549f099a3fe8ef7e898c5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 30 Sep 2024 01:05:57 +0200
Subject: [PATCH 591/721] Version 0.27 Beta 13

---
 docs/CHANGELOG.md | 23 +++++++++++++++++++++++
 docs/FEATURES.md  |  5 +++++
 root.gradle.kts   |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 33d0b77c7433..64e1288718f0 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -93,6 +93,8 @@
     + Shows attempts and XP since the last ULTRA-RARE.
 + Added Experiments Profit Tracker. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2171)
     + Tracks profits in Coins and Enchanting XP.
++ Added Ultimate Enchant Star. - Empa (https://github.com/hannibal002/SkyHanni/pull/2612)
+    + Shows a star on Enchanted Books with an Ultimate Enchant.
 
 #### Chat Features
 
@@ -134,6 +136,11 @@
     + Includes an option to warn you when to throw your rod.
     + Shows how weak the golden fish is, as a nametag.
     + Also works on Stranded.
++ Added an alert for Gold or Diamond Trophy Fish catches. - ReyMaratov (https://github.com/hannibal002/SkyHanni/pull/2615)
+    + Displays a popup with the trophy name, rarity, and amount of the catch.
+    + Optionally, also plays a sound.+ Added an alert for Gold or Diamond Trophy Fish catches. - ReyMaratov (https://github.com/hannibal002/SkyHanni/pull/2615)
+  + Displays a popup with the trophy name, rarity, and amount of the catch.
+  + Optionally, also plays a sound.
 
 #### Misc Features
 
@@ -200,6 +207,7 @@
 + Added exceptions to the enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2254)
     + Stonk and non-mining tools with Efficiency 5 use the maximum enchant color.
 + Added a short cooldown between Experimentation Table Guardian Pet chat warnings. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2459)
++ Prevented the SB Menu from replacing items from Dungeons and Kuudra that are placed in the item pickup log. - Fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2599)
 
 #### Chat Improvements
 
@@ -226,6 +234,7 @@
 
 + Made the "Line to Arachne" width configurable. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/2406)
 + Made the "Line to Miniboss" width configurable. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/2406)
++ Added item cooldown support for Blaze Flares. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2601)+ Added item cooldown support for Blaze Flares. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2601)
 
 #### Config Improvements
 
@@ -264,6 +273,9 @@
 + Improved the performance of pathfinding logic in Area Navigation. - nea (https://github.com/hannibal002/SkyHanni/pull/2537)
 + Added a toggle to force the `en_US` locale for number formatting. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2563)
 + Queued GfS will now always fall back to a default amount if one is not specified. - Luna (https://github.com/hannibal002/SkyHanni/pull/2584)
++ Improved pathfinding. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2597)
+    + The line to the target no longer jumps around as much.
+    + Progress to the target now shows up in chat, displaying blocks remaining and percentage completed. Clicking on the chat message cancels the pathfinding.
 
 ### Fixes
 
@@ -296,6 +308,11 @@
 + Fixed Estimated Item Value incorrectly showing all Kuudra armor as starred. - Luna (https://github.com/hannibal002/SkyHanni/pull/2550)
 + Fixed Experiments Profit Tracker & Superpair Data. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2560)
 + Fixed price per unit for Stonk of Stonks auction not working for the bracket you are in. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2572)
++ Fixed bugs in the Experiments Profit Tracker. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2594)
+    + Corrected the count for bottles applied while being inside the experimentation table.
+    + Fixed `/shedittracker` support not functioning properly.
++ Fixed an issue where the item stack size on Diamond/Golden Heads and Master Skulls could be incorrect. - Fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2611)
++ Fixed item category detection for recombobulated items. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2608)
 
 #### Mining Fixes
 
@@ -320,6 +337,7 @@
 + Fixed some blocks in the Crystal Hollows being detected as Mithril instead of Hard Stone. - Luna (https://github.com/hannibal002/SkyHanni/pull/2580)
 + Fixed "Mining Commissions Block Color" causing OptiFine connected textures not to connect properly. - nopo (https://github.com/hannibal002/SkyHanni/pull/2577)
 + Fixed the Mineshaft Pity Counter not working in the Great Glacite Lake. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2565)
++ Fixed Powder Tracker inaccuracies. - Empa (https://github.com/hannibal002/SkyHanni/pull/2591)
 
 #### Scoreboard Fixes
 
@@ -342,6 +360,7 @@
 + Fixed a Custom Scoreboard error while in the Dojo. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2519)
 + Fixed a Custom Scoreboard error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2510)
 + Fixed Custom Scoreboard error during the Raffle Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2545)
++ Fixed both the Custom Scoreboard Active and Starting Soon Tab List events being active simultaneously in the Garden. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2592)
 
 #### Hoppity Fixes
 
@@ -351,6 +370,7 @@
 + Fixed minor formatting issues with Hoppity Event Summary. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2416)
 + Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
 + Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
++ Fixed inconsistencies in Hoppity Duplicate Number counts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2595)
 
 #### Chat Fixes
 
@@ -382,6 +402,8 @@
 
 + Updated Ghost Counter bestiary tiers to reflect Hypixel reducing the max kills needed from 250K to 100K. - Luna (https://github.com/hannibal002/SkyHanni/pull/2533)
 + Fixed a case where the Broodmother countdown could be wildly inaccurate. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2513)
++ Fixed Flare Display spamming chat with negative values when the server is lagging. - Stella (https://github.com/hannibal002/SkyHanni/pull/2567)
++ Fixed a case where the Imminent stage did not update the Broodmother countdown. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2602)v
 
 #### The Carnival Fixes
 
@@ -480,6 +502,7 @@
     + These are added as a layer between SkyHanni and NEU so that we are not reliant on NEU functions.
 + Added Blossom Gradle plugin for token replacement in code. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2558)
     + `@MOD_VERSION@` is now a token that will be replaced.
++ Added `detekt` runner to the build process. - Daveed & nea (https://github.com/hannibal002/SkyHanni/pull/2547)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index 0783d9e09f82..d78a2114dfbf 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -224,6 +224,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Can be enabled/disabled on the Item Number list.
 + Item Pickup Log. - catgirlseraid (https://github.com/hannibal002/SkyHanni/pull/1937)
 + Display the price per Stonk when taking the minimum bid in the Stonks Auction (Richard Menu). - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2195)
++ Added Ultimate Enchant Star. - Empa (https://github.com/hannibal002/SkyHanni/pull/2612)
+    + Shows a star on Enchanted Books with an Ultimate Enchant.
 
 </details>
 <details open><summary>
@@ -369,6 +371,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Includes an option to warn you when to throw your rod.
     + Shows how weak the golden fish is, as a nametag.
     + Also works on Stranded.
++ Added an alert for Gold or Diamond Trophy Fish catches. - ReyMaratov (https://github.com/hannibal002/SkyHanni/pull/2615)
+    + Displays a popup with the trophy name, rarity, and amount of the catch.
+    + Optionally, also plays a sound.
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 79dbe9ffba6f..9eb7a0854868 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.12"
+    version = "0.27.Beta.13"
     repositories {
         mavenCentral()
         mavenLocal()

From e4e8a313b66d67107a64db9873996ec58d76566d Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Mon, 30 Sep 2024 00:44:22 +0100
Subject: [PATCH 592/721] Feature: West Village/Dreadfarm/Living Cave features
 (#2616)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |   2 +-
 .../features/rift/EnigmaSoulConfig.java       |   5 +
 .../area/dreadfarm/WiltedBerberisConfig.java  |   7 +-
 .../LivingCaveLivingMetalConfig.java          |   7 +
 .../area/westvillage/GunthersRaceConfig.java  |  33 ++++
 .../area/westvillage/WestVillageConfig.java   |  15 +-
 .../jsonobjects/repo/RiftWoodenButtonsJson.kt |  13 ++
 .../skyhanni/data/model/GraphNodeTag.kt       |   1 +
 .../skyhanni/features/rift/RiftAPI.kt         |  11 +-
 .../dreadfarm/RiftWiltedBerberisHelper.kt     |  31 ++-
 .../area/dreadfarm/WoodenButtonsHelper.kt     | 184 ++++++++++++++++++
 .../livingcave/LivingCaveLivingMetalHelper.kt |   8 +-
 .../rift/area/westvillage/RiftGunthersRace.kt | 117 +++++++++++
 .../area/westvillage/VerminHighlighter.kt     |   5 +-
 .../rift/area/westvillage/VerminTracker.kt    |   5 +-
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |  18 +-
 .../features/rift/everywhere/RiftTimer.kt     |  44 +++--
 .../hannibal2/skyhanni/utils/ParkourHelper.kt |   7 +-
 18 files changed, 461 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftWoodenButtonsJson.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index b9f21ca2255c..aa15461f5af2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 59
+    const val CONFIG_VERSION = 60
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
index f64a42506043..69a87bd31660 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java
@@ -32,4 +32,9 @@ public class EnigmaSoulConfig {
     @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.")
     @ConfigEditorColour
     public String color = "0:245:219:27:198";
+
+    @Expose
+    @ConfigOption(name = "Buttons Helper", desc = "Help find all 56 wooden buttons required for the Buttons soul when tracking it.")
+    @ConfigEditorBoolean
+    public boolean showButtonsHelper = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/WiltedBerberisConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/WiltedBerberisConfig.java
index eddcb740d96d..2aa89f66ea6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/WiltedBerberisConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/WiltedBerberisConfig.java
@@ -21,7 +21,10 @@ public class WiltedBerberisConfig {
     @Expose
     @ConfigOption(name = "Hide Particles", desc = "Hide the Wilted Berberis particles.")
     @ConfigEditorBoolean
-    // TODO fix typo
-    public boolean hideparticles = false;
+    public boolean hideParticles = false;
 
+    @Expose
+    @ConfigOption(name = "Mute Others Sounds", desc = "Mute nearby Wilted Berberis sounds while not holding a Wand of Farming or not standing on Farmland blocks.")
+    @ConfigEditorBoolean
+    public boolean muteOthersSounds = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveLivingMetalConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveLivingMetalConfig.java
index 38f60870f5ac..4053070e3375 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveLivingMetalConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveLivingMetalConfig.java
@@ -3,7 +3,9 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
 
 public class LivingCaveLivingMetalConfig {
 
@@ -19,4 +21,9 @@ public class LivingCaveLivingMetalConfig {
     @FeatureToggle
     public boolean hideParticles = false;
 
+    @Expose
+    @ConfigOption(name = "Color", desc = "Set the color to highlight the blocks in.")
+    @ConfigEditorColour
+    public Property<String> color = Property.of("0:255:85:255:255");
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
new file mode 100644
index 000000000000..beb4acc9e3a0
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
@@ -0,0 +1,33 @@
+package at.hannibal2.skyhanni.config.features.rift.area.westvillage;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+
+public class GunthersRaceConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Show the route for Gunther's rift race.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Look Ahead", desc = "Change how many waypoints should be shown in front of you.")
+    @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1)
+    public Property<Integer> lookAhead = Property.of(3);
+
+    @Expose
+    @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
+    @ConfigEditorBoolean
+    public Property<Boolean> rainbowColor = Property.of(true);
+
+    @Expose
+    @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the guide waypoints.")
+    @ConfigEditorColour
+    public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/WestVillageConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/WestVillageConfig.java
index 5dbf1a231eff..fa6db52144b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/WestVillageConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/WestVillageConfig.java
@@ -6,11 +6,6 @@
 
 public class WestVillageConfig {
 
-    @ConfigOption(name = "Kloon Hacking", desc = "")
-    @Accordion
-    @Expose
-    public KloonHackingConfig hacking = new KloonHackingConfig();
-
     @ConfigOption(name = "Vermin Tracker", desc = "Track all vermins collected.")
     @Accordion
     @Expose
@@ -20,4 +15,14 @@ public class WestVillageConfig {
     @Accordion
     @Expose
     public VerminHighlightConfig verminHighlight = new VerminHighlightConfig();
+
+    @ConfigOption(name = "Gunther's Race", desc = "")
+    @Accordion
+    @Expose
+    public GunthersRaceConfig gunthersRace = new GunthersRaceConfig();
+
+    @ConfigOption(name = "Kloon Hacking", desc = "")
+    @Accordion
+    @Expose
+    public KloonHackingConfig hacking = new KloonHackingConfig();
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftWoodenButtonsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftWoodenButtonsJson.kt
new file mode 100644
index 000000000000..fdc4befe785f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftWoodenButtonsJson.kt
@@ -0,0 +1,13 @@
+package at.hannibal2.skyhanni.data.jsonobjects.repo
+
+import at.hannibal2.skyhanni.utils.LorenzVec
+import com.google.gson.annotations.Expose
+
+data class RiftWoodenButtonsJson(
+    @Expose val houses: Map<String, List<ButtonSpots>>
+)
+
+data class ButtonSpots(
+    @Expose val position: LorenzVec,
+    @Expose val buttons: List<LorenzVec>
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
index 6bf00edafcf6..8efcf4621e37 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/GraphNodeTag.kt
@@ -42,6 +42,7 @@ enum class GraphNodeTag(
 
     // Rift
     RIFT_ENIGMA("rift_enigma", LorenzColor.DARK_PURPLE, "Enigma Soul", "Enigma Souls in the Rift.", onlyIsland = IslandType.THE_RIFT),
+    RIFT_BUTTONS_QUEST("rift_buttons_quest", LorenzColor.LIGHT_PURPLE, "Wooden Buttons", "A spot to hit wooden buttons for the Dreadfarm Enigma Soul.", onlyIsland = IslandType.THE_RIFT),
     RIFT_EYE("rift_eye", LorenzColor.DARK_RED, "Rift Eye", "An Eye in the Rift to teleport to.", onlyIsland = IslandType.THE_RIFT),
     RIFT_MONTEZUMA(
         "rift_montezuma",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
index 844ac0227da4..48fa8d03fce6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
@@ -21,6 +21,11 @@ object RiftAPI {
 
     val farmingTool by lazy { "FARMING_WAND".asInternalName() }
 
+    private val blowgun by lazy  { "BERBERIS_BLOWGUN".asInternalName() }
+
+    val ItemStack?.isBlowgun: Boolean
+        get() = this?.getInternalName() == blowgun
+
     fun ItemStack.motesNpcPrice(): Double? {
         val baseMotes = motesPrice[getInternalName()] ?: return null
         val burgerStacks = config.motes.burgerStacks
@@ -28,9 +33,13 @@ object RiftAPI {
         return pricePer * stackSize
     }
 
+    var inRiftRace = false
+    var trackingButtons = false
+    var allButtonsHit = false
+
     fun inLivingCave() = LorenzUtils.skyBlockArea == "Living Cave"
     fun inLivingStillness() = LorenzUtils.skyBlockArea == "Living Stillness"
     fun inStillgoreChateau() = LorenzUtils.skyBlockArea.let { it == "Stillgore Château" || it == "Oubliette" }
-
     fun inDreadfarm() = LorenzUtils.skyBlockArea == "Dreadfarm"
+    fun inWestVillage() = LorenzUtils.skyBlockArea.let { it == "West Village" || it == "Infested House" }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
index e1664e6c8087..9ff96213b3fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
@@ -1,7 +1,9 @@
 package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -56,10 +58,9 @@ object RiftWiltedBerberisHelper {
         }
     }
 
-    private fun nearestBerberis(location: LorenzVec): WiltedBerberis? {
-        return list.filter { it.currentParticles.distanceSq(location) < 8 }
+    private fun nearestBerberis(location: LorenzVec): WiltedBerberis? =
+        list.filter { it.currentParticles.distanceSq(location) < 8 }
             .minByOrNull { it.currentParticles.distanceSq(location) }
-    }
 
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
@@ -70,13 +71,13 @@ object RiftWiltedBerberisHelper {
         val berberis = nearestBerberis(location)
 
         if (event.type != EnumParticleTypes.FIREWORKS_SPARK) {
-            if (config.hideparticles && berberis != null) {
+            if (config.hideParticles && berberis != null) {
                 event.cancel()
             }
             return
         }
 
-        if (config.hideparticles) {
+        if (config.hideParticles) {
             event.cancel()
         }
 
@@ -106,6 +107,16 @@ object RiftWiltedBerberisHelper {
         }
     }
 
+    @SubscribeEvent
+    fun onPlaySound(event: PlaySoundEvent) {
+        if (!isMuteOthersSoundsEnabled()) return
+        val soundName = event.soundName
+
+        if (soundName == "mob.horse.donkey.death" || soundName == "mob.horse.donkey.hit") {
+            event.cancel()
+        }
+    }
+
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
@@ -133,6 +144,11 @@ object RiftWiltedBerberisHelper {
         }
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(60, "rift.area.dreadfarm.wiltedBerberis.hideparticles", "rift.area.dreadfarm.wiltedBerberis.hideParticles")
+    }
+
     private fun axisAlignedBB(loc: LorenzVec) = loc.add(0.1, -0.1, 0.1).boundingToOffset(0.8, 1.0, 0.8).expandBlock()
 
     private fun LorenzVec.fixLocation(wiltedBerberis: WiltedBerberis): LorenzVec {
@@ -143,4 +159,9 @@ object RiftWiltedBerberisHelper {
     }
 
     private fun isEnabled() = RiftAPI.inRift() && RiftAPI.inDreadfarm() && config.enabled
+
+    private fun isMuteOthersSoundsEnabled() = RiftAPI.inRift() &&
+        config.muteOthersSounds &&
+        (RiftAPI.inDreadfarm() || RiftAPI.inWestVillage()) &&
+        !(hasFarmingToolInHand && isOnFarmland)
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
new file mode 100644
index 000000000000..d2413cc3ae63
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
@@ -0,0 +1,184 @@
+package at.hannibal2.skyhanni.features.rift.area.dreadfarm
+
+import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.jsonobjects.repo.RiftWoodenButtonsJson
+import at.hannibal2.skyhanni.data.model.GraphNode
+import at.hannibal2.skyhanni.data.model.GraphNodeTag
+import at.hannibal2.skyhanni.events.BlockClickEvent
+import at.hannibal2.skyhanni.events.ItemClickEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.RiftAPI.isBlowgun
+import at.hannibal2.skyhanni.features.rift.everywhere.EnigmaSoulWaypoints.soulLocations
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
+import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.block.BlockButtonWood
+import net.minecraft.init.Blocks
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object WoodenButtonsHelper {
+
+    private val config get() = RiftAPI.config.enigmaSoulWaypoints
+
+    private val patternGroup = RepoPattern.group("rift.area.dreadfarm.buttons")
+
+    /**
+     * REGEX-TEST: §eYou have hit §r§b1/56 §r§eof the wooden buttons!
+     * REGEX-TEST: §eYou have hit §r§b10/56 §r§eof the wooden buttons!
+     */
+    private val buttonHitPattern by patternGroup.pattern(
+        "hit",
+        "§eYou have hit §r§b\\d+/56 §r§eof the wooden buttons!",
+    )
+
+    private var buttonLocations = mapOf<String, List<LorenzVec>>()
+    private var hitButtons = mutableSetOf<LorenzVec>()
+    private var lastHitButton: LorenzVec? = null
+    private var currentSpot: GraphNode? = null
+    private var lastBlowgunFire = SimpleTimeMark.farPast()
+
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        val data = event.getConstant<RiftWoodenButtonsJson>("rift/RiftWoodenButtons")
+        buttonLocations = mutableMapOf<String, List<LorenzVec>>().apply {
+            data.houses.forEach { (houseName, spots) ->
+                spots.forEach { spot ->
+                    this["$houseName House:${spot.position}"] = spot.buttons
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        hitButtons.clear()
+        RiftAPI.allButtonsHit = false
+        currentSpot = null
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        findClosestSpot()
+        checkBlowgunActivatedButtons()
+    }
+
+    private fun findClosestSpot() {
+        if (!showButtons()) return
+        val graph = IslandGraphs.currentIslandGraph ?: return
+
+        val closestNode = graph.nodes
+            .filter { it.tags.contains(GraphNodeTag.RIFT_BUTTONS_QUEST) }
+            .filter { node ->
+                val spotName = "${node.name}:${node.position}"
+                val buttonsAtSpot = buttonLocations[spotName] ?: return@filter false
+                buttonsAtSpot.any { !hitButtons.contains(it) }
+            }
+            .minByOrNull { it.position.distanceToPlayer() }
+
+        if (closestNode != currentSpot) {
+            currentSpot = closestNode
+            currentSpot?.let {
+                IslandGraphs.pathFind(it.position, "Button Spot", config.color.toChromaColor(), condition = { config.showPathFinder && config.showButtonsHelper })
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onBlockClick(event: BlockClickEvent) {
+        if (!checkButtons()) return
+
+        val location = event.position
+        if (location.getBlockAt() == Blocks.wooden_button && !hitButtons.contains(location)) {
+            lastHitButton = event.position
+        }
+    }
+
+    @SubscribeEvent
+    fun onItemClick(event: ItemClickEvent) {
+        if (!checkButtons()) return
+        if (event.clickType != ClickType.RIGHT_CLICK) return
+        if (!event.itemInHand.isBlowgun) return
+        lastBlowgunFire = SimpleTimeMark.now()
+    }
+
+    private fun checkBlowgunActivatedButtons() {
+        if (lastBlowgunFire.passedSince() > 2.5.seconds) return
+        buttonLocations.values.flatten().forEach { buttonLocation ->
+            val blockState = buttonLocation.getBlockStateAt()
+            if (blockState.block is BlockButtonWood &&
+                blockState.getValue(BlockButtonWood.POWERED) == true &&
+                buttonLocation.canBeSeen(1..3) &&
+                lastHitButton != buttonLocation &&
+                !hitButtons.contains(buttonLocation)) {
+                lastHitButton = buttonLocation
+                addLastHitButton()
+            }
+        }
+    }
+
+    private fun addLastHitButton() {
+        if (lastHitButton !in hitButtons) {
+            lastHitButton?.let { hitButtons.add(it) }
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!checkButtons()) return
+
+        buttonHitPattern.matchMatcher(event.message) {
+            addLastHitButton()
+        }
+
+        if (event.message != "§eYou've hit all §r§b56 §r§ewooden buttons!") return
+        RiftAPI.allButtonsHit = true
+        hitButtons = buttonLocations.values.flatten().toMutableSet()
+        soulLocations["Buttons"]?.let {
+            IslandGraphs.pathFind(
+                it,
+                "Buttons Enigma Soul",
+                config.color.toChromaColor(),
+                condition = { config.showPathFinder },
+            )
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!showButtons()) return
+
+        val spot = currentSpot ?: return
+        val distance = spot.position.distanceToPlayer()
+        if (distance > 2.5) {
+            event.drawDynamicText(spot.position.add(y = 1), "Hit Buttons Here!", 1.25)
+        }
+
+        if (distance > 15.0) return
+        val spotName = "${spot.name}:${spot.position}"
+        buttonLocations[spotName]?.forEach { button ->
+            if (!hitButtons.contains(button)) {
+                event.drawWaypointFilled(button, config.color.toChromaColor(), inverseAlphaScale = true)
+            }
+        }
+    }
+
+    private fun checkButtons() = RiftAPI.inRift() && !RiftAPI.allButtonsHit
+    fun showButtons() = checkButtons() && RiftAPI.trackingButtons && config.showButtonsHelper
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
index 3b64f0fb1c95..63a4e35cb750 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
@@ -8,8 +8,8 @@ import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.TitleReceivedEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
-import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -72,8 +72,8 @@ object LivingCaveLivingMetalHelper {
         } else b
         event.drawWaypointFilled(
             location,
-            LorenzColor.AQUA.toColor(),
-            seeThroughBlocks = location.distanceToPlayer() < 10
+            color,
+            seeThroughBlocks = location.distanceToPlayer() < 10,
         )
     }
 
@@ -97,5 +97,7 @@ object LivingCaveLivingMetalHelper {
         }
     }
 
+    val color get() = config.color.get().toChromaColor()
+
     fun isEnabled() = RiftAPI.inRift() && (RiftAPI.inLivingCave() || RiftAPI.inLivingStillness()) && config.enabled
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt
new file mode 100644
index 000000000000..cf729453fcb6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt
@@ -0,0 +1,117 @@
+package at.hannibal2.skyhanni.features.rift.area.westvillage
+
+import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.ParkourHelper
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object RiftGunthersRace {
+
+    private val config get() = RiftAPI.config.area.westVillage.gunthersRace
+    private var parkourHelper: ParkourHelper? = null
+
+    private val patternGroup = RepoPattern.group("rift.area.westvillage.riftrace")
+
+    /**
+     * REGEX-TEST: §3§lRIFT RACING §r§eRace started! Good luck!
+     */
+    private val raceStartedPattern by patternGroup.pattern(
+        "start",
+        "§3§lRIFT RACING §r§eRace started! Good luck!"
+    )
+
+    /**
+     * REGEX-TEST: §3§lRIFT RACING §r§eRace finished in 00:36.539!
+     * REGEX-TEST: §3§lRIFT RACING §r§eRace finished in §r§300:32.794§r§e! §r§3§lPERSONAL BEST!
+     */
+    private val raceFinishedPattern by patternGroup.pattern(
+        "finish",
+        "§3§lRIFT RACING §r§eRace finished in \\d+:\\d+.\\d+!.*"
+    )
+
+    /**
+     * REGEX-TEST: §3§lRIFT RACING §r§cRace cancelled!
+     * REGEX-TEST: §3§lRIFT RACING §r§cRace cancelled! Time limit reached!
+     * REGEX-TEST: §3§lRIFT RACING §r§cRace cancelled! You left the racing area!
+     */
+    private val raceCancelledPattern by patternGroup.pattern(
+        "cancel",
+        "§3§lRIFT RACING §r§cRace cancelled!.*"
+    )
+
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        parkourHelper?.reset()
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        RiftAPI.inRiftRace = false
+    }
+
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        val data = event.getConstant<ParkourJson>("rift/RiftRace")
+        parkourHelper = ParkourHelper(
+            data.locations,
+            data.shortCuts,
+            detectionRange = 5.0,
+            goInOrder = true,
+        )
+        updateConfig()
+    }
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        ConditionalUtils.onToggle(config.rainbowColor, config.monochromeColor, config.lookAhead) {
+            updateConfig()
+        }
+    }
+
+    private fun updateConfig() {
+        parkourHelper?.run {
+            rainbowColor = config.rainbowColor.get()
+            monochromeColor = config.monochromeColor.get().toChromaColor()
+            lookAhead = config.lookAhead.get() + 1
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        raceStartedPattern.matchMatcher(event.message) {
+            RiftAPI.inRiftRace = true
+        }
+        raceCancelledPattern.matchMatcher(event.message) {
+            parkourHelper?.reset()
+            RiftAPI.inRiftRace = false
+        }
+        raceFinishedPattern.matchMatcher(event.message) {
+            parkourHelper?.reset()
+            RiftAPI.inRiftRace = false
+        }
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled() || !RiftAPI.inRiftRace) return
+
+        parkourHelper?.render(event)
+    }
+
+    fun isEnabled() =
+        RiftAPI.inRift() && RiftAPI.inWestVillage() && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt
index 3fa6af42fc0e..c08594c26ea9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminHighlighter.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
 import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.TimeLimitedSet
@@ -63,10 +62,8 @@ object VerminHighlighter {
         else -> false
     }
 
-    private fun inArea() = LorenzUtils.skyBlockArea.let { it == "West Village" || it == "Infested House" }
-
     private fun hasItemInHand() = InventoryUtils.itemInHandId == "TURBOMAX_VACUUM".asInternalName()
 
-    fun isEnabled() = RiftAPI.inRift() && inArea() && config.enabled && hasItemInHand()
+    fun isEnabled() = RiftAPI.inRift() && RiftAPI.inWestVillage() && config.enabled && hasItemInHand()
 
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
index e47fe8002b6d..cedaa569bfbf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
@@ -13,7 +13,6 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -162,9 +161,7 @@ object VerminTracker {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isEnabled()) return
-        if (!config.showOutsideWestVillage &&
-            !LorenzUtils.skyBlockArea.let { it == "Infested House" || it == "West Village" }
-        ) return
+        if (!config.showOutsideWestVillage && !RiftAPI.inWestVillage()) return
         if (!config.showWithoutVacuum && !hasVacuum) return
 
         tracker.renderDisplay(config.position)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index 41ad12763496..fc0856be64d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.render.gui.ReplaceItemEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.area.dreadfarm.WoodenButtonsHelper
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
@@ -36,7 +37,7 @@ object EnigmaSoulWaypoints {
 
     private val config get() = RiftAPI.config.enigmaSoulWaypoints
     private var inInventory = false
-    private var soulLocations = mapOf<String, LorenzVec>()
+    var soulLocations = mapOf<String, LorenzVec>()
     private val trackedSouls = mutableListOf<String>()
     private val inventoryUnfound = mutableListOf<String>()
     private var adding = true
@@ -89,6 +90,9 @@ object EnigmaSoulWaypoints {
 
         if (event.slotId == 31 && inventoryUnfound.isNotEmpty()) {
             event.makePickblock()
+            if (inventoryUnfound.contains("Buttons")) {
+                RiftAPI.trackingButtons = !RiftAPI.trackingButtons
+            }
             if (adding) {
                 trackedSouls.addAll(inventoryUnfound)
                 adding = false
@@ -107,12 +111,17 @@ object EnigmaSoulWaypoints {
         val name = split.last()
         if (!soulLocations.contains(name)) return
 
+        if (name == "Buttons") {
+            RiftAPI.trackingButtons = !RiftAPI.trackingButtons
+        }
+
         if (!trackedSouls.contains(name)) {
             ChatUtils.chat("§5Tracking the $name Enigma Soul!", prefixColor = "§5")
             if (config.showPathFinder) {
                 soulLocations[name]?.let {
-
-                    IslandGraphs.pathFind(it, "$name Enigma Soul", config.color.toChromaColor(), condition = { config.showPathFinder })
+                    if (!(name == "Buttons" && WoodenButtonsHelper.showButtons())) {
+                        IslandGraphs.pathFind(it, "$name Enigma Soul", config.color.toChromaColor(), condition = { config.showPathFinder })
+                    }
                 }
             }
             trackedSouls.add(name)
@@ -189,6 +198,9 @@ object EnigmaSoulWaypoints {
         if (closestSoul in trackedSouls) {
             trackedSouls.remove(closestSoul)
             ChatUtils.chat("§5Found the $closestSoul Enigma Soul!", prefixColor = "§5")
+            if (closestSoul == "Buttons") {
+                RiftAPI.trackingButtons = false
+            }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
index 403a786869cc..94fbe5c3e3e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
@@ -1,20 +1,22 @@
 package at.hannibal2.skyhanni.features.rift.everywhere
 
-import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
+import at.hannibal2.skyhanni.data.ActionBarStatsData
+import at.hannibal2.skyhanni.events.ActionBarValueUpdateEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.entity.EntityHealthDisplayEvent
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
@@ -26,11 +28,6 @@ object RiftTimer {
     private val config get() = RiftAPI.config.timer
 
     private val repoGroup = RepoPattern.group("rift.everywhere")
-    private val timePattern by repoGroup.pattern(
-        "timer",
-        "§(?<color>[a7])(?<time>.*)ф Left.*"
-    )
-
     /**
      * REGEX-TEST: 3150 §aф
      */
@@ -53,23 +50,28 @@ object RiftTimer {
         currentTime = 0.seconds
     }
 
-    // todo use ActionBarValueUpdateEvent
     @SubscribeEvent
-    fun onActionBarUpdate(event: ActionBarUpdateEvent) {
-        if (!isEnabled()) return
-
-        event.actionBar.split("     ").matchFirst(timePattern) {
-            val color = group("color")
-            val newTime = TimeUtils.getDuration(group("time").replace("m", "m "))
+    fun onActionBarValueUpdate(event: ActionBarValueUpdateEvent) {
+        if (event.updated != ActionBarStatsData.RIFT_TIME) return
+        if (!isEnabled() || RiftAPI.inRiftRace) return
 
-            if (color == "7") {
-                if (newTime > maxTime) {
-                    maxTime = newTime
-                }
-            }
-            currentTime = newTime
-            update()
+        val newTime = TimeUtils.getDuration(event.updated.value.replace("m", "m "))
+        if (newTime > maxTime) {
+            maxTime = newTime
         }
+        currentTime = newTime
+        update()
+    }
+
+    // prevents rift time from pausing during Rift Race
+    // (hypixel hides the action bar during the race)
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled() || !RiftAPI.inRiftRace) return
+        if (!event.isMod(5)) return
+        val newTime = TimeUtils.getDuration(Minecraft.getMinecraft().thePlayer.experienceLevel.toString() + " s")
+        currentTime = newTime
+        update()
     }
 
     private fun update() {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
index cf01b2bf9f9b..4fccbed68125 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
@@ -23,6 +23,7 @@ class ParkourHelper(
     val detectionRange: Double = 1.0,
     val depth: Boolean = true,
     val onEndReach: () -> Unit = {},
+    val goInOrder: Boolean = false,
 ) {
 
     private var current = -1
@@ -58,9 +59,9 @@ class ParkourHelper(
                     for ((index, location) in locations.withIndex()) {
                         val onGround = Minecraft.getMinecraft().thePlayer.onGround
                         val closeEnough = location.offsetCenter().distanceToPlayer() < detectionRange
-                        if (closeEnough && onGround) {
-                            current = index
-                        }
+                        if (!(closeEnough && onGround)) continue
+                        if (goInOrder && (index < current - 1 || index > current + 1)) continue
+                        current = index
                     }
                 }
 

From cc0e94d6d2b935ae5f8b1704de524871caea4148 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 29 Sep 2024 21:55:27 -0400
Subject: [PATCH 593/721] Fix: Jasper Gemstones not in Powder Mining Filter
 (#2618)

---
 .../features/chat/PowderMiningGemstoneFilterConfig.java     | 5 +++++
 .../skyhanni/features/chat/PowderMiningChatFilter.kt        | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
index 3a44738ca6e8..e2b1c5d18143 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningGemstoneFilterConfig.java
@@ -42,6 +42,11 @@ public class PowderMiningGemstoneFilterConfig {
     @ConfigEditorDropdown
     public GemstoneFilterEntry topazGemstones = GemstoneFilterEntry.FINE_UP;
 
+    @Expose
+    @ConfigOption(name = "Jasper", desc = "Hide Jasper gemstones under a certain quality.")
+    @ConfigEditorDropdown
+    public GemstoneFilterEntry jasperGemstones = GemstoneFilterEntry.FINE_UP;
+
     public enum GemstoneFilterEntry {
         SHOW_ALL("Show All"),
         HIDE_ALL("Hide all"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index d6e992738c67..88ac9df69eab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -246,10 +246,13 @@ object PowderMiningChatFilter {
      * REGEX-TEST: §r§a❈ Flawed Amethyst Gemstone §r§8x4
      * REGEX-TEST: §r§9⸕ Fine Amber Gemstone
      * REGEX-TEST: §r§5⸕ Flawless Amber Gemstone
+     * REGEX-TEST: §r§f❁ Rough Jasper Gemstone §r§8x24
+     * REGEX-TEST: §r§a❁ Flawed Jasper Gemstone
      */
+    @Suppress("MaxLineLength")
     private val gemstonePattern by patternGroup.pattern(
         "reward.gemstone",
-        "§r§[fa9][❤❈☘⸕✎✧] (?<tier>Rough|Flawed|Fine|Flawless) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone( §r§8x(?<amount>[\\d,]+))?",
+        "§r§[fa9][❤❈☘⸕✎✧❁] (?<tier>Rough|Flawed|Fine|Flawless) (?<gem>Ruby|Amethyst|Jade|Amber|Sapphire|Topaz|Jasper) Gemstone( §r§8x(?<amount>[\\d,]+))?",
     )
 
     @Suppress("CyclomaticComplexMethod")
@@ -381,6 +384,7 @@ object PowderMiningChatFilter {
                 "amethyst" -> gemstoneConfig.amethystGemstones
                 "jade" -> gemstoneConfig.jadeGemstones
                 "topaz" -> gemstoneConfig.topazGemstones
+                "jasper" -> gemstoneConfig.jasperGemstones
                 // Failure case that should never be reached
                 else -> return "no_filter"
             }

From 975b1b5dcc08bf4b0277d19ebe7a66eee2b006e7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 30 Sep 2024 08:44:32 +0200
Subject: [PATCH 594/721] changed todo

---
 .../skyhanni/config/features/chat/PowderMiningFilterConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
index 42a53f8dd3bf..cb1aae0e5e9c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PowderMiningFilterConfig.java
@@ -111,7 +111,7 @@ public String toString() {
     @Expose
     @ConfigOption(name = "Gemstones", desc = "")
     @Accordion
-    // TODO remove config
+    // TODO rename to "gemstoneFilter"
     public PowderMiningGemstoneFilterConfig gemstoneFilterConfig = new PowderMiningGemstoneFilterConfig();
 
 }

From e66b753d30512274b747bc7350f18f415a150bf5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:28:36 +0200
Subject: [PATCH 595/721] added parameter `/shcopylocation pathfind`

---
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 6c34feddaf1f..07fc7b81a2f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -138,7 +138,8 @@ object SkyHanniDebugsAndTests {
     }
 
     @Suppress("EmptyFunctionBlock")
-    private fun asyncTest(args: Array<String>) {}
+    private fun asyncTest(args: Array<String>) {
+    }
 
     fun findNullConfig(args: Array<String>) {
         println("start null finder")
@@ -327,9 +328,15 @@ object SkyHanniDebugsAndTests {
         val x = (location.x + 0.001).roundTo(1)
         val y = (location.y + 0.001).roundTo(1)
         val z = (location.z + 0.001).roundTo(1)
-        if (args.size == 1 && args[0].equals("json", false)) {
-            OSUtils.copyToClipboard("\"$x:$y:$z\"")
-            return
+        if (args.size == 1) {
+            if (args[0].equals("json", false)) {
+                OSUtils.copyToClipboard("\"$x:$y:$z\"")
+                return
+            }
+            if (args[0].equals("pathfind", false)) {
+                OSUtils.copyToClipboard("`/shtestwaaypoint $x $y $z pathfind`")
+                return
+            }
         }
 
         OSUtils.copyToClipboard("LorenzVec($x, $y, $z)")
@@ -487,7 +494,8 @@ object SkyHanniDebugsAndTests {
 
     @SubscribeEvent
     @Suppress("EmptyFunctionBlock")
-    fun onChat(event: LorenzChatEvent) {}
+    fun onChat(event: LorenzChatEvent) {
+    }
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
@@ -578,8 +586,7 @@ object SkyHanniDebugsAndTests {
         }.editCopy {
             this.add(
                 0,
-                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.roundTo(1).toString()) }
-                    .toList(),
+                generateSequence(scale) { it + 0.1 }.take(25).map { Renderable.string(it.roundTo(1).toString()) }.toList(),
             )
         }
         config.debugItemPos.renderRenderables(

From 49d321025d6ecfe67f9c4df49c4ee2a9651b3688 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Mon, 30 Sep 2024 19:36:13 -0400
Subject: [PATCH 596/721] Fix a massive bug (#2626)

---
 .../skyhanni/features/garden/fortuneguide/FortuneStats.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
index b5558b638042..7b667afaf002 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
@@ -23,7 +23,7 @@ enum class FortuneStats(
     GEMSTONE("§2Tool gemstone", "§7§2Fortune from gemstones on your tool"),
     FFD("§2Farming for Dummies", "§7§2Fortune for each applied book\n§2You get 1☘ per applied book"),
     COUNTER("§2Logarithmic Counter", "§7§2Fortune from increasing crop counter\n§2You get 16☘ per digit - 4"),
-    COLLECTION("§2Collection Analyst", "§7§2Fortune from increasing crop collection\n§2You get 8☘ per digit - 4"),
+    COLLECTION("§2Collection Analysis", "§7§2Fortune from increasing crop collection\n§2You get 8☘ per digit - 4"),
     HARVESTING("§2Harvesting Enchantment", "§7§2Fortune for each enchantment level\n§2You get 12.5☘ per level"),
     SUNDER("§2Sunder Enchantment", "§7§2Fortune for each enchantment level\n§2You get 12.5☘ per level"),
     CULTIVATING("§2Cultivating Enchantment", "§7§2Fortune for each enchantment level\n§2You get 2☘ per level"),

From f181902cce81b99c5b940e1cb5c116bdff18b159 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:44:27 +1000
Subject: [PATCH 597/721] Fix: Typos in readme (#2629)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 07bf336a172c..3c7721cfb176 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ SkyHanni is a Forge mod for Minecraft 1.8.9 that adds many useful features to [H
 * **Helpful GUIs:** View important information at a glance.
 * **Extra Chat Messages:** Receive reminders and tips at the right moment.
 * **Object Highlighters:** Focus on important items in inventories or highlight mobs in the world.
-* **Highly Customizeable Displays:** Personalise your Scoreboard, Tab List or chat format.
+* **Highly Customizable Displays:** Personalise your Scoreboard, Tab List or chat format.
 * [And **much** more!](docs/FEATURES.md)
 
 SkyHanni is especially useful when doing farming, slayers, Bingo, Diana, fishing, Rift or mining.
@@ -35,7 +35,7 @@ SkyHanni is especially useful when doing farming, slayers, Bingo, Diana, fishing
 Give feedback or just chat with others on our community Discord!
 
 * **Bug Reports:** Use the `#bug-reports` channel when you find broken features (please check out `#faq` and `#known-bugs`).
-* **Quick Help** Ask in `#support` for questions and problems with the the mod or Minecraft in general.
+* **Quick Help** Ask in `#support` for questions and problems with the mod or Minecraft in general.
 * **Feature Suggestions:** Feel fre to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
 * **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel about the game.
 

From 3f751c8d46479c7f7c07840eca0e28b43e7d3a23 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 1 Oct 2024 12:05:33 +0200
Subject: [PATCH 598/721] Fix: Custom Scoreboard Carnival (#2631)

---
 .../skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index ce4b5a4fafa9..802cc073bd71 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -534,7 +534,8 @@ private fun getCarnivalLines() = listOf(
         getSbLines().firstOrNull { pattern.matches(it) }
     }
 
-private fun getCarnivalShowWhen(): Boolean = SbPattern.carnivalPattern.anyMatches(getSbLines())
+private fun getCarnivalShowWhen() =
+    listOf(SbPattern.carnivalPattern, SbPattern.carnivalTokensPattern, SbPattern.carnivalTasksPattern).anyMatches(getSbLines())
 
 private fun getRiftLines() = getSbLines().filter { line ->
     RiftBloodEffigies.heartsPattern.matches(line) ||

From 65ef886e2e649a86f395572d1f8f127874ef6d5f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 1 Oct 2024 19:33:39 +0200
Subject: [PATCH 599/721] formatting

---
 .../features/rift/area/dreadfarm/WoodenButtonsHelper.kt    | 7 ++++++-
 .../features/rift/everywhere/EnigmaSoulWaypoints.kt        | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
index d2413cc3ae63..92e6c2014901 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
@@ -95,7 +95,12 @@ object WoodenButtonsHelper {
         if (closestNode != currentSpot) {
             currentSpot = closestNode
             currentSpot?.let {
-                IslandGraphs.pathFind(it.position, "Button Spot", config.color.toChromaColor(), condition = { config.showPathFinder && config.showButtonsHelper })
+                IslandGraphs.pathFind(
+                    it.position,
+                    "Button Spot",
+                    config.color.toChromaColor(),
+                    condition = { config.showPathFinder && config.showButtonsHelper },
+                )
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index fc0856be64d1..6fadfce8f2a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -120,7 +120,11 @@ object EnigmaSoulWaypoints {
             if (config.showPathFinder) {
                 soulLocations[name]?.let {
                     if (!(name == "Buttons" && WoodenButtonsHelper.showButtons())) {
-                        IslandGraphs.pathFind(it, "$name Enigma Soul", config.color.toChromaColor(), condition = { config.showPathFinder })
+                        IslandGraphs.pathFind(
+                            it,
+                            "$name Enigma Soul",
+                            config.color.toChromaColor(),
+                            condition = { config.showPathFinder })
                     }
                 }
             }

From 064a8b388727eb00d2fc30243385305c69cad69a Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Tue, 1 Oct 2024 19:56:53 +0200
Subject: [PATCH 600/721] Fix: Add more Pablo patterns (#2636)

---
 .../java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
index aa7cfcafc130..04f5e6113576 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
@@ -33,8 +33,10 @@ object PabloHelper {
 //     )
 
     private val patterns = listOf(
-        "\\[NPC] Pablo: (?:✆ )?Could you bring me an (?<flower>[\\w ]+).*".toPattern(),
+        "\\[NPC] Pablo: (?:✆ )?Are you available\\? I desperately need an? (?<flower>[\\w ]+) today\\.".toPattern(),
         "\\[NPC] Pablo: (?:✆ )?Bring me that (?<flower>[\\w ]+) as soon as you can!".toPattern(),
+        "\\[NPC] Pablo: (?:✆ )?Could you bring me an? (?<flower>[\\w ]+)\\?".toPattern(),
+        "\\[NPC] Pablo: (?:✆ )?I really need an? (?<flower>[\\w ]+) today, do you have one you could spare\\?".toPattern(),
     )
 
     private var lastSentMessage = SimpleTimeMark.farPast()

From 0135920e7bd317211514d75f6436463507654866 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Tue, 1 Oct 2024 19:59:20 +0200
Subject: [PATCH 601/721] Fix: Minister in Calendar Color Reset (#2632)

---
 .../skyhanni/features/inventory/MinisterInCalendar.kt          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
index d078f0d1a39f..655f1f91982e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MinisterInCalendar.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import at.hannibal2.skyhanni.utils.StringUtils.splitLines
 import net.minecraft.client.player.inventory.ContainerLocalMenu
 import net.minecraft.item.ItemStack
@@ -74,7 +75,7 @@ object MinisterInCalendar {
             addAll(prefix)
             for (perk in minister.activePerks) {
                 add("$ministerColor${perk.perkName}")
-                addAll(perk.description.splitLines(170).removePrefix("§r").split("\n").map { "§7$it" })
+                addAll(perk.description.splitLines(170).removeResets().split("\n").map { "§7$it" })
             }
             addAll(suffix)
         }

From 22dfa1ec9977a9440a23f7f7efbf79da81b79e6b Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:00:20 -0400
Subject: [PATCH 602/721] Fix: Strays Wrongly Counting as Unique (#2627)

---
 .../features/event/hoppity/HoppityAPI.kt        |  5 +++++
 .../ChocolateFactoryStrayTracker.kt             | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 09c0dedf9b29..0a144aa2f49d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -14,6 +14,8 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundP
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker.duplicateDoradoStrayPattern
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker.duplicatePseudoStrayPattern
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -24,6 +26,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.SkyblockSeason
 import net.minecraftforge.fml.common.eventhandler.EventPriority
@@ -108,12 +111,14 @@ object HoppityAPI {
                         EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§9Fish the Rabbit"
                         lastMeal = STRAY
+                        duplicate = it.stack.getLore().any { line -> duplicatePseudoStrayPattern.matches(line)}
                         attemptFireRabbitFound()
                     }
                     "El Dorado" -> {
                         EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§6El Dorado"
                         lastMeal = STRAY
+                        duplicate = it.stack.getLore().any { line -> duplicateDoradoStrayPattern.matches(line)}
                         attemptFireRabbitFound()
                     }
                     else -> return@matchMatcher
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 52a3c5f1bb3c..1aa9d068b124 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -100,6 +100,7 @@ object ChocolateFactoryStrayTracker {
         "§7You caught a stray §6§lGolden Rabbit§7! §7You gained §6\\+5 Chocolate §7until the §7end of the SkyBlock year!",
     )
 
+    // TODO: Fix this pattern so it doesn't only match duplicates.
     /**
      * REGEX-TEST: §7You caught a stray §9Fish the Rabbit§7! §7You have already found §9Fish the §9Rabbit§7, so you received §655,935,257 §6Chocolate§7!
      */
@@ -108,6 +109,22 @@ object ChocolateFactoryStrayTracker {
         "§7You caught a stray (?<color>§.)Fish the Rabbit§7! §7You have already found (?:§.)?Fish the (?:§.)?Rabbit§7, so you received §6(?<amount>[\\d,]*) (?:§6)?Chocolate§7!",
     )
 
+    /**
+     * REGEX-TEST: §7You have already found §9Fish the
+     */
+    val duplicatePseudoStrayPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.pseudoduplicate",
+        "(?:§.)*You have already found.*",
+    )
+
+    /**
+     * REGEX-TEST: §7already have captured him before
+     */
+    val duplicateDoradoStrayPattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "stray.doradoduplicate",
+        "(?:§.)*already have captured him before.*",
+    )
+
     private val tracker = SkyHanniTracker("Stray Tracker", { Data() }, { it.chocolateFactory.strayTracker })
     { drawDisplay(it) }
 

From 8b2db58f5d10948eebc8d0af4b70fee725590238 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 2 Oct 2024 04:01:50 +1000
Subject: [PATCH 603/721] Fix: Item trackers saying removed item name from item
 name (#2620)

---
 .../hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
index 3295880b9c85..e30395a004c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt
@@ -119,9 +119,9 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
             val newDrop = itemProfit.lastTimeUpdated.passedSince() < 10.seconds && config.showRecentDrops
             val numberColor = if (newDrop) "§a§l" else "§7"
 
-            val name = cleanName.removeColor(keepFormatting = true).replace("§r", "")
+            val formattedName = cleanName.removeColor(keepFormatting = true).replace("§r", "")
             var displayName = if (hidden) {
-                "§8§m$name"
+                "§8§m$formattedName"
             } else cleanName
             displayName = " $numberColor${displayAmount.addSeparators()}x $displayName§7: §6$priceFormat"
 
@@ -152,7 +152,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
                 },
             ) else Renderable.string(displayName)
 
-            lists.add(renderable.toSearchable(name))
+            lists.add(renderable.toSearchable(formattedName))
         }
         if (hiddenItemTexts.size > 0) {
             val text = Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts).toSearchable()

From 649dc5363b26acaeac4eb1c53a7cd3ed777f0293 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 1 Oct 2024 21:37:02 +0200
Subject: [PATCH 604/721] fix time format showing empty string for sub 1s

---
 src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
index 5cf3ec2e51f7..34b86f63efdb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt
@@ -34,6 +34,11 @@ object TimeUtils {
 
         val largestNonZeroUnit = parts.firstNotNullOfOrNull { if (it.value != 0) it.key else null } ?: TimeUnit.SECOND
 
+        if (absoluteValue < 1.seconds) {
+            val formattedMillis = (millis / 100).toInt()
+            return "0.${formattedMillis}s"
+        }
+
         var currentUnits = 0
         val result = buildString {
             for ((unit, value) in parts) {

From e304c8fb4e9d60421b8b679ea99cb93cc6177019 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 1 Oct 2024 21:39:01 +0200
Subject: [PATCH 605/721] fixed composter data collection

---
 .../features/garden/composter/ComposterOverlay.kt      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 22e9c12f7990..d7452725fd05 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -639,20 +639,20 @@ object ComposterOverlay {
             add("currentOrganicMatterItem: $currentOrganicMatterItem")
             add("currentFuelItem: $currentFuelItem")
 
-            println(" ")
+            add(" ")
             val composterUpgrades = ComposterAPI.composterUpgrades
             if (composterUpgrades == null) {
-                println("composterUpgrades is null")
+                add("composterUpgrades is null")
             } else {
                 for ((a, b) in composterUpgrades) {
-                    println("upgrade $a: $b")
+                    add("upgrade $a: $b")
                 }
             }
 
-            println(" ")
+            add(" ")
             val tabListData = ComposterAPI.tabListData
             for ((a, b) in tabListData) {
-                println("tabListData $a: $b")
+                add("tabListData $a: $b")
             }
         }
     }

From b10fc13cfc7bf9dd191219f5f93337125907a6dd Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Tue, 1 Oct 2024 22:05:00 +0100
Subject: [PATCH 606/721] Improvement: Add ignored crops for lane features
 (#2622)

---
 .../garden/laneswitch/FarmingLaneConfig.java         | 12 ++++++++++++
 .../features/garden/farming/lane/FarmingLaneAPI.kt   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/laneswitch/FarmingLaneConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/laneswitch/FarmingLaneConfig.java
index 667e3233109d..bb7ea595b94d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/laneswitch/FarmingLaneConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/laneswitch/FarmingLaneConfig.java
@@ -2,13 +2,18 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.garden.CropType;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FarmingLaneConfig {
 
     @Expose
@@ -37,4 +42,11 @@ public class FarmingLaneConfig {
     @FeatureToggle
     public boolean cornerWaypoints = false;
 
+    @Expose
+    @ConfigOption(
+        name = "Ignored Crops",
+        desc = "Add the crops you wish to not setup a lane for."
+    )
+    @ConfigEditorDraggableList()
+    public List<CropType> ignoredCrops = new ArrayList<>();
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
index ba0eaee5dd4e..b9b091e53a27 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt
@@ -43,6 +43,7 @@ object FarmingLaneAPI {
 
     private fun warnNoLane(crop: CropType?) {
         if (crop == null || currentLane != null) return
+        if (crop in config.ignoredCrops) return
         if (!GardenAPI.hasFarmingToolInHand()) return
         if (FarmingLaneCreator.detection) return
         if (!config.distanceDisplay && !config.laneSwitchNotification.enabled) return

From bdbac0dfde77e87891e3078aa4a672d6404a1fc3 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Tue, 1 Oct 2024 23:16:36 +0200
Subject: [PATCH 607/721] Improvement: Change "efficient miner" to "spread" in
 mineshaft pity breakdown (#2633)

---
 .../features/mining/MineshaftPityDisplay.kt    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 72f3d13d4138..79d838f20c97 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -45,11 +45,11 @@ object MineshaftPityDisplay {
             profileStorage?.blocksBroken = value
         }
 
-    private var PityBlock.efficientMiner: Int
-        get() = minedBlocks.firstOrNull { it.pityBlock == this }?.efficientMiner ?: 0
+    private var PityBlock.spreadBlocksBroken: Int
+        get() = minedBlocks.firstOrNull { it.pityBlock == this }?.spreadBlocksBroken ?: 0
         set(value) {
-            minedBlocks.firstOrNull { it.pityBlock == this }?.let { it.efficientMiner = value } ?: run {
-                minedBlocks.add(PityData(this, efficientMiner = value))
+            minedBlocks.firstOrNull { it.pityBlock == this }?.let { it.spreadBlocksBroken = value } ?: run {
+                minedBlocks.add(PityData(this, spreadBlocksBroken = value))
             }
         }
 
@@ -92,7 +92,7 @@ object MineshaftPityDisplay {
                 if (originalOre != null) addOrPut(originalOre, -1)
             }
             .map { (block, amount) ->
-                block.getPityBlock()?.let { it.efficientMiner += amount }
+                block.getPityBlock()?.let { it.spreadBlocksBroken += amount }
             }
 
         update()
@@ -105,7 +105,7 @@ object MineshaftPityDisplay {
             val pityCounter = calculateCounter()
             val chance = calculateChance(pityCounter)
             val counterUntilPity = MAX_COUNTER - pityCounter
-            val totalBlocks = PityBlock.entries.sumOf { it.blocksBroken + it.efficientMiner }
+            val totalBlocks = PityBlock.entries.sumOf { it.blocksBroken + it.spreadBlocksBroken }
 
             mineshaftTotalBlocks += totalBlocks
             mineshaftTotalCount++
@@ -124,7 +124,7 @@ object MineshaftPityDisplay {
                 minedBlocks.forEach {
                     add(
                         "    §7${it.pityBlock.displayName} mined: " +
-                            "§e${it.blocksBroken.addSeparators()} [+${it.efficientMiner.addSeparators()} efficient miner]" +
+                            "§e${it.blocksBroken.addSeparators()} [+${it.spreadBlocksBroken.addSeparators()} spread]" +
                             " §6(${it.pityBlock.getPity().addSeparators()}/${counterUntilPity.addSeparators()})",
                     )
                 }
@@ -283,7 +283,7 @@ object MineshaftPityDisplay {
     data class PityData(
         @Expose val pityBlock: PityBlock,
         @Expose var blocksBroken: Int = 0,
-        @Expose var efficientMiner: Int = 0,
+        @Expose var spreadBlocksBroken: Int = 0,
     )
 
     enum class PityBlock(
@@ -339,7 +339,7 @@ object MineshaftPityDisplay {
                 return entries.firstOrNull { oreType in it.oreTypes }
             }
 
-            fun PityBlock.getPity() = (blocksBroken + efficientMiner / 2.0) * multiplier
+            fun PityBlock.getPity() = (blocksBroken + spreadBlocksBroken / 2.0) * multiplier
         }
     }
 }

From f7a51f5ec5e992c53cd6ef7bc2ece482ead848f0 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 2 Oct 2024 07:30:29 +1000
Subject: [PATCH 608/721] Backend: Rename keystore file to specify it is for
 skyhanni (#2619)

---
 .../java/at/hannibal2/skyhanni/utils/APIUtils.kt    |   2 +-
 .../{mykeystore.jks => skyhanni-keystore.jks}       | Bin
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/main/resources/{mykeystore.jks => skyhanni-keystore.jks} (100%)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
index d28263af6c7d..f331ab3e3d17 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
@@ -30,7 +30,7 @@ object APIUtils {
     private val ctx: SSLContext? = run {
         try {
             val myKeyStore = KeyStore.getInstance("JKS")
-            myKeyStore.load(APIUtils.javaClass.getResourceAsStream("/keystore.jks"), "changeit".toCharArray())
+            myKeyStore.load(APIUtils.javaClass.getResourceAsStream("/skyhanni-keystore.jks"), "changeit".toCharArray())
             val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
             val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
             kmf.init(myKeyStore, null)
diff --git a/src/main/resources/mykeystore.jks b/src/main/resources/skyhanni-keystore.jks
similarity index 100%
rename from src/main/resources/mykeystore.jks
rename to src/main/resources/skyhanni-keystore.jks

From 1bf9db2453b5af2781b6de22afca6296ef395c57 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Wed, 2 Oct 2024 09:56:10 +0200
Subject: [PATCH 609/721] Fix: Superpair Data (#2566)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../ExperimentationTableAPI.kt                |  10 +-
 .../SuperpairDataDisplay.kt                   | 291 ++++++++++++++++++
 .../SuperpairExperimentInformationDisplay.kt  | 277 -----------------
 3 files changed, 300 insertions(+), 278 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
index 25abb16ed82f..9fcbbad0be11 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -69,7 +69,7 @@ object ExperimentationTableAPI {
      */
     val rewardPattern by patternGroup.pattern(
         "rewards",
-        "\\d{1,3}k Enchanting Exp|Enchanted Book|(?:Titanic |Grand |\\b)Experience Bottle|Metaphysical Serum|Experiment The Fish",
+        "\\d{1,3}k Enchanting Exp|Enchanted Book|(?:Titanic |Grand |\\b)Experience Bottle|Metaphysical Serum|Experiment the Fish",
     )
 
     /**
@@ -131,6 +131,14 @@ object ExperimentationTableAPI {
         "(?:COLOSSAL_|TITANIC_|GRAND_|\\b)EXP_BOTTLE",
     )
 
+    /**
+     * REGEX-TEST: Remaining Clicks: 22
+     */
+    val remainingClicksPattern by patternGroup.pattern(
+        "clicks",
+        "Remaining Clicks: (?<clicks>\\d+)"
+    )
+
     /**
      * REGEX-TEST: ☕ You renewed the experiment table! (1/3)
      */
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
new file mode 100644
index 000000000000..627974e6baac
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
@@ -0,0 +1,291 @@
+package at.hannibal2.skyhanni.features.inventory.experimentationtable
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.GuiContainerEvent.SlotClickEvent
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryCloseEvent
+import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentationTableAPI.remainingClicksPattern
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.CollectionUtils.equalsOneOf
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils.isAnyOf
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+
+// TODO important: all use cases of listOf in combination with string needs to be gone. no caching, constant new list creation, and bad design.
+@SkyHanniModule
+object SuperpairDataDisplay {
+
+    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
+
+    private data class SuperpairItem(val index: Int, val reward: String, val damage: Int)
+    private data class FoundData(val item: SuperpairItem? = null, val first: SuperpairItem? = null, val second: SuperpairItem? = null)
+
+    private enum class FoundType {
+        NORMAL,
+        POWERUP,
+        MATCH,
+        PAIR
+    }
+
+    private val sideSpaces1 = listOf(17, 18, 26, 27, 35, 36)
+    private val sideSpaces2 = listOf(16, 17, 18, 19, 25, 26, 27, 28, 34, 35, 36, 37)
+    private val emptySuperpairItem = SuperpairItem(-1, "", -1)
+
+    private var display = emptyList<String>()
+    private var uncoveredItems = mutableMapOf<Int, SuperpairItem>()
+    private var found = mutableMapOf<FoundType, MutableList<FoundData>>()
+
+    @SubscribeEvent
+    fun onInventoryClose(event: InventoryCloseEvent) {
+        display = emptyList()
+
+        uncoveredItems = mutableMapOf()
+        found.clear()
+    }
+
+    @SubscribeEvent
+    fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
+        if (!isEnabled()) return
+        if (display.isEmpty()) display = drawDisplay()
+
+        config.superpairDisplayPosition.renderStrings(display, posLabel = "Superpair Experiment Information")
+    }
+
+    @SubscribeEvent
+    fun onSlotClick(event: SlotClickEvent) {
+        if (!isEnabled()) return
+        val currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return
+
+        val item = event.item ?: return
+        if (isOutOfBounds(event.slotId, currentExperiment) || item.displayName.removeColor() == "?") return
+
+        val clicksItem = InventoryUtils.getItemAtSlotIndex(4)
+
+        // TODO add variable name to indicate what is going on here
+        if (uncoveredItems.none { it.value.index == event.slotId && it.key == uncoveredItems.keys.max() }) {
+            if (clicksItem != null) {
+                remainingClicksPattern.matchMatcher(clicksItem.displayName.removeColor()) { if (group("clicks").toInt() == 0) return }
+            }
+
+            handleItem(event.slotId)
+        }
+    }
+
+    private fun handleItem(slot: Int) = DelayedRun.runDelayed(200.milliseconds) {
+        val itemNow = InventoryUtils.getItemAtSlotIndex(slot) ?: return@runDelayed
+        val itemName = itemNow.displayName.removeColor()
+        val reward = convertToReward(itemNow)
+        val itemData = SuperpairItem(slot, reward, itemNow.itemDamage)
+        val uncovered = uncoveredItems.keys.maxOrNull() ?: -1
+
+        if (isWaiting(itemName)) return@runDelayed
+
+        if (uncoveredItems.none { it.key == uncovered && it.value.index == slot }) uncoveredItems[uncovered + 1] = itemData
+
+        when {
+            isPowerUp(reward) -> handlePowerUp(itemData, uncovered + 1)
+            isReward(itemName) -> handleReward(itemData, uncovered + 1)
+        }
+
+        val since = clicksSinceSeparator(uncoveredItems)
+
+        val lastReward = uncoveredItems.entries.last().value.reward
+        // TODO use repo patterns for "Instant Find"
+        if ((since >= 2 || (since == -1 && uncoveredItems.size >= 2)) && lastReward != "Instant Find") uncoveredItems[uncovered + 2] =
+            emptySuperpairItem
+
+        display = drawDisplay()
+    }
+
+    private fun handlePowerUp(item: SuperpairItem, uncovered: Int) {
+        // TODO use repo patterns for "Instant Find"
+        if (item.reward != "Instant Find") uncoveredItems.remove(uncovered)
+
+        val itemData = FoundData(item = item)
+        found.getOrPut(FoundType.POWERUP) { mutableListOf(itemData) }.apply { if (!contains(itemData)) add(itemData) }
+    }
+
+    private fun handleReward(item: SuperpairItem, uncovered: Int) {
+        val last = uncoveredItems.getOrDefault(uncovered - 1, item)
+
+        if (isWaiting(last.reward)) return
+
+        when {
+            // TODO use repo patterns for "Instant Find"
+            last.reward == "Instant Find" -> handleInstantFind(item, uncovered)
+            hasFoundPair(item, last) -> handleFoundPair(item, last)
+            hasFoundMatch(item) -> handleFoundMatch(item)
+            else -> handleNormalReward(item)
+        }
+
+        println(found)
+    }
+
+    private fun handleInstantFind(item: SuperpairItem, uncovered: Int) {
+        uncoveredItems[uncovered - 1] = item
+        uncoveredItems[uncovered] = emptySuperpairItem
+
+        handleFoundPair(item, emptySuperpairItem)
+    }
+
+    private fun handleFoundPair(
+        first: SuperpairItem,
+        second: SuperpairItem,
+    ) {
+        found.entries.forEach {
+            when (it.key) {
+                FoundType.MATCH -> it.value.removeIf { data -> data.first?.sameAs(first) ?: false || data.second?.sameAs(first) ?: false }
+                FoundType.NORMAL -> it.value.removeIf { data -> data.item?.sameAs(first) ?: false || data.item?.sameAs(second) ?: false }
+                else -> {}
+            }
+        }
+
+        val pairData = FoundData(first = first, second = second)
+
+        found.getOrPut(FoundType.PAIR) { mutableListOf(pairData) }.apply { if (!contains(pairData)) add(pairData) }
+    }
+
+    private fun handleFoundMatch(item: SuperpairItem) {
+        // TODO better name
+        val match = uncoveredItems.values.find { it.index != item.index && it.sameAs(item) } ?: return
+
+        found.entries.forEach {
+            when {
+                it.key.isAnyOf(FoundType.MATCH, FoundType.PAIR) -> {
+                    // TODO extract logic in some way
+                    if (it.value.any { data ->
+                            (data.first?.index ?: -1).equalsOneOf(item.index, match.index) ||
+                                (data.second?.index
+                                    ?: -1).equalsOneOf(item.index, match.index)
+                        }) {
+                        return
+                    }
+                }
+
+                it.key == FoundType.NORMAL -> it.value.removeIf { data ->
+                    (data.item?.index ?: -1).equalsOneOf(item.index, match.index)
+                }
+
+                else -> {}
+            }
+        }
+
+        val pairData = FoundData(first = item, second = match)
+        found.getOrPut(FoundType.MATCH) { mutableListOf(pairData) }.apply { if (!contains(pairData)) add(pairData) }
+    }
+
+    private fun handleNormalReward(item: SuperpairItem) {
+        for ((key, value) in found.entries) {
+            when {
+                key.isAnyOf(FoundType.MATCH, FoundType.PAIR) -> {
+                    if (value.any { data ->
+                            item.index.equalsOneOf(data.first?.index ?: -1, data.second?.index ?: -1)
+                        }) return
+                }
+
+                else -> if (value.any { data ->
+                        (data.item?.index ?: -1) == item.index && data.item?.sameAs(item) == true
+                    }) return
+            }
+        }
+
+        val itemData = FoundData(item = item)
+        found.getOrPut(FoundType.NORMAL) { mutableListOf(itemData) }.apply { if (!contains(itemData)) add(itemData) }
+    }
+
+    private fun drawDisplay() = buildList {
+        val currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return emptyList<String>()
+
+        add("§6Superpair Experimentation Data")
+        add("")
+
+        val normals = found.entries.firstOrNull { it.key == FoundType.NORMAL }?.value ?: mutableListOf()
+        val powerups = found.entries.firstOrNull { it.key == FoundType.POWERUP }?.value ?: mutableListOf()
+        val matches = found.entries.firstOrNull { it.key == FoundType.MATCH }?.value ?: mutableListOf()
+        val pairs = found.entries.firstOrNull { it.key == FoundType.PAIR }?.value ?: mutableListOf()
+        val possiblePairs = calculatePossiblePairs(currentExperiment)
+
+        if (pairs.isNotEmpty()) add("§2Found")
+        for (pair in pairs) {
+            val prefix = determinePrefix(pairs.indexOf(pair), pairs.lastIndex)
+            add(" $prefix §a${pair.first?.reward ?: ""}")
+        }
+        if (matches.isNotEmpty()) add("§eMatched")
+        for (match in matches) {
+            val prefix = determinePrefix(matches.indexOf(match), matches.lastIndex)
+            add(" $prefix §e${match.first?.reward ?: ""}")
+        }
+        if (powerups.isNotEmpty()) add("§bPowerUp")
+        for (powerup in powerups) {
+            val prefix = determinePrefix(powerups.indexOf(powerup), powerups.size - 1)
+            add(" $prefix §b${powerup.item?.reward ?: ""}")
+        }
+        val toAdd = mutableListOf<String>()
+        if (possiblePairs >= 1) toAdd.add("§ePairs - $possiblePairs")
+        if (2 - powerups.size >= 1) toAdd.add("§bPowerUps - ${2 - powerups.size}")
+        if (normals.isNotEmpty()) toAdd.add("§7Normals - ${normals.size}")
+
+        if (toAdd.isNotEmpty()) {
+            add("")
+            add("§4Not found")
+        }
+        for (string in toAdd) if (string != toAdd.last()) add(" ├ $string") else add(" └ $string")
+    }
+
+    private fun calculatePossiblePairs(currentExperiment: Experiment) =
+        ((currentExperiment.gridSize - 2) / 2) - found.filter { it.key != FoundType.POWERUP }.values.sumOf { it.size }
+
+    private fun convertToReward(item: ItemStack) = if (item.displayName.removeColor() == "Enchanted Book") item.getLore()[2].removeColor()
+    else item.displayName.removeColor()
+
+    private fun determinePrefix(index: Int, lastIndex: Int) = if (index == lastIndex) "└" else "├"
+
+    private fun hasFoundPair(
+        first: SuperpairItem,
+        second: SuperpairItem,
+    ) = first.index != second.index && first.sameAs(second)
+
+    // TODO extract logic greatly
+    private fun hasFoundMatch(firstItem: SuperpairItem) =
+        uncoveredItems.any { it.value.index != firstItem.index && it.value.sameAs(firstItem) } &&
+            found.entries.none {
+                it.key.isAnyOf(FoundType.PAIR, FoundType.MATCH) &&
+                    it.value.any { data ->
+                        firstItem.index.equalsOneOf(data.first?.index ?: -1, data.second?.index ?: -1)
+                    }
+            }
+
+    private fun isPowerUp(reward: String) = ExperimentationTableAPI.powerUpPattern.matches(reward)
+
+    private fun isReward(reward: String) =
+        ExperimentationTableAPI.rewardPattern.matches(reward) || ExperimentationTableAPI.powerUpPattern.matches(reward)
+
+    // TODO use repo patterns instead
+    private fun isWaiting(itemName: String) =
+        listOf("Click any button!", "Click a second button!", "Next button is instantly rewarded!").contains(itemName)
+
+    private fun clicksSinceSeparator(list: MutableMap<Int, SuperpairItem>): Int {
+        val lastIndex = list.entries.indexOfLast { it.value == emptySuperpairItem }
+        return if (lastIndex != -1) list.size - 1 - lastIndex else -1
+    }
+
+    private fun isOutOfBounds(slot: Int, experiment: Experiment): Boolean =
+        slot <= experiment.startSlot ||
+            slot >= experiment.endSlot ||
+            (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2)
+
+    private fun SuperpairItem?.sameAs(other: SuperpairItem) = this?.reward == other.reward && this?.damage == other.damage
+
+    private fun isEnabled() =
+        IslandType.PRIVATE_ISLAND.isInIsland() && config.superpairDisplay && ExperimentationTableAPI.getCurrentExperiment() != null
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
deleted file mode 100644
index cb3102ca8eed..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairExperimentInformationDisplay.kt
+++ /dev/null
@@ -1,277 +0,0 @@
-package at.hannibal2.skyhanni.features.inventory.experimentationtable
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.events.GuiContainerEvent.SlotClickEvent
-import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.InventoryCloseEvent
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matches
-import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import net.minecraft.item.ItemStack
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.milliseconds
-
-// TODO important: all use cases of listOf in combination with string needs to be gone. no caching, constant new list creation, and bad design.
-@SkyHanniModule
-object SuperpairExperimentInformationDisplay {
-
-    private val config get() = SkyHanniMod.feature.inventory.experimentationTable
-
-    private var display = emptyList<String>()
-
-    private var uncoveredAt = 0
-    private var uncoveredItems = mutableListOf<Pair<Int, String>>()
-    private var possiblePairs = 0
-
-    data class Item(val index: Int, val name: String)
-    data class ItemPair(val first: Item, val second: Item)
-
-    // TODO remove string. use enum instead! maybe even create new data type instead of map of pairs
-    private var found = mutableMapOf<Pair<Item?, ItemPair?>, String>()
-
-    private var toCheck = mutableListOf<Pair<Int, Int>>()
-    private var lastClicked = mutableListOf<Pair<Int, Int>>()
-    private var lastClick = SimpleTimeMark.farPast()
-    private var currentExperiment = Experiment.NONE
-    private var instantFind = 0
-
-    private val sideSpaces1 = listOf(17, 18, 26, 27, 35, 36)
-    private val sideSpaces2 = listOf(16, 17, 18, 19, 25, 26, 27, 28, 34, 35, 36, 37)
-
-    @SubscribeEvent
-    fun onInventoryClose(event: InventoryCloseEvent) {
-        display = emptyList()
-
-        uncoveredAt = 0
-        uncoveredItems.clear()
-        possiblePairs = 0
-
-        found.clear()
-        toCheck.clear()
-        lastClicked.clear()
-        lastClick = SimpleTimeMark.farPast()
-        currentExperiment = Experiment.NONE
-        instantFind = 0
-    }
-
-    @SubscribeEvent
-    fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
-        if (!isEnabled()) return
-        config.superpairDisplayPosition.renderStrings(display, posLabel = "Superpair Experiment Information")
-        display = checkItems(toCheck)
-    }
-
-    @SubscribeEvent
-    fun onSlotClick(event: SlotClickEvent) {
-        if (!isEnabled()) return
-        currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return
-
-        if (isOutOfBounds(event.slotId, currentExperiment)) return
-        val item = event.item ?: return
-        if (item.displayName.removeColor() == "?") return
-        val clicksItem = InventoryUtils.getItemAtSlotIndex(4)
-
-        if (lastClicked.none { it.first == event.slotId && it.second == uncoveredAt } && lastClick.passedSince() > 100.milliseconds) {
-            if (clicksItem != null && clicksItem.displayName.removeColor().split(" ")[1] == "0") return
-            lastClicked.add(Pair(event.slotId, uncoveredAt))
-            lastClick = SimpleTimeMark.now()
-            toCheck.add(event.slotId to uncoveredAt)
-            uncoveredAt += 1
-        }
-    }
-
-    private fun checkItems(check: MutableList<Pair<Int, Int>>): List<String> {
-        currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return listOf()
-        if (check.isEmpty()) return drawDisplay()
-
-        for ((slot, uncovered) in check) {
-            val itemNow = InventoryUtils.getItemAtSlotIndex(slot) ?: return drawDisplay()
-            val itemName = itemNow.displayName.removeColor()
-
-            if (isWaiting(itemName) || isOutOfBounds(slot, currentExperiment)) return drawDisplay()
-
-            val reward = convertToReward(itemNow)
-            if (uncoveredItems.none { it.first == slot }) uncoveredItems.add(Pair(slot, reward))
-
-            when {
-                isPowerUp(reward) -> handlePowerUp(slot, reward)
-                isReward(itemName) -> handleReward(slot, uncovered, reward)
-            }
-
-            possiblePairs = calculatePossiblePairs()
-
-            val since = clicksSinceSeparator(lastClicked)
-
-            if ((since >= 2 || (since == -1 && lastClicked.size >= 2)) && instantFind == 0) {
-                lastClicked.add(-1 to uncoveredAt)
-                uncoveredAt += 1
-            }
-            toCheck.removeIf { it.first == slot }
-
-            return drawDisplay()
-        }
-        possiblePairs = calculatePossiblePairs()
-        return drawDisplay()
-    }
-
-    private fun handlePowerUp(slot: Int, reward: String) {
-        val item = toEither(Item(slot, reward))
-
-        found[item] = "Powerup"
-        possiblePairs--
-        lastClicked.removeIf { it.first == slot }
-        uncoveredAt -= 1
-        if (reward == "Instant Find") instantFind += 1
-    }
-
-    private fun handleReward(slot: Int, uncovered: Int, reward: String) {
-        val lastSlotClicked =
-            if (instantFind == 0 && lastClicked.none { it.first == -1 && it.second == uncovered - 1 } && lastClicked.size != 1) lastClicked.find { it.second == uncovered - 1 }
-                ?: return else lastClicked.find { it.second == uncovered } ?: return
-
-        val lastItem = InventoryUtils.getItemAtSlotIndex(lastSlotClicked.first) ?: return
-        val itemClicked = InventoryUtils.getItemAtSlotIndex(slot) ?: return
-
-        val lastItemName = convertToReward(lastItem)
-
-        if (isWaiting(lastItemName)) return
-
-        when {
-            instantFind >= 1 -> {
-                handleFoundPair(slot, reward, lastSlotClicked.first)
-                instantFind -= 1
-                lastClicked.add(-1 to uncoveredAt)
-                uncoveredAt += 1
-            }
-
-            hasFoundPair(slot, lastSlotClicked.first, reward, lastItemName) && lastItem.itemDamage == itemClicked.itemDamage -> handleFoundPair(
-                slot,
-                reward,
-                lastSlotClicked.first,
-            )
-
-            hasFoundMatch(slot, reward) -> handleFoundMatch(slot, reward)
-            else -> handleNormalReward(slot, reward)
-        }
-
-    }
-
-    private fun handleFoundPair(
-        slot: Int,
-        reward: String,
-        lastSlotClicked: Int,
-    ) {
-        val pair = toEither(ItemPair(Item(slot, reward), Item(lastSlotClicked, reward)))
-
-        found[pair] = "Pair"
-        found.entries.removeIf {
-            it.value == "Match" && right(it.key).first.index == slot
-        }
-        found.entries.removeIf {
-            it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == lastSlotClicked)
-        }
-    }
-
-    private fun handleFoundMatch(slot: Int, reward: String) {
-        val match = uncoveredItems.find { it.second == reward }?.first ?: return
-        val pair = toEither(ItemPair(Item(slot, reward), Item(match, reward)))
-
-        if (found.none {
-                listOf("Pair", "Match").contains(it.value) && (right(it.key).first.index == slot)
-            }) found[pair] = "Match"
-        found.entries.removeIf { it.value == "Normal" && (left(it.key).index == slot || left(it.key).index == match) }
-    }
-
-    private fun handleNormalReward(slot: Int, reward: String) {
-        val item = toEither(Item(slot, reward))
-
-        if (found.none {
-                listOf("Match", "Pair").contains(it.value) && (right(it.key).first.index == slot || right(it.key).second.index == slot)
-            } && found.none { it.value == "Normal" && left(it.key).index == slot }) found[item] = "Normal"
-    }
-
-    private fun calculatePossiblePairs() =
-        ((currentExperiment.gridSize - 2) / 2) - found.filter { listOf("Pair", "Match", "Normal").contains(it.value) }.size
-
-    private fun drawDisplay() = buildList {
-        add("§6Superpair Experimentation Data")
-        add("")
-
-        val pairs = found.entries.filter { it.value == "Pair" }
-        val matches = found.entries.filter { it.value == "Match" }
-        val powerups = found.entries.filter { it.value == "Powerup" }
-        val normals = found.entries.filter { it.value == "Normal" }
-
-        if (pairs.isNotEmpty()) add("§2Found")
-        for (pair in pairs) {
-            val prefix = determinePrefix(pairs.indexOf(pair), pairs.lastIndex)
-            add(" $prefix §a${right(pair.key).first.name}")
-        }
-        if (matches.isNotEmpty()) add("§eMatched")
-        for (match in matches) {
-            val prefix = determinePrefix(matches.indexOf(match), matches.lastIndex)
-            add(" $prefix §e${right(match.key).first.name}")
-        }
-        if (powerups.isNotEmpty()) add("§bPowerUp")
-        for (powerup in powerups) {
-            val prefix = determinePrefix(powerups.indexOf(powerup), powerups.size - 1)
-            add(" $prefix §b${left(powerup.key).name}")
-        }
-        val toAdd = mutableListOf<String>()
-        if (possiblePairs >= 1) toAdd.add("§ePairs - $possiblePairs")
-        if (2 - powerups.size >= 1) toAdd.add("§bPowerUps - ${2 - powerups.size}")
-        if (normals.isNotEmpty()) toAdd.add("§7Normals - ${normals.size}")
-
-        if (toAdd.isNotEmpty()) {
-            add("")
-            add("§4Not found")
-        }
-        for (string in toAdd) if (string != toAdd.last()) add(" ├ $string") else add(" └ $string")
-    }
-
-    private fun convertToReward(item: ItemStack) = if (item.displayName.removeColor() == "Enchanted Book") item.getLore()[2].removeColor()
-    else item.displayName.removeColor()
-
-    private fun determinePrefix(index: Int, lastIndex: Int) = if (index == lastIndex) "└" else "├"
-
-    private fun hasFoundPair(
-        firstSlot: Int,
-        secondSlot: Int,
-        firstName: String,
-        secondName: String,
-    ) = firstSlot != secondSlot && firstName == secondName
-
-    private fun hasFoundMatch(itemSlot: Int, reward: String) =
-        uncoveredItems.any { (slot, name) -> slot != itemSlot && name == reward } && found.none {
-            listOf("Pair", "Match").contains(it.value) && (right(it.key).first.index == itemSlot || right(it.key).second.index == itemSlot)
-        }
-
-    private fun isPowerUp(reward: String) = ExperimentationTableAPI.powerUpPattern.matches(reward)
-
-    private fun isReward(reward: String) = ExperimentationTableAPI.rewardPattern.matches(reward)
-
-    private fun isWaiting(itemName: String) =
-        listOf("Click any button!", "Click a second button!", "Next button is instantly rewarded!").contains(itemName)
-
-    private fun clicksSinceSeparator(list: MutableList<Pair<Int, Int>>): Int {
-        val lastIndex = list.indexOfLast { it.first == -1 }
-        return if (lastIndex != -1) list.size - 1 - lastIndex else -1
-    }
-
-    private fun isOutOfBounds(slot: Int, experiment: Experiment): Boolean =
-        slot <= experiment.startSlot || slot >= experiment.endSlot || (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2)
-
-    // TODO remove left and right, use custom data type instead
-    private fun left(it: Pair<Item?, ItemPair?>): Item = it.first ?: Item(-1, "")
-
-    private fun right(it: Pair<Item?, ItemPair?>): ItemPair = it.second ?: ItemPair(Item(-1, ""), Item(-1, ""))
-
-    private fun toEither(it: Any): Pair<Item?, ItemPair?> = if (it is Item) it to null else null to it as ItemPair
-
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.superpairDisplay && ExperimentationTableAPI.getCurrentExperiment() != null
-}

From d06878ca5d28d20fa835a41a0f931c7a123dffb8 Mon Sep 17 00:00:00 2001
From: minhperry <46137516+minhperry@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:59:02 +0200
Subject: [PATCH 610/721] Improvement: Added cooldown to Carnival NPC click
 (#2628)

---
 .../skyhanni/features/event/carnival/CarnivalQuickStart.kt     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
index ee2a9028ae7e..2257772c8f3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
@@ -32,6 +32,7 @@ object CarnivalQuickStart {
     private val cowboy by repoGroup.pattern("cowboy", "Carnival Cowboy")
 
     private var lastChat = SimpleTimeMark.farPast()
+    private var lastClicked = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onEntityClick(event: EntityClickEvent) {
@@ -44,6 +45,8 @@ object CarnivalQuickStart {
             pirate.matches(mob.name) -> "carnival_pirateman"
             else -> return
         }
+        if (lastClicked.passedSince() < 1.seconds) return
+        lastClicked = SimpleTimeMark.now()
         HypixelCommands.npcOption(type, "r_2_1")
         event.cancel()
     }

From 0864f1e1de572b955f356053ad9cb73be24d5683 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:59:48 +0200
Subject: [PATCH 611/721] =?UTF-8?q?Automatically=20stating=20pathfind=20af?=
 =?UTF-8?q?ter=20clicking=20the=20hypixel=20reminder=20ch=E2=80=A6=20(#263?=
 =?UTF-8?q?5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/data/EntityMovementData.kt       | 51 ++++++++++++++++++-
 .../event/carnival/CarnivalReminder.kt        |  7 +++
 .../features/event/hoppity/HoppityNpc.kt      | 11 +++-
 .../features/fame/CityProjectFeatures.kt      | 15 +++++-
 .../skyhanni/features/fame/UpgradeReminder.kt | 15 +++++-
 5 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
index 92a36b62363d..d38b6824b864 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.EntityMoveEvent
+import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWarpEvent
@@ -8,22 +9,36 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.Entity
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object EntityMovementData {
 
     private val warpingPattern by RepoPattern.pattern(
         "data.entity.warping",
-        "§7(?:Warping|Warping you to your SkyBlock island|Warping using transfer token|Finding player|Sending a visit request)\\.\\.\\."
+        "§7(?:Warping|Warping you to your SkyBlock island|Warping using transfer token|Finding player|Sending a visit request)\\.\\.\\.",
     )
 
+    private var nextTeleport: OnNextTeleport? = null
+
+    fun onNextTeleport(island: IslandType, action: () -> Unit) {
+        nextTeleport = OnNextTeleport(island, action)
+    }
+
+    class OnNextTeleport(val island: IslandType, val action: () -> Unit) {
+        val startTime: SimpleTimeMark = SimpleTimeMark.now()
+    }
+
     private val entityLocation = mutableMapOf<Entity, LorenzVec>()
 
     fun addToTrack(entity: Entity) {
@@ -32,6 +47,40 @@ object EntityMovementData {
         }
     }
 
+    @SubscribeEvent
+    fun onIslandChange(event: IslandChangeEvent) {
+        val nextData = nextTeleport ?: return
+        if (nextData.island != event.newIsland) return
+        val passedSince = nextData.startTime.passedSince()
+        if (passedSince > 5.seconds) {
+            nextTeleport = null
+            return
+        }
+
+        DelayedRun.runDelayed(100.milliseconds) {
+            nextData.action()
+        }
+        nextTeleport = null
+    }
+
+    @SubscribeEvent
+    fun onPlayerMove(event: EntityMoveEvent) {
+        if (!LorenzUtils.inSkyBlock || event.entity != Minecraft.getMinecraft().thePlayer) return
+
+        val nextData = nextTeleport ?: return
+
+        val passedSince = nextData.startTime.passedSince()
+        if (passedSince > 5.seconds) {
+            nextTeleport = null
+            return
+        }
+        if (passedSince > 50.milliseconds && nextData.island.isInIsland()) {
+            nextData.action()
+            nextTeleport = null
+            return
+        }
+    }
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt
index eff7516617b1..d77861872d6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalReminder.kt
@@ -1,6 +1,9 @@
 package at.hannibal2.skyhanni.features.event.carnival
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.EntityMovementData
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.Perk
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -11,6 +14,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
@@ -90,6 +94,9 @@ object CarnivalReminder {
                 "warp to The Carnival",
             ) {
                 HypixelCommands.warp("carnival")
+                EntityMovementData.onNextTeleport(IslandType.HUB) {
+                    IslandGraphs.pathFind(LorenzVec(-89.5, 71.0, -18.7), "§aCarnival Tickets", condition = { config.reminderDailyTickets })
+                }
             }
             nextCheckTime = 5.0.minutes.fromNow()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index c120c3d649fd..0546e5ff98d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -1,5 +1,8 @@
 package at.hannibal2.skyhanni.features.event.hoppity
 
+import at.hannibal2.skyhanni.data.EntityMovementData
+import at.hannibal2.skyhanni.data.IslandGraphs
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -15,6 +18,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SkyBlockTime
@@ -60,7 +64,12 @@ object HoppityNpc {
             actionName = "warp to hub",
             action = {
                 HypixelCommands.warp("hub")
-                //afterNextIslandwarpTtp hub: IslandGraphs.pathFind(hoppity)
+                EntityMovementData.onNextTeleport(IslandType.HUB) {
+                    IslandGraphs.pathFind(
+                        LorenzVec(6.4, 70.0, 7.4),
+                        "§aHoppity's Shop",
+                        condition = { config.hoppityShopReminder })
+                }
             },
         )
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
index 5a1e1361a784..cf5d3ce5a5a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
@@ -2,6 +2,9 @@ package at.hannibal2.skyhanni.features.fame
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+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.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -20,6 +23,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
@@ -79,7 +83,16 @@ object CityProjectFeatures {
             "Daily City Project Reminder!",
             config::dailyReminder,
             actionName = "warp to Hub",
-            action = { HypixelCommands.warp("hub") },
+            action = {
+                HypixelCommands.warp("hub")
+                EntityMovementData.onNextTeleport(IslandType.HUB) {
+                    IslandGraphs.pathFind(
+                        LorenzVec(9.3, 72.0, -103.4),
+                        "§aCity Project",
+                        condition = { config.dailyReminder },
+                    )
+                }
+            },
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
index d5f33204ce25..d22151c1b014 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
@@ -2,6 +2,9 @@ package at.hannibal2.skyhanni.features.fame
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+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.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
@@ -13,6 +16,7 @@ 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.anyMatches
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
@@ -162,7 +166,16 @@ object UpgradeReminder {
                 "The §a$name §eupgrade has completed!",
                 config::accountUpgradeReminder,
                 actionName = "warp to Hub",
-                action = { HypixelCommands.warp("hub") },
+                action = {
+                    HypixelCommands.warp("hub")
+                    EntityMovementData.onNextTeleport(IslandType.HUB) {
+                        IslandGraphs.pathFind(
+                            LorenzVec(-2.6, 73.0, -101.6),
+                            "§eCommunity Shop",
+                            condition = { config.accountUpgradeReminder },
+                        )
+                    }
+                },
             )
         }
 

From ab7b3269eb8a5b3869331fa94663b1ddfebe80b2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:50:45 +0200
Subject: [PATCH 612/721] Improvement: Pathfind Rendering (#2634)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/data/IslandGraphs.kt   | 180 +++++++-----------
 .../skyhanni/data/mob/IslandExceptions.kt     |  24 ++-
 .../features/chat/PowderMiningChatFilter.kt   |   1 +
 .../skyhanni/features/mining/TunnelsMaps.kt   |  20 +-
 .../skyhanni/features/misc/IslandAreas.kt     |  16 +-
 .../misc/pathfind/NavigationHelper.kt         |   4 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |   2 +-
 .../skyhanni/test/graph/GraphEditor.kt        |  50 ++---
 .../at/hannibal2/skyhanni/utils/MobUtils.kt   |  11 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |   4 +-
 10 files changed, 136 insertions(+), 176 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 73915c22d183..9829b4ec9e92 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -19,7 +19,6 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.LocationUtils
-import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
@@ -39,7 +38,6 @@ import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import java.io.File
-import kotlin.math.abs
 import kotlin.time.Duration.Companion.milliseconds
 
 /**
@@ -104,18 +102,17 @@ object IslandGraphs {
 
     val existsForThisIsland get() = currentIslandGraph != null
 
-    var closedNote: GraphNode? = null
-    var secondClosedNote: GraphNode? = null
+    private var pathfindClosestNode: GraphNode? = null
+    var closestNode: GraphNode? = null
+    private var secondClosestNode: GraphNode? = null
 
     private var currentTarget: LorenzVec? = null
     private var currentTargetNode: GraphNode? = null
     private var label = ""
-    private var distanceViaNodes = 0.0
-    private var distanceToNextNode = 0.0
+    private var lastDistance = 0.0
     private var totalDistance = 0.0
     private var color = Color.WHITE
     private var shouldAllowRerouting = false
-    private var showGoalExact = false
     private var onFound: () -> Unit = {}
     private var goal: GraphNode? = null
         set(value) {
@@ -215,7 +212,7 @@ object IslandGraphs {
 
         // calling various update functions to make swtiching between deep caverns and glacite tunnels bareable
         handleTick()
-        IslandAreas.noteMoved()
+        IslandAreas.nodeMoved()
         DelayedRun.runDelayed(150.milliseconds) {
             IslandAreas.updatePosition()
         }
@@ -223,20 +220,21 @@ object IslandGraphs {
 
     private fun reset() {
         stop()
-        closedNote = null
+        pathfindClosestNode = null
+        closestNode = null
     }
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        handleTick()
         if (event.isMod(2)) {
+            handleTick()
             checkMoved()
         }
     }
 
     private fun handleTick() {
-        val prevClosed = closedNote
+        val prevClosest = pathfindClosestNode
 
         currentTarget?.let {
             if (it.distanceToPlayer() < 3) {
@@ -252,39 +250,46 @@ object IslandGraphs {
         val graph = currentIslandGraph ?: return
         val sortedNodes = graph.sortedBy { it.position.distanceSqToPlayer() }
         val newClosest = sortedNodes.first()
-        if (closedNote == newClosest) return
-        if (onCurrentPath()) return
-
-        closedNote = newClosest
-        secondClosedNote = sortedNodes.getOrNull(1)
-        onNewNote()
-        hasMoved = false
-        if (newClosest == prevClosed) return
-        findNewPath()
+        if (pathfindClosestNode == newClosest) return
+        val newPath = !onCurrentPath()
+
+        closestNode = newClosest
+        secondClosestNode = sortedNodes.getOrNull(1)
+        onNewNode()
+        if (newClosest == prevClosest) return
+        if (newPath) {
+            pathfindClosestNode = closestNode
+            findNewPath()
+        }
     }
 
     private fun onCurrentPath(): Boolean {
         val path = fastestPath ?: return false
         val closest = path.nodes.minBy { it.position.distanceSqToPlayer() }
         val distance = closest.position.distanceToPlayer()
-        if (distance > 5) return false
-
-        if (distance < 3) {
-            val index = path.nodes.indexOf(closest)
-            val newNodes = path.drop(index)
-            val newGraph = Graph(newNodes)
-            fastestPath = newGraph
-            newNodes.getOrNull(1)?.let {
-                secondClosedNote = it
-            }
-            setFastestPath(newGraph to newGraph.totalLenght(), setPath = false)
+        if (distance > 7) return false
+
+        val index = path.nodes.indexOf(closest)
+        val newNodes = path.drop(index)
+        val newGraph = Graph(newNodes)
+        fastestPath = skipIfCloser(newGraph)
+        newNodes.getOrNull(1)?.let {
+            secondClosestNode = it
         }
+        setFastestPath(newGraph to newGraph.totalLenght(), setPath = false)
         return true
     }
 
+    private fun skipIfCloser(graph: Graph): Graph = if (graph.nodes.size > 1) {
+        val hideNearby = if (Minecraft.getMinecraft().thePlayer.onGround) 3 else 5
+        Graph(graph.nodes.takeLastWhile { it.position.distanceToPlayer() > hideNearby })
+    } else {
+        graph
+    }
+
     private fun findNewPath() {
         val goal = IslandGraphs.goal ?: return
-        val closest = closedNote ?: return
+        val closest = pathfindClosestNode ?: return
 
         val (path, distance) = GraphUtils.findShortestPathAsGraphWithDistance(closest, goal)
         val first = path.firstOrNull()
@@ -307,8 +312,6 @@ object IslandGraphs {
     private fun Graph.totalLenght(): Double = nodes.zipWithNext().sumOf { (a, b) -> a.position.distance(b.position) }
 
     private fun handlePositionChange() {
-        val secondClosestNode = secondClosedNote ?: return
-        distanceToNextNode = secondClosestNode.position.distanceToPlayer()
         updateChat()
     }
 
@@ -331,25 +334,21 @@ object IslandGraphs {
     }
 
     private fun setFastestPath(path: Pair<Graph, Double>, setPath: Boolean = true) {
+        // TODO cleanup
         val (fastestPath, distance) = path.takeIf { it.first.isNotEmpty() } ?: return
         val nodes = fastestPath.nodes.toMutableList()
         if (Minecraft.getMinecraft().thePlayer.onGround) {
             nodes.add(0, GraphNode(0, LocationUtils.playerLocation()))
         }
         if (setPath) {
-            this.fastestPath = Graph(cutByMaxDistance(nodes, 3.0))
+            this.fastestPath = skipIfCloser(Graph(cutByMaxDistance(nodes, 2.0)))
         }
-
-        val diff = fastestPath.getOrNull(1)?.let {
-            fastestPath.first().position.distance(it.position)
-        } ?: 0.0
-        this.distanceViaNodes = distance - diff
         updateChat()
     }
 
-    private fun onNewNote() {
+    private fun onNewNode() {
         // TODO create an event
-        IslandAreas.noteMoved()
+        IslandAreas.nodeMoved()
         if (shouldAllowRerouting) {
             tryRerouting()
         }
@@ -357,12 +356,12 @@ object IslandGraphs {
 
     private fun tryRerouting() {
         val target = currentTargetNode ?: return
-        val closest = closedNote ?: return
+        val closest = pathfindClosestNode ?: return
         val map = GraphUtils.findAllShortestDistances(closest).distances.filter { it.key.sameNameAndTags(target) }
         val newTarget = map.sorted().keys.firstOrNull() ?: return
         if (newTarget != target) {
             ChatUtils.debug("Rerouting navigation..")
-            newTarget.pathFind(label, color, onFound, allowRerouting = true, condition)
+            newTarget.pathFind(label, color, onFound, allowRerouting = true, condition = condition)
         }
     }
 
@@ -372,9 +371,8 @@ object IslandGraphs {
         fastestPath = null
         currentTargetNode = null
         label = ""
-        distanceToNextNode = 0.0
-        distanceViaNodes = 0.0
         totalDistance = 0.0
+        lastDistance = 0.0
     }
 
     /**
@@ -396,7 +394,7 @@ object IslandGraphs {
         reset()
         currentTargetNode = this
         shouldAllowRerouting = allowRerouting
-        pathFind0(location = position, label, color, onFound, showGoalExact = false, condition)
+        pathFind0(location = position, label, color, onFound, condition)
     }
 
     /**
@@ -406,7 +404,6 @@ object IslandGraphs {
      * @param label The name of the naviation goal in chat.
      * @param color The color of the lines in world.
      * @param onFound The callback that gets fired when the goal is reached.
-     * @param showGoalExact Wether the exact location should be shown as a waypoint, as well as shwoing a line from last node to the goal location.
      * @param condition The pathfinding stops when the condition is no longer valid.
      */
     fun pathFind(
@@ -414,12 +411,11 @@ object IslandGraphs {
         label: String,
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
-        showGoalExact: Boolean = false,
         condition: () -> Boolean,
     ) {
         reset()
         shouldAllowRerouting = false
-        pathFind0(location, label, color, onFound, showGoalExact, condition)
+        pathFind0(location, label, color, onFound, condition)
     }
 
     private fun pathFind0(
@@ -427,14 +423,12 @@ object IslandGraphs {
         label: String,
         color: Color = LorenzColor.WHITE.toColor(),
         onFound: () -> Unit = {},
-        showGoalExact: Boolean = false,
         condition: () -> Boolean,
     ) {
         currentTarget = location
         this.label = label
         this.color = color
         this.onFound = onFound
-        this.showGoalExact = showGoalExact
         this.condition = condition
         val graph = currentIslandGraph ?: return
         goal = graph.minBy { it.position.distance(currentTarget!!) }
@@ -445,9 +439,18 @@ object IslandGraphs {
 
     private fun updateChat() {
         if (label == "") return
-        val finalDistance = distanceViaNodes + distanceToNextNode
-        if (finalDistance == 0.0) return
-        val distance = finalDistance.roundTo(1)
+        val path = fastestPath ?: return
+        var distance = 0.0
+        for ((a, b) in path.zipWithNext()) {
+            distance += a.position.distance(b.position)
+        }
+        val distanceToPlayer = path.first().position.distanceToPlayer()
+        distance += distanceToPlayer
+        distance = distance.roundTo(1)
+
+        if (distance == lastDistance) return
+        lastDistance = distance
+        if (distance == 0.0) return
         if (totalDistance == 0.0 || distance > totalDistance) {
             totalDistance = distance
         }
@@ -470,29 +473,25 @@ object IslandGraphs {
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        var path = fastestPath ?: return
-
-        if (path.nodes.size > 1) {
-            val hideNearby = if (Minecraft.getMinecraft().thePlayer.onGround) 5 else 7
-            path = Graph(path.nodes.takeLastWhile { it.position.distanceToPlayer() > hideNearby })
-        }
-//         graph = skipNodes(graph) ?: graph
+        val path = fastestPath ?: return
 
+        // maybe reuse for debuggin
+//         for ((a, b) in path.nodes.zipWithNext()) {
+//             val diff = a.position.distance(b.position)
+//             event.drawString(a.position, "diff: ${diff.roundTo(1)}")
+//         }
         event.draw3DPathWithWaypoint(
             path,
             color,
             6,
             true,
-            bezierPoint = 2.0,
+            bezierPoint = 0.6,
             textSize = 1.0,
-            markLastBlock = showGoalExact,
         )
 
-        if (showGoalExact) {
-            val targetLocation = currentTarget ?: return
-            val lastNode = path.nodes.last().position
-            event.draw3DLine(lastNode.add(0.5, 0.5, 0.5), targetLocation.add(0.5, 0.5, 0.5), color, 4, true)
-        }
+        val targetLocation = currentTarget ?: return
+        val lastNode = path.nodes.lastOrNull()?.position ?: return
+        event.draw3DLine(lastNode.add(0.5, 0.5, 0.5), targetLocation.add(0.5, 0.5, 0.5), color, 4, true)
     }
 
     // TODO move into new utils class
@@ -524,47 +523,4 @@ object IslandGraphs {
 
         return locations.map { GraphNode(index++, it) }
     }
-
-    // trying to find a faster node-path, if the future nodes are in line of sight and gratly beneift the current path
-    private fun skipNodes(graph: Graph): Graph? {
-        val closedNode = closedNote ?: return null
-
-        val playerEyeLocation = LocationUtils.playerEyeLocation()
-        val playerY = playerEyeLocation.y - 1
-
-        val distanceToPlayer = closedNode.position.distanceToPlayer()
-        val skipNodeDistance = distanceToPlayer > 8
-        val maxSkipDistance = if (skipNodeDistance) 50.0 else 20.0
-
-        val nodes = graph.nodes
-        val potentialSkip =
-            nodes.lastOrNull { it.position.canBeSeen(maxSkipDistance, -1.0) && abs(it.position.y - playerY) <= 2 } ?: return null
-
-        val angleSkip = if (potentialSkip == nodes.first()) {
-            false
-        } else {
-            val v1 = potentialSkip.position - playerEyeLocation
-            val v2 = nodes.first().position - playerEyeLocation
-            val v = v1.angleInRad(v2)
-            v > 1
-        }
-
-        if (!skipNodeDistance && !angleSkip) return null
-
-        val list = mutableListOf<GraphNode>()
-        list.add(potentialSkip)
-
-        var passed = false
-        for (node in nodes) {
-            if (passed) {
-                list.add(node)
-            } else {
-                if (node == potentialSkip) {
-                    passed = true
-                }
-            }
-        }
-
-        return Graph(list)
-    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
index 2acbe3546117..eed2d5e70dba 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/IslandExceptions.kt
@@ -58,26 +58,28 @@ object IslandExceptions {
         armorStand: EntityArmorStand?,
         nextEntity: EntityLivingBase?,
     ) = when {
-        baseEntity is EntityZombie && armorStand != null &&
+        baseEntity is EntityZombie &&
+            armorStand != null &&
             (armorStand.name == "§e﴾ §c§lThe Watcher§r§r §e﴿" || armorStand.name == "§3§lWatchful Eye§r") ->
             MobData.MobResult.found(
                 MobFactories.special(baseEntity, armorStand.cleanName(), armorStand),
             )
 
-        baseEntity is EntityCaveSpider -> MobUtils.getClosedArmorStand(baseEntity, 2.0).takeNonDefault()
+        baseEntity is EntityCaveSpider -> MobUtils.getClosestArmorStand(baseEntity, 2.0).takeNonDefault()
             .makeMobResult { MobFactories.dungeon(baseEntity, it) }
 
         baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "Shadow Assassin" ->
-            MobUtils.getClosedArmorStandWithName(baseEntity, 3.0, "Shadow Assassin")
+            MobUtils.getClosestArmorStandWithName(baseEntity, 3.0, "Shadow Assassin")
                 .makeMobResult { MobFactories.dungeon(baseEntity, it) }
 
         baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() && baseEntity.name == "The Professor" ->
             MobUtils.getArmorStand(baseEntity, 9)
                 .makeMobResult { MobFactories.boss(baseEntity, it) }
 
-        baseEntity is EntityOtherPlayerMP && baseEntity.isNPC() &&
+        baseEntity is EntityOtherPlayerMP &&
+            baseEntity.isNPC() &&
             (nextEntity is EntityGiantZombie || nextEntity == null) &&
-            baseEntity.name.contains("Livid") -> MobUtils.getClosedArmorStandWithName(baseEntity, 6.0, "﴾ Livid")
+            baseEntity.name.contains("Livid") -> MobUtils.getClosestArmorStandWithName(baseEntity, 6.0, "﴾ Livid")
             .makeMobResult { MobFactories.boss(baseEntity, it, overriddenName = "Real Livid") }
 
         baseEntity is EntityIronGolem && MobFilter.wokeSleepingGolemPattern.matches(armorStand?.name ?: "") ->
@@ -174,7 +176,8 @@ object IslandExceptions {
         baseEntity: EntityLivingBase,
         armorStand: EntityArmorStand?,
     ) = when {
-        baseEntity is EntityMagmaCube && armorStand != null &&
+        baseEntity is EntityMagmaCube &&
+            armorStand != null &&
             armorStand.cleanName() == "[Lv100] Bal ???❤" ->
             MobData.MobResult.found(
                 Mob(baseEntity, Mob.Type.BOSS, armorStand, "Bal", levelOrTier = 100),
@@ -188,7 +191,8 @@ object IslandExceptions {
         armorStand: EntityArmorStand?,
         nextEntity: EntityLivingBase?,
     ) = when {
-        baseEntity is EntityOcelot && armorStand?.isDefaultValue() == false &&
+        baseEntity is EntityOcelot &&
+            armorStand?.isDefaultValue() == false &&
             armorStand.name.startsWith("§8[§7Lv155§8] §cAzrael§r") ->
             MobUtils.getArmorStand(baseEntity, 1)
                 .makeMobResult { MobFactories.basic(baseEntity, it) }
@@ -203,7 +207,8 @@ object IslandExceptions {
             MobUtils.getArmorStand(baseEntity, 2)
                 .makeMobResult { MobFactories.basic(baseEntity, it, listOf(armorStand)) }
 
-        baseEntity is EntityZombie && armorStand?.isDefaultValue() == true &&
+        baseEntity is EntityZombie &&
+            armorStand?.isDefaultValue() == true &&
             MobUtils.getNextEntity(baseEntity, 4)?.name?.startsWith("§e") == true ->
             petCareHandler(baseEntity)
 
@@ -250,7 +255,8 @@ object IslandExceptions {
             .take(RAT_SEARCH_UP_TO - RAT_SEARCH_START + 1)
             .map { i -> MobUtils.getArmorStand(baseEntity, i) }
             .firstOrNull {
-                it != null && it.distanceTo(baseEntity) < 4.0 &&
+                it != null &&
+                    it.distanceTo(baseEntity) < 4.0 &&
                     it.inventory?.get(4)?.getSkullTexture() == MobFilter.RAT_SKULL
             }?.let {
                 MobData.MobResult.found(Mob(baseEntity, mobType = Mob.Type.BASIC, armorStand = it, name = "Rat"))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 88ac9df69eab..1e0397959270 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -33,6 +33,7 @@ object PowderMiningChatFilter {
 
     val patternGroup = RepoPattern.group("filter.powdermining")
 
+    // TODO rename to "openedRewards" ?
     private var unclosedRewards = false
 
     /**
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 19383d4fad14..ad2baedbef87 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -72,7 +72,7 @@ object TunnelsMaps {
             field = value
         }
 
-    private var closedNote: GraphNode? = null
+    private var closestNode: GraphNode? = null
     private var path: Pair<Graph, Double>? = null
 
     private var possibleLocations = mapOf<String, List<GraphNode>>()
@@ -94,11 +94,11 @@ object TunnelsMaps {
             return it
         }
 
-        val closed = closedNote ?: return null
+        val closest = closestNode ?: return null
         val list = possibleLocations[name] ?: return null
 
         val offCooldown = list.filter { cooldowns[it]?.isInPast() != false }
-        val best = offCooldown.minByOrNull { GraphUtils.findShortestDistance(closed, it) } ?: list.minBy {
+        val best = offCooldown.minByOrNull { GraphUtils.findShortestDistance(closest, it) } ?: list.minBy {
             cooldowns[it] ?: SimpleTimeMark.farPast()
         }
         if (cooldowns[best]?.isInPast() != false) {
@@ -394,11 +394,11 @@ object TunnelsMaps {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
         if (checkGoalReached()) return
-        val prevClosed = closedNote
-        closedNote = graph.minBy { it.position.distanceSqToPlayer() }
-        val closest = closedNote ?: return
+        val prevclosest = closestNode
+        closestNode = graph.minBy { it.position.distanceSqToPlayer() }
+        val closest = closestNode ?: return
         val goal = goal ?: return
-        if (closest == prevClosed && goal == prevGoal) return
+        if (closest == prevclosest && goal == prevGoal) return
         val (path, distance) = GraphUtils.findShortestPathAsGraphWithDistance(closest, goal)
         val first = path.firstOrNull()
         val second = path.getOrNull(1)
@@ -454,7 +454,7 @@ object TunnelsMaps {
             true,
             bezierPoint = 2.0,
             textSize = config.textSize.toDouble(),
-            showNoteNames = true,
+            showNodeNames = true,
         )
         event.drawDynamicText(
             if (config.distanceFirst) {
@@ -511,8 +511,8 @@ object TunnelsMaps {
 
     @SubscribeEvent
     fun onIslandChange(event: IslandChangeEvent) {
-        if (closedNote == null) return // Value that must be none null if it was active
-        closedNote = null
+        if (closestNode == null) return // Value that must be none null if it was active
+        closestNode = null
         clearPath()
         cooldowns.clear()
         goalReached = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index faf3130b5ad8..439e434c146e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -20,7 +20,6 @@ import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils
 import at.hannibal2.skyhanni.utils.GraphUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen
-import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
@@ -54,7 +53,7 @@ object IslandAreas {
         hasMoved = true
     }
 
-    fun noteMoved() {
+    fun nodeMoved() {
         SkyHanniMod.coroutineScope.launch {
             updateNodes()
         }
@@ -63,9 +62,9 @@ object IslandAreas {
     private fun updateNodes() {
         if (!isEnabled()) return
         val graph = IslandGraphs.currentIslandGraph ?: return
-        val closedNote = IslandGraphs.closedNote ?: return
+        val closestNode = IslandGraphs.closestNode ?: return
 
-        val (paths, map) = GraphUtils.findFastestPaths(graph, closedNote) { it.getAreaTag() != null }
+        val (paths, map) = GraphUtils.findFastestPaths(graph, closestNode) { it.getAreaTag() != null }
         this.paths = paths
 
         val finalNodes = mutableMapOf<GraphNode, Double>()
@@ -129,14 +128,11 @@ object IslandAreas {
     }
 
     private fun buildDisplay() = buildList<Searchable> {
-        val closedNote = IslandGraphs.closedNote ?: return@buildList
-        val playerDiff = closedNote.position.distanceToPlayer()
-
         var foundCurrentArea = false
         var foundAreas = 0
 
         for ((node, diff) in nodes) {
-            val difference = diff + playerDiff
+            val difference = diff
             val tag = node.getAreaTag() ?: continue
 
             val name = node.name ?: continue
@@ -160,7 +156,7 @@ object IslandAreas {
                 }
             }
 
-            val distance = difference.roundTo(1)
+            val distance = difference.roundTo(0).toInt()
             val text = "$coloredName§7: §e$distance$suffix"
 
             if (!foundCurrentArea) {
@@ -270,11 +266,11 @@ object IslandAreas {
         node.pathFind(
             displayName,
             color,
-            allowRerouting = true,
             onFound = {
                 targetNode = null
                 updatePosition()
             },
+            allowRerouting = true,
             condition = { config.pathfinder.enabled },
         )
         hasMoved = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index f3dc20df66e8..855a16394bb1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -94,7 +94,7 @@ object NavigationHelper {
         searchTerm: String,
     ): Map<GraphNode, Double> {
         val graph = IslandGraphs.currentIslandGraph ?: return emptyMap()
-        val closedNote = IslandGraphs.closedNote ?: return emptyMap()
+        val closestNode = IslandGraphs.closestNode ?: return emptyMap()
 
         val nodes = graph.nodes
         val distances = mutableMapOf<GraphNode, Double>()
@@ -103,7 +103,7 @@ object NavigationHelper {
             val remainingTags = node.tags.filter { it in allowedTags }
             if (remainingTags.isEmpty()) continue
             if (name.lowercase().contains(searchTerm)) {
-                distances[node] = GraphUtils.findShortestDistance(closedNote, node)
+                distances[node] = GraphUtils.findShortestDistance(closestNode, node)
             }
             if (remainingTags.size != 1) {
                 println("found node with invalid amount of tags: ${node.name} (${remainingTags.map { it.cleanName }}")
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 07fc7b81a2f4..fa6537046fc8 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -126,7 +126,7 @@ object SkyHanniDebugsAndTests {
         val location = LorenzVec(x, y, z)
         testLocation = location
         if (args.getOrNull(3) == "pathfind") {
-            IslandGraphs.pathFind(location, "/shtestwaypoint", showGoalExact = true, condition = { true })
+            IslandGraphs.pathFind(location, "/shtestwaypoint", condition = { true })
         }
         ChatUtils.chat("set test waypoint")
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
index 9c9b5bb0693c..e724a8fe6c85 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
@@ -52,13 +52,13 @@ object GraphEditor {
     var activeNode: GraphingNode? = null
         set(value) {
             field = value
-            selectedEdge = findEdgeBetweenActiveAndClosed()
+            selectedEdge = findEdgeBetweenActiveAndClosest()
             checkDissolve()
         }
-    private var closedNode: GraphingNode? = null
+    private var closestNode: GraphingNode? = null
         set(value) {
             field = value
-            selectedEdge = findEdgeBetweenActiveAndClosed()
+            selectedEdge = findEdgeBetweenActiveAndClosest()
         }
 
     private var selectedEdge: GraphingEdge? = null
@@ -88,7 +88,7 @@ object GraphEditor {
 
     private val nodeColor = LorenzColor.BLUE.addOpacity(200)
     private val activeColor = LorenzColor.GREEN.addOpacity(200)
-    private val closedColor = LorenzColor.YELLOW.addOpacity(200)
+    private val closestColor = LorenzColor.YELLOW.addOpacity(200)
     private val dijkstraColor = LorenzColor.LIGHT_PURPLE.addOpacity(200)
 
     private val edgeColor = LorenzColor.GOLD.addOpacity(150)
@@ -168,7 +168,7 @@ object GraphEditor {
 
     private var dissolvePossible = false
 
-    private fun findEdgeBetweenActiveAndClosed(): GraphingEdge? = getEdgeIndex(activeNode, closedNode)?.let { edges[it] }
+    private fun findEdgeBetweenActiveAndClosest(): GraphingEdge? = getEdgeIndex(activeNode, closestNode)?.let { edges[it] }
 
     private fun checkDissolve() {
         if (activeNode == null) {
@@ -189,7 +189,7 @@ object GraphEditor {
         if (!isEnabled()) return
         input()
         if (nodes.isEmpty()) return
-        closedNode = nodes.minBy { it.position.distanceSqToPlayer() }
+        closestNode = nodes.minBy { it.position.distanceSqToPlayer() }
     }
 
     private fun LorenzRenderWorldEvent.drawNode(node: GraphingNode) {
@@ -245,8 +245,8 @@ object GraphEditor {
     }
 
     private fun GraphingNode.getNodeColor() = when (this) {
-        activeNode -> if (this == closedNode) ColorUtils.blendRGB(activeColor, closedColor, 0.5) else activeColor
-        closedNode -> closedColor
+        activeNode -> if (this == closestNode) ColorUtils.blendRGB(activeColor, closestColor, 0.5) else activeColor
+        closestNode -> closestColor
         in highlightedNodes -> dijkstraColor
         else -> nodeColor
     }
@@ -341,12 +341,12 @@ object GraphEditor {
             toggleGhostPosition()
         }
         if (config.selectKey.isKeyClicked()) {
-            activeNode = if (activeNode == closedNode) {
+            activeNode = if (activeNode == closestNode) {
                 feedBackInTutorial("De-selected active node.")
                 null
             } else {
                 feedBackInTutorial("Selected new active node.")
-                closedNode
+                closestNode
             }
         }
         if (config.selectRaycastKey.isKeyClicked()) {
@@ -371,15 +371,15 @@ object GraphEditor {
             }
             activeNode = minimumNode
         }
-        if (activeNode != closedNode && config.connectKey.isKeyClicked()) {
-            val edge = getEdgeIndex(activeNode, closedNode)
+        if (activeNode != closestNode && config.connectKey.isKeyClicked()) {
+            val edge = getEdgeIndex(activeNode, closestNode)
             if (edge == null) {
-                addEdge(activeNode, closedNode)
+                addEdge(activeNode, closestNode)
                 feedBackInTutorial("Added new edge.")
             } else {
                 edges.removeAt(edge)
                 checkDissolve()
-                selectedEdge = findEdgeBetweenActiveAndClosed()
+                selectedEdge = findEdgeBetweenActiveAndClosest()
                 feedBackInTutorial("Removed edge.")
             }
         }
@@ -476,14 +476,14 @@ object GraphEditor {
     }
 
     private fun addNode() {
-        val closedNode = closedNode
-        if (closedNode != null && closedNode.position.distanceSqToPlayer() < 9.0) {
-            if (closedNode == activeNode) {
+        val closestNode = closestNode
+        if (closestNode != null && closestNode.position.distanceSqToPlayer() < 9.0) {
+            if (closestNode == activeNode) {
                 feedBackInTutorial("Removed node, since you where closer than 3 blocks from a the active node.")
-                nodes.remove(closedNode)
-                edges.removeIf { it.isInEdge(closedNode) }
-                if (closedNode == activeNode) activeNode = null
-                GraphEditor.closedNode = null
+                nodes.remove(closestNode)
+                edges.removeIf { it.isInEdge(closestNode) }
+                if (closestNode == activeNode) activeNode = null
+                GraphEditor.closestNode = null
                 return
             }
         }
@@ -521,7 +521,7 @@ object GraphEditor {
         val edge = GraphingEdge(node1, node2)
         if (edge.isInEdge(activeNode)) {
             checkDissolve()
-            selectedEdge = findEdgeBetweenActiveAndClosed()
+            selectedEdge = findEdgeBetweenActiveAndClosest()
         }
         edges.add(edge)
     } else false
@@ -561,7 +561,7 @@ object GraphEditor {
         )
         id = nodes.lastOrNull()?.id?.plus(1) ?: 0
         checkDissolve()
-        selectedEdge = findEdgeBetweenActiveAndClosed()
+        selectedEdge = findEdgeBetweenActiveAndClosest()
     }
 
     private val highlightedNodes = mutableSetOf<GraphingNode>()
@@ -569,7 +569,7 @@ object GraphEditor {
 
     private fun testDijkstra() {
 
-        val savedCurrent = closedNode ?: return
+        val savedCurrent = closestNode ?: return
         val savedActive = activeNode ?: return
 
         val compiled = compileGraph()
@@ -594,7 +594,7 @@ object GraphEditor {
         nodes.clear()
         edges.clear()
         activeNode = null
-        closedNode = null
+        closestNode = null
         dissolvePossible = false
         ghostPosition = null
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MobUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/MobUtils.kt
index db04ddd7cdf8..10d9e2c940f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MobUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MobUtils.kt
@@ -25,10 +25,10 @@ object MobUtils {
     fun getArmorStandByRangeAll(entity: Entity, range: Double) =
         EntityUtils.getEntitiesNearby<EntityArmorStand>(entity.getLorenzVec(), range)
 
-    fun getClosedArmorStand(entity: Entity, range: Double) =
+    fun getClosestArmorStand(entity: Entity, range: Double) =
         getArmorStandByRangeAll(entity, range).sortedBy { it.distanceTo(entity) }.firstOrNull()
 
-    fun getClosedArmorStandWithName(entity: Entity, range: Double, name: String) =
+    fun getClosestArmorStandWithName(entity: Entity, range: Double, name: String) =
         getArmorStandByRangeAll(entity, range).filter { it.cleanName().startsWith(name) }
             .sortedBy { it.distanceTo(entity) }.firstOrNull()
 
@@ -71,9 +71,10 @@ object MobUtils {
         val pos = entity.getPositionEyes(partialTicks).toLorenzVec() + offset
         val look = entity.getLook(partialTicks).toLorenzVec().normalize()
         val possibleEntities = MobData.entityToMob.filterKeys {
-            it !is EntityArmorStand && it.entityBoundingBox.rayIntersects(
-                pos, look
-            )
+            it !is EntityArmorStand &&
+                it.entityBoundingBox.rayIntersects(
+                    pos, look
+                )
         }.values
         if (possibleEntities.isEmpty()) return null
         return possibleEntities.distinct().sortedBy { it.baseEntity.distanceTo(pos) }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index d22ecc85e12c..cf2339bf3c42 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -1279,7 +1279,7 @@ object RenderUtils {
         waypointColor: Color =
             (path.lastOrNull()?.name?.getFirstColorCode()?.toLorenzColor() ?: LorenzColor.WHITE).toColor(),
         bezierPoint: Double = 1.0,
-        showNoteNames: Boolean = false,
+        showNodeNames: Boolean = false,
         markLastBlock: Boolean = true,
     ) {
         if (path.isEmpty()) return
@@ -1302,7 +1302,7 @@ object RenderUtils {
                 bezierPoint,
             )
         }
-        if (showNoteNames) {
+        if (showNodeNames) {
             path.filter { it.name?.isNotEmpty() == true }.forEach {
                 this.drawDynamicText(it.position, it.name!!, textSize)
             }

From 140219f75b361fce1d9dec265f78b70202d06d3b Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:45:32 +0200
Subject: [PATCH 613/721] Backend: Alert Clock Offsets (#2623)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>
---
 build.gradle.kts                              |   4 +
 .../config/features/misc/MiscConfig.java      |   9 ++
 .../skyhanni/utils/ComputerTimeOffset.kt      | 122 ++++++++++++++++++
 .../at/hannibal2/skyhanni/utils/OSUtils.kt    |  13 +-
 4 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 71a882ac96bf..3e3b002ff9aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -171,6 +171,9 @@ dependencies {
 
     implementation("net.hypixel:mod-api:0.3.1")
 
+    // getting clock offset
+    shadowImpl("commons-net:commons-net:3.8.0")
+
     detektPlugins("org.notenoughupdates:detektrules:1.0.0")
     detektPlugins(project(":detekt"))
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
@@ -279,6 +282,7 @@ tasks.shadowJar {
     relocate("io.github.notenoughupdates.moulconfig", "at.hannibal2.skyhanni.deps.moulconfig")
     relocate("moe.nea.libautoupdate", "at.hannibal2.skyhanni.deps.libautoupdate")
     relocate("com.jagrosh.discordipc", "at.hannibal2.skyhanni.deps.discordipc")
+    relocate("org.apache.commons.net", "at.hannibal2.skyhanni.deps.commons.net")
 }
 tasks.jar {
     archiveClassifier.set("nodeps")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 9d503c3986be..df1ae1da5c04 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -334,4 +334,13 @@ public class MiscConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean userluckEnabled = true;
+
+    @Expose
+    @ConfigOption(name = "Computer Time Offset Warning",
+        desc = "Sends a Chat Warning if your computer time is not synchronized with the actual time.\n" +
+        "§cMaking sure your computer time is correct is important for SkyHanni to display times correctly."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean warnAboutPcTimeOffset = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
new file mode 100644
index 000000000000..83ea15ecc437
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
@@ -0,0 +1,122 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.TimeUtils.format
+import kotlinx.coroutines.launch
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.apache.commons.net.ntp.NTPUDPClient
+import java.net.InetAddress
+import kotlin.concurrent.thread
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object ComputerTimeOffset {
+    private var offsetMillis: Duration? = null
+
+    private val config get() = SkyHanniMod.feature.misc.warnAboutPcTimeOffset
+
+    private val offsetFixLinks by lazy {
+        when {
+            OSUtils.isWindows -> {
+                "https://support.microsoft.com/en-us/windows/how-to-set-your-time-and-time-zone-dfaa7122-479f-5b98-2a7b-fa0b6e01b261"
+            }
+
+            OSUtils.isLinux -> "https://unix.stackexchange.com/a/79116"
+            OSUtils.isMac -> "https://support.apple.com/guide/mac-help/set-the-date-and-time-automatically-mchlp2996/mac"
+            else -> null
+        }
+    }
+
+    init {
+        thread {
+            while (true) {
+                Thread.sleep(1000)
+                detectTimeChange()
+            }
+        }
+    }
+
+    private fun checkOffset() {
+        val wasOffsetBefore = (offsetMillis?.absoluteValue ?: 0.seconds) > 5.seconds
+        SkyHanniMod.coroutineScope.launch {
+            offsetMillis = getNtpOffset("time.google.com")
+            offsetMillis?.let {
+                tryDisplayOffset(wasOffsetBefore)
+            }
+        }
+    }
+
+    private fun getNtpOffset(ntpServer: String): Duration? = try {
+        val client = NTPUDPClient()
+        val address = InetAddress.getByName(ntpServer)
+        val timeInfo = client.getTime(address)
+
+        timeInfo.computeDetails()
+        timeInfo.offset.milliseconds
+    } catch (e: Exception) {
+        if (LorenzUtils.inSkyBlock && config) ErrorManager.logErrorWithData(
+            e, "Failed to get NTP offset",
+            "server" to ntpServer,
+        )
+        else e.printStackTrace()
+        null
+    }
+
+    private var lastSystemTime = System.currentTimeMillis()
+
+    private fun detectTimeChange() {
+        val currentSystemTime = System.currentTimeMillis()
+        val timeDifference = (currentSystemTime - lastSystemTime).milliseconds
+        lastSystemTime = currentSystemTime
+
+        val expectedDuration = 1.seconds
+        val deviation = timeDifference - expectedDuration
+
+        if (deviation.absoluteValue > 1.seconds) {
+            checkOffset()
+        }
+    }
+
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        DelayedRun.runDelayed(5.seconds) {
+            checkOffset()
+        }
+    }
+
+    private fun tryDisplayOffset(wasOffsetBefore: Boolean) {
+        if (!config || !LorenzUtils.onHypixel) return
+        val offsetMillis = offsetMillis ?: return
+        if (offsetMillis.absoluteValue < 5.seconds) {
+            if (wasOffsetBefore) {
+                ChatUtils.chat("Congratulations! Your computer's clock is now accurate.")
+            }
+            return
+        }
+
+        ChatUtils.clickableLinkChat(
+            "Your computer's clock is off by ${offsetMillis.absoluteValue.format()}.\n" +
+                "§ePlease update your time settings. Many features may not function correctly until you do.\n" +
+                "§eClick here for instructions on how to fix your clock.",
+            offsetFixLinks ?: return,
+            prefixColor = "§c",
+        )
+    }
+
+    @SubscribeEvent
+    fun onDebugCollect(event: DebugDataCollectEvent) {
+        event.title("Time Offset")
+        val relevant = offsetMillis?.absoluteValue?.let { it < 100.milliseconds } ?: true
+        if (relevant) {
+            event.addData(offsetMillis.toString())
+        } else {
+            event.addIrrelevant(offsetMillis.toString())
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
index e209e0ce9d28..5b42c5dc640f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
@@ -7,6 +7,17 @@ import java.net.URI
 
 object OSUtils {
 
+    val isWindows: Boolean
+    val isMac: Boolean
+    val isLinux: Boolean
+
+    init {
+        val os = System.getProperty("os.name")
+        isWindows = os.contains("win", ignoreCase = true)
+        isMac = os.contains("mac", ignoreCase = true)
+        isLinux = os.contains("linux", ignoreCase = true)
+    }
+
     @JvmStatic
     fun openBrowser(url: String) {
         val desktopSupported = Desktop.isDesktopSupported()
@@ -17,7 +28,7 @@ object OSUtils {
             } catch (e: IOException) {
                 ErrorManager.logErrorWithData(
                     e, "Error while opening website.",
-                    "url" to url
+                    "url" to url,
                 )
             }
         } else {

From cc3ea04a7534b187673a05151f1f102ff869ce4c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:00:44 +0200
Subject: [PATCH 614/721] fixed typo in broodmother message

---
 .../hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
index 4020e26d36d4..d122ba342fee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt
@@ -97,11 +97,9 @@ object BroodmotherFeatures {
         // this is so that two messages aren't immediately sent upon joining a server
         if (!(currentStage == StageEntry.ALIVE && isAliveMessageEnabled())) {
             val duration = currentStage?.duration
-            val minutes = duration?.inWholeMinutes?.toInt() ?: 0
-            val pluralize = StringUtils.pluralize(minutes, "minute")
             var message = "The Broodmother's current stage in this server is ${currentStage.toString().replace("!", "")}§e."
             if (duration != 0.minutes) {
-                message += " It will spawn §bwithin $duration $pluralize§e."
+                message += " It will spawn §bwithin $duration§e."
             }
             ChatUtils.chat(message)
             return true

From f8fd5fb7e2e449d9a49bf8982c8acc4549602d9a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:06:09 +0200
Subject: [PATCH 615/721] fixed errors when path is zero

---
 .../java/at/hannibal2/skyhanni/data/IslandGraphs.kt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
index 9829b4ec9e92..386fb8bbf489 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt
@@ -265,6 +265,7 @@ object IslandGraphs {
 
     private fun onCurrentPath(): Boolean {
         val path = fastestPath ?: return false
+        if (path.isEmpty()) return false
         val closest = path.nodes.minBy { it.position.distanceSqToPlayer() }
         val distance = closest.position.distanceToPlayer()
         if (distance > 7) return false
@@ -441,12 +442,14 @@ object IslandGraphs {
         if (label == "") return
         val path = fastestPath ?: return
         var distance = 0.0
-        for ((a, b) in path.zipWithNext()) {
-            distance += a.position.distance(b.position)
+        if (path.isNotEmpty()) {
+            for ((a, b) in path.zipWithNext()) {
+                distance += a.position.distance(b.position)
+            }
+            val distanceToPlayer = path.first().position.distanceToPlayer()
+            distance += distanceToPlayer
+            distance = distance.roundTo(1)
         }
-        val distanceToPlayer = path.first().position.distanceToPlayer()
-        distance += distanceToPlayer
-        distance = distance.roundTo(1)
 
         if (distance == lastDistance) return
         lastDistance = distance

From 2d24eb5a533b506e1b6119425edc7d117ec0f6a5 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:36:01 +0200
Subject: [PATCH 616/721] Version 0.27 Beta 14

---
 docs/CHANGELOG.md | 27 +++++++++++++++++++++++++++
 docs/FEATURES.md  |  4 ++++
 root.gradle.kts   |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 64e1288718f0..ce469091517f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -24,6 +24,10 @@
 + Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
     + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
 + Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
++ Added a helper for tracking the Buttons Enigma Soul in the Rift. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+    + Using pathfinding to guide the player to the nearest spot with unpressed buttons and highlights them.
++ Added a route helper for Gunther's Rift Race in the West Village. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
++ Added the ability to mute Wilted Berberis sounds when not farming. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 #### Dungeon Features
 
@@ -178,6 +182,7 @@
 + Added an option to hide all tooltips inside the Fossil Excavator. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2579)
 + Added support for using the Pickobulus ability for the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2540)
 + Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
++ Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - luna (https://github.com/hannibal002/SkyHanni/pull/2633)
 
 #### Diana Improvements
 
@@ -250,11 +255,13 @@
     + Since the cactus knife now allows 500 max speed.
 + Made the waypoint to the middle of the plot for Pest Waypoint optional (off by default). - Luna (https://github.com/hannibal002/SkyHanni/pull/2469)
 + Reduced one click for supercrafting visitor materials by using `/viewrecipe` instead of `/recipe` when using the Shopping List button. - Miestiek (https://github.com/hannibal002/SkyHanni/pull/2505)
++ Added ignored crops for the Farming Lane feature. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2622)
 
 #### Rift Improvements
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
 + Added Path Finder to Enigma Soul waypoints in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2515)
++ Added the option to choose the color of the Living Metal Helper highlight. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 #### Dungeon Improvements
 
@@ -263,6 +270,7 @@
 #### The Carnival Improvements
 
 + Updated the Zombie Shootout Diamond color to be a deeper blue. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2511)
++ Added a cooldown to the Carnival NPC Quickstart feature. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2628)
 
 #### Misc Improvements
 
@@ -276,6 +284,9 @@
 + Improved pathfinding. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2597)
     + The line to the target no longer jumps around as much.
     + Progress to the target now shows up in chat, displaying blocks remaining and percentage completed. Clicking on the chat message cancels the pathfinding.
++ Added a warning in chat when the computer's time is inaccurate, along with a tutorial on how to fix it. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
++ Improved the way pathfinding lines are rendered. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
++ Automatically starts pathfinding after clicking on SkyHanni reminder chat messages about Carnival Reminder, Hoppity NPC, City Project, and account/profile upgrades. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
 
 ### Fixes
 
@@ -288,6 +299,7 @@
 #### Bingo Fixes
 
 + Fixed "show bingo rank number" feature toggle not functioning. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2445)
++ Fixed Custom Scoreboard not showing Carnival Lines on Bingo. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2631)
 
 #### Inventory Fixes
 
@@ -313,6 +325,10 @@
     + Fixed `/shedittracker` support not functioning properly.
 + Fixed an issue where the item stack size on Diamond/Golden Heads and Master Skulls could be incorrect. - Fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2611)
 + Fixed item category detection for recombobulated items. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2608)
++ Fixed bugs in Superpair Data. - ILike2WatchMemes (https://github.com/hannibal002/SkyHanni/pull/2566)
+    + Fixed pair detection.
+    + Fixed enchanting XP detection.
++ Fixed Minister in Calendar Perk description sometimes not using the gray color. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2632)
 
 #### Mining Fixes
 
@@ -338,6 +354,7 @@
 + Fixed "Mining Commissions Block Color" causing OptiFine connected textures not to connect properly. - nopo (https://github.com/hannibal002/SkyHanni/pull/2577)
 + Fixed the Mineshaft Pity Counter not working in the Great Glacite Lake. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2565)
 + Fixed Powder Tracker inaccuracies. - Empa (https://github.com/hannibal002/SkyHanni/pull/2591)
++ Fixed Jasper gemstones not being addressed in the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2618)
 
 #### Scoreboard Fixes
 
@@ -371,6 +388,7 @@
 + Fixed Hoppity Event stats resetting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2489)
 + Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 + Fixed inconsistencies in Hoppity Duplicate Number counts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2595)
++ Fixed Fish the Rabbit and El Dorado incorrectly counting as unique rabbits during Hoppity's Hunt. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2627)
 
 #### Chat Fixes
 
@@ -414,6 +432,10 @@
 
 + Fixed error messages while using the Chum Bucket Hider feature. - nea89 (https://github.com/hannibal002/SkyHanni/pull/2587)
 
+#### Rift Fixes
+
++ Fixed the Rift Timer pausing while in Gunther's Rift Race. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+
 #### Misc Fixes
 
 + Fixed Mayor Detection failing when Special Mayors are in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2389)
@@ -434,6 +456,9 @@
 + Fixed reforge display not working with new mining stats. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2555)
 + Fixed Totem of Corruption expiry warning not working in some cases. - Luna (https://github.com/hannibal002/SkyHanni/pull/2554)
 + Fixed a few typos in the config. - rdbt (https://github.com/hannibal002/SkyHanni/pull/2585)
++ Fixed Area Navigation distances to player being incorrect. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
++ Fixed item trackers displaying removed item names incorrectly. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2620)
++ Fixed some messages from Pablo NPC not being detected. - Luna (https://github.com/hannibal002/SkyHanni/pull/2636)
 
 ### Technical Details
 
@@ -503,6 +528,8 @@
 + Added Blossom Gradle plugin for token replacement in code. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2558)
     + `@MOD_VERSION@` is now a token that will be replaced.
 + Added `detekt` runner to the build process. - Daveed & nea (https://github.com/hannibal002/SkyHanni/pull/2547)
++ Added Clock Offset Millis using an NTP server. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
++ Added `EntityMovementData.onNextTeleport()` logic, which triggers a runnable after the world has changed or the player has teleported. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
 
 ### Removed Features
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index d78a2114dfbf..a57725958d57 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -841,6 +841,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added Crafting Room Helper. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2178)
     + Shows a holographic mob at the location where the mob is present in the real room inside the Mirrorverse in Rift.
 + Added Rift Time Real-Time Nametag Format. - Empa (https://github.com/hannibal002/SkyHanni/pull/2015)
++ Added a helper for tracking the Buttons Enigma Soul in the Rift. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
+    + Using pathfinding to guide the player to the nearest spot with unpressed buttons and highlights them.
++ Added a route helper for Gunther's Rift Race in the West Village. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
++ Added the ability to mute Wilted Berberis sounds when not farming. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index 9eb7a0854868..9346a78f9f92 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.13"
+    version = "0.27.Beta.14"
     repositories {
         mavenCentral()
         mavenLocal()

From b45002ecafb9fd212d3c956dcd7b2249d6607a8b Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:10:49 -0400
Subject: [PATCH 617/721] Improvement: Slight Touch up for Hoppity Event
 Summary (#2638)

---
 .../features/event/hoppity/HoppityEventSummary.kt      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
index 0d4e09b9c518..b2f806c8000a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
@@ -231,12 +231,18 @@ object HoppityEventSummary {
         config.eventSummary.statDisplayList.forEach {
             summaryOperationList[it]?.invoke(statsBuilder, stats, eventYear)
         }
+
+        // If no stats are found, display a message
         if (statsBuilder.toString().replace("\n", "").isEmpty()) {
-            statsBuilder.appendHeadedLine("§c§lNothing to show!\n§c§oGo find some eggs!")
+            statsBuilder.appendHeadedLine("§c§lNothing to show!")
+            statsBuilder.appendHeadedLine("§c§oGo find some eggs!")
         }
 
+        // Remove any consecutive empty lines in the stats
+        val statsBuilderString = statsBuilder.toString().replace(Regex("\n{4,}"), "\n".repeat(3))
+
         // Append stats
-        summaryBuilder.append(statsBuilder)
+        summaryBuilder.append(statsBuilderString)
 
         // Footer
         summaryBuilder.append("§d§l${"▬".repeat(64)}")

From fdd5bb7acd10c2ab51b76a3ec47a9ac8405021e2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:00:31 +0200
Subject: [PATCH 618/721] code cleanup

---
 .../skyhanni/features/inventory/bazaar/BazaarApi.kt      | 9 +++++----
 .../inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
index afd5900f7c34..25ddb8dace8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
@@ -66,13 +66,13 @@ object BazaarApi {
         searchForBazaarItem(internalName.itemNameWithoutColor, amount)
     }
 
-    fun searchForBazaarItem(displayName: String, amount: Int = -1) {
+    fun searchForBazaarItem(displayName: String, amount: Int? = null) {
         if (!LorenzUtils.inSkyBlock) return
         if (NEUItems.neuHasFocus()) return
         if (LorenzUtils.noTradeMode) return
         if (DungeonAPI.inDungeon() || LorenzUtils.inKuudraFight) return
         HypixelCommands.bazaar(displayName.removeColor())
-        if (amount != -1) OSUtils.copyToClipboard(amount.toString())
+        amount?.let { OSUtils.copyToClipboard(it.toString()) }
         currentSearchedItem = displayName.removeColor()
     }
 
@@ -96,12 +96,12 @@ object BazaarApi {
                 orderOptionProduct = internalName
             } else if (itemName.contains("BUY")) {
                 // pickup items from bazaar order
-                OwnInventoryData.ignoreItem(1.seconds, { it == internalName })
+                OwnInventoryData.ignoreItem(1.seconds) { it == internalName }
             }
         }
         if (InventoryUtils.openInventoryName() == "Order options" && itemName == "§cCancel Order") {
             // pickup items from own bazaar order
-            OwnInventoryData.ignoreItem(1.seconds, { it == orderOptionProduct })
+            OwnInventoryData.ignoreItem(1.seconds) { it == orderOptionProduct }
         }
     }
 
@@ -123,6 +123,7 @@ object BazaarApi {
         }
     }
 
+    // TODO cache
     @SubscribeEvent
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
index a177d3fe6287..dfd7e38f9b85 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -103,7 +103,7 @@ object BazaarCancelledBuyOrderClipboard {
         event.blockedReason = "bazaar cancelled buy order clipboard"
         val lastClicked = lastClickedItem ?: error("last clicked bz item is null")
 
-        val message = "Bazaar buy order cancelled. Click to reorder. " +
+        val message = "Bazaar buy order cancelled. Click to re-order. " +
             "(§8${latestAmount.addSeparators()}x §r${lastClicked.itemName}§e)"
         ChatUtils.clickableChat(
             message,

From b449c2bbfd8c7661693bde36c25ab3ae379c2304 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 2 Oct 2024 23:40:55 +0200
Subject: [PATCH 619/721] Fix: Highlight in Bazaar (#2640)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
index 25ddb8dace8b..8e8bbb595bb7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt
@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.InventoryUtils.getAllItems
+import at.hannibal2.skyhanni.utils.InventoryUtils.getUpperItems
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -135,7 +135,7 @@ object BazaarApi {
         val guiChest = event.gui
         val chest = guiChest.inventorySlots as ContainerChest
 
-        for ((slot, stack) in chest.getAllItems()) {
+        for ((slot, stack) in chest.getUpperItems()) {
             if (chest.inventorySlots.indexOf(slot) !in 9..44) {
                 continue
             }

From 8798f722c32736bcbe686728fafdde87f561e1a8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 2 Oct 2024 23:49:44 +0200
Subject: [PATCH 620/721] Fix: Flare expire warning (#2643)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
index 5a67e1d3405f..c5804ea37c40 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt
@@ -101,7 +101,7 @@ object FlareDisplay {
                     }
                 }
             }
-            if (remainingTime !in 5.seconds..0.seconds) continue
+            if (remainingTime !in 0.seconds..5.seconds) continue
             val message = "$name §eexpires in: §b${remainingTime.inWholeSeconds}s"
             when (config.alertType) {
                 FlareConfig.AlertType.CHAT -> {

From d3930a1f04371a76804ed2512da93b87e3c197db Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 3 Oct 2024 00:19:57 +0200
Subject: [PATCH 621/721] Fix: Ender node tracker (#2644)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../endernodetracker/EnderNodeTracker.kt      | 82 ++++++++++++-------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 51deea2b865d..0363543bffd0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -26,7 +26,9 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.renderables.Searchable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -40,12 +42,30 @@ object EnderNodeTracker {
 
     private var miteGelInInventory = 0
 
-    private val enderNodeRegex = Regex("""ENDER NODE!.+You found (\d+x )?§r(.+)§r§f!""")
+    private val patternGroup = RepoPattern.group("combat.endernodetracker.chat")
+
+    /**
+     * REGEX-TEST: §5§lENDER NODE! §r§fYou found §r§8§r§aEnchanted Obsidian§r§f!
+     */
+    private val patternOne by patternGroup.pattern(
+        "one",
+        "§5§lENDER NODE! §r§fYou found §r(?:§8§r)?(?<name>.*)§r§f!",
+    )
+
+    /**
+     * REGEX-TEST: §5§lENDER NODE! §r§fYou found §r§85x §r§aEnchanted Ender Pearl§r§f!
+     */
+    private val patternMulti by patternGroup.pattern(
+        "multi",
+        "§5§lENDER NODE! §r§fYou found §r§8(?<amount>\\d+)x §r(?<name>.*)§r§f!",
+    )
+
+    // TODO add abstract logic with ohter pet drop chat messages
     private val endermanRegex = Regex("""(RARE|PET) DROP! §r(.+) §r§b\(""")
 
     private val tracker = SkyHanniTracker("Ender Node Tracker", { Data() }, { it.enderNodeTracker }) {
         formatDisplay(
-            drawDisplay(it)
+            drawDisplay(it),
         )
     }
 
@@ -77,14 +97,17 @@ object EnderNodeTracker {
         var item: String? = null
         var amount = 1
 
-        // check whether the loot is from an ender node or an enderman
-        enderNodeRegex.find(message)?.let {
-            tracker.modify { storage ->
-                storage.totalNodesMined++
-            }
-            amount = it.groups[1]?.value?.substringBefore("x")?.toIntOrNull() ?: 1
-            item = it.groups[2]?.value
-        } ?: endermanRegex.find(message)?.let {
+        patternMulti.matchMatcher(message) {
+            item = group("name")
+            amount = group("amount").toInt()
+            addOneNodeMined()
+        } ?: patternOne.matchMatcher(message) {
+            item = group("name")
+            amount = 1
+            addOneNodeMined()
+        }
+
+        endermanRegex.find(message)?.let {
             amount = 1
             item = it.groups[2]?.value
         }
@@ -106,12 +129,18 @@ object EnderNodeTracker {
         }
     }
 
+    private fun addOneNodeMined() {
+        tracker.modify { storage ->
+            storage.totalNodesMined++
+        }
+    }
+
     @SubscribeEvent
     fun onIslandChange(event: IslandChangeEvent) {
         if (!isEnabled()) return
-        miteGelInInventory = Minecraft.getMinecraft().thePlayer.inventory.mainInventory
-            .filter { it?.getInternalNameOrNull() == EnderNode.MITE_GEL.internalName }
-            .sumOf { it.stackSize }
+        miteGelInInventory = Minecraft.getMinecraft().thePlayer.inventory.mainInventory.filter {
+            it?.getInternalNameOrNull() == EnderNode.MITE_GEL.internalName
+        }.sumOf { it.stackSize }
     }
 
     @SubscribeEvent
@@ -119,9 +148,7 @@ object EnderNodeTracker {
         if (!isEnabled()) return
         if (!ProfileStorageData.loaded) return
 
-        val change = event.sackChanges
-            .firstOrNull { it.internalName == EnderNode.MITE_GEL.internalName && it.delta > 0 }
-            ?: return
+        val change = event.sackChanges.firstOrNull { it.internalName == EnderNode.MITE_GEL.internalName && it.delta > 0 } ?: return
 
         tracker.modify { storage ->
             storage.lootCount.addOrPut(EnderNode.MITE_GEL, change.delta)
@@ -133,9 +160,9 @@ object EnderNodeTracker {
         if (!isEnabled()) return
         if (!ProfileStorageData.loaded) return
 
-        val newMiteGelInInventory = Minecraft.getMinecraft().thePlayer.inventory.mainInventory
-            .filter { it?.getInternalNameOrNull() == EnderNode.MITE_GEL.internalName }
-            .sumOf { it.stackSize }
+        val newMiteGelInInventory = Minecraft.getMinecraft().thePlayer.inventory.mainInventory.filter {
+            it?.getInternalNameOrNull() == EnderNode.MITE_GEL.internalName
+        }.sumOf { it.stackSize }
         val change = newMiteGelInInventory - miteGelInInventory
         if (change > 0) {
             tracker.modify { storage ->
@@ -176,18 +203,16 @@ object EnderNodeTracker {
             val price = if (isEnderArmor(item)) {
                 10_000.0
             } else {
-                (if (!LorenzUtils.noTradeMode) item.internalName.getPriceOrNull() else 0.0)
-                    ?.coerceAtLeast(item.internalName.getNpcPriceOrNull() ?: 0.0)
-                    ?.coerceAtLeast(georgePrice(item) ?: 0.0)
-                    ?: 0.0
+                (if (!LorenzUtils.noTradeMode) item.internalName.getPriceOrNull() else 0.0)?.coerceAtLeast(
+                    item.internalName.getNpcPriceOrNull() ?: 0.0,
+                )?.coerceAtLeast(georgePrice(item) ?: 0.0) ?: 0.0
             }
             newProfit[item] = price * amount
         }
         return newProfit
     }
 
-    private fun isEnabled() = IslandType.THE_END.isInIsland() && config.enabled &&
-        (!config.onlyPickaxe || hasItemInHand())
+    private fun isEnabled() = IslandType.THE_END.isInIsland() && config.enabled && (!config.onlyPickaxe || hasItemInHand())
 
     private fun hasItemInHand() = ItemCategory.miningTools.containsItem(InventoryUtils.getItemInHand())
 
@@ -230,7 +255,7 @@ object EnderNodeTracker {
 
         val totalEnderArmor = calculateEnderArmor(data)
         addSearchString(
-            "§b${totalEnderArmor.addSeparators()} §5Ender Armor " + "§7(§6${(totalEnderArmor * 10_000).shortFormat()}§7)"
+            "§b${totalEnderArmor.addSeparators()} §5Ender Armor " + "§7(§6${(totalEnderArmor * 10_000).shortFormat()}§7)",
         )
         for (item in EnderNode.entries.subList(11, 16)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
@@ -243,10 +268,7 @@ object EnderNodeTracker {
         addSearchString("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
     }
 
-    private fun calculateEnderArmor(storage: Data) =
-        storage.lootCount.filter { isEnderArmor(it.key) }
-            .map { it.value }
-            .sum()
+    private fun calculateEnderArmor(storage: Data) = storage.lootCount.filter { isEnderArmor(it.key) }.map { it.value }.sum()
 
     private fun formatDisplay(map: List<Searchable>): List<Searchable> {
         if (!ProfileStorageData.loaded) return emptyList()

From c33c011a3314ee533b998da78851e7777338c727 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Thu, 3 Oct 2024 00:27:23 +0200
Subject: [PATCH 622/721] Fix: Powder Tracker not tracking items (#2645)

---
 .../skyhanni/features/mining/powdertracker/PowderTracker.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 2749404bef59..c3d307a16f69 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -198,7 +198,7 @@ object PowderTracker {
         }
 
         for (reward in PowderChestReward.entries) {
-            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) return
+            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) continue
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0

From e468384b34a5e1af56921149d1a05976e4eadd6a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 3 Oct 2024 00:28:26 +0200
Subject: [PATCH 623/721] Fix: Preconditions to debug commands (#2641)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>
---
 .../skyhanni/test/command/TrackParticlesCommand.kt         | 7 +++++++
 .../hannibal2/skyhanni/test/command/TrackSoundsCommand.kt  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
index 69c16daeb414..a48294bd8e64 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
@@ -35,7 +36,13 @@ object TrackParticlesCommand {
     private var display: List<Renderable> = emptyList()
     private var worldParticles: Map<LorenzVec, List<ReceiveParticleEvent>> = emptyMap()
 
+    // TODO write abstract code for this and TrackSoundsCommand
     fun command(args: Array<String>) {
+        if (!LorenzUtils.inSkyBlock) {
+            ChatUtils.userError("This command only works in SkyBlock!")
+            return
+        }
+
         if (args.firstOrNull() == "end") {
             if (!isRecording) {
                 ChatUtils.userError("Nothing to end")
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
index 1fadab62da24..18cfcf786bf8 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.OSUtils
@@ -36,7 +37,13 @@ object TrackSoundsCommand {
     private var display: List<Renderable> = emptyList()
     private var worldSounds: Map<LorenzVec, List<PlaySoundEvent>> = emptyMap()
 
+    // TODO write abstract code for this and TrackParticlesCommand
     fun command(args: Array<String>) {
+        if (!LorenzUtils.inSkyBlock) {
+            ChatUtils.userError("This command only works in SkyBlock!")
+            return
+        }
+
         if (args.firstOrNull() == "end") {
             if (!isRecording) {
                 ChatUtils.userError("Nothing to end")

From c212cc7a3ee573b2eda614c29ced575936f4d4bb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:48:11 +0200
Subject: [PATCH 624/721] Fix: Dummies and Damage Indicator (#2646)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../combat/damageindicator/MobFinder.kt       | 138 +++++++++---------
 1 file changed, 65 insertions(+), 73 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
index 399040179934..44c7608c2b6b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
@@ -71,8 +71,7 @@ class MobFinder {
     // F5
     private var floor5lividEntity: EntityOtherPlayerMP? = null
     private var floor5lividEntitySpawnTime = 0L
-    private val correctLividPattern =
-        "§c\\[BOSS] (.*) Livid§r§f: Impossible! How did you figure out which one I was\\?!".toPattern()
+    private val correctLividPattern = "§c\\[BOSS] (.*) Livid§r§f: Impossible! How did you figure out which one I was\\?!".toPattern()
 
     // F6
     private var floor6Giants = false
@@ -86,29 +85,32 @@ class MobFinder {
         RiftAPI.inRift() -> tryAddRift(entity)
         GardenAPI.inGarden() -> tryAddGarden(entity)
         else -> {
-            when (entity) {
-                /*
-                 * Note that the order does matter here.
-                 * For example, if you put EntityZombie before EntityPigZombie,
-                 * EntityPigZombie will never be reached because EntityPigZombie extends EntityZombie.
-                 * Please take this into consideration if you are to modify this.
-                 */
-                is EntityOtherPlayerMP -> tryAddEntityOtherPlayerMP(entity)
-                is EntityIronGolem -> tryAddEntityIronGolem(entity)
-                is EntityPigZombie -> tryAddEntityPigZombie(entity)
-                is EntityMagmaCube -> tryAddEntityMagmaCube(entity)
-                is EntityEnderman -> tryAddEntityEnderman(entity)
-                is EntitySkeleton -> tryAddEntitySkeleton(entity)
-                is EntityGuardian -> tryAddEntityGuardian(entity)
-                is EntityZombie -> tryAddEntityZombie(entity)
-                is EntityWither -> tryAddEntityWither(entity)
-                is EntityDragon -> tryAddEntityDragon(entity)
-                is EntitySpider -> tryAddEntitySpider(entity)
-                is EntityHorse -> tryAddEntityHorse(entity)
-                is EntityBlaze -> tryAddEntityBlaze(entity)
-                is EntityWolf -> tryAddEntityWolf(entity)
-                is EntityLiving -> tryAddEntityLiving(entity)
-                else -> null
+            if (entity is EntityLiving && entity.hasNameTagWith(2, "Dummy §a10M§c❤")) {
+                EntityResult(bossType = BossType.DUMMY)
+            } else {
+                when (entity) {
+                    /*
+                     * Note that the order does matter here.
+                     * For example, if you put EntityZombie before EntityPigZombie,
+                     * EntityPigZombie will never be reached because EntityPigZombie extends EntityZombie.
+                     * Please take this into consideration if you are to modify this.
+                     */
+                    is EntityOtherPlayerMP -> tryAddEntityOtherPlayerMP(entity)
+                    is EntityIronGolem -> tryAddEntityIronGolem(entity)
+                    is EntityPigZombie -> tryAddEntityPigZombie(entity)
+                    is EntityMagmaCube -> tryAddEntityMagmaCube(entity)
+                    is EntityEnderman -> tryAddEntityEnderman(entity)
+                    is EntitySkeleton -> tryAddEntitySkeleton(entity)
+                    is EntityGuardian -> tryAddEntityGuardian(entity)
+                    is EntityZombie -> tryAddEntityZombie(entity)
+                    is EntityWither -> tryAddEntityWither(entity)
+                    is EntityDragon -> tryAddEntityDragon(entity)
+                    is EntitySpider -> tryAddEntitySpider(entity)
+                    is EntityHorse -> tryAddEntityHorse(entity)
+                    is EntityBlaze -> tryAddEntityBlaze(entity)
+                    is EntityWolf -> tryAddEntityWolf(entity)
+                    else -> null
+                }
             }
         }
     }
@@ -124,8 +126,7 @@ class MobFinder {
     private fun tryAddGardenPest(entity: EntityLivingBase): EntityResult? {
         if (!GardenAPI.inGarden()) return null
 
-        return PestType.entries
-            .firstOrNull { entity.hasNameTagWith(3, it.displayName) }
+        return PestType.entries.firstOrNull { entity.hasNameTagWith(3, it.displayName) }
             ?.let { EntityResult(bossType = it.damageIndicatorBoss) }
     }
 
@@ -170,7 +171,7 @@ class MobFinder {
                 return EntityResult(
                     floor2secondPhaseSpawnTime,
                     finalDungeonBoss = true,
-                    bossType = BossType.DUNGEON_F2_SCARF
+                    bossType = BossType.DUNGEON_F2_SCARF,
                 )
             }
         }
@@ -193,14 +194,14 @@ class MobFinder {
             return EntityResult(
                 floor3ProfessorSpawnTime,
                 floor3ProfessorSpawnTime + 1_000 > System.currentTimeMillis(),
-                bossType = BossType.DUNGEON_F3_PROFESSOR_1
+                bossType = BossType.DUNGEON_F3_PROFESSOR_1,
             )
         }
         if (floor3ProfessorGuardianPrepare && entity is EntityOtherPlayerMP && entity.name == "The Professor") {
             return EntityResult(
                 floor3ProfessorGuardianPrepareSpawnTime,
                 true,
-                bossType = BossType.DUNGEON_F3_PROFESSOR_2
+                bossType = BossType.DUNGEON_F3_PROFESSOR_2,
             )
         }
 
@@ -215,7 +216,7 @@ class MobFinder {
             return EntityResult(
                 bossType = BossType.DUNGEON_F4_THORN,
                 ignoreBlocks = true,
-                finalDungeonBoss = true
+                finalDungeonBoss = true,
             )
         }
         return null
@@ -226,7 +227,7 @@ class MobFinder {
             return EntityResult(
                 bossType = BossType.DUNGEON_F5,
                 ignoreBlocks = true,
-                finalDungeonBoss = true
+                finalDungeonBoss = true,
             )
         }
         return null
@@ -239,7 +240,7 @@ class MobFinder {
             return EntityResult(
                 floor6GiantsSpawnTime + extraDelay,
                 floor6GiantsSpawnTime + extraDelay + 1_000 > System.currentTimeMillis(),
-                bossType = bossType
+                bossType = bossType,
             )
         }
 
@@ -274,8 +275,12 @@ class MobFinder {
     }
 
     private fun tryAddEntityBlaze(entity: EntityLivingBase) = when {
-        entity.name != "Dinnerbone" && entity.hasNameTagWith(2, "§e﴾ §8[§7Lv200§8] §l§8§lAshfang§r ") &&
-            entity.hasMaxHealth(50_000_000, true) -> {
+        entity.name != "Dinnerbone" &&
+            entity.hasNameTagWith(2, "§e﴾ §8[§7Lv200§8] §l§8§lAshfang§r ") &&
+            entity.hasMaxHealth(
+                50_000_000,
+                true,
+            ) -> {
             EntityResult(bossType = BossType.NETHER_ASHFANG)
         }
 
@@ -312,8 +317,9 @@ class MobFinder {
 
     private fun tryAddEntityOtherPlayerMP(entity: EntityLivingBase) = when {
         entity.name == "Mage Outlaw" -> EntityResult(bossType = BossType.NETHER_MAGE_OUTLAW)
-        entity.name == "DukeBarb " && entity.getLorenzVec()
-            .distanceToPlayer() < 30 -> EntityResult(bossType = BossType.NETHER_BARBARIAN_DUKE)
+        entity.name == "DukeBarb " &&
+            entity.getLorenzVec()
+                .distanceToPlayer() < 30 -> EntityResult(bossType = BossType.NETHER_BARBARIAN_DUKE)
 
         entity.name == "Minos Inquisitor" -> EntityResult(bossType = BossType.MINOS_INQUISITOR)
         entity.name == "Minos Champion" -> EntityResult(bossType = BossType.MINOS_CHAMPION)
@@ -385,15 +391,8 @@ class MobFinder {
         else -> null
     }
 
-    private fun tryAddEntityLiving(entity: EntityLivingBase) = when {
-        entity.hasNameTagWith(2, "Dummy §a10M§c❤") -> EntityResult(bossType = BossType.DUMMY)
-
-        else -> null
-    }
-
     private fun tryAddEntityMagmaCube(entity: EntityLivingBase) = when {
-        entity.hasNameTagWith(15, "§e﴾ §8[§7Lv500§8] §l§4§lMagma Boss§r ") &&
-            entity.hasMaxHealth(200_000_000, true) -> {
+        entity.hasNameTagWith(15, "§e﴾ §8[§7Lv500§8] §l§4§lMagma Boss§r ") && entity.hasMaxHealth(200_000_000, true) -> {
             EntityResult(bossType = BossType.NETHER_MAGMA_BOSS, ignoreBlocks = true)
         }
 
@@ -401,24 +400,22 @@ class MobFinder {
     }
 
     private fun tryAddEntityHorse(entity: EntityLivingBase) = when {
-        entity.hasNameTagWith(15, "§8[§7Lv100§8] §c§6Headless Horseman§r ") &&
-            entity.hasMaxHealth(3_000_000, true) -> {
+        entity.hasNameTagWith(15, "§8[§7Lv100§8] §c§6Headless Horseman§r ") && entity.hasMaxHealth(3_000_000, true) -> {
             EntityResult(bossType = BossType.HUB_HEADLESS_HORSEMAN)
         }
 
         else -> null
     }
 
-    private fun tryAddEntityPigZombie(entity: EntityLivingBase) =
-        if (entity.hasNameTagWith(2, "§c☠ §6ⓉⓎⓅⒽⓄⒺⓊⓈ ")) {
-            when {
-                entity.hasBossHealth(10_000_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_4)
-                entity.hasBossHealth(5_000_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_3)
-                entity.hasBossHealth(1_750_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_2)
-                entity.hasBossHealth(500_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_1)
-                else -> null
-            }
-        } else null
+    private fun tryAddEntityPigZombie(entity: EntityLivingBase) = if (entity.hasNameTagWith(2, "§c☠ §6ⓉⓎⓅⒽⓄⒺⓊⓈ ")) {
+        when {
+            entity.hasBossHealth(10_000_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_4)
+            entity.hasBossHealth(5_000_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_3)
+            entity.hasBossHealth(1_750_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_2)
+            entity.hasBossHealth(500_000) -> EntityResult(bossType = BossType.SLAYER_BLAZE_TYPHOEUS_1)
+            else -> null
+        }
+    } else null
 
     private fun tryAddEntitySpider(entity: EntityLivingBase): EntityResult? {
         if (entity.hasNameTagWith(1, "§5☠ §4Tarantula Broodfather ")) {
@@ -439,17 +436,13 @@ class MobFinder {
     }
 
     private fun checkArachne(entity: EntitySpider): EntityResult? {
-        if (entity.hasNameTagWith(1, "[§7Lv300§8] §cArachne") ||
-            entity.hasNameTagWith(1, "[§7Lv300§8] §lArachne")
-        ) {
+        if (entity.hasNameTagWith(1, "[§7Lv300§8] §cArachne") || entity.hasNameTagWith(1, "[§7Lv300§8] §lArachne")) {
             val maxHealth = entity.baseMaxHealth
             // Ignore the minis
             if (maxHealth == 12 || maxHealth.derpy() == 4000) return null
             return EntityResult(bossType = BossType.ARACHNE_SMALL)
         }
-        if (entity.hasNameTagWith(1, "[§7Lv500§8] §cArachne") ||
-            entity.hasNameTagWith(1, "[§7Lv500§8] §lArachne")
-        ) {
+        if (entity.hasNameTagWith(1, "[§7Lv500§8] §cArachne") || entity.hasNameTagWith(1, "[§7Lv500§8] §lArachne")) {
             val maxHealth = entity.baseMaxHealth
             if (maxHealth == 12 || maxHealth.derpy() == 20_000) return null
             return EntityResult(bossType = BossType.ARACHNE_BIG)
@@ -458,16 +451,15 @@ class MobFinder {
         return null
     }
 
-    private fun tryAddEntityWolf(entity: EntityLivingBase) =
-        if (entity.hasNameTagWith(1, "§c☠ §fSven Packmaster ")) {
-            when {
-                entity.hasMaxHealth(2_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_1)
-                entity.hasMaxHealth(40_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_2)
-                entity.hasMaxHealth(750_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_3)
-                entity.hasMaxHealth(2_000_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_4)
-                else -> null
-            }
-        } else null
+    private fun tryAddEntityWolf(entity: EntityLivingBase) = if (entity.hasNameTagWith(1, "§c☠ §fSven Packmaster ")) {
+        when {
+            entity.hasMaxHealth(2_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_1)
+            entity.hasMaxHealth(40_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_2)
+            entity.hasMaxHealth(750_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_3)
+            entity.hasMaxHealth(2_000_000, true) -> EntityResult(bossType = BossType.SLAYER_WOLF_4)
+            else -> null
+        }
+    } else null
 
     private fun tryAddEntityGuardian(entity: EntityLivingBase) = if (entity.hasMaxHealth(35_000_000)) {
         EntityResult(bossType = BossType.THUNDER)

From 3264d76f1d5a765da57b03a7ffcba506737cb5b0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 3 Oct 2024 12:09:17 +0200
Subject: [PATCH 625/721] fixed wrong feature toggle

---
 .../skyhanni/config/features/commands/CommandsConfig.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
index 854ed39cc38f..d8626e243b93 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
@@ -55,8 +55,7 @@ public class CommandsConfig {
     public boolean transferCooldown = false;
 
     @Expose
-    @ConfigOption(name = "Transfer Cooldown Ended Message", desc = "Sends a message in chat when the transfer cooldown ends.")
+    @ConfigOption(name = "Transfer Cooldown Message", desc = "Sends a message in chat when the transfer cooldown ends.")
     @ConfigEditorBoolean
-    @FeatureToggle
     public boolean transferCooldownMessage = false;
 }

From 4d4fbd019a58a694c0d36ae08d25a97c9db268d8 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:28:22 +0200
Subject: [PATCH 626/721] Improvement: Superpair Experimentation data always
 visible (#2647)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>
---
 .idea/dictionaries/default_user.xml                |  5 ++++-
 .../ExperimentationTableConfig.java                |  2 +-
 .../experimentationtable/SuperpairDataDisplay.kt   | 14 +++++++++++---
 .../fossilexcavator/solver/FossilSolverDisplay.kt  |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index a0017ca5e3e0..4c56b1303ca0 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -193,6 +193,8 @@
       <w>pling</w>
       <w>pocalypse</w>
       <w>polarvoid</w>
+      <w>powerup</w>
+      <w>powerups</w>
       <w>preinitialization</w>
       <w>procs</w>
       <w>prospection</w>
@@ -251,6 +253,7 @@
       <w>supercraft</w>
       <w>supercrafting</w>
       <w>superlite</w>
+      <w>superpair</w>
       <w>superpairs</w>
       <w>tablist</w>
       <w>terracottas</w>
@@ -278,4 +281,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
\ No newline at end of file
+</component>
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
index dfdad248256e..0313498e6829 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/experimentationtable/ExperimentationTableConfig.java
@@ -21,7 +21,7 @@ public class ExperimentationTableConfig {
     public ExperimentsDryStreakConfig dryStreak = new ExperimentsDryStreakConfig();
 
     @Expose
-    @ConfigOption(name = "Superpair Data", desc = "Shows a display with useful information while doing the Superpair experiment.")
+    @ConfigOption(name = "Superpair Data", desc = "Displays useful data while doing the Superpair experiment.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean superpairDisplay = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
index 627974e6baac..37e12aa51f80 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
@@ -15,6 +15,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isAnyOf
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.item.ItemStack
@@ -56,14 +57,22 @@ object SuperpairDataDisplay {
     @SubscribeEvent
     fun onChestGuiOverlayRendered(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) {
         if (!isEnabled()) return
+        if (InventoryUtils.openInventoryName() == "Experimentation Table") {
+            // Render here so they can move it around.
+            config.superpairDisplayPosition.renderString("§6Superpair Experimentation Data", posLabel = "Superpair Experimentation Data")
+        }
+        if (ExperimentationTableAPI.getCurrentExperiment() == null) return
+
         if (display.isEmpty()) display = drawDisplay()
 
-        config.superpairDisplayPosition.renderStrings(display, posLabel = "Superpair Experiment Information")
+        config.superpairDisplayPosition.renderStrings(display, posLabel = "Superpair Experimentation Data")
     }
 
     @SubscribeEvent
     fun onSlotClick(event: SlotClickEvent) {
         if (!isEnabled()) return
+        if (ExperimentationTableAPI.getCurrentExperiment() == null) return
+
         val currentExperiment = ExperimentationTableAPI.getCurrentExperiment() ?: return
 
         val item = event.item ?: return
@@ -286,6 +295,5 @@ object SuperpairDataDisplay {
 
     private fun SuperpairItem?.sameAs(other: SuperpairItem) = this?.reward == other.reward && this?.damage == other.damage
 
-    private fun isEnabled() =
-        IslandType.PRIVATE_ISLAND.isInIsland() && config.superpairDisplay && ExperimentationTableAPI.getCurrentExperiment() != null
+    private fun isEnabled() = IslandType.PRIVATE_ISLAND.isInIsland() && config.superpairDisplay
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
index cb50e3c85459..f9dd9b8db316 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/solver/FossilSolverDisplay.kt
@@ -188,7 +188,7 @@ object FossilSolverDisplay {
 
         if (inExcavatorMenu) {
             // Render here so they can move it around. As if you press key while doing the excavator you lose the scrap
-            config.position.renderString("§eExcavator solver gui", posLabel = "Fossil Excavator Solver")
+            config.position.renderString("§eExcavator solver GUI", posLabel = "Fossil Excavator Solver")
             return
         }
 

From 7efb11313d70c65b8df6692ed237f137d4d346d1 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:34:40 -0400
Subject: [PATCH 627/721] Backend: Detekt Fixes Part 5 (#2617)

---
 build.gradle.kts                              | 55 ++++++++++---------
 .../hannibal2/skyhanni/api/GetFromSackAPI.kt  |  2 +-
 .../at/hannibal2/skyhanni/data/HotmData.kt    |  3 +-
 .../at/hannibal2/skyhanni/data/SackAPI.kt     |  2 +-
 .../skyhanni/data/mob/MobDetection.kt         |  2 +-
 .../features/bingo/card/goals/GoalType.kt     |  1 -
 .../features/chat/ColorFormattingHelper.kt    |  2 +-
 .../features/chat/PowderMiningChatFilter.kt   |  3 +-
 .../combat/damageindicator/BossType.kt        |  4 +-
 .../combat/ghostcounter/GhostCounter.kt       |  3 +-
 .../features/combat/mobs/MobHighlight.kt      | 30 +++++-----
 .../features/dungeon/DungeonHideItems.kt      |  8 +--
 .../dungeon/HighlightDungeonDeathmite.kt      |  6 +-
 .../event/hoppity/HoppityCollectionStats.kt   |  2 +-
 .../event/hoppity/HoppityEggsManager.kt       |  1 -
 .../frozentreasure/FrozenTreasureTracker.kt   |  5 +-
 .../waypoints/easter/EasterEggWaypoints.kt    |  2 +-
 .../fishing/tracker/SeaCreatureTracker.kt     |  5 +-
 .../features/garden/AnitaMedalProfit.kt       |  1 -
 .../garden/farming/ArmorDropTracker.kt        |  5 +-
 .../garden/farming/DicerRngDropTracker.kt     |  5 +-
 .../garden/farming/lane/FarmingDirection.kt   |  1 -
 .../farming/lane/FarmingLaneFeatures.kt       |  1 -
 .../visitor/GardenVisitorCompactChat.kt       |  2 +-
 .../visitor/GardenVisitorDropStatistics.kt    |  2 +-
 .../features/garden/visitor/VisitorAPI.kt     |  2 +-
 .../gui/customscoreboard/ScoreboardEvent.kt   |  6 +-
 .../skyhanni/features/inventory/ChestValue.kt |  2 -
 .../features/inventory/HarpFeatures.kt        |  2 +-
 .../inventory/HideNotClickableItems.kt        |  2 +-
 .../features/inventory/QuickCraftFeatures.kt  |  1 -
 .../features/inventory/SackDisplay.kt         |  7 +--
 .../ChocolateFactoryStrayTracker.kt           |  5 +-
 .../itemabilities/CrownOfAvariceCounter.kt    |  2 +-
 .../mining/HighlightMiningCommissionMobs.kt   |  7 +--
 .../mining/powdertracker/PowderTracker.kt     |  3 +-
 .../features/misc/NonGodPotEffectDisplay.kt   |  1 -
 .../features/misc/discordrpc/DiscordStatus.kt |  1 -
 .../items/EstimatedItemValueCalculator.kt     |  9 ++-
 .../rift/area/dreadfarm/VoltHighlighter.kt    |  2 +-
 .../area/mirrorverse/RiftUpsideDownParkour.kt |  2 +-
 .../rift/area/westvillage/VerminTracker.kt    |  5 +-
 .../features/slayer/SlayerMiniBossFeatures.kt |  7 ++-
 .../skyhanni/features/slayer/SlayerType.kt    |  2 +-
 .../features/slayer/blaze/HellionShield.kt    |  1 -
 .../hannibal2/skyhanni/utils/EntityUtils.kt   |  1 +
 .../skyhanni/utils/PrimitiveRecipe.kt         |  1 -
 .../utils/json/SkyHanniTypeAdapters.kt        |  4 +-
 .../skyhanni/utils/renderables/Renderable.kt  |  1 +
 .../skyhanni/utils/tracker/SkyHanniTracker.kt |  1 -
 50 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3e3b002ff9aa..cb384b26946b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,8 @@ import at.skyhanni.sharedvariables.versionString
 import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 
 plugins {
     idea
@@ -348,28 +350,31 @@ publishing.publications {
     }
 }
 
-// Detekt: TODO: Uncomment this when we're ready to enforce
-// detekt {
-//     buildUponDefaultConfig = true // preconfigure defaults
-//     config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
-//     baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
-//     source.setFrom(project.sourceSets.named("main").map { it.allSource })
-// }
-//
-// tasks.withType<Detekt>().configureEach {
-//     reports {
-//         html.required.set(true) // observe findings in your browser with structure and code snippets
-//         xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
-//         sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
-//         md.required.set(true) // simple Markdown format
-//     }
-// }
-//
-// tasks.withType<Detekt>().configureEach {
-//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-//     outputs.cacheIf { false } // Custom rules won't work if cached
-// }
-// tasks.withType<DetektCreateBaselineTask>().configureEach {
-//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-//     outputs.cacheIf { false } // Custom rules won't work if cached
-// }
+detekt {
+    buildUponDefaultConfig = true // preconfigure defaults
+    config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
+    baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
+    source.setFrom(project.sourceSets.named("main").map { it.allSource })
+}
+
+tasks.withType<Detekt>().configureEach {
+    onlyIf {
+        false // TODO: Remove onlyIf when we're ready to enforce
+    }
+
+    reports {
+        html.required.set(true) // observe findings in your browser with structure and code snippets
+        xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
+        sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
+        md.required.set(true) // simple Markdown format
+    }
+}
+
+tasks.withType<Detekt>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}
+tasks.withType<DetektCreateBaselineTask>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
index 9da50e13eaba..4d7662b4f452 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
@@ -182,7 +182,7 @@ object GetFromSackAPI {
         if (!amountString.isDouble()) return CommandResult.WRONG_AMOUNT to null
 
         val itemString = arguments.dropLast(1).joinToString(" ").uppercase().replace(':', '-')
-        val replacedString = itemString.replace("_"," ")
+        val replacedString = itemString.replace("_", " ")
 
         val item = when {
             SackAPI.sackListInternalNames.contains(itemString) -> itemString.asInternalName()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
index 1d8182328b6e..3137458c3bec 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt
@@ -421,7 +421,8 @@ enum class HotmData(
 
         val storage get() = ProfileStorageData.profileSpecific?.mining?.hotmTree
 
-        val abilities = listOf(PICKOBULUS, MINING_SPEED_BOOST, MANIAC_MINER, GEMSTONE_INFUSION, ANOMALOUS_DESIRE, SHEER_FORCE)
+        val abilities =
+            listOf(PICKOBULUS, MINING_SPEED_BOOST, MANIAC_MINER, GEMSTONE_INFUSION, ANOMALOUS_DESIRE, SHEER_FORCE)
 
         private val inventoryPattern by patternGroup.pattern(
             "inventory",
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
index e392699cdbfe..7581b3b1ec94 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt
@@ -412,5 +412,5 @@ enum class SackStatus {
     MISSING,
     CORRECT,
     ALRIGHT,
-    OUTDATED;
+    OUTDATED,
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index a763961f8b54..34f776308fda 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -126,7 +126,7 @@ object MobDetection {
             MobData.currentEntityLiving.clear() // Naturally removing the mobs using the despawn
         }
 
-        (MobData.currentEntityLiving - MobData.previousEntityLiving).forEach { addRetry(it) }  // Spawn
+        (MobData.currentEntityLiving - MobData.previousEntityLiving).forEach { addRetry(it) } // Spawn
         (MobData.previousEntityLiving - MobData.currentEntityLiving).forEach { entityDeSpawn(it) } // Despawn
 
         MobData.notSeenMobs.removeIf(::canBeSeen)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt
index b2e4f6d8dfbc..6dd666d4e84d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/GoalType.kt
@@ -3,5 +3,4 @@ package at.hannibal2.skyhanni.features.bingo.card.goals
 enum class GoalType {
     COMMUNITY,
     PERSONAL,
-    ;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt
index 9c7c0380614b..2987d95a680e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ColorFormattingHelper.kt
@@ -21,7 +21,7 @@ object ColorFormattingHelper {
                     "§f&k = Obfuscated (like this: §khellspawn§r)\n" +
                     "§f&l = §lBold           §r&m = §mStrikethrough \n" +
                     "§f&o = §oItalic            §r&n = §nUnderline\n" +
-                    "§f&r = Reset\n"+
+                    "§f&r = Reset\n" +
                     "§c==================================================="
             )
         )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 1e0397959270..624a2d0c2b95 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -310,7 +310,8 @@ object PowderMiningChatFilter {
         return null
     }
 
-    private var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> = emptyMap()
+    private var rewardPatterns: Map<Pair<Pattern, PowderMiningFilterConfig.SimplePowderMiningRewardTypes>, String> =
+        emptyMap()
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRepoReload(event: RepositoryReloadEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
index 3d46d3edc5d4..0d542df383b8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt
@@ -21,7 +21,7 @@ enum class BossType(
     NETHER_VANQUISHER("§5Vanquisher", Type.VANQUISHER),
 
     END_ENDSTONE_PROTECTOR("§cEndstone Protector", Type.ENDERSTONE_PROTECTOR),
-    END_ENDER_DRAGON("Ender Dragon", Type.ENDER_DRAGON),// TODO fix totally
+    END_ENDER_DRAGON("Ender Dragon", Type.ENDER_DRAGON), // TODO fix totally
 
     SLAYER_ZOMBIE_1("§aRevenant Horror 1", Type.REVENANT_HORROR, "§aRev 1", showDeathTime = true),
     SLAYER_ZOMBIE_2("§eRevenant Horror 2", Type.REVENANT_HORROR, "§eRev 2", showDeathTime = true),
@@ -107,7 +107,7 @@ enum class BossType(
     LEECH_SUPREME("§cLeech Supreme", Type.THE_RIFT_BOSSES),
     BACTE("§aBacte", Type.THE_RIFT_BOSSES),
 
-    WINTER_REINDRAKE("Reindrake", Type.REINDRAKE),// TODO fix totally
+    WINTER_REINDRAKE("Reindrake", Type.REINDRAKE), // TODO fix totally
 
     GARDEN_PEST_BEETLE("§cBeetle", Type.GARDEN_PESTS),
     GARDEN_PEST_CRICKET("§cCricket", Type.GARDEN_PESTS),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index b337d58b1487..40e329f20cdf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -71,7 +71,8 @@ object GhostCounter {
     val config get() = SkyHanniMod.feature.combat.ghostCounter
     val storage get() = ProfileStorageData.profileSpecific?.ghostCounter
     private var display = emptyList<List<Any>>()
-    var ghostCounterV3File = File(FilenameUtils.separatorsToSystem("./config/ChatTriggers/modules/GhostCounterV3/.persistantData.json"))
+    var ghostCounterV3File =
+        File(FilenameUtils.separatorsToSystem("./config/ChatTriggers/modules/GhostCounterV3/.persistantData.json"))
 
     private val patternGroup = RepoPattern.group("combat.ghostcounter")
     private val skillXPPattern by patternGroup.pattern(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
index 7c33afcdb653..7d51994c029f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
@@ -42,8 +42,7 @@ object MobHighlight {
             RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                 entity,
                 LorenzColor.DARK_PURPLE.toColor().withAlpha(127)
-            )
-            { config.corruptedMobHighlight }
+            ) { config.corruptedMobHighlight }
         }
     }
 
@@ -57,16 +56,14 @@ object MobHighlight {
             RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                 entity,
                 LorenzColor.DARK_BLUE.toColor().withAlpha(127)
-            )
-            { config.arachneKeeperHighlight }
+            ) { config.arachneKeeperHighlight }
         }
 
         if (config.corleoneHighlighter && maxHealth == 1_000_000 && entity is EntityOtherPlayerMP && entity.name == "Team Treasurite") {
             RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                 entity,
                 LorenzColor.DARK_PURPLE.toColor().withAlpha(127)
-            )
-            { config.corleoneHighlighter }
+            ) { config.corleoneHighlighter }
         }
 
         if (entity is EntityEnderman) {
@@ -78,8 +75,7 @@ object MobHighlight {
                     RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                         entity,
                         LorenzColor.DARK_AQUA.toColor().withAlpha(127)
-                    )
-                    { config.zealotBruiserHighlighter }
+                    ) { config.zealotBruiserHighlighter }
                 }
             }
 
@@ -89,8 +85,7 @@ object MobHighlight {
                     RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                         entity,
                         LorenzColor.GREEN.toColor().withAlpha(127)
-                    )
-                    { config.chestZealotHighlighter }
+                    ) { config.chestZealotHighlighter }
                 }
             }
 
@@ -99,8 +94,7 @@ object MobHighlight {
                 RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                     entity,
                     LorenzColor.DARK_RED.toColor().withAlpha(50)
-                )
-                { config.specialZealotHighlighter }
+                ) { config.specialZealotHighlighter }
             }
         }
 
@@ -153,12 +147,16 @@ object MobHighlight {
     }
 
     private fun markArachneMinis(entity: EntityLivingBase) {
-        RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, LorenzColor.GOLD.toColor().withAlpha(50))
-        { config.arachneBossHighlighter }
+        RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+            entity,
+            LorenzColor.GOLD.toColor().withAlpha(50)
+        ) { config.arachneBossHighlighter }
     }
 
     private fun markArachne(entity: EntityLivingBase) {
-        RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, LorenzColor.RED.toColor().withAlpha(50))
-        { config.arachneBossHighlighter }
+        RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+            entity,
+            LorenzColor.RED.toColor().withAlpha(50)
+        ) { config.arachneBossHighlighter }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
index f0ce80b1b18e..a5237aeb666a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@@ -194,10 +194,10 @@ object DungeonHideItems {
 
         if (isSkeletonSkull(entity)) {
             movingSkeletonSkulls[entity] = System.currentTimeMillis()
-            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, LorenzColor.GOLD.toColor().withAlpha(60))
-            {
-                shouldColorMovingSkull(entity)
-            }
+            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+                entity,
+                LorenzColor.GOLD.toColor().withAlpha(60)
+            ) { shouldColorMovingSkull(entity) }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/HighlightDungeonDeathmite.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/HighlightDungeonDeathmite.kt
index 26b129dd9574..15848a9bc859 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/HighlightDungeonDeathmite.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/HighlightDungeonDeathmite.kt
@@ -21,8 +21,10 @@ object HighlightDungeonDeathmite {
         val maxHealth = event.maxHealth
 
         if (entity is EntitySilverfish && maxHealth == 1_000_000_000) {
-            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, LorenzColor.DARK_RED.toColor().withAlpha(20))
-            { SkyHanniMod.feature.dungeon.highlightDeathmites }
+            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+                entity,
+                LorenzColor.DARK_RED.toColor().withAlpha(20)
+            ) { SkyHanniMod.feature.dungeon.highlightDeathmites }
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 9fbb3e527dc0..7d2a6a457c28 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -213,7 +213,7 @@ object HoppityCollectionStats {
             val newItemStack = if (config.rarityDyeRecolor) ItemStack(
                 Items.dye, 1,
                 when (rarity) {
-                    LorenzRarity.COMMON -> 7  // Light gray dye
+                    LorenzRarity.COMMON -> 7 // Light gray dye
                     LorenzRarity.UNCOMMON -> 10 // Lime dye
                     LorenzRarity.RARE -> 4 // Lapis lazuli
                     LorenzRarity.EPIC -> 5 // Purple dye
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index bdbe4cd7e10b..a69366931886 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -25,7 +25,6 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.now
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
-import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.regex.Matcher
 import kotlin.time.Duration.Companion.minutes
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index 80812c4c563b..e41a61013210 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -42,8 +42,9 @@ object FrozenTreasureTracker {
     private var icePerSecond = mutableListOf<Long>()
     private var icePerHour = 0
     private var stoppedChecks = 0
-    private val tracker = SkyHanniTracker("Frozen Treasure Tracker", { Data() }, { it.frozenTreasureTracker })
-    { formatDisplay(drawDisplay(it)) }
+    private val tracker = SkyHanniTracker("Frozen Treasure Tracker", { Data() }, { it.frozenTreasureTracker }) {
+        formatDisplay(drawDisplay(it))
+    }
 
     init {
         FrozenTreasure.entries.forEach { it.chatPattern }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
index 6831f1440115..8250b023db10 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
@@ -91,7 +91,7 @@ object EasterEggWaypoints {
     /*
         Title:
         §e§lHYPIXEL
-        
+
         '§703/14/24  §8L30A'
         '  '
         'Rank: §bMVP§d+§b'
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index f050e56cdf95..ca8a73ce9d5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -28,8 +28,9 @@ object SeaCreatureTracker {
 
     private val config get() = SkyHanniMod.feature.fishing.seaCreatureTracker
 
-    private val tracker = SkyHanniTracker("Sea Creature Tracker", { Data() }, { it.fishing.seaCreatureTracker })
-    { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Sea Creature Tracker", { Data() }, { it.fishing.seaCreatureTracker }) {
+        drawDisplay(it)
+    }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
index 26e41f7eea89..6cbda5b04ca7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
@@ -38,7 +38,6 @@ object AnitaMedalProfit {
         GOLD("§6Gold medal", 8),
         SILVER("§fSilver medal", 2),
         BRONZE("§cBronze medal", 1),
-        ;
     }
 
     private fun getMedal(name: String) = MedalType.entries.firstOrNull { it.displayName == name }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
index 90c68a046980..8a21525c1646 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt
@@ -41,8 +41,9 @@ object ArmorDropTracker {
 
     private var hasArmor = false
 
-    private val tracker = SkyHanniTracker("Armor Drop Tracker", { Data() }, { it.garden.armorDropTracker })
-    { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Armor Drop Tracker", { Data() }, { it.garden.armorDropTracker }) {
+        drawDisplay(it)
+    }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
index 9e9e3620b618..af74da0d7fb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt
@@ -31,8 +31,9 @@ object DicerRngDropTracker {
 
     private val itemDrops = mutableListOf<ItemDrop>()
     private val config get() = GardenAPI.config.dicerCounters
-    private val tracker = SkyHanniTracker("Dicer RNG Drop Tracker", { Data() }, { it.garden.dicerDropTracker })
-    { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Dicer RNG Drop Tracker", { Data() }, { it.garden.dicerDropTracker }) {
+        drawDisplay(it)
+    }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingDirection.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingDirection.kt
index 6ce5ebe06c11..06ff155b6cb0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingDirection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingDirection.kt
@@ -3,5 +3,4 @@ package at.hannibal2.skyhanni.features.garden.farming.lane
 enum class FarmingDirection {
     NORTH_SOUTH,
     EAST_WEST,
-    ;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
index e407d0ad4deb..ce4ce6a9f8c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt
@@ -49,7 +49,6 @@ object FarmingLaneFeatures {
         TOO_SLOW("§cToo slow!"),
         CALCULATING("§aCalculating.."),
         NORMAL(""),
-        ;
     }
 
     @HandleEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
index 52e49d26fe18..8cafd5260a1a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt
@@ -56,7 +56,7 @@ object GardenVisitorCompactChat {
     )
 
     private var visitorAcceptedChat = mutableListOf<String>()
-    private var visitorNameFormatted = "";
+    private var visitorNameFormatted = ""
     private var rewardsList = mutableListOf<String>()
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
index 152fc1b7c23a..2ad6f56b1c05 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
@@ -196,7 +196,7 @@ object GardenVisitorDropStatistics {
 
         for (reward in VisitorReward.entries) {
             val count = rewardsCount[reward] ?: 0
-            if (config.displayIcons) {// Icons
+            if (config.displayIcons) { // Icons
                 val stack = reward.itemStack
                 if (config.displayNumbersFirst)
                     add(listOf("§b${count.addSeparators()} ", stack))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
index d621aa081b37..1565d87d3eba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
@@ -201,7 +201,7 @@ object VisitorAPI {
         val pricePerCopper = pricePerCopper ?: error("pricePerCopper is null")
         val totalPrice = totalPrice ?: error("totalPrice is null")
         val totalReward = totalReward ?: error("totalReward is null")
-        val loss = totalPrice - totalReward;
+        val loss = totalPrice - totalReward
         return when {
             preventRefusing && hasReward() != null -> VisitorBlockReason.RARE_REWARD
             preventRefusingNew && offersAccepted == 0 -> VisitorBlockReason.NEVER_ACCEPTED
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 802cc073bd71..6531d5158d75 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -373,9 +373,9 @@ private fun getWinterLines() = buildList {
 }
 
 private fun getWinterShowWhen(): Boolean = getSbLines().any {
-    SbPattern.winterEventStartPattern.matches(it)
-        || (SbPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!"))
-        || SbPattern.winterWavePattern.matches(it)
+    SbPattern.winterEventStartPattern.matches(it) ||
+        (SbPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!")) ||
+        SbPattern.winterWavePattern.matches(it)
 }
 
 private fun getNewYearLines() = listOf(getSbLines().first { SbPattern.newYearPattern.matches(it) })
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
index bd032fe66cda..50c5e446fd20 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt
@@ -230,13 +230,11 @@ object ChestValue {
     enum class SortType(val shortName: String, val longName: String) {
         PRICE_DESC("Price D", "Price Descending"),
         PRICE_ASC("Price A", "Price Ascending"),
-        ;
     }
 
     enum class FormatType(val type: String) {
         SHORT("Formatted"),
         LONG("Unformatted"),
-        ;
     }
 
     enum class DisplayType(val type: String) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
index d6d79b31a710..dd9e3d91e9ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
@@ -111,7 +111,7 @@ object HarpFeatures {
 
     private fun updateScale() {
         if (Minecraft.getMinecraft().currentScreen == null) {
-            DelayedRun.runNextTick() {
+            DelayedRun.runNextTick {
                 updateScale()
             }
             return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index 2e549313ce3a..f8a16bf50b0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -311,7 +311,7 @@ object HideNotClickableItems {
             "BRACELET",
         )
         for (type in list) {
-            if (stack.getLore().any { it.contains("§l") && it.contains(type) }) {// todo use item api
+            if (stack.getLore().any { it.contains("§l") && it.contains(type) }) { // todo use item api
                 showGreenLine = true
                 return false
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuickCraftFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuickCraftFeatures.kt
index 70069a84ea2a..f1235a968af8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuickCraftFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuickCraftFeatures.kt
@@ -29,7 +29,6 @@ object QuickCraftFeatures {
     enum class InventoryType(val inventoryName: String) {
         CRAFT_ITEM("Craft Item"),
         MORE_QUICK_CRAFT_OPTIONS("Quick Crafting"),
-        ;
     }
 
     private fun InventoryType.ignoreSlot(slotNumber: Int?): Boolean = when (this) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 4856c65c10b7..1489ba83ff93 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -299,20 +299,17 @@ object SackDisplay {
         STORED_ASC("Stored A", "Stored Ascending"),
         PRICE_DESC("Price D", "Price Descending"),
         PRICE_ASC("Price A", "Price Ascending"),
-        ;
     }
 
     enum class PriceFormat(val displayName: String) {
-        FORMATED("Formatted"),
-        UNFORMATED("Unformatted"),
-        ;
+        FORMATTED("Formatted"),
+        UNFORMATTED("Unformatted"),
     }
 
     enum class NumberFormat(val displayName: String) {
         DEFAULT("Default"),
         FORMATTED("Formatted"),
         UNFORMATTED("Unformatted"),
-        ;
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
index 1aa9d068b124..bb4eeaedb20c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt
@@ -125,8 +125,9 @@ object ChocolateFactoryStrayTracker {
         "(?:§.)*already have captured him before.*",
     )
 
-    private val tracker = SkyHanniTracker("Stray Tracker", { Data() }, { it.chocolateFactory.strayTracker })
-    { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Stray Tracker", { Data() }, { it.chocolateFactory.strayTracker }) {
+        drawDisplay(it)
+    }
 
     class Data : TrackerData() {
         override fun reset() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt
index 207e1b92b6a1..df408133a136 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/CrownOfAvariceCounter.kt
@@ -40,7 +40,7 @@ object CrownOfAvariceCounter {
         if (!config.enable) return null
         val item = InventoryUtils.getHelmet()
         if (item?.getInternalNameOrNull() != internalName) return null
-        val count = item.extraAttributes.getLong("collected_coins");
+        val count = item.extraAttributes.getLong("collected_coins")
         return Renderable.horizontalContainer(
             listOf(
                 Renderable.itemStack(internalName.getItemStack()),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
index cc9f6b7534ba..071c905d53f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
@@ -53,7 +53,6 @@ object HighlightMiningCommissionMobs {
         CH_GOBLIN_SLAYER("Goblin Slayer", { it.name == "Weakling " }),
 
         // new commissions
-        ;
     }
 
     @SubscribeEvent
@@ -67,8 +66,7 @@ object HighlightMiningCommissionMobs {
                 RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                     entity,
                     LorenzColor.YELLOW.toColor().withAlpha(127)
-                )
-                { isEnabled() && type in active }
+                ) { isEnabled() && type in active }
             }
         }
     }
@@ -99,8 +97,7 @@ object HighlightMiningCommissionMobs {
                 RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
                     entity,
                     LorenzColor.YELLOW.toColor().withAlpha(127)
-                )
-                { isEnabled() && type in active }
+                ) { isEnabled() && type in active }
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index c3d307a16f69..da9dbb2fbdab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -140,7 +140,8 @@ object PowderTracker {
         }
     }
 
-    private val tracker = SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker }) { formatDisplay(drawDisplay(it)) }
+    private val tracker =
+        SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker }) { formatDisplay(drawDisplay(it)) }
 
     class Data : TrackerData() {
 
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 89db21304472..61f9a344923f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -76,7 +76,6 @@ object NonGodPotEffectDisplay {
         CURSE_OF_GREED("§4Curse of Greed I"),
 
         COLD_RESISTANCE_4("§bCold Resistance IV"),
-        ;
     }
 
     private val effectsCountPattern by RepoPattern.pattern(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 47472d2fec20..82be48f80fa0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -344,5 +344,4 @@ enum class AutoStatus(val placeholderText: String, val correspondingDiscordStatu
     STACKING("Stacking placeholder (should never be visible)", DiscordStatus.STACKING),
     DUNGEONS("Dungeons placeholder (should never be visible)", DiscordStatus.DUNGEONS),
     AFK("This person is not afk (should never be visible)", DiscordStatus.AFK),
-    ;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 2f58a4fd191f..62abb1c8c52a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -742,9 +742,12 @@ object EstimatedItemValueCalculator {
         val map = mutableMapOf<String, Double>()
 
         // todo use repo
-        val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb", "toxophilite")
-        val onlyTierOnePrices = listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
-        val onlyTierFivePrices = listOf("ferocious_mana", "hardened_mana", "mana_vampire", "strong_mana")
+        val tieredEnchants =
+            listOf("compact", "cultivating", "champion", "expertise", "hecatomb", "toxophilite")
+        val onlyTierOnePrices =
+            listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
+        val onlyTierFivePrices =
+            listOf("ferocious_mana", "hardened_mana", "mana_vampire", "strong_mana")
 
         val internalName = stack.getInternalName()
         for ((rawName, rawLevel) in enchantments) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 77807e5bf176..50887554dac0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -91,11 +91,11 @@ object VoltHighlighter {
         FRIENDLY,
         HOSTILE,
         DOING_LIGHTNING,
-        ;
     }
 
     private fun getVoltState(itemStack: ItemStack): VoltState {
         return when (itemStack.getSkullTexture()) {
+            // TODO: Move these textures to the repo
             "ewogICJ0aW1lc3RhbXAiIDogMTY3Mzg4MzU3MjAzNSwKICAicHJvZmlsZUlkIiA6ICI0MDU4NDhjMmJjNTE0ZDhkOThkOTJkMGIwYzhiZDQ0YiIsCiAgInByb2ZpbGVOYW1lIiA6ICJMb3ZlT3dPIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2UxYjFiZmI1MzZiNjQxNmIyNmEyODNkMmQ4YWQ0YjE3NzFiYmU1Yjc2ODk2ZTI3MjdkNWU4MzNiYzg5NDk4MmQiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==" -> {
                 VoltState.DOING_LIGHTNING
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
index ac12b43c00cd..c93932344d63 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
@@ -24,7 +24,7 @@ object RiftUpsideDownParkour {
     fun onRepoReload(event: RepositoryReloadEvent) {
         val data = event.getConstant<ParkourJson>("RiftUpsideDownParkour")
         parkourHelper = ParkourHelper(
-            data.locations.map { it.add(-1.0, -1.0, -1.0) },// TODO remove offset. change repo instead
+            data.locations.map { it.add(-1.0, -1.0, -1.0) }, // TODO remove offset. change repo instead
             data.shortCuts,
             platformSize = 2.0,
             detectionRange = 2.0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
index cedaa569bfbf..0f397e6e348f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt
@@ -55,8 +55,9 @@ object VerminTracker {
 
     private val config get() = RiftAPI.config.area.westVillage.verminTracker
 
-    private val tracker = SkyHanniTracker("Vermin Tracker", { Data() }, { it.rift.verminTracker })
-    { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Vermin Tracker", { Data() }, { it.rift.verminTracker }) {
+        drawDisplay(it)
+    }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
index 0fd24e25c6d8..4798a943257d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
@@ -43,8 +43,10 @@ object SlayerMiniBossFeatures {
             if (bossType.clazz != entity.javaClass) continue
 
             miniBosses = miniBosses.editCopy { add(entity) }
-            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, LorenzColor.AQUA.toColor().withAlpha(127))
-            { config.slayerMinibossHighlight }
+            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
+                entity,
+                LorenzColor.AQUA.toColor().withAlpha(127)
+            ) { config.slayerMinibossHighlight }
         }
     }
 
@@ -79,6 +81,5 @@ object SlayerMiniBossFeatures {
         SVEN(EntityWolf::class.java, 45_000, 120_000, 480_000),
         VOIDLING(EntityEnderman::class.java, 8_400_000, 17_500_000, 52_500_000),
         INFERNAL(EntityBlaze::class.java, 12_000_000, 25_000_000, 75_000_000),
-        ;
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
index 75b1efd34cf7..0a07e62fece0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt
@@ -16,6 +16,6 @@ enum class SlayerType(val displayName: String, val rngName: String, val clazz: C
     ;
 
     companion object {
-        fun getByName(name: String): SlayerType? = entries.firstOrNull {name.contains(it.displayName)}
+        fun getByName(name: String): SlayerType? = entries.firstOrNull { name.contains(it.displayName) }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/HellionShield.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/HellionShield.kt
index db3826d4469e..290f006789c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/HellionShield.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/HellionShield.kt
@@ -14,5 +14,4 @@ enum class HellionShield(
     ASHEN("§8§lASHEN", "Ashen", LorenzColor.DARK_GRAY),
     SPIRIT("§f§lSPIRIT", "Spirit", LorenzColor.WHITE),
     CRYSTAL("§b§lCRYSTAL", "Crystal", LorenzColor.AQUA),
-    ;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 198f7c0a00d0..281b744d657b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -38,6 +38,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 //#endif
 
 @SkyHanniModule
+@Suppress("ImportOrdering")
 object EntityUtils {
 
     @Deprecated("Old. Instead use entity detection feature instead.")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt
index f064183ba372..24deb38a207d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/PrimitiveRecipe.kt
@@ -49,5 +49,4 @@ enum class RecipeType {
     KAT_UPGRADE,
     ESSENCE,
     CRAFTING,
-    ;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
index 13aec1d92b6a..968ad7fded97 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/SkyHanniTypeAdapters.kt
@@ -84,9 +84,7 @@ object SkyHanniTypeAdapters {
         }
     }
 
-    inline
-
-    fun <reified T> GsonBuilder.registerTypeAdapter(
+    inline fun <reified T> GsonBuilder.registerTypeAdapter(
         crossinline write: (JsonWriter, T) -> Unit,
         crossinline read: (JsonReader) -> T,
     ): GsonBuilder {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index f3f704f374a2..5362cc17794c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -1139,6 +1139,7 @@ interface Renderable {
                     GlStateManager.translate(0f, yShift.toFloat(), 0f)
                     renderY += yShift
                 }
+                @Suppress("SpacingAroundCurly")
                 val range = yOffsets.indexOfFirst { it >= scroll.asInt() }..<(yOffsets.indexOfFirst { it >= end }.takeIf { it > 0 }
                     ?: yOffsets.size) - 1
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
index a6d42839cdb5..eea93de044e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt
@@ -198,7 +198,6 @@ open class SkyHanniTracker<Data : TrackerData>(
         TOTAL("Total"),
         SESSION("This Session"),
         MAYOR("This Mayor"),
-        ;
     }
 
     enum class DefaultDisplayMode(val display: String, val mode: DisplayMode?) {

From 7000057486bf31972f6a91477db6b864575e9988 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Fri, 4 Oct 2024 06:56:30 +1000
Subject: [PATCH 628/721] change neu to 2.4 (#2652)

---
 build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cb384b26946b..190385c1e4ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -150,9 +150,9 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    // August 27, 2024, 4:30 PM AEST
-    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.3.3
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.3.3:all") {
+    // October 3, 2024, 11:43 PM AEST
+    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.4.0
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.4.0:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }

From a8bd03caf2ec478fe926c160fd67d4dd2df7ef1e Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:49:06 +1000
Subject: [PATCH 629/721] Fix: Template (#2661)

---
 pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pull_request_template.md b/pull_request_template.md
index 2dd04bcec865..b004c1c13866 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -21,7 +21,7 @@ Describe what this pull request does, including technical details, screenshots,
 
 ## Changelog New Features
 + Cool new feature. - your_name_here
-    * extra info
+    * Extra info.
 
 ## Changelog Improvements
 + Improved cool feature. - your_name_here

From a95bf3a5712951eff5d4d52f418468e901e1eda6 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Fri, 4 Oct 2024 03:54:19 +0200
Subject: [PATCH 630/721] Removed the password in download source check (#2649)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../tweaker/DownloadSourceChecker.java        | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
index 63a92849bc62..2c417909e6a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
@@ -18,15 +18,6 @@ public class DownloadSourceChecker {
     private static final String GITHUB_REPO = "511310721";
     private static final String GITHUB_REPO_TEXT = "repo_id=" + GITHUB_REPO;
     private static final String MODRINTH_URL = "/data/byNkmv5G/";
-    private static final String THE_PASSWORD = "danger";
-
-    private static final String[] PASSWORD_POPUP = {
-        "If someone asks you to type in here,",
-        "",
-        "the likelihood of them ratting you is high!",
-        "",
-        "Enter the password:"
-    };
 
     private static final String[] SECURITY_POPUP = {
         "The file you are trying to run is hosted on a non-trusted domain.",
@@ -77,17 +68,6 @@ private static void openMenu(URI host) {
 
         JPanel buttons = new JPanel();
 
-        buttons.add(TweakerUtils.createButton(
-            "Skip (Trusted Users Only)",
-            () -> {
-                String password = JOptionPane.showInputDialog(frame, String.join("\n", PASSWORD_POPUP));
-                if (password != null && password.equals(THE_PASSWORD)) {
-                    close.set(false);
-                    frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
-                }
-            }
-        ));
-
         buttons.add(TweakerUtils.createButton(
             "Close",
             () -> {

From fda50f2ecd79498b8cb155025807d018cf86279e Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sat, 5 Oct 2024 00:08:45 +0200
Subject: [PATCH 631/721] Fix: Delay Pablo GfS message (#2662)

---
 .../hannibal2/skyhanni/features/nether/PabloHelper.kt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
index 04f5e6113576..eb4962549f70 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/PabloHelper.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.GetFromSackAPI
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -51,10 +52,12 @@ object PabloHelper {
 
         if (InventoryUtils.countItemsInLowerInventory { it.name.contains(itemName) } > 0) return
 
-        GetFromSackAPI.getFromChatMessageSackItems(
-            itemName.asInternalName().makePrimitiveStack(),
-            "Click here to grab an $itemName from sacks!",
-        )
+        DelayedRun.runNextTick {
+            GetFromSackAPI.getFromChatMessageSackItems(
+                itemName.asInternalName().makePrimitiveStack(),
+                "Click here to grab an $itemName from sacks!",
+            )
+        }
 
         lastSentMessage = SimpleTimeMark.now()
     }

From c636d88309279ec458f96c6e6eadd93a39a6c912 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Sat, 5 Oct 2024 16:16:18 +1000
Subject: [PATCH 632/721] Fix: repo getting redownloaded on the same commit
 (#2669)

---
 src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index ec6f0cbd9ebe..b3109c9ee4d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -36,7 +36,7 @@ class RepoManager(private val configLocation: File) {
     private var latestRepoCommit: String? = null
     val repoLocation: File = File(configLocation, "repo")
     private var error = false
-    private var lastRepoUpdate = SimpleTimeMark.farPast()
+    private var lastRepoUpdate = SimpleTimeMark.now()
 
     companion object {
 

From 5a77e28bf9bd7f9d10eb561212ea5f68512892b7 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Sat, 5 Oct 2024 17:55:52 +1000
Subject: [PATCH 633/721] Fix: error punctuation (#2651)

---
 .../java/at/hannibal2/skyhanni/api/event/EventHandler.kt    | 4 +++-
 src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt   | 4 +++-
 .../java/at/hannibal2/skyhanni/test/command/ErrorManager.kt | 6 +++++-
 src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt    | 5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
index 4b4c008523e2..d164e0e774d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAnyIsland
+import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.chat.Text
 import java.lang.invoke.LambdaMetafactory
 import java.lang.invoke.MethodHandles
@@ -91,7 +92,8 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
                 errors++
                 if (errors <= 3) {
                     val errorName = throwable::class.simpleName ?: "error"
-                    val message = "Caught an $errorName in ${listener.name} at $name: ${throwable.message}"
+                    val aOrAn = StringUtils.optionalAn(errorName)
+                    val message = "Caught $aOrAn $errorName in ${listener.name} at $name: ${throwable.message}"
                     ErrorManager.logErrorWithData(throwable, message, ignoreErrorCache = onError != null)
                 }
                 onError?.invoke(throwable)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
index 4a294a6779ca..b567d9ae6d06 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.mixins.hooks.setValue
 import at.hannibal2.skyhanni.mixins.transformers.AccessorEventBus
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.chat.Text
 import at.hannibal2.skyhanni.utils.system.PlatformUtils
 import net.minecraftforge.common.MinecraftForge
@@ -57,7 +58,8 @@ abstract class LorenzEvent : Event() {
                 if (printError && errors <= visibleErrors) {
                     val callerName = listener.toString().split(" ")[1].split("@")[0].split(".").last()
                     val errorName = throwable::class.simpleName ?: "error"
-                    val message = "Caught an $errorName in $callerName at $eventName: ${throwable.message}"
+                    val aOrAn = StringUtils.optionalAn(errorName)
+                    val message = "Caught $aOrAn $errorName in $callerName at $eventName: ${throwable.message}"
                     ErrorManager.logErrorWithData(throwable, message, ignoreErrorCache = ignoreErrorCache)
                 }
                 onError(throwable)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index df3d85267677..56a50ecebd06 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -154,8 +154,12 @@ object ErrorManager {
         fullErrorMessages[randomId] =
             "```\nSkyHanni ${SkyHanniMod.version}: $rawMessage\n(full stack trace)\n \n$fullStackTrace\n$extraDataString```"
 
+        var finalMessage = message
+        if (finalMessage.last() !in ".?!") {
+            finalMessage += "§c."
+        }
         ChatUtils.clickableChat(
-            "§c[SkyHanni-${SkyHanniMod.version}]: $message§c. Click here to copy the error into the clipboard.",
+            "§c[SkyHanni-${SkyHanniMod.version}]: $finalMessage Click here to copy the error into the clipboard.",
             onClick = { copyError(randomId) },
             "§eClick to copy!",
             prefix = false,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index f118d5d665c0..c6de8c13fced 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -569,4 +569,9 @@ object StringUtils {
             false
         }
     }
+
+    fun optionalAn(string: String): String {
+        if (string.isEmpty()) return ""
+        return if (string[0] in "aeiou") "an" else "a"
+    }
 }

From 168372b0be062dff2bf17d661ab4adfa4492e91d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 5 Oct 2024 10:01:05 +0200
Subject: [PATCH 634/721] renamed Bug Fix

---
 .github/workflows/label-bug-fix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
index dae2980de630..4730d6194468 100644
--- a/.github/workflows/label-bug-fix.yml
+++ b/.github/workflows/label-bug-fix.yml
@@ -14,7 +14,7 @@ jobs:
             -   name: label
                 env:
                     TITLE: ${{ github.event.pull_request.title }}
-                    LABEL: Bug Fix - Sooner than Very Soon
+                    LABEL: Bug Fix
                 uses: actions/github-script@v7
                 with:
                     github-token: ${{ secrets.GITHUB_TOKEN}}

From 9f9e11b88620047e98d12b609d6aca7d57760e31 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 5 Oct 2024 10:09:14 +0200
Subject: [PATCH 635/721] code cleanup

---
 src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index 18519a364b1e..3a3ffead303c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -260,7 +260,7 @@ object ChatUtils {
 
 
     fun clickToActionOrDisable(message: String, option: KMutableProperty0<*>, actionName: String, action: () -> Unit) {
-        ChatUtils.clickableChat(
+        clickableChat(
             "$message\n§e[CLICK to $actionName or disable this feature]",
             onClick = {
                 if (KeyboardManager.isShiftKeyDown() || KeyboardManager.isModifierKeyDown()) {

From 524df8b718cad70c7a7fc02e323721c85385d41b Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Sat, 5 Oct 2024 08:31:56 +0000
Subject: [PATCH 636/721] Fix: Stop king talisman tracker on finish (#2663)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/mining/KingTalismanHelper.kt     | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
index 057d2f476948..b9f205984f38 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
@@ -2,9 +2,11 @@ package at.hannibal2.skyhanni.features.mining
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.MiningAPI
 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.SecondPassedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -16,6 +18,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -31,11 +34,27 @@ object KingTalismanHelper {
     private val config get() = SkyHanniMod.feature.mining.kingTalisman
     private val storage get() = ProfileStorageData.profileSpecific?.mining
 
-    private val kingPattern by RepoPattern.pattern(
-        "mining.kingtalisman.king",
+    private val patternGroup = RepoPattern.group("mining.kingtalisman")
+
+    /**
+     * REGEX-TEST: §6§lKing Brammor
+     * REGEX-TEST: §6§lKing Emkam
+     * REGEX-TEST: §6§lKing Kevin
+     * REGEX-TEST: §6§lKing Redros
+     */
+    private val kingPattern by patternGroup.pattern(
+        "king",
         "§6§lKing (?<name>.*)"
     )
 
+    /**
+     * REGEX-TEST: §7You have received a §r§fKing Talisman§r§7!
+     */
+    private val talismanPattern by patternGroup.pattern(
+        "talisman",
+        "§7You have received a §r§fKing Talisman§r§7!"
+    )
+
     private var currentOffset: Int? = null
     private var skyblockYear = 0
 
@@ -66,7 +85,8 @@ object KingTalismanHelper {
     private var farDisplay = ""
     private var display = emptyList<String>()
 
-    private fun isNearby() = IslandType.DWARVEN_MINES.isInIsland() && LorenzUtils.skyBlockArea == "Royal Palace" &&
+    private fun isNearby() = IslandType.DWARVEN_MINES.isInIsland() &&
+        LorenzUtils.skyBlockArea == "Royal Palace" &&
         kingLocation.distanceToPlayer() < 10
 
     @SubscribeEvent
@@ -86,7 +106,7 @@ object KingTalismanHelper {
             return
         }
 
-        update(kingsTalkedTo)
+        update()
         display = if (nearby) allKingsDisplay else Collections.singletonList(farDisplay)
     }
 
@@ -103,7 +123,8 @@ object KingTalismanHelper {
         skyblockYear = SkyBlockTime.now().year
     }
 
-    fun isEnabled() = config.enabled && LorenzUtils.inSkyBlock &&
+    fun isEnabled() = config.enabled &&
+        LorenzUtils.inSkyBlock &&
         (IslandType.DWARVEN_MINES.isInIsland() || config.outsideMines)
 
     @SubscribeEvent
@@ -118,12 +139,13 @@ object KingTalismanHelper {
         val kingsTalkedTo = storage.kingsTalkedTo
         if (currentKing !in kingsTalkedTo) {
             kingsTalkedTo.add(currentKing)
-            update(kingsTalkedTo)
+            update()
             display = allKingsDisplay
         }
     }
 
-    private fun update(kingsTalkedTo: MutableList<String>) {
+    private fun update() {
+        val kingsTalkedTo = storage?.kingsTalkedTo ?: return
         if (kingsTalkedTo.size == kingCircles.size) {
             allKingsDisplay = Collections.singletonList("§eAll Kings found.")
             farDisplay = ""
@@ -198,4 +220,15 @@ object KingTalismanHelper {
 
         config.position.renderStrings(display, posLabel = "King Talisman Helper")
     }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+        if (!MiningAPI.inDwarvenMines) return
+
+        if (talismanPattern.matches(event.message)) {
+            storage?.kingsTalkedTo = kingCircles.toMutableList()
+            update()
+        }
+    }
 }

From e83d5b432a54d53253bcf6f2828fb41767ad17e1 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Sat, 5 Oct 2024 18:39:05 +1000
Subject: [PATCH 637/721] Fix: Made it so you can shift click to disable
 features like it says (#2650)

---
 .../skyhanni/mixins/transformers/gui/MixinGuiScreen.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
index b3338acf5032..3f0371f07f7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiScreen.java
@@ -8,6 +8,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
@@ -33,4 +34,9 @@ public void getTooltip(ItemStack stack, int x, int y, CallbackInfo ci, List<Stri
     public void handleKeyboardInput(CallbackInfo ci) {
         TextInput.Companion.onGuiInput(ci);
     }
+
+    @Redirect(method = "handleComponentClick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiScreen;isShiftKeyDown()Z"))
+    public boolean handleComponentClick() {
+        return false;
+    }
 }

From a517ef456bde52aa391e31198c0facc87edaa7cf Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Sat, 5 Oct 2024 18:50:42 +1000
Subject: [PATCH 638/721] Fix: chroma disabling patchers font renderer for no
 reason (#2666)

---
 .../config/features/chroma/ChromaConfig.java  |  4 ++--
 .../skyhanni/mixins/hooks/FontRendererHook.kt |  2 +-
 .../hooks/MixinPatcherFontRendererHookHook.kt | 20 +++++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java
index 6a02e2ed3061..b3f8577f0c0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java
@@ -20,7 +20,7 @@ public class ChromaConfig {
     public boolean chromaPreview = false;
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Toggle SkyHanni's chroma. §e(Disables Patcher's Optimized Font Renderer while enabled)")
+    @ConfigOption(name = "Enabled", desc = "Toggle SkyHanni's chroma.")
     @ConfigEditorBoolean
     @FeatureToggle
     public Property<Boolean> enabled = Property.of(false);
@@ -80,7 +80,7 @@ public String toString() {
     public Runnable resetSettings = ChromaManager::resetChromaSettings;
 
     @Expose
-    @ConfigOption(name = "Everything Chroma", desc = "Render §4§l§oALL §r§7text in chroma. §e(Some enchants may appear white with SBA enchant parsing)")
+    @ConfigOption(name = "Everything Chroma", desc = "Render §4§l§oALL §r§7text in chroma. §e(Disables Patcher's Optimized Font Renderer while enabled)")
     @ConfigEditorBoolean
     public boolean allChroma = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
index db9c1c07e1c2..b52407b65233 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
@@ -28,7 +28,7 @@ object FontRendererHook {
 
     private var currentDrawState: ChromaFontRenderer? = null
     private var previewChroma = false
-    private var chromaPreviewText: String
+    var chromaPreviewText: String
 
     var cameFromChat = false
 
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
index 25d415889b0d..25697e0ee633 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
@@ -11,9 +11,25 @@ class MixinPatcherFontRendererHookHook {
         fun overridePatcherFontRenderer(string: String, shadow: Boolean, cir: CallbackInfoReturnable<Boolean>) {
             if (!LorenzUtils.onHypixel) return
 
-            if (ChromaManager.config.enabled.get()) {
-                cir.cancel()
+            if (ChromaManager.config.allChroma) {
                 cir.returnValue = false
+                return
+            }
+
+            if (string == FontRendererHook.chromaPreviewText) {
+                cir.returnValue = false
+                return
+            }
+
+            if (string.contains("§#§")) {
+                cir.returnValue = false
+                return
+            }
+            if (ChromaManager.config.enabled.get()) {
+                if (string.contains("§z") || string.contains("§Z")) {
+                    cir.returnValue = false
+                    return
+                }
             }
         }
     }

From 96599f69ea7f22289a74c5c5e931d1001d73e42f Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Sat, 5 Oct 2024 09:59:13 +0100
Subject: [PATCH 639/721] Improvement: Option to hide other players while in
 Gunther's Race (#2655)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../rift/area/westvillage/GunthersRaceConfig.java |  6 ++++++
 .../rift/area/westvillage/RiftGunthersRace.kt     | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
index beb4acc9e3a0..10d18fa85c05 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/GunthersRaceConfig.java
@@ -30,4 +30,10 @@ public class GunthersRaceConfig {
     @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the guide waypoints.")
     @ConfigEditorColour
     public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+
+    @Expose
+    @ConfigOption(name = "Hide Other Players", desc = "Hide other players while in the race.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean hidePlayers = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt
index cf729453fcb6..5a3638101a71 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftGunthersRace.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.rift.area.westvillage
 
 import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson
+import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -11,9 +12,11 @@ import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
 import at.hannibal2.skyhanni.utils.ParkourHelper
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -105,6 +108,18 @@ object RiftGunthersRace {
         }
     }
 
+    @SubscribeEvent
+    fun onCheckRender(event: CheckRenderEntityEvent<*>) {
+        if (!isEnabled()) return
+        if (!config.hidePlayers) return
+        if (!RiftAPI.inRiftRace) return
+
+        val entity = event.entity
+        if (entity is EntityOtherPlayerMP && !entity.isNPC()) {
+            event.cancel()
+        }
+    }
+
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled() || !RiftAPI.inRiftRace) return

From 2db5f13d4f5e7f004006c438dbf5a7f20b34e084 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:01:30 +0200
Subject: [PATCH 640/721] Remove: Mithril Powder from Powder Tracker (#2656)

---
 .../skyhanni/config/ConfigUpdaterMigrator.kt      |  2 +-
 .../features/mining/PowderTrackerConfig.java      |  3 ---
 .../mining/powdertracker/PowderChestReward.kt     |  4 ----
 .../mining/powdertracker/PowderTracker.kt         | 15 ++++++++++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index aa15461f5af2..7c41245fc7f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonPrimitive
 object ConfigUpdaterMigrator {
 
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 60
+    const val CONFIG_VERSION = 61
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
index 1c32cabc2e95..247da9b546d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java
@@ -24,7 +24,6 @@
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.GOLD_ESSENCE;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.HARD_STONE;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.JADE;
-import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.MITHRIL_POWDER;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.ROBOTRON;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.RUBY;
 import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SAPPHIRE;
@@ -56,7 +55,6 @@ public class PowderTrackerConfig {
     public Property<List<PowderDisplayEntry>> textFormat = Property.of(new ArrayList<>(Arrays.asList(
         TOTAL_CHESTS,
         DOUBLE_POWDER,
-        MITHRIL_POWDER,
         GEMSTONE_POWDER,
         SPACER_1,
         DIAMOND_ESSENCE,
@@ -78,7 +76,6 @@ public class PowderTrackerConfig {
     public enum PowderDisplayEntry implements HasLegacyId {
         TOTAL_CHESTS("§d852 Total chests Picked §7(950/h)", 2),
         DOUBLE_POWDER("§bx2 Powder: §aActive!", 3),
-        MITHRIL_POWDER("§b250,420 §aMithril Powder §7(350,000/h)", 4),
         GEMSTONE_POWDER("§b250,420 §dGemstone Powder §7(350,000/h)", 5),
         SPACER_1("", 6),
         DIAMOND_ESSENCE("§b129 §bDiamond Essence §7(600/h)", 7),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index b2b449563a5f..1a48a661a926 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -4,10 +4,6 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 
 enum class PowderChestReward(val displayName: String, pattern: String) {
 
-    MITHRIL_POWDER(
-        "§aMithril Powder",
-        " {4}§r§2Mithril Powder(?: §r§8x(?<amount>.*))?",
-    ),
     GEMSTONE_POWDER(
         "§dGemstone Powder",
         " {4}§r§dGemstone Powder(?: §r§8x(?<amount>.*))?",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index da9dbb2fbdab..38779224cf90 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -199,7 +199,7 @@ object PowderTracker {
         }
 
         for (reward in PowderChestReward.entries) {
-            if (reward == PowderChestReward.MITHRIL_POWDER || reward == PowderChestReward.GEMSTONE_POWDER) continue
+            if (reward == PowderChestReward.GEMSTONE_POWDER) continue
             reward.chatPattern.matchMatcher(msg) {
                 tracker.modify {
                     val count = it.rewards[reward] ?: 0
@@ -217,7 +217,6 @@ object PowderTracker {
         tracker.modify {
             val reward = when (event.powder) {
                 HotmAPI.PowderType.GEMSTONE -> PowderChestReward.GEMSTONE_POWDER
-                HotmAPI.PowderType.MITHRIL -> PowderChestReward.MITHRIL_POWDER
                 else -> return@modify
             }
             it.rewards.addOrPut(reward, event.amount)
@@ -275,6 +274,17 @@ object PowderTracker {
             }
             newList
         }
+
+        event.transform(61, "mining.powderTracker.textFormat") { element ->
+            val newList = JsonArray()
+            for (entry in element.asJsonArray) {
+                if (entry is JsonNull) continue
+                if (entry.asString.let { it != "MITHRIL_POWDER" }) {
+                    newList.add(entry)
+                }
+            }
+            newList
+        }
     }
 
     @SubscribeEvent
@@ -297,7 +307,6 @@ object PowderTracker {
 
     private fun drawDisplay(data: Data): List<Searchable> = buildList {
         calculate(data, gemstoneInfo, PowderChestReward.GEMSTONE_POWDER)
-        calculate(data, mithrilInfo, PowderChestReward.MITHRIL_POWDER)
         calculate(data, diamondEssenceInfo, PowderChestReward.DIAMOND_ESSENCE)
         calculate(data, goldEssenceInfo, PowderChestReward.GOLD_ESSENCE)
         calculateChest(data)

From b3cb37f5459afce7c6234b5ab3a8891447eb587a Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Sat, 5 Oct 2024 09:07:15 +0000
Subject: [PATCH 641/721] Improvement: Make visitor GUI clickable to tp to barn
 (#2658)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/garden/visitor/TimerConfig.java  |  1 +
 .../garden/visitor/GardenVisitorTimer.kt      | 26 ++++++++++++-------
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  3 ++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
index 32bff02debbe..a6b7e509e610 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
@@ -34,5 +34,6 @@ public class TimerConfig {
 
     @Expose
     @ConfigLink(owner = TimerConfig.class, field = "enabled")
+    // TODO rename to position
     public Position pos = new Position(-200, 40, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
index 3a69f2ece3b8..af31448d66e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
@@ -11,15 +11,17 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
-import at.hannibal2.skyhanni.utils.RenderUtils.renderString
+import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
@@ -36,10 +38,10 @@ object GardenVisitorTimer {
 
     private val timePattern by RepoPattern.pattern(
         "garden.visitor.timer.time.new",
-        " Next Visitor: §r(?<info>.*)"
+        " Next Visitor: §r(?<info>.*)",
     )
 
-    private var display = ""
+    private var display: Renderable? = null
     private var lastMillis = 0.seconds
     private var sixthVisitorArrivalTime = SimpleTimeMark.farPast()
     private var visitorJustArrived = false
@@ -65,7 +67,7 @@ object GardenVisitorTimer {
 
     @SubscribeEvent
     fun onProfileJoin(event: ProfileJoinEvent) {
-        display = ""
+        display = null
         lastMillis = 0.seconds
         sixthVisitorArrivalTime = SimpleTimeMark.farPast()
         visitorJustArrived = false
@@ -84,7 +86,7 @@ object GardenVisitorTimer {
         TabListData.getTabList().matchFirst(timePattern) {
             val timeInfo = group("info").removeColor()
             if (timeInfo == "Not Unlocked!") {
-                display = "§cVisitors not unlocked!"
+                display = Renderable.string("§cVisitors not unlocked!")
                 return
             }
             if (timeInfo == "Queue Full!") {
@@ -97,7 +99,7 @@ object GardenVisitorTimer {
                 millis = TimeUtils.getDuration(timeInfo)
             }
         } ?: run {
-            display = "§cVisitor time info not in tab list"
+            display = createDisplayText("§cVisitor time info not in tab list")
             return
         }
 
@@ -140,7 +142,7 @@ object GardenVisitorTimer {
         if (lastMillis == Duration.INFINITE) {
             ErrorManager.logErrorStateWithData(
                 "Found Visitor Timer bug, reset value", "lastMillis was infinite",
-                "lastMillis" to lastMillis
+                "lastMillis" to lastMillis,
             )
             lastMillis = 0.seconds
         }
@@ -168,14 +170,20 @@ object GardenVisitorTimer {
             "Next in §$formatColor$formatDuration$extraSpeed"
         }
         val visitorLabel = if (visitorsAmount == 1) "visitor" else "visitors"
-        display = "§b$visitorsAmount $visitorLabel §7($next§7)"
+        display = createDisplayText("§b$visitorsAmount $visitorLabel §7($next§7)")
     }
 
+    private fun createDisplayText(text: String) = Renderable.clickAndHover(
+        text,
+        listOf("§eClick to teleport to the barn!"),
+        onClick = { HypixelCommands.teleportToPlot("barn") },
+    )
+
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
 
-        config.pos.renderString(display, posLabel = "Garden Visitor Timer")
+        config.pos.renderRenderable(display, posLabel = "Garden Visitor Timer")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index cf2339bf3c42..309f17f686e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -591,10 +591,11 @@ object RenderUtils {
     }
 
     fun Position.renderRenderable(
-        renderable: Renderable,
+        renderable: Renderable?,
         posLabel: String,
         addToGuiManager: Boolean = true,
     ) {
+        if (renderable == null) return
         GlStateManager.pushMatrix()
         val (x, y) = transform()
         Renderable.withMousePosition(x, y) {

From 153f5e3895783397e01281218ab2218525c5da62 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:20:37 +0200
Subject: [PATCH 642/721] code cleanup

---
 src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt  |  2 +-
 .../skyhanni/features/commands/WikiManager.kt        | 12 +++++++-----
 .../hannibal2/skyhanni/features/misc/TpsCounter.kt   |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index b40255449226..0e35e602fc61 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -392,7 +392,7 @@ object SkillAPI {
                     ChatUtils.chat("§bSkill Custom Goal Level")
                     val map = storage?.filter { it.value.customGoalLevel != 0 } ?: return
                     if (map.isEmpty()) {
-                        ChatUtils.chat("§cYou haven't set any custom goals yet!")
+                        ChatUtils.userError("You haven't set any custom goals yet!")
                     }
                     map.forEach { (skill, data) ->
                         ChatUtils.chat("§e${skill.displayName}: §b${data.customGoalLevel}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
index af56be8e7ba4..e72ad09c5481 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
@@ -50,7 +50,7 @@ object WikiManager {
         }
         if (message == ("/wikithis")) {
             val itemInHand = InventoryUtils.getItemInHand() ?: run {
-                ChatUtils.chat("§cYou must be holding an item to use this command!")
+                ChatUtils.userError("You must be holding an item to use this command!")
                 return
             }
             wikiTheItem(itemInHand, config.autoOpenWiki)
@@ -79,7 +79,7 @@ object WikiManager {
 
     fun otherWikiCommands(args: Array<String>, useFandom: Boolean, wikithis: Boolean = false) {
         if (wikithis && !LorenzUtils.inSkyBlock) {
-            ChatUtils.chat("§cYou must be in SkyBlock to do this!")
+            ChatUtils.userError("You must be in SkyBlock to do this!")
             return
         }
 
@@ -88,7 +88,7 @@ object WikiManager {
 
         if (wikithis) {
             val itemInHand = InventoryUtils.getItemInHand() ?: run {
-                ChatUtils.chat("§cYou must be holding an item to use this command!")
+                ChatUtils.userError("You must be holding an item to use this command!")
                 return
             }
             wikiTheItem(itemInHand, false, useFandom = useFandom)
@@ -102,8 +102,10 @@ object WikiManager {
     }
 
     fun sendWikiMessage(
-        search: String = "", displaySearch: String = search,
-        autoOpen: Boolean = config.autoOpenWiki, useFandom: Boolean = config.useFandom
+        search: String = "",
+        displaySearch: String = search,
+        autoOpen: Boolean = config.autoOpenWiki,
+        useFandom: Boolean = config.useFandom,
     ) {
         val wiki = if (useFandom) "SkyBlock Fandom Wiki" else "Official SkyBlock Wiki"
         val urlPrefix = if (useFandom) FANDOM_URL_PREFIX else OFFICIAL_URL_PREFIX
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
index 01d84daa3fdc..1515ee3dcbd1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt
@@ -74,7 +74,7 @@ object TpsCounter {
 
     fun tpsCommand() {
         if (display.isEmpty()) {
-            ChatUtils.chat("§cNo tps data available, make sure you have the setting on.")
+            ChatUtils.userError("No tps data available, make sure you have the setting on.")
             return
         }
         ChatUtils.chat(display)
@@ -101,7 +101,8 @@ object TpsCounter {
         config.tpsDisplayPosition.renderString(display, posLabel = "Tps Display")
     }
 
-    private fun isEnabled() = LorenzUtils.onHypixel && config.tpsDisplay &&
+    private fun isEnabled() = LorenzUtils.onHypixel &&
+        config.tpsDisplay &&
         (LorenzUtils.inSkyBlock || OutsideSbFeature.TPS_DISPLAY.isSelected())
 
     @SubscribeEvent

From b755ffe1a288282f9b29bf7b6c048d5e94c48e37 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:24:08 +0200
Subject: [PATCH 643/721] Fixed trophy fish title (#2670)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/fishing/trophy/TrophyFishMessages.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
index 66ddde50b939..4a23e84e5d52 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
@@ -96,7 +96,7 @@ object TrophyFishMessages {
     }
 
     private fun sendTitle(displayName: String, displayRarity: String?, amount: Int) {
-        val text = "$displayName\n$displayRarity $amount!"
+        val text = "$displayName $displayRarity §8$amount§c!"
         LorenzUtils.sendTitle(text, 3.seconds, 2.8, 7f)
     }
 

From 1c9fd3f55529461e32a341a71318b9b4664ef816 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:27:30 +0200
Subject: [PATCH 644/721] Improvement: Mining Event Error Format (#2671)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/eventtracker/MiningEventTracker.kt | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
index a076ba68f0c3..d5ee14ec92e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
@@ -200,7 +200,8 @@ object MiningEventTracker {
                 canRequestAt = SimpleTimeMark.now() + 20.minutes
                 if (LorenzUtils.debug) {
                     ErrorManager.logErrorWithData(
-                        e, "Receiving mining event data was unsuccessful",
+                        e,
+                        "Failed to load Mining Event data!",
                     )
                 }
                 return@launch
@@ -208,11 +209,17 @@ object MiningEventTracker {
             val miningEventData = ConfigManager.gson.fromJson(data, MiningEventDataReceive::class.java)
 
             if (!miningEventData.success) {
-                ErrorManager.logErrorWithData(
-                    Exception("PostFailure"), "Receiving mining event data was unsuccessful",
-                    "cause" to miningEventData.cause,
-                    "recievedData" to data
-                )
+                if (data.toString() == "{}") {
+                    ChatUtils.chat("§cFailed loading Mining Event data!\n" +
+                        "Please wait until the server problem fixes itself! There is nothing else to do at the moment.")
+                } else {
+                    ErrorManager.logErrorWithData(
+                        Exception("miningEventData.success = false"),
+                        "Failed to load Mining Event data!",
+                        "cause" to miningEventData.cause,
+                        "recievedData" to data
+                    )
+                }
                 return@launch
             }
             apiErrorCount = 0

From 4b6789f6eb4bb40720bc0e445d701935d0cafdcb Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 5 Oct 2024 17:18:59 +0200
Subject: [PATCH 645/721] Backend: /shdebug + bz fetch (#2675)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../data/bazaar/HypixelBazaarFetcher.kt       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
index 13044b7c3151..c1a7af2890b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarData
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -29,10 +30,29 @@ object HypixelBazaarFetcher {
     private const val HIDDEN_FAILED_ATTEMPTS = 3
 
     var latestProductInformation = mapOf<NEUInternalName, BazaarData>()
+    private var lastSuccessfulFetch = SimpleTimeMark.farPast()
     private var nextFetchTime = SimpleTimeMark.farPast()
     private var failedAttempts = 0
     private var nextFetchIsManual = false
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Bazaar Fetching")
+
+        val data = listOf(
+            "failedAttempts: $failedAttempts",
+            "nextFetchIsManual: $nextFetchIsManual",
+            "nextFetchTime: ${nextFetchTime.timeUntil()}",
+            "lastSuccessfulFetch: ${lastSuccessfulFetch.passedSince()}",
+        )
+
+        if (failedAttempts == 0) {
+            event.addIrrelevant(data)
+        } else {
+            event.addData(data)
+        }
+    }
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         if (!canFetch()) return
@@ -51,6 +71,7 @@ object HypixelBazaarFetcher {
             if (response.success) {
                 latestProductInformation = process(response.products)
                 failedAttempts = 0
+                lastSuccessfulFetch = SimpleTimeMark.now()
             } else {
                 val rawResponse = jsonResponse.toString()
                 onError(fetchType, Exception("success=false, cause=${response.cause}"), rawResponse)

From 79f8298760e1d9fb982106296f39352bdddc03ad Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Sat, 5 Oct 2024 17:30:42 +0200
Subject: [PATCH 646/721] Improvement: Add Search Tag to the Account Upgrade
 Reminder (#2676)

---
 .../at/hannibal2/skyhanni/config/features/misc/MiscConfig.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index df1ae1da5c04..0869262959c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -15,6 +15,7 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.annotations.SearchTag;
 import io.github.notenoughupdates.moulconfig.observer.Property;
 
 import java.util.ArrayList;
@@ -226,6 +227,7 @@ public class MiscConfig {
     @Expose
     @ConfigOption(name = "Account Upgrade Reminder", desc = "Remind you to claim community shop account and profile upgrades when complete.")
     @ConfigEditorBoolean
+    @SearchTag("Elizabeth Community Center")
     @FeatureToggle
     public boolean accountUpgradeReminder = true;
 

From 86c3700cfd11ba53da18bff1987c69d19de17b81 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 5 Oct 2024 17:45:37 +0200
Subject: [PATCH 647/721] Version 0.27 Beta 15

---
 docs/CHANGELOG.md | 19 +++++++++++++++++++
 root.gradle.kts   |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index ce469091517f..050f6c9bd7af 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -183,6 +183,7 @@
 + Added support for using the Pickobulus ability for the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2540)
 + Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
 + Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - luna (https://github.com/hannibal002/SkyHanni/pull/2633)
++ Improved the wording of the Mining Event data error chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2671)
 
 #### Diana Improvements
 
@@ -234,6 +235,7 @@
 + Added the required chocolate amount to the tooltip of milestone rabbits in Hoppity's Collection. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2523)
 + Improved the responsiveness of Hoppity Chat Compacting. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 + Added the ability to see how many duplicates you have previously found in Hoppity messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2556)
++ Improved the formatting of the Hoppity Event Stats card. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2638)
 
 #### Combat Improvements
 
@@ -256,12 +258,14 @@
 + Made the waypoint to the middle of the plot for Pest Waypoint optional (off by default). - Luna (https://github.com/hannibal002/SkyHanni/pull/2469)
 + Reduced one click for supercrafting visitor materials by using `/viewrecipe` instead of `/recipe` when using the Shopping List button. - Miestiek (https://github.com/hannibal002/SkyHanni/pull/2505)
 + Added ignored crops for the Farming Lane feature. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2622)
++ Made the Visitor Timer GUI clickable to teleport to the Barn. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2658)
 
 #### Rift Improvements
 
 + Updated the description of the config for Enigma Soul Waypoints to help find the Rift Guide in the game. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2433)
 + Added Path Finder to Enigma Soul waypoints in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2515)
 + Added the option to choose the color of the Living Metal Helper highlight. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2616)
++ Added an option to hide players while in Gunther's Rift Race. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2655)
 
 #### Dungeon Improvements
 
@@ -287,6 +291,7 @@
 + Added a warning in chat when the computer's time is inaccurate, along with a tutorial on how to fix it. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
 + Improved the way pathfinding lines are rendered. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
 + Automatically starts pathfinding after clicking on SkyHanni reminder chat messages about Carnival Reminder, Hoppity NPC, City Project, and account/profile upgrades. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
++ Greatly improved performance by optimizing SkyHanni Chroma support for Patcher Font Renderer. - nopo (https://github.com/hannibal002/SkyHanni/pull/2666)
 
 ### Fixes
 
@@ -329,6 +334,7 @@
     + Fixed pair detection.
     + Fixed enchanting XP detection.
 + Fixed Minister in Calendar Perk description sometimes not using the gray color. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2632)
++ Fixed highlighting items in one's own inventory for some Bazaar features, e.g., in the "click to re-order" feature. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2640)
 
 #### Mining Fixes
 
@@ -355,6 +361,8 @@
 + Fixed the Mineshaft Pity Counter not working in the Great Glacite Lake. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2565)
 + Fixed Powder Tracker inaccuracies. - Empa (https://github.com/hannibal002/SkyHanni/pull/2591)
 + Fixed Jasper gemstones not being addressed in the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2618)
++ Fixed the King Talisman Tracker sometimes not displaying the correct data. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2663)
++ Fixed the Powder Tracker not tracking items correctly. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2645)
 
 #### Scoreboard Fixes
 
@@ -394,6 +402,7 @@
 
 + Fixed an error with Patcher Coordinate Detection from chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2410)
 + Fixed ultimate enchants not showing in `/show`. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2465)
++ Fixed being unable to shift-click on chat messages. - nopo (https://github.com/hannibal002/SkyHanni/pull/2650)
 
 ####  Commands Fixes
 
@@ -409,6 +418,7 @@
 
 + Fixed the reputation helper not updating after a sack update. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2439)
 + Fixed Heavy Pearls sometimes not being highlighted. - Luna (https://github.com/hannibal002/SkyHanni/pull/2479)
++ Added a delay to the Pablo helper message so it appears after he finishes his dialogue. - Luna (https://github.com/hannibal002/SkyHanni/pull/2662)
 
 #### Garden Fixes
 
@@ -422,6 +432,9 @@
 + Fixed a case where the Broodmother countdown could be wildly inaccurate. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2513)
 + Fixed Flare Display spamming chat with negative values when the server is lagging. - Stella (https://github.com/hannibal002/SkyHanni/pull/2567)
 + Fixed a case where the Imminent stage did not update the Broodmother countdown. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2602)v
++ Fixed some Islands Dummy mob types not being detected by the Damage Indicator. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2646)
++ Fixed the Ender Node Tracker not detecting some items. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2644)
++ Fixed Flare Expiration warnings not appearing in chat or as a title. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2643)
 
 #### The Carnival Fixes
 
@@ -431,6 +444,7 @@
 #### Fishing Fixes
 
 + Fixed error messages while using the Chum Bucket Hider feature. - nea89 (https://github.com/hannibal002/SkyHanni/pull/2587)
++ Fixed the Trophy Fish Title displaying an undefined character in the format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2670)
 
 #### Rift Fixes
 
@@ -459,6 +473,7 @@
 + Fixed Area Navigation distances to player being incorrect. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
 + Fixed item trackers displaying removed item names incorrectly. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2620)
 + Fixed some messages from Pablo NPC not being detected. - Luna (https://github.com/hannibal002/SkyHanni/pull/2636)
++ Fixed SkyHanni re-downloading the repository on every launch. - nopo (https://github.com/hannibal002/SkyHanni/pull/2669)
 
 ### Technical Details
 
@@ -530,6 +545,9 @@
 + Added `detekt` runner to the build process. - Daveed & nea (https://github.com/hannibal002/SkyHanni/pull/2547)
 + Added Clock Offset Millis using an NTP server. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2623)
 + Added `EntityMovementData.onNextTeleport()` logic, which triggers a runnable after the world has changed or the player has teleported. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
++ Added Bazaar Fetch information to `/shdebug`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2675)
++ Removed the password from the download source check. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2649)
++ Added a missing SkyBlock check for debug commands `/shtrackparticles` and `/shtracksounds`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2641)
 
 ### Removed Features
 
@@ -539,6 +557,7 @@
     + Replaced then with a draggable list of different Hoppity collection highlight options.
 + Removed "Forge GfS". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2564)
     + Hypixel now pulls directly from sacks when using the forge.
++ Removed Mithril Powder from the Powder Tracker. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2656)
 
 ## Version 0.26
 
diff --git a/root.gradle.kts b/root.gradle.kts
index 9346a78f9f92..58285a7012c2 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.14"
+    version = "0.27.Beta.15"
     repositories {
         mavenCentral()
         mavenLocal()

From df1bff9338410828ec566f28483dee0938463165 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 6 Oct 2024 10:54:42 +0200
Subject: [PATCH 648/721] Improvement: Working on scoreboard errors again
 (#2672)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/combat/SpidersDenAPI.kt |  5 +-
 .../gui/customscoreboard/CustomScoreboard.kt  | 18 ++---
 .../customscoreboard/CustomScoreboardUtils.kt | 11 +--
 .../customscoreboard/ScoreboardElements.kt    | 69 +++++++------------
 .../gui/customscoreboard/ScoreboardEvent.kt   |  3 +-
 .../customscoreboard/UnknownLinesHandler.kt   | 60 +++++++++++++---
 6 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt
index 7986c55e9d3a..af1dd8430186 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/SpidersDenAPI.kt
@@ -1,12 +1,11 @@
 package at.hannibal2.skyhanni.features.combat
 
-import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 
 @SkyHanniModule
 object SpidersDenAPI {
-    private fun getSbLines(): List<String> = CustomScoreboard.activeLines
-    fun isAtTopOfNest(): Boolean = getSbLines().any { ScoreboardPattern.broodmotherPattern.matches(it) }
+    fun isAtTopOfNest(): Boolean = ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.broodmotherPattern.matches(it) }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index c9fb4b15f821..8a1d7b50de45 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -50,11 +50,6 @@ object CustomScoreboard {
     private var cache = emptyList<ScoreboardElementType>()
     private const val GUI_NAME = "Custom Scoreboard"
 
-    // Cached scoreboard data, only update after no change for 300ms
-    var activeLines = emptyList<String>()
-
-    // Most recent scoreboard state, not in use until cached
-    private var mostRecentLines = emptyList<String>()
     private var lastScoreboardUpdate = SimpleTimeMark.farFuture()
 
     @SubscribeEvent
@@ -115,14 +110,13 @@ object CustomScoreboard {
 
         // We want to update the scoreboard as soon as we have new data, not 5 ticks delayed
         var dirty = false
-        if (lastScoreboardUpdate.passedSince() > 300.milliseconds) {
-            activeLines = mostRecentLines
+        if (lastScoreboardUpdate.passedSince() > 250.milliseconds) {
             lastScoreboardUpdate = SimpleTimeMark.farFuture()
             dirty = true
         }
 
         // Creating the lines
-        if (event.isMod(5) || dirty) {
+        if (dirty) {
             display = createLines().removeEmptyLinesFromEdges()
             if (TabListData.fullyLoaded) {
                 cache = display.toList()
@@ -135,7 +129,6 @@ object CustomScoreboard {
 
     @SubscribeEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
-        mostRecentLines = event.scoreboard
         lastScoreboardUpdate = SimpleTimeMark.now()
     }
 
@@ -160,12 +153,12 @@ object CustomScoreboard {
 
     private fun addAllNonSkyBlockLines() = buildList {
         addAll(ScoreboardElement.TITLE.getVisiblePair())
-        addAll(activeLines.map { it to HorizontalAlignment.LEFT })
+        addAll(ScoreboardData.sidebarLinesFormatted.map { it to HorizontalAlignment.LEFT })
     }
 
     private fun addDefaultSkyBlockLines() = buildList {
         add(ScoreboardData.objectiveTitle to displayConfig.titleAndFooter.alignTitleAndFooter)
-        addAll(activeLines.map { it to HorizontalAlignment.LEFT })
+        addAll(ScoreboardData.sidebarLinesFormatted.map { it to HorizontalAlignment.LEFT })
     }
 
     private fun addCustomSkyBlockLines() = buildList<ScoreboardElementType> {
@@ -175,7 +168,8 @@ object CustomScoreboard {
 
             if (
                 informationFilteringConfig.hideConsecutiveEmptyLines &&
-                lines.first().first == "<empty>" && lastOrNull()?.first?.isEmpty() == true
+                lines.first().first == "<empty>" &&
+                lastOrNull()?.first?.isEmpty() == true
             ) {
                 continue
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
index 4cfc403c421f..99fdc4f3fcf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboardUtils.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 import at.hannibal2.skyhanni.config.features.gui.customscoreboard.DisplayConfig
 import at.hannibal2.skyhanni.data.BitsAPI
 import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.bingo.BingoAPI
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.displayConfig
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -27,7 +28,7 @@ object CustomScoreboardUtils {
     fun getProfileTypeSymbol() = when {
         HypixelData.ironman -> "§7♲ "
         HypixelData.stranded -> "§a☀ "
-        HypixelData.bingo -> CustomScoreboard.activeLines.firstNotNullOfOrNull {
+        HypixelData.bingo -> ScoreboardData.sidebarLinesFormatted.firstNotNullOfOrNull {
             BingoAPI.getIconFromScoreboard(it)?.plus(" ")
         } ?: "§e❤ "
 
@@ -43,7 +44,7 @@ object CustomScoreboardUtils {
 
     internal fun String.formatNum() = this.formatDouble().formatNum()
 
-    internal fun getMotes() = getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.motesPattern, "motes")
+    internal fun getMotes() = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.motesPattern, "motes")
     internal fun getBank() = getGroupFromPattern(TabListData.getTabList(), ScoreboardPattern.bankPattern, "bank")
 
     internal fun getBits() = BitsAPI.bits.coerceAtLeast(0).formatNum()
@@ -57,15 +58,15 @@ object CustomScoreboardUtils {
     }
 
     internal fun getCopper() =
-        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.copperPattern, "copper")
+        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.copperPattern, "copper")
 
     internal fun getGems() = getGroupFromPattern(TabListData.getTabList(), ScoreboardPattern.gemsPattern, "gems")
 
     internal fun getHeat() =
-        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.heatPattern, "heat")
+        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.heatPattern, "heat")
 
     internal fun getNorthStars() =
-        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.northstarsPattern, "northstars")
+        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.northstarsPattern, "northstars")
 
 
     class UndetectedScoreboardLines(message: String) : Exception(message)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 0289a3c81862..769184077b09 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -39,8 +39,6 @@ import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils.getHeat
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils.getMotes
 import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboardUtils.getNorthStars
-import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAdvancedMiningIsland
@@ -50,41 +48,25 @@ import at.hannibal2.skyhanni.utils.NumberUtil.percentageColor
 import at.hannibal2.skyhanni.utils.RegexUtils.anyMatches
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SkyBlockTime
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.StringUtils.pluralize
 import at.hannibal2.skyhanni.utils.TabListData
-import at.hannibal2.skyhanni.utils.TimeLimitedSet
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.TimeUtils.formatted
 import kotlin.time.Duration.Companion.seconds
 
-internal var confirmedUnknownLines = listOf<String>()
-internal var unconfirmedUnknownLines = listOf<String>()
-internal var unknownLinesSet = TimeLimitedSet<String>(1.seconds) { onRemoval(it) }
-
-private fun onRemoval(line: String) {
-    if (!LorenzUtils.inSkyBlock) return
-    if (!unconfirmedUnknownLines.contains(line)) return
-    if (line !in unconfirmedUnknownLines) return
-    unconfirmedUnknownLines = unconfirmedUnknownLines.filterNot { it == line }
-    confirmedUnknownLines = confirmedUnknownLines.editCopy { add(line) }
-    if (!config.unknownLinesWarning) return
-    val pluralize = pluralize(confirmedUnknownLines.size, "unknown line", withNumber = true)
-    val message = "CustomScoreboard detected $pluralize"
-    ErrorManager.logErrorWithData(
-        CustomScoreboardUtils.UndetectedScoreboardLines(message),
-        message,
-        "Unknown Lines" to confirmedUnknownLines,
-        "Island" to LorenzUtils.skyBlockIsland,
-        "Area" to HypixelData.skyBlockArea,
-        "Full Scoreboard" to CustomScoreboard.activeLines,
-        noStackTrace = true,
-        betaOnly = true,
-    )
-}
+internal var allUnknownLines = listOf<UnknownLine>()
+internal var lastRecentAlarmWarning = SimpleTimeMark.farPast()
+
+internal fun recentUnknownLines() = allUnknownLines.filter { it.lastFound.passedSince() < 3.seconds }
 
-internal var amountOfUnknownLines = 0
+internal class UnknownLine(val line: String) {
+    val firstFound = SimpleTimeMark.now()
+    var lastFound = SimpleTimeMark.now()
+    var lastWarned = SimpleTimeMark.farPast()
+}
 
 enum class ScoreboardElement(
     private val displayPair: () -> List<ScoreboardElementType>,
@@ -389,7 +371,7 @@ private fun getPurseDisplayPair(): List<ScoreboardElementType> {
     var purse = PurseAPI.currentPurse.formatNum()
 
     if (!displayConfig.hideCoinsDifference) {
-        val earned = getGroupFromPattern(CustomScoreboard.activeLines, PurseAPI.coinsPattern, "earned")
+        val earned = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, PurseAPI.coinsPattern, "earned")
         if (earned != null) purse += " §7(§e+$earned§7)§6"
     }
 
@@ -492,7 +474,7 @@ private fun getHeatDisplayPair(): List<ScoreboardElementType> {
 }
 
 private fun getHeatShowWhen() = inAnyIsland(IslandType.CRYSTAL_HOLLOWS) &&
-    CustomScoreboard.activeLines.any { ScoreboardPattern.heatPattern.matches(it) }
+    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.heatPattern.matches(it) }
 
 private fun getColdDisplayPair(): List<ScoreboardElementType> {
     val cold = -MiningAPI.cold
@@ -507,7 +489,7 @@ private fun getColdDisplayPair(): List<ScoreboardElementType> {
 }
 
 private fun getColdShowWhen() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT) &&
-    CustomScoreboard.activeLines.any { ScoreboardPattern.coldPattern.matches(it) }
+    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.coldPattern.matches(it) }
 
 private fun getNorthStarsDisplayPair(): List<ScoreboardElementType> {
     val northStars = getNorthStars()?.formatNum() ?: "0"
@@ -550,7 +532,7 @@ private fun getIslandDisplayPair() =
 private fun getLocationDisplayPair() = buildList {
     HypixelData.skyBlockAreaWithSymbol?.let { add(it to HorizontalAlignment.LEFT) }
 
-    CustomScoreboard.activeLines.firstOrNull { ScoreboardPattern.plotPattern.matches(it) }
+    ScoreboardData.sidebarLinesFormatted.firstOrNull { ScoreboardPattern.plotPattern.matches(it) }
         ?.let { add(it to HorizontalAlignment.LEFT) }
 }
 
@@ -568,12 +550,12 @@ fun getPlayerAmountDisplayPair() = buildList {
 
 private fun getVisitDisplayPair() =
     listOf(
-        CustomScoreboard.activeLines.first { ScoreboardPattern.visitingPattern.matches(it) } to
+        ScoreboardData.sidebarLinesFormatted.first { ScoreboardPattern.visitingPattern.matches(it) } to
             HorizontalAlignment.LEFT,
     )
 
 private fun getVisitShowWhen() =
-    CustomScoreboard.activeLines.any { ScoreboardPattern.visitingPattern.matches(it) }
+    ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.visitingPattern.matches(it) }
 
 private fun getDateDisplayPair() =
     listOf(
@@ -582,7 +564,7 @@ private fun getDateDisplayPair() =
 
 private fun getTimeDisplayPair(): List<ScoreboardElementType> {
     val symbol =
-        getGroupFromPattern(CustomScoreboard.activeLines, ScoreboardPattern.timePattern, "symbol") ?: ""
+        getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.timePattern, "symbol") ?: ""
     return listOf(
         "§7" + SkyBlockTime.now()
             .formatted(
@@ -671,7 +653,7 @@ private fun getCookieShowWhen(): Boolean {
 }
 
 private fun getObjectiveDisplayPair() = buildList {
-    val formattedLines = CustomScoreboard.activeLines
+    val formattedLines = ScoreboardData.sidebarLinesFormatted
     val objective = formattedLines.firstOrNull { ScoreboardPattern.objectivePattern.matches(it) }
     if (objective != null) {
         add(objective to HorizontalAlignment.LEFT)
@@ -690,7 +672,7 @@ private fun getObjectiveDisplayPair() = buildList {
 }
 
 private fun getObjectiveShowWhen(): Boolean =
-    ScoreboardPattern.objectivePattern.anyMatches(CustomScoreboard.activeLines)
+    ScoreboardPattern.objectivePattern.anyMatches(ScoreboardData.sidebarLinesFormatted)
 
 private fun getSlayerDisplayPair(): List<ScoreboardElementType> = buildList {
     add((if (SlayerAPI.hasActiveSlayerQuest()) "Slayer Quest" else "<hidden>") to HorizontalAlignment.LEFT)
@@ -860,15 +842,10 @@ private fun getFooterDisplayPair(): List<ScoreboardElementType> = listOf(
 ).flatten()
 
 private fun getExtraDisplayPair(): List<ScoreboardElementType> {
-    if (unconfirmedUnknownLines.isEmpty()) return listOf("<hidden>" to HorizontalAlignment.LEFT)
-    amountOfUnknownLines = unconfirmedUnknownLines.size
+    val lines = recentUnknownLines()
+    if (lines.isEmpty()) return listOf("<hidden>" to HorizontalAlignment.LEFT)
 
-    return listOf("§cUndetected Lines:" to HorizontalAlignment.LEFT) + unconfirmedUnknownLines.map { it to HorizontalAlignment.LEFT }
+    return listOf("§cUndetected Lines:" to HorizontalAlignment.LEFT) + lines.map { it.line to HorizontalAlignment.LEFT }
 }
 
-private fun getExtraShowWhen(): Boolean {
-    if (unconfirmedUnknownLines.isEmpty()) {
-        amountOfUnknownLines = 0
-    }
-    return unconfirmedUnknownLines.isNotEmpty()
-}
+private fun getExtraShowWhen(): Boolean = recentUnknownLines().isNotEmpty()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 6531d5158d75..3d8251dfbb63 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
@@ -29,7 +30,7 @@ import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern as
  * because they are visible for a maximum of like 1 minute every 5 days and ~12 hours.
  */
 
-private fun getSbLines(): List<String> = CustomScoreboard.activeLines
+private fun getSbLines(): List<String> = ScoreboardData.sidebarLinesFormatted
 
 enum class ScoreboardEvent(
     private val displayLine: () -> List<String>,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
index 38612f29703b..0dff1f4933dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
@@ -1,15 +1,22 @@
 package at.hannibal2.skyhanni.features.gui.customscoreboard
 
 import at.hannibal2.skyhanni.data.BitsAPI
+import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.PurseAPI
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.features.misc.ServerRestartTitle
 import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigies
+import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.removeResets
 import java.util.regex.Pattern
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern as SbPattern
 
 object UnknownLinesHandler {
@@ -133,7 +140,7 @@ object UnknownLinesHandler {
     private var remoteOnlyPatternsAdded = false
 
     fun handleUnknownLines() {
-        val sidebarLines = CustomScoreboard.activeLines
+        val sidebarLines = ScoreboardData.sidebarLinesFormatted
 
         var unknownLines = sidebarLines.map { it.removeResets() }.filter { it.isNotBlank() }.filter { it.trim().length > 3 }
 
@@ -205,19 +212,50 @@ object UnknownLinesHandler {
         /*
          * Handle broken scoreboard lines
          */
-        confirmedUnknownLines = confirmedUnknownLines.filter { it in unknownLines }
+        if (unknownLines.isEmpty()) return
 
-        unknownLines = unknownLines.filter { it !in confirmedUnknownLines }
-
-        unconfirmedUnknownLines = unknownLines
-
-        unknownLines = unknownLines.filter { it !in unknownLinesSet }
+        for (line in unknownLines) {
+            val unknownLine = allUnknownLines.firstOrNull { it.line == line }
+            if (unknownLine == null) {
+                if (LorenzUtils.inSkyBlock) {
+                    ChatUtils.debug("Unknown Scoreboard line: '$line'")
+                }
+                allUnknownLines = allUnknownLines.editCopy {
+                    add(UnknownLine(line))
+                }
+            } else {
+                unknownLine.lastFound = SimpleTimeMark.now()
+                val firstFoundSince = unknownLine.firstFound.passedSince()
+                val lastWarnedSince = unknownLine.lastWarned.passedSince()
+                if (firstFoundSince > 3.seconds && lastWarnedSince > 30.minutes) {
+                    unknownLine.lastWarned = SimpleTimeMark.now()
+                    warn(line, "same line active for 3 seconds")
+                    continue
+                }
+            }
+        }
 
-        unknownLines.forEach {
-            if (LorenzUtils.inSkyBlock) {
-                ChatUtils.debug("Unknown Scoreboard line: '$it'")
+        if (lastRecentAlarmWarning.passedSince() > 30.minutes) {
+            val recentAlarms = allUnknownLines.filter { it.firstFound.passedSince() < 6.seconds }
+            if (recentAlarms.size >= 5) {
+                warn(recentAlarms.first().line, "5 different lines in 5 seconds")
             }
-            unknownLinesSet.add(it)
         }
     }
+
+    private fun warn(line: String, reason: String) {
+        ErrorManager.logErrorWithData(
+            // line inclucded in chat message to not cache a previous message
+            CustomScoreboardUtils.UndetectedScoreboardLines(line),
+            "CustomScoreboard detected a unknown line: '$line'",
+            "Unknown Line" to line,
+            "reason" to reason,
+            "Island" to LorenzUtils.skyBlockIsland,
+            "Area" to HypixelData.skyBlockArea,
+            "Full Scoreboard" to ScoreboardData.sidebarLinesFormatted,
+            noStackTrace = true,
+            betaOnly = true,
+        )
+
+    }
 }

From a07ad3ee5b80d214fa62583817309f1ddc1c2c64 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 6 Oct 2024 10:58:03 +0200
Subject: [PATCH 649/721] Fix: Powder Tracker IndexOutOfBoundsException (#2678)

---
 .../mining/powdertracker/PowderChestReward.kt |  2 ++
 .../mining/powdertracker/PowderTracker.kt     | 32 +++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index 1a48a661a926..ac824abd38f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -115,6 +115,8 @@ enum class PowderChestReward(val displayName: String, pattern: String) {
         "§9FTX 3070",
         " {4}§r§9FTX 3070(?: §r§8x(?<amount>.*))?",
     ),
+
+    // TODO: Fix typo
     ELECTRON_TRANSIMTTER(
         "§9Electron Transmitter",
         " {4}§r§9Electron Transmitter(?: §r§8x(?<amount>.*))?",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 38779224cf90..4c27f195a895 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -140,8 +140,7 @@ object PowderTracker {
         }
     }
 
-    private val tracker =
-        SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker }) { formatDisplay(drawDisplay(it)) }
+    private val tracker = SkyHanniTracker("Powder Tracker", { Data() }, { it.powderTracker }) { formatDisplay(drawDisplay(it)) }
 
     class Data : TrackerData() {
 
@@ -316,13 +315,11 @@ object PowderTracker {
         addSearchString("§d${data.totalChestPicked.addSeparators()} Total Chests Picked §7($chestPerHour/h)")
         addSearchString("§bDouble Powder: ${if (doublePowder) "§aActive! §7($powderTimer)" else "§cInactive!"}")
 
-        val entries = PowderChestReward.entries
         val rewards = data.rewards
-        addPerHour(rewards, entries[0], mithrilInfo)
-        addPerHour(rewards, entries[1], gemstoneInfo)
+        addPerHour(rewards, PowderChestReward.GEMSTONE_POWDER, gemstoneInfo)
         addSearchString("")
-        addPerHour(rewards, entries[46], diamondEssenceInfo)
-        addPerHour(rewards, entries[47], goldEssenceInfo)
+        addPerHour(rewards, PowderChestReward.DIAMOND_ESSENCE, diamondEssenceInfo)
+        addPerHour(rewards, PowderChestReward.GOLD_ESSENCE, goldEssenceInfo)
         addSearchString("")
         val hardStonePerHour = format(hardStoneInfo.perHour)
         addSearchString("§b${data.totalHardStoneCompacted.addSeparators()} §fHard Stone §bCompacted §7($hardStonePerHour/h)", "Hard Stone")
@@ -347,7 +344,14 @@ object PowderTracker {
         }
 
         var totalParts = 0L
-        for (reward in entries.subList(26, 32)) { // robots part
+        for (reward in listOf(
+            PowderChestReward.FTX_3070,
+            PowderChestReward.ELECTRON_TRANSIMTTER,
+            PowderChestReward.ROBOTRON_REFLECTOR,
+            PowderChestReward.SUPERLITE_MOTOR,
+            PowderChestReward.CONTROL_SWITCH,
+            PowderChestReward.SYNTHETIC_HEART,
+        )) {
             val count = rewards.getOrDefault(reward, 0)
             totalParts += count
             val name = reward.displayName
@@ -362,7 +366,17 @@ object PowderTracker {
         val blueEgg = rewards.getOrDefault(PowderChestReward.BLUE_GOBLIN_EGG, 0)
         addSearchString("§3$blueEgg§7-§c$redEgg§7-§e$yellowEgg§f-§a$greenEgg§f-§9$goblinEgg §fGoblin Egg")
 
-        for (reward in entries.subList(37, 46)) {
+        for (reward in listOf(
+            PowderChestReward.WISHING_COMPASS,
+            PowderChestReward.SLUDGE_JUICE,
+            PowderChestReward.ASCENSION_ROPE,
+            PowderChestReward.TREASURITE,
+            PowderChestReward.JUNGLE_HEART,
+            PowderChestReward.PICKONIMBUS_2000,
+            PowderChestReward.YOGGIE,
+            PowderChestReward.PREHISTORIC_EGG,
+            PowderChestReward.OIL_BARREL,
+        )) {
             val count = rewards.getOrDefault(reward, 0).addSeparators()
             val name = reward.displayName
             addSearchString("§b$count $name", name)

From 9dd04711a4e3ca577ad3b41891aaa5eb7c403197 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 6 Oct 2024 13:28:54 +0200
Subject: [PATCH 650/721] Fix: Account upgrade warning (#2674)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/fame/UpgradeReminder.kt | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
index d22151c1b014..b55aa8f11e7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/UpgradeReminder.kt
@@ -96,6 +96,36 @@ object UpgradeReminder {
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!LorenzUtils.inSkyBlock) return
         inInventory = event.inventoryName == "Community Shop"
+        if (!inInventory) return
+
+        if (currentProfileUpgrade == null && currentAccountUpgrade == null) return
+        detectWrongAccountUpgradeData(event.inventoryItems)
+    }
+
+    private fun detectWrongAccountUpgradeData(items: Map<Int, ItemStack>) {
+        val hasProfileUpgrade = foundActiveUpgrade(items, 27..35)
+        if (!hasProfileUpgrade && currentProfileUpgrade != null) {
+            ChatUtils.chat("§eRemoved invalid Profile Upgrade information.")
+            currentProfileUpgrade = null
+        }
+
+        val hasAccountUpgrade = foundActiveUpgrade(items, 36..44)
+        if (!hasAccountUpgrade && currentAccountUpgrade != null) {
+            ChatUtils.chat("§eRemoved invalid Account Upgrade information.")
+            currentAccountUpgrade = null
+        }
+    }
+
+    private fun foundActiveUpgrade(items: Map<Int, ItemStack>, slots: IntRange): Boolean {
+        for (slot in slots) {
+            val item = items[slot] ?: continue
+            val isUpgrading = item.getLore().any { it == "§aCurrently upgrading!" }
+            val isDone = item.getLore().any { it == "§cClick to claim!" }
+            val isReadyForUpgrade = item.getLore().any { it == "§eClick to start upgrade!" }
+            if (isUpgrading || isDone) return true
+            if (isReadyForUpgrade) return false
+        }
+        return false
     }
 
     @SubscribeEvent

From 1e786d98c20a022e2c11c11a2cd55cc4efd6a499 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Sun, 6 Oct 2024 13:33:27 +0200
Subject: [PATCH 651/721] Improvement: Add Mining Effects to Non God Pot Effect
 Display (#2677)

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

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 61f9a344923f..83f45e535d5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -76,6 +76,10 @@ object NonGodPotEffectDisplay {
         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(

From cbaae605593df9ce1edf1675f0ef6d4e560fc6ff Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:30:33 +0200
Subject: [PATCH 652/721] Improvement: Better bz errors (#2681)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../data/bazaar/HypixelBazaarFetcher.kt       | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
index c1a7af2890b4..7a97fca1d19d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt
@@ -37,7 +37,7 @@ object HypixelBazaarFetcher {
 
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
-        event.title("Bazaar Fetching")
+        event.title("Bazaar Data Fetcher from API")
 
         val data = listOf(
             "failedAttempts: $failedAttempts",
@@ -119,13 +119,20 @@ object HypixelBazaarFetcher {
             e.printStackTrace()
         } else {
             nextFetchTime = SimpleTimeMark.now() + 15.minutes
-            ErrorManager.logErrorWithData(
-                e,
-                userMessage,
-                "fetchType" to fetchType,
-                "failedAttempts" to failedAttempts,
-                "rawResponse" to rawResponse,
-            )
+            if (rawResponse == null || rawResponse.toString() == "{}") {
+                ChatUtils.chat(
+                    "§cFailed loading Bazaar Price data!\n" +
+                        "Please wait until the Hypixel API is sending correct data again! There is nothing else to do at the moment.",
+                )
+            } else {
+                ErrorManager.logErrorWithData(
+                    e,
+                    userMessage,
+                    "fetchType" to fetchType,
+                    "failedAttempts" to failedAttempts,
+                    "rawResponse" to rawResponse,
+                )
+            }
         }
     }
 

From 41d59a6888a8e1132e57dfab279efa8426853970 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:58:51 +0200
Subject: [PATCH 653/721] Improvement: Fewer Server id errors (#2680)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/HypixelData.kt | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 039bd7d28afd..f34dafb3b95c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigManager.Companion.gson
 import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.HypixelJoinEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -119,6 +120,9 @@ object HypixelData {
     var skyBlock = false
     var skyBlockIsland = IslandType.UNKNOWN
     var serverId: String? = null
+    private var lastSuccessfulServerIdFetchTime = SimpleTimeMark.farPast()
+    private var lastSuccessfulServerIdFetchType: String? = null
+    private var failedServerIdFetchCounter = 0
 
     // Ironman, Stranded and Bingo
     var noTrade = false
@@ -159,24 +163,56 @@ object HypixelData {
 
         TabWidget.SERVER.matchMatcherFirstLine {
             serverId = group("serverid")
+            lastSuccessfulServerIdFetchTime = SimpleTimeMark.now()
+            lastSuccessfulServerIdFetchType = "tab list"
+            failedServerIdFetchCounter = 0
             return
         }
 
         ScoreboardData.sidebarLinesFormatted.matchFirst(serverIdScoreboardPattern) {
             val serverType = if (group("servertype") == "M") "mega" else "mini"
             serverId = "$serverType${group("serverid")}"
+            lastSuccessfulServerIdFetchTime = SimpleTimeMark.now()
+            lastSuccessfulServerIdFetchType = "scoreboard"
+            failedServerIdFetchCounter = 0
             return
         }
 
+        failedServerIdFetchCounter++
+        if (failedServerIdFetchCounter < 3) return
         ErrorManager.logErrorWithData(
             Exception("NoServerId"),
             "Could not find server id",
+            "failedServerIdFetchCounter" to failedServerIdFetchCounter,
+            "lastSuccessfulServerIdFetchTime" to lastSuccessfulServerIdFetchTime,
+            "lastSuccessfulServerIdFetchType" to lastSuccessfulServerIdFetchType,
             "islandType" to LorenzUtils.skyBlockIsland,
             "tablist" to TabListData.getTabList(),
             "scoreboard" to ScoreboardData.sidebarLinesFormatted,
         )
     }
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Server ID")
+        val id = serverId
+        if (id == null) {
+            event.addData {
+                add("server id is null!")
+                add("failedServerIdFetchCounter: $failedServerIdFetchCounter")
+                add("")
+                add("last successful fetch time: $lastSuccessfulServerIdFetchTime")
+                add("last successful fetch type: $lastSuccessfulServerIdFetchType")
+            }
+        } else {
+            event.addIrrelevant {
+                add("Server id: '$id'")
+                add("fetch time: $lastSuccessfulServerIdFetchTime")
+                add("fetch type: $lastSuccessfulServerIdFetchType")
+            }
+        }
+    }
+
     fun getPlayersOnCurrentServer(): Int {
         var amount = 0
         val playerPatternList = mutableListOf(

From 3326753f29824791df28a941e2f4fc239992c9f1 Mon Sep 17 00:00:00 2001
From: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:01:37 +0100
Subject: [PATCH 654/721] Fix: Wiki keybind searching for <null> (#2682)

---
 .../config/features/commands/BetterWikiCommandConfig.java      | 2 +-
 .../at/hannibal2/skyhanni/features/commands/WikiManager.kt     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
index fc6d0be06fc2..df0468226e77 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
@@ -53,7 +53,7 @@ public class BetterWikiCommandConfig {
     public boolean menuOpenWiki = false;
 
     @Expose
-    @ConfigOption(name = "Fandom Wiki Key", desc = "Search for an item on Wiki with this keybind.\n" +
+    @ConfigOption(name = "Wiki Key", desc = "Search for an item's wiki page with this keybind.\n" +
         "§cFor an optimal experience, do §lNOT §cbind this to a mouse button.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
     public int wikiKeybind = Keyboard.KEY_NONE;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
index e72ad09c5481..e6a1ef4e955e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
-import at.hannibal2.skyhanni.utils.ItemUtils.itemName
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUItems
@@ -70,7 +69,7 @@ object WikiManager {
 
     private fun wikiTheItem(item: ItemStack, autoOpen: Boolean, useFandom: Boolean = config.useFandom) {
         val itemDisplayName =
-            item.itemName.replace("§a✔ ", "").replace("§c✖ ", "")
+            item.displayName.replace("§a✔ ", "").replace("§c✖ ", "")
         val internalName = item.getInternalName().asString()
         val wikiUrlSearch = if (internalName != "NONE") internalName else itemDisplayName.removeColor()
 

From 4df35d062a41f0e8fed82caf2249c2e71f5b4058 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:02:48 +0200
Subject: [PATCH 655/721] Fix: Unknown Perkpocalypse Mayor Chat Spam (#2683)

---
 src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt       | 2 +-
 .../features/gui/customscoreboard/ScoreboardElements.kt    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index 469c48489245..a07960231bdf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -170,7 +170,7 @@ object MayorAPI {
             } ?: false
         } ?: return
 
-        val perk = stack.getLore().nextAfter({ perkpocalypsePerksPattern.matches(it) }) ?: return
+        val perk = stack.getLore().nextAfter({ perkpocalypsePerksPattern.matches(it) }, 2) ?: return
         // This is the first Perk of the Perkpocalypse Mayor
         val jerryMayor = getMayorFromPerk(getPerkFromName(perk.removeColor()) ?: return)?.addAllPerks() ?: return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 769184077b09..e1c5d3f845d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -784,6 +784,11 @@ private fun getMayorDisplayPair() = buildList {
     }
 
     if (!mayorConfig.showExtraMayor) return@buildList
+    addAll(addMinister())
+    addAll(addPerkpocalypseMayor())
+}
+
+private fun addMinister() = buildList {
     val ministerName = MayorAPI.currentMinister?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: return@buildList
     add(ministerName to HorizontalAlignment.LEFT)
 
@@ -792,7 +797,9 @@ private fun getMayorDisplayPair() = buildList {
             add(" §7- §e${perk.perkName}" to HorizontalAlignment.LEFT)
         }
     }
+}
 
+private fun addPerkpocalypseMayor() = buildList {
     val jerryExtraMayor = MayorAPI.jerryExtraMayor
     val extraMayor = jerryExtraMayor.first ?: return@buildList
 

From 023b44c71ea7739716ebd010cea2841e5336a69b Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Mon, 7 Oct 2024 07:43:06 +1100
Subject: [PATCH 656/721] Added the ability to disable chat errors via the repo
 (#2668)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../data/jsonobjects/repo/RepoErrorData.kt    | 10 +++
 .../skyhanni/test/command/ErrorManager.kt     | 64 +++++++++++++++++--
 2 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
new file mode 100644
index 000000000000..4866176516c3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
@@ -0,0 +1,10 @@
+package at.hannibal2.skyhanni.data.jsonobjects.repo
+
+import com.google.gson.annotations.Expose
+
+data class RepoErrorData(
+    @Expose var messageExact: List<String>?,
+    @Expose var messageStartsWith: List<String>?,
+    @Expose var replaceMessage: String?,
+    @Expose var affectedVersions: List<String> = listOf(),
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index 56a50ecebd06..e0fcf8fcbdc3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -1,6 +1,10 @@
 package at.hannibal2.skyhanni.test.command
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.jsonobjects.repo.RepoErrorData
+import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -8,9 +12,12 @@ import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeLimitedSet
+import at.hannibal2.skyhanni.utils.json.fromJson
 import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.minutes
 
+@SkyHanniModule
 object ErrorManager {
 
     // random id -> error message
@@ -158,12 +165,57 @@ object ErrorManager {
         if (finalMessage.last() !in ".?!") {
             finalMessage += "§c."
         }
-        ChatUtils.clickableChat(
-            "§c[SkyHanni-${SkyHanniMod.version}]: $finalMessage Click here to copy the error into the clipboard.",
-            onClick = { copyError(randomId) },
-            "§eClick to copy!",
-            prefix = false,
-        )
+
+        var hideError = false
+        for (repoError in repoErrors) {
+            for (s in repoError.messageStartsWith ?: listOf()) {
+                if (rawMessage.startsWith(s)) {
+                    hideError = true
+                }
+            }
+            for (s in repoError.messageExact ?: listOf()) {
+                if (rawMessage == s) {
+                    hideError = true
+                }
+            }
+            if (hideError) {
+                if (repoError.replaceMessage != null) {
+                    finalMessage = repoError.replaceMessage!!
+                    hideError = false
+                }
+                break
+            }
+        }
+
+        if (!hideError) {
+            ChatUtils.clickableChat(
+                "§c[SkyHanni-${SkyHanniMod.version}]: $finalMessage Click here to copy the error into the clipboard.",
+                onClick = { copyError(randomId) },
+                "§eClick to copy!",
+                prefix = false,
+            )
+        }
+
+    }
+
+    private var repoErrors: List<RepoErrorData> = listOf()
+
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        val chatErrors = event.repoLocation.resolve("chat_errors")
+        repoErrors = if (chatErrors.exists()) {
+            chatErrors.listFiles()
+                .filter {
+                    it != null && it.isFile && it.canRead()
+                }
+                .map {
+                    ConfigManager.gson.fromJson<RepoErrorData>(it.readText())
+                }.filter {
+                    SkyHanniMod.version in it.affectedVersions
+                }
+        } else {
+            listOf()
+        }
     }
 
     private fun buildExtraDataString(extraData: Array<out Pair<String, Any?>>): String {

From 497d652aa83ed81e04f9400ae84362642585dfca Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:48:31 +0200
Subject: [PATCH 657/721] code cleanup in the chat error repo logic

---
 .../data/jsonobjects/repo/RepoErrorData.kt    | 18 ++++--
 .../skyhanni/test/command/ErrorManager.kt     | 60 ++++++++-----------
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
index 4866176516c3..3ec529db3e3f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
@@ -1,10 +1,18 @@
 package at.hannibal2.skyhanni.data.jsonobjects.repo
 
 import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
 
-data class RepoErrorData(
-    @Expose var messageExact: List<String>?,
-    @Expose var messageStartsWith: List<String>?,
-    @Expose var replaceMessage: String?,
-    @Expose var affectedVersions: List<String> = listOf(),
+data class RepoErrorJson(
+    @Expose @SerializedName("changed_error_messages") val changedErrorMessages: List<RepoErrorData>,
 )
+
+data class RepoErrorData(
+    @Expose @SerializedName("message_exact") private var rawMessageExact: List<String>?,
+    @Expose @SerializedName("message_starts_with") private var rawMessageStartsWith: List<String>?,
+    @Expose @SerializedName("replace_message") var replaceMessage: String?,
+    @Expose @SerializedName("affected_versions") var affectedVersions: List<String> = listOf(),
+) {
+    val messageExact by lazy { rawMessageExact ?: emptyList() }
+    val messageStartsWith by lazy { rawMessageStartsWith ?: emptyList() }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index e0fcf8fcbdc3..7fed3ad028f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.test.command
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.data.jsonobjects.repo.RepoErrorData
+import at.hannibal2.skyhanni.data.jsonobjects.repo.RepoErrorJson
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -12,7 +12,6 @@ import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeLimitedSet
-import at.hannibal2.skyhanni.utils.json.fromJson
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.minutes
@@ -24,6 +23,7 @@ object ErrorManager {
     private val errorMessages = mutableMapOf<String, String>()
     private val fullErrorMessages = mutableMapOf<String, String>()
     private var cache = TimeLimitedSet<Pair<String, Int>>(10.minutes)
+    private var repoErrors: List<RepoErrorData> = emptyList()
 
     private val breakAfter = listOf(
         "at at.hannibal2.skyhanni.config.commands.Commands\$createCommand",
@@ -156,66 +156,56 @@ object ErrorManager {
 
         val extraDataString = buildExtraDataString(extraData)
         val rawMessage = message.removeColor()
-        errorMessages[randomId] =
-            "```\nSkyHanni ${SkyHanniMod.version}: $rawMessage\n \n$stackTrace\n$extraDataString```"
+        errorMessages[randomId] = "```\nSkyHanni ${SkyHanniMod.version}: $rawMessage\n \n$stackTrace\n$extraDataString```"
         fullErrorMessages[randomId] =
             "```\nSkyHanni ${SkyHanniMod.version}: $rawMessage\n(full stack trace)\n \n$fullStackTrace\n$extraDataString```"
 
+        val finalMessage = buildFinalMessage(message) ?: return
+        ChatUtils.clickableChat(
+            "§c[SkyHanni-${SkyHanniMod.version}]: $finalMessage Click here to copy the error into the clipboard.",
+            onClick = { copyError(randomId) },
+            "§eClick to copy!",
+            prefix = false,
+        )
+    }
+
+    private fun buildFinalMessage(message: String): String? {
         var finalMessage = message
         if (finalMessage.last() !in ".?!") {
             finalMessage += "§c."
         }
+        val rawMessage = message.removeColor()
 
         var hideError = false
         for (repoError in repoErrors) {
-            for (s in repoError.messageStartsWith ?: listOf()) {
-                if (rawMessage.startsWith(s)) {
+            for (string in repoError.messageStartsWith) {
+                if (rawMessage.startsWith(string)) {
                     hideError = true
                 }
             }
-            for (s in repoError.messageExact ?: listOf()) {
-                if (rawMessage == s) {
+            for (string in repoError.messageExact) {
+                if (rawMessage == string) {
                     hideError = true
                 }
             }
             if (hideError) {
-                if (repoError.replaceMessage != null) {
-                    finalMessage = repoError.replaceMessage!!
+                repoError.replaceMessage?.let {
+                    finalMessage = it
                     hideError = false
                 }
                 break
             }
         }
 
-        if (!hideError) {
-            ChatUtils.clickableChat(
-                "§c[SkyHanni-${SkyHanniMod.version}]: $finalMessage Click here to copy the error into the clipboard.",
-                onClick = { copyError(randomId) },
-                "§eClick to copy!",
-                prefix = false,
-            )
-        }
-
+        return if (hideError) null else finalMessage
     }
 
-    private var repoErrors: List<RepoErrorData> = listOf()
-
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
-        val chatErrors = event.repoLocation.resolve("chat_errors")
-        repoErrors = if (chatErrors.exists()) {
-            chatErrors.listFiles()
-                .filter {
-                    it != null && it.isFile && it.canRead()
-                }
-                .map {
-                    ConfigManager.gson.fromJson<RepoErrorData>(it.readText())
-                }.filter {
-                    SkyHanniMod.version in it.affectedVersions
-                }
-        } else {
-            listOf()
-        }
+        val data = event.getConstant<RepoErrorJson>("ChangedChatErrors")
+        val version = SkyHanniMod.version
+
+        repoErrors = data.changedErrorMessages.filter { version in it.affectedVersions }
     }
 
     private fun buildExtraDataString(extraData: Array<out Pair<String, Any?>>): String {

From ff119419cce3e192012aee9e438911ffeb8d8519 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:49:45 +0200
Subject: [PATCH 658/721] Fixed /viewrecipe replace breaking pages (#2679)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/commands/ViewRecipeCommand.kt        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt
index e3d6a5713297..dbaf037ca363 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils.senderIsSkyhanni
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.NumberUtil.isInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -30,12 +31,20 @@ object ViewRecipeCommand {
         if (!config.viewRecipeLowerCase) return
         if (event.senderIsSkyhanni()) return
 
-        val item = pattern.matchMatcher(event.message.lowercase()) {
-            group("item").uppercase().replace(" ", "_")
+        val input = pattern.matchMatcher(event.message.lowercase()) {
+            group("item").uppercase()
         } ?: return
 
+        val args = input.split(" ")
+        val endsWithPageNumber = args.last().isInt()
+        val finalCommand = if (endsWithPageNumber) {
+            "${args.dropLast(1).joinToString("_")} ${args.last()}"
+        } else {
+            input.replace(" ", "_")
+        }
+
         event.cancel()
-        HypixelCommands.viewRecipe(item)
+        HypixelCommands.viewRecipe(finalCommand)
     }
 
     val list by lazy {

From c4077a9aa597ddec23f8d4649c07f6615d0ecfc2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 6 Oct 2024 23:33:32 +0200
Subject: [PATCH 659/721] fixed serialized names not liking lazy

---
 .../skyhanni/data/jsonobjects/repo/RepoErrorData.kt         | 4 ++--
 .../java/at/hannibal2/skyhanni/test/command/ErrorManager.kt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
index 3ec529db3e3f..0fe893723580 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
@@ -13,6 +13,6 @@ data class RepoErrorData(
     @Expose @SerializedName("replace_message") var replaceMessage: String?,
     @Expose @SerializedName("affected_versions") var affectedVersions: List<String> = listOf(),
 ) {
-    val messageExact by lazy { rawMessageExact ?: emptyList() }
-    val messageStartsWith by lazy { rawMessageStartsWith ?: emptyList() }
+    val messageExact get() = rawMessageExact ?: emptyList()
+    val messageStartsWith get() = rawMessageStartsWith ?: emptyList()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index 7fed3ad028f5..fecdb6cdd7e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -171,9 +171,6 @@ object ErrorManager {
 
     private fun buildFinalMessage(message: String): String? {
         var finalMessage = message
-        if (finalMessage.last() !in ".?!") {
-            finalMessage += "§c."
-        }
         val rawMessage = message.removeColor()
 
         var hideError = false
@@ -197,6 +194,9 @@ object ErrorManager {
             }
         }
 
+        if (finalMessage.last() !in ".?!") {
+            finalMessage += "§c."
+        }
         return if (hideError) null else finalMessage
     }
 

From dc2ea3ff0b449489ee32bf066b9c8854791f5d86 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 6 Oct 2024 23:50:57 +0200
Subject: [PATCH 660/721] added support for custom_message

---
 .../hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt | 1 +
 .../java/at/hannibal2/skyhanni/test/command/ErrorManager.kt   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
index 0fe893723580..41d0f701cb15 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
@@ -11,6 +11,7 @@ data class RepoErrorData(
     @Expose @SerializedName("message_exact") private var rawMessageExact: List<String>?,
     @Expose @SerializedName("message_starts_with") private var rawMessageStartsWith: List<String>?,
     @Expose @SerializedName("replace_message") var replaceMessage: String?,
+    @Expose @SerializedName("custom_message") var customMessage: String?,
     @Expose @SerializedName("affected_versions") var affectedVersions: List<String> = listOf(),
 ) {
     val messageExact get() = rawMessageExact ?: emptyList()
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index fecdb6cdd7e3..25b485c5a0f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -190,6 +190,10 @@ object ErrorManager {
                     finalMessage = it
                     hideError = false
                 }
+                repoError.customMessage?.let {
+                    ChatUtils.userError(it)
+                    return null
+                }
                 break
             }
         }

From 8a1591748ac661c6f61776e25592ee879bbcdd72 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 00:52:59 +0200
Subject: [PATCH 661/721] removed unnecessary check

---
 .../features/fishing/tracker/SeaCreatureTracker.kt   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index ca8a73ce9d5f..5ba50c2b74f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -79,16 +79,8 @@ object SeaCreatureTracker {
         val realAmount = data.amount.filter { filter(it.key) }
 
         val total = realAmount.sumAllValues()
-        for ((name, amount) in realAmount.entries.sortedByDescending { it.value }) {
-            val displayName = SeaCreatureManager.allFishingMobs[name]?.displayName ?: run {
-                ErrorManager.logErrorStateWithData(
-                    "Sea Creature Tracker can not display a name correctly",
-                    "Could not find sea creature by name",
-                    "SeaCreatureManager.allFishingMobs.keys" to SeaCreatureManager.allFishingMobs.keys,
-                    "name" to name
-                )
-                name
-            }
+        for ((displayName, amount) in realAmount.entries.sortedByDescending { it.value }) {
+
 
             val percentageSuffix = if (config.showPercentage.get()) {
                 val percentage = LorenzUtils.formatPercentage(amount.toDouble() / total)

From 71f6d7e18627a04e5d80d8f5951cdb3b2bc5d44d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 01:11:28 +0200
Subject: [PATCH 662/721] reverted old removal

---
 .../features/fishing/tracker/SeaCreatureTracker.kt   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index 5ba50c2b74f6..ca8a73ce9d5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -79,8 +79,16 @@ object SeaCreatureTracker {
         val realAmount = data.amount.filter { filter(it.key) }
 
         val total = realAmount.sumAllValues()
-        for ((displayName, amount) in realAmount.entries.sortedByDescending { it.value }) {
-
+        for ((name, amount) in realAmount.entries.sortedByDescending { it.value }) {
+            val displayName = SeaCreatureManager.allFishingMobs[name]?.displayName ?: run {
+                ErrorManager.logErrorStateWithData(
+                    "Sea Creature Tracker can not display a name correctly",
+                    "Could not find sea creature by name",
+                    "SeaCreatureManager.allFishingMobs.keys" to SeaCreatureManager.allFishingMobs.keys,
+                    "name" to name
+                )
+                name
+            }
 
             val percentageSuffix = if (config.showPercentage.get()) {
                 val percentage = LorenzUtils.formatPercentage(amount.toDouble() / total)

From edbbe1e61afe600b9d111c7bf74db70f07befd2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 7 Oct 2024 01:32:30 +0200
Subject: [PATCH 663/721] Backend: Migrate Plhlegblast (#2684)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../fishing/tracker/SeaCreatureTracker.kt     | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index ca8a73ce9d5f..e106858012de 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -4,11 +4,13 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.FishingBobberCastEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.SeaCreatureFishEvent
 import at.hannibal2.skyhanni.features.fishing.FishingAPI
 import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager
 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.addOrPut
 import at.hannibal2.skyhanni.utils.CollectionUtils.addSearchString
 import at.hannibal2.skyhanni.utils.CollectionUtils.sumAllValues
@@ -25,6 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
 object SeaCreatureTracker {
+    private var needMigration = true
 
     private val config get() = SkyHanniMod.feature.fishing.seaCreatureTracker
 
@@ -72,7 +75,15 @@ object SeaCreatureTracker {
         return map
     }
 
+    @SubscribeEvent
+    fun onProfileJoin(event: ProfileJoinEvent) {
+        needMigration = true
+    }
+
     private fun drawDisplay(data: Data): List<Searchable> = buildList {
+        // manually migrating from "Phlhlegblast" to "Plhlegblast" when the new name is in the repo
+        tryToMigrate(data.amount)
+
         addSearchString("§7Sea Creature Tracker:")
 
         val filter: (String) -> Boolean = addCategories(data)
@@ -85,7 +96,7 @@ object SeaCreatureTracker {
                     "Sea Creature Tracker can not display a name correctly",
                     "Could not find sea creature by name",
                     "SeaCreatureManager.allFishingMobs.keys" to SeaCreatureManager.allFishingMobs.keys,
-                    "name" to name
+                    "name" to name,
                 )
                 name
             }
@@ -100,6 +111,25 @@ object SeaCreatureTracker {
         addSearchString(" §7- §e${total.addSeparators()} §7Total Sea Creatures")
     }
 
+    private fun tryToMigrate(
+        data: MutableMap<String, Int>,
+    ) {
+        if (!needMigration) return
+        needMigration = false
+
+        val oldName = "Phlhlegblast"
+        val newName = "Plhlegblast"
+
+        // only migrate once the repo contains the new name
+        if (SeaCreatureManager.allFishingMobs.containsKey(newName)) {
+            data[oldName]?.let {
+                ChatUtils.debug("Sea Creature Tracker migrated $it $oldName to $newName")
+                data[newName] = it
+                data.remove(oldName)
+            }
+        }
+    }
+
     private fun MutableList<Searchable>.addCategories(data: Data): (String) -> Boolean {
         val amounts = getCurrentCategories(data)
         val list = amounts.keys.toList()
@@ -115,7 +145,7 @@ object SeaCreatureTracker {
                     val id = list.indexOf(currentCategory)
                     currentCategory = list[(id + 1) % list.size]
                     tracker.update()
-                }
+                },
             )
         }
 
@@ -161,6 +191,5 @@ object SeaCreatureTracker {
         tracker.resetCommand()
     }
 
-    private fun isEnabled() =
-        LorenzUtils.inSkyBlock && config.enabled && !FishingAPI.wearingTrophyArmor && !LorenzUtils.inKuudraFight
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !FishingAPI.wearingTrophyArmor && !LorenzUtils.inKuudraFight
 }

From 82ea42e7dfe989c75eebc072f1cebe0b6c000492 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 01:52:48 +0200
Subject: [PATCH 664/721] Version 0.27 Beta 16

---
 docs/CHANGELOG.md | 14 ++++++++++++++
 root.gradle.kts   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 050f6c9bd7af..72032222eff6 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -184,6 +184,7 @@
 + Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
 + Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - luna (https://github.com/hannibal002/SkyHanni/pull/2633)
 + Improved the wording of the Mining Event data error chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2671)
++ Added Mining Effects (Powder Pumpkin, Filet O' Fortune, and Chilled Pristine Potato) to the Non-God Effect Display. - jani (https://github.com/hannibal002/SkyHanni/pull/2677)
 
 #### Diana Improvements
 
@@ -201,6 +202,7 @@
 + Added an opacity slider for the Custom Background Image in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/1837)
 + Added an Undo message when auto alignment inCustom Scoreboard gets disabled. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2402)
 + Added an option to show SkyBlock time on the custom scoreboard rounded to 10 minutes, similar to the vanilla scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2443)
++ Reduced the frequency of scoreboard errors being displayed. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2672)
 
 #### Inventory Improvements
 
@@ -292,6 +294,8 @@
 + Improved the way pathfinding lines are rendered. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2634)
 + Automatically starts pathfinding after clicking on SkyHanni reminder chat messages about Carnival Reminder, Hoppity NPC, City Project, and account/profile upgrades. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2635)
 + Greatly improved performance by optimizing SkyHanni Chroma support for Patcher Font Renderer. - nopo (https://github.com/hannibal002/SkyHanni/pull/2666)
++ "Could not find server id" errors are now less common. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2680)
++ Clarified the wording of Bazaar Data Loading error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2681)
 
 ### Fixes
 
@@ -335,6 +339,7 @@
     + Fixed enchanting XP detection.
 + Fixed Minister in Calendar Perk description sometimes not using the gray color. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2632)
 + Fixed highlighting items in one's own inventory for some Bazaar features, e.g., in the "click to re-order" feature. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2640)
++ Automatically remove incorrect Account/Profile Upgrade warnings by talking to Elizabeth. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2674)
 
 #### Mining Fixes
 
@@ -363,6 +368,7 @@
 + Fixed Jasper gemstones not being addressed in the Powder Mining filter. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2618)
 + Fixed the King Talisman Tracker sometimes not displaying the correct data. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2663)
 + Fixed the Powder Tracker not tracking items correctly. - HiZe (https://github.com/hannibal002/SkyHanni/pull/2645)
++ Fixed an error in Powder Tracker. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2678)
 
 #### Scoreboard Fixes
 
@@ -386,6 +392,8 @@
 + Fixed a Custom Scoreboard error during M7 Dragons. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2510)
 + Fixed Custom Scoreboard error during the Raffle Event. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2545)
 + Fixed both the Custom Scoreboard Active and Starting Soon Tab List events being active simultaneously in the Garden. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2592)
++ Fixed Custom Scoreboard not showing the Perkpocalypse Mayor. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2683)
++ Fixed some scoreboard error messages appearing in chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2672)
 
 #### Hoppity Fixes
 
@@ -407,6 +415,7 @@
 ####  Commands Fixes
 
 + Fixed the command `/shtps` printing nothing if the TPS display was currently showing nothing. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2446)
++ Fixed "/viewrecipe command replace" breaking pages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2679)
 
 #### Dungeon Fixes
 
@@ -474,6 +483,8 @@
 + Fixed item trackers displaying removed item names incorrectly. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2620)
 + Fixed some messages from Pablo NPC not being detected. - Luna (https://github.com/hannibal002/SkyHanni/pull/2636)
 + Fixed SkyHanni re-downloading the repository on every launch. - nopo (https://github.com/hannibal002/SkyHanni/pull/2669)
++ Fixed unknown Perkpocalypse Mayor chat spam. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2683)
++ Fixed the wiki keybind searching for "null" on items with no internal name. - MTOnline (https://github.com/hannibal002/SkyHanni/pull/2682)
 
 ### Technical Details
 
@@ -548,6 +559,9 @@
 + Added Bazaar Fetch information to `/shdebug`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2675)
 + Removed the password from the download source check. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2649)
 + Added a missing SkyBlock check for debug commands `/shtrackparticles` and `/shtracksounds`. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2641)
++ Prepared for later migration of correct config name of Plhlegblast. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2684)
++ Added the ability to disable SkyHanni errors via repo configuration. - nopo (https://github.com/hannibal002/SkyHanni/pull/2668)
++ Added current server ID and fetch data to the `/shdebug` command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2680)
 
 ### Removed Features
 
diff --git a/root.gradle.kts b/root.gradle.kts
index 58285a7012c2..33a21442e6f0 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.15"
+    version = "0.27.Beta.16"
     repositories {
         mavenCentral()
         mavenLocal()

From df210dceb42d76597272b066854fa39209f6d353 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:21:31 +0200
Subject: [PATCH 665/721] Fix: Custom Scoreboard Update time (#2685)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../gui/customscoreboard/CustomScoreboard.kt  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index 8a1d7b50de45..4a86519c374e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -30,6 +30,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderable
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.renderables.Renderable
@@ -50,7 +51,7 @@ object CustomScoreboard {
     private var cache = emptyList<ScoreboardElementType>()
     private const val GUI_NAME = "Custom Scoreboard"
 
-    private var lastScoreboardUpdate = SimpleTimeMark.farFuture()
+    private var nextScoreboardUpdate = SimpleTimeMark.farFuture()
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
@@ -82,9 +83,7 @@ object CustomScoreboard {
     fun onGuiPositionMoved(event: GuiPositionMovedEvent) {
         if (event.guiName == GUI_NAME) {
             with(alignmentConfig) {
-                if (horizontalAlignment != HorizontalAlignment.DONT_ALIGN ||
-                    verticalAlignment != VerticalAlignment.DONT_ALIGN
-                ) {
+                if (horizontalAlignment != HorizontalAlignment.DONT_ALIGN || verticalAlignment != VerticalAlignment.DONT_ALIGN) {
                     val tempHori = horizontalAlignment
                     val tempVert = verticalAlignment
 
@@ -108,15 +107,9 @@ object CustomScoreboard {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
 
-        // We want to update the scoreboard as soon as we have new data, not 5 ticks delayed
-        var dirty = false
-        if (lastScoreboardUpdate.passedSince() > 250.milliseconds) {
-            lastScoreboardUpdate = SimpleTimeMark.farFuture()
-            dirty = true
-        }
-
-        // Creating the lines
-        if (dirty) {
+        if (dirty || nextScoreboardUpdate.isInPast()) {
+            nextScoreboardUpdate = 250.milliseconds.fromNow()
+            dirty = false
             display = createLines().removeEmptyLinesFromEdges()
             if (TabListData.fullyLoaded) {
                 cache = display.toList()
@@ -129,10 +122,9 @@ object CustomScoreboard {
 
     @SubscribeEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
-        lastScoreboardUpdate = SimpleTimeMark.now()
+        dirty = true
     }
 
-
     internal val config get() = SkyHanniMod.feature.gui.customScoreboard
     internal val displayConfig get() = config.display
     internal val alignmentConfig get() = displayConfig.alignment

From 3b61c48e2e1545bcf009bcbb563de5fbb63277ab Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:24:20 +0200
Subject: [PATCH 666/721] Fix: Hoppity wrong amount (#2686)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/event/hoppity/HoppityCollectionStats.kt        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 7d2a6a457c28..6d201e57edcd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -505,7 +505,11 @@ object HoppityCollectionStats {
 
             val found = !rabbitNotFoundPattern.anyMatches(itemLore)
 
-            if (!found) continue
+            if (!found) {
+                // if the config has wrong data, remove it
+                loggedRabbits.remove(itemName)
+                continue
+            }
 
             val duplicates = duplicatesFoundPattern.firstMatcher(itemLore) {
                 group("duplicates").formatInt()

From 129bc896df29ed5cedd915b094365058b19137a1 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Mon, 7 Oct 2024 21:08:50 +1100
Subject: [PATCH 667/721] Backend: Update pr template (#2687)

---
 pull_request_template.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pull_request_template.md b/pull_request_template.md
index b004c1c13866..dba81f46b91c 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -1,4 +1,6 @@
-<!-- remove all unused parts -->
+<!-- remove all unused parts 
+
+The title of your PR should be descriptive and concise. It should be in the format of `Type: Description`. For example, `Feature: Add new command` or `Fix: Bug in command`. If there are multiple types of changes these can be separated by an ampersand. For example, `Feature & Fix: Add new command and fix bug in command`.
 
 ## PR Reviews
 
@@ -6,6 +8,8 @@ When your PR is marked as ready for review, some of our maintainers will look th
 
 Make sure to only mark your PR as "Ready to review" when it is. If you still want to do major changes, you can keep a draft PR open until then.
 
+-->
+
 ## Dependencies
 - pr_number_or_link_here
 

From 1de910a9ae9ab96fa75044367f9546d671fbcba1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 7 Oct 2024 12:09:22 +0200
Subject: [PATCH 668/721] Fix: Hoppity > max (#2688)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/storage/ProfileSpecificStorage.java        |  3 +++
 .../inventory/chocolatefactory/ChocolateAmount.kt     |  1 +
 .../inventory/chocolatefactory/ChocolateFactoryAPI.kt |  4 ++++
 .../chocolatefactory/ChocolateFactoryDataLoader.kt    | 11 +++++++++++
 .../chocolatefactory/ChocolateFactoryStats.kt         |  5 ++++-
 5 files changed, 23 insertions(+), 1 deletion(-)

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 754eea3bba59..4ccb0823d512 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -102,6 +102,9 @@ public static class ChocolateFactoryStorage {
         @Expose
         public long currentChocolate = 0;
 
+        @Expose
+        public long maxChocolate = 0;
+
         @Expose
         public long chocolateThisPrestige = 0;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateAmount.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateAmount.kt
index 7f0694e2a779..1f1f6d0c0969 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateAmount.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateAmount.kt
@@ -31,6 +31,7 @@ enum class ChocolateAmount(val chocolate: () -> Long) {
 
     companion object {
         fun chocolateSinceUpdate(): Long {
+            if (ChocolateFactoryAPI.isMax()) return 0L
             val lastUpdate = profileStorage?.lastDataSave ?: return 0
             val currentTime = SimpleTimeMark.now()
             val secondsSinceUpdate = (currentTime - lastUpdate).inWholeSeconds
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
index 112e8a7a7383..195ea51d32f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@@ -239,4 +239,8 @@ object ChocolateFactoryAPI {
             it.rabbit.removeColor() == rabbitName.removeColor()
         }
     }
+
+    fun isMax(): Boolean = profileStorage?.let {
+        it.maxChocolate == it.currentChocolate
+    } ?: false
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
index eebbb19e93a7..64a99a8c911f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryDataLoader.kt
@@ -51,6 +51,14 @@ object ChocolateFactoryDataLoader {
         "chocolate.thisprestige",
         "§7Chocolate this Prestige: §6(?<amount>[\\d,]+)",
     )
+
+    /**
+     * REGEX-TEST: §7Max Chocolate: §660B
+     */
+    private val maxChocolatePattern by ChocolateFactoryAPI.patternGroup.pattern(
+        "chocolate.max",
+        "§7Max Chocolate: §6(?<max>.*)",
+    )
     private val chocolateForPrestigePattern by ChocolateFactoryAPI.patternGroup.pattern(
         "chocolate.forprestige",
         "§7§cRequires (?<amount>\\w+) Chocolate this.*",
@@ -230,6 +238,9 @@ object ChocolateFactoryDataLoader {
             chocolateThisPrestigePattern.matchMatcher(line) {
                 profileStorage.chocolateThisPrestige = group("amount").formatLong()
             }
+            maxChocolatePattern.matchMatcher(line) {
+                profileStorage.maxChocolate = group("max").formatLong()
+            }
             chocolateForPrestigePattern.matchMatcher(line) {
                 ChocolateFactoryAPI.chocolateForPrestige = group("amount").formatLong()
                 prestigeCost = ChocolateFactoryAPI.chocolateForPrestige
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
index 8d08e485e16f..36c79728cd39 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStats.kt
@@ -76,7 +76,10 @@ object ChocolateFactoryStats {
         val map = buildMap<ChocolateFactoryStat, String> {
             put(ChocolateFactoryStat.HEADER, "§6§lChocolate Factory ${ChocolateFactoryAPI.currentPrestige.toRoman()}")
 
-            put(ChocolateFactoryStat.CURRENT, "§eCurrent Chocolate: §6${ChocolateAmount.CURRENT.formatted}")
+            val maxSuffix = if (ChocolateFactoryAPI.isMax()) {
+                " §cMax!"
+            } else ""
+            put(ChocolateFactoryStat.CURRENT, "§eCurrent Chocolate: §6${ChocolateAmount.CURRENT.formatted}$maxSuffix")
             put(ChocolateFactoryStat.THIS_PRESTIGE, "§eThis Prestige: §6${ChocolateAmount.PRESTIGE.formatted}")
             put(ChocolateFactoryStat.ALL_TIME, "§eAll-time: §6${ChocolateAmount.ALL_TIME.formatted}")
 

From 266d007da9f23b19f8e815da3005451195a33a5e Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Mon, 7 Oct 2024 21:16:35 +1100
Subject: [PATCH 669/721] its actually a plus (#2689)

---
 pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pull_request_template.md b/pull_request_template.md
index dba81f46b91c..02769a0f8470 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -1,6 +1,6 @@
 <!-- remove all unused parts 
 
-The title of your PR should be descriptive and concise. It should be in the format of `Type: Description`. For example, `Feature: Add new command` or `Fix: Bug in command`. If there are multiple types of changes these can be separated by an ampersand. For example, `Feature & Fix: Add new command and fix bug in command`.
+The title of your PR should be descriptive and concise. It should be in the format of `Type: Description`. For example, `Feature: Add new command` or `Fix: Bug in command`. If there are multiple types of changes these can be separated by a plus. For example, `Feature + Fix: Add new command and fix bug in command`.
 
 ## PR Reviews
 

From f53fbddd604fd795780f16c25f57378c32d18763 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:33:51 +0200
Subject: [PATCH 670/721] Backend: More /shdebug (#2691)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/HypixelData.kt |   5 +
 .../tweaker/DownloadSourceChecker.java        |   4 +-
 .../skyhanni/tweaker/TweakerUtils.java        |   4 -
 .../skyhanni/utils/ComputerEnvDebug.kt        | 107 ++++++++++++++++++
 .../skyhanni/utils/ComputerTimeOffset.kt      |  11 +-
 .../at/hannibal2/skyhanni/utils/OSUtils.kt    |  30 ++++-
 6 files changed, 149 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/ComputerEnvDebug.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index f34dafb3b95c..3707d10af0a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -195,6 +195,11 @@ object HypixelData {
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
         event.title("Server ID")
+        if (!LorenzUtils.inSkyBlock) {
+            event.addIrrelevant("not in sb")
+            return
+        }
+
         val id = serverId
         if (id == null) {
             event.addData {
diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
index 2c417909e6a2..7947b6ebc9e1 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/DownloadSourceChecker.java
@@ -1,5 +1,7 @@
 package at.hannibal2.skyhanni.tweaker;
 
+import at.hannibal2.skyhanni.utils.OSUtils;
+
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -32,7 +34,7 @@ public class DownloadSourceChecker {
     };
 
     public static void init() {
-        if (!TweakerUtils.isOnWindows()) return;
+        if (!OSUtils.INSTANCE.isWindows()) return;
         URI host = getDangerousHost();
         if (host != null) {
             openMenu(host);
diff --git a/src/main/java/at/hannibal2/skyhanni/tweaker/TweakerUtils.java b/src/main/java/at/hannibal2/skyhanni/tweaker/TweakerUtils.java
index b9070e0c16bb..ffd415c10133 100644
--- a/src/main/java/at/hannibal2/skyhanni/tweaker/TweakerUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/tweaker/TweakerUtils.java
@@ -11,10 +11,6 @@
 
 public class TweakerUtils {
 
-    public static boolean isOnWindows() {
-        return System.getProperty("os.name").toLowerCase().contains("win");
-    }
-
     public static void openUrl(String url) {
         try {
             Desktop.getDesktop().browse(new URI(url));
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ComputerEnvDebug.kt b/src/main/java/at/hannibal2/skyhanni/utils/ComputerEnvDebug.kt
new file mode 100644
index 000000000000..ca4eeeb71118
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ComputerEnvDebug.kt
@@ -0,0 +1,107 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.system.PlatformUtils
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object ComputerEnvDebug {
+
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        os(event)
+        java(event)
+        launcher(event)
+    }
+
+    private fun launcher(event: DebugDataCollectEvent) {
+        event.title("Computer Minecraft Launcher")
+
+        val firstStack = getFirstStack() ?: run {
+            event.addData("Could not load data!")
+            return
+        }
+
+        val (launcher, relevant) = findLauncher(firstStack)
+
+        launcher?.let {
+            if (relevant) {
+                event.addData(it)
+            } else {
+                event.addIrrelevant(it)
+            }
+            return
+        }
+
+        event.addData {
+            add("Unknown launcher!")
+            add("firstStack: '$firstStack'")
+        }
+    }
+
+    // TODO put into repo
+    private fun findLauncher(firstStack: String): Pair<String?, Boolean> {
+        if (firstStack.contains("net.fabricmc.devlaunchinjector.Main.main")) {
+            return Pair("Dev Env", false)
+        }
+        if (firstStack.contains("net.minecraft.launchwrapper.Launch.main")) {
+            return Pair("Vanilla Launcher", false)
+        }
+        if (firstStack.contains("org.prismlauncher.EntryPoint.main")) {
+            return Pair("Prism", false)
+        }
+        if (firstStack.contains("net.digitalingot.vendor.")) {
+            return Pair("Feather Client", true)
+        }
+        return Pair(null, true)
+    }
+
+    private fun getFirstStack(): String? {
+        val firstStack = try {
+            Thread.currentThread().stackTrace.last().toString()
+        } catch (e: Exception) {
+            ErrorManager.logErrorWithData(e, "Failed loading current thread stack trace info")
+            null
+        }
+        return firstStack
+    }
+
+    private fun java(event: DebugDataCollectEvent) {
+        event.title("Computer Java Version")
+        val version = System.getProperty("java.version")
+        val pattern = "1\\.8\\.0_(?<update>.*)".toPattern()
+        pattern.matchMatcher(version) {
+            group("update").toIntOrNull()?.let {
+                val devEnvironment = PlatformUtils.isDevEnvironment
+                if (it < 300 && !devEnvironment) {
+                    event.addData("Old update: $it")
+                } else {
+                    if (devEnvironment) {
+                        event.addIrrelevant("Update version: $it (dev env)")
+                    } else {
+                        event.addIrrelevant("New update: $it")
+                    }
+                }
+                return
+            }
+        }
+        event.addData("Unknwon java version: '$version'")
+    }
+
+    private fun os(event: DebugDataCollectEvent) {
+        event.title("Computer Operating System")
+        val osType = OSUtils.getOperatingSystem()
+        val exactName = OSUtils.getOperatingSystemRaw()
+        if (osType != OSUtils.OperatingSystem.UNKNOWN) {
+            event.addIrrelevant {
+                add("OS type: $osType")
+                add("Exact name: $exactName")
+            }
+        } else {
+            event.addData("Unknwon OS: '$exactName'")
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
index 83ea15ecc437..c0f65645a1f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
@@ -112,11 +112,16 @@ object ComputerTimeOffset {
     @SubscribeEvent
     fun onDebugCollect(event: DebugDataCollectEvent) {
         event.title("Time Offset")
-        val relevant = offsetMillis?.absoluteValue?.let { it < 100.milliseconds } ?: true
+        val offset = offsetMillis ?: run {
+            event.addIrrelevant("not calculated yet")
+            return
+        }
+
+        val relevant = offset.absoluteValue > 500.milliseconds
         if (relevant) {
-            event.addData(offsetMillis.toString())
+            event.addData(offset.toString())
         } else {
-            event.addIrrelevant(offsetMillis.toString())
+            event.addIrrelevant(offset.toString())
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
index 5b42c5dc640f..ecd0f0650adf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/OSUtils.kt
@@ -7,15 +7,37 @@ import java.net.URI
 
 object OSUtils {
 
+    enum class OperatingSystem {
+        LINUX,
+        SOLARIS,
+        WINDOWS,
+        MACOS,
+        UNKNOWN,
+    }
+
+    fun getOperatingSystemRaw(): String = System.getProperty("os.name")
+
+    fun getOperatingSystem(): OperatingSystem {
+        val osName = getOperatingSystemRaw().lowercase()
+        return when {
+            osName.contains("win") -> OperatingSystem.WINDOWS
+            osName.contains("mac") -> OperatingSystem.MACOS
+            osName.contains("solaris") || osName.contains("sunos") -> OperatingSystem.SOLARIS
+            osName.contains("linux") || osName.contains("unix") -> OperatingSystem.LINUX
+
+            else -> OperatingSystem.UNKNOWN
+        }
+    }
+
     val isWindows: Boolean
     val isMac: Boolean
     val isLinux: Boolean
 
     init {
-        val os = System.getProperty("os.name")
-        isWindows = os.contains("win", ignoreCase = true)
-        isMac = os.contains("mac", ignoreCase = true)
-        isLinux = os.contains("linux", ignoreCase = true)
+        val os = getOperatingSystem()
+        isWindows = os == OperatingSystem.WINDOWS
+        isMac = os == OperatingSystem.MACOS
+        isLinux = os == OperatingSystem.LINUX
     }
 
     @JvmStatic

From 2e13dbc1d038090566dd630559b290b3991aa181 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:48:03 +0200
Subject: [PATCH 671/721] only show mining api data in /shdebug after mining
 ores

---
 .../java/at/hannibal2/skyhanni/data/MiningAPI.kt   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 45aec43d3c72..47133f199a49 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -74,7 +74,7 @@ object MiningAPI {
      */
     private val pickobulusFailPattern by pickbobulusGroup.pattern(
         "fail",
-        "§7Your §r§aPickobulus §r§7didn't destroy any blocks!"
+        "§7Your §r§aPickobulus §r§7didn't destroy any blocks!",
     )
 
     private data class MinedBlock(val ore: OreBlock, var confirmed: Boolean) {
@@ -127,6 +127,8 @@ object MiningAPI {
     var lastColdReset = SimpleTimeMark.farPast()
         private set
 
+    private var lastOreMinedTime = SimpleTimeMark.farPast()
+
     fun inGlaciteArea() = inGlacialTunnels() || IslandType.MINESHAFT.isInIsland()
 
     fun inDwarvenBaseCamp() = IslandType.DWARVEN_MINES.isInIsland() && dwarvenBaseCampPattern.matches(LorenzUtils.skyBlockArea)
@@ -341,6 +343,7 @@ object MiningAPI {
         currentAreaOreBlocks = setOf()
         resetOreEvent()
         resetPickobulusEvent()
+        lastOreMinedTime = SimpleTimeMark.farPast()
     }
 
     private fun resetOreEvent() {
@@ -359,6 +362,11 @@ object MiningAPI {
         pickobulusWaitingForBlock = false
     }
 
+    @HandleEvent(onlyOnSkyblock = true)
+    fun onOreMined(event: OreMinedEvent) {
+        lastOreMinedTime = SimpleTimeMark.now()
+    }
+
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
         event.title("Mining API")
@@ -366,6 +374,10 @@ object MiningAPI {
             event.addIrrelevant("not in a mining island")
             return
         }
+        if (lastOreMinedTime.passedSince() > 30.seconds) {
+            event.addIrrelevant("not mined recently")
+            return
+        }
 
         event.addData {
             if (lastInitSound.isFarPast()) {

From bd5d50c5fc31dd2df76f19cc6b27579615149647 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:48:43 +0200
Subject: [PATCH 672/721] add debug data in console when silent error happens

---
 .../java/at/hannibal2/skyhanni/utils/NEUItems.kt    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index a7abe6527bdc..75c6173ba57e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -12,6 +12,8 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.isInt
 import at.hannibal2.skyhanni.utils.PrimitiveIngredient.Companion.toPrimitiveItemStacks
@@ -259,7 +261,16 @@ object NEUItems {
 
         AdjustStandardItemLighting.adjust() // Compensate for z scaling
 
-        Minecraft.getMinecraft().renderItem.renderItemIntoGUI(item, 0, 0)
+        try {
+            Minecraft.getMinecraft().renderItem.renderItemIntoGUI(item, 0, 0)
+        } catch (e: Exception) {
+            println(" ")
+            println("item: $item")
+            println("name: ${item.name}")
+            println("getInternalNameOrNull: ${item.getInternalNameOrNull()}")
+            println(" ")
+            e.printStackTrace()
+        }
         RenderHelper.disableStandardItemLighting()
 
         GlStateManager.popMatrix()

From 5712758e7889bb3f2bacfacf75fca9c8230daac9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:09:54 +0200
Subject: [PATCH 673/721] Version 0.27 Beta 17

---
 docs/CHANGELOG.md | 5 +++++
 root.gradle.kts   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 72032222eff6..cc693d1891c9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -296,6 +296,7 @@
 + Greatly improved performance by optimizing SkyHanni Chroma support for Patcher Font Renderer. - nopo (https://github.com/hannibal002/SkyHanni/pull/2666)
 + "Could not find server id" errors are now less common. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2680)
 + Clarified the wording of Bazaar Data Loading error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2681)
++ Indicate in the CF menu when the chocolate amount has reached the cap and is therefore halted. - hannibal2  (https://github.com/hannibal002/SkyHanni/pull/2688)
 
 ### Fixes
 
@@ -394,6 +395,7 @@
 + Fixed both the Custom Scoreboard Active and Starting Soon Tab List events being active simultaneously in the Garden. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2592)
 + Fixed Custom Scoreboard not showing the Perkpocalypse Mayor. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2683)
 + Fixed some scoreboard error messages appearing in chat. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2672)
++ Fixed the custom scoreboard not updating when the Hypixel scoreboard is not updating. - hannibal2  (https://github.com/hannibal002/SkyHanni/pull/2685)
 
 #### Hoppity Fixes
 
@@ -405,6 +407,8 @@
 + Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2488)
 + Fixed inconsistencies in Hoppity Duplicate Number counts. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2595)
 + Fixed Fish the Rabbit and El Dorado incorrectly counting as unique rabbits during Hoppity's Hunt. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2627)
++ Fixed Hoppity Collection Display not updating the rabbit count in some cases, e.g., when collecting rabbits on alpha or manually changing the config values. - hannibal2  (https://github.com/hannibal002/SkyHanni/pull/2686)
++ Fixed the chocolate count increasing in other menus even when production is halted. - hannibal2  (https://github.com/hannibal002/SkyHanni/pull/2688)
 
 #### Chat Fixes
 
@@ -562,6 +566,7 @@
 + Prepared for later migration of correct config name of Plhlegblast. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2684)
 + Added the ability to disable SkyHanni errors via repo configuration. - nopo (https://github.com/hannibal002/SkyHanni/pull/2668)
 + Added current server ID and fetch data to the `/shdebug` command. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2680)
++ Added more `/shdebug` checks for aspects like OS, Java version, and launcher. - hannibal2  (https://github.com/hannibal002/SkyHanni/pull/2691)
 
 ### Removed Features
 
diff --git a/root.gradle.kts b/root.gradle.kts
index 33a21442e6f0..772b5a89c4b0 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.16"
+    version = "0.27.Beta.17"
     repositories {
         mavenCentral()
         mavenLocal()

From f57e32eab95b0ec0588caecec784a87a6ef7720e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:57:50 +0200
Subject: [PATCH 674/721] nea!!!

---
 docs/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index cc693d1891c9..0097160082c8 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -189,7 +189,7 @@
 #### Diana Improvements
 
 + Added /warp stonks to the Burrow Warp Helper. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2399)
-+ Added per-election season Diana Trackers. - !nea (https://github.com/hannibal002/SkyHanni/pull/2487)
++ Added per-election season Diana Trackers. - nea (https://github.com/hannibal002/SkyHanni/pull/2487)
     + This includes the Diana Profit Tracker and the Mythological Creature Tracker.
     + The data is stored moving forward, but there is currently no way to view anything other than the current year.
 + Changed the Diana Profit Tracker and Mythological Creature Tracker to always be visible when holding the Ancestral Spade in hand, even if Diana is not the mayor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2496)
@@ -456,7 +456,7 @@
 
 #### Fishing Fixes
 
-+ Fixed error messages while using the Chum Bucket Hider feature. - nea89 (https://github.com/hannibal002/SkyHanni/pull/2587)
++ Fixed error messages while using the Chum Bucket Hider feature. - nea (https://github.com/hannibal002/SkyHanni/pull/2587)
 + Fixed the Trophy Fish Title displaying an undefined character in the format. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2670)
 
 #### Rift Fixes
@@ -520,7 +520,7 @@
 + Changed RenderableTooltips to be more consistent with the vanilla ones. - Empa (https://github.com/hannibal002/SkyHanni/pull/1869)
 + Improved error logging for enchant parser. - Vixid (https://github.com/hannibal002/SkyHanni/pull/2454)
 + Added renderable search box. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2475)
-+ Added the ability to add more optional display modes to trackers. - !nea (https://github.com/hannibal002/SkyHanni/pull/2487)
++ Added the ability to add more optional display modes to trackers. - nea (https://github.com/hannibal002/SkyHanni/pull/2487)
     + These extra trackers still need to provide their own storage.
 + Added perk descriptions to mayor perks. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2342)
     + These are loaded when checking the active mayor/minister from the API, so most of the perks will initially have no description.

From 09f48f8c4c880e053712033a08e137a8390c384d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 8 Oct 2024 00:05:00 +0200
Subject: [PATCH 675/721] consistent spelling

---
 docs/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0097160082c8..2b712e027786 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -182,7 +182,7 @@
 + Added an option to hide all tooltips inside the Fossil Excavator. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2579)
 + Added support for using the Pickobulus ability for the Mineshaft Pity Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/2540)
 + Added Area Navigation support to Glacite Tunnels. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2544)
-+ Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - luna (https://github.com/hannibal002/SkyHanni/pull/2633)
++ Updated wording in mineshaft pity breakdown ("efficient miner" -> "spread"). - Luna (https://github.com/hannibal002/SkyHanni/pull/2633)
 + Improved the wording of the Mining Event data error chat message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2671)
 + Added Mining Effects (Powder Pumpkin, Filet O' Fortune, and Chilled Pristine Potato) to the Non-God Effect Display. - jani (https://github.com/hannibal002/SkyHanni/pull/2677)
 
@@ -435,7 +435,7 @@
 
 #### Garden Fixes
 
-+ Fixed outdated Dicer gemstone fortune in FF guide. - Not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2499)
++ Fixed outdated Dicer gemstone fortune in FF guide. - not_a_cow (https://github.com/hannibal002/SkyHanni/pull/2499)
 + Fixed some garden messages not being blocked. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2532)
 + Fixed active sprays not being removed from the GUI when using a washer. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2532)
 

From 5da8bed25779bfe8bb3b63c8a8cb70d28c9bc082 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Tue, 8 Oct 2024 09:08:41 -0400
Subject: [PATCH 676/721] Bruh (#2695)

---
 src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 4d9af4c9d042..34dcef6bd804 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -281,6 +281,7 @@ object ChatFilter {
         "§6§lGOOD CATCH! §r§bYou found a §r§fSpooky Bait§r§b.",
         "§e[NPC] Jacob§f: §rMy contest has started!",
         "§eObtain a §r§6Booster Cookie §r§efrom the community shop in the hub!",
+        "§rUnknown command. Type \"/help\" for help. ('uhfdsolguhkjdjfhgkjhdfdlgkjhldkjhlkjhsldkjfhldshkjf')",
     )
 
     private val skymallMessages = listOf(

From 92b111017c289a56d89f52ed7b8c013d5df054a2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:49:56 +0200
Subject: [PATCH 677/721] Version 0.27

---
 docs/CHANGELOG.md | 2 +-
 root.gradle.kts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 2b712e027786..d7381099902b 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,6 @@
 # SkyHanni - Change Log
 
-## Version 0.27 (in Beta)
+## Version 0.27
 
 ### New Features
 
diff --git a/root.gradle.kts b/root.gradle.kts
index 772b5a89c4b0..a121d65f8dcb 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27.Beta.17"
+    version = "0.27"
     repositories {
         mavenCentral()
         mavenLocal()

From 7ae1a4e0daebb67d6f75628817e4c27f85015667 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:41:10 +0200
Subject: [PATCH 678/721] added prefix

---
 .../hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index 32cacc6292e0..6bcd6dcb441b 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -23,7 +23,7 @@ object SkyHanniConfigSearchResetCommand {
 
     fun command(args: Array<String>) {
         SkyHanniMod.coroutineScope.launch {
-            ChatUtils.chat(runCommand(args), false)
+            ChatUtils.chat(runCommand(args))
         }
         lastCommand = args
     }

From 67578ff1eb68c6df87ea50268c4ac2258f28812f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:41:20 +0200
Subject: [PATCH 679/721] code cleanup

---
 .../test/SkyHanniConfigSearchResetCommand.kt        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index 6bcd6dcb441b..e69a53d3109d 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -223,7 +223,9 @@ object SkyHanniConfigSearchResetCommand {
                 val className = obj.getClassName()
                 if (!classFilter(className)) continue
                 val objectName = obj.getObjectName()
-                if (obj !is Runnable && objectName.startsWith(className) && (objectName.startsWith("at.hannibal2.skyhanni.config.features.") ||
+                if (obj !is Runnable &&
+                    objectName.startsWith(className) &&
+                    (objectName.startsWith("at.hannibal2.skyhanni.config.features.") ||
                         objectName.startsWith("at.hannibal2.skyhanni.config.storage.Storage"))
                 ) {
                     "<category>"
@@ -275,7 +277,14 @@ object SkyHanniConfigSearchResetCommand {
             val newObj = field.makeAccessible().get(obj)
             map[fieldName] = newObj
             @Suppress("ComplexCondition")
-            if (newObj != null && newObj !is Boolean && newObj !is String && newObj !is Long && newObj !is Int && newObj !is Double && newObj !is Position && !newObj.javaClass.isEnum) {
+            if (newObj != null &&
+                newObj !is Boolean &&
+                newObj !is String &&
+                newObj !is Long &&
+                newObj !is Int &&
+                newObj !is Double &&
+                newObj !is Position &&
+                !newObj.javaClass.isEnum) {
                 map.putAll(loadAllFields(fieldName, newObj, depth + 1))
             }
         }

From 43ecdddd8eaac3858fc3ab2766415ef6466611f4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:57:19 +0200
Subject: [PATCH 680/721] typos

---
 .../features/misc/items/EstimatedItemValueCalculator.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 62abb1c8c52a..e2efab05b1fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -396,8 +396,8 @@ object EstimatedItemValueCalculator {
     private fun addBookwormBook(stack: ItemStack, list: MutableList<String>): Double {
         val count = stack.getBookwormBookCount() ?: return 0.0
 
-        val tfHardcodedItemAgain = "BOOKWORM_BOOK".asInternalName()
-        val price = tfHardcodedItemAgain.getPrice() * count
+        val bookwormBook = "BOOKWORM_BOOK".asInternalName()
+        val price = bookwormBook.getPrice() * count
         list.add("§7Bookworm's Favorite Book: §e$count§7/§e5 §7(§6" + price.shortFormat() + "§7)")
         return price
     }

From 94851695702912ac12f37e1e7f89dac7cf1805fa Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:54:58 +1100
Subject: [PATCH 681/721] Backend: Assign relevant labels (#2690)

---
 .github/workflows/assign-relevant-labels.yml | 64 ++++++++++++++++++++
 .github/workflows/label-bug-fix.yml          | 44 --------------
 2 files changed, 64 insertions(+), 44 deletions(-)
 create mode 100644 .github/workflows/assign-relevant-labels.yml
 delete mode 100644 .github/workflows/label-bug-fix.yml

diff --git a/.github/workflows/assign-relevant-labels.yml b/.github/workflows/assign-relevant-labels.yml
new file mode 100644
index 000000000000..4118c7172093
--- /dev/null
+++ b/.github/workflows/assign-relevant-labels.yml
@@ -0,0 +1,64 @@
+name: "Assign relevant labels"
+on:
+    pull_request_target:
+        types: [ opened, edited ]
+jobs:
+    assign-label:
+        if: github.event.pull_request.state == 'open'
+        runs-on: ubuntu-latest
+        permissions:
+            issues: write
+            pull-requests: write
+            contents: read
+        steps:
+            -   name: label
+                env:
+                    TITLE: ${{ github.event.pull_request.title }}
+                    LABEL_FIX: Bug Fix
+                    LABEL_BACKEND: Backend
+                uses: actions/github-script@v7
+                with:
+                    github-token: ${{ secrets.GITHUB_TOKEN}}
+                    script: |
+                        const labelsToAdd = [];
+                        const labelsToRemove = [];
+                        const title = process.env.TITLE.split(":")[0].toUpperCase();
+                        
+                        if(title.includes("FIX")){
+                          labelsToAdd.push(process.env.LABEL_FIX);
+                        } else {
+                          labelsToRemove.push(process.env.LABEL_FIX);
+                        }
+                        
+                        if(title.includes("BACKEND")){
+                          labelsToAdd.push(process.env.LABEL_BACKEND);
+                        } else {
+                          labelsToRemove.push(process.env.LABEL_BACKEND);
+                        }
+                        
+                        for (const label of labelsToAdd) {
+                          github.rest.issues.addLabels({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            labels: [label]
+                          });
+                        }
+                        
+                        const {data} = await github.rest.issues.listLabelsOnIssue({
+                          issue_number: context.issue.number,
+                          owner: context.repo.owner,
+                          repo: context.repo.repo,
+                        });
+                        
+                        for (const label of labelsToRemove) {
+                          const filtered = data.filter(l => l.name == label);
+                          if(filtered.length == 1){
+                            github.rest.issues.removeLabel({
+                              issue_number: context.issue.number,
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              name: label
+                            });
+                          }
+                        }
diff --git a/.github/workflows/label-bug-fix.yml b/.github/workflows/label-bug-fix.yml
deleted file mode 100644
index 4730d6194468..000000000000
--- a/.github/workflows/label-bug-fix.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Bug Fix label"
-on:
-    pull_request_target:
-        types: [ opened, edited ]
-jobs:
-    assign-label:
-        if: github.event.pull_request.state == 'open' # Condition to check if PR is open
-        runs-on: ubuntu-latest
-        permissions:
-            issues: write
-            pull-requests: write
-            contents: read
-        steps:
-            -   name: label
-                env:
-                    TITLE: ${{ github.event.pull_request.title }}
-                    LABEL: Bug Fix
-                uses: actions/github-script@v7
-                with:
-                    github-token: ${{ secrets.GITHUB_TOKEN}}
-                    script: |
-                        if(process.env.TITLE.split(":")[0].toUpperCase().includes("FIX")){
-                          github.rest.issues.addLabels({
-                            issue_number: context.issue.number,
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            labels: [process.env.LABEL]
-                          })
-                        }else{
-                          const {data} = await github.rest.issues.listLabelsOnIssue({
-                            issue_number: context.issue.number,
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                          })
-                          const filtered = data.filter(label => label.name == process.env.LABEL)
-                          if(filtered.length == 1){
-                            github.rest.issues.removeLabel({
-                              issue_number: context.issue.number,
-                              owner: context.repo.owner,
-                              repo: context.repo.repo,
-                              name: process.env.LABEL
-                            })
-                          }
-                        }

From 86dd8b421b3a530f8ff5ef1197ce5aed3e5cc01e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:11:32 +0200
Subject: [PATCH 682/721] Fix: Dungeon Fishing (#2697)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
index 596d6f49cfd2..89ae7dc18317 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.entity.EntityEnterWorldEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager.getFilletValue
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
@@ -137,7 +138,8 @@ object FishingAPI {
         return info?.getFilletValue(rarity) ?: 0
     }
 
-    fun isFishing(checkRodInHand: Boolean = true) = IsFishingDetection.isFishing || (checkRodInHand && holdingRod)
+    fun isFishing(checkRodInHand: Boolean = true) =
+        (IsFishingDetection.isFishing || (checkRodInHand && holdingRod)) && !DungeonAPI.inDungeon()
 
     fun seaCreatureCount(entity: EntityArmorStand): Int {
         val name = entity.name

From 5e71dc9572870b7dc7ab4358ee61718bec014ae1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:18:24 +0200
Subject: [PATCH 683/721] Fix: Experimentation Table Pet Rule (#2699)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../inventory/experimentationtable/GuardianReminder.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
index 216cbf7c6ba8..32157adf7ebe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
+import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -37,12 +38,17 @@ object GuardianReminder {
     fun onInventory(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
         if (event.inventoryName != "Experimentation Table") return
-        if (ExperimentationTableAPI.petNamePattern.matches(PetAPI.currentPet)) return
-
         lastInventoryOpen = SimpleTimeMark.now()
 
+        DelayedRun.runDelayed(200.milliseconds, ::warn)
+    }
+
+    private fun warn() {
+        if (ExperimentationTableAPI.petNamePattern.matches(PetAPI.currentPet)) return
+
         if (lastWarn.passedSince() < 5.seconds) return
         lastWarn = SimpleTimeMark.now()
+
         ChatUtils.clickToActionOrDisable(
             "Use a §9§lGuardian Pet §efor more Exp in the Experimentation Table.",
             config::guardianReminder,

From 9beb1bb5876d0f3203606e59b16225fbee40e652 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:43:16 +0200
Subject: [PATCH 684/721] Improvement: Pocket Sack-in-a-Sack in Estimated Item
 Value (#2698)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../misc/items/EstimatedItemValueCalculator.kt        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index e2efab05b1fc..5797c50cd7b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -29,6 +29,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.PrimitiveIngredient
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAppliedPocketSackInASack
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getArmorDye
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAttributes
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getBookwormBookCount
@@ -98,6 +99,7 @@ object EstimatedItemValueCalculator {
         ::addManaDisintegrators,
         ::addPolarvoidBook,
         ::addBookwormBook,
+        ::addPocketSackInASack,
 
         // cosmetic
         ::addHelmetSkin,
@@ -393,6 +395,15 @@ object EstimatedItemValueCalculator {
         return price
     }
 
+    private fun addPocketSackInASack(stack: ItemStack, list: MutableList<String>): Double {
+        val count = stack.getAppliedPocketSackInASack() ?: return 0.0
+
+        val pocketSackInASack = "POCKET_SACK_IN_A_SACK".asInternalName()
+        val price = pocketSackInASack.getPrice() * count
+        list.add("§7Pocket Sack-in-a-Sack: §e$count§7/§e3 §7(§6" + price.shortFormat() + "§7)")
+        return price
+    }
+
     private fun addBookwormBook(stack: ItemStack, list: MutableList<String>): Double {
         val count = stack.getBookwormBookCount() ?: return 0.0
 

From 5fc17cd508e671a65e61df0957bf32d5dcb42455 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:58:28 +0200
Subject: [PATCH 685/721] code cleanup

---
 .../at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
index ceec04aa0f20..d8593047ec26 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt
@@ -126,7 +126,7 @@ object SensitivityReducer {
 
     fun manualToggle() {
         if (isToggled) {
-            ChatUtils.chat("This command is disabled while the Sensitivity is lowered.")
+            ChatUtils.userError("This command is disabled while the Sensitivity is lowered!")
             return
         }
         isManualToggle = !isManualToggle

From 4f724df118aa46f329b36e410785b9b65c018e25 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:03:43 +0200
Subject: [PATCH 686/721] Improvement: Less spam (#2700)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/MayorAPI.kt    |  1 +
 .../at/hannibal2/skyhanni/utils/ChatUtils.kt  | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index a07960231bdf..949e33146ce6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -143,6 +143,7 @@ object MayorAPI {
             ChatUtils.clickableChat(
                 "The Perkpocalypse Mayor is not known! Click here to update the temporary Mayor.",
                 onClick = { HypixelCommands.calendar() },
+                replaceSameMessage = true,
             )
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index 3a3ffead303c..a8941c95aed8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.utils.chat.Text.command
 import at.hannibal2.skyhanni.utils.chat.Text.hover
 import at.hannibal2.skyhanni.utils.chat.Text.onClick
 import at.hannibal2.skyhanni.utils.chat.Text.prefix
+import at.hannibal2.skyhanni.utils.chat.Text.send
 import at.hannibal2.skyhanni.utils.chat.Text.url
 import at.hannibal2.skyhanni.utils.compat.getFormattedTextCompat
 import net.minecraft.client.Minecraft
@@ -110,6 +111,7 @@ object ChatUtils {
      * @param expireAt When the click action should expire, default never
      * @param prefix Whether to prefix the message with the chat prefix, default true
      * @param prefixColor Color that the prefix should be, default yellow (§e)
+     * @param replaceSameMessage Replace the old message with this new message if they are identical
      *
      * @see CHAT_PREFIX
      */
@@ -121,14 +123,30 @@ object ChatUtils {
         prefix: Boolean = true,
         prefixColor: String = "§e",
         oneTimeClick: Boolean = false,
+        replaceSameMessage: Boolean = false,
     ) {
         val msgPrefix = if (prefix) prefixColor + CHAT_PREFIX else ""
-        chat(Text.text(msgPrefix + message) {
+
+        val rawText = msgPrefix + message
+        val text = Text.text(rawText) {
             this.onClick(expireAt, oneTimeClick, onClick)
             this.hover = hover.asComponent()
-        })
+        }
+        if (replaceSameMessage) {
+            text.send(getUniqueMessageIdForString(rawText))
+        } else {
+            chat(text)
+        }
     }
 
+    val uniqueMessageIdStorage = mutableMapOf<String, Int>()
+
+    fun getUniqueMessageIdForString(string: String) = uniqueMessageIdStorage.getOrPut(string) { getUniqueMessageId() }
+
+    var lastUniqueMessageId = 123242
+
+    fun getUniqueMessageId() = lastUniqueMessageId++
+
     /**
      * Sends a message to the user that they can click and run a command
      * @param message The message to be sent
@@ -271,6 +289,7 @@ object ChatUtils {
             },
             hover = "§eClick to $actionName!\n" +
                 "§eShift-Click or Control-Click to disable this feature!",
+            replaceSameMessage = true,
         )
     }
 }

From 77f2872d9502f08b69e23d826b0ebd39d76d3c7e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:12:26 +0200
Subject: [PATCH 687/721] Fix: Ghost Counter area detection (#2696)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/combat/ghostcounter/GhostCounter.kt | 8 +++++++-
 .../at/hannibal2/skyhanni/features/misc/IslandAreas.kt    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 40e329f20cdf..14abcfad6f3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.PurseChangeCause
 import at.hannibal2.skyhanni.events.PurseChangeEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
@@ -24,6 +25,7 @@ import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.isUsingCTGho
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.preFormat
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil.prettyTime
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
+import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ChatUtils.chat
@@ -332,7 +334,6 @@ object GhostCounter {
             }
         }
 
-        inMist = LorenzUtils.skyBlockArea == "The Mist"
         update()
 
         if (event.repeatSeconds(2)) {
@@ -341,6 +342,11 @@ object GhostCounter {
         }
     }
 
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        inMist = IslandAreas.currentAreaName == "The Mist"
+    }
+
     @SubscribeEvent
     fun onActionBarUpdate(event: ActionBarUpdateEvent) {
         if (!isEnabled()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index 439e434c146e..dfa60478a6c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -276,5 +276,5 @@ object IslandAreas {
         hasMoved = true
     }
 
-    fun isEnabled() = LorenzUtils.inSkyBlock && config.let { it.pathfinder.enabled || it.enterTitle || it.inWorld }
+    fun isEnabled() = LorenzUtils.inSkyBlock
 }

From a0229f243df1a158543e8b33923c839e7a017746 Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:26:08 +0100
Subject: [PATCH 688/721] Feature: Show unique hoppity eggs in the warp menu
 (#2625)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../event/hoppity/HoppityEggsConfig.java      | 11 ++++
 .../features/event/hoppity/WarpMenuUniques.kt | 58 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/hoppity/WarpMenuUniques.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
index 8bbaa962ca26..3fd83db69655 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/hoppity/HoppityEggsConfig.java
@@ -211,4 +211,15 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean petWarning = false;
+
+    @Expose
+    @ConfigOption(name = "Show uniques in Warp Menu", desc = "Shows your unique eggs in the Warp Menu during the hoppity event.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean uniquesWarpMenu = true;
+
+    @Expose
+    @ConfigOption(name = "Hide when maxed", desc = "Stops the above feature from working when the island is complete.")
+    @ConfigEditorBoolean
+    public boolean uniquesWarpMenuHideMax = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/WarpMenuUniques.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/WarpMenuUniques.kt
new file mode 100644
index 000000000000..939dea1b702f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/WarpMenuUniques.kt
@@ -0,0 +1,58 @@
+package at.hannibal2.skyhanni.features.event.hoppity
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object WarpMenuUniques {
+
+    /**
+     * REGEX-TEST: §bSkyBlock Hub
+     * REGEX-TEST: §aThe Barn§7 - §bSpawn
+     * REGEX-TEST: §aCrystal Hollows§7 - §bEntrance
+     */
+    private val islandNamePattern by RepoPattern.pattern(
+        "inventory.warpmenu.island.name",
+        "§[ab](?<name>[\\w ']+)(?:§7 - §b.*)?",
+    )
+
+    private val collectedEggStorage: MutableMap<IslandType, MutableSet<LorenzVec>>?
+        get() = ChocolateFactoryAPI.profileStorage?.collectedEggLocations
+
+    private val config get() = SkyHanniMod.feature.event.hoppityEggs
+
+    @SubscribeEvent
+    fun onTooltip(event: LorenzToolTipEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!config.uniquesWarpMenu) return
+        if (!HoppityAPI.isHoppityEvent()) return
+        if (event.slot.inventory.name != "Fast Travel") return
+
+        val name = islandNamePattern.matchMatcher(event.slot.stack.displayName) {
+            group("name")
+        } ?: return
+
+        val island = when (name) {
+            "SkyBlock Hub" -> IslandType.HUB
+            "The Barn" -> IslandType.THE_FARMING_ISLANDS
+            else -> IslandType.getByNameOrNull(name) ?: return
+        }
+        if (island == IslandType.DUNGEON_HUB) return
+
+        if (HoppityEggLocations.apiEggLocations[island]?.size == null) return
+        val maxEggs = 15
+        val collectedEggs = collectedEggStorage?.get(island)?.size ?: 0
+
+        if (collectedEggs >= maxEggs && config.uniquesWarpMenuHideMax) return
+
+        event.toolTip.add(2, "§7Collected Hoppity Eggs: ${if (collectedEggs == maxEggs) "§a" else ""}$collectedEggs/$maxEggs")
+    }
+}

From 2ebce56d4fa44fb12ec15a436feea6c43f7ecd8b Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <thatgravyboat@gmail.com>
Date: Wed, 9 Oct 2024 08:14:16 -0230
Subject: [PATCH 689/721] Improvement: Add Suggestion Provider and guild
 support in tab complete (#2637)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/commands/TabCompleteConfig.java  |  12 +-
 .../at/hannibal2/skyhanni/data/GuildAPI.kt    |   6 +-
 .../features/commands/PartyCommands.kt        |  29 -----
 .../commands/suggestions/SuggestionEntry.kt   |  31 +++++
 .../suggestions/SuggestionProvider.kt         |  83 ++++++++++++
 .../commands/tabcomplete/PlayerTabComplete.kt | 122 +++++++++++-------
 .../commands/tabcomplete/TabComplete.kt       |  18 ++-
 7 files changed, 208 insertions(+), 93 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionEntry.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionProvider.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java
index 790224761e1e..388cec87da93 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java
@@ -36,22 +36,22 @@ public class TabCompleteConfig {
     public boolean party = true;
 
     @Expose
-    @ConfigOption(name = "VIP Visits", desc = "Tab-complete the visit to special users with cake souls on it.")
+    @ConfigOption(name = "Guild", desc = "Tab-complete Guild Members.")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean vipVisits = true;
+    public boolean guild = false;
 
     @Expose
-    @ConfigOption(name = "/gfs Sack", desc = "Tab-complete §e/gfs §7sack items.")
+    @ConfigOption(name = "VIP Visits", desc = "Tab-complete the visit to special users with cake souls on it.")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean gfsSack = true;
+    public boolean vipVisits = true;
 
     @Expose
-    @ConfigOption(name = "Party Commands", desc = "Tab-complete commonly used party commands.")
+    @ConfigOption(name = "/gfs Sack", desc = "Tab-complete §e/gfs §7sack items.")
     @ConfigEditorBoolean
     @FeatureToggle
-    public boolean partyCommands = true;
+    public boolean gfsSack = true;
 
     @Expose
     @ConfigOption(name = "View Recipe", desc = "Tab-complete item IDs in the the Hypixel command §e/viewrecipe§7. Only items with recipes are tab completed.")
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt
index 541eb323cf8f..1e98b61e424a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt
@@ -38,7 +38,7 @@ object GuildAPI {
         }
     }
 
-    fun isInGuild(name: String) = ProfileStorageData.playerSpecific?.guildMembers?.let {
-        name in it
-    } ?: false
+    fun isInGuild(name: String) = name in getAllMembers()
+
+    fun getAllMembers() = ProfileStorageData.playerSpecific?.guildMembers ?: emptyList()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
index e7b3333dd7eb..3cbd43a785a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.commands
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.FriendAPI
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.PartyAPI.partyLeader
 import at.hannibal2.skyhanni.data.PartyAPI.transferVoluntaryPattern
@@ -11,7 +10,6 @@ import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -115,25 +113,9 @@ object PartyCommands {
         if (command == "pk" || command == "pt" || command == "pp" && config.shortCommands) {
             return PartyAPI.partyMembers
         }
-
-        if (command == "p" || command == "party") {
-            val friends = if (config.tabComplete.friends) {
-                FriendAPI.getAllFriends().filter { it.bestFriend || !config.tabComplete.onlyBestFriends }.map { it.name }
-            } else {
-                emptyList<String>()
-            }
-            val allOnLobby = EntityUtils.getPlayerEntities().map { it.name }
-            return friends + getPartyCommands() + allOnLobby
-        }
         return null
     }
 
-    private fun getPartyCommands(): List<String> {
-        return if (config.tabComplete.partyCommands && PartyAPI.partyMembers.isNotEmpty()) {
-            otherPartyCommands
-        } else emptyList()
-    }
-
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(5, "commands.usePartyTransferAlias", "commands.shortCommands")
@@ -157,14 +139,3 @@ object PartyCommands {
         )
     }
 }
-
-private val otherPartyCommands = listOf(
-    "Disband",
-    "KickOffline",
-    "Leave",
-    "List",
-    "Mute",
-    "Private",
-    "Warp",
-    "Settings",
-)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionEntry.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionEntry.kt
new file mode 100644
index 000000000000..74fcb0ef0e01
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionEntry.kt
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.features.commands.suggestions
+
+interface SuggestionEntry {
+
+    val suggestions: List<String>
+
+    fun isEntryFor(argument: String): Boolean {
+        return this.suggestions.any { it.equals(argument, ignoreCase = true) }
+    }
+}
+
+data class LiteralSuggestionEntry(override val suggestions: List<String>) : SuggestionEntry
+
+data class CompositeSuggestionEntry(val entries: List<SuggestionEntry>) : SuggestionEntry {
+    override val suggestions: List<String> get() = entries.flatMap { it.suggestions }
+    override fun isEntryFor(argument: String): Boolean = entries.any { it.isEntryFor(argument) }
+}
+
+data class ParentSuggestionEntry(val parent: SuggestionEntry, val children: List<SuggestionEntry>) : SuggestionEntry {
+    override val suggestions: List<String> get() = parent.suggestions
+    override fun isEntryFor(argument: String): Boolean = parent.isEntryFor(argument)
+}
+
+data class LazySuggestionEntry(val supplier: MutableList<String>.() -> Unit) : SuggestionEntry {
+    override val suggestions: List<String> get() = mutableListOf<String>().apply { supplier() }
+}
+
+data class ConditionalSuggestionEntry(val condition: () -> Boolean, val entry: SuggestionEntry) : SuggestionEntry {
+    override val suggestions: List<String> get() = if (condition()) entry.suggestions else emptyList()
+    override fun isEntryFor(argument: String): Boolean = entry.isEntryFor(argument)
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionProvider.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionProvider.kt
new file mode 100644
index 000000000000..eda4c704cbcf
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/suggestions/SuggestionProvider.kt
@@ -0,0 +1,83 @@
+package at.hannibal2.skyhanni.features.commands.suggestions
+
+class SuggestionProvider {
+
+    private val entry = mutableListOf<SuggestionEntry>()
+
+    fun add(entry: SuggestionEntry) {
+        this.entry.add(entry)
+    }
+
+    private fun List<SuggestionEntry>.getEntryForPath(path: List<String>): SuggestionEntry? {
+        val entry = this.firstOrNull { it.isEntryFor(path.first()) }
+        val remainingPath = path.drop(1)
+        if (remainingPath.isNotEmpty()) {
+            if (entry is ParentSuggestionEntry) {
+                return entry.children.getEntryForPath(remainingPath)
+            }
+            return null
+        } else if (entry is ParentSuggestionEntry) {
+            return CompositeSuggestionEntry(entry.children)
+        }
+        return null
+    }
+
+    fun getSuggestions(command: String): List<String> {
+        val arguments = command.lowercase().split(" ")
+        val last = arguments.lastOrNull() ?: ""
+        val suggestions = mutableListOf<String>()
+        if (arguments.size != 1) {
+            entry.getEntryForPath(arguments.dropLast(1))?.suggestions?.let { suggestions.addAll(it) }
+        } else {
+            entry.forEach { suggestions.addAll(it.suggestions) }
+        }
+        return suggestions.filter { it.startsWith(last, ignoreCase = true) }
+    }
+
+    companion object {
+
+        fun build(builder: Builder.() -> Unit): SuggestionProvider {
+            val b = Builder()
+            b.builder()
+            return b.build()
+        }
+    }
+}
+
+class Builder {
+    private val entries = mutableListOf<SuggestionEntry>()
+
+    fun add(entry: SuggestionEntry) {
+        entries.add(entry)
+    }
+
+    fun conditional(condition: () -> Boolean, builder: Builder.() -> Unit) {
+        val childBuilder = Builder()
+        childBuilder.builder()
+        add(ConditionalSuggestionEntry(condition, CompositeSuggestionEntry(childBuilder.entries)))
+    }
+
+    fun literal(vararg literals: String) {
+        add(LiteralSuggestionEntry(literals.toList()))
+    }
+
+    fun lazy(supplier: () -> List<String>) {
+        add(LazySuggestionEntry { addAll(supplier()) })
+    }
+
+    fun group(vararg children: SuggestionEntry) {
+        add(CompositeSuggestionEntry(children.toList()))
+    }
+
+    fun parent(vararg literals: String, children: Builder.() -> Unit) {
+        val childBuilder = Builder()
+        childBuilder.children()
+        add(ParentSuggestionEntry(LiteralSuggestionEntry(literals.toList()), childBuilder.entries))
+    }
+
+    fun build(): SuggestionProvider {
+        val provider = SuggestionProvider()
+        entries.forEach { provider.add(it) }
+        return provider
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
index 070ab478e083..95acec9a6931 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt
@@ -3,9 +3,12 @@ package at.hannibal2.skyhanni.features.commands.tabcomplete
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.FriendAPI
+import at.hannibal2.skyhanni.data.GuildAPI
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.jsonobjects.repo.VipVisitsJson
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.commands.suggestions.LazySuggestionEntry
+import at.hannibal2.skyhanni.features.commands.suggestions.SuggestionProvider
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.EntityUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -15,68 +18,97 @@ object PlayerTabComplete {
 
     private val config get() = SkyHanniMod.feature.misc.commands.tabComplete
     private var vipVisits = listOf<String>()
-    private val ignoredCommandCategories = mapOf(
-        "f" to listOf(PlayerCategory.FRIENDS),
-        "friend" to listOf(PlayerCategory.FRIENDS),
 
-        "msg" to listOf(),
-        "w" to listOf(),
-        "tell" to listOf(),
-        "boop" to listOf(),
+    private val friendsEntry = lazyEntry { FriendAPI.getAllFriends().map { it.name } }
+    private val partyMembersEntry = lazyEntry { PartyAPI.partyMembers }
+    private val guildMembersEntry = lazyEntry { GuildAPI.getAllMembers() }
+    private val vipVisitsEntry = lazyEntry { vipVisits }
+    private val islandPlayersEntry = lazyEntry { EntityUtils.getPlayerEntities().map { it.name } }
+
+    private val suggestions = SuggestionProvider.build {
+        parent("f", "friend") {
+            parent("accept", "add", "deny") { add(getExcluding(PlayerCategory.FRIENDS)) }
+            parent("best") { add(friendsEntry) }
+            parent("remove", "nickname") { add(friendsEntry) }
+            parent("list") { literal("best") }
+            literal("help", "notifications", "removeall", "requests")
+        }
 
-        "visit" to listOf(),
-        "invite" to listOf(),
-        "ah" to listOf(),
+        parent("g", "guild") {
+            parent("invite") { add(getExcluding(PlayerCategory.GUILD)) }
+            parent("kick", "transfer", "setrank", "promote", "demote") { add(guildMembersEntry) }
+            parent("mute", "unmute") {
+                add(guildMembersEntry)
+                literal("everyone")
+            }
+            parent("member") { add(guildMembersEntry) }
+            literal(
+                "top", "toggle", "tagcolor", "tag", "slow", "settings", "rename", "quest", "permissions", "party", "onlinemode",
+                "online", "officerchat", "notifications", "mypermissions", "motd", "menu", "members", "log", "leave", "info", "history",
+                "help", "discord", "disband", "create", "chat", "accept",
+            )
+        }
 
-        "pv" to listOf(), // NEU's Profile Viewer
-        "shmarkplayer" to listOf(), // SkyHanni's Mark Player
+        parent("p", "party") {
+            parent("accept", "invite") { add(getExcluding(PlayerCategory.PARTY)) }
+            conditional({ PartyAPI.partyMembers.isNotEmpty() }) {
+                parent("kick", "demote", "promote", "transfer") { add(partyMembersEntry) }
+                literal("chat", "disband", "kickoffline", "leave", "list", "mute", "poll", "private", "settings", "warp")
+            }
+        }
 
-        "trade" to listOf(PlayerCategory.FRIENDS, PlayerCategory.PARTY),
-    )
+        parent("w", "msg", "tell", "boop") { add(getExcluding()) }
 
-    @SubscribeEvent
-    fun onRepoReload(event: RepositoryReloadEvent) {
-        val data = event.getConstant<VipVisitsJson>("VipVisits")
-        vipVisits = data.vipVisits
-    }
+        parent("visit") {
+            add(getExcluding())
+            conditional({ config.vipVisits }) {
+                add(vipVisitsEntry)
+            }
+        }
 
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(2, "misc.tabCompleteCommands", "commands.tabComplete")
+        parent("invite") { add(getExcluding()) }
+        parent("ah") { add(getExcluding()) }
+
+        parent("pv") { add(getExcluding()) }
+        parent("shmarkplayer") { add(getExcluding()) }
+
+        parent("trade") { add(islandPlayersEntry) }
     }
 
     enum class PlayerCategory {
         FRIENDS,
         ISLAND_PLAYERS,
         PARTY,
+        GUILD,
     }
 
-    fun handleTabComplete(command: String): List<String>? {
-        val ignoredCategories = ignoredCommandCategories[command] ?: return null
-
-        return buildList {
+    private fun getExcluding(vararg categories: PlayerCategory) = LazySuggestionEntry {
+        if (config.friends && PlayerCategory.FRIENDS !in categories) {
+            addAll(FriendAPI.getAllFriends().filter { it.bestFriend || !config.onlyBestFriends }.map { it.name })
+        }
+        if (config.islandPlayers && PlayerCategory.ISLAND_PLAYERS !in categories) {
+            addAll(EntityUtils.getPlayerEntities().map { it.name })
+        }
+        if (config.party && PlayerCategory.PARTY !in categories) {
+            addAll(PartyAPI.partyMembers)
+        }
+        if (config.guild && PlayerCategory.GUILD !in categories) {
+            addAll(GuildAPI.getAllMembers())
+        }
+    }
 
-            if (config.friends && PlayerCategory.FRIENDS !in ignoredCategories) {
-                FriendAPI.getAllFriends().filter { it.bestFriend || !config.onlyBestFriends }.forEach { add(it.name) }
-            }
+    private fun lazyEntry(getter: () -> List<String>) = LazySuggestionEntry { addAll(getter()) }
 
-            if (config.islandPlayers && PlayerCategory.ISLAND_PLAYERS !in ignoredCategories) {
-                for (entity in EntityUtils.getPlayerEntities()) {
-                    add(entity.name)
-                }
-            }
+    fun handleTabComplete(command: String): List<String>? = suggestions.getSuggestions(command).takeIf { it.isNotEmpty() }?.distinct()
 
-            if (config.party && PlayerCategory.PARTY !in ignoredCategories) {
-                for (member in PartyAPI.partyMembers) {
-                    add(member)
-                }
-            }
+    @SubscribeEvent
+    fun onRepoReload(event: RepositoryReloadEvent) {
+        val data = event.getConstant<VipVisitsJson>("VipVisits")
+        vipVisits = data.vipVisits
+    }
 
-            if (config.vipVisits && command == "visit") {
-                for (visit in vipVisits) {
-                    add(visit)
-                }
-            }
-        }
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "misc.tabCompleteCommands", "commands.tabComplete")
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/TabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/TabComplete.kt
index 602c4a3b9e10..aa66b69377dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/TabComplete.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/TabComplete.kt
@@ -14,20 +14,18 @@ object TabComplete {
     @SubscribeEvent
     fun handleTabComplete(event: TabCompletionEvent) {
         val splits = event.leftOfCursor.split(" ")
-        if (splits.size > 1) {
-            var command = splits.first().lowercase()
-            if (command.startsWith("/")) {
-                command = command.substring(1)
-                customTabComplete(command)?.let {
-                    event.addSuggestions(it)
-                }
-            }
+        if (splits.size <= 1) return
+        var command = splits.first().lowercase()
+        if (!command.startsWith("/")) return
+        command = command.substring(1)
+        customTabComplete(event.leftOfCursor.substring(1), command)?.let {
+            event.addSuggestions(it)
         }
     }
 
-    private fun customTabComplete(command: String): List<String>? {
+    private fun customTabComplete(fullCommand: String, command: String): List<String>? {
         GetFromSacksTabComplete.handleTabComplete(command)?.let { return it }
-        PlayerTabComplete.handleTabComplete(command)?.let { return it }
+        PlayerTabComplete.handleTabComplete(fullCommand)?.let { return it }
         CollectionTracker.handleTabComplete(command)?.let { return it }
         PartyCommands.customTabComplete(command)?.let { return it }
         ViewRecipeCommand.customTabComplete(command)?.let { return it }

From 4c7409ca07be69d2708f22db6bba229a18557ce7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:14:56 +0200
Subject: [PATCH 690/721] Fix: empty list in compact experiment rewards (#2702)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/chat/CompactExperimentRewards.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
index 286166ee7c0b..8ad277b4a419 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactExperimentRewards.kt
@@ -21,7 +21,7 @@ object CompactExperimentRewards {
 
     private val config get() = SkyHanniMod.feature.chat
 
-    private var gainedRewards = mutableListOf<String>()
+    private val gainedRewards = mutableListOf<String>()
     private var lastTimeTableOpened = SimpleTimeMark.farPast()
     private var currentMessage = ""
 
@@ -89,7 +89,7 @@ object CompactExperimentRewards {
     }
 
     private fun sendMessage(reward: String?) {
-        if (gainedRewards.last() != reward || currentMessage == "") return
+        if (gainedRewards.lastOrNull() != reward || currentMessage == "") return
 
         val expList = mutableListOf<String>().apply {
             gainedRewards.forEach { add("§8+$it") }

From 6b01ce6c00663b929893e091646971e71becc3be Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:28:21 +0200
Subject: [PATCH 691/721] Feature: Inventory Focus Mode (#2694)

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
---
 .../features/inventory/FocusModeConfig.java   | 22 ++++++++++++
 .../features/inventory/InventoryConfig.java   |  5 +++
 .../skyhanni/features/inventory/FocusMode.kt  | 35 +++++++++++++++++++
 .../skyhanni/utils/InventoryUtils.kt          |  2 ++
 4 files changed, 64 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/FocusModeConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/FocusMode.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/FocusModeConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/FocusModeConfig.java
new file mode 100644
index 000000000000..3211354fec3d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/FocusModeConfig.java
@@ -0,0 +1,22 @@
+package at.hannibal2.skyhanni.config.features.inventory;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import org.lwjgl.input.Keyboard;
+
+public class FocusModeConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "In focus mode you only see the name of the item instead of the whole description.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Toggle Key", desc = "Key to toggle the focus mode on and off.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int toggleKey = Keyboard.KEY_NONE;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
index 6e064ced6420..71ab7c792147 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java
@@ -84,6 +84,11 @@ public class InventoryConfig {
     @Accordion
     public PersonalCompactorConfig personalCompactor = new PersonalCompactorConfig();
 
+    @Expose
+    @ConfigOption(name = "Focus Mode", desc="")
+    @Accordion
+    public FocusModeConfig focusMode = new FocusModeConfig();
+
     @Expose
     @ConfigOption(name = "RNG Meter", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/FocusMode.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/FocusMode.kt
new file mode 100644
index 000000000000..c02f2993399a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/FocusMode.kt
@@ -0,0 +1,35 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzToolTipEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object FocusMode {
+
+    private val config get() = SkyHanniMod.feature.inventory.focusMode
+
+    private var toggle = true
+
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onLorenzToolTip(event: LorenzToolTipEvent) {
+        if (!isEnabled() || !toggle) return
+        if(event.toolTip.isEmpty()) return
+        event.toolTip = mutableListOf(event.toolTip.first())
+    }
+
+    @SubscribeEvent
+    fun onLorenzTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        if (!config.toggleKey.isKeyClicked()) return
+        toggle = !toggle
+    }
+
+    fun isEnabled() = LorenzUtils.inSkyBlock && InventoryUtils.inContainer() && config.enabled
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index 7ff17f96506b..0f025e50ba50 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -41,6 +41,8 @@ object InventoryUtils {
 
     fun inInventory() = Minecraft.getMinecraft().currentScreen is GuiChest
 
+    fun inContainer() = Minecraft.getMinecraft().currentScreen is GuiContainer
+
     fun ContainerChest.getInventoryName() = this.lowerChestInventory.displayName.unformattedText.trim()
 
     fun getWindowId(): Int? = (Minecraft.getMinecraft().currentScreen as? GuiChest)?.inventorySlots?.windowId

From 201e41b8a9f26c9c3fb04164f0a28986006b25a2 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:21:55 +0200
Subject: [PATCH 692/721] Backend: Stats API (#2253)

Co-authored-by: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../combat/FerocityDisplayConfig.java         |   2 +-
 .../storage/ProfileSpecificStorage.java       |   4 +
 .../skyhanni/data/model/SkyblockStat.kt       | 208 +++++++++++++-----
 .../features/combat/FerocityDisplay.kt        |  33 +--
 4 files changed, 165 insertions(+), 82 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java
index d212a4a0797b..605a31a2b4da 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java
@@ -13,7 +13,7 @@ public class FerocityDisplayConfig {
     @ConfigOption(
         name = "Enabled",
         desc = "Show ferocity stat as single GUI element.\n" +
-        "§eRequires tab list widget enabled and ferocity selected to work."
+        "§eRequires tab list widget enabled and ferocity selected to update live."
     )
     @ConfigEditorBoolean
     @FeatureToggle
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 4ccb0823d512..4ad2c8eb300a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -6,6 +6,7 @@
 import at.hannibal2.skyhanni.data.MaxwellAPI;
 import at.hannibal2.skyhanni.data.jsonobjects.local.HotmTree;
 import at.hannibal2.skyhanni.data.model.ComposterUpgrade;
+import at.hannibal2.skyhanni.data.model.SkyblockStat;
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker;
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostData;
 import at.hannibal2.skyhanni.features.dungeon.CroesusChestTracker;
@@ -203,6 +204,9 @@ public static class CarnivalStorage {
         public Map<CarnivalGoal, Boolean> goals = new HashMap<>();
     }
 
+    @Expose
+    public Map<SkyblockStat,Double> stats = new HashMap<>(SkyblockStat.getEntries().size());
+
     @Expose
     public MaxwellPowerStorage maxwell = new MaxwellPowerStorage();
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index f31c95958659..d1c6dede0327 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -1,69 +1,115 @@
 package at.hannibal2.skyhanni.data.model
 
+import at.hannibal2.skyhanni.data.ProfileStorageData
+import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.intellij.lang.annotations.Language
 import java.util.EnumMap
+import java.util.regex.Pattern
+import kotlin.math.roundToInt
 
-enum class SkyblockStat(val icon: String) {
-    DAMAGE("§c❁"),
-    HEALTH("§c❤"),
-    DEFENSE("§a❈"),
-    STRENGTH("§c❁"),
-    INTELLIGENCE("§b✎"),
-
-    CRIT_DAMAGE("§9☠"),
-    CRIT_CHANCE("§9☣"),
-    FEROCITY("§c⫽"),
-    BONUS_ATTACK_SPEED("§e⚔"),
-    ABILITY_DAMAGE("§c๑"),
-    HEALTH_REGEN("§c❣"),
-    VITALITY("§4♨"),
-    MENDING("§a☄"),
-    TRUE_DEFENCE("§7❂"),
-    SWING_RANGE("§eⓈ"),
-    SPEED("§f✦"),
-    SEA_CREATURE_CHANCE("§3α"),
-    MAGIC_FIND("§b✯"),
-    PET_LUCK("§d♣"),
-    FISHING_SPEED("§b☂"),
-    BONUS_PEST_CHANCE("§2ൠ"),
-    COMBAT_WISDOM("§3☯"),
-    MINING_WISDOM("§3☯"),
-    FARMING_WISDOM("§3☯"),
-    FORAGING_WISDOM("§3☯"),
-    FISHING_WISDOM("§3☯"),
-    ENCHANTING_WISDOM("§3☯"),
-    ALCHEMY_WISDOM("§3☯"),
-    CARPENTRY_WISDOM("§3☯"),
-    RUNECRAFTING_WISDOM("§3☯"),
-    SOCIAL_WISDOM("§3☯"),
-    TAMING_WISDOM("§3☯"),
-    MINING_SPEED("§6⸕"),
-    BREAKING_POWER("§2Ⓟ"),
-    PRISTINE("§5✧"),
-    FORAGING_FORTUNE("§☘"),
-    FARMING_FORTUNE("§6☘"),
-
-    MINING_SPREAD("§e▚"),
-    MINING_FORTUNE("§6☘"),
-    ORE_FORTUNE("§6☘"),
-    DWARVEN_METAL_FORTUNE("§6☘"),
-    BLOCK_FORTUNE("§6☘"),
-    GEMSTONE_FORTUNE("§6☘"),
-
-    FEAR("§a☠"),
-    HEAT_RESISTANCE("§c♨"),
-
-    UNKNOWN("§c?")
+enum class SkyblockStat(
+    val icon: String,
+    @Language("RegExp") tabListPatternS: String,
+    @Language("RegExp") menuPatternS: String,
+) {
+    DAMAGE("§c❁", "", ""),  // Weapon only
+    HEALTH("§c❤", " Health: §r§c❤(?<value>.*)", " §c❤ Health §f(?<value>.*)"), // TODO get from action bar
+    DEFENSE("§a❈", " Defense: §r§a❈(?<value>.*)", " §a❈ Defense §f(?<value>.*)"), // TODO get from action bar
+    STRENGTH("§c❁", " Strength: §r§c❁(?<value>.*)", " §c❁ Strength §f(?<value>.*)"),
+    INTELLIGENCE("§b✎", " Intelligence: §r§b✎(?<value>.*)", " §b✎ Intelligence §f(?<value>.*)"), // TODO get from action bar
+    CRIT_DAMAGE("§9☠", " Crit Damage: §r§9☠(?<value>.*)", " §9☠ Crit Damage §f(?<value>.*)"),
+    CRIT_CHANCE("§9☣", " Crit Chance: §r§9☣(?<value>.*)", " §9☣ Crit Chance §f(?<value>.*)"),
+    FEROCITY("§c⫽", " Ferocity: §r§c⫽(?<value>.*)", " §c⫽ Ferocity §f(?<value>.*)"),
+    BONUS_ATTACK_SPEED("§e⚔", " Attack Speed: §r§e⚔(?<value>.*)", " §e⚔ Bonus Attack Speed §f(?<value>.*)"),
+    ABILITY_DAMAGE("§c๑", " Ability Damage: §r§c๑(?<value>.*)", " §c๑ Ability Damage §f(?<value>.*)"),
+    HEALTH_REGEN("§c❣", " Health Regen: §r§c❣(?<value>.*)", " §c❣ Health Regen §f(?<value>.*)"),
+    VITALITY("§4♨", " Vitality: §r§4♨(?<value>.*)", " §4♨ Vitality §f(?<value>.*)"),
+    MENDING("§a☄", " Mending: §r§a☄(?<value>.*)", " §a☄ Mending §f(?<value>.*)"),
+    TRUE_DEFENCE("§7❂", " True Defense: §r§f❂(?<value>.*)", " §f❂ True Defense §f(?<value>.*)"),
+    SWING_RANGE("§eⓈ", " Swing Range: §r§eⓈ(?<value>.*)", " §eⓈ Swing Range §f(?<value>.*)"),
+    SPEED("§f✦", " Speed: §r§f✦(?<value>.*)", " §f✦ Speed §f(?<value>.*)"), // TODO add the way sba did get it (be careful with 500+ Speed)
+    SEA_CREATURE_CHANCE("§3α", " Sea Creature Chance: §r§3α(?<value>.*)", " §3α Sea Creature Chance §f(?<value>.*)"),
+    MAGIC_FIND("§b✯", " Magic Find: §r§b✯(?<value>.*)", " §b✯ Magic Find §f(?<value>.*)"),
+    PET_LUCK("§d♣", " Pet Luck: §r§d♣(?<value>.*)", " §d♣ Pet Luck §f(?<value>.*)"),
+    FISHING_SPEED("§b☂", " Fishing Speed: §r§b☂(?<value>.*)", " §b☂ Fishing Speed §f(?<value>.*)"),
+    DOUBLE_HOOK_CHANCE("§9⚓", " Double Hook Chance: §r§9⚓(?<value>.*)", ""),
+    BONUS_PEST_CHANCE("§2ൠ", " (?:§r§7§m)?Bonus Pest Chance: (?:§r§2)?ൠ(?<value>.*)", " (?:§7§m|§2)ൠ Bonus Pest Chance (?:§f)?(?<value>.*)"),
+    COMBAT_WISDOM("§3☯", " Combat Wisdom: §r§3☯(?<value>.*)", " §3☯ Combat Wisdom §f(?<value>.*)"),
+    MINING_WISDOM("§3☯", " Mining Wisdom: §r§3☯(?<value>.*)", " §3☯ Mining Wisdom §f(?<value>.*)"),
+    FARMING_WISDOM("§3☯", " Farming Wisdom: §r§3☯(?<value>.*)", " §3☯ Farming Wisdom §f(?<value>.*)"),
+    FORAGING_WISDOM("§3☯", " Foraging Wisdom: §r§3☯(?<value>.*)", " §3☯ Foraging Wisdom §f(?<value>.*)"),
+    FISHING_WISDOM("§3☯", " Fishing Wisdom: §r§3☯(?<value>.*)", " §3☯ Fishing Wisdom §f(?<value>.*)"),
+    ENCHANTING_WISDOM("§3☯", " Enchanting Wisdom: §r§3☯(?<value>.*)", " §3☯ Enchanting Wisdom §f(?<value>.*)"),
+    ALCHEMY_WISDOM("§3☯", " Alchemy Wisdom: §r§3☯(?<value>.*)", " §3☯ Alchemy Wisdom §f(?<value>.*)"),
+    CARPENTRY_WISDOM("§3☯", " Carpentry Wisdom: §r§3☯(?<value>.*)", " §3☯ Carpentry Wisdom §f(?<value>.*)"),
+    RUNECRAFTING_WISDOM("§3☯", " Runecrafting Wisdom: §r§3☯(?<value>.*)", " §3☯ Runecrafting Wisdom §f(?<value>.*)"),
+    SOCIAL_WISDOM("§3☯", " Social Wisdom: §r§3☯(?<value>.*)", " §3☯ Social Wisdom §f(?<value>.*)"),
+    TAMING_WISDOM("§3☯", " Taming Wisdom: §r§3☯(?<value>.*)", " §3☯ Taming Wisdom §f(?<value>.*)"),
+    MINING_SPEED("§6⸕", " Mining Speed: §r§6⸕(?<value>.*)", " §6⸕ Mining Speed §f(?<value>.*)"),
+    BREAKING_POWER("§2Ⓟ", "", " §2Ⓟ Breaking Power §f(?<value>.*)"),
+    PRISTINE("§5✧", " Pristine: §r§5✧(?<value>.*)", " §5✧ Pristine §f(?<value>.*)"),
+    FORAGING_FORTUNE("§☘", " Foraging Fortune: §r§6☘(?<value>.*)", " §6☘ Foraging Fortune §f(?<value>.*)"),
+    FARMING_FORTUNE("§6☘", " (?:§r§7§m)?Farming Fortune: (?:§r§6)?☘(?<value>.*)", " (?:§7§m|§6)☘ Farming Fortune (?:§f)?(?<value>.*)"),
+    MINING_FORTUNE("§6☘", " Mining Fortune: §r§6☘(?<value>.*)", " §6☘ Mining Fortune §f(?<value>.*)"),
+    FEAR("§a☠", "", ""), // Skyblock does not like fear. It only shows during Great Spook, therefore no Data.
+    COLD_RESISTANCE("§b❄", " Cold Resistance: §r§b❄(?<value>.*)", ""),
+    WHEAT_FORTUNE("§7☘", "", " §7(?:§m)☘ Wheat Fortune (?<value>.*)"),
+    CARROT_FORTUNE("§7☘", "", " §7(?:§m)☘ Carrot Fortune (?<value>.*)"),
+    POTATO_FORTUNE("§7☘", "", " §7(?:§m)☘ Potato Fortune (?<value>.*)"),
+    PUMPKIN_FORTUNE("§7☘", "", " §7(?:§m)☘ Pumpkin Fortune (?<value>.*)"),
+    MELON_FORTUNE("§7☘", "", " §7(?:§m)☘ Melon Fortune (?<value>.*)"),
+    MUSHROOM_FORTUNE("§7☘", "", " §7(?:§m)☘ Mushroom Fortune (?<value>.*)"),
+    CACTUS_FORTUNE("§7☘", "", " §7(?:§m)☘ Cactus Fortune (?<value>.*)"),
+    NETHER_WART_FORTUNE("§7☘", "", " §7(?:§m)☘ Nether Wart Fortune (?<value>.*)"),
+    COCOA_BEANS_FORTUNE("§7☘", "", " §7(?:§m)☘ Cocoa Beans Fortune (?<value>.*)"),
+    SUGAR_CANE_FORTUNE("§7☘", "", " §7(?:§m)☘ Sugar Cane Fortune (?<value>.*)"),
+
+    MINING_SPREAD("§e▚", " (§r§7§m)?Mining Spread: (§r§e)?▚(?<value>.*)", " (§7§m|§e)▚ Mining Spread (§f)?(?<value>.*)"),
+    GEMSTONE_SPREAD("§e▚", " (§r§7§m)?Mining Spread: (§r§e)?▚(?<value>.*)", " (§7§m|§e)▚ Gemstone Spread (§f)?(?<value>.*)"),
+    ORE_FORTUNE("§6☘", " Ore Fortune: §r§6☘(?<value>.*)", " §6☘ Ore Fortune §f103"),
+    DWARVEN_METAL_FORTUNE("§6☘", " Dwarven Metal Fortune: §r§6☘(?<value>.*)", " §6☘ Dwarven Metal Fortune §f(?<value>.*)"),
+    BLOCK_FORTUNE("§6☘", " Block Fortune: §r§6☘(?<value>.*)", " §6☘ Block Fortune §f(?<value>.*)"),
+    GEMSTONE_FORTUNE("§6☘", " Gemstone Fortune: §r§6☘(?<value>.*)", " §6☘ Gemstone Fortune §f(?<value>.*)"),
+    HEAT_RESISTANCE("§c♨", " Heat Resistance: §r§c♨(?<value>.*)", " §c♨ Heat Resistance §f(?<value>.*)"),
+
+    UNKNOWN("§c?", "", "")
     ;
 
+    var lastKnownValue: Double
+        get() = ProfileStorageData.profileSpecific?.stats?.get(this) ?: 0.0
+        set(value) {
+            ProfileStorageData.profileSpecific?.stats?.set(this, value)
+        }
+
+    var lastSource: StatSourceType = StatSourceType.UNKNOWN
+
     val capitalizedName = name.lowercase().allLettersFirstUppercase()
 
     val iconWithName = "$icon $capitalizedName"
 
+    val keyName = name.lowercase().replace('_', '.')
+
+    val displayValue get() = icon + lastKnownValue.roundToInt()
+
+    val tablistPattern by RepoPattern.pattern("stats.tablist.$keyName", tabListPatternS)
+    val menuPattern by RepoPattern.pattern("stats.menu.$keyName", menuPatternS)
+
     fun asString(value: Int) = (if (value > 0) "+" else "") + value.toString() + " " + this.icon
 
+    @SkyHanniModule
     companion object {
+
         val fontSizeOfLargestIcon by lazy {
             entries.maxOf { Minecraft.getMinecraft().fontRendererObj.getStringWidth(it.icon) } + 1
         }
@@ -71,6 +117,59 @@ enum class SkyblockStat(val icon: String) {
         fun getValueOrNull(string: String): SkyblockStat? = entries.firstOrNull { it.name == string }
 
         fun getValue(string: String): SkyblockStat = getValueOrNull(string) ?: UNKNOWN
+
+        init {
+            entries.forEach {
+                it.tablistPattern
+                it.menuPattern
+            }
+        }
+
+        @SubscribeEvent
+        fun onInventory(event: InventoryFullyOpenedEvent) {
+            if (!LorenzUtils.inSkyBlock) return
+            onSkyblockMenu(event)
+            onStatsMenu(event)
+        }
+
+        private const val PLAYER_STATS_SLOT_INDEX = 13
+
+        private fun onSkyblockMenu(event: InventoryFullyOpenedEvent) {
+            if (event.inventoryName != "SkyBlock Menu") return
+            val list = event.inventoryItems[PLAYER_STATS_SLOT_INDEX]?.getLore() ?: return
+            DelayedRun.runNextTick {  // Delayed to not impact opening time
+                assignEntry(list, StatSourceType.SKYBLOCK_MENU) { it.menuPattern }
+            }
+        }
+
+        private val statsMenuRelevantSlotIndexes = listOf(15, 16, 24, 25)
+
+        private fun onStatsMenu(event: InventoryFullyOpenedEvent) {
+            if (event.inventoryName != "Your Equipment and Stats") return
+            val list = statsMenuRelevantSlotIndexes.mapNotNull { event.inventoryItems[it]?.getLore() }.flatten()
+            if (list.isEmpty()) return
+            DelayedRun.runNextTick {  // Delayed to not impact opening time
+                assignEntry(list, StatSourceType.STATS_MENU) { it.menuPattern }
+            }
+        }
+
+        @SubscribeEvent
+        fun onTabList(event: WidgetUpdateEvent) {
+            if (!event.isWidget(TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS)) return
+            val type = if (event.isWidget(TabWidget.DUNGEON_SKILLS_AND_STATS)) StatSourceType.TABLIST_DUNGEON else StatSourceType.TABLIST
+            assignEntry(event.lines, type) { it.tablistPattern }
+        }
+
+        private fun assignEntry(lines: List<String>, type: StatSourceType, pattern: (SkyblockStat) -> Pattern) {
+            for (line in lines) for (entry in entries) {
+                val matchResult = pattern(entry).matchMatcher(line) {
+                    groupOrNull("value")?.replace("[,%]".toRegex(), "")?.toDouble()
+                } ?: continue
+                entry.lastKnownValue = matchResult
+                entry.lastSource = type
+                break // Exit the inner loop once a match is found
+            }
+        }
     }
 }
 
@@ -93,3 +192,10 @@ class SkyblockStatList : EnumMap<SkyblockStat, Double>(SkyblockStat::class.java)
     }
 }
 
+enum class StatSourceType {
+    UNKNOWN,
+    SKYBLOCK_MENU,
+    STATS_MENU,
+    TABLIST,
+    TABLIST_DUNGEON,
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
index c30299e4f167..8ea8449f467a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
@@ -1,14 +1,11 @@
 package at.hannibal2.skyhanni.features.combat
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.data.model.SkyblockStat
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -16,35 +13,11 @@ object FerocityDisplay {
 
     private val config get() = SkyHanniMod.feature.combat.ferocityDisplay
 
-    /**
-     * REGEX-TEST:  Ferocity: §r§c⫽14
-     */
-    private val ferocityPattern by RepoPattern.pattern(
-        "combat.ferocity.tab",
-        " Ferocity: §r§c⫽(?<stat>.*)",
-    )
-
-    private var display = ""
-
-    @SubscribeEvent
-    fun onTabListUpdate(event: WidgetUpdateEvent) {
-        if (!isEnabled()) return
-        if (!event.isWidget(TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS)) return
-        display = ""
-        if (event.isClear()) return
-        val stat = event.lines.matchFirst(ferocityPattern) {
-            group("stat")
-        } ?: return
-
-        display = "§c⫽$stat"
-
-    }
-
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isEnabled()) return
-
-        config.position.renderString(display, posLabel = "Ferocity Display")
+        if (SkyblockStat.FEROCITY.lastKnownValue == 0.0) return
+        config.position.renderString(SkyblockStat.FEROCITY.displayValue, posLabel = "Ferocity Display")
     }
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled

From b16ec45e018563dad295caac58ff6759cb99eb4d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 9 Oct 2024 21:56:11 +0200
Subject: [PATCH 693/721] Version 0.28 Beta 1

---
 docs/CHANGELOG.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/FEATURES.md  |  5 +++++
 root.gradle.kts   |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d7381099902b..6f2dcbba0155 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,55 @@
 # SkyHanni - Change Log
 
+## Version 0.28 (in Beta)
+
+### New Features
+
+#### Hoppity Features
+
++ Added an easier way to check your unique Hoppity Eggs collected on each island. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2625)
+    +  Shows your progress in the Warp Menu.
+    +  Can be automatically hidden when an island is complete.
+
+#### Inventory Features
+
++ Added Focus Mode. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2694)
+    +  In Focus Mode, only the name of the item is displayed instead of the full description.
+
+### Improvements
+
+#### Inventory Improvements
+
++ Added Pocket Sack-in-a-Sack support to Estimated Item Value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2698)
+
+#### Chat and Command Improvements
+
++ Replaced repeated SkyHanni messages with the previous message. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2700)
++ Added support for Guilds in player-related tab completions. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
++ Added support for all Guild and Friend commands in tab completions. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
+
+### Fixes
+
+#### Fishing Fixes
+
++ Fixed fishing displays showing in dungeons. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2697)
+
+#### Inventory Fixes
+
++ Fixed "No Guardian Pet warning" not supporting Pet Rule "On open Experimentation Table". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2699)
++ Fixed an error with compact experiment rewards chat messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2702)
+
+#### Combat Fixes
+
++ Fixed Ghost Counter display appearing while in incorrect areas on the map. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2696)
+
+### Technical Details
+
++ Assigned 'backend' label to PRs with 'backend' in the title. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2690)
+    +  This does not change the functionality of the current bug fix label.
++ Added SuggestionProvider. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
+    +  This new class simplifies building suggestion trees.
++ Added Stats API. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2253)
+
 ## Version 0.27
 
 ### New Features
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index a57725958d57..ed5c74ad3e0b 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -226,6 +226,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Display the price per Stonk when taking the minimum bid in the Stonks Auction (Richard Menu). - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2195)
 + Added Ultimate Enchant Star. - Empa (https://github.com/hannibal002/SkyHanni/pull/2612)
     + Shows a star on Enchanted Books with an Ultimate Enchant.
++ Added Focus Mode. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2694)
+    +  In Focus Mode, only the name of the item is displayed instead of the full description.
 
 </details>
 <details open><summary>
@@ -1005,6 +1007,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Abi = Dark Green.
 + Added a toggle to highlight found rabbits in Hoppity's Collection menu. - the1divider (https://github.com/hannibal002/SkyHanni/pull/2438)
 + Added the ability to change the color of missing rabbit dyes in Hoppity's Collection to reflect rabbit rarity. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2522)
++ Added an easier way to check your unique Hoppity Eggs collected on each island. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2625)
+    +  Shows your progress in the Warp Menu.
+    +  Can be automatically hidden when an island is complete.
 
 ### The Carnival
 
diff --git a/root.gradle.kts b/root.gradle.kts
index a121d65f8dcb..e3af39d26071 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.27"
+    version = "0.28.Beta.1"
     repositories {
         mavenCentral()
         mavenLocal()

From 0d34625ac157a477f04226fa76026601ecb79a49 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:57:50 -0400
Subject: [PATCH 694/721] =?UTF-8?q?Erroneous=20=C2=A7r=20(#2708)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 34dcef6bd804..28a2b4b4f081 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -281,7 +281,7 @@ object ChatFilter {
         "§6§lGOOD CATCH! §r§bYou found a §r§fSpooky Bait§r§b.",
         "§e[NPC] Jacob§f: §rMy contest has started!",
         "§eObtain a §r§6Booster Cookie §r§efrom the community shop in the hub!",
-        "§rUnknown command. Type \"/help\" for help. ('uhfdsolguhkjdjfhgkjhdfdlgkjhldkjhlkjhsldkjfhldshkjf')",
+        "Unknown command. Type \"/help\" for help. ('uhfdsolguhkjdjfhgkjhdfdlgkjhldkjhlkjhsldkjfhldshkjf')",
     )
 
     private val skymallMessages = listOf(

From 0671e35163d55ab0f940aa6806a0d7bfb2876429 Mon Sep 17 00:00:00 2001
From: HiZe <super@hize.be>
Date: Fri, 11 Oct 2024 18:33:04 +0200
Subject: [PATCH 695/721] Feature: Change lava color (#1885)

Co-authored-by: nea <nea@nea.moe>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
---
 .../features/fishing/FishingConfig.java       |  5 +++
 .../fishing/LavaReplacementConfig.java        | 23 ++++++++++++++
 .../features/fishing/LavaReplacement.kt       | 31 +++++++++++++++++++
 .../mixins/transformers/MixinBlockLiquid.java | 27 ++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/fishing/LavaReplacement.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinBlockLiquid.java

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
index 759da0f0eb34..3cae9f2f569d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java
@@ -66,6 +66,11 @@ public class FishingConfig {
     @Accordion
     public SeaCreatureTrackerConfig seaCreatureTracker = new SeaCreatureTrackerConfig();
 
+    @Expose
+    @ConfigOption(name = "Lava Replacement", desc = "")
+    @Accordion
+    public LavaReplacementConfig lavaReplacement = new LavaReplacementConfig();
+
     @Expose
     @ConfigOption(
         name = "Shark Fish Counter",
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java
new file mode 100644
index 000000000000..e1cd4fd33c85
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java
@@ -0,0 +1,23 @@
+package at.hannibal2.skyhanni.config.features.fishing;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import io.github.notenoughupdates.moulconfig.observer.Property;
+import net.minecraft.client.Minecraft;
+
+public class LavaReplacementConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Replace the lava texture with the water texture.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public Property<Boolean> enabled = Property.of(false);
+
+    @Expose
+    @ConfigOption(name = "Only In Crimson Isle", desc = "Enable the water texture only in Crimson Isle.")
+    @ConfigEditorBoolean
+    public Property<Boolean> onlyInCrimsonIsle = Property.of(true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/LavaReplacement.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/LavaReplacement.kt
new file mode 100644
index 000000000000..663f2d87aae1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/LavaReplacement.kt
@@ -0,0 +1,31 @@
+package at.hannibal2.skyhanni.features.fishing
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ConditionalUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object LavaReplacement {
+
+    private val config get() = SkyHanniMod.feature.fishing.lavaReplacement
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        ConditionalUtils.onToggle(config.enabled, config.onlyInCrimsonIsle) {
+            Minecraft.getMinecraft().renderGlobal.loadRenderers()
+        }
+    }
+
+    @JvmStatic
+    fun replaceLava(): Boolean {
+        if (!LorenzUtils.inSkyBlock || !config.enabled.get()) return false
+        if (config.onlyInCrimsonIsle.get() && !IslandType.CRIMSON_ISLE.isInIsland()) return false
+        return true
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinBlockLiquid.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinBlockLiquid.java
new file mode 100644
index 000000000000..0e9b7779f046
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinBlockLiquid.java
@@ -0,0 +1,27 @@
+package at.hannibal2.skyhanni.mixins.transformers;
+
+import at.hannibal2.skyhanni.features.fishing.LavaReplacement;
+import net.minecraft.client.renderer.BlockFluidRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(value = BlockFluidRenderer.class)
+public abstract class MixinBlockLiquid {
+
+    @Shadow
+    private TextureAtlasSprite[] atlasSpritesWater;
+
+    @ModifyVariable(
+        method = "renderFluid",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockLiquid;colorMultiplier(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/BlockPos;)I")
+    )
+    TextureAtlasSprite[] replaceRenderedFluid(TextureAtlasSprite[] value) {
+        if (LavaReplacement.replaceLava()) {
+            return this.atlasSpritesWater;
+        }
+        return value;
+    }
+}

From 7c2d4ed566246513bc438272e436627412147d62 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 11 Oct 2024 12:42:33 -0400
Subject: [PATCH 696/721] Backend: Detekt Fixes Part 6 (#2657)

Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .idea/dictionaries/default_user.xml           |   3 +-
 .../at/hannibal2/skyhanni/api/SkillAPI.kt     |   6 +-
 .../skyhanni/config/ConfigUpdaterMigrator.kt  |  24 ++-
 .../skyhanni/config/commands/Commands.kt      |   4 +-
 .../data/hypixel/chat/PlayerNameFormatter.kt  |  42 ++--
 .../hypixel/chat/event/PlayerAllChatEvent.kt  |  19 +-
 .../at/hannibal2/skyhanni/data/mob/Mob.kt     |  17 +-
 .../skyhanni/data/mob/MobDetection.kt         |  15 +-
 .../hannibal2/skyhanni/data/mob/MobFilter.kt  |   6 +-
 .../skyhanni/data/repo/RepoManager.kt         |  14 +-
 .../features/bingo/card/BingoCardDisplay.kt   |  15 +-
 .../features/bingo/card/BingoCardTips.kt      |   4 +-
 .../nextstephelper/BingoNextStepHelper.kt     |   6 +-
 .../nextstephelper/steps/CollectionStep.kt    |   4 +-
 .../features/chat/PlayerDeathMessages.kt      |   3 +-
 .../skyhanni/features/combat/BestiaryData.kt  |  41 ++--
 .../damageindicator/DamageIndicatorManager.kt |   4 +-
 .../endernodetracker/EnderNodeTracker.kt      |  10 +-
 .../combat/ghostcounter/GhostCounter.kt       |   2 +-
 .../features/commands/PartyChatCommands.kt    |   4 +-
 .../features/dungeon/CroesusChestTracker.kt   |  15 +-
 .../dungeon/DungeonArchitectFeatures.kt       |   3 +-
 .../features/dungeon/DungeonHideItems.kt      |   4 +-
 .../features/dungeon/DungeonLividFinder.kt    |   2 +-
 .../event/carnival/CarnivalZombieShootout.kt  |  10 +-
 .../features/event/diana/DianaFixChat.kt      |   6 +-
 .../features/event/diana/SoopyGuessBurrow.kt  |   3 +-
 .../features/event/hoppity/HoppityAPI.kt      |   8 +-
 .../event/hoppity/HoppityEggLocator.kt        |   4 +-
 .../event/hoppity/HoppityEventSummary.kt      |  11 +-
 .../features/event/hoppity/HoppityNpc.kt      |   3 +-
 .../features/fishing/ChumBucketHider.kt       |   6 +-
 .../features/fishing/trophy/TrophyFishAPI.kt  |   2 +-
 .../features/garden/AnitaMedalProfit.kt       |   2 +-
 .../skyhanni/features/garden/CropType.kt      |   4 +-
 .../features/garden/GardenNextJacobContest.kt |   6 +-
 .../skyhanni/features/garden/GardenPlotAPI.kt |   2 +-
 .../features/garden/GardenYawAndPitch.kt      |   6 +-
 .../garden/composter/ComposterDisplay.kt      |   3 +-
 .../garden/composter/ComposterOverlay.kt      |   6 +-
 .../garden/contest/JacobContestTimeNeeded.kt  |  23 ++-
 .../garden/farming/CropMoneyDisplay.kt        |   2 +-
 .../features/garden/farming/CropSpeedMeter.kt |   2 +-
 .../garden/farming/FarmingWeightDisplay.kt    |  26 ++-
 .../farming/GardenCropMilestoneDisplay.kt     |  26 ++-
 .../garden/fortuneguide/FFGuideGUI.kt         |   8 +-
 .../garden/fortuneguide/FortuneStats.kt       |   3 +-
 .../garden/fortuneguide/FortuneUpgrades.kt    |   2 +-
 .../plots/GardenPlotMenuHighlighting.kt       |   4 +-
 .../features/garden/pests/PestFinder.kt       |   4 +-
 .../HighlightVisitorsOutsideOfGarden.kt       |   3 +-
 .../customscoreboard/ScoreboardElements.kt    |  41 ++--
 .../gui/customscoreboard/ScoreboardEvent.kt   |  18 +-
 .../inventory/ItemDisplayOverlayFeatures.kt   |   6 +-
 .../skyhanni/features/inventory/ItemStars.kt  |   2 +-
 .../features/inventory/MaxPurseItems.kt       |   3 +-
 .../features/inventory/ReforgeHelper.kt       |  22 +-
 .../features/inventory/SackDisplay.kt         | 194 ++++++++++--------
 .../SkyblockGuideHighlightFeature.kt          |   4 +-
 .../bazaar/CraftMaterialsFromBazaar.kt        |  17 +-
 .../ChocolateFactoryTooltip.kt                |   2 +-
 .../inventory/craft/CraftableItemList.kt      |   4 +-
 .../ExperimentationTableAPI.kt                |   4 +-
 .../SuperpairDataDisplay.kt                   |  20 +-
 .../SuperpairsClicksAlert.kt                  |  25 ++-
 .../skyhanni/features/mining/TunnelsMaps.kt   |   8 +-
 .../mining/glacitemineshaft/CorpseTracker.kt  |  10 +-
 .../skyhanni/features/minion/MinionXp.kt      |   4 +-
 .../skyhanni/features/misc/CarryTracker.kt    |   2 +-
 .../features/misc/CollectionTracker.kt        |  12 +-
 .../features/misc/JoinCrystalHollows.kt       |   3 +-
 .../misc/PrivateIslandNoPickaxeAbility.kt     |   3 +-
 .../misc/discordrpc/DiscordLocationKey.kt     |  16 +-
 .../misc/discordrpc/DiscordRPCManager.kt      |  30 +--
 .../features/misc/discordrpc/DiscordStatus.kt |   2 +-
 .../items/EstimatedItemValueCalculator.kt     |  26 ++-
 .../misc/items/enchants/EnchantsJson.kt       |  24 ++-
 .../features/misc/limbo/LimboTimeTracker.kt   |   7 +-
 .../DefaultConfigFeatures.kt                  |   4 +-
 .../DefaultConfigOptionGui.kt                 |  20 +-
 .../ashfang/AshfangNextResetCooldown.kt       |   3 +-
 .../skyhanni/features/rift/RiftAPI.kt         |   2 +-
 .../rift/area/dreadfarm/VoltHighlighter.kt    |   3 +-
 .../area/dreadfarm/WoodenButtonsHelper.kt     |   3 +-
 .../livingcave/LivingMetalSuitProgress.kt     |  29 ++-
 .../stillgorechateau/RiftBloodEffigies.kt     |   4 +-
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |   3 +-
 .../everywhere/motes/ShowMotesNpcSellPrice.kt |  46 +++--
 .../features/skillprogress/SkillProgress.kt   | 104 +++++-----
 .../features/slayer/SlayerRngMeterDisplay.kt  |   3 +-
 .../slayer/enderman/EndermanSlayerFeatures.kt |   6 +-
 .../stranded/HighlightPlaceableNpcs.kt        |   4 +-
 .../skyhanni/test/graph/GraphEditor.kt        |  18 +-
 .../skyhanni/test/graph/GraphNodeEditor.kt    |   4 +-
 .../skyhanni/utils/CachedItemData.kt          |   1 +
 .../at/hannibal2/skyhanni/utils/ChatUtils.kt  |  28 +--
 .../skyhanni/utils/ClipboardUtils.kt          |   6 +-
 .../skyhanni/utils/CollectionUtils.kt         |   7 +-
 .../skyhanni/utils/ComputerTimeOffset.kt      |   5 +-
 .../skyhanni/utils/EntityOutlineRenderer.kt   |  22 +-
 .../skyhanni/utils/EssenceItemUtils.kt        |   4 +-
 .../skyhanni/utils/GuiRenderUtils.kt          |   3 +-
 .../skyhanni/utils/ItemNameResolver.kt        |   6 +-
 .../hannibal2/skyhanni/utils/KSerializable.kt |   4 +-
 .../skyhanni/utils/NEUInternalName.kt         |   1 +
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  15 +-
 .../hannibal2/skyhanni/utils/TabListData.kt   |   8 +-
 .../hannibal2/skyhanni/utils/UtilsPatterns.kt |  14 +-
 .../at/hannibal2/skyhanni/utils/chat/Text.kt  |  12 +-
 .../skyhanni/utils/guide/GuideTab.kt          |  34 +--
 .../skyhanni/utils/guide/GuideTablePage.kt    |   3 +-
 .../json/FeatureTogglesByDefaultAdapter.kt    |   3 +-
 .../skyhanni/utils/renderables/Renderable.kt  |   8 +-
 .../utils/renderables/RenderableInventory.kt  |  21 +-
 .../utils/renderables/RenderableUtils.kt      |  10 +-
 .../utils/tracker/BucketedItemTrackerData.kt  |  16 +-
 .../tracker/SkyHanniBucketedItemTracker.kt    |   4 +-
 117 files changed, 857 insertions(+), 595 deletions(-)

diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
index 4c56b1303ca0..86cfbc3f33b1 100644
--- a/.idea/dictionaries/default_user.xml
+++ b/.idea/dictionaries/default_user.xml
@@ -149,6 +149,7 @@
       <w>mineman</w>
       <w>mineshafts</w>
       <w>miniboss</w>
+      <w>minigame</w>
       <w>mirrorverse</w>
       <w>misclick</w>
       <w>missclick</w>
@@ -281,4 +282,4 @@
       <w>yolkar</w>
     </words>
   </dictionary>
-</component>
+</component>
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index 0e35e602fc61..ba8e42d66ee5 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -486,7 +486,8 @@ object SkillAPI {
             1 -> listOf("levelwithxp", "xpforlevel", "goal")
             2 -> if (strings[0].lowercase() == "goal") CommandBase.getListOfStringsMatchingLastWord(
                 strings,
-                SkillType.entries.map { it.displayName })
+                SkillType.entries.map { it.displayName }
+            )
             else
                 listOf()
 
@@ -502,7 +503,8 @@ object SkillAPI {
                 "§6/shskills goal - §bView your current goal",
                 "§6/shskills goal <skill> <level> - §bDefine your goal for <skill>",
                 "",
-            ).joinToString("\n"), prefix = false
+            ).joinToString("\n"),
+            prefix = false
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index 7c41245fc7f8..c9ae8c2c7e89 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -120,21 +120,27 @@ object ConfigUpdaterMigrator {
             logger.log("Starting config transformation from $i to ${i + 1}")
             val storage = accumulator["storage"]?.asJsonObject
             val dynamicPrefix: Map<String, List<String>> = mapOf(
-                "#profile" to
-                    (storage?.get("players")?.asJsonObject?.entrySet()
+                "#profile" to (
+                    storage?.get("players")?.asJsonObject?.entrySet()
                         ?.flatMap { player ->
                             player.value.asJsonObject["profiles"]?.asJsonObject?.entrySet()?.map {
                                 "storage.players.${player.key}.profiles.${it.key}"
                             } ?: listOf()
                         }
-                        ?: listOf()),
-                "#player" to
-                    (storage?.get("players")?.asJsonObject?.entrySet()?.map { "storage.players.${it.key}" }
-                        ?: listOf()),
+                        ?: listOf()
+                    ),
+                "#player" to (
+                    storage?.get("players")?.asJsonObject?.entrySet()?.map { "storage.players.${it.key}" }
+                        ?: listOf()
+                    ),
             )
-            val migration = ConfigFixEvent(accumulator, JsonObject().also {
-                it.add("lastVersion", JsonPrimitive(i + 1))
-            }, i, 0, dynamicPrefix).also { it.postAndCatch() }
+            val migration = ConfigFixEvent(
+                accumulator,
+                JsonObject().also {
+                    it.add("lastVersion", JsonPrimitive(i + 1))
+                },
+                i, 0, dynamicPrefix
+            ).also { it.postAndCatch() }
             logger.log("Transformations scheduled: ${migration.new}")
             val mergesPerformed = merge(migration.old, migration.new)
             logger.log("Migration done with $mergesPerformed merges and ${migration.movesPerformed} moves performed")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 4974c80f2d51..44565aa95451 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -507,7 +507,9 @@ object Commands {
     private fun developersCodingHelp() {
         registerCommand("shrepopatterns", "See where regexes are loaded from") { RepoPatternGui.open() }
         registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) }
-        registerCommand("shtestrabbitpaths", "Tests pathfinding to rabbit eggs. Use a number 0-14.") { HoppityEggLocator.testPathfind(it) }
+        registerCommand("shtestrabbitpaths", "Tests pathfinding to rabbit eggs. Use a number 0-14.") {
+            HoppityEggLocator.testPathfind(it)
+        }
         registerCommand(
             "shtestitem",
             "test item internal name resolving",
diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
index edc4f65b0388..35356f32f3bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt
@@ -125,32 +125,38 @@ object PlayerNameFormatter {
     fun onPrivateChat(event: PrivateMessageChatEvent) {
         if (!isEnabled()) return
         event.chatComponent =
-            StringUtils.replaceIfNeeded(event.chatComponent, Text.text("§d${event.direction}") {
-                appendText(" ")
-                appendSibling(nameFormat(event.authorComponent))
-                appendText("§f: ")
-                appendSibling(event.messageComponent.intoComponent())
-            }) ?: return
+            StringUtils.replaceIfNeeded(
+                event.chatComponent,
+                Text.text("§d${event.direction}") {
+                    appendText(" ")
+                    appendSibling(nameFormat(event.authorComponent))
+                    appendText("§f: ")
+                    appendSibling(event.messageComponent.intoComponent())
+                }
+            ) ?: return
     }
 
     @SubscribeEvent
     fun onPlayerShowItemChat(event: PlayerShowItemChatEvent) {
         if (!isEnabled()) return
-        event.chatComponent = StringUtils.replaceIfNeeded(event.chatComponent, Text.text("") {
-            appendSibling(
-                nameFormat(
-                    event.authorComponent,
-                    levelColor = event.levelComponent?.sampleStyleAtStart()?.color?.toString(),
-                    level = event.levelComponent
+        event.chatComponent = StringUtils.replaceIfNeeded(
+            event.chatComponent,
+            Text.text("") {
+                appendSibling(
+                    nameFormat(
+                        event.authorComponent,
+                        levelColor = event.levelComponent?.sampleStyleAtStart()?.color?.toString(),
+                        level = event.levelComponent
+                    )
                 )
-            )
 
-            appendText(" ")
-            appendSibling(event.action.intoComponent().changeColor(LorenzColor.GRAY))
+                appendText(" ")
+                appendSibling(event.action.intoComponent().changeColor(LorenzColor.GRAY))
 
-            appendText(" ")
-            appendSibling(event.item.intoComponent())
-        }) ?: return
+                appendText(" ")
+                appendSibling(event.item.intoComponent())
+            }
+        ) ?: return
     }
 
     private fun nameFormat(
diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt
index 7d6d1a7ac055..e33165b34acc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt
@@ -21,11 +21,14 @@ class PlayerAllChatEvent(
     val isAGuest by lazy { privateIslandGuest != null }
 
     companion object {
-        private val listenerList = ListenerList(AbstractChatEvent(
-            ComponentSpan.empty(),
-            ComponentSpan.empty(),
-            ChatComponentText(""),
-            "").listenerList)
+        private val listenerList = ListenerList(
+            AbstractChatEvent(
+                ComponentSpan.empty(),
+                ComponentSpan.empty(),
+                ChatComponentText(""),
+                ""
+            ).listenerList
+        )
     }
 
     /**
@@ -45,8 +48,10 @@ class PlayerAllChatEvent(
      * This method is required if [setup] is present.
      */
     @ApiStatus.Internal
-    constructor() : this(null, null, null, "",
-                         ComponentSpan.empty(), ComponentSpan.empty(), ChatComponentText(""))
+    constructor() : this(
+        null, null, null, "",
+        ComponentSpan.empty(), ComponentSpan.empty(), ChatComponentText("")
+    )
 
     /**
      * This method is required if [setup] is present.
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
index 7e7e9f96cdc8..e9eb6729de43 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
@@ -154,9 +154,11 @@ class Mob(
         relativeBoundingBox =
             if (extraEntities.isNotEmpty()) makeRelativeBoundingBox() else null // Inlined updateBoundingBox()
 
-        owner = (ownerName ?: if (mobType == Type.SLAYER) hologram2?.let {
-            summonOwnerPattern.matchMatcher(it.cleanName()) { this.group("name") }
-        } else null)?.let { MobUtils.OwnerShip(it) }
+        owner = (
+            ownerName ?: if (mobType == Type.SLAYER) hologram2?.let {
+                summonOwnerPattern.matchMatcher(it.cleanName()) { this.group("name") }
+            } else null
+            )?.let { MobUtils.OwnerShip(it) }
     }
 
     private fun removeExtraEntitiesFromChecking() =
@@ -164,15 +166,16 @@ class Mob(
             MobData.externRemoveOfRetryAmount += it
         }
 
-    fun updateBoundingBox() {
+    private fun updateBoundingBox() {
         relativeBoundingBox = if (extraEntities.isNotEmpty()) makeRelativeBoundingBox() else null
     }
 
-    private fun makeRelativeBoundingBox() =
-        (baseEntity.entityBoundingBox.union(
+    private fun makeRelativeBoundingBox() = (
+        baseEntity.entityBoundingBox.union(
             extraEntities.filter { it !is EntityArmorStand }
                 .mapNotNull { it.entityBoundingBox },
-        ))?.offset(-baseEntity.posX, -baseEntity.posY, -baseEntity.posZ)
+        )
+        )?.offset(-baseEntity.posX, -baseEntity.posY, -baseEntity.posZ)
 
     fun fullEntityList() =
         baseEntity.toSingletonListOrEmpty() +
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 34f776308fda..014e0a846613 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -97,8 +97,9 @@ object MobDetection {
     }
 
     private fun Mob.watchdogCheck(world: World): Boolean =
-        this.baseEntity.worldObj != world || (this.armorStand?.let { it.worldObj != world }
-            ?: false) || this.extraEntities.any { it.worldObj != world }
+        this.baseEntity.worldObj != world || (
+            this.armorStand?.let { it.worldObj != world } ?: false
+            ) || this.extraEntities.any { it.worldObj != world }
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -338,7 +339,7 @@ object MobDetection {
 
     private fun handleEntityUpdate(entityID: Int): Boolean {
         val entity = EntityUtils.getEntityByID(entityID) as? EntityLivingBase ?: return false
-        getRetry(entity)?.apply { this.entity = entity }
+        getRetry(entity)?.entity = entity
         MobData.currentEntityLiving.refreshReference(entity)
         MobData.previousEntityLiving.refreshReference(entity)
         // update map
@@ -353,10 +354,10 @@ object MobDetection {
             is S0CPacketSpawnPlayer -> addEntityUpdate(packet.entityID)
             // is S0EPacketSpawnObject -> addEntityUpdate(packet.entityID)
             is S01PacketJoinGame -> // one of the first packets that is sent when switching servers inside the BungeeCord Network (please some prove this, I just found it out via Testing)
-            {
-                shouldClear.set(true)
-                allEntitiesViaPacketId.clear()
-            }
+                {
+                    shouldClear.set(true)
+                    allEntitiesViaPacketId.clear()
+                }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
index a9f8a14533ac..5d6111336fbd 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@@ -243,8 +243,10 @@ object MobFilter {
                 baseEntity,
                 armorStand,
                 extraEntityList,
-            ) else (MobFactories.basic(baseEntity, armorStand, extraEntityList)
-                ?: MobFactories.dojo(baseEntity, armorStand))
+            ) else (
+                MobFactories.basic(baseEntity, armorStand, extraEntityList)
+                    ?: MobFactories.dojo(baseEntity, armorStand)
+                )
 
     private fun noArmorStandMobs(baseEntity: EntityLivingBase): MobResult? = when {
         baseEntity is EntityBat -> createBat(baseEntity)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index b3109c9ee4d6..babbb2558def 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -165,8 +165,8 @@ class RepoManager(private val configLocation: File) {
         }
     }
 
-    private fun reloadRepository(answerMessage: String = ""): CompletableFuture<Void?> {
-        val comp = CompletableFuture<Void?>()
+    private fun reloadRepository(answerMessage: String = ""): CompletableFuture<Unit?> {
+        val comp = CompletableFuture<Unit?>()
         if (!atomicShouldManuallyReload.get()) return comp
         ErrorManager.resetCache()
         DelayedRun.onThread.execute {
@@ -232,8 +232,10 @@ class RepoManager(private val configLocation: File) {
             if (unsuccessfulConstants.isNotEmpty()) {
                 val text = mutableListOf<IChatComponent>()
                 text.add(
-                    ("§c[SkyHanni-${SkyHanniMod.version}] §7Repo Issue! Some features may not work. " +
-                        "Please report this error on the Discord!").asComponent(),
+                    (
+                        "§c[SkyHanni-${SkyHanniMod.version}] §7Repo Issue! Some features may not work. " +
+                            "Please report this error on the Discord!"
+                        ).asComponent(),
                 )
                 text.add("§7Repo Auto Update Value: §c${config.repoAutoUpdate}".asComponent())
                 text.add("§7If you have Repo Auto Update turned off, please try turning that on.".asComponent())
@@ -286,13 +288,13 @@ class RepoManager(private val configLocation: File) {
         val repoUser = config.location.user
         val repoName = config.location.name
         val repoBranch = config.location.branch
-        return String.format("https://api.github.com/repos/%s/%s/commits/%s", repoUser, repoName, repoBranch)
+        return "https://api.github.com/repos/$repoUser/$repoName/commits/$repoBranch"
     }
 
     private fun getDownloadUrl(commitId: String?): String {
         val repoUser = config.location.user
         val repoName = config.location.name
-        return String.format("https://github.com/%s/%s/archive/%s.zip", repoUser, repoName, commitId)
+        return "https://github.com/$repoUser/$repoName/archive/$commitId.zip"
     }
 
     @Throws(IOException::class)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt
index 94bd4f6dd8dc..b0f883ac240a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt
@@ -85,12 +85,15 @@ object BingoCardDisplay {
 
         if (BingoAPI.bingoGoals.isEmpty()) {
             newList.add(Renderable.string("§6Bingo Goals:"))
-            newList.add(Renderable.clickAndHover("§cOpen the §e/bingo §ccard.",
-                listOf("Click to run §e/bingo"),
-                onClick = {
-                    HypixelCommands.bingo()
-                }
-            ))
+            newList.add(
+                Renderable.clickAndHover(
+                    "§cOpen the §e/bingo §ccard.",
+                    listOf("Click to run §e/bingo"),
+                    onClick = {
+                        HypixelCommands.bingo()
+                    }
+                )
+            )
         } else {
             if (!config.hideCommunityGoals.get()) {
                 newList.addCommunityGoals()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt
index abf8bbedc701..83b41d3fd759 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt
@@ -81,9 +81,7 @@ object BingoCardTips {
         for (line in bingoTip.guide) {
             toolTip.add(index++, " $line")
         }
-        bingoTip.found?.let {
-            toolTip.add(index++, "§7Found by: §e$it")
-        }
+        toolTip.add(index++, "§7Found by: §e${bingoTip.found}")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
index 2e56a536bc68..69602ec70765 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
@@ -275,7 +275,8 @@ object BingoNextStepHelper {
                     "Emerald",
                     160 * 32,
                     mapOf("Emerald" to 1, "Enchanted Emerald" to 160)
-                ) requires IslandType.DWARVEN_MINES.getStep())
+                ) requires IslandType.DWARVEN_MINES.getStep()
+                )
         }
 
         if (description == "Obtain a Mathematical Hoe Blueprint.") {
@@ -285,7 +286,8 @@ object BingoNextStepHelper {
                     "Jacob's Ticket",
                     32,
                     mapOf("Jacob's Ticket" to 1)
-                ).addItemRequirements() requires IslandType.GARDEN.getStep())
+                ).addItemRequirements() requires IslandType.GARDEN.getStep()
+                )
         }
 
         crystalPattern.matchMatcher(description) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt
index 7871ae28d512..10c968d845f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt
@@ -6,5 +6,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 class CollectionStep(collectionName: String, amountNeeded: Int) :
     ProgressionStep(amountNeeded.shortFormat() + " $collectionName Collection", amountNeeded.toLong()) {
 
-    val internalName by lazy { NEUInternalName.fromItemName(if (collectionName == "Mushroom") "Red Mushroom" else collectionName) }
+    val internalName by lazy {
+        NEUInternalName.fromItemName(if (collectionName == "Mushroom") "Red Mushroom" else collectionName)
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index d256bfe63eb7..2afc9276bbf0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -35,7 +35,8 @@ object PlayerDeathMessages {
         if (MarkedPlayerManager.config.highlightInChat &&
             !DungeonAPI.inDungeon() &&
             !LorenzUtils.inKuudraFight &&
-            MarkedPlayerManager.isMarkedPlayer(name)) {
+            MarkedPlayerManager.isMarkedPlayer(name)
+        ) {
             val reason = event.reason
             val color = MarkedPlayerManager.config.chatColor.getChatColor()
             ChatUtils.chat(" §c☠ $color$name §7$reason", false)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
index 3b2b936802c0..f40e437e5403 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
@@ -279,10 +279,12 @@ object BestiaryData {
             val isUnlocked = mob.actualRealTotalKill != 0.toLong()
             val isMaxed = mob.percentToMax() >= 1
             if (!isUnlocked) {
-                newDisplay.add(buildList {
-                    add(" §7- ")
-                    add("${mob.name}: §cNot unlocked!")
-                })
+                newDisplay.add(
+                    buildList {
+                        add(" §7- ")
+                        add("${mob.name}: §cNot unlocked!")
+                    }
+                )
                 continue
             }
             if (isMaxed && config.hideMaxed) continue
@@ -358,7 +360,8 @@ object BestiaryData {
                 // todo: avoid ordinal
                 config.numberFormat = BestiaryConfig.NumberFormatEntry.entries[(config.numberFormat.ordinal + 1) % 2]
                 update()
-            })
+            }
+        )
 
         newDisplay.addButton(
             prefix = "§7Display Type: ",
@@ -367,7 +370,8 @@ object BestiaryData {
                 // todo: avoid ordinal
                 config.displayType = DisplayTypeEntry.entries[(config.displayType.ordinal + 1) % 8]
                 update()
-            })
+            }
+        )
 
         newDisplay.addButton(
             prefix = "§7Number Type: ",
@@ -377,6 +381,7 @@ object BestiaryData {
                 update()
             }
         )
+
         newDisplay.addButton(
             prefix = "§7Hide Maxed: ",
             getName = HideMaxed.entries[if (config.hideMaxed) 1 else 0].type,
@@ -391,18 +396,20 @@ object BestiaryData {
         if (catList.isNotEmpty()) {
             newDisplay.addAsSingletonList("§7Category")
             for (cat in catList) {
-                newDisplay.add(buildList {
-                    add(" §7- ${cat.name}§7: ")
-                    val element = when {
-                        cat.familiesCompleted == cat.totalFamilies -> "§c§lCompleted!"
-                        cat.familiesFound == cat.totalFamilies -> "§b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed"
-                        cat.familiesFound < cat.totalFamilies ->
-                            "§b${cat.familiesFound}§7/§b${cat.totalFamilies} §7found, §b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed"
-
-                        else -> continue
+                newDisplay.add(
+                    buildList {
+                        add(" §7- ${cat.name}§7: ")
+                        val element = when {
+                            cat.familiesCompleted == cat.totalFamilies -> "§c§lCompleted!"
+                            cat.familiesFound == cat.totalFamilies -> "§b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed"
+                            cat.familiesFound < cat.totalFamilies ->
+                                "§b${cat.familiesFound}§7/§b${cat.totalFamilies} §7found, §b${cat.familiesCompleted}§7/§b${cat.totalFamilies} §7completed"
+
+                            else -> continue
+                        }
+                        add(element)
                     }
-                    add(element)
-                })
+                )
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index 4f0dad4b84be..7f5b42e3c538 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -367,8 +367,8 @@ object DamageIndicatorManager {
                 getCustomHealth(entityData, health, entity, maxHealth) ?: return null
             }
 
-            if (data.containsKey(entity.uniqueID)) {
-                val lastHealth = data[entity.uniqueID]!!.lastHealth
+            data[entity.uniqueID]?.let {
+                val lastHealth = it.lastHealth
                 checkDamage(entityData, health, lastHealth)
                 tickDamage(entityData.damageCounter)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 0363543bffd0..4a0bed69c6a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -148,7 +148,9 @@ object EnderNodeTracker {
         if (!isEnabled()) return
         if (!ProfileStorageData.loaded) return
 
-        val change = event.sackChanges.firstOrNull { it.internalName == EnderNode.MITE_GEL.internalName && it.delta > 0 } ?: return
+        val change = event.sackChanges.firstOrNull {
+            it.internalName == EnderNode.MITE_GEL.internalName && it.delta > 0
+        } ?: return
 
         tracker.modify { storage ->
             storage.lootCount.addOrPut(EnderNode.MITE_GEL, change.delta)
@@ -268,7 +270,11 @@ object EnderNodeTracker {
         addSearchString("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
     }
 
-    private fun calculateEnderArmor(storage: Data) = storage.lootCount.filter { isEnderArmor(it.key) }.map { it.value }.sum()
+    private fun calculateEnderArmor(storage: Data) = storage.lootCount.filter {
+        isEnderArmor(it.key)
+    }.map {
+        it.value
+    }.sum()
 
     private fun formatDisplay(map: List<Searchable>): List<Searchable> {
         if (!ProfileStorageData.loaded) return emptyList()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 14abcfad6f3c..2ef652e4a93a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -385,7 +385,7 @@ object GhostCounter {
                 }
                 percent = 100f.coerceAtMost(percent)
                 if (!parse) {
-                    sb.append(" (").append(String.format("%.2f", percent)).append("%)")
+                    sb.append(" (").append(String.format(Locale.US, "%.2f", percent)).append("%)")
                 } else {
                     sb.append(" (").append(nf.format(currentSkillXp))
                     if (totalSkillXp != 0) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
index b6bcff3bd13e..4651570e4b8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@@ -200,8 +200,8 @@ object PartyChatCommands {
         var message = "Ignored player list:"
         if (blacklist.size > 15) {
             message += "\n§e"
-            blacklist.forEachIndexed { i, it ->
-                message += it
+            blacklist.forEachIndexed { i, blacklistedMessage ->
+                message += blacklistedMessage
                 if (i < blacklist.size - 1) {
                     message += ", "
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
index 8b2d600695e1..377d7bfd405f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt
@@ -138,9 +138,11 @@ object CroesusChestTracker {
             val lore = item.getLore()
 
             if (run.floor == null) run.floor =
-                (if (masterPattern.matches(item.name)) "M" else "F") + (lore.firstNotNullOfOrNull {
-                    floorPattern.matchMatcher(it) { group("floor").romanToDecimal() }
-                } ?: "0")
+                (if (masterPattern.matches(item.name)) "M" else "F") + (
+                    lore.firstNotNullOfOrNull {
+                        floorPattern.matchMatcher(it) { group("floor").romanToDecimal() }
+                    } ?: "0"
+                    )
             run.openState = when {
                 keyUsedPattern.anyMatches(lore) -> OpenedState.KEY_USED
                 openedPattern.anyMatches(lore) -> OpenedState.OPENED
@@ -274,11 +276,12 @@ object CroesusChestTracker {
     fun generateMaxChestAsList(): List<DungeonRunInfo> = generateMaxChest().toList()
     private fun generateMaxChest(): Sequence<DungeonRunInfo> = generateSequence { DungeonRunInfo() }.take(MAX_CHESTS)
 
-    fun getLastActiveChest(includeDungeonKey: Boolean = false): Int =
-        (croesusChests?.indexOfLast {
+    private fun getLastActiveChest(includeDungeonKey: Boolean = false): Int = (
+        croesusChests?.indexOfLast {
             it.floor != null &&
                 (it.openState == OpenedState.UNOPENED || (includeDungeonKey && it.openState == OpenedState.OPENED))
-        } ?: -1) + 1
+        } ?: -1
+        ) + 1
 
     enum class OpenedState {
         UNOPENED,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt
index 662c366045b1..284f8424ffe2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt
@@ -49,7 +49,8 @@ object DungeonArchitectFeatures {
         if (architectItemAmount <= 0) return
 
         GetFromSackAPI.getFromChatMessageSackItems(
-            architectsFirstDraft, "§c§lPUZZLE FAILED! §r§b$name §r§efailed a puzzle. \n" +
+            architectsFirstDraft,
+            "§c§lPUZZLE FAILED! §r§b$name §r§efailed a puzzle. \n" +
                 "§eClick here to get §5Architect's First Draft §7(§e${architectItemAmount}x left§7)"
         )
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
index a5237aeb666a..4f29aca52eac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@@ -202,7 +202,9 @@ object DungeonHideItems {
     }
 
     private fun shouldColorMovingSkull(entity: Entity) =
-        SkyHanniMod.feature.dungeon.highlightSkeletonSkull && movingSkeletonSkulls[entity]?.let { it + 200 > System.currentTimeMillis() } ?: false
+        SkyHanniMod.feature.dungeon.highlightSkeletonSkull && movingSkeletonSkulls[entity]?.let {
+            it + 200 > System.currentTimeMillis()
+        } ?: false
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
index 474e8367f6dd..9cc4b8a100a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@@ -63,7 +63,7 @@ object DungeonLividFinder {
 
         if (event.isMod(20)) {
             if (lividArmorStand == null) {
-            val amountArmorStands = EntityUtils.getEntities<EntityArmorStand>().filter { it.name.contains("Livid") }.count()
+                val amountArmorStands = EntityUtils.getEntities<EntityArmorStand>().count { it.name.contains("Livid") }
                 if (amountArmorStands >= 8) {
                     ErrorManager.logErrorStateWithData(
                         "Could not find livid",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
index 9edf05b7bdfe..8a0d4296ff19 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt
@@ -86,9 +86,13 @@ object CarnivalZombieShootout {
                 zombie to type
             }.toMap()
 
-            drawZombies =
-                if (config.highestOnly) nearbyZombies.filterValues { zombieType -> zombieType == nearbyZombies.values.maxByOrNull { it.points } }
-                else nearbyZombies
+            drawZombies = if (config.highestOnly)
+                nearbyZombies.filterValues { zombieType ->
+                    zombieType == nearbyZombies.values.maxByOrNull {
+                        it.points
+                    }
+                }
+            else nearbyZombies
 
             lastUpdate.zombie = SimpleTimeMark.now()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
index 20cf553b802c..2f3d19c24cb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
@@ -73,7 +73,8 @@ object DianaFixChat {
                         HypixelCommands.particleQuality("high")
                         errorCounter = 0
                         ChatUtils.chat("Now try again!")
-                    })
+                    }
+                )
             }
         } else {
             if (!hasSetToggleMusic) {
@@ -87,7 +88,8 @@ object DianaFixChat {
                             HypixelCommands.toggleMusic()
                             errorCounter = 0
                             ChatUtils.chat("Now try again, please!")
-                        })
+                        }
+                    )
                 }
             } else {
                 ErrorManager.logErrorStateWithData(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index 0bb5e3dc17a4..35016eda3740 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -175,7 +175,8 @@ object SoopyGuessBurrow {
                     }
 
                     val (a, b, c) = solveEquationThing(
-                        LorenzVec(slopeThing.size - 5, slopeThing.size - 3, slopeThing.size - 1), LorenzVec(
+                        LorenzVec(slopeThing.size - 5, slopeThing.size - 3, slopeThing.size - 1),
+                        LorenzVec(
                             slopeThing[slopeThing.size - 5],
                             slopeThing[slopeThing.size - 3],
                             slopeThing[slopeThing.size - 1]
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 0a144aa2f49d..593326c67f13 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -58,7 +58,9 @@ object HoppityAPI {
 
     fun getLastRabbit(): String = this.lastNameCache
     fun isHoppityEvent() = (SkyblockSeason.currentSeason == SkyblockSeason.SPRING || SkyHanniMod.feature.dev.debug.alwaysHoppitys)
-    fun rarityByRabbit(rabbit: String): LorenzRarity? = hoppityRarities.firstOrNull { it.chatColorCode == rabbit.substring(0, 2) }
+    fun rarityByRabbit(rabbit: String): LorenzRarity? = hoppityRarities.firstOrNull {
+        it.chatColorCode == rabbit.substring(0, 2)
+    }
 
     /**
      * REGEX-TEST: §f1st Chocolate Milestone
@@ -111,14 +113,14 @@ object HoppityAPI {
                         EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§9Fish the Rabbit"
                         lastMeal = STRAY
-                        duplicate = it.stack.getLore().any { line -> duplicatePseudoStrayPattern.matches(line)}
+                        duplicate = it.stack.getLore().any { line -> duplicatePseudoStrayPattern.matches(line) }
                         attemptFireRabbitFound()
                     }
                     "El Dorado" -> {
                         EggFoundEvent(STRAY, it.slotNumber).post()
                         lastName = "§6El Dorado"
                         lastMeal = STRAY
-                        duplicate = it.stack.getLore().any { line -> duplicateDoradoStrayPattern.matches(line)}
+                        duplicate = it.stack.getLore().any { line -> duplicateDoradoStrayPattern.matches(line) }
                         attemptFireRabbitFound()
                     }
                     else -> return@matchMatcher
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index 7a5e726d2f06..e5425af34213 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -283,7 +283,9 @@ object HoppityEggLocator {
         IslandGraphs.pathFind(location, "Hoppity Egg", color, condition = { config.showPathFinder })
     }
 
-    fun isValidEggLocation(location: LorenzVec): Boolean = HoppityEggLocations.islandLocations.any { it.distance(location) < 5.0 }
+    fun isValidEggLocation(location: LorenzVec): Boolean = HoppityEggLocations.islandLocations.any {
+        it.distance(location) < 5.0
+    }
 
     private fun ReceiveParticleEvent.isVillagerParticle() = type == EnumParticleTypes.VILLAGER_HAPPY && speed == 0.0f && count == 1
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
index b2f806c8000a..4a536465c28f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
@@ -98,8 +98,8 @@ object HoppityEventSummary {
 
         if (year < currentYear || (year == currentYear && !isSpring) && config.eventSummary.enabled) {
             sendStatsMessage(stats, year)
-            (ProfileStorageData.profileSpecific?.hoppityEventStats?.get(year)?.also { it.summarized = true }
-                ?: ErrorManager.skyHanniError("Could not save summarization state in Hoppity Event Summarization."))
+            ProfileStorageData.profileSpecific?.hoppityEventStats?.get(year)?.also { it.summarized = true }
+                ?: ErrorManager.skyHanniError("Could not save summarization state in Hoppity Event Summarization.")
         }
     }
 
@@ -131,6 +131,10 @@ object HoppityEventSummary {
         )
     }
 
+    private fun HoppityEventStats.getMilestoneCount(): Int =
+        (mealsFound[HoppityEggType.CHOCOLATE_FACTORY_MILESTONE] ?: 0) +
+            (mealsFound[HoppityEggType.CHOCOLATE_SHOP_MILESTONE] ?: 0)
+
     private val summaryOperationList by lazy {
         buildMap<HoppityStat, (sb: StringBuilder, stats: HoppityEventStats, year: Int) -> Unit> {
             put(HoppityStat.MEAL_EGGS_FOUND) { sb, stats, year ->
@@ -155,8 +159,7 @@ object HoppityEventSummary {
             }
 
             put(HoppityStat.MILESTONE_RABBITS) { sb, stats, _ ->
-                ((stats.mealsFound[HoppityEggType.CHOCOLATE_FACTORY_MILESTONE] ?: 0) +
-                    (stats.mealsFound[HoppityEggType.CHOCOLATE_SHOP_MILESTONE] ?: 0)).takeIf { it > 0 }?.let {
+                stats.getMilestoneCount().takeIf { it > 0 }?.let {
                     sb.appendHeadedLine("§7You claimed §b$it §6§lMilestone §r§6${StringUtils.pluralize(it, "Rabbit")}§7.")
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
index 0546e5ff98d2..bf324a8f66b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt
@@ -68,7 +68,8 @@ object HoppityNpc {
                     IslandGraphs.pathFind(
                         LorenzVec(6.4, 70.0, 7.4),
                         "§aHoppity's Shop",
-                        condition = { config.hoppityShopReminder })
+                        condition = { config.hoppityShopReminder }
+                    )
                 }
             },
         )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
index 5f64aba8c2d1..3eac15fc675f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt
@@ -64,7 +64,11 @@ object ChumBucketHider {
         }
 
         // Chum Bucket
-        if (config.hideBucket.get() && entity.inventory.any { it != null && (it.name == "§fEmpty Chum Bucket" || it.name == "§aEmpty Chumcap Bucket") }) {
+        if (config.hideBucket.get() &&
+            entity.inventory.any {
+                it != null && (it.name == "§fEmpty Chum Bucket" || it.name == "§aEmpty Chumcap Bucket")
+            }
+        ) {
             val entityLocation = entity.getLorenzVec()
             for (title in titleEntity.toSet()) {
                 if (entityLocation.equalsIgnoreY(title.getLorenzVec())) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishAPI.kt
index fec662f396a6..3a6333a9c150 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishAPI.kt
@@ -21,7 +21,7 @@ object TrophyFishAPI {
                 |${TrophyRarity.BRONZE.formattedString}: ${formatCount(counts, TrophyRarity.BRONZE)}
                 |
                 |§7Total: ${bestFishObtained.formatCode}${counts.values.sum().addSeparators()}
-            """.trimMargin()
+        """.trimMargin()
     }
 
     private fun formatCount(counts: Map<TrophyRarity, Int>, rarity: TrophyRarity): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
index 6cbda5b04ca7..760df643285a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
@@ -76,7 +76,7 @@ object AnitaMedalProfit {
     }
 
     private fun readItem(slot: Int, item: ItemStack, table: MutableList<DisplayTableEntry>) {
-        val itemName = getItemName(item) ?: return
+        val itemName = getItemName(item)
         if (itemName == " ") return
         if (itemName == "§cClose") return
         if (itemName == "§eUnique Gold Medals") return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
index 3a661161e134..290c5427bb6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
@@ -74,7 +74,9 @@ enum class CropType(
         fun getByNameOrNull(itemName: String): CropType? {
             if (itemName == "Red Mushroom" || itemName == "Brown Mushroom") return MUSHROOM
             if (itemName == "Seeds") return WHEAT
-            return entries.firstOrNull { it.cropName.equals(itemName, ignoreCase = true) || it.simpleName.equals(itemName, ignoreCase = true) }
+            return entries.firstOrNull {
+                it.cropName.equals(itemName, ignoreCase = true) || it.simpleName.equals(itemName, ignoreCase = true)
+            }
         }
 
         fun getByName(name: String) = getByNameOrNull(name) ?: error("No valid crop type '$name'")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index c79bbb46147b..d0a386272a1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -515,8 +515,10 @@ object GardenNextJacobContest {
     }
 
     private fun isEnabled() =
-        config.display && ((LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden)) ||
-            (OutsideSbFeature.NEXT_JACOB_CONTEST.isSelected() && !LorenzUtils.inSkyBlock))
+        config.display && (
+            (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden)) ||
+                (OutsideSbFeature.NEXT_JACOB_CONTEST.isSelected() && !LorenzUtils.inSkyBlock)
+            )
 
     private fun isFetchEnabled() = isEnabled() && config.fetchAutomatically
     private fun isSendEnabled() =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
index 8ad8d21dab1a..373eadfe9463 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
@@ -191,7 +191,7 @@ object GardenPlotAPI {
         }
 
     fun Plot.markExpiredSprayAsNotified() {
-        getData()?.apply { sprayHasNotified = true }
+        getData()?.sprayHasNotified = true
     }
 
     private fun Plot.setSpray(spray: SprayType, duration: Duration) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
index 171df87e70ab..ef1aaa1bd9c4 100755
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt
@@ -60,8 +60,10 @@ object GardenYawAndPitch {
     }
 
     private fun isEnabled() =
-        config.enabled && ((OutsideSbFeature.YAW_AND_PITCH.isSelected() && !LorenzUtils.inSkyBlock) ||
-            (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden)))
+        config.enabled && (
+            (OutsideSbFeature.YAW_AND_PITCH.isSelected() && !LorenzUtils.inSkyBlock) ||
+                (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden))
+            )
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index 058ae15909f9..ffc77934b4c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -49,7 +49,7 @@ object ComposterDisplay {
         val pattern by lazy { rawPattern.toPattern() }
 
         fun addToList(map: Map<DataType, String>): List<Any> {
-            return listOf(displayItem, map[this]!!)
+            return map[this]?.let { listOf(displayItem, it) } ?: emptyList()
         }
     }
 
@@ -72,7 +72,6 @@ object ComposterDisplay {
         val newDisplay = mutableListOf<List<Any>>()
         newDisplay.addAsSingletonList("§bComposter")
 
-
         newDisplay.add(DataType.TIME_LEFT.addToList(tabListData))
 
         val list = mutableListOf<Any>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index d7452725fd05..6059eded9a14 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -344,7 +344,7 @@ object ComposterOverlay {
         newList.addAsSingletonList(" §7$compostPerTitle: §e${multiplier.roundTo(2)}$compostPerTitlePreview")
 
         val organicMatterPrice = getPrice(organicMatterItem)
-        val organicMatterFactor = organicMatterFactors[organicMatterItem]!!
+        val organicMatterFactor = organicMatterFactors[organicMatterItem] ?: 1.0
 
         val organicMatterRequired = ComposterAPI.organicMatterRequiredPer(null)
         val organicMatterRequiredPreview = ComposterAPI.organicMatterRequiredPer(upgrade)
@@ -353,7 +353,7 @@ object ComposterOverlay {
         val organicMatterPricePerPreview = organicMatterPrice * (organicMatterRequiredPreview / organicMatterFactor)
 
         val fuelPrice = getPrice(fuelItem)
-        val fuelFactor = fuelFactors[fuelItem]!!
+        val fuelFactor = fuelFactors[fuelItem] ?: 1.0
 
         val fuelRequired = ComposterAPI.fuelRequiredPer(null)
         val fuelRequiredPreview = ComposterAPI.fuelRequiredPer(upgrade)
@@ -427,7 +427,7 @@ object ComposterOverlay {
             i++
             if (i < testOffset) continue
             if (first == null) first = internalName
-            val factor = factors[internalName]!!
+            val factor = factors[internalName] ?: 1.0
 
             val item = internalName.getItemStack()
             val price = getPrice(internalName)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
index bb9f9ea21773..399c4cfadef2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt
@@ -168,16 +168,19 @@ object JacobContestTimeNeeded {
                 showLine = line
             }
         }
-        map[crop] = Renderable.hoverTips(showLine, buildList {
-            add("§7Time Needed for §9${crop.cropName} Medals§7:")
-            addAll(brackets)
-            add("")
-            val latestFF = crop.getLatestTrueFarmingFortune() ?: 0.0
-            add("§7Latest FF: §e${(latestFF).addSeparators()}")
-            val bps = crop.getBps()?.roundTo(1) ?: 0
-            add("§7${addBpsTitle()}§e${bps.addSeparators()}")
-            addAll(lowBPSWarning)
-        })
+        map[crop] = Renderable.hoverTips(
+            showLine,
+            buildList {
+                add("§7Time Needed for §9${crop.cropName} Medals§7:")
+                addAll(brackets)
+                add("")
+                val latestFF = crop.getLatestTrueFarmingFortune() ?: 0.0
+                add("§7Latest FF: §e${(latestFF).addSeparators()}")
+                val bps = crop.getBps()?.roundTo(1) ?: 0
+                add("§7${addBpsTitle()}§e${bps.addSeparators()}")
+                addAll(lowBPSWarning)
+            }
+        )
     }
 
     private fun addBpsTitle() = if (config.jacobContestCustomBps) "Custom Blocks/Second: " else "Your Blocks/Second: "
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
index 217da97359ac..87306744e4a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
@@ -229,7 +229,7 @@ object CropMoneyDisplay {
             }
 
             val coinsColor = if (isCurrent && config.compact) "§e" else "§6"
-            val moneyArray = moneyPerHourData[internalName]!!
+            val moneyArray = moneyPerHourData[internalName] ?: emptyArray()
 
             for (price in moneyArray) {
                 val finalPrice = price + extraMushroomCowPerkCoins + extraDicerCoins + extraArmorCoins
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
index 74c59674f580..9a47acaa1064 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt
@@ -89,7 +89,7 @@ object CropSpeedMeter {
             snapshot = emptyList()
         } else {
             currentCrop?.let {
-                val crops = it.getCounter() - startCrops[it]!!
+                val crops = it.getCounter() - (startCrops[it] ?: 0L)
                 val blocks = currentBlocks
                 val cropsPerBlocks = (crops.toDouble() / blocks.toDouble()).roundTo(3)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 24edf8d4352b..3da9945b59d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -123,12 +123,6 @@ object FarmingWeightDisplay {
     private var nextPlayers = mutableListOf<UpcomingLeaderboardPlayer>()
     private val nextPlayer get() = nextPlayers.firstOrNull()
 
-    private val recalculate by lazy {
-        ({
-            resetData()
-        })
-    }
-
     private val eliteWeightApiGson by lazy {
         BaseGsonBuilder.gson()
             .registerTypeAdapter(CropType::class.java, SkyHanniTypeAdapters.CROP_TYPE.nullSafe())
@@ -141,22 +135,22 @@ object FarmingWeightDisplay {
             Renderable.clickAndHover(
                 "§cFarming Weight error: Cannot load",
                 listOf("§eClick here to reload the data right now!"),
-                onClick = recalculate,
+                onClick = ::resetData,
             ),
             Renderable.clickAndHover(
                 "§cdata from Elite Farmers!",
                 listOf("§eClick here to reload the data right now!"),
-                onClick = recalculate,
+                onClick = ::resetData,
             ),
             Renderable.clickAndHover(
                 "§eRejoin the garden or",
                 listOf("§eClick here to reload the data right now!"),
-                onClick = recalculate,
+                onClick = ::resetData,
             ),
             Renderable.clickAndHover(
                 "§eclick here to fix it.",
                 listOf("§eClick here to reload the data right now!"),
-                onClick = recalculate,
+                onClick = ::resetData,
             ),
         )
     }
@@ -268,7 +262,7 @@ object FarmingWeightDisplay {
         val nextPlayer = nextPlayer ?: return Renderable.clickAndHover(
             "§cWaiting for leaderboard update...",
             listOf("§eClick here to load new data right now!"),
-            onClick = recalculate,
+            onClick = ::resetData,
         )
         val showRankGoal = leaderboardPosition == -1 || leaderboardPosition > rankGoal
         var nextName =
@@ -304,7 +298,7 @@ object FarmingWeightDisplay {
             return Renderable.clickAndHover(
                 "§cRejoin the garden to show ETA!",
                 listOf("Click here to calculate the data right now!"),
-                onClick = recalculate,
+                onClick = ::resetData,
             )
         }
 
@@ -366,8 +360,12 @@ object FarmingWeightDisplay {
         )
     }
 
-    private fun isEnabled() = ((OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock) ||
-        (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden))) && config.display
+    private fun isEnabled() = (
+        config.display && (
+            OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock
+            ) ||
+            (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden))
+        )
 
     private fun isEtaEnabled() = config.overtakeETA
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index 7189199a9987..aca1751b0082 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -156,14 +156,16 @@ object GardenCropMilestoneDisplay {
         val useCustomGoal = customTargetLevel != 0 && customTargetLevel > currentTier
         nextTier = if (useCustomGoal) customTargetLevel else nextTier
 
-        lineMap[MilestoneTextEntry.MILESTONE_TIER] = Renderable.horizontalContainer(buildList {
-            addCropIconRenderable(crop)
-            if (crop.isMaxed(overflowDisplay) && !overflowDisplay) {
-                addString("§7" + crop.cropName + " §eMAXED")
-            } else {
-                addString("§7" + crop.cropName + " §8$currentTier➜§3$nextTier")
+        lineMap[MilestoneTextEntry.MILESTONE_TIER] = Renderable.horizontalContainer(
+            buildList {
+                addCropIconRenderable(crop)
+                if (crop.isMaxed(overflowDisplay) && !overflowDisplay) {
+                    addString("§7" + crop.cropName + " §eMAXED")
+                } else {
+                    addString("§7" + crop.cropName + " §8$currentTier➜§3$nextTier")
+                }
             }
-        })
+        )
 
         val allowOverflowOrCustom = overflowDisplay || useCustomGoal
         val cropsForNextTier = GardenCropMilestones.getCropsForTier(nextTier, crop, allowOverflowOrCustom)
@@ -302,10 +304,12 @@ object GardenCropMilestoneDisplay {
         val missing = need - have
 
         lineMap[MushroomTextEntry.TITLE] = Renderable.string("§6Mooshroom Cow Perk")
-        lineMap[MushroomTextEntry.MUSHROOM_TIER] = Renderable.horizontalContainer(buildList {
-            addCropIconRenderable(mushroom)
-            addString("§7Mushroom Milestone $nextTier")
-        })
+        lineMap[MushroomTextEntry.MUSHROOM_TIER] = Renderable.horizontalContainer(
+            buildList {
+                addCropIconRenderable(mushroom)
+                addString("§7Mushroom Milestone $nextTier")
+            }
+        )
 
         lineMap[MushroomTextEntry.NUMBER_OUT_OF_TOTAL] = Renderable.string("§e$haveFormat§8/§e$needFormat")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
index 660c772ab47f..3771dd112db7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
@@ -53,9 +53,13 @@ class FFGuideGUI : GuideGUI<FFGuideGUI.FortuneGuidePage>(FortuneGuidePage.OVERVI
             vTab(ItemStack(Items.gold_ingot), Renderable.string("§eBreakdown")) {
                 currentPage = if (currentCrop == null) FortuneGuidePage.OVERVIEW else FortuneGuidePage.CROP
             },
-            vTab(ItemStack(Items.map), Renderable.string("§eUpgrades")) {
+            vTab(
+                ItemStack(Items.map),
+                Renderable.string("§eUpgrades")
+            ) {
                 currentPage = FortuneGuidePage.UPGRADES
-            })
+            }
+        )
         horizontalTabs = buildList {
             add(
                 hTab(ItemStack(Blocks.grass), Renderable.string("§eOverview")) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
index 7b667afaf002..349144299804 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt
@@ -15,7 +15,8 @@ enum class FortuneStats(
     ),
     CROP_TOTAL(
         { crop -> "§6${crop.niceName.firstLetterUppercase()} Farming Fortune" },
-        { "§7§2Farming fortune for this crop" }),
+        { "§7§2Farming fortune for this crop" }
+    ),
     ACCESSORY("§2Talisman Bonus", "§7§2Fortune from your talisman\n§2You get 10☘ per talisman tier"),
     CROP_UPGRADE("§2Crop Upgrade", "§7§2Fortune from Desk crop upgrades\n§2You get 5☘ per level"),
     BASE_TOOL("§2Base tool fortune", "§7§2Crop specific fortune from your tool"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt
index cd76262c06eb..aabee53c8b6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt
@@ -90,7 +90,7 @@ object FortuneUpgrades {
     private fun getEquipmentUpgrades() {
         val visitors = GardenAPI.storage?.uniqueVisitors?.toDouble() ?: 0.0
         for (piece in FarmingItems.equip) {
-            val item = piece.getItem() ?: return
+            val item = piece.getItem()
             // todo tell them to buy the missing item
             if (!item.getInternalName().contains("LOTUS")) return
             val enchantments = item.getEnchantments() ?: emptyMap()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt
index af84bd7717b4..3ca75b1793b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt
@@ -29,7 +29,9 @@ object GardenPlotMenuHighlighting {
             val list = mutableListOf<PlotStatusType>()
             val plot = GardenPlotAPI.plots.find { it.inventorySlot == slot.slotIndex } ?: continue
 
-            val (pestsEnabled, spraysEnabled, locksEnabled, currentEnabled, pastesEnabled) = PlotStatusType.entries.map { it in config.deskPlotStatusTypes }
+            val (pestsEnabled, spraysEnabled, locksEnabled, currentEnabled, pastesEnabled) = PlotStatusType.entries.map {
+                it in config.deskPlotStatusTypes
+            }
 
             if (plot.pests >= 1 && pestsEnabled) list.add(PlotStatusType.PESTS)
             if (plot.currentSpray != null && spraysEnabled) list.add(PlotStatusType.SPRAYS)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
index d8754fd81e70..690592d52184 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
@@ -157,8 +157,8 @@ object PestFinder {
         val isInaccurate = plot.isPestCountInaccurate
         val location = playerLocation.copy(x = middle.x, z = middle.z)
         event.drawWaypointFilled(location, LorenzColor.RED.toColor())
-        val text = "§e" + (if (isInaccurate) "?" else
-            pests
+        val text = "§e" + (
+            if (isInaccurate) "?" else pests
             ) + " §c$pestsName §7in §b$plotName"
         event.drawDynamicText(
             location, text, 1.5,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index a413f295ab27..a3536c1969fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -100,7 +100,8 @@ object HighlightVisitorsOutsideOfGarden {
         if (isVisitor(entity) || (entity is EntityArmorStand && isVisitorNearby(entity.getLorenzVec()))) {
             event.cancel()
             if (packet.action == C02PacketUseEntity.Action.INTERACT) {
-                ChatUtils.chatAndOpenConfig("Blocked you from interacting with a visitor. Sneak to bypass or click here to change settings.",
+                ChatUtils.chatAndOpenConfig(
+                    "Blocked you from interacting with a visitor. Sneak to bypass or click here to change settings.",
                     GardenAPI.config.visitors::blockInteracting
                 )
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index e1c5d3f845d1..f20479b65e44 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -352,10 +352,11 @@ private fun getTitleDisplayPair(): List<ScoreboardElementType> {
     }
 
     return if (displayConfig.titleAndFooter.useCustomTitle) {
-        listOf(displayConfig.titleAndFooter.customTitle.get().toString()
-            .replace("&", "§")
-            .split("\\n")
-            .map { it to alignment }
+        listOf(
+            displayConfig.titleAndFooter.customTitle.get().toString()
+                .replace("&", "§")
+                .split("\\n")
+                .map { it to alignment }
         ).flatten()
     } else {
         listOf(ScoreboardData.objectiveTitle to alignment)
@@ -585,15 +586,16 @@ private fun getLobbyDisplayPair(): List<ScoreboardElementType> {
 }
 
 private fun getPowerDisplayPair() = listOf(
-    (MaxwellAPI.currentPower?.let {
-        val mp = if (maxwellConfig.showMagicalPower) "§7(§6${MaxwellAPI.magicalPower?.addSeparators()}§7)" else ""
-        if (displayConfig.displayNumbersFirst) {
-            "§a${it.replace(" Power", "")} Power $mp"
-        } else {
-            "Power: §a$it $mp"
-        }
-    }
-        ?: "§cOpen \"Your Bags\"!") to HorizontalAlignment.LEFT,
+    (
+        MaxwellAPI.currentPower?.let {
+            val mp = if (maxwellConfig.showMagicalPower) "§7(§6${MaxwellAPI.magicalPower?.addSeparators()}§7)" else ""
+            if (displayConfig.displayNumbersFirst) {
+                "§a${it.replace(" Power", "")} Power $mp"
+            } else {
+                "Power: §a$it $mp"
+            }
+        } ?: "§cOpen \"Your Bags\"!"
+        ) to HorizontalAlignment.LEFT,
 )
 
 private fun getTuningDisplayPair(): List<Pair<String, HorizontalAlignment>> {
@@ -641,10 +643,11 @@ private fun getTuningDisplayPair(): List<Pair<String, HorizontalAlignment>> {
 private fun getPowerShowWhen() = !inAnyIsland(IslandType.THE_RIFT)
 
 private fun getCookieDisplayPair() = listOf(
-    "§dCookie Buff§f: " + (BitsAPI.cookieBuffTime?.let {
-        if (!BitsAPI.hasCookieBuff()) "§cNot Active" else it.timeUntil().format(maxUnits = 2)
-    }
-        ?: "§cOpen SbMenu!") to HorizontalAlignment.LEFT,
+    "§dCookie Buff§f: " + (
+        BitsAPI.cookieBuffTime?.let {
+            if (!BitsAPI.hasCookieBuff()) "§cNot Active" else it.timeUntil().format(maxUnits = 2)
+        } ?: "§cOpen SbMenu!"
+        ) to HorizontalAlignment.LEFT,
 )
 
 private fun getCookieShowWhen(): Boolean {
@@ -852,7 +855,9 @@ private fun getExtraDisplayPair(): List<ScoreboardElementType> {
     val lines = recentUnknownLines()
     if (lines.isEmpty()) return listOf("<hidden>" to HorizontalAlignment.LEFT)
 
-    return listOf("§cUndetected Lines:" to HorizontalAlignment.LEFT) + lines.map { it.line to HorizontalAlignment.LEFT }
+    return listOf("§cUndetected Lines:" to HorizontalAlignment.LEFT) + lines.map { 
+      it.line to HorizontalAlignment.LEFT 
+    }
 }
 
 private fun getExtraShowWhen(): Boolean = recentUnknownLines().isNotEmpty()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index 3d8251dfbb63..8dd3af9f7aec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -441,7 +441,8 @@ private fun getBroodmotherLines(): List<String> =
 private fun getMiningEventsLines() = buildList {
     // Wind
     if (getSbLines().any { SbPattern.windCompassPattern.matches(it) } &&
-        getSbLines().any { SbPattern.windCompassArrowPattern.matches(it) }) {
+        getSbLines().any { SbPattern.windCompassArrowPattern.matches(it) }
+    ) {
         add(getSbLines().first { SbPattern.windCompassPattern.matches(it) })
         add("| ${getSbLines().first { SbPattern.windCompassArrowPattern.matches(it) }} §f|")
     }
@@ -454,14 +455,16 @@ private fun getMiningEventsLines() = buildList {
 
     // Zone Events
     if (getSbLines().any { SbPattern.miningEventPattern.matches(it) } &&
-        getSbLines().any { SbPattern.miningEventZonePattern.matches(it) }) {
+        getSbLines().any { SbPattern.miningEventZonePattern.matches(it) }
+    ) {
         add(getSbLines().first { SbPattern.miningEventPattern.matches(it) }.removePrefix("Event: "))
         add("in ${getSbLines().first { SbPattern.miningEventZonePattern.matches(it) }.removePrefix("Zone: ")}")
     }
 
     // Zone Events but no Zone Line
     if (getSbLines().any { SbPattern.miningEventPattern.matches(it) } &&
-        getSbLines().none { SbPattern.miningEventZonePattern.matches(it) }) {
+        getSbLines().none { SbPattern.miningEventZonePattern.matches(it) }
+    ) {
         add(
             getSbLines().first { SbPattern.miningEventPattern.matches(it) }
                 .removePrefix("Event: "),
@@ -470,21 +473,24 @@ private fun getMiningEventsLines() = buildList {
 
     // Mithril Gourmand
     if (getSbLines().any { SbPattern.mithrilRemainingPattern.matches(it) } &&
-        getSbLines().any { SbPattern.mithrilYourMithrilPattern.matches(it) }) {
+        getSbLines().any { SbPattern.mithrilYourMithrilPattern.matches(it) }
+    ) {
         add(getSbLines().first { SbPattern.mithrilRemainingPattern.matches(it) })
         add(getSbLines().first { SbPattern.mithrilYourMithrilPattern.matches(it) })
     }
 
     // Raffle
     if (getSbLines().any { SbPattern.raffleTicketsPattern.matches(it) } &&
-        getSbLines().any { SbPattern.rafflePoolPattern.matches(it) }) {
+        getSbLines().any { SbPattern.rafflePoolPattern.matches(it) }
+    ) {
         add(getSbLines().first { SbPattern.raffleTicketsPattern.matches(it) })
         add(getSbLines().first { SbPattern.rafflePoolPattern.matches(it) })
     }
 
     // Raid
     if (getSbLines().any { SbPattern.yourGoblinKillsPattern.matches(it) } &&
-        getSbLines().any { SbPattern.remainingGoblinPattern.matches(it) }) {
+        getSbLines().any { SbPattern.remainingGoblinPattern.matches(it) }
+    ) {
         add(getSbLines().first { SbPattern.yourGoblinKillsPattern.matches(it) })
         add(getSbLines().first { SbPattern.remainingGoblinPattern.matches(it) })
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 43a598839256..40eb8c4b335b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -298,7 +298,11 @@ object ItemDisplayOverlayFeatures {
             }
         }
 
-        if (BESTIARY_LEVEL.isSelected() && (chestName.contains("Bestiary ➜") || chestName.contains("Fishing ➜")) && lore.any { it.contains("Deaths: ") }) {
+        if (BESTIARY_LEVEL.isSelected() && (chestName.contains("Bestiary ➜") || chestName.contains("Fishing ➜")) &&
+            lore.any {
+                it.contains("Deaths: ")
+            }
+        ) {
             lore.matchFirst(bestiaryStackPattern) {
                 val tier = (group("tier").romanToDecimalIfNecessary() - 1)
                 return tier.toString()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt
index 8e2a5c5927e5..d89c2aca9e3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt
@@ -32,7 +32,7 @@ object ItemStars {
     @SubscribeEvent(priority = EventPriority.LOW)
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!isEnabled()) return
-        val stack = event.itemStack ?: return
+        val stack = event.itemStack
         if (stack.stackSize != 1) return
 
         val itemName = stack.name
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt
index 517cf4b59346..516ee08fd8d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt
@@ -88,7 +88,8 @@ object MaxPurseItems {
                 "§7Max items with purse",
                 "§7Buy order +0.1: §e${buyOrders.addSeparators()}x",
                 "§7Instant buy: §e${buyInstant.addSeparators()}x"
-            ), posLabel = "Max Items With Purse"
+            ),
+            posLabel = "Max Items With Purse"
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
index 2854b47dfbef..1c098000cce5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt
@@ -288,7 +288,9 @@ object ReforgeHelper {
             } else emptyList()
         }
 
-        val addedEffect = getReforgeEffect(reforge, itemRarity)?.let { listOf(renderableString(addEffectText)) + it } ?: emptyList()
+        val addedEffect = getReforgeEffect(reforge, itemRarity)?.let {
+            listOf(renderableString(addEffectText)) + it
+        } ?: emptyList()
 
         return listOf(renderableString("§6Reforge Stats")) + stats + removedEffect + addedEffect + click
     }
@@ -414,15 +416,17 @@ object ReforgeHelper {
 
     private fun SkyblockStatList.print(appliedReforge: SkyblockStatList? = null): List<Renderable> {
         val diff = appliedReforge?.takeIf { config.showDiff }?.let { this - it }
-        val main = ((diff ?: this).mapNotNull {
-            val key = it.key
-            val value = this[key] ?: 0.0
-            buildList<Renderable> {
-                add(renderableString("§9${value.toStringWithPlus().removeSuffix(".0")}"))
-                diff?.get(key)?.let { add(renderableString((if (it < 0) "§c" else "§a") + it.toStringWithPlus().removeSuffix(".0"))) }
-                add(renderableString(key.iconWithName))
+        val main = (
+            (diff ?: this).mapNotNull {
+                val key = it.key
+                val value = this[key] ?: 0.0
+                buildList {
+                    add(renderableString("§9${value.toStringWithPlus().removeSuffix(".0")}"))
+                    diff?.get(key)?.let { add(renderableString((if (it < 0) "§c" else "§a") + it.toStringWithPlus().removeSuffix(".0"))) }
+                    add(renderableString(key.iconWithName))
+                }
             }
-        })
+            )
         val table = Renderable.table(main, 5)
         return listOf(table)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 1489ba83ff93..fe14959351d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -93,71 +93,73 @@ object SackDisplay {
             totalPrice += price
             if (rendered >= config.itemToShow) continue
             if (stored == 0 && !config.showEmpty) continue
-            table[buildList {
-                addString(" §7- ")
-                addItemStack(internalName)
-                // TODO move replace into itemName
-                val nameText = Renderable.optionalLink(
-                    itemName.replace("§k", ""),
-                    onClick = {
-                        if (!SackAPI.isTrophySack) {
-                            BazaarApi.searchForBazaarItem(itemName)
+            table[
+                buildList {
+                    addString(" §7- ")
+                    addItemStack(internalName)
+                    // TODO move replace into itemName
+                    val nameText = Renderable.optionalLink(
+                        itemName.replace("§k", ""),
+                        onClick = {
+                            if (!SackAPI.isTrophySack) {
+                                BazaarApi.searchForBazaarItem(itemName)
+                            }
+                        },
+                        highlightsOnHoverSlots = listOf(slot)
+                    ) { !NEUItems.neuHasFocus() }
+                    add(nameText)
+
+
+                    when (config.numberFormat) {
+                        NumberFormatEntry.DEFAULT -> {
+                            addAlignedNumber("$colorCode${stored.addSeparators()}")
+                            addString("§7/")
+                            addAlignedNumber("§b${total.shortFormat()}")
                         }
-                    },
-                    highlightsOnHoverSlots = listOf(slot)
-                ) { !NEUItems.neuHasFocus() }
-                add(nameText)
 
+                        NumberFormatEntry.FORMATTED -> {
+                            addAlignedNumber("$colorCode${stored.shortFormat()}")
+                            addString("§7/")
+                            addAlignedNumber("§b${total.shortFormat()}")
+                        }
 
-                when (config.numberFormat) {
-                    NumberFormatEntry.DEFAULT -> {
-                        addAlignedNumber("$colorCode${stored.addSeparators()}")
-                        addString("§7/")
-                        addAlignedNumber("§b${total.shortFormat()}")
-                    }
-
-                    NumberFormatEntry.FORMATTED -> {
-                        addAlignedNumber("$colorCode${stored.shortFormat()}")
-                        addString("§7/")
-                        addAlignedNumber("§b${total.shortFormat()}")
-                    }
-
-                    NumberFormatEntry.UNFORMATTED -> {
-                        addAlignedNumber("$colorCode${stored.addSeparators()}")
-                        addString("§7/")
-                        addAlignedNumber("§b${total.addSeparators()}")
-                    }
+                        NumberFormatEntry.UNFORMATTED -> {
+                            addAlignedNumber("$colorCode${stored.addSeparators()}")
+                            addString("§7/")
+                            addAlignedNumber("§b${total.addSeparators()}")
+                        }
 
-                    else -> {
-                        addAlignedNumber("$colorCode${stored.addSeparators()}")
-                        addString("§7/")
-                        addAlignedNumber("§b${total.addSeparators()}")
+                        else -> {
+                            addAlignedNumber("$colorCode${stored.addSeparators()}")
+                            addString("§7/")
+                            addAlignedNumber("§b${total.addSeparators()}")
+                        }
                     }
-                }
 
-                // TODO change color of amount if full
-//                 if (colorCode == "§a") addString("§c§l(Full!)")
-
-                if (SackAPI.isTrophySack && magmaFish > 0) {
-                    totalMagmaFish += magmaFish
-                    add(
-                        Renderable.hoverTips(
-                            Renderable.string(
-                                "§d$magmaFish",
-                                horizontalAlign = config.alignment
-                            ),
-                            listOf(
-                                "§6Magmafish: §b${magmaFish.addSeparators()}",
-                                "§6Magmafish value: §b${price / magmaFish}",
-                                "§6Magmafish per: §b${magmaFish / stored}"
-                            ),
+                    // TODO change color of amount if full
+                    // if (colorCode == "§a") addString("§c§l(Full!)")
+
+                    if (SackAPI.isTrophySack && magmaFish > 0) {
+                        totalMagmaFish += magmaFish
+                        add(
+                            Renderable.hoverTips(
+                                Renderable.string(
+                                    "§d$magmaFish",
+                                    horizontalAlign = config.alignment
+                                ),
+                                listOf(
+                                    "§6Magmafish: §b${magmaFish.addSeparators()}",
+                                    "§6Magmafish value: §b${price / magmaFish}",
+                                    "§6Magmafish per: §b${magmaFish / stored}"
+                                ),
+                            )
                         )
-                    )
-                    // TODO add cache
-                    addItemStack("MAGMA_FISH".asInternalName())
+                        // TODO add cache
+                        addItemStack("MAGMA_FISH".asInternalName())
+                    }
+                    if (config.showPrice && price != 0L) addAlignedNumber("§6${format(price)}")
                 }
-                if (config.showPrice && price != 0L) addAlignedNumber("§6${format(price)}")
-            }] = itemName
+            ] = itemName
             rendered++
         }
         list.add(table.buildSearchableTable())
@@ -187,13 +189,15 @@ object SackDisplay {
         val name = SortType.entries[config.sortingType.ordinal].longName // todo avoid ordinal
         list.addString("§7Sorted By: §c$name")
 
-        list.addSelector<SortType>(" ",
+        list.addSelector<SortType>(
+            " ",
             getName = { type -> type.shortName },
             isCurrent = { it.ordinal == config.sortingType.ordinal }, // todo avoid ordinal
             onChange = {
                 config.sortingType = SortingTypeEntry.entries[it.ordinal] // todo avoid ordinals
                 update(false)
-            })
+            }
+        )
 
         list.addButton(
             prefix = "§7Number format: ",
@@ -207,13 +211,15 @@ object SackDisplay {
         )
 
         if (config.showPrice) {
-            list.addSelector<ItemPriceSource>(" ",
+            list.addSelector<ItemPriceSource>(
+                " ",
                 getName = { type -> type.sellName },
                 isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
                     config.priceSource = ItemPriceSource.entries[it.ordinal] // todo avoid ordinal
                     update(false)
-                })
+                }
+            )
             list.addButton(
                 prefix = "§7Price Format: ",
                 getName = PriceFormat.entries[config.priceFormat.ordinal].displayName, // todo avoid ordinal
@@ -234,20 +240,22 @@ object SackDisplay {
         val table = mutableMapOf<List<Renderable>, String?>()
         for ((name, rune) in sort(SackAPI.runeItem.toList())) {
             val (stack, lv1, lv2, lv3) = rune
-            table[buildList {
-                addString(" §7- ")
-                stack?.let { addItemStack(it) }
-                add(
-                    Renderable.optionalLink(
-                        name,
-                        onClick = {},
-                        highlightsOnHoverSlots = listOf(rune.slot)
+            table[
+                buildList {
+                    addString(" §7- ")
+                    stack?.let { addItemStack(it) }
+                    add(
+                        Renderable.optionalLink(
+                            name,
+                            onClick = {},
+                            highlightsOnHoverSlots = listOf(rune.slot)
+                        )
                     )
-                )
-                addAlignedNumber("§e$lv1")
-                addAlignedNumber("§e$lv2")
-                addAlignedNumber("§e$lv3")
-            }] = name
+                    addAlignedNumber("§e$lv1")
+                    addAlignedNumber("§e$lv2")
+                    addAlignedNumber("§e$lv3")
+                }
+            ] = name
         }
         list.add(table.buildSearchableTable())
     }
@@ -259,23 +267,27 @@ object SackDisplay {
         val table = mutableMapOf<List<Renderable>, String?>()
         for ((name, gem) in sort(SackAPI.gemstoneItem.toList())) {
             val (internalName, rough, flawed, fine, roughprice, flawedprice, fineprice) = gem
-            table[buildList {
-                addString(" §7- ")
-                addItemStack(internalName)
-                add(Renderable.optionalLink(
-                    name,
-                    onClick = {
-                        BazaarApi.searchForBazaarItem(name.dropLast(1))
-                    },
-                    highlightsOnHoverSlots = listOf(gem.slot)
-                ) { !NEUItems.neuHasFocus() })
-                addAlignedNumber(rough.addSeparators())
-                addAlignedNumber("§a${flawed.addSeparators()}")
-                addAlignedNumber("§9${fine.addSeparators()}")
-                val price = roughprice + flawedprice + fineprice
-                totalPrice += price
-                if (config.showPrice && price != 0L) addAlignedNumber("§7(§6${format(price)}§7)")
-            }] = name
+            table[
+                buildList {
+                    addString(" §7- ")
+                    addItemStack(internalName)
+                    add(
+                        Renderable.optionalLink(
+                            name,
+                            onClick = {
+                                BazaarApi.searchForBazaarItem(name.dropLast(1))
+                            },
+                            highlightsOnHoverSlots = listOf(gem.slot)
+                        ) { !NEUItems.neuHasFocus() }
+                    )
+                    addAlignedNumber(rough.addSeparators())
+                    addAlignedNumber("§a${flawed.addSeparators()}")
+                    addAlignedNumber("§9${fine.addSeparators()}")
+                    val price = roughprice + flawedprice + fineprice
+                    totalPrice += price
+                    if (config.showPrice && price != 0L) addAlignedNumber("§7(§6${format(price)}§7)")
+                }
+            ] = name
         }
 
         list.add(table.buildSearchableTable())
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
index e0d7e207cc11..c95950a85dcd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
@@ -175,7 +175,9 @@ class SkyblockGuideHighlightFeature private constructor(
                 "travel",
                 "Core ➜ Fast Travels Unlocked",
                 taskOnlyCompleteOncePattern,
-                { HypixelCommands.wiki("MUSEUM_TRAVEL_SCROLL") }, // The items do not have proper internal names and using the fact that all travel scrolls lead to the same wiki page
+                {
+                    HypixelCommands.wiki("MUSEUM_TRAVEL_SCROLL")
+                }, // The items do not have proper internal names and using the fact that all travel scrolls lead to the same wiki page
                 openWikiTooltip
             )
             SkyblockGuideHighlightFeature(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
index adc932cce724..b5c3c6ab4989 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
@@ -79,7 +79,8 @@ object CraftMaterialsFromBazaar {
                         listOf("§eClick here to buy the items from bazaar!"),
                         onClick = {
                             getFromBazaar(neededMaterials)
-                        })
+                        }
+                    )
                 )
             }
         }
@@ -109,9 +110,14 @@ object CraftMaterialsFromBazaar {
                 val priceMultiplier = amount * multiplier
                 val text = "§8${priceMultiplier.addSeparators()}x " + material.itemName +
                     " §6${(material.getPrice() * priceMultiplier).shortFormat(false)}"
-                add(Renderable.optionalLink(text, onClick = {
-                    BazaarApi.searchForBazaarItem(material, priceMultiplier)
-                }))
+                add(
+                    Renderable.optionalLink(
+                        text,
+                        onClick = {
+                            BazaarApi.searchForBazaarItem(material, priceMultiplier)
+                        }
+                    )
+                )
             }
             add(
                 Renderable.clickAndHover(
@@ -120,7 +126,8 @@ object CraftMaterialsFromBazaar {
                     onClick = {
                         purchasing = false
                         display = emptyList()
-                    })
+                    }
+                )
             )
             addMultipliers()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
index 88ac9d4747ae..01b42a130582 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt
@@ -36,7 +36,7 @@ object ChocolateFactoryTooltip {
         if (upgradeInfo.effectiveCost == null) return
 
         event.toolTip.add("§7Extra: §6${upgradeInfo.extraPerSecond?.roundTo(2) ?: "N/A"} §7choc/s")
-        event.toolTip.add("§7Effective Cost: §6${upgradeInfo.effectiveCost.addSeparators() ?: "N/A"}")
+        event.toolTip.add("§7Effective Cost: §6${upgradeInfo.effectiveCost.addSeparators()}")
 
         if (slotIndex == ChocolateFactoryAPI.timeTowerIndex) {
             event.toolTip.add("§7One charge will give: §6${chocPerTimeTower().addSeparators()}")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
index 8612c9795cfc..517a6fd6d9de 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/craft/CraftableItemList.kt
@@ -124,7 +124,9 @@ object CraftableItemList {
         inInventory = false
     }
 
-    private fun pricePer(neededItems: Map<NEUInternalName, Int>): Double = neededItems.map { it.key.getPrice() * it.value }.sum()
+    private fun pricePer(neededItems: Map<NEUInternalName, Int>): Double = neededItems.map {
+        it.key.getPrice() * it.value
+    }.sum()
 
     private fun canCraftAmount(
         need: Map<NEUInternalName, Int>,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
index 9fcbbad0be11..4965a988324e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -35,7 +35,9 @@ object ExperimentationTableAPI {
     fun onInventoryUpdated(event: InventoryUpdatedEvent) {
         if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND || !inTable) return
 
-        val entity = EntityUtils.getEntities<EntityArmorStand>().find { it.hasSkullTexture(EXPERIMENTATION_TABLE_SKULL) } ?: return
+        val entity = EntityUtils.getEntities<EntityArmorStand>().find {
+            it.hasSkullTexture(EXPERIMENTATION_TABLE_SKULL)
+        } ?: return
         val vec = entity.getLorenzVec()
         if (storage?.tablePos != vec) storage?.tablePos = vec
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
index 37e12aa51f80..f67c7dcf817a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt
@@ -174,9 +174,9 @@ object SuperpairDataDisplay {
                     // TODO extract logic in some way
                     if (it.value.any { data ->
                             (data.first?.index ?: -1).equalsOneOf(item.index, match.index) ||
-                                (data.second?.index
-                                    ?: -1).equalsOneOf(item.index, match.index)
-                        }) {
+                                (data.second?.index ?: -1).equalsOneOf(item.index, match.index)
+                        }
+                    ) {
                         return
                     }
                 }
@@ -199,12 +199,16 @@ object SuperpairDataDisplay {
                 key.isAnyOf(FoundType.MATCH, FoundType.PAIR) -> {
                     if (value.any { data ->
                             item.index.equalsOneOf(data.first?.index ?: -1, data.second?.index ?: -1)
-                        }) return
+                        }
+                    ) return
                 }
 
-                else -> if (value.any { data ->
-                        (data.item?.index ?: -1) == item.index && data.item?.sameAs(item) == true
-                    }) return
+                else ->
+                    if (
+                        value.any { data ->
+                            (data.item?.index ?: -1) == item.index && data.item?.sameAs(item) == true
+                        }
+                    ) return
             }
         }
 
@@ -293,7 +297,7 @@ object SuperpairDataDisplay {
             slot >= experiment.endSlot ||
             (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2)
 
-    private fun SuperpairItem?.sameAs(other: SuperpairItem) = this?.reward == other.reward && this?.damage == other.damage
+    private fun SuperpairItem?.sameAs(other: SuperpairItem) = this?.reward == other.reward && this.damage == other.damage
 
     private fun isEnabled() = IslandType.PRIVATE_ISLAND.isInIsland() && config.superpairDisplay
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
index 6c35eb5b1e8c..379d3aa50a71 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairsClicksAlert.kt
@@ -47,14 +47,7 @@ object SuperpairsClicksAlert {
         if (!targetInventoryNames.any { event.inventoryName.contains(it) }) return
 
         if ( // checks if we have succeeded in either minigame
-            (event.inventoryName.contains("Chronomatron") &&
-                ((event.inventoryItems[4]?.displayName?.removeColor()
-                ?.let { currentRoundRegex.find(it) }
-                ?.groups?.get(1)?.value?.toInt() ?: -1) > roundsNeeded)) ||
-            (event.inventoryName.contains("Ultrasequencer") &&
-                event.inventoryItems.entries
-                .filter { it.key < 45 }
-                .any { it.value.stackSize > roundsNeeded })
+            isChronomatron(event) || isUltraSequencer(event)
         ) {
             SoundUtils.playBeepSound()
             ChatUtils.chat("You have reached the maximum extra Superpairs clicks from this add-on!")
@@ -62,6 +55,22 @@ object SuperpairsClicksAlert {
         }
     }
 
+    private fun isChronomatron(event: InventoryOpenEvent) =
+        event.inventoryName.contains("Chronomatron") &&
+            (
+                (
+                    event.inventoryItems[4]?.displayName?.removeColor()?.let {
+                        currentRoundRegex.find(it)
+                    }?.groups?.get(1)?.value?.toInt() ?: -1
+                    ) > roundsNeeded
+                )
+
+    private fun isUltraSequencer(event: InventoryUpdatedEvent) =
+        event.inventoryName.contains("Ultrasequencer") &&
+            event.inventoryItems.entries
+                .filter { it.key < 45 }
+                .any { it.value.stackSize > roundsNeeded }
+
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(46, "misc.superpairsClicksAlert", "inventory.helper.enchanting.superpairsClicksAlert")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index ad2baedbef87..0012ed8b0ef8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -366,9 +366,11 @@ object TunnelsMaps {
 
     private fun toCompactGemstoneName(it: Map.Entry<String, List<GraphNode>>): Renderable = Renderable.clickAndHover(
         Renderable.string(
-            (it.key.getFirstColorCode()?.let { "§$it" } ?: "") + ("ROUGH_".plus(
-                it.key.removeColor().removeSuffix("stone"),
-            ).asInternalName().itemName.takeWhile { it != ' ' }.removeColor()),
+            (it.key.getFirstColorCode()?.let { "§$it" } ?: "") + (
+                "ROUGH_".plus(
+                    it.key.removeColor().removeSuffix("stone"),
+                ).asInternalName().itemName.takeWhile { it != ' ' }.removeColor()
+                ),
             horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
         ),
         tips = listOf(it.key),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
index 3e81a01a9588..bc5e324401bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -45,7 +45,11 @@ object CorpseTracker {
         }
 
         override fun getDescription(timesGained: Long): List<String> {
-            val divisor = 1.coerceAtLeast(getSelectedBucket()?.let { corpsesLooted[it]?.toInt() } ?: corpsesLooted.sumAllValues().toInt())
+            val divisor = 1.coerceAtLeast(
+                getSelectedBucket()?.let {
+                    corpsesLooted[it]?.toInt()
+                } ?: corpsesLooted.sumAllValues().toInt()
+            )
             val percentage = timesGained.toDouble() / divisor
             val dropRate = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0))
             return listOf(
@@ -85,7 +89,9 @@ object CorpseTracker {
         if (bucketData.getCorpseCount() == 0L) return@buildList
 
         var profit = tracker.drawItems(bucketData, { true }, this)
-        val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) } ?: enumValues<CorpseType>().toList()
+        val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let {
+            listOf(it)
+        } ?: enumValues<CorpseType>().toList()
             .filter { bucketData.corpsesLooted[it] != null }
         var totalKeyCost = 0.0
         var totalKeyCount = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
index a0545dc1ca45..67d54f10be94 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -152,8 +152,8 @@ object MinionXp {
             MinionFeatures.minionInventoryOpen -> {
                 addXpInfoToTooltip(event)
                 if (collectItem == event.itemStack.item) {
-                    collectItemXpList.forEachIndexed { i, it ->
-                        event.toolTip.add(i + 1, it)
+                    collectItemXpList.forEachIndexed { i, item ->
+                        event.toolTip.add(i + 1, item)
                     }
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
index a5062ee1d388..7efce2fcdae5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
@@ -260,7 +260,7 @@ object CarryTracker {
         val totalCost = customer.carries.sumOf { it.getCost() ?: 0.0 }
         val totalCostFormat = formatCost(totalCost)
         if (totalCostFormat != "") {
-	            val paidFormat = "§6${customer.alreadyPaid.shortFormat()}"
+            val paidFormat = "§6${customer.alreadyPaid.shortFormat()}"
             val missingFormat = formatCost(totalCost - customer.alreadyPaid)
             list.add(
                 Renderable.clickAndHover(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
index ffc2607233e1..948ae70e07ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt
@@ -157,12 +157,14 @@ object CollectionTracker {
             itemAmount.percentWithColorCode(goalAmount, 1)
         }§f)"
 
-        display = Collections.singletonList(buildList {
-            internalName?.let {
-                add(it.getItemStack())
+        display = Collections.singletonList(
+            buildList {
+                internalName?.let {
+                    add(it.getItemStack())
+                }
+                add("$itemName collection: §e$format$goal $gainText")
             }
-            add("$itemName collection: §e$format$goal $gainText")
-        })
+        )
     }
 
     private fun countCurrentlyInInventory(): Int {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
index f8e5fbe32aa0..ff5a5f7ac57d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/JoinCrystalHollows.kt
@@ -28,7 +28,8 @@ object JoinCrystalHollows {
         if (message == "§cYou do not have an active Crystal Hollows pass!") {
             lastWrongPassTime = System.currentTimeMillis()
             if (!IslandType.DWARVEN_MINES.isInIsland()) {
-                ChatUtils.clickableChat("Click here to warp to Dwarven Mines!",
+                ChatUtils.clickableChat(
+                    "Click here to warp to Dwarven Mines!",
                     onClick = {
                         HypixelCommands.warp("mines")
                     }, "§eClick to run /warp mines!"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
index dc55af349d14..093c7d80ed3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
@@ -23,7 +23,8 @@ object PrivateIslandNoPickaxeAbility {
 
         if (event.itemInHand?.getItemCategoryOrNull()?.let {
                 ItemCategory.miningTools.contains(it)
-            } == true) {
+            } == true
+        ) {
             event.cancel()
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
index 895a04688f80..7f6caba24047 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt
@@ -298,16 +298,12 @@ object DiscordLocationKey {
     fun getDiscordIconKey(location: String): String {
         val keyIfNormal = location.lowercase().replace(' ', '-')
 
-        return if (normalRPC.contains(keyIfNormal)) {
-            keyIfNormal
-        } else if (specialRPC.containsKey(location)) {
-            specialRPC[location]!!
-        } else if (specialNetherRPC.contains(location)) {
-            "crimson-isle"
-        } else if (specialRiftRPC.containsKey(location)) {
-            specialRiftRPC[location]!!
-        } else {
-            getAmbiguousKey(location) // will return skyblock-logo if not found
+        return when {
+            normalRPC.contains(keyIfNormal) -> keyIfNormal
+            specialRPC.containsKey(location) -> specialRPC[location] ?: getAmbiguousKey(location)
+            specialNetherRPC.contains(location) -> "crimson-isle"
+            specialRiftRPC.containsKey(location) -> specialRiftRPC[location] ?: getAmbiguousKey(location)
+            else -> getAmbiguousKey(location) // will return skyblock-logo if not found
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
index 16843ff6d796..29f20fc050ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
@@ -120,21 +120,23 @@ object DiscordRPCManager : IPCListener {
     private fun updatePresence() {
         val location = DiscordStatus.LOCATION.getDisplayString()
         val discordIconKey = DiscordLocationKey.getDiscordIconKey(location)
-        client?.sendRichPresence(RichPresence.Builder().apply {
-            setDetails(getStatusByConfigId(config.firstLine.get()).getDisplayString())
-            setState(getStatusByConfigId(config.secondLine.get()).getDisplayString())
-            setStartTimestamp(startTimestamp)
-            setLargeImage(discordIconKey, location)
-
-            if (config.showSkyCryptButton.get()) {
-                addButton(
-                    RichPresenceButton(
-                        "https://sky.shiiyu.moe/stats/${LorenzUtils.getPlayerName()}/${HypixelData.profileName}",
-                        "Open SkyCrypt"
+        client?.sendRichPresence(
+            RichPresence.Builder().apply {
+                setDetails(getStatusByConfigId(config.firstLine.get()).getDisplayString())
+                setState(getStatusByConfigId(config.secondLine.get()).getDisplayString())
+                setStartTimestamp(startTimestamp)
+                setLargeImage(discordIconKey, location)
+
+                if (config.showSkyCryptButton.get()) {
+                    addButton(
+                        RichPresenceButton(
+                            "https://sky.shiiyu.moe/stats/${LorenzUtils.getPlayerName()}/${HypixelData.profileName}",
+                            "Open SkyCrypt"
+                        )
                     )
-                )
-            }
-        }.build())
+                }
+            }.build()
+        )
     }
 
     override fun onReady(client: IPCClient) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index 82be48f80fa0..708704d68c26 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -163,7 +163,7 @@ enum class DiscordStatus(private val displayMessageSupplier: (() -> String?)) {
 
     ITEM({
         InventoryUtils.getItemInHand()?.let {
-            String.format("Holding ${it.displayName.removeColor()}")
+            String.format(java.util.Locale.US, "Holding ${it.displayName.removeColor()}")
         } ?: "No item in hand"
     }),
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index 5797c50cd7b7..fb1ce6b4488f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -133,13 +133,15 @@ object EstimatedItemValueCalculator {
         return Pair(totalPrice, basePrice)
     }
 
-    private fun isKuudraSet(internalName: String) = (kuudraSets.any { internalName.contains(it) } &&
-        listOf(
-            "CHESTPLATE",
-            "LEGGINGS",
-            "HELMET",
-            "BOOTS",
-        ).any { internalName.endsWith(it) })
+    private fun isKuudraSet(internalName: String) = (
+        kuudraSets.any { internalName.contains(it) } &&
+            listOf(
+                "CHESTPLATE",
+                "LEGGINGS",
+                "HELMET",
+                "BOOTS",
+            ).any { internalName.endsWith(it) }
+        )
 
     private fun addAttributeCost(stack: ItemStack, list: MutableList<String>): Double {
         val attributes = stack.getAttributes() ?: return 0.0
@@ -223,7 +225,9 @@ object EstimatedItemValueCalculator {
     private fun getPriceOrCompositePriceForAttribute(attributeName: String, level: Int): Double? {
         val intRange = if (config.useAttributeComposite.get()) 1..10 else level..level
         return intRange.mapNotNull { lowerLevel ->
-            "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()?.let { it / (1 shl lowerLevel) * (1 shl level).toDouble() }
+            "$attributeName;$lowerLevel".asInternalName().getPriceOrNull()?.let {
+                it / (1 shl lowerLevel) * (1 shl level).toDouble()
+            }
         }.minOrNull()
     }
 
@@ -501,13 +505,13 @@ object EstimatedItemValueCalculator {
 
             val tiers = mutableMapOf<NEUInternalName, Int>()
 
-            for ((id, prices) in EssenceItemUtils.itemPrices) {
+            for ((id, _) in EssenceItemUtils.itemPrices) {
                 if (!id.contains(removed)) continue
                 tiers[id] = getKuudraTier(id)
 
             }
-            for ((id, tier) in tiers.sorted()) {
-                val prices = EssenceItemUtils.itemPrices[id]!!
+            for ((id, _) in tiers.sorted()) {
+                val prices = EssenceItemUtils.itemPrices[id] ?: emptyMap()
                 maxStars += prices.size
                 if (remainingStars <= 0) continue
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantsJson.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantsJson.kt
index 99fb0b3287bb..6e1550a974a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantsJson.kt
@@ -2,22 +2,26 @@ package at.hannibal2.skyhanni.features.misc.items.enchants
 
 import at.hannibal2.skyhanni.features.misc.items.enchants.EnchantParser.enchantmentPattern
 import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
 
 class EnchantsJson {
     @Expose
-    var NORMAL: HashMap<String, Enchant.Normal> = hashMapOf()
+    @SerializedName("NORMAL")
+    var normal: HashMap<String, Enchant.Normal> = hashMapOf()
 
     @Expose
-    var ULTIMATE: HashMap<String, Enchant.Ultimate> = hashMapOf()
+    @SerializedName("ULTIMATE")
+    var ultimate: HashMap<String, Enchant.Ultimate> = hashMapOf()
 
     @Expose
-    var STACKING: HashMap<String, Enchant.Stacking> = hashMapOf()
+    @SerializedName("STACKING")
+    var stacking: HashMap<String, Enchant.Stacking> = hashMapOf()
 
     fun getFromLore(passedLoreName: String): Enchant {
         val loreName = passedLoreName.lowercase()
-        var enchant: Enchant? = NORMAL[loreName]
-        if (enchant == null) enchant = ULTIMATE[loreName]
-        if (enchant == null) enchant = STACKING[loreName]
+        var enchant: Enchant? = normal[loreName]
+        if (enchant == null) enchant = ultimate[loreName]
+        if (enchant == null) enchant = stacking[loreName]
         if (enchant == null) enchant = Enchant.Dummy(passedLoreName)
         return enchant
     }
@@ -29,13 +33,13 @@ class EnchantsJson {
             if (enchants.isNotEmpty()) {
                 if (enchants.containsKey(enchant.nbtName)) return true
             } else {
-                if (NORMAL.containsKey(enchant.loreName.lowercase())) return true
-                if (ULTIMATE.containsKey(enchant.loreName.lowercase())) return true
-                if (STACKING.containsKey(enchant.loreName.lowercase())) return true
+                if (normal.containsKey(enchant.loreName.lowercase())) return true
+                if (ultimate.containsKey(enchant.loreName.lowercase())) return true
+                if (stacking.containsKey(enchant.loreName.lowercase())) return true
             }
         }
         return false
     }
 
-    fun hasEnchantData() = NORMAL.isNotEmpty() && ULTIMATE.isNotEmpty() && STACKING.isNotEmpty()
+    fun hasEnchantData() = normal.isNotEmpty() && ultimate.isNotEmpty() && stacking.isNotEmpty()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
index bfb8ce715d2f..120c53e47b82 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt
@@ -144,8 +144,11 @@ object LimboTimeTracker {
 
     fun printStats(onlyPlaytime: Boolean = false) {
         val timeInLimbo: Int = if (inLimbo) limboJoinTime.passedSince().inWholeSeconds.toInt() else 0
-        val playtime: Int = if (inLimbo) (storage?.playtime
-            ?: 0) + limboJoinTime.passedSince().inWholeSeconds.toInt() else storage?.playtime ?: 0
+        val playtime: Int = if (inLimbo) (
+            storage?.playtime ?: 0
+            ) + limboJoinTime.passedSince().inWholeSeconds.toInt()
+        else storage?.playtime ?: 0
+
         if (onlyPlaytime) {
             ChatUtils.chat("§aYou have ${playtime / 3600} hours and ${playtime % 3600 / 60} minutes playtime!", false)
         } else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
index f87146a6f803..745928cee13c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt
@@ -76,8 +76,8 @@ object DefaultConfigFeatures {
             return
         }
         optionList = optionList
-            .mapValues { it ->
-                it.value.filter {
+            .mapValues { option ->
+                option.value.filter {
                     (togglesInNewVersion == null || it.path in togglesInNewVersion) &&
                         (togglesInOldVersion == null || it.path !in togglesInOldVersion)
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
index 1ebbaed684cb..38ba952d5431 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
@@ -107,19 +107,25 @@ class DefaultConfigOptionGui(
         button("Turn all on", listOf()) {
             for (entry in resetSuggestionState.entries) {
                 entry.setValue(ResetSuggestionState.TURN_ALL_ON)
-                orderedOptions[entry.key]!!.forEach { it.toggleOverride = null }
+                orderedOptions[entry.key]?.let { opts ->
+                    opts.forEach { it.toggleOverride = null }
+                }
             }
         }
         button("Turn all off", listOf()) {
             for (entry in resetSuggestionState.entries) {
                 entry.setValue(ResetSuggestionState.TURN_ALL_OFF)
-                orderedOptions[entry.key]!!.forEach { it.toggleOverride = null }
+                orderedOptions[entry.key]?.let { opts ->
+                    opts.forEach { it.toggleOverride = null }
+                }
             }
         }
         button("Leave all untouched", listOf()) {
             for (entry in resetSuggestionState.entries) {
                 entry.setValue(ResetSuggestionState.LEAVE_DEFAULTS)
-                orderedOptions[entry.key]!!.forEach { it.toggleOverride = null }
+                orderedOptions[entry.key]?.let { opts ->
+                    opts.forEach { it.toggleOverride = null }
+                }
             }
         }
         button("Cancel", listOf()) {
@@ -165,12 +171,16 @@ class DefaultConfigOptionGui(
                     hoveringTextToDraw = listOf(
                         "§e${cat.name}",
                         "§7${cat.description}",
-                    ) + orderedOptions[cat]!!.map { "§7 - §a" + it.name }
+                    ) + orderedOptions[cat]?.let { opts ->
+                        opts.map { "§7 - §a" + it.name }
+                    }.orEmpty()
                 }
 
                 if (shouldClick) {
                     resetSuggestionState[cat] = suggestionState.next
-                    orderedOptions[cat]!!.forEach { it.toggleOverride = null }
+                    orderedOptions[cat]?.let { opts ->
+                        opts.forEach { it.toggleOverride = null }
+                    }
                 }
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
index 98b2d52a02c6..c555ec6d29f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
@@ -30,7 +30,8 @@ object AshfangNextResetCooldown {
 
         if (EntityUtils.getEntities<EntityArmorStand>().any {
                 it.posY > 145 && (it.name.contains("§c§9Ashfang Acolyte§r") || it.name.contains("§c§cAshfang Underling§r"))
-            }) {
+            }
+        ) {
             spawnTime = SimpleTimeMark.now()
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
index 48fa8d03fce6..af82198bf81e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
@@ -21,7 +21,7 @@ object RiftAPI {
 
     val farmingTool by lazy { "FARMING_WAND".asInternalName() }
 
-    private val blowgun by lazy  { "BERBERIS_BLOWGUN".asInternalName() }
+    private val blowgun by lazy { "BERBERIS_BLOWGUN".asInternalName() }
 
     val ItemStack?.isBlowgun: Boolean
         get() = this?.getInternalName() == blowgun
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 50887554dac0..6b94919eeb77 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -56,7 +56,8 @@ object VoltHighlighter {
 
             if (config.voltMoodMeter)
                 RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
-                    entity, when (state) {
+                    entity,
+                    when (state) {
                         VoltState.FRIENDLY -> 0x8000FF00.toInt()
                         VoltState.DOING_LIGHTNING -> 0x800000FF.toInt()
                         VoltState.HOSTILE -> 0x80FF0000.toInt()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
index 92e6c2014901..516ecfd90805 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
@@ -131,7 +131,8 @@ object WoodenButtonsHelper {
                 blockState.getValue(BlockButtonWood.POWERED) == true &&
                 buttonLocation.canBeSeen(1..3) &&
                 lastHitButton != buttonLocation &&
-                !hitButtons.contains(buttonLocation)) {
+                !hitButtons.contains(buttonLocation)
+            ) {
                 lastHitButton = buttonLocation
                 addLastHitButton()
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
index 9c65a273e867..913cfc4bf1a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
@@ -46,14 +46,18 @@ object LivingMetalSuitProgress {
         if (config.compactWhenMaxed && isMaxed) return@buildList
 
         for ((stack, progress) in progressMap.entries.reversed()) {
-            add(buildList {
-                add("  §7- ")
-                add(stack)
-                add("${stack.displayName}: ")
-                add(progress?.let {
-                    drawProgressBar(progress) + " §b${LorenzUtils.formatPercentage(progress)}"
-                } ?: "§cStart upgrading it!")
-            })
+            add(
+                buildList {
+                    add("  §7- ")
+                    add(stack)
+                    add("${stack.displayName}: ")
+                    add(
+                        progress?.let {
+                            drawProgressBar(progress) + " §b${LorenzUtils.formatPercentage(progress)}"
+                        } ?: "§cStart upgrading it!"
+                    )
+                }
+            )
         }
     }
 
@@ -63,9 +67,12 @@ object LivingMetalSuitProgress {
         val old = progressMap
         progressMap = buildMap {
             for (armor in InventoryUtils.getArmor().filterNotNull()) {
-                put(armor, armor.getLivingMetalProgress()?.toDouble()?.let {
-                    it.coerceAtMost(100.0) / 100
-                })
+                put(
+                    armor,
+                    armor.getLivingMetalProgress()?.toDouble()?.let {
+                        it.coerceAtMost(100.0) / 100
+                    }
+                )
             }
         }
         if (old != progressMap) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index ccb432f61905..11de17b148c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -90,7 +90,7 @@ object RiftBloodEffigies {
 
         val split = hearts.split("§").drop(1)
         for ((index, s) in split.withIndex()) {
-            val time = effigiesTimes[index]!!
+            val time = effigiesTimes[index] ?: continue
 
             if (time.isInPast()) {
                 if (s == "7") {
@@ -131,7 +131,7 @@ object RiftBloodEffigies {
 
         for ((index, location) in locations.withIndex()) {
             val name = "Effigy #${index + 1}"
-            val duration = effigiesTimes[index]!!
+            val duration = effigiesTimes[index] ?: continue
 
             if (duration.isFarPast()) {
                 if (config.unknownTime) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index 6fadfce8f2a1..86ae6d096226 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -124,7 +124,8 @@ object EnigmaSoulWaypoints {
                             it,
                             "$name Enigma Soul",
                             config.color.toChromaColor(),
-                            condition = { config.showPathFinder })
+                            condition = { config.showPathFinder }
+                        )
                     }
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
index 50ce7f2dc83b..022a808d0afc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
@@ -134,29 +134,31 @@ object ShowMotesNpcSellPrice {
         val sorted = itemMap.toList().sortedByDescending { it.second.second }.toMap().toMutableMap()
 
         for ((internalName, pair) in sorted) {
-            newDisplay.add(buildList {
-                val (index, value) = pair
-                add("  §7- ")
-                val stack = internalName.getItemStack()
-                add(stack)
-                val price = value.formatPrice()
-                val valuePer = stack.motesNpcPrice() ?: continue
-                val tips = buildList {
-                    add("§6Item: ${stack.displayName}")
-                    add("§6Value per: §d$valuePer Motes")
-                    add("§6Total in chest: §d${(value / valuePer).toInt()}")
-                    add("")
-                    add("§6Total value: §d$price coins")
-                }
-                add(
-                    Renderable.hoverTips(
-                        "§6${stack.displayName}: §b$price",
-                        tips,
-                        highlightsOnHoverSlots = index,
-                        stack = stack
+            newDisplay.add(
+                buildList {
+                    val (index, value) = pair
+                    add("  §7- ")
+                    val stack = internalName.getItemStack()
+                    add(stack)
+                    val price = value.formatPrice()
+                    val valuePer = stack.motesNpcPrice() ?: continue
+                    val tips = buildList {
+                        add("§6Item: ${stack.displayName}")
+                        add("§6Value per: §d$valuePer Motes")
+                        add("§6Total in chest: §d${(value / valuePer).toInt()}")
+                        add("")
+                        add("§6Total value: §d$price coins")
+                    }
+                    add(
+                        Renderable.hoverTips(
+                            "§6${stack.displayName}: §b$price",
+                            tips,
+                            highlightsOnHoverSlots = index,
+                            stack = stack
+                        )
                     )
-                )
-            })
+                }
+            )
         }
         val total = itemMap.values.fold(0.0) { acc, pair -> acc + pair.second }.formatPrice()
         newDisplay.addAsSingletonList("§7Total price: §b$total")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
index 9a01a97298f1..ffee3eda4656 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt
@@ -297,16 +297,19 @@ object SkillProgress {
                     add("§6Total XP: §b${totalXp.addSeparators()}")
                 }
                 val nameColor = if (skill == activeSkill) "§2" else "§a"
-                Renderable.hoverTips(buildString {
-                    append("$nameColor${skill.displayName} $level ")
-                    append("§7(")
-                    append("§b${currentXp.addSeparators()}")
-                    if (currentXpMax != 0L) {
-                        append("§6/")
-                        append("§b${currentXpMax.addSeparators()}")
-                    }
-                    append("§7)")
-                }, tips)
+                Renderable.hoverTips(
+                    buildString {
+                        append("$nameColor${skill.displayName} $level ")
+                        append("§7(")
+                        append("§b${currentXp.addSeparators()}")
+                        if (currentXpMax != 0L) {
+                            append("§6/")
+                            append("§b${currentXpMax.addSeparators()}")
+                        }
+                        append("§7)")
+                    },
+                    tips
+                )
             }
         }
     }
@@ -376,7 +379,8 @@ object SkillProgress {
 
         val session = xpInfo.timeActive.seconds.format(TimeUnit.HOUR)
         add(
-            Renderable.clickAndHover("§7Session: §e$session ${if (xpInfo.sessionTimerActive) "" else "§c(PAUSED)"}",
+            Renderable.clickAndHover(
+                "§7Session: §e$session ${if (xpInfo.sessionTimerActive) "" else "§c(PAUSED)"}",
                 listOf("§eClick to reset!"),
                 onClick = {
                     xpInfo.sessionTimerActive = false
@@ -421,45 +425,49 @@ object SkillProgress {
             add(Renderable.itemStack(activeSkill.item, 1.0))
         }
 
-        add(Renderable.string(buildString {
-            append("§b+${skill.lastGain} ")
-
-            if (config.useSkillName.get())
-                append("${activeSkill.displayName} ")
-
-            val (barCurrent, barMax) =
-                if (useCustomGoalLevel && customGoalConfig.enableInProgressBar)
-                    Pair(have, need)
-                else if (config.overflowConfig.enableInProgressBar.get())
-                    Pair(skill.overflowCurrentXp, skill.overflowCurrentXpMax)
-                else
-                    Pair(skill.currentXp, skill.currentXpMax)
-
-            val barPercent = if (barMax == 0L) 100F else 100F * barCurrent / barMax
-            skillExpPercentage = (barPercent.toDouble() / 100)
-
-            val percent = if (currentXpMax == 0L) 100F else 100F * currentXp / currentXpMax
-
-            if (config.usePercentage.get())
-                append("§7(§6${percent.roundTo(2)}%§7)")
-            else {
-                if (currentXpMax == 0L)
-                    append("§7(§6${currentXp.addSeparators()}§7)")
-                else
-                    append("§7(§6${currentXp.addSeparators()}§7/§6${currentXpMax.addSeparators()}§7)")
-            }
+        add(
+            Renderable.string(
+                buildString {
+                    append("§b+${skill.lastGain} ")
+
+                    if (config.useSkillName.get())
+                        append("${activeSkill.displayName} ")
+
+                    val (barCurrent, barMax) =
+                        if (useCustomGoalLevel && customGoalConfig.enableInProgressBar)
+                            Pair(have, need)
+                        else if (config.overflowConfig.enableInProgressBar.get())
+                            Pair(skill.overflowCurrentXp, skill.overflowCurrentXpMax)
+                        else
+                            Pair(skill.currentXp, skill.currentXpMax)
+
+                    val barPercent = if (barMax == 0L) 100F else 100F * barCurrent / barMax
+                    skillExpPercentage = (barPercent.toDouble() / 100)
+
+                    val percent = if (currentXpMax == 0L) 100F else 100F * currentXp / currentXpMax
+
+                    if (config.usePercentage.get())
+                        append("§7(§6${percent.roundTo(2)}%§7)")
+                    else {
+                        if (currentXpMax == 0L)
+                            append("§7(§6${currentXp.addSeparators()}§7)")
+                        else
+                            append("§7(§6${currentXp.addSeparators()}§7/§6${currentXpMax.addSeparators()}§7)")
+                    }
 
-            if (config.showActionLeft.get() && percent != 100f) {
-                append(" - ")
-                val gain = skill.lastGain.formatDouble()
-                val actionLeft = (ceil(currentXpMax.toDouble() - currentXp) / gain).toLong().addSeparators()
-                if (skill.lastGain != "" && !actionLeft.contains("-")) {
-                    append("§6$actionLeft Left")
-                } else {
-                    append("§6∞ Left")
+                    if (config.showActionLeft.get() && percent != 100f) {
+                        append(" - ")
+                        val gain = skill.lastGain.formatDouble()
+                        val actionLeft = (ceil(currentXpMax.toDouble() - currentXp) / gain).toLong().addSeparators()
+                        if (skill.lastGain != "" && !actionLeft.contains("-")) {
+                            append("§6$actionLeft Left")
+                        } else {
+                            append("§6∞ Left")
+                        }
+                    }
                 }
-            }
-        }))
+            )
+        )
     }
 
     private fun updateSkillInfo() {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
index d2c161eba813..cd6e7b2dbf5b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -217,7 +217,8 @@ object SlayerRngMeterDisplay {
 
         if (SlayerAPI.latestSlayerCategory.let {
                 it.endsWith(" I") || it.endsWith(" II")
-            }) {
+            }
+        ) {
             return ""
         }
         val latestSlayerCategory = SlayerAPI.latestSlayerCategory
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
index 72ab05195e35..dd63fdd966a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
@@ -81,7 +81,11 @@ object EndermanSlayerFeatures {
                 }
             }
 
-            if (config.highlightNukekebi && entity.inventory.any { it?.getSkullTexture() == NUKEKUBI_SKULL_TEXTURE } && entity !in nukekubiSkulls) {
+            if (config.highlightNukekebi &&
+                entity.inventory.any {
+                    it?.getSkullTexture() == NUKEKUBI_SKULL_TEXTURE
+                } && entity !in nukekubiSkulls
+            ) {
                 nukekubiSkulls.add(entity)
                 RenderLivingEntityHelper.setEntityColor(
                     entity,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/stranded/HighlightPlaceableNpcs.kt b/src/main/java/at/hannibal2/skyhanni/features/stranded/HighlightPlaceableNpcs.kt
index 82d57cac6a26..2f15696541ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/stranded/HighlightPlaceableNpcs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/stranded/HighlightPlaceableNpcs.kt
@@ -84,9 +84,7 @@ object HighlightPlaceableNpcs {
 
     private fun isPlaceableNpc(lore: List<String>): Boolean {
         // Checking if NPC & placeable
-        if (lore.isEmpty() ||
-            !(clickToSetPattern.matches(lore.last()) ||
-                clickToSpawnPattern.matches(lore.last()))) {
+        if (lore.isEmpty() || !(clickToSetPattern.matches(lore.last()) || clickToSpawnPattern.matches(lore.last()))) {
             return false
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
index e724a8fe6c85..af5a1ea3c7d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt
@@ -260,7 +260,8 @@ object GraphEditor {
         }
     }
 
-    private fun chatAtDisable() = ChatUtils.clickableChat("Graph Editor is now inactive. §lClick to activate.",
+    private fun chatAtDisable() = ChatUtils.clickableChat(
+        "Graph Editor is now inactive. §lClick to activate.",
         GraphEditor::commandIn
     )
 
@@ -530,14 +531,23 @@ object GraphEditor {
     private fun compileGraph(): Graph {
         prune()
         val indexedTable = nodes.mapIndexed { index, node -> node.id to index }.toMap()
-        val nodes = nodes.mapIndexed { index, it -> GraphNode(index, it.position, it.name, it.tags.mapNotNull { it.internalName }) }
+        val nodes = nodes.mapIndexed { index, node ->
+            GraphNode(
+                index,
+                node.position,
+                node.name,
+                node.tags.map {
+                    it.internalName
+                }
+            )
+        }
         val neighbours = GraphEditor.nodes.map { node ->
             edges.filter { it.isInEdge(node) }.map { edge ->
                 val otherNode = if (node == edge.node1) edge.node2 else edge.node1
                 nodes[indexedTable[otherNode.id]!!] to node.position.distance(otherNode.position)
             }.sortedBy { it.second }
         }
-        nodes.forEachIndexed { index, it -> it.neighbours = neighbours[index].toMap() }
+        nodes.forEachIndexed { index, node -> node.neighbours = neighbours[index].toMap() }
         return Graph(nodes)
     }
 
@@ -553,7 +563,7 @@ object GraphEditor {
                 )
             },
         )
-        val translation = graph.mapIndexed { index, it -> it to nodes[index] }.toMap()
+        val translation = graph.mapIndexed { index, node -> node to nodes[index] }.toMap()
         edges.addAll(
             graph.map { node ->
                 node.neighbours.map { GraphingEdge(translation[node]!!, translation[it.key]!!) }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
index c4f6a389638d..8c16b4c67962 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/graph/GraphNodeEditor.kt
@@ -179,7 +179,9 @@ object GraphNodeEditor {
     )
 
     private fun drawNodeNames(): List<Searchable> = buildList {
-        for ((node, distance: Double) in GraphEditor.nodes.map { it to it.position.distanceSqToPlayer() }.sortedBy { it.second }) {
+        for ((node, distance: Double) in GraphEditor.nodes.map {
+            it to it.position.distanceSqToPlayer()
+        }.sortedBy { it.second }) {
             if (node.tags.isNotEmpty()) {
                 if (!node.tags.any { it in tagsToShow }) continue
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
index 663281ed1ba2..9480e21e6490 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
@@ -32,5 +32,6 @@ data class CachedItemData(
      * We can't call the generated no args constructors (or rather we cannot generate that constructor), because inline
      * classes are not part of the java-kotlin ABI that is super well supported (especially with default arguments).
      */
+    @Suppress("ForbiddenVoid")
     constructor(void: Void?) : this()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
index a8941c95aed8..d600cc403c33 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt
@@ -129,9 +129,9 @@ object ChatUtils {
 
         val rawText = msgPrefix + message
         val text = Text.text(rawText) {
-            this.onClick(expireAt, oneTimeClick, onClick)
-            this.hover = hover.asComponent()
-        }
+                this.onClick(expireAt, oneTimeClick, onClick)
+                this.hover = hover.asComponent()
+            }
         if (replaceSameMessage) {
             text.send(getUniqueMessageIdForString(rawText))
         } else {
@@ -166,12 +166,14 @@ object ChatUtils {
     ) {
         val msgPrefix = if (prefix) prefixColor + CHAT_PREFIX else ""
 
-        chat(Text.text(msgPrefix + message) {
-            this.hover = Text.multiline(hover)
-            if (command != null) {
-                this.command = command
+        chat(
+            Text.text(msgPrefix + message) {
+                this.hover = Text.multiline(hover)
+                if (command != null) {
+                    this.command = command
+                }
             }
-        })
+        )
     }
 
     /**
@@ -194,10 +196,12 @@ object ChatUtils {
         prefixColor: String = "§e",
     ) {
         val msgPrefix = if (prefix) prefixColor + CHAT_PREFIX else ""
-        chat(Text.text(msgPrefix + message) {
-            this.url = url
-            this.hover = "$prefixColor$hover".asComponent()
-        })
+        chat(
+            Text.text(msgPrefix + message) {
+                this.url = url
+                this.hover = "$prefixColor$hover".asComponent()
+            }
+        )
         if (autoOpen) OSUtils.openBrowser(url)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
index ddd072c2864d..13ce7816d8d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
@@ -32,8 +32,10 @@ object ClipboardUtils {
         delay(11)
         getClipboard(retries - 1)
     } else {
-        ErrorManager.logErrorStateWithData("can not read clipboard",
-            "clipboard can not be accessed after 20 retries")
+        ErrorManager.logErrorStateWithData(
+            "can not read clipboard",
+            "clipboard can not be accessed after 20 retries"
+        )
         null
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index 898466ce4b84..829b692345f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -291,8 +291,11 @@ object CollectionUtils {
     }
 
     fun takeColumn(start: Int, end: Int, startColumn: Int, endColumn: Int, rowSize: Int = 9) =
-        generateSequence(start) { it + 1 }.map { (it / (endColumn - startColumn)) * rowSize + (it % (endColumn - startColumn)) + startColumn }
-            .takeWhile { it <= end }
+        generateSequence(start) {
+            it + 1
+        }.map {
+            (it / (endColumn - startColumn)) * rowSize + (it % (endColumn - startColumn)) + startColumn
+        }.takeWhile { it <= end }
 
     fun MutableList<Renderable>.addItemStack(internalName: NEUInternalName) {
         addItemStack(internalName.getItemStack())
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
index c0f65645a1f3..59701a38f28b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ComputerTimeOffset.kt
@@ -64,7 +64,10 @@ object ComputerTimeOffset {
             e, "Failed to get NTP offset",
             "server" to ntpServer,
         )
-        else e.printStackTrace()
+        else {
+            @Suppress("PrintStackTrace")
+            e.printStackTrace()
+        }
         null
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
index 97225369d6b3..3467366c96e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
@@ -288,17 +288,21 @@ object EntityOutlineRenderer {
     private fun shouldRender(camera: ICamera, entity: Entity, vector: LorenzVec): Boolean =
         // Only render the view entity when sleeping or in 3rd person mode
         if (entity === mc.renderViewEntity &&
-            !(mc.renderViewEntity is EntityLivingBase && (mc.renderViewEntity as EntityLivingBase).isPlayerSleeping ||
-                mc.gameSettings.thirdPersonView != 0)
+            !(
+                mc.renderViewEntity is EntityLivingBase && (mc.renderViewEntity as EntityLivingBase).isPlayerSleeping ||
+                    mc.gameSettings.thirdPersonView != 0
+                )
         ) {
             false
-        } else mc.theWorld.isBlockLoaded(BlockPos(entity)) && (mc.renderManager.shouldRender(
-            entity,
-            camera,
-            vector.x,
-            vector.y,
-            vector.z
-        ) || entity.riddenByEntity === mc.thePlayer)
+        } else mc.theWorld.isBlockLoaded(BlockPos(entity)) && (
+            mc.renderManager.shouldRender(
+                entity,
+                camera,
+                vector.x,
+                vector.y,
+                vector.z
+            ) || entity.riddenByEntity === mc.thePlayer
+            )
     // Only render if renderManager would render and the world is loaded at the entity
 
     private fun outlineColor(color: Int) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
index b4b9f30b1f2f..df6116388c6a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EssenceItemUtils.kt
@@ -64,7 +64,9 @@ object EssenceItemUtils {
         return Pair(collectCoinPrices, collectItemPrices)
     }
 
-    private fun split(string: String): Pair<NEUInternalName, Long> = string.split(":").let { it[0].asInternalName() to it[1].toLong() }
+    private fun split(string: String): Pair<NEUInternalName, Long> = string.split(":").let {
+        it[0].asInternalName() to it[1].toLong()
+    }
 
     private fun loadEssencePrices(data: NeuEssenceCostJson): MutableMap<Int, EssencePrice> {
         val map = mutableMapOf<Int, EssencePrice>()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
index 121b9cce337a..68ffd74bcca8 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
@@ -132,8 +132,7 @@ object GuiRenderUtils {
             // borders
             GuiScreen.drawRect(
                 tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1, tooltipY + tooltipHeight + 3 - 1, borderColor,
-
-                )
+            )
 
             GuiScreen.drawRect(
                 tooltipX + tooltipTextWidth + 2,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
index e3776308f246..d3c9a8e15ec1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
@@ -100,9 +100,11 @@ object ItemNameResolver {
         UtilsPatterns.enchantmentNamePattern.matchMatcher(enchantmentName) {
             val name = group("name").trim { it <= ' ' }
             val ultimate = group("format").lowercase().contains("§l")
-                ((if (ultimate && name != "Ultimate Wise" && name != "Ultimate Jerry") "ULTIMATE_" else "") +
+            (
+                (if (ultimate && name != "Ultimate Wise" && name != "Ultimate Jerry") "ULTIMATE_" else "") +
                     turboCheck(name).replace(" ", "_").replace("-", "_").uppercase() +
-                    ";" + group("level").romanToDecimal())
+                    ";" + group("level").romanToDecimal()
+                )
         }
 
     private fun turboCheck(text: String): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt b/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt
index ad90ff863ba9..8f40284aa63c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/KSerializable.kt
@@ -47,7 +47,9 @@ class KotlinTypeAdapterFactory : TypeAdapterFactory {
         val extraDataParam = primaryConstructor.parameters
             .find { it.findAnnotation<ExtraData>() != null && typeOf<MutableMap<String, JsonElement>>().isSubtypeOf(it.type) }
             ?.let { param ->
-                param to kotlinClass.memberProperties.find { it.name == param.name && it.returnType.isSubtypeOf(typeOf<Map<String, JsonElement>>()) } as KProperty1<Any, Map<String, JsonElement>>
+                param to kotlinClass.memberProperties.find {
+                    it.name == param.name && it.returnType.isSubtypeOf(typeOf<Map<String, JsonElement>>())
+                } as KProperty1<Any, Map<String, JsonElement>>
             }
         val parameterInfos = params.map { param ->
             ParameterInfo(
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
index 6d0eb33e51fd..5ea2ed116f0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUInternalName.kt
@@ -62,6 +62,7 @@ class NEUInternalName private constructor(private val internalName: String) {
 
     override fun hashCode(): Int = internalName.hashCode()
 
+    @Suppress("WrongEqualsTypeParameter")
     fun equals(other: String) = internalName == other
 
     fun contains(other: String) = internalName.contains(other)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 309f17f686e2..39f251340a3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -650,8 +650,11 @@ object RenderUtils {
     ) {
         if (list.isEmpty()) return
 
-        val render =
-            list.map { it.map { Renderable.fromAny(it, itemScale = itemScale) ?: throw RuntimeException("Unknown render object: $it") } }
+        val render = list.map { listEntry ->
+            listEntry.map {
+                Renderable.fromAny(it, itemScale = itemScale) ?: throw RuntimeException("Unknown render object: $it")
+            }
+        }
 
         this.renderRenderablesDouble(render, extraSpace, posLabel, true)
     }
@@ -1323,11 +1326,11 @@ object RenderUtils {
                 }
             } else {
                 val pathLines = path.zipWithNext()
-                pathLines.forEachIndexed { index, it ->
-                    val reduce = it.second.minus(it.first).normalize().times(bezierPoint)
+                pathLines.forEachIndexed { index, pathLine ->
+                    val reduce = pathLine.second.minus(pathLine.first).normalize().times(bezierPoint)
                     draw3DLine(
-                        if (index != 0) it.first + reduce else it.first,
-                        if (index != pathLines.lastIndex) it.second - reduce else it.second,
+                        if (index != 0) pathLine.first + reduce else pathLine.first,
+                        if (index != pathLines.lastIndex) pathLine.second - reduce else pathLine.second,
                         color,
                         lineWidth,
                         depth,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
index 270b52038ce2..9a081749425d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
@@ -74,10 +74,10 @@ object TabListData {
         val tabHeader = header.conditionalTransform(noColor, { this.removeColor() }, { this })
         val tabFooter = footer.conditionalTransform(noColor, { this.removeColor() }, { this })
 
-            val widgets = TabWidget.entries.filter { it.isActive }
-                .joinToString("\n") { "\n${it.name} : \n${it.lines.joinToString("\n")}" }
-            val string =
-                "Header:\n\n$tabHeader\n\nBody:\n\n${resultList.joinToString("\n")}\n\nFooter:\n\n$tabFooter\n\nWidgets:$widgets"
+        val widgets = TabWidget.entries.filter { it.isActive }
+            .joinToString("\n") { "\n${it.name} : \n${it.lines.joinToString("\n")}" }
+        val string =
+            "Header:\n\n$tabHeader\n\nBody:\n\n${resultList.joinToString("\n")}\n\nFooter:\n\n$tabFooter\n\nWidgets:$widgets"
 
         OSUtils.copyToClipboard(string)
         ChatUtils.chat("Tab list copied into the clipboard!")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
index efe1ddf95e68..2e507989699b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
@@ -10,13 +10,13 @@ object UtilsPatterns {
     private val patternGroup = RepoPattern.group("utils")
 
     /** Examples:
-    §d§l§ka§r §d§lMYTHIC ACCESSORY §d§l§ka
-    §d§l§ka§r §d§lSHINY MYTHIC DUNGEON CHESTPLATE §d§l§ka
-    §c§l§ka§r §c§lVERY SPECIAL HATCESSORY §c§l§ka
-    §6§lSHINY LEGENDARY DUNGEON BOOTS
-    §6§lLEGENDARY DUNGEON BOOTS
-    §5§lEPIC BOOTS
-    §f§lCOMMON
+     §d§l§ka§r §d§lMYTHIC ACCESSORY §d§l§ka
+     §d§l§ka§r §d§lSHINY MYTHIC DUNGEON CHESTPLATE §d§l§ka
+     §c§l§ka§r §c§lVERY SPECIAL HATCESSORY §c§l§ka
+     §6§lSHINY LEGENDARY DUNGEON BOOTS
+     §6§lLEGENDARY DUNGEON BOOTS
+     §5§lEPIC BOOTS
+     §f§lCOMMON
      **/
     val rarityLoreLinePattern by patternGroup.pattern(
         "item.lore.rarity.line",
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
index fe7486d0d541..df5766bcdee6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/chat/Text.kt
@@ -22,13 +22,13 @@ object Text {
     fun multiline(vararg lines: Any?) = join(*lines, separator = NEWLINE)
     fun join(vararg components: Any?, separator: IChatComponent? = null): IChatComponent {
         val result = ChatComponentText("")
-        components.forEachIndexed { index, it ->
-            when (it) {
-                is IChatComponent -> result.appendSibling(it)
-                is String -> result.appendText(it)
-                is List<*> -> result.appendSibling(join(*it.toTypedArray(), separator = separator))
+        components.forEachIndexed { index, component ->
+            when (component) {
+                is IChatComponent -> result.appendSibling(component)
+                is String -> result.appendText(component)
+                is List<*> -> result.appendSibling(join(*component.toTypedArray(), separator = separator))
                 null -> return@forEachIndexed
-                else -> error("Unsupported type: ${it::class.simpleName}")
+                else -> error("Unsupported type: ${component::class.simpleName}")
             }
 
             if (index < components.size - 1 && separator != null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
index 231402d330f7..fd199b48a9e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTab.kt
@@ -42,24 +42,28 @@ class GuideTab(
 
     private var selectColor = NOT_SELECTED_COLOR
 
-    private val renderable = Renderable.clickAndHover(object : Renderable {
-        override val width = this@GuideTab.width
-        override val height = this@GuideTab.height
-        override val horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT
-        override val verticalAlign: VerticalAlignment = VerticalAlignment.TOP
+    private val renderable = Renderable.clickAndHover(
+        object : Renderable {
+            override val width = this@GuideTab.width
+            override val height = this@GuideTab.height
+            override val horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT
+            override val verticalAlign: VerticalAlignment = VerticalAlignment.TOP
 
-        val itemRender = Renderable.itemStack(
-            item, 1.0, horizontalAlign = HorizontalAlignment.CENTER, verticalAlign = VerticalAlignment.CENTER
-        )
+            val itemRender = Renderable.itemStack(
+                item, 1.0, horizontalAlign = HorizontalAlignment.CENTER, verticalAlign = VerticalAlignment.CENTER
+            )
 
-        override fun render(posX: Int, posY: Int) {
-            Gui.drawRect(0, 0, width, height, selectColor)
-            itemRender.renderXYAligned(posX, posY, width, height)
+            override fun render(posX: Int, posY: Int) {
+                Gui.drawRect(0, 0, width, height, selectColor)
+                itemRender.renderXYAligned(posX, posY, width, height)
+            }
+        },
+        listOf(tip),
+        onClick = {
+            click()
+            SoundUtils.playClickSound()
         }
-    }, listOf(tip), onClick = {
-        click()
-        SoundUtils.playClickSound()
-    })
+    )
 
     fun render(posX: Int, posY: Int) {
         renderable.render(posX, posY)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTablePage.kt b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTablePage.kt
index 85dd5bddaad3..a0dc51c8be96 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTablePage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/guide/GuideTablePage.kt
@@ -27,7 +27,8 @@ abstract class GuideTablePage(
                         yPadding = ySpace
                     ),
                     Renderable.horizontalContainer(footer, footerSpacing, horizontalAlign = HorizontalAlignment.CENTER)
-                ), spacing = ySpace
+                ),
+                spacing = ySpace
             )
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/json/FeatureTogglesByDefaultAdapter.kt b/src/main/java/at/hannibal2/skyhanni/utils/json/FeatureTogglesByDefaultAdapter.kt
index 67dc2420cdbe..4cef43e35ea2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/json/FeatureTogglesByDefaultAdapter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/json/FeatureTogglesByDefaultAdapter.kt
@@ -81,7 +81,8 @@ object FeatureTogglesByDefaultAdapter : TypeAdapterFactory {
         if (t.fields.none {
                 it.isAnnotationPresent(FeatureToggle::class.java) ||
                     gson.getAdapter(TypeToken.get(getType(type, it))) is Adapter
-            }) return null
+            }
+        ) return null
 
         val originalWrite = gson.getDelegateAdapter(this, type)
         return Adapter(originalWrite, t as Class<T>, gson, type)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 5362cc17794c..94f0bc16eff1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -564,7 +564,7 @@ interface Renderable {
                     for ((index, renderable) in row.withIndex()) {
                         GlStateManager.pushMatrix()
                         GlStateManager.translate(xOffsets[index].toFloat(), yOffsets[rowIndex].toFloat(), 0F)
-                        renderable?.renderXYAligned(
+                        renderable.renderXYAligned(
                             posX + xOffsets[index],
                             posY + yOffsets[rowIndex],
                             xOffsets[index + 1] - xOffsets[index] - emptySpaceX,
@@ -1140,8 +1140,10 @@ interface Renderable {
                     renderY += yShift
                 }
                 @Suppress("SpacingAroundCurly")
-                val range = yOffsets.indexOfFirst { it >= scroll.asInt() }..<(yOffsets.indexOfFirst { it >= end }.takeIf { it > 0 }
-                    ?: yOffsets.size) - 1
+                val range = yOffsets.indexOfFirst { it >= scroll.asInt() }..<(
+                    yOffsets.indexOfFirst { it >= end }.takeIf { it > 0 }
+                        ?: yOffsets.size
+                    ) - 1
 
                 val range2 = if (range.last + 3 <= yOffsets.size && yOffsets[range.last + 2] - yOffsets[range.first] <= height - renderY) {
                     range.first..range.last() + 1
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
index 9760ef867f98..310a0523b72b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableInventory.kt
@@ -87,15 +87,20 @@ object RenderableInventory {
             uvRow.map { uv ->
                 val uvArray = uv.getUvCoords()
                 val renderable = if (uv == SlotsUv.CENTER) {
-                    (items[index]?.let { item ->
-                        Renderable.itemStack(
-                            item,
-                            scale,
-                            0,
-                            0,
-                            false,
+                    (
+                        items[index]?.let { item ->
+                            Renderable.itemStack(
+                                item,
+                                scale,
+                                0,
+                                0,
+                                false,
+                            )
+                        } ?: Renderable.placeholder(
+                            (16 * scale).toInt(),
+                            (16 * scale).toInt()
                         )
-                    } ?: Renderable.placeholder((16 * scale).toInt(), (16 * scale).toInt())).also { index++ }
+                        ).also { index++ }
                 } else Renderable.placeholder(0, 0)
                 Renderable.drawInsideFixedSizedImage(
                     renderable,
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
index 64c1d8f86b6a..d71ac51a6900 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -33,10 +33,12 @@ internal object RenderableUtils {
     /** Calculates the absolute y position of the rows in a table*/
     fun calculateTableYOffsets(content: List<List<Renderable?>>, yPadding: Int) = run {
         var buffer = 0
-        listOf(0) + (content.takeIf { it.isNotEmpty() }?.map { row ->
-            buffer += (row.maxOfOrNull { it?.height ?: 0 } ?: 0) + yPadding
-            buffer
-        } ?: listOf(yPadding))
+        listOf(0) + (
+            content.takeIf { it.isNotEmpty() }?.map { row ->
+                buffer += (row.maxOfOrNull { it?.height ?: 0 } ?: 0) + yPadding
+                buffer
+            } ?: listOf(yPadding)
+            )
     }
 
     fun calculateAlignmentXOffset(width: Int, xSpace: Int, alignment: HorizontalAlignment) = when (alignment) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
index 2197bf5c0e9e..f5aa42056762 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt
@@ -59,10 +59,10 @@ abstract class BucketedItemTrackerData<E : Enum<E>> : TrackerData() {
             ?: (this.javaClass.genericSuperclass as? ParameterizedTypeImpl)?.actualTypeArguments?.firstOrNull()?.let { type ->
                 (type as? Class<E>)?.enumConstants
             } ?: ErrorManager.skyHanniError(
-                "Unable to retrieve enum constants for E in BucketedItemTrackerData",
-                "selectedBucket" to selectedBucket,
-                "dataClass" to this.javaClass.superclass.name,
-            )
+            "Unable to retrieve enum constants for E in BucketedItemTrackerData",
+            "selectedBucket" to selectedBucket,
+            "dataClass" to this.javaClass.superclass.name,
+        )
     }
 
     @Expose
@@ -71,8 +71,12 @@ abstract class BucketedItemTrackerData<E : Enum<E>> : TrackerData() {
     private var bucketedItems: MutableMap<E, MutableMap<NEUInternalName, TrackedItem>> = HashMap()
 
     private fun getBucket(bucket: E): MutableMap<NEUInternalName, TrackedItem> = bucketedItems[bucket]?.toMutableMap() ?: HashMap()
-    private fun getPoppedBuckets(): MutableList<E> = (bucketedItems.toMutableMap().filter { it.value.isNotEmpty() }.keys).toMutableList()
-    fun getItemsProp(): MutableMap<NEUInternalName, TrackedItem> = getSelectedBucket()?.let { getBucket(it) } ?: flattenBuckets()
+    private fun getPoppedBuckets(): MutableList<E> = bucketedItems.toMutableMap().filter {
+        it.value.isNotEmpty()
+    }.keys.toMutableList()
+    fun getItemsProp(): MutableMap<NEUInternalName, TrackedItem> = getSelectedBucket()?.let {
+        getBucket(it)
+    } ?: flattenBuckets()
     fun getSelectedBucket() = selectedBucket
     fun selectNextSequentialBucket() {
         // Move to the next ordinal, or wrap to null if at the last value
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
index cd85646341fc..2addca5c0aa9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt
@@ -59,9 +59,9 @@ class SkyHanniBucketedItemTracker<E : Enum<E>, BucketedData : BucketedItemTracke
             lists.addSearchableSelector<ItemPriceSource>(
                 "",
                 getName = { type -> type.sellName },
-                isCurrent = { it?.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
+                isCurrent = { it.ordinal == config.priceSource.ordinal }, // todo avoid ordinal
                 onChange = {
-                    config.priceSource = it?.let { ItemPriceSource.entries[it.ordinal] } // todo avoid ordinal
+                    config.priceSource = it.let { ItemPriceSource.entries[it.ordinal] } // todo avoid ordinal
                     update()
                 },
             )

From 5c5cd184763e1202d26028124ad1f51750510800 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 11 Oct 2024 18:44:16 +0200
Subject: [PATCH 697/721] Fix: Custom Scoreboard Second Objective (#2709)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/gui/customscoreboard/ScoreboardPattern.kt        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index fb014cc29243..f7371d9566c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -428,10 +428,12 @@ object ScoreboardPattern {
     // this thirdObjectiveLinePattern includes all those weird objective lines that go into a third (and fourth) scoreboard line
     /**
      * REGEX-TEST: §eProtect Elle §7(§a98%§7)
+     * REGEX-TEST: §fFish 1 Flyfish §c✖
+     * REGEX-TEST: §fFish 1 Skeleton Fish §c✖
      */
     val thirdObjectiveLinePattern by miscSb.pattern(
         "thirdobjectiveline",
-        "(\\s*§.\\(§.\\w+§./§.\\w+§.\\)|§f Mages.*|§f Barbarians.*|§edefeat Kuudra|§eand stun him)",
+        "(\\s*§.\\(§.\\w+§.\\/§.\\w+§.\\)|§f Mages.*|§f Barbarians.*|§edefeat Kuudra|§eand stun him|§.Fish \\d .*[fF]ish §.[✖✔])",
     )
 
     // collection of lines that just randomly exist and I have no clue how on earth to effectively remove them

From 7ee4d351c790043324863205a89a74361d3a2bed Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 11 Oct 2024 18:44:48 +0200
Subject: [PATCH 698/721] Fix: MP Reset in Dungeons (#2710)

---
 src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
index 194664c94886..776a7c808103 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
@@ -273,11 +273,11 @@ object MaxwellAPI {
             if (noPowerSelectedPattern.matches(line)) currentPower = NO_POWER
 
             inventoryMPPattern.matchMatcher(line) {
+                foundMagicalPower = true
                 // MagicalPower is boosted in catacombs
                 if (DungeonAPI.inDungeon()) return@matchMatcher
 
                 magicalPower = group("mp").formatInt()
-                foundMagicalPower = true
             }
 
             inventoryPowerPattern.matchMatcher(line) {

From f448c9095d914ef49bee400f53f291e537a5013d Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Fri, 11 Oct 2024 17:46:38 +0100
Subject: [PATCH 699/721] Fix: Remove color codes from hoppity eggs share
 message (#2711)

---
 .../hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
index 593326c67f13..5e1910d0d1c9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt
@@ -29,6 +29,7 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.SkyblockSeason
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -167,7 +168,8 @@ object HoppityAPI {
         eggFoundPattern.matchMatcher(event.message) {
             resetRabbitData()
             lastMeal = getEggType(event)
-            lastMeal?.let { EggFoundEvent(it, note = groupOrNull("note")).post() }
+            val note = groupOrNull("note")?.removeColor()
+            lastMeal?.let { EggFoundEvent(it, note = note).post() }
             attemptFireRabbitFound()
         }
 

From ec5c1957e6f24a2ca25d5242fa169540ac461344 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Fri, 11 Oct 2024 18:47:13 +0200
Subject: [PATCH 700/721] Improvement: Add Distance to Patcher Send Coords
 Waypoints (#2704)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../skyhanni/features/misc/PatcherSendCoordinates.kt       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
index 98232a428d3c..3babbc52a4af 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
@@ -9,9 +9,11 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
@@ -67,9 +69,12 @@ object PatcherSendCoordinates {
 
         for (beacon in patcherBeacon) {
             val location = beacon.location
+            val distance = location.distanceToPlayer()
+            val formattedDistance = distance.toInt().addSeparators()
+
             event.drawColor(location, LorenzColor.DARK_GREEN, alpha = 1f)
             event.drawWaypointFilled(location, config.color.toChromaColor(), true, true)
-            event.drawString(location.add(0.5, 0.5, 0.5), beacon.name, true, LorenzColor.DARK_BLUE.toColor())
+            event.drawString(location.add(0.5, 0.5, 0.5), beacon.name + " §e[${formattedDistance}m]", true, LorenzColor.DARK_BLUE.toColor())
         }
     }
 

From 8c54be95700b224c2f93b549465dbe06bf3bbe86 Mon Sep 17 00:00:00 2001
From: Fazfoxy <78978526+Fazfoxy@users.noreply.github.com>
Date: Fri, 11 Oct 2024 17:49:06 +0100
Subject: [PATCH 701/721] Fix: buy from bazaar supercraft on overflowed
 inventory names (#2703)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../inventory/bazaar/CraftMaterialsFromBazaar.kt       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
index b5c3c6ab4989..36b5fa505648 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt
@@ -17,10 +17,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack
 import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.makePrimitiveStack
-import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.renderables.Renderable
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
@@ -29,10 +27,6 @@ object CraftMaterialsFromBazaar {
     private val config get() = SkyHanniMod.feature.inventory.bazaar
 
     private val materialSlots = listOf(10, 11, 12, 19, 20, 21, 28, 29, 30)
-    private val inventoryPattern by RepoPattern.pattern(
-        "inventory.recipe.title",
-        ".* Recipe"
-    )
 
     private var inRecipeInventory = false
     private var purchasing = false
@@ -43,11 +37,11 @@ object CraftMaterialsFromBazaar {
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!isEnabled()) return
-        val correctInventoryName = inventoryPattern.matches(event.inventoryName)
         val items = event.inventoryItems
         val correctItem = items[23]?.name == "§aCrafting Table"
+        val correctSuperCraftItem = items[32]?.name == "§aSupercraft"
 
-        inRecipeInventory = correctInventoryName && correctItem && !purchasing
+        inRecipeInventory = correctSuperCraftItem && correctItem && !purchasing
         if (!inRecipeInventory) return
 
         val recipeName = items[25]?.itemName ?: return

From 9a2286ac3070e1ba0023445dc8243e618989e86e Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Fri, 11 Oct 2024 19:01:42 +0200
Subject: [PATCH 702/721] Backend: LorenzVec up/down and drawLineToEye (#2056)

Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/data/mob/MobDebug.kt   |  2 +-
 .../features/combat/mobs/MobHighlight.kt      | 10 +-
 .../cosmetics/CosmeticFollowingLine.kt        |  4 +-
 .../dungeon/DungeonHighlightClickedBlocks.kt  |  2 +-
 .../features/dungeon/DungeonLividFinder.kt    | 16 ++--
 .../event/diana/GriffinBurrowHelper.kt        | 23 ++---
 .../event/hoppity/HoppityEggLocations.kt      |  4 +-
 .../event/hoppity/HoppityEggLocator.kt        | 13 ++-
 .../features/fishing/ShowFishingItemName.kt   |  2 +-
 .../fishing/ThunderSparksHighlight.kt         |  8 +-
 .../features/fishing/TotemOfCorruption.kt     |  4 +-
 .../garden/farming/GardenStartLocation.kt     |  3 +-
 .../garden/pests/PestParticleWaypoint.kt      | 10 +-
 .../garden/visitor/GardenVisitorFeatures.kt   |  4 +-
 .../mining/glacitemineshaft/CorpseLocator.kt  |  2 +-
 .../glacitemineshaft/MineshaftWaypoints.kt    |  4 +-
 .../features/minion/MinionFeatures.kt         |  6 +-
 .../features/misc/PatcherSendCoordinates.kt   |  2 +-
 .../features/misc/trevor/TrevorFeatures.kt    | 12 ++-
 .../features/nether/MatriarchHelper.kt        |  2 +-
 .../nether/ashfang/AshfangBlazingSouls.kt     |  2 +-
 .../nether/ashfang/AshfangGravityOrbs.kt      |  2 +-
 .../rift/area/dreadfarm/RiftAgaricusCap.kt    |  2 +-
 .../dreadfarm/RiftWiltedBerberisHelper.kt     |  4 +-
 .../rift/area/dreadfarm/VoltHighlighter.kt    |  4 +-
 .../livingcave/LivingCaveDefenseBlocks.kt     | 15 ++-
 .../area/mirrorverse/RiftUpsideDownParkour.kt |  2 +-
 .../rift/everywhere/EnigmaSoulWaypoints.kt    |  2 +-
 .../rift/everywhere/motes/RiftMotesOrb.kt     |  2 +-
 .../features/slayer/SlayerItemsOnGround.kt    |  2 +-
 .../features/slayer/SlayerMiniBossFeatures.kt | 10 +-
 .../features/slayer/VampireSlayerFeatures.kt  | 94 ++++++++++---------
 .../slayer/enderman/EndermanSlayerFeatures.kt | 16 ++--
 .../features/summonings/SummoningSoulsName.kt |  2 +-
 .../test/command/TrackParticlesCommand.kt     | 10 +-
 .../test/command/TrackSoundsCommand.kt        |  8 +-
 .../hannibal2/skyhanni/utils/EntityUtils.kt   |  6 +-
 .../hannibal2/skyhanni/utils/LocationUtils.kt |  6 +-
 .../at/hannibal2/skyhanni/utils/LorenzVec.kt  | 32 ++++---
 .../hannibal2/skyhanni/utils/ParkourHelper.kt |  2 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  9 ++
 41 files changed, 180 insertions(+), 185 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
index 69b0b85a8c10..d9cb34ed25d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt
@@ -42,7 +42,7 @@ object MobDebug {
         val map = filter { it.canBeSeen() && it.isNotInvisible() }
             .map { it.boundingBox.getTopCenter() to it.name }
         for ((location, text) in map) {
-            event.drawString(location.add(y = 0.5), "§5$text", seeThroughBlocks = true)
+            event.drawString(location.up(0.5), "§5$text", seeThroughBlocks = true)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
index 7d51994c029f..a4c4dcf8d09b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
@@ -15,8 +15,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import at.hannibal2.skyhanni.utils.LorenzUtils.ignoreDerpy
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.entity.EntityLivingBase
@@ -115,12 +114,11 @@ object MobHighlight {
 
         if (arachne.distanceToPlayer() > 10) return
 
-        event.draw3DLine(
-            event.exactPlayerEyeLocation(),
-            arachne.getLorenzVec().add(y = 1),
+        event.drawLineToEye(
+            arachne.getLorenzVec().up(),
             LorenzColor.RED.toColor(),
             config.lineToArachneWidth,
-            true
+            true,
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt
index 34e962890553..54ef80f77a4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt
@@ -72,7 +72,7 @@ object CosmeticFollowingLine {
     }
 
     private fun updateClose(event: LorenzRenderWorldEvent) {
-        val playerLocation = event.exactLocation(Minecraft.getMinecraft().thePlayer).add(y = 0.3)
+        val playerLocation = event.exactLocation(Minecraft.getMinecraft().thePlayer).up(0.3)
 
         latestLocations = latestLocations.editCopy {
             val locationSpot = LocationSpot(SimpleTimeMark.now(), Minecraft.getMinecraft().thePlayer.onGround)
@@ -113,7 +113,7 @@ object CosmeticFollowingLine {
         }
 
         if (event.isMod(2)) {
-            val playerLocation = LocationUtils.playerLocation().add(y = 0.3)
+            val playerLocation = LocationUtils.playerLocation().up(0.3)
 
             locations.keys.lastOrNull()?.let {
                 if (it.distance(playerLocation) < 0.1) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index 4d494567d4d6..ca9dd8c1f6bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -97,7 +97,7 @@ object DungeonHighlightClickedBlocks {
         blocks.forEach { (position, block) ->
             event.drawColor(position, block.color)
             if (config.showText) {
-                event.drawString(position.add(0.5, 0.5, 0.5), block.displayText, true)
+                event.drawString(position.blockCenter(), block.displayText, true)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
index 9cc4b8a100a2..2a8595af9e8e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@@ -15,11 +15,10 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzColor.Companion.toLorenzColor
 import at.hannibal2.skyhanni.utils.LorenzVec
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
-import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
+import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import net.minecraft.block.BlockStainedGlass
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
@@ -134,17 +133,16 @@ object DungeonLividFinder {
         if (!config.enabled) return
 
         val livid = getLividAlive() ?: return
-        val location = livid.getLorenzVec().add(-0.5, 0.0, -0.5)
-
         val lorenzColor = color ?: return
-
-        event.drawDynamicText(location, lorenzColor.getChatColor() + "Livid", 1.5)
+        val location = event.exactLocation(livid)
 
         if (location.distanceSqToPlayer() < 50) return
 
+        event.drawDynamicText(location, lorenzColor.getChatColor() + "Livid", 1.5)
+
         val color = lorenzColor.toColor()
-        event.draw3DLine(event.exactPlayerEyeLocation(), location.add(0.5, 0.0, 0.5), color, 3, true)
-        event.drawWaypointFilled(location, color, beacon = false, seeThroughBlocks = true)
+        event.drawLineToEye(location, color, 3, true)
+        event.drawWaypointFilled(location.add(-0.5, 0.0, -0.5), color, beacon = false, seeThroughBlocks = true)
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index aa58c3c0f43f..57cc77df583e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -31,10 +31,9 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.toLorenzVec
@@ -281,34 +280,32 @@ object GriffinBurrowHelper {
                 if (distance > 10) {
                     // TODO use round(1)
                     val formattedDistance = distance.toInt().addSeparators()
-                    event.drawDynamicText(location.add(y = 1), "§d§lInquisitor §e${formattedDistance}m", 1.7)
+                    event.drawDynamicText(location.up(), "§d§lInquisitor §e${formattedDistance}m", 1.7)
                 } else {
-                    event.drawDynamicText(location.add(y = 1), "§d§lInquisitor", 1.7)
+                    event.drawDynamicText(location.up(), "§d§lInquisitor", 1.7)
                 }
                 if (distance < 5) {
                     InquisitorWaypointShare.maybeRemove(inquis)
                 }
-                event.drawDynamicText(location.add(y = 1), "§eFrom §b${inquis.displayName}", 1.6, yOff = 9f)
+                event.drawDynamicText(location.up(), "§eFrom §b${inquis.displayName}", 1.6, yOff = 9f)
 
                 if (config.inquisitorSharing.showDespawnTime) {
                     val spawnTime = inquis.spawnTime
                     val format = (75.seconds - spawnTime.passedSince()).format()
-                    event.drawDynamicText(location.add(y = 1), "§eDespawns in §b$format", 1.6, yOff = 18f)
+                    event.drawDynamicText(location.up(), "§eDespawns in §b$format", 1.6, yOff = 18f)
                 }
             }
         }
 
         val currentWarp = BurrowWarpHelper.currentWarp
         if (config.lineToNext) {
-            val player = event.exactPlayerEyeLocation()
-
             var color: LorenzColor?
             val renderLocation = if (currentWarp != null) {
                 color = LorenzColor.AQUA
                 currentWarp.location
             } else {
                 color = if (shouldFocusOnInquis) LorenzColor.LIGHT_PURPLE else LorenzColor.WHITE
-                targetLocation?.add(0.5, 0.5, 0.5) ?: return
+                targetLocation?.blockCenter() ?: return
             }
 
             val lineWidth = if (targetLocation in particleBurrows) {
@@ -316,7 +313,7 @@ object GriffinBurrowHelper {
                 3
             } else 2
             if (currentWarp == null) {
-                event.draw3DLine(player, renderLocation, color.toColor(), lineWidth, false)
+                event.drawLineToEye(renderLocation, color.toColor(), lineWidth, false)
             }
         }
 
@@ -330,7 +327,7 @@ object GriffinBurrowHelper {
                 val distance = location.distance(playerLocation)
                 val burrowType = burrow.value
                 event.drawColor(location, burrowType.color, distance > 10)
-                event.drawDynamicText(location.add(y = 1), burrowType.text, 1.5)
+                event.drawDynamicText(location.up(), burrowType.text, 1.5)
             }
         }
 
@@ -340,10 +337,10 @@ object GriffinBurrowHelper {
                 val distance = guessLocation.distance(playerLocation)
                 event.drawColor(guessLocation, LorenzColor.WHITE, distance > 10)
                 val color = if (currentWarp != null && targetLocation == guessLocation) "§b" else "§f"
-                event.drawDynamicText(guessLocation.add(y = 1), "${color}Guess", 1.5)
+                event.drawDynamicText(guessLocation.up(), "${color}Guess", 1.5)
                 if (distance > 5) {
                     val formattedDistance = distance.toInt().addSeparators()
-                    event.drawDynamicText(guessLocation.add(y = 1), "§e${formattedDistance}m", 1.7, yOff = 10f)
+                    event.drawDynamicText(guessLocation.up(), "§e${formattedDistance}m", 1.7, yOff = 10f)
                 }
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
index 8962208424e4..13c5301126aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocations.kt
@@ -142,9 +142,9 @@ object HoppityEggLocations {
             val nameColorCode = (if (name != null) LorenzColor.GREEN else LorenzColor.RED).getChatColor()
 
             event.drawColor(location, color, false, 0.5f)
-            event.drawDynamicText(location.add(y = 0.5), "$nameColorCode$name", 1.2)
+            event.drawDynamicText(location.up(0.5), "$nameColorCode$name", 1.2)
             if (location.distanceSqToPlayer() < 100) {
-                event.drawDynamicText(location.add(y = 0.5), location.toCleanString(), 1.0, yOff = 12f)
+                event.drawDynamicText(location.up(0.5), location.toCleanString(), 1.0, yOff = 12f)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index e5425af34213..bef61bfbf5db 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -24,9 +24,9 @@ import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RecalculatingValue
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -120,11 +120,10 @@ object HoppityEggLocator {
     }
 
     private fun LorenzRenderWorldEvent.drawGuessLocations() {
-        val eyeLocation = exactPlayerEyeLocation()
         for ((index, eggLocation) in possibleEggLocations.withIndex()) {
             drawEggWaypoint(eggLocation, "§aGuess #${index + 1}")
             if (config.showLine) {
-                draw3DLine(eyeLocation, eggLocation.add(0.5, 0.5, 0.5), LorenzColor.GREEN.toColor(), 2, false)
+                drawLineToEye(eggLocation.blockCenter(), LorenzColor.GREEN.toColor(), 2, false)
             }
         }
     }
@@ -136,7 +135,7 @@ object HoppityEggLocator {
             if (dist < 10 && HoppityEggLocations.hasCollectedEgg(eggLocation)) {
                 val alpha = ((10 - dist) / 10).coerceAtMost(0.5).toFloat()
                 drawColor(eggLocation, LorenzColor.RED, false, alpha)
-                drawDynamicText(eggLocation.add(y = 1), "§cDuplicate Location!", 1.5)
+                drawDynamicText(eggLocation.up(), "§cDuplicate Location!", 1.5)
             }
         }
     }
@@ -152,10 +151,10 @@ object HoppityEggLocator {
                             config.waypointColor.toChromaColor(),
                             seeThroughBlocks = true,
                         )
-                        drawDynamicText(it.add(y = 1), "§aGuess", 1.5)
+                        drawDynamicText(it.up(), "§aGuess", 1.5)
                     }
                     if (!drawLocations && config.showLine) {
-                        draw3DLine(eyeLocation, it.add(0.5, 0.5, 0.5), LorenzColor.GREEN.toColor(), 2, false)
+                        drawLineToEye(it.blockCenter(), LorenzColor.GREEN.toColor(), 2, false)
                     }
                 }
             }
@@ -170,7 +169,7 @@ object HoppityEggLocator {
         } else {
             drawColor(location, LorenzColor.RED.toColor(), false, 0.5f)
         }
-        drawDynamicText(location.add(y = 1), possibleDuplicateLabel, 1.5)
+        drawDynamicText(location.up(), possibleDuplicateLabel, 1.5)
     }
 
     private fun shouldShowAllEggs() = config.showAllWaypoints && !locatorInHotbar && HoppityEggType.eggsRemaining()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
index 04b4fc7489ce..514d330a4bee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt
@@ -64,7 +64,7 @@ object ShowFishingItemName {
         if (!isEnabled()) return
 
         for ((item, text) in itemsOnGround) {
-            val location = event.exactLocation(item).add(y = 0.8)
+            val location = event.exactLocation(item).up(0.8)
             event.drawString(location, text)
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
index d1220d7e39be..b84ee2970b0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt
@@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
-import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
@@ -47,7 +46,6 @@ object ThunderSparksHighlight {
         val special = config.color
         val color = Color(SpecialColor.specialToChromaRGB(special), true)
 
-        val playerLocation = LocationUtils.playerLocation()
         for (spark in sparks) {
             if (spark.isDead) continue
             val sparkLocation = spark.getLorenzVec()
@@ -55,10 +53,10 @@ object ThunderSparksHighlight {
             val seeThroughBlocks =
                 sparkLocation.distanceToPlayer() < 6 && (block == Blocks.flowing_lava || block == Blocks.lava)
             event.drawWaypointFilled(
-                sparkLocation.add(-0.5, 0.0, -0.5), color, extraSize = -0.25, seeThroughBlocks = seeThroughBlocks
+                sparkLocation.add(-0.5, 0.0, -0.5), color, extraSize = -0.25, seeThroughBlocks = seeThroughBlocks,
             )
-            if (sparkLocation.distance(playerLocation) < 10) {
-                event.drawString(sparkLocation.add(y = 1.5), "Thunder Spark", seeThroughBlocks = seeThroughBlocks)
+            if (sparkLocation.distanceToPlayer() < 10) {
+                event.drawString(sparkLocation.up(1.5), "Thunder Spark", seeThroughBlocks = seeThroughBlocks)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
index 9896580c6b2b..079f1cc630a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
@@ -96,11 +96,11 @@ object TotemOfCorruption {
             // The center of the totem is the upper part of the armor stand
             when (config.outlineType) {
                 OutlineType.FILLED -> {
-                    event.drawSphereInWorld(color, totem.location.add(y = 1), 16f)
+                    event.drawSphereInWorld(color, totem.location.up(), 16f)
                 }
 
                 OutlineType.WIREFRAME -> {
-                    event.drawSphereWireframeInWorld(color, totem.location.add(y = 1), 16f)
+                    event.drawSphereWireframeInWorld(color, totem.location.up(), 16f)
                 }
 
                 else -> return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenStartLocation.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenStartLocation.kt
index 8dc32fae6b4b..ba422d0f2eab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenStartLocation.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenStartLocation.kt
@@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceSqToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -64,7 +63,7 @@ object GardenStartLocation {
             ChatUtils.chat("Auto updated your Crop Start Location for ${crop.cropName}")
         }
 
-        lastFarmedLocations[crop] = LorenzVec.getBlockBelowPlayer().add(0.0, 1.0, 0.0)
+        lastFarmedLocations[crop] = LocationUtils.playerLocation().roundLocationToBlock()
         shouldShowLastFarmedWaypoint = false
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index d07e55816732..6056c054eac9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -17,10 +17,9 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayerIgnoreY
 import at.hannibal2.skyhanni.utils.LocationUtils.playerLocation
 import at.hannibal2.skyhanni.utils.LorenzVec
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
 import net.minecraft.network.play.server.S0EPacketSpawnObject
@@ -145,12 +144,7 @@ object PestParticleWaypoint {
 
         event.drawWaypointFilled(waypoint, color, beacon = true)
         event.drawDynamicText(waypoint, text, 1.3)
-        if (config.drawLine) event.draw3DLine(
-            event.exactPlayerEyeLocation(),
-            waypoint,
-            color,
-            3,
-            false,
+        if (config.drawLine) event.drawLineToEye(waypoint, color, 3, false,
         )
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 9fc0e7664aa1..1d5907d85284 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -361,12 +361,12 @@ object GardenVisitorFeatures {
         val visitor = event.visitor
         val text = visitor.status.displayName
         val location = event.location
-        event.parent.drawString(location.add(y = 2.23), text)
+        event.parent.drawString(location.up(2.23), text)
         if (config.rewardWarning.showOverName) {
             visitor.hasReward()?.let { reward ->
                 val name = reward.displayName
 
-                event.parent.drawString(location.add(y = 2.73), "§c!$name§c!")
+                event.parent.drawString(location.up(2.73), "§c!$name§c!")
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
index 3ea9ee4b14ec..6ec32fd2e129 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseLocator.kt
@@ -59,7 +59,7 @@ object CorpseLocator {
                     MineshaftWaypoints.waypoints.add(
                         MineshaftWaypoint(
                             waypointType = corpseType,
-                            location = entity.getLorenzVec().add(y = 1),
+                            location = entity.getLorenzVec().up(),
                             isCorpse = true,
                         ),
                     )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
index ae17e783bb16..2c05e35251ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/MineshaftWaypoints.kt
@@ -9,9 +9,9 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.HypixelCommands
-import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -38,7 +38,7 @@ object MineshaftWaypoints {
     fun onIslandChange(event: IslandChangeEvent) {
         if (event.newIsland != IslandType.MINESHAFT) return
 
-        val playerLocation = LocationUtils.playerLocation().roundTo(0).add(y = -1)
+        val playerLocation = LorenzVec.getBlockBelowPlayer()
 
         if (config.mineshaftWaypoints.entranceLocation) {
             waypoints.add(MineshaftWaypoint(waypointType = MineshaftWaypointType.ENTRANCE, location = playerLocation))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index 3908155724be..c7d7bb5042e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -360,7 +360,7 @@ object MinionFeatures {
         val playerLocation = LocationUtils.playerLocation()
         val minions = minions ?: return
         for (minion in minions) {
-            val location = minion.key.add(y = 1.0)
+            val location = minion.key.up()
             if (location.distanceToPlayer() > 50) continue
 
             val lastEmptied = minion.value.lastClicked
@@ -371,14 +371,14 @@ object MinionFeatures {
                 val name = "§6" + if (config.nameOnlyTier) {
                     displayName.split(" ").last()
                 } else displayName
-                event.drawString(location.add(y = 0.65), name, true)
+                event.drawString(location.up(0.65), name, true)
             }
 
             if (config.emptiedTime.display && lastEmptied != 0L) {
                 val passedSince = SimpleTimeMark(lastEmptied).passedSince()
                 val format = passedSince.format(longName = true) + " ago"
                 val text = "§eHopper Emptied: $format"
-                event.drawString(location.add(y = 1.15), text, true)
+                event.drawString(location.up(1.15), text, true)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
index 3babbc52a4af..0d300bab1e87 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
@@ -74,7 +74,7 @@ object PatcherSendCoordinates {
 
             event.drawColor(location, LorenzColor.DARK_GREEN, alpha = 1f)
             event.drawWaypointFilled(location, config.color.toChromaColor(), true, true)
-            event.drawString(location.add(0.5, 0.5, 0.5), beacon.name + " §e[${formattedDistance}m]", true, LorenzColor.DARK_BLUE.toColor())
+            event.drawString(location.blockCenter(), beacon.name + " §e[${formattedDistance}m]", true, LorenzColor.DARK_BLUE.toColor())
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index 9d1a1dca24a0..6ca32d610db6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -254,10 +254,12 @@ object TrevorFeatures {
         var entityTrapper = EntityUtils.getEntityByID(trapperID)
         if (entityTrapper !is EntityLivingBase) entityTrapper = EntityUtils.getEntityByID(backupTrapperID)
         if (entityTrapper is EntityLivingBase && config.trapperTalkCooldown) {
-            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color) { config.trapperTalkCooldown }
+            RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color) {
+                config.trapperTalkCooldown
+            }
             entityTrapper.getLorenzVec().let {
                 if (it.distanceToPlayer() < 15) {
-                    event.drawString(it.add(y = 2.23), currentLabel)
+                    event.drawString(it.up(2.23), currentLabel)
                 }
             }
         }
@@ -273,11 +275,11 @@ object TrevorFeatures {
                     TrevorSolver.currentMob!!.mobName
                 }
                 location = TrevorSolver.mobCoordinates
-                event.drawWaypointFilled(location.add(y = -2), LorenzColor.GREEN.toColor(), true, true)
-                event.drawDynamicText(location.add(y = 1), displayName, 1.5)
+                event.drawWaypointFilled(location.down(2), LorenzColor.GREEN.toColor(), true, true)
+                event.drawDynamicText(location.up(), displayName, 1.5)
             } else {
                 event.drawWaypointFilled(location, LorenzColor.GOLD.toColor(), true, true)
-                event.drawDynamicText(location.add(y = 1), TrevorSolver.mobLocation.location, 1.5)
+                event.drawDynamicText(location.up(), TrevorSolver.mobLocation.location, 1.5)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/MatriarchHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/MatriarchHelper.kt
index 1d74e0b96581..7d2240d4dbdd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/MatriarchHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/MatriarchHelper.kt
@@ -62,7 +62,7 @@ object MatriarchHelper {
             val color = config.lineColor.toChromaColor()
             var prePoint = event.exactPlayerEyeLocation()
             for (mob in pearlList) {
-                val point = mob.baseEntity.getLorenzVec().add(y = 1.2)
+                val point = mob.baseEntity.getLorenzVec().up(1.2)
                 event.draw3DLine(prePoint, point, color, 10, true)
                 prePoint = point
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
index 849f9a48a0b0..de4db8f833da 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
@@ -50,7 +50,7 @@ object AshfangBlazingSouls {
             event.drawWaypointFilled(orbLocation.add(-0.5, 1.25, -0.5), color, extraSize = -0.15)
             if (orbLocation.distance(playerLocation) < 10) {
                 // TODO find way to dynamically change color
-                event.drawString(orbLocation.add(y = 2.5), "§bBlazing Soul")
+                event.drawString(orbLocation.up(2.5), "§bBlazing Soul")
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
index 6a4b02416ed5..1eaa1dd5e921 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
@@ -52,7 +52,7 @@ object AshfangGravityOrbs {
 
             if (orbLocation.distance(playerLocation) < 15) {
                 // TODO find way to dynamically change color
-                event.drawString(orbLocation.add(y = 2.5), "§cGravity Orb")
+                event.drawString(orbLocation.up(2.5), "§cGravity Orb")
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
index 161200fedad6..d601601a10e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
@@ -63,7 +63,7 @@ object RiftAgaricusCap {
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
 
-        val location = location?.add(y = 0.6) ?: return
+        val location = location?.up(0.6) ?: return
 
         if (startTime.isFarFuture()) {
             event.drawDynamicText(location, "§cClick!", 1.5)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
index 9ff96213b3fe..4ac014d3abe1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
@@ -52,7 +52,7 @@ object RiftWiltedBerberisHelper {
         hasFarmingToolInHand = InventoryUtils.getItemInHand()?.getInternalName() == RiftAPI.farmingTool
 
         if (Minecraft.getMinecraft().thePlayer.onGround) {
-            val block = LocationUtils.playerLocation().add(y = -1).getBlockAt()
+            val block = LorenzVec.getBlockBelowPlayer().getBlockAt()
             val currentY = LocationUtils.playerLocation().y
             isOnFarmland = block == Blocks.farmland && (currentY % 1 == 0.0)
         }
@@ -132,7 +132,7 @@ object RiftWiltedBerberisHelper {
                 val location = currentParticles.fixLocation(berberis)
                 if (!moving) {
                     event.drawFilledBoundingBox_nea(axisAlignedBB(location), Color.YELLOW, 0.7f)
-                    event.drawDynamicText(location.add(y = 1), "§eWilted Berberis", 1.5, ignoreBlocks = false)
+                    event.drawDynamicText(location.up(), "§eWilted Berberis", 1.5, ignoreBlocks = false)
                 } else {
                     event.drawFilledBoundingBox_nea(axisAlignedBB(location), Color.WHITE, 0.5f)
                     previous?.fixLocation(berberis)?.let {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 6b94919eeb77..50c6593fb9d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -78,9 +78,9 @@ object VoltHighlighter {
                 val dischargeTimeLeft = CHARGE_TIME - dischargingSince.passedSince()
                 if (dischargeTimeLeft > Duration.ZERO) {
                     event.drawDynamicText(
-                        event.exactLocation(entity).add(y = 2.5),
+                        event.exactLocation(entity).up(2.5),
                         "§eLightning: ${dischargeTimeLeft.format(showMilliSeconds = true)}",
-                        2.5
+                        2.5,
                     )
                 }
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
index 275ca3573ac2..dd5910b58c79 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
@@ -17,8 +17,9 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -140,18 +141,16 @@ object LivingCaveDefenseBlocks {
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
 
-
         for ((block, time) in movingBlocks) {
             if (block.hidden) continue
             if (time > System.currentTimeMillis()) {
                 val location = block.location
                 event.drawWaypointFilled(location, color)
-                event.draw3DLine(
-                    block.entity.getLorenzVec().add(y = 0.5),
-                    location.add(0.5, 0.5, 0.5),
+                event.drawLineToEye(
+                    location.blockCenter(),
                     color,
                     1,
-                    false
+                    false,
                 )
             }
         }
@@ -161,8 +160,8 @@ object LivingCaveDefenseBlocks {
             event.drawWaypointFilled(location, color)
 
             event.draw3DLine(
-                block.entity.getLorenzVec().add(y = 0.5),
-                location.add(0.5, 0.5, 0.5),
+                event.exactLocation(block.entity).up(0.5),
+                location.blockCenter(),
                 color,
                 3,
                 true,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
index c93932344d63..2ff0eac9931d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
@@ -27,7 +27,7 @@ object RiftUpsideDownParkour {
             data.locations.map { it.add(-1.0, -1.0, -1.0) }, // TODO remove offset. change repo instead
             data.shortCuts,
             platformSize = 2.0,
-            detectionRange = 2.0
+            detectionRange = 2.0,
         )
         updateConfig()
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index 86ae6d096226..24b254736e73 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -163,7 +163,7 @@ object EnigmaSoulWaypoints {
         for (soul in trackedSouls) {
             soulLocations[soul]?.let {
                 event.drawWaypointFilled(it, config.color.toChromaColor(), seeThroughBlocks = true, beacon = true)
-                event.drawDynamicText(it.add(y = 1), "§5${soul.removeSuffix(" Soul")} Soul", 1.5)
+                event.drawDynamicText(it.up(), "§5${soul.removeSuffix(" Soul")} Soul", 1.5)
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
index 4fc0ccbf5fce..064dbf506ef0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
@@ -87,7 +87,7 @@ object RiftMotesOrb {
                 orb.pickedUp = true
             }
 
-            val location = orb.location.add(y = 0.5)
+            val location = orb.location.up(0.5)
             val sizeOffset = (5 - config.size) * -0.1
             val color = if (orb.pickedUp) LorenzColor.GRAY else LorenzColor.LIGHT_PURPLE
             val text = color.getChatColor() + "Motes Orb"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
index 2880d183b468..20edbf285ba2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt
@@ -42,7 +42,7 @@ object SlayerItemsOnGround {
         if (!isEnabled()) return
 
         for ((item, text) in itemsOnGround) {
-            val location = event.exactLocation(item).add(y = 0.8)
+            val location = event.exactLocation(item).up(0.8)
             event.drawString(location, text)
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
index 4798a943257d..11a335a63afd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt
@@ -14,8 +14,7 @@ import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.entity.EntityCreature
 import net.minecraft.entity.monster.EntityBlaze
@@ -63,12 +62,11 @@ object SlayerMiniBossFeatures {
             if (mob.isDead) continue
             if (mob.distanceToPlayer() > 10) continue
 
-            event.draw3DLine(
-                event.exactPlayerEyeLocation(),
-                mob.getLorenzVec().add(y = 1),
+            event.drawLineToEye(
+                mob.getLorenzVec().up(),
                 LorenzColor.AQUA.toColor(),
                 config.slayerMinibossLineWidth,
-                true
+                true,
             )
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
index 57aa65e53527..df7ab69d907a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
@@ -22,12 +22,14 @@ import at.hannibal2.skyhanni.utils.EntityUtils.getAllNameTagsInRadiusWith
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
 import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
 import at.hannibal2.skyhanni.utils.LocationUtils
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
 import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
@@ -115,15 +117,17 @@ object VampireSlayerFeatures {
                     it.name.contains(username)
                 }
                 val containCoop = getAllNameTagsInRadiusWith("Spawned by").any {
-                    coopList.isNotEmpty() && configCoopBoss.highlight && coopList.any { it2 ->
-                        var contain = false
-                        if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
-                            val name = ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex()
-                                .find(it.name)?.groupValues?.get(1)
-                            contain = it2 == name
+                    coopList.isNotEmpty() &&
+                        configCoopBoss.highlight &&
+                        coopList.any { it2 ->
+                            var contain = false
+                            if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
+                                val name = ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex()
+                                    .find(it.name)?.groupValues?.get(1)
+                                contain = it2 == name
+                            }
+                            contain
                         }
-                        contain
-                    }
                 }
                 val shouldSendTitle =
                     if (containUser && configOwnBoss.twinClawsTitle) true
@@ -146,22 +150,23 @@ object VampireSlayerFeatures {
         for (it in getAllNameTagsInRadiusWith("Spawned by")) {
             val coopList = configCoopBoss.coopMembers.split(",").toList()
             val containUser = it.name.contains(username)
-            val containCoop = coopList.isNotEmpty() && coopList.any { it2 ->
-                var contain = false
-                if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
-                    val name =
-                        ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex().find(it.name)?.groupValues?.get(1)
-                    contain = it2 == name
+            val containCoop = coopList.isNotEmpty() &&
+                coopList.any { it2 ->
+                    var contain = false
+                    if (".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex().matches(it.name)) {
+                        val name =
+                            ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex().find(it.name)?.groupValues?.get(1)
+                        contain = it2 == name
+                    }
+                    contain
                 }
-                contain
-            }
             val neededHealth = baseMaxHealth * 0.2f
-            if (containUser && taggedEntityList.contains(this.entityId)) {
-                taggedEntityList.remove(this.entityId)
+            if (containUser && taggedEntityList.contains(entityId)) {
+                taggedEntityList.remove(entityId)
             }
             val canUseSteak = health <= neededHealth
             val ownBoss = configOwnBoss.highlight && containUser && isNPC()
-            val otherBoss = configOtherBoss.highlight && taggedEntityList.contains(this.entityId) && isNPC()
+            val otherBoss = configOtherBoss.highlight && taggedEntityList.contains(entityId) && isNPC()
             val coopBoss = configCoopBoss.highlight && containCoop && isNPC()
             val shouldRender = if (ownBoss) true else if (otherBoss) true else coopBoss
 
@@ -176,7 +181,7 @@ object VampireSlayerFeatures {
 
             val shouldSendSteakTitle =
                 if (canUseSteak && configOwnBoss.steakAlert && containUser) true
-                else if (canUseSteak && configOtherBoss.steakAlert && taggedEntityList.contains(this.entityId)) true
+                else if (canUseSteak && configOtherBoss.steakAlert && taggedEntityList.contains(entityId)) true
                 else canUseSteak && configCoopBoss.steakAlert && containCoop
 
             if (shouldSendSteakTitle) {
@@ -191,7 +196,7 @@ object VampireSlayerFeatures {
     }
 
     private fun EntityOtherPlayerMP.isHighlighted(): Boolean {
-        return entityList.contains(this) || taggedEntityList.contains(this.entityId)
+        return entityList.contains(this) || taggedEntityList.contains(entityId)
     }
 
     private fun String.color(): Int {
@@ -208,14 +213,15 @@ object VampireSlayerFeatures {
         val regexA = ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*).*".toRegex()
         val regexB = ".*§(?:\\d|\\w)+Spawned by: §(?:\\d|\\w)(\\w*)".toRegex()
         for (armorStand in event.clickedEntity.getAllNameTagsInRadiusWith("Spawned by")) {
-            val containCoop = coopList.isNotEmpty() && coopList.any { it2 ->
-                var contain = false
-                if (regexA.matches(armorStand.name)) {
-                    val name = regexB.find(armorStand.name)?.groupValues?.get(1)
-                    contain = it2 == name
+            val containCoop = coopList.isNotEmpty() &&
+                coopList.any {
+                    var contain = false
+                    if (regexA.matches(armorStand.name)) {
+                        val name = regexB.find(armorStand.name)?.groupValues?.get(1)
+                        contain = it == name
+                    }
+                    contain
                 }
-                contain
-            }
             if (armorStand.name.contains(username) || containCoop) return
             if (!taggedEntityList.contains(event.clickedEntity.entityId)) {
                 taggedEntityList.add(event.clickedEntity.entityId)
@@ -256,27 +262,25 @@ object VampireSlayerFeatures {
     @SubscribeEvent
     fun onWorldRender(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
-        val start = LocationUtils.playerLocation()
 
         if (config.drawLine) {
             for (it in Minecraft.getMinecraft().theWorld.loadedEntityList.filterIsInstance<EntityOtherPlayerMP>()) {
                 if (!it.isHighlighted()) continue
                 val vec = event.exactLocation(it)
-                val distance = start.distance(vec)
-                if (distance > 15) continue
-                event.draw3DLine(
-                    event.exactPlayerEyeLocation(),
-                    vec.add(y = 1.54),
-                    config.lineColor.toChromaColor(),
-                    config.lineWidth,
-                    true
-                )
+                if (vec.distanceToPlayer() < 15) {
+                    event.drawLineToEye(
+                        vec.up(1.54),
+                        config.lineColor.toChromaColor(),
+                        config.lineWidth,
+                        true,
+                    )
+                }
             }
         }
         if (!configBloodIchor.highlight && !configKillerSpring.highlight) return
         for (stand in Minecraft.getMinecraft().theWorld.loadedEntityList.filterIsInstance<EntityArmorStand>()) {
             val vec = stand.position.toLorenzVec()
-            val distance = start.distance(vec)
+            val distance = vec.distanceToPlayer()
             val isIchor = stand.hasSkullTexture(BLOOD_ICHOR_TEXTURE)
             val isSpring = stand.hasSkullTexture(KILLER_SPRING_TEXTURE)
             if (!(isIchor && config.bloodIchor.highlight) && !(isSpring && config.killerSpring.highlight)) continue
@@ -292,9 +296,9 @@ object VampireSlayerFeatures {
                     (if (isIchor) configBloodIchor.linesColor else configKillerSpring.linesColor).toChromaColor()
                 val text = if (isIchor) "§4Ichor" else "§4Spring"
                 event.drawColor(
-                    stand.position.toLorenzVec().add(y = 2.0),
+                    stand.position.toLorenzVec().up(2.0),
                     LorenzColor.DARK_RED,
-                    alpha = 1f
+                    alpha = 1f,
                 )
                 event.drawDynamicText(
                     stand.position.toLorenzVec().add(0.5, 2.5, 0.5),
@@ -305,13 +309,13 @@ object VampireSlayerFeatures {
                 for ((player, stand2) in standList) {
                     if ((configBloodIchor.showLines && isIchor) || (configKillerSpring.showLines && isSpring))
                         event.draw3DLine(
-                            event.exactLocation(player).add(y = 1.5),
-                            event.exactLocation(stand2).add(y = 1.5),
-                            // stand2.position.toLorenzVec().add(0.0, 1.5, 0.0),
+                            event.exactPlayerEyeLocation(player),
+                            event.exactPlayerEyeLocation(stand2),
                             linesColorStart,
                             3,
-                            true
+                            true,
                         )
+
                 }
             }
             if (configBloodIchor.renderBeam && isIchor && stand.isEntityAlive) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
index dd63fdd966a3..684d06cd4ba2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
@@ -24,12 +24,11 @@ import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.LorenzVec
-import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawLineToEye
 import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
-import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import at.hannibal2.skyhanni.utils.getLorenzVec
@@ -135,12 +134,11 @@ object EndermanSlayerFeatures {
                 val skullLocation = event.exactLocation(skull)
                 if (skullLocation.distanceToPlayer() > 20) continue
                 if (!skullLocation.canBeSeen()) continue
-                event.draw3DLine(
-                    event.exactPlayerEyeLocation(),
-                    skullLocation.add(y = 1),
+                event.drawLineToEye(
+                    skullLocation.up(),
                     LorenzColor.GOLD.toColor(),
                     3,
-                    true,
+                    true
                 )
             }
         }
@@ -156,8 +154,7 @@ object EndermanSlayerFeatures {
 
             if (beaconConfig.showLine) {
                 val beaconLocation = event.exactLocation(beacon)
-                event.draw3DLine(
-                    event.exactPlayerEyeLocation(),
+                event.drawLineToEye(
                     beaconLocation.add(0.5, 1.0, 0.5),
                     beaconConfig.lineColor.toChromaColor(),
                     beaconConfig.lineWidth,
@@ -171,8 +168,7 @@ object EndermanSlayerFeatures {
         for ((location, time) in sittingBeacon) {
             if (location.distanceToPlayer() > 20) continue
             if (beaconConfig.showLine) {
-                event.draw3DLine(
-                    event.exactPlayerEyeLocation(),
+                event.drawLineToEye(
                     location.add(0.5, 1.0, 0.5),
                     beaconConfig.lineColor.toChromaColor(),
                     beaconConfig.lineWidth,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index ef9da0261b93..da3b62cc2d5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -83,7 +83,7 @@ object SummoningSoulsName {
 
         for ((entity, name) in souls) {
             val vec = entity.getLorenzVec()
-            event.drawString(vec.add(y = 2.5), name)
+            event.drawString(vec.up(2.5), name)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
index a48294bd8e64..bdcb935bb034 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackParticlesCommand.kt
@@ -112,19 +112,19 @@ object TrackParticlesCommand {
             if (value.size != 1) {
                 event.drawDynamicText(key, "§e${value.size} particles", 0.8)
 
-                var offset = -0.2
+                var offset = 0.2
                 value.groupBy { it.type }.forEach { (particleType, particles) ->
-                    event.drawDynamicText(key.up(offset), "§7§l$particleType §7(§e${particles.size}§7)", 0.8)
-                    offset -= 0.2
+                    event.drawDynamicText(key.down(offset), "§7§l$particleType §7(§e${particles.size}§7)", 0.8)
+                    offset += 0.2
                 }
             } else {
                 val particle = value.first()
 
                 event.drawDynamicText(key, "§7§l${particle.type}", 0.8)
                 event.drawDynamicText(
-                    key.up(-0.2),
+                    key.down(0.2),
                     "§7C: §e${particle.count} §7S: §a${particle.speed.roundTo(2)}",
-                    scaleMultiplier = 0.8
+                    scaleMultiplier = 0.8,
                 )
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
index 18cfcf786bf8..c038d8098699 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt
@@ -114,10 +114,10 @@ object TrackSoundsCommand {
             if (value.size != 1) {
                 event.drawDynamicText(key, "§e${value.size} sounds", 0.8)
 
-                var offset = -0.2
+                var offset = 0.2
                 value.groupBy { it.soundName }.forEach { (soundName, sounds) ->
-                    event.drawDynamicText(key.up(offset), "§7§l$soundName §7(§e${sounds.size}§7)", 0.8)
-                    offset -= 0.2
+                    event.drawDynamicText(key.down(offset), "§7§l$soundName §7(§e${sounds.size}§7)", 0.8)
+                    offset += 0.2
                 }
             } else {
                 val sound = value.first()
@@ -129,7 +129,7 @@ object TrackSoundsCommand {
 
                 event.drawDynamicText(key, "§7§l${sound.soundName}", 0.8)
                 event.drawDynamicText(
-                    key.up(-0.2),
+                    key.down(0.2),
                     "§7P: §e${sound.pitch.roundTo(2)} §7V: $volumeColor${sound.volume.roundTo(2)}",
                     scaleMultiplier = 0.8,
                 )
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 281b744d657b..59799ff3d1fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -63,7 +63,7 @@ object EntityUtils {
     fun EntityLivingBase.getAllNameTagsInRadiusWith(
         contains: String,
         radius: Double = 3.0,
-    ): List<EntityArmorStand> = getArmorStandsInRadius(getLorenzVec().add(y = 3), radius).filter {
+    ): List<EntityArmorStand> = getArmorStandsInRadius(getLorenzVec().up(3), radius).filter {
         it.getNameAsString().contains(contains)
     }
 
@@ -84,7 +84,7 @@ object EntityUtils {
         inaccuracy: Double = 1.6,
         debugWrongEntity: Boolean = false,
     ): List<EntityArmorStand> {
-        val center = getLorenzVec().add(y = y)
+        val center = getLorenzVec().up(y)
         return getArmorStandsInRadius(center, inaccuracy).filter {
             val result = it.getNameAsString().contains(contains)
             if (debugWrongEntity && !result) {
@@ -188,7 +188,7 @@ object EntityUtils {
         if (Minecraft.getMinecraft().isCallingFromMinecraftThread) it else it.toMutableList()
     }?.asSequence()?.filterNotNull() ?: emptySequence()
 
-    fun Entity.canBeSeen(radius: Double = 150.0) = getLorenzVec().add(y = 0.5).canBeSeen(radius)
+    fun Entity.canBeSeen(radius: Double = 150.0) = getLorenzVec().up(0.5).canBeSeen(radius)
 
     fun getEntityByID(entityId: Int) = Minecraft.getMinecraft()?.thePlayer?.entityWorld?.getEntityByID(entityId)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
index 34aa3f22f303..d2394624c8a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt
@@ -35,7 +35,7 @@ object LocationUtils {
     fun playerEyeLocation(): LorenzVec {
         val player = Minecraft.getMinecraft().thePlayer
         val vec = player.getLorenzVec()
-        return vec.add(y = player.getEyeHeight().toDouble())
+        return vec.up(player.getEyeHeight().toDouble())
     }
 
     fun AxisAlignedBB.isInside(vec: LorenzVec) = isVecInside(vec.toVec3())
@@ -53,7 +53,7 @@ object LocationUtils {
 
     fun LorenzVec.canBeSeen(yOffsetRange: IntRange, radius: Double = 150.0): Boolean =
         yOffsetRange.any { offset ->
-            this.add(y = offset).canBeSeen(radius)
+            up(offset).canBeSeen(radius)
         }
 
     fun AxisAlignedBB.minBox() = LorenzVec(minX, minY, minZ)
@@ -99,7 +99,7 @@ object LocationUtils {
 
     fun AxisAlignedBB.getCenter() = getEdgeLengths() * 0.5 + minBox()
 
-    fun AxisAlignedBB.getTopCenter() = getCenter().add(y = (maxY - minY) / 2)
+    fun AxisAlignedBB.getTopCenter() = getCenter().up((maxY - minY) / 2)
 
     fun AxisAlignedBB.clampTo(other: AxisAlignedBB): AxisAlignedBB {
         val minX = max(this.minX, other.minX)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 6769210ef26b..ee84731116fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -42,7 +42,7 @@ data class LorenzVec(
 
     fun distance(x: Double, y: Double, z: Double): Double = distance(LorenzVec(x, y, z))
 
-    fun distanceChebyshevIgnoreY(other: LorenzVec) = max(abs(this.x - other.x), abs(this.z - other.z))
+    fun distanceChebyshevIgnoreY(other: LorenzVec) = max(abs(x - other.x), abs(z - other.z))
 
     fun distanceSq(other: LorenzVec): Double {
         val dx = other.x - x
@@ -86,11 +86,11 @@ data class LorenzVec(
 
     fun dotProduct(other: LorenzVec): Double = (x * other.x) + (y * other.y) + (z * other.z)
 
-    fun angleAsCos(other: LorenzVec) = this.normalize().dotProduct(other.normalize())
+    fun angleAsCos(other: LorenzVec) = normalize().dotProduct(other.normalize())
 
-    fun angleInRad(other: LorenzVec) = acos(this.angleAsCos(other))
+    fun angleInRad(other: LorenzVec) = acos(angleAsCos(other))
 
-    fun angleInDeg(other: LorenzVec) = Math.toDegrees(this.angleInRad(other))
+    fun angleInDeg(other: LorenzVec) = Math.toDegrees(angleInRad(other))
 
     @Deprecated("Use operator fun plus instead", ReplaceWith("this + other"))
     fun add(other: LorenzVec) = LorenzVec(x + other.x, y + other.y, z + other.z)
@@ -125,7 +125,7 @@ data class LorenzVec(
     fun toCleanString(separator: String = ", "): String = listOf(x, y, z).joinToString(separator)
 
     fun lengthSquared(): Double = x * x + y * y + z * z
-    fun length(): Double = sqrt(this.lengthSquared())
+    fun length(): Double = sqrt(lengthSquared())
 
     fun isNormalized(tolerance: Double = 0.01) = (lengthSquared() - 1.0).absoluteValue < tolerance
 
@@ -165,13 +165,15 @@ data class LorenzVec(
         return LorenzVec(x, y, z)
     }
 
+    fun blockCenter() = roundLocationToBlock().add(0.5, 0.5, 0.5)
+
     fun slope(other: LorenzVec, factor: Double) = this + (other - this).scale(factor)
 
     // TODO better name. dont confuse with roundTo()
     fun roundLocation(): LorenzVec {
-        val x = if (this.x < 0) x.toInt() - 1 else x.toInt()
+        val x = if (x < 0) x.toInt() - 1 else x.toInt()
         val y = y.toInt() - 1
-        val z = if (this.z < 0) z.toInt() - 1 else z.toInt()
+        val z = if (z < 0) z.toInt() - 1 else z.toInt()
         return LorenzVec(x, y, z)
     }
 
@@ -186,14 +188,16 @@ data class LorenzVec(
 
     fun axisAlignedTo(other: LorenzVec) = AxisAlignedBB(x, y, z, other.x, other.y, other.z)
 
-    fun up(offset: Double): LorenzVec = copy(y = y + offset)
+    fun up(offset: Number = 1): LorenzVec = copy(y = y + offset.toDouble())
+
+    fun down(offset: Number = 1): LorenzVec = copy(y = y - offset.toDouble())
 
     fun interpolate(other: LorenzVec, factor: Double): LorenzVec {
         require(factor in 0.0..1.0) { "Percentage must be between 0 and 1: $factor" }
 
-        val x = (1 - factor) * this.x + factor * other.x
-        val y = (1 - factor) * this.y + factor * other.y
-        val z = (1 - factor) * this.z + factor * other.z
+        val x = (1 - factor) * x + factor * other.x
+        val y = (1 - factor) * y + factor * other.y
+        val z = (1 - factor) * z + factor * other.z
 
         return LorenzVec(x, y, z)
     }
@@ -244,7 +248,7 @@ data class LorenzVec(
             return LorenzVec(x, y, z)
         }
 
-        fun getBlockBelowPlayer() = LocationUtils.playerLocation().roundLocationToBlock().add(y = -1.0)
+        fun getBlockBelowPlayer() = LocationUtils.playerLocation().roundLocationToBlock().down()
 
         val expandVector = LorenzVec(0.0020000000949949026, 0.0020000000949949026, 0.0020000000949949026)
     }
@@ -268,6 +272,6 @@ fun Array<Double>.toLorenzVec(): LorenzVec {
 
 fun RenderUtils.translate(vec: LorenzVec) = GlStateManager.translate(vec.x, vec.y, vec.z)
 
-fun AxisAlignedBB.expand(vec: LorenzVec): AxisAlignedBB = this.expand(vec.x, vec.y, vec.z)
+fun AxisAlignedBB.expand(vec: LorenzVec): AxisAlignedBB = expand(vec.x, vec.y, vec.z)
 
-fun AxisAlignedBB.expand(amount: Double): AxisAlignedBB = this.expand(amount, amount, amount)
+fun AxisAlignedBB.expand(amount: Double): AxisAlignedBB = expand(amount, amount, amount)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
index 4fccbed68125..f6d52b7fc593 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
@@ -122,7 +122,7 @@ class ParkourHelper(
                     if (outline) event.outlineTopFace(aabb, 2, Color.BLACK, depth)
                 }
                 if (SkyHanniMod.feature.dev.waypoint.showPlatformNumber && !isMovingPlatform) {
-                    event.drawString(location.offsetCenter().add(y = 1), "§a§l$index", seeThroughBlocks = true)
+                    event.drawString(location.offsetCenter().up(1), "§a§l$index", seeThroughBlocks = true)
                 }
             }
         } catch (e: Throwable) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 39f251340a3b..14241f314a32 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -1100,6 +1100,15 @@ object RenderUtils {
         return exactLocation(player) + add
     }
 
+    fun LorenzRenderWorldEvent.exactPlayerEyeLocation(player: Entity): LorenzVec {
+        val add = if (player.isSneaking) LorenzVec(0.0, 1.54, 0.0) else LorenzVec(0.0, 1.62, 0.0)
+        return exactLocation(player) + add
+    }
+
+    fun LorenzRenderWorldEvent.drawLineToEye(location: LorenzVec, color: Color, lineWidth: Int, depth: Boolean) {
+        draw3DLine(exactPlayerEyeLocation(), location, color, lineWidth, depth)
+    }
+
     fun exactLocation(entity: Entity, partialTicks: Float): LorenzVec {
         if (entity.isDead) return entity.getLorenzVec()
         val x = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks

From 46824035c67b50320e1d12f16d0692d3ef261ece Mon Sep 17 00:00:00 2001
From: Clicks <58398364+CuzImClicks@users.noreply.github.com>
Date: Fri, 11 Oct 2024 19:11:57 +0200
Subject: [PATCH 703/721] Feature: Precision Mining Hightlighter (#2614)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../config/features/mining/MiningConfig.java  |  6 ++
 .../mining/PrecisionMiningHighlight.kt        | 69 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/PrecisionMiningHighlight.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 08c8ec894a71..2c460bd2f0f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -96,4 +96,10 @@ public class MiningConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean highlightYourGoldenGoblin = true;
+
+    @Expose
+    @ConfigOption(name = "Precision Mining Helper", desc = "Draws a box over the Precision Mining particles.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean highlightPrecisionMiningParticles = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/PrecisionMiningHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/PrecisionMiningHighlight.kt
new file mode 100644
index 000000000000..462a963489ab
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/PrecisionMiningHighlight.kt
@@ -0,0 +1,69 @@
+package at.hannibal2.skyhanni.features.mining
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.MiningAPI
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.ReceiveParticleEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
+import at.hannibal2.skyhanni.utils.TimeUtils.ticks
+import at.hannibal2.skyhanni.utils.toLorenzVec
+import net.minecraft.client.Minecraft
+import net.minecraft.util.AxisAlignedBB
+import net.minecraft.util.EnumParticleTypes
+import net.minecraft.util.MovingObjectPosition
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.awt.Color
+
+@SkyHanniModule
+object PrecisionMiningHighlight {
+
+    private val config get() = SkyHanniMod.feature.mining.highlightPrecisionMiningParticles
+
+    private var lastParticle: AxisAlignedBB? = null
+    private var lookingAtParticle: Boolean = false
+    private var deleteTime: SimpleTimeMark? = null
+
+    @SubscribeEvent
+    fun onParticle(event: ReceiveParticleEvent) {
+        if (!isEnabled()) return
+        if (!(event.type == EnumParticleTypes.CRIT || event.type == EnumParticleTypes.VILLAGER_HAPPY) ||
+            !Minecraft.getMinecraft().gameSettings.keyBindAttack.isKeyDown) return
+
+        val mouseOverObject = Minecraft.getMinecraft().objectMouseOver
+        if (mouseOverObject.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) return
+
+        val particleBoundingBox = event.location.add(-0.12, -0.12, -0.12)
+            .axisAlignedTo(event.location.clone().add(0.12, 0.12, 0.12))
+
+        val blockBoundingBox = mouseOverObject.blockPos.toLorenzVec()
+            .axisAlignedTo(mouseOverObject.blockPos.add(1, 1, 1).toLorenzVec())
+        if (!blockBoundingBox.intersectsWith(particleBoundingBox)) return
+
+        lookingAtParticle = event.type == EnumParticleTypes.VILLAGER_HAPPY
+        lastParticle = particleBoundingBox
+        deleteTime = 5.ticks.fromNow()
+    }
+
+    @SubscribeEvent
+    fun onRender(event: LorenzRenderWorldEvent) {
+        val particleBoundingBox = lastParticle ?: return
+
+        event.drawFilledBoundingBox_nea(particleBoundingBox, if (lookingAtParticle) Color.GREEN else Color.CYAN)
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        lastParticle ?: return
+        val deletionTime = deleteTime ?: return
+        if (deletionTime.isInPast()) {
+            deleteTime = null
+            lastParticle = null
+        }
+    }
+
+    fun isEnabled() = MiningAPI.inCustomMiningIsland() && config
+}

From 925bb0964d502bdecf74ad14002bdf7c57bb44d6 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:26:14 -0400
Subject: [PATCH 704/721] Feature: Highlight Crystal Nucleus Crystals (#2598)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../mining/CrystalHighlighterConfig.java      | 35 ++++++++
 .../config/features/mining/MiningConfig.java  |  5 ++
 .../event/hoppity/NucleusBarriersBox.kt       | 81 +++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/CrystalHighlighterConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/CrystalHighlighterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CrystalHighlighterConfig.java
new file mode 100644
index 000000000000..06c60b507024
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/CrystalHighlighterConfig.java
@@ -0,0 +1,35 @@
+package at.hannibal2.skyhanni.config.features.mining;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CrystalHighlighterConfig {
+
+    @Expose
+    @ConfigOption(
+        name = "Highlight Crystal Nucleus barriers",
+        desc = "Draw visible bounding boxes around the Crystal Nucleus crystal barrier blocks."
+    )
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(
+        name = "Highlight Opacity",
+        desc = "Set the opacity of the highlighted boxes.\n§70§8: §7Transparent\n§7100§8: §7Solid"
+    )
+    @ConfigEditorSlider(minValue = 0, maxValue = 100, minStep = 1)
+    public int opacity = 60;
+
+    @Expose
+    @ConfigOption(
+        name = "Only Show During Hoppity's",
+        desc = "Only show the highlighted boxes during Hoppity's Hunt."
+    )
+    @ConfigEditorBoolean
+    public boolean onlyDuringHoppity = false;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 2c460bd2f0f2..f6a5a83baca6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -73,6 +73,11 @@ public class MiningConfig {
     @Accordion
     public MineshaftPityDisplayConfig mineshaftPityDisplay = new MineshaftPityDisplayConfig();
 
+    @Expose
+    @ConfigOption(name = "Crystal Nucleus Crystal Highlights", desc = "")
+    @Accordion
+    public CrystalHighlighterConfig crystalHighlighter = new CrystalHighlighterConfig();
+
     @Expose
     @ConfigOption(name = "Highlight Commission Mobs", desc = "Highlight mobs that are part of active commissions.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt
new file mode 100644
index 000000000000..47ab47a38240
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/NucleusBarriersBox.kt
@@ -0,0 +1,81 @@
+package at.hannibal2.skyhanni.features.event.hoppity
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.misc.IslandAreas
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
+import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock
+import net.minecraft.util.AxisAlignedBB
+import net.minecraft.util.BlockPos
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object NucleusBarriersBox {
+    private val config get() = SkyHanniMod.feature.mining.crystalHighlighter
+
+    private var inNucleus = false
+
+    private enum class Crystal(val color: LorenzColor, val boundingBox: AxisAlignedBB) {
+        AMBER(
+            LorenzColor.GOLD,
+            AxisAlignedBB(
+                BlockPos(474.0, 124.0, 524.0),
+                BlockPos(485.0, 111.0, 535.0),
+            ).expandBlock(),
+        ),
+        AMETHYST(
+            LorenzColor.DARK_PURPLE,
+            AxisAlignedBB(
+                BlockPos(474.0, 124.0, 492.0),
+                BlockPos(485.0, 111.0, 503.0),
+            ).expandBlock(),
+        ),
+        TOPAZ(
+            LorenzColor.YELLOW,
+            AxisAlignedBB(
+                BlockPos(508.0, 124.0, 473.0),
+                BlockPos(519.0, 111.0, 484.0),
+            ).expandBlock(),
+        ),
+        JADE(
+            LorenzColor.GREEN,
+            AxisAlignedBB(
+                BlockPos(542.0, 124.0, 492.0),
+                BlockPos(553.0, 111.0, 503.0),
+            ).expandBlock(),
+        ),
+        SAPPHIRE(
+            LorenzColor.BLUE,
+            AxisAlignedBB(
+                BlockPos(542.0, 124.0, 524.0),
+                BlockPos(553.0, 111.0, 535.0),
+            ).expandBlock(),
+        ),
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        inNucleus = IslandAreas.currentAreaName == "Crystal Nucleus"
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled()) return
+
+        Crystal.entries.forEach { crystal ->
+            event.drawFilledBoundingBox_nea(
+                crystal.boundingBox,
+                crystal.color.addOpacity(config.opacity),
+                renderRelativeToCamera = false,
+            )
+        }
+    }
+
+    private fun isEnabled() =
+        IslandType.CRYSTAL_HOLLOWS.isInIsland() && (HoppityAPI.isHoppityEvent() || !config.onlyDuringHoppity) && config.enabled && inNucleus
+}

From 60f92d58aec0ec976cf1b4933174c1143a20551c Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <thatgravyboat@gmail.com>
Date: Fri, 11 Oct 2024 15:06:51 -0230
Subject: [PATCH 705/721] Backend: Add event inheritance (#2047)

Co-authored-by: Cal <cwolfson58@gmail.com>
---
 .../skyhanni/api/event/EventHandler.kt        | 85 ++-----------------
 .../skyhanni/api/event/EventListeners.kt      | 78 +++++++++++++++++
 .../skyhanni/api/event/SkyHanniEvents.kt      | 30 ++++++-
 .../hannibal2/skyhanni/data/ItemClickData.kt  | 14 +--
 .../at/hannibal2/skyhanni/data/MiningAPI.kt   |  2 +-
 .../skyhanni/events/BlockClickEvent.kt        |  2 -
 .../skyhanni/events/EntityClickEvent.kt       |  2 -
 .../skyhanni/events/ItemClickEvent.kt         |  2 -
 .../skyhanni/events/WorldClickEvent.kt        |  5 +-
 .../skyhanni/features/dungeon/DungeonAPI.kt   |  5 +-
 .../event/carnival/CarnivalQuickStart.kt      |  3 +-
 .../features/event/diana/DianaFixChat.kt      |  4 +-
 .../event/diana/GriffinBurrowHelper.kt        |  3 +-
 .../diana/GriffinBurrowParticleFinder.kt      |  2 +-
 .../event/hoppity/HoppityEggLocator.kt        |  2 +-
 .../skyhanni/features/garden/GardenAPI.kt     |  4 +-
 .../features/garden/pests/PestParticleLine.kt |  4 +-
 .../garden/pests/PestParticleWaypoint.kt      |  2 +-
 .../ExperimentsProfitTracker.kt               |  3 +-
 .../itemabilities/FireVeilWandParticles.kt    |  4 +-
 .../abilitycooldown/ItemAbilityCooldown.kt    |  3 +-
 .../skyhanni/features/mining/TunnelsMaps.kt   |  3 +-
 .../features/minion/MinionFeatures.kt         |  5 +-
 .../misc/PrivateIslandNoPickaxeAbility.kt     |  6 +-
 .../area/dreadfarm/WoodenButtonsHelper.kt     |  5 +-
 .../livingcave/LivingCaveLivingMetalHelper.kt |  4 +-
 .../rift/everywhere/PunchcardHighlight.kt     |  4 +-
 .../features/slayer/SlayerQuestWarning.kt     |  3 +-
 .../features/slayer/VampireSlayerFeatures.kt  |  4 +-
 .../slayer/blaze/BlazeSlayerDaggerHelper.kt   |  3 +-
 .../at/hannibal2/skyhanni/test/WorldEdit.kt   |  3 +-
 31 files changed, 170 insertions(+), 129 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/api/event/EventListeners.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
index d164e0e774d7..63d3e14cfb21 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/EventHandler.kt
@@ -8,77 +8,25 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.inAnyIsland
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.chat.Text
-import java.lang.invoke.LambdaMetafactory
-import java.lang.invoke.MethodHandles
-import java.lang.invoke.MethodType
-import java.lang.reflect.Method
-import java.lang.reflect.ParameterizedType
-import java.util.function.Consumer
 
-class EventHandler<T : SkyHanniEvent> private constructor(val name: String, private val isGeneric: Boolean) {
-
-    private val listeners: MutableList<Listener> = mutableListOf()
-
-    private var isFrozen = false
-    private var canReceiveCancelled = false
+class EventHandler<T : SkyHanniEvent> private constructor(
+    val name: String,
+    private val listeners: List<EventListeners.Listener>,
+    private val canReceiveCancelled: Boolean,
+) {
 
     var invokeCount: Long = 0L
         private set
 
-    constructor(event: Class<T>) : this(
+    constructor(event: Class<T>, listeners: List<EventListeners.Listener>) : this(
         (event.name.split(".").lastOrNull() ?: event.name).replace("$", "."),
-        GenericSkyHanniEvent::class.java.isAssignableFrom(event)
+        listeners.sortedBy { it.options.priority }.toList(),
+        listeners.any { it.options.receiveCancelled }
     )
 
-    fun addListener(method: Method, instance: Any, options: HandleEvent) {
-        if (isFrozen) throw IllegalStateException("Cannot add listener to frozen event handler")
-        val generic: Class<*>? = if (isGeneric) {
-            method.genericParameterTypes
-                .firstNotNullOfOrNull { it as? ParameterizedType }
-                ?.let { it.actualTypeArguments.firstOrNull() as? Class<*> }
-                ?: throw IllegalArgumentException("Generic event handler must have a generic type")
-        } else {
-            null
-        }
-        val name = "${method.declaringClass.name}.${method.name}${
-            method.parameterTypes.joinTo(
-                StringBuilder(),
-                prefix = "(",
-                postfix = ")",
-                separator = ", ",
-                transform = Class<*>::getTypeName
-            )
-        }"
-        listeners.add(Listener(name, createEventConsumer(name, instance, method), options, generic))
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun createEventConsumer(name: String, instance: Any, method: Method): Consumer<Any> {
-        try {
-            val handle = MethodHandles.lookup().unreflect(method)
-            return LambdaMetafactory.metafactory(
-                MethodHandles.lookup(),
-                "accept",
-                MethodType.methodType(Consumer::class.java, instance::class.java),
-                MethodType.methodType(Nothing::class.javaPrimitiveType, Object::class.java),
-                handle,
-                MethodType.methodType(Nothing::class.javaPrimitiveType, method.parameterTypes[0])
-            ).target.bindTo(instance).invokeExact() as Consumer<Any>
-        } catch (e: Throwable) {
-            throw IllegalArgumentException("Method $name is not a valid consumer", e)
-        }
-    }
-
-    fun freeze() {
-        isFrozen = true
-        listeners.sortBy { it.options.priority }
-        canReceiveCancelled = listeners.any { it.options.receiveCancelled }
-    }
-
     fun post(event: T, onError: ((Throwable) -> Unit)? = null): Boolean {
         invokeCount++
         if (this.listeners.isEmpty()) return false
-        if (!isFrozen) error("Cannot invoke event on unfrozen event handler")
 
         if (SkyHanniEvents.isDisabledHandler(name)) return false
 
@@ -112,7 +60,7 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
         return event.isCancelled
     }
 
-    private fun shouldInvoke(event: SkyHanniEvent, listener: Listener): Boolean {
+    private fun shouldInvoke(event: SkyHanniEvent, listener: EventListeners.Listener): Boolean {
         if (SkyHanniEvents.isDisabledInvoker(listener.name)) return false
         if (listener.options.onlyOnSkyblock && !LorenzUtils.inSkyBlock) return false
         if (IslandType.ANY !in listener.onlyOnIslandTypes && !inAnyIsland(listener.onlyOnIslandTypes)) return false
@@ -126,19 +74,4 @@ class EventHandler<T : SkyHanniEvent> private constructor(val name: String, priv
         }
         return true
     }
-
-    private class Listener(
-        val name: String,
-        val invoker: Consumer<Any>,
-        val options: HandleEvent,
-        val generic: Class<*>?,
-    ) {
-        val onlyOnIslandTypes: Set<IslandType> = getIslands(options)
-
-        companion object {
-            private fun getIslands(options: HandleEvent): Set<IslandType> =
-                if (options.onlyOnIslands.isEmpty()) setOf(options.onlyOnIsland)
-                else options.onlyOnIslands.toSet()
-        }
-    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/EventListeners.kt b/src/main/java/at/hannibal2/skyhanni/api/event/EventListeners.kt
new file mode 100644
index 000000000000..ce8194ebc5f3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/EventListeners.kt
@@ -0,0 +1,78 @@
+package at.hannibal2.skyhanni.api.event
+
+import at.hannibal2.skyhanni.data.IslandType
+import java.lang.invoke.LambdaMetafactory
+import java.lang.invoke.MethodHandles
+import java.lang.invoke.MethodType
+import java.lang.reflect.Method
+import java.lang.reflect.ParameterizedType
+import java.util.function.Consumer
+
+class EventListeners private constructor(val name: String, private val isGeneric: Boolean) {
+
+    private val listeners: MutableList<Listener> = mutableListOf()
+
+    constructor(event: Class<*>) : this(
+        (event.name.split(".").lastOrNull() ?: event.name).replace("$", "."),
+        GenericSkyHanniEvent::class.java.isAssignableFrom(event)
+    )
+
+    fun addListener(method: Method, instance: Any, options: HandleEvent) {
+        val generic: Class<*>? = if (isGeneric) {
+            method.genericParameterTypes
+                .firstNotNullOfOrNull { it as? ParameterizedType }
+                ?.let { it.actualTypeArguments.firstOrNull() as? Class<*> }
+                ?: throw IllegalArgumentException("Generic event handler must have a generic type")
+        } else {
+            null
+        }
+        val name = "${method.declaringClass.name}.${method.name}${
+            method.parameterTypes.joinTo(
+                StringBuilder(),
+                prefix = "(",
+                postfix = ")",
+                separator = ", ",
+                transform = Class<*>::getTypeName
+            )
+        }"
+        listeners.add(Listener(name, createEventConsumer(name, instance, method), options, generic))
+    }
+
+    /**
+     * Creates a consumer using LambdaMetafactory, this is the most efficient way to reflectively call
+     * a method from within code.
+     */
+    @Suppress("UNCHECKED_CAST")
+    private fun createEventConsumer(name: String, instance: Any, method: Method): Consumer<Any> {
+        try {
+            val handle = MethodHandles.lookup().unreflect(method)
+            return LambdaMetafactory.metafactory(
+                MethodHandles.lookup(),
+                "accept",
+                MethodType.methodType(Consumer::class.java, instance::class.java),
+                MethodType.methodType(Nothing::class.javaPrimitiveType, Object::class.java),
+                handle,
+                MethodType.methodType(Nothing::class.javaPrimitiveType, method.parameterTypes[0])
+            ).target.bindTo(instance).invokeExact() as Consumer<Any>
+        } catch (e: Throwable) {
+            throw IllegalArgumentException("Method $name is not a valid consumer", e)
+        }
+    }
+
+    fun getListeners(): List<Listener> = listeners
+
+    class Listener(
+        val name: String,
+        val invoker: Consumer<Any>,
+        val options: HandleEvent,
+        val generic: Class<*>?,
+    ) {
+        val onlyOnIslandTypes: Set<IslandType> = getIslands(options)
+
+        companion object {
+            private fun getIslands(options: HandleEvent): Set<IslandType> =
+                if (options.onlyOnIslands.isEmpty()) setOf(options.onlyOnIsland)
+                else options.onlyOnIslands.toSet()
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt
index e3dff201485b..ace86b224de4 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt
@@ -11,6 +11,7 @@ import java.lang.reflect.Method
 @SkyHanniModule
 object SkyHanniEvents {
 
+    private val listeners: MutableMap<Class<*>, EventListeners> = mutableMapOf()
     private val handlers: MutableMap<Class<*>, EventHandler<*>> = mutableMapOf()
     private var disabledHandlers = emptySet<String>()
     private var disabledHandlerInvokers = emptySet<String>()
@@ -21,12 +22,14 @@ object SkyHanniEvents {
                 registerMethod(it, instance)
             }
         }
-        handlers.values.forEach { it.freeze() }
     }
 
     @Suppress("UNCHECKED_CAST")
     fun <T : SkyHanniEvent> getEventHandler(event: Class<T>): EventHandler<T> = handlers.getOrPut(event) {
-        EventHandler(event)
+        EventHandler(
+            event,
+            getEventClasses(event).mapNotNull { listeners[it] }.flatMap(EventListeners::getListeners)
+        )
     } as EventHandler<T>
 
     fun isDisabledHandler(handler: String): Boolean = handler in disabledHandlers
@@ -38,8 +41,8 @@ object SkyHanniEvents {
         val options = method.getAnnotation(HandleEvent::class.java) ?: return
         val event = method.parameterTypes[0]
         if (!SkyHanniEvent::class.java.isAssignableFrom(event)) return
-        val handler = getEventHandler(event as Class<SkyHanniEvent>)
-        handler.addListener(method, instance, options)
+        listeners.getOrPut(event as Class<SkyHanniEvent>) { EventListeners(event) }
+            .addListener(method, instance, options)
     }
 
     @SubscribeEvent
@@ -61,4 +64,23 @@ object SkyHanniEvents {
                 }
         }
     }
+
+    /**
+     * Returns a list of all super classes and the class itself up to [SkyHanniEvent].
+     */
+    private fun getEventClasses(clazz: Class<*>): List<Class<*>> {
+        val classes = mutableListOf<Class<*>>()
+        classes.add(clazz)
+
+        var current = clazz
+        while (current.superclass != null) {
+            val superClass = current.superclass
+            if (superClass == SkyHanniEvent::class.java) break
+            if (superClass == GenericSkyHanniEvent::class.java) break
+            if (superClass == CancellableSkyHanniEvent::class.java) break
+            classes.add(superClass)
+            current = superClass
+        }
+        return classes
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
index e7fa75331924..2bcf589a3d50 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
@@ -24,23 +24,23 @@ object ItemClickData {
             packet is C08PacketPlayerBlockPlacement -> {
                 if (packet.placedBlockDirection != 255) {
                     val position = packet.position.toLorenzVec()
-                    BlockClickEvent(ClickType.RIGHT_CLICK, position, packet.stack).postAndCatch()
+                    BlockClickEvent(ClickType.RIGHT_CLICK, position, packet.stack).post()
                 } else {
-                    ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.RIGHT_CLICK).postAndCatch()
+                    ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.RIGHT_CLICK).post()
                 }
             }
 
             packet is C07PacketPlayerDigging && packet.status == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK -> {
                 val position = packet.position.toLorenzVec()
                 val blockClickCancelled =
-                    BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).postAndCatch()
+                    BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).post()
                 ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).also {
-                    it.isCanceled = blockClickCancelled
-                }.postAndCatch()
+                    if (blockClickCancelled) it.cancel()
+                }.post()
             }
 
             packet is C0APacketAnimation -> {
-                ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).postAndCatch()
+                ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).post()
             }
 
             packet is C02PacketUseEntity -> {
@@ -51,7 +51,7 @@ object ItemClickData {
                     else -> return
                 }
                 val clickedEntity = packet.getEntityFromWorld(Minecraft.getMinecraft().theWorld) ?: return
-                EntityClickEvent(clickType, clickedEntity, InventoryUtils.getItemInHand()).postAndCatch()
+                EntityClickEvent(clickType, clickedEntity, InventoryUtils.getItemInHand()).post()
             }
 
             else -> {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 47133f199a49..54d186ae52c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -163,7 +163,7 @@ object MiningAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onBlockClick(event: BlockClickEvent) {
         if (!inCustomMiningIsland()) return
         if (event.clickType != ClickType.LEFT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt
index 2822c28a98c5..42587b3909db 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/BlockClickEvent.kt
@@ -4,9 +4,7 @@ import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.LorenzVec
 import net.minecraft.item.ItemStack
-import net.minecraftforge.fml.common.eventhandler.Cancelable
 
-@Cancelable
 class BlockClickEvent(clickType: ClickType, val position: LorenzVec, itemInHand: ItemStack?) :
     WorldClickEvent(itemInHand, clickType) {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt
index d0cf14214789..2c85ef110670 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt
@@ -3,8 +3,6 @@ package at.hannibal2.skyhanni.events
 import at.hannibal2.skyhanni.data.ClickType
 import net.minecraft.entity.Entity
 import net.minecraft.item.ItemStack
-import net.minecraftforge.fml.common.eventhandler.Cancelable
 
-@Cancelable
 class EntityClickEvent(clickType: ClickType, val clickedEntity: Entity?, itemInHand: ItemStack?) :
     WorldClickEvent(itemInHand, clickType)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt
index a34cb43f19de..e0a96d7e5db6 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/ItemClickEvent.kt
@@ -2,7 +2,5 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.data.ClickType
 import net.minecraft.item.ItemStack
-import net.minecraftforge.fml.common.eventhandler.Cancelable
 
-@Cancelable
 class ItemClickEvent(itemInHand: ItemStack?, clickType: ClickType) : WorldClickEvent(itemInHand, clickType)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt
index 4597041a1d32..ff3892859ce4 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/WorldClickEvent.kt
@@ -1,8 +1,7 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent
 import at.hannibal2.skyhanni.data.ClickType
 import net.minecraft.item.ItemStack
-import net.minecraftforge.fml.common.eventhandler.Cancelable
 
-@Cancelable
-open class WorldClickEvent(val itemInHand: ItemStack?, val clickType: ClickType) : LorenzEvent()
+open class WorldClickEvent(val itemInHand: ItemStack?, val clickType: ClickType) : CancellableSkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index f95c846b2a0a..7ea372b20d33 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.dungeon
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.ClickedBlockType
 import at.hannibal2.skyhanni.data.IslandType
@@ -360,9 +361,9 @@ object DungeonAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.CATACOMBS)
     fun onBlockClick(event: BlockClickEvent) {
-        if (!inDungeon() || event.clickType != ClickType.RIGHT_CLICK) return
+        if (event.clickType != ClickType.RIGHT_CLICK) return
 
         val position = event.position
         val blockType: ClickedBlockType = when (position.getBlockAt()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
index 2257772c8f3c..fe7a73d09053 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalQuickStart.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.carnival
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.Perk
 import at.hannibal2.skyhanni.events.EntityClickEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -34,7 +35,7 @@ object CarnivalQuickStart {
     private var lastChat = SimpleTimeMark.farPast()
     private var lastClicked = SimpleTimeMark.farPast()
 
-    @SubscribeEvent
+    @HandleEvent
     fun onEntityClick(event: EntityClickEvent) {
         if (!isEnabled()) return
         if (lastChat.passedSince() > 5.0.seconds) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
index 2f3d19c24cb5..aefce4e58088 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt
@@ -1,7 +1,9 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.BurrowGuessEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -102,7 +104,7 @@ object DianaFixChat {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.HUB)
     fun onItemClick(event: ItemClickEvent) {
         if (!isEnabled()) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 57cc77df583e..64b33c93418f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandType
@@ -358,7 +359,7 @@ object GriffinBurrowHelper {
         event.move(2, "diana", "event.diana")
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.HUB)
     fun onBlockClick(event: BlockClickEvent) {
         if (!isEnabled()) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 80d6ea0e0df9..f3860276ad47 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -165,7 +165,7 @@ object GriffinBurrowParticleFinder {
         return true
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.HUB)
     fun onBlockClick(event: BlockClickEvent) {
         if (!isEnabled()) return
         if (!config.burrowsSoopyGuess) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
index bef61bfbf5db..92dbd9dcba8f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggLocator.kt
@@ -208,7 +208,7 @@ object HoppityEggLocator {
         lastParticlePosition = null
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onItemClick(event: ItemClickEvent) {
         if (!isEnabled()) return
         val item = event.itemInHand ?: return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index 4e80bdbea678..7e1800931c41 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -213,10 +213,8 @@ object GardenAPI {
 
     private var lastLocation: LorenzVec? = null
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onBlockClick(event: BlockClickEvent) {
-        if (!inGarden()) return
-
         val blockState = event.getBlockState
         val cropBroken = blockState.getCropType() ?: return
         if (cropBroken.multiplier == 1 && blockState.isBabyCrop()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
index ff9af9cff523..bd8636b9ff86 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleLine.kt
@@ -1,7 +1,9 @@
 package at.hannibal2.skyhanni.features.garden.pests
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.ItemClickEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
@@ -33,7 +35,7 @@ object PestParticleLine {
     private var lastPestTrackerUse = SimpleTimeMark.farPast()
     private val locations = mutableListOf<MutableList<ParticleLocation>>()
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onItemClick(event: ItemClickEvent) {
         if (!isEnabled()) return
         if (PestAPI.hasVacuumInHand()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index 6056c054eac9..33c9dbea2f57 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -48,7 +48,7 @@ object PestParticleWaypoint {
     private var isPointingToPest = false
     private var color: Color? = null
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.GARDEN)
     fun onItemClick(event: ItemClickEvent) {
         if (!isEnabled()) return
         if (PestAPI.hasVacuumInHand()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
index ac1e8105ef25..79f0304f433f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.ItemAddManager
@@ -164,7 +165,7 @@ object ExperimentsProfitTracker {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemClick(event: ItemClickEvent) {
         if (isEnabled() && event.clickType == ClickType.RIGHT_CLICK) {
             val item = event.itemInHand ?: return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
index 81477957e4cd..5923433d1b36 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.itemabilities
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.itemability.FireVeilWandConfig.DisplayEntry
 import at.hannibal2.skyhanni.data.ClickType
@@ -39,9 +40,8 @@ object FireVeilWandParticles {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onItemClick(event: ItemClickEvent) {
-        if (!LorenzUtils.inSkyBlock) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
         val internalName = event.itemInHand?.getInternalName()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index 7715f7456055..830d823f6576 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
 import at.hannibal2.skyhanni.events.ItemClickEvent
@@ -204,7 +205,7 @@ object ItemAbilityCooldown {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemClick(event: ItemClickEvent) {
         if (AshfangFreezeCooldown.isCurrentlyFrozen()) return
         handleItemClick(event.itemInHand)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
index 0012ed8b0ef8..2d7487ddcb15 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.mining
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.model.Graph
@@ -484,7 +485,7 @@ object TunnelsMaps {
         nextSpotKey(event)
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemClick(event: ItemClickEvent) {
         if (!isEnabled() || !config.leftClickPigeon) return
         if (event.clickType != ClickType.LEFT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index c7d7bb5042e6..a9dc3dce34df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.minion
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.ClickType
@@ -121,7 +122,7 @@ object MinionFeatures {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onEntityClick(event: EntityClickEvent) {
         if (!enableWithHub()) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
@@ -129,7 +130,7 @@ object MinionFeatures {
         lastClickedEntity = event.clickedEntity?.getLorenzVec() ?: return
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onBlockClick(event: BlockClickEvent) {
         if (!enableWithHub()) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
index 093c7d80ed3c..ca735ce2c8ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PrivateIslandNoPickaxeAbility.kt
@@ -1,23 +1,21 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.WorldClickEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
-import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
 object PrivateIslandNoPickaxeAbility {
 
     private val config get() = SkyHanniMod.feature.mining
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.PRIVATE_ISLAND)
     fun onClick(event: WorldClickEvent) {
-        if (!IslandType.PRIVATE_ISLAND.isInIsland()) return
         if (!config.privateIslandNoPickaxeAbility) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
index 516ecfd90805..d3fbefa999a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.jsonobjects.repo.RiftWoodenButtonsJson
@@ -105,7 +106,7 @@ object WoodenButtonsHelper {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onBlockClick(event: BlockClickEvent) {
         if (!checkButtons()) return
 
@@ -115,7 +116,7 @@ object WoodenButtonsHelper {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemClick(event: ItemClickEvent) {
         if (!checkButtons()) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
index 63a4e35cb750..08079849e11e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.features.rift.area.livingcave
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
@@ -22,7 +24,7 @@ object LivingCaveLivingMetalHelper {
     private var pair: Pair<LorenzVec, LorenzVec>? = null
     private var startTime = 0L
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.THE_RIFT)
     fun onBlockClick(event: BlockClickEvent) {
         if (!isEnabled()) return
         if (event.clickType == ClickType.LEFT_CLICK) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt
index 10be4a54abd9..d1fcea62e871 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.rift.everywhere
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.mob.MobData
@@ -169,9 +170,8 @@ object PunchcardHighlight {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.THE_RIFT)
     fun onPunch(event: EntityClickEvent) {
-        if (!RiftAPI.inRift()) return
         val entity = event.clickedEntity
         if (entity !is AbstractClientPlayer) return
         if (entity.isNPC()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index 162675486946..c879c202b42d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.slayer
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.data.SlayerAPI
 import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent
@@ -148,7 +149,7 @@ object SlayerQuestWarning {
         return getSlayerData().lastSlayerType == slayerType
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onItemClick(event: ItemClickEvent) {
         val internalName = event.itemInHand?.getInternalNameOrNull()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
index df7ab69d907a..13186cd96910 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
@@ -1,8 +1,10 @@
 package at.hannibal2.skyhanni.features.slayer
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.ClickType
+import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.EntityClickEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -203,7 +205,7 @@ object VampireSlayerFeatures {
         return toChromaColor().withAlpha(config.withAlpha)
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnIsland = IslandType.THE_RIFT)
     fun onEntityClick(event: EntityClickEvent) {
         if (!isEnabled()) return
         if (event.clickType != ClickType.LEFT_CLICK) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
index 8a5b5f727193..2f01af9033cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.slayer.blaze
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor
 import at.hannibal2.skyhanni.config.features.slayer.blaze.BlazeHellionConfig.FirstDaggerEntry
@@ -202,7 +203,7 @@ object BlazeSlayerDaggerHelper {
         return LorenzUtils.inSkyBlock && config.daggers
     }
 
-    @SubscribeEvent
+    @HandleEvent(onlyOnSkyblock = true)
     fun onBlockClick(event: BlockClickEvent) {
         if (!isEnabled()) return
         if (clientSideClicked) return
diff --git a/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt b/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
index 9b3cec0a09b3..0c5f66626de2 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/WorldEdit.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.test
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -52,7 +53,7 @@ object WorldEdit {
         return text
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onBlockClick(event: BlockClickEvent) {
         if (!isEnabled()) return
         if (event.itemInHand?.getItemId() != "WOOD_AXE") return

From 9c1a84491382ce9ffc4bf94cc5ee24f35b58a2cf Mon Sep 17 00:00:00 2001
From: DungeonHub <177025031+DungeonHub@users.noreply.github.com>
Date: Fri, 11 Oct 2024 19:54:54 +0200
Subject: [PATCH 706/721] Improvement: Added Item Cooldown to Totem of
 Corruption and Enrager (#2706)

---
 .../abilitycooldown/ItemAbility.kt             |  2 ++
 .../abilitycooldown/ItemAbilityCooldown.kt     | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index 68f9798c309b..6bc24f055ada 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -52,6 +52,8 @@ enum class ItemAbility(
     ROYAL_PIGEON(5),
     WAND_OF_STRENGTH(10),
     TACTICAL_INSERTION(20),
+    TOTEM_OF_CORRUPTION(20),
+    ENRAGER(20),
 
     // doesn't have a sound
     ENDER_BOW("Ender Warp", 5, "Ender Bow"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index 830d823f6576..fb15bd703a44 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -55,12 +55,14 @@ object ItemAbilityCooldown {
     private var lastAbility = ""
     private var items = mapOf<String, List<ItemText>>()
     private var abilityItems = mapOf<ItemStack, MutableList<ItemAbility>>()
+    private val recentItemsInHand = InventoryUtils.recentItemsInHand.values
     private val WEIRD_TUBA = "WEIRD_TUBA".asInternalName()
     private val WEIRDER_TUBA = "WEIRDER_TUBA".asInternalName()
     private val VOODOO_DOLL_WILTED = "VOODOO_DOLL_WILTED".asInternalName()
     private val WARNING_FLARE = "WARNING_FLARE".asInternalName()
     private val ALERT_FLARE = "ALERT_FLARE".asInternalName()
     private val SOS_FLARE = "SOS_FLARE".asInternalName()
+    private val TOTEM_OF_CORRUPTION = "TOTEM_OF_CORRUPTION".asInternalName()
 
 
     @SubscribeEvent
@@ -192,13 +194,23 @@ object ItemAbilityCooldown {
             event.soundName == "mob.zombie.remedy" && event.pitch == 1.8888888f && event.volume == 0.7f -> {
                 ItemAbility.TACTICAL_INSERTION.activate(null, 17_000)
             }
+            // Totem of Corruption
+            event.soundName == "random.wood_click" && event.pitch == 0.84126985f && event.volume == 0.5f -> {
+                if (TOTEM_OF_CORRUPTION in recentItemsInHand) {
+                    ItemAbility.TOTEM_OF_CORRUPTION.sound()
+                }
+            }
+            // Enrager
+            event.soundName == "mob.enderdragon.growl" && event.pitch == 0.4920635f && event.volume == 2.0f -> {
+                ItemAbility.ENRAGER.sound()
+            }
+
             // Blaze Slayer Flares
             event.soundName == "fireworks.launch" && event.pitch == 1.0f && event.volume == 3.0f -> {
-                val recent = InventoryUtils.recentItemsInHand.values
-                if (WARNING_FLARE in recent || ALERT_FLARE in recent) {
+                if (WARNING_FLARE in recentItemsInHand || ALERT_FLARE in recentItemsInHand) {
                     ItemAbility.ALERT_FLARE.sound()
                 }
-                if (SOS_FLARE in recent) {
+                if (SOS_FLARE in recentItemsInHand) {
                     ItemAbility.SOS_FLARE.sound()
                 }
             }

From 8a0105f4ad3964d1c8977fa8b09c75df33a74c74 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:16:39 +0200
Subject: [PATCH 707/721] added todo

---
 .../skyhanni/config/features/misc/EstimatedItemValueConfig.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
index 3f5874ac0941..2bdae5c59290 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java
@@ -106,5 +106,6 @@ public String toString() {
 
     @Expose
     @ConfigLink(owner = EstimatedItemValueConfig.class, field = "enabled")
+    // TODO rename "position"
     public Position itemPriceDataPos = new Position(140, 90, false, true);
 }

From 92291e61cbbdc05736288aef1743ee1c667da6fa Mon Sep 17 00:00:00 2001
From: Obsidian <108832807+Obsidianninja11@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:23:27 -0800
Subject: [PATCH 708/721] Fix/Improvement: Translator feature (#2693)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  12 +-
 .../features/chat/TranslatorConfig.java       |  20 ++-
 .../chat/translation/TranslatableLanguage.kt  |   4 +-
 .../features/chat/translation/Translator.kt   | 133 +++++++++---------
 4 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 44565aa95451..bd94a16587f1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -252,12 +252,12 @@ object Commands {
         ) { FarmingWeightDisplay.lookUpCommand(it) }
         registerCommand(
             "shcopytranslation",
-            "Copy the English translation of a message in another language to the clipboard.\n" + "Uses a 2 letter language code that can be found at the end of a translation message.",
-        ) { Translator.fromEnglish(it) }
+            "Copy the translation of a message in another language to your clipboard.\n" + "Uses a language code that can be found at the end of a translation message.",
+        ) { Translator.fromNativeLanguage(it) }
         registerCommand(
             "shtranslate",
-            "Translate a message in another language to English.",
-        ) { Translator.toEnglish(it) }
+            "Translate a message in another language to your language.",
+        ) { Translator.toNativeLanguage(it) }
         registerCommand(
             "shmouselock",
             "Lock/Unlock the mouse so it will no longer rotate the player (for farming)",
@@ -619,6 +619,10 @@ object Commands {
             "shresetmineshaftpitystats",
             "Resets the mineshaft pity display stats",
         ) { MineshaftPityDisplay.fullResetCounter() }
+        registerCommand(
+            "shtranslateadvanced",
+            "Translates a message in an inputted language to another inputted language.",
+        ) { Translator.translateAdvancedCommand(it) }
     }
 
     private fun internalCommands() {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
index 648afbd8739c..fdd678d0b2dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/TranslatorConfig.java
@@ -2,8 +2,10 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.features.chat.translation.TranslatableLanguage;
+import at.hannibal2.skyhanni.utils.OSUtils;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
@@ -14,7 +16,7 @@ public class TranslatorConfig {
     @Expose
     @ConfigOption(
         name = "Translate On Click",
-        desc = "Click on a message to translate it to English.\n" +
+        desc = "Click on a message to translate it to your language.\n" +
             "Use §e/shcopytranslation§7 to translate from English.\n" +
             "§cTranslation is not guaranteed to be 100% accurate."
     )
@@ -22,7 +24,7 @@ public class TranslatorConfig {
     @FeatureToggle
     public boolean translateOnClick = false;
 
-    @ConfigOption(name = "Language Name", desc = "The name of the language selected below. Note that languages marked as unknown might still be supported.")
+    @ConfigOption(name = "Your Language", desc = "The language that messages should be translated to.")
     @Expose
     @ConfigEditorDropdown
     public Property<TranslatableLanguage> languageName = Property.of(TranslatableLanguage.ENGLISH);
@@ -30,8 +32,18 @@ public class TranslatorConfig {
     @Expose
     @ConfigOption(
         name = "Language Code",
-        desc = "Enter a language code here to translate on chat click into another language. " +
-            "E.g. `es` for spanish or 'de' for german. Empty for english.")
+        desc = "If your language doesn't show in the dropdown, enter your language code here. " +
+            "E.g. 'es' for Spanish or 'de' for German. Empty will use English."
+    )
     @ConfigEditorText
     public Property<String> languageCode = Property.of("en");
+
+    @ConfigOption(
+        name = "List of Language Codes",
+        desc = "A list of Google Translate's suppored language codes."
+    )
+    @ConfigEditorButton(buttonText = "Open")
+    public Runnable langCodesURL = () -> OSUtils.openBrowser(
+        "https://cloud.google.com/translate/docs/languages#try-it-for-yourself"
+    );
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
index 13a19a1dcbc8..7f5db80d1ef8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/TranslatableLanguage.kt
@@ -34,8 +34,8 @@ enum class TranslatableLanguage(private val englishName: String, private val nat
     TAGALOG("Tagalog", "Tagalog", "tl"), // Major language in the Philippines
     PUNJABI("Punjabi", "ਪੰਜਾਬੀ", "pa"), // Significant in India and Pakistan
 
-    // 5. need better name
-    UNKNOWN("Unknown Language", "", ""),
+    // 5. Other Language
+    UNKNOWN("Other", "", ""),
     ;
 
     // Limit to 20 characters so that the text is not too small in the config
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
index 24809faac798..ca827432fad9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/translation/Translator.kt
@@ -66,7 +66,7 @@ object Translator {
             if (text.isEmpty()) {
                 config.languageName.set(TranslatableLanguage.ENGLISH)
             } else {
-                for (language in TranslatableLanguage.values()) {
+                for (language in TranslatableLanguage.entries) {
                     if (language.languageCode.equals(text, ignoreCase = true)) {
                         config.languageName.set(language)
                         return@onToggle
@@ -107,102 +107,107 @@ object Translator {
      *     ]
      *   ],
      *   null,
-     *   '"target language as a two-letter code following ISO 639-1"',
+     *   '"target language as a (usually) two-letter code following ISO 639-1"',
      * ]
      */
 
-    private fun getJSONResponse(urlString: String) =
-        APIUtils.getJSONResponseAsElement(urlString, false, "Google Translate API")
+    private fun getJSONResponse(urlString: String) = APIUtils.getJSONResponseAsElement(urlString, false, "Google Translate API")
 
-    private fun getTranslationToEnglish(message: String): String {
-        val url =
-            "https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=en&dt=t&q=" +
-                URLEncoder.encode(message, "UTF-8")
+    fun getTranslation(
+        message: String,
+        targetLanguage: String,
+        sourceLanguage: String = "auto",
+    ): Array<String>? {
+        // TODO add &dj=1 to use named json
+        val url = "https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=$sourceLanguage&tl=$targetLanguage&q=" +
+            URLEncoder.encode(message, "UTF-8")
 
         var messageToSend = ""
-        val layer1 = getJSONResponse(url).asJsonArray
-        if (layer1.size() <= 2) return "Error!"
+        val fullResponse = getJSONResponse(url).asJsonArray
+        if (fullResponse.size() < 3) return null
 
-        val language = layer1[2].toString()
-        if (language == "\"en\"") return "Unable to translate!"
-        if (language.length != 4) return "Error!"
+        val language = fullResponse[2].toString() // the detected language the message is in
+        val sentences = fullResponse[0] as? JsonArray ?: return null
 
-        val layer2 = try {
-            layer1[0] as JsonArray
-        } catch (_: Exception) {
-            return "Error!"
-        }
-
-        for (layer3 in layer2) {
-            val arrayLayer3 = layer3 as? JsonArray ?: continue
-            val sentence = arrayLayer3[0].toString()
+        for (rawSentence in sentences) {
+            val arrayPhrase = rawSentence as? JsonArray ?: continue
+            val sentence = arrayPhrase[0].toString()
             val sentenceWithoutQuotes = sentence.substring(1, sentence.length - 1)
             messageToSend = "$messageToSend$sentenceWithoutQuotes"
         }
-        messageToSend = "$messageToSend §7(Language: $language)"
+        messageToSend = URLDecoder.decode(messageToSend, "UTF-8").replace("\\", "") // Not sure if this is actually needed
+        return arrayOf(messageToSend, language)
+    }
 
-        return URLDecoder.decode(messageToSend, "UTF-8").replace("\\", "")
+    @Deprecated("Use toNativeLanguage() instead", ReplaceWith("Translator.toNativeLanguage(args)"))
+    fun toEnglish(args: Array<String>) {
+        toNativeLanguage(args)
     }
 
-    private fun getTranslationFromEnglish(message: String, lang: String): String {
-        val url =
-            "https://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=$lang&dt=t&q=" +
-                URLEncoder.encode(message, "UTF-8")
-
-        val layer1 = getJSONResponse(url).asJsonArray
-        if (layer1.size() < 1) return "Error!"
-        val layer2 = layer1[0] as? JsonArray
-
-        val firstSentence = (layer2?.get(0) as? JsonArray)?.get(0).toString()
-        var messageToSend = firstSentence.substring(0, firstSentence.length - 1)
-        if (layer2 != null) {
-            for (sentenceIndex in 1..<layer2.size()) {
-                val sentence = (layer2.get(sentenceIndex) as JsonArray).get(0).toString()
-                val sentenceWithoutQuotes = sentence.substring(1, sentence.length - 1)
-                messageToSend = "$messageToSend$sentenceWithoutQuotes"
-            }
-        } // The first translated sentence only has 1 extra char at the end, but sentences after it need 1 at the front and 1 at the end removed in the substring
-        messageToSend = messageToSend.substring(1, messageToSend.length)
-        return URLDecoder.decode(messageToSend, "UTF-8").replace("\\", "")
+    @Deprecated("Use fromNativeLanguage() instead", ReplaceWith("Translator.fromNativeLanguage(args)"))
+    fun fromEnglish(args: Array<String>) {
+        fromNativeLanguage(args)
     }
 
-    fun toEnglish(args: Array<String>) {
+    fun toNativeLanguage(args: Array<String>) {
         val message = args.joinToString(" ").removeColor()
 
         coroutineScope.launch {
-            var lang = config.languageCode.get()
-            val translation = if (lang.isEmpty()) {
-                getTranslationToEnglish(message)
-            } else {
-                getTranslationFromEnglish(message, lang)
-            }
-            if (message == translation) {
-                ChatUtils.userError("Translation is the same as the original message!")
-                return@launch
-            }
+            val translation = getTranslation(message, nativeLanguage())
+            val translatedMessage = translation?.get(0) ?: "Error!"
+            val detectedLanguage = translation?.get(1) ?: "Error!"
 
-            if (translation == "Unable to translate!") {
-                ChatUtils.userError("Unable to translate message :( (is it in English?)")
+            if (message == translatedMessage) {
+                ChatUtils.userError("Translation is the same as the original message!")
                 return@launch
             }
-            ChatUtils.chat("Found translation: §f$translation")
+            ChatUtils.clickableChat(
+                "Found translation: §f$translatedMessage",
+                onClick = { OSUtils.copyToClipboard(translatedMessage) },
+                "§eClick to copy!\n§eOriginal message: §f$message §7(Language: $detectedLanguage)",
+            )
         }
     }
 
-    fun fromEnglish(args: Array<String>) {
-        if (args.size < 2 || args[0].length != 2) { // args[0] is the language code
-            ChatUtils.userError("Usage: /shcopytranslation <two letter language code (at the end of a translation)> <message>")
+    fun fromNativeLanguage(args: Array<String>) {
+        if (args.size < 2) {
+            ChatUtils.userError("Usage: /shcopytranslation <language code (found at the end of a translation)> <message>")
             return
         }
         val language = args[0]
         val message = args.drop(1).joinToString(" ")
 
         coroutineScope.launch {
-            val translation = getTranslationFromEnglish(message, language)
-            ChatUtils.chat("Copied translation to clipboard: §f$translation")
-            OSUtils.copyToClipboard(translation)
+            val translation = getTranslation(message, language, nativeLanguage())?.get(0) ?: "Error!"
+            ChatUtils.clickableChat(
+                "Copied §f$language §etranslation to clipboard: §f$translation",
+                onClick = { OSUtils.copyToClipboard(translation) },
+                "§eClick to copy!\n§eOriginal message: §f$message",
+            )
         }
     }
 
+    fun translateAdvancedCommand(args: Array<String>) {
+        if (args.size < 3) {
+            ChatUtils.userError("Usage: /shtranslateadvanced <source lang code> <target lang code> <message>")
+            return
+        }
+        val sourceLanguage = args[0]
+        val targetLanguage = args[1]
+        val message = args.drop(2).joinToString(" ")
+
+        val translation = getTranslation(message, sourceLanguage, targetLanguage)
+        val translatedMessage = translation?.get(0) ?: "Error!"
+        val detectedLanguage = if (sourceLanguage == "auto") " ${translation?.get(1) ?: "Error!"}" else ""
+
+        ChatUtils.clickableChat(
+            "Found translation from sl: $sourceLanguage: §f$translatedMessage §7(tl: $targetLanguage)",
+            onClick = { OSUtils.copyToClipboard(translatedMessage) },
+            "§eClick to copy!\n§eOriginal message: §f$message §7(sl: $sourceLanguage$detectedLanguage)",
+        )
+    }
+
+    fun nativeLanguage(): String = config.languageCode.get().ifEmpty { "en" }
+
     fun isEnabled() = config.translateOnClick
 }

From ec9e3340cae5d42a6aa57e381d01f79a00b7ffd1 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 12 Oct 2024 05:38:06 +1100
Subject: [PATCH 709/721] Fix: Make adding stars debug only (#2715)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../features/misc/items/EstimatedItemValue.kt  | 18 ++++++++++--------
 .../misc/items/EstimatedItemValueCalculator.kt |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 0463257496f0..8b6697a41af8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.misc.items
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig
 import at.hannibal2.skyhanni.data.jsonobjects.repo.ItemsJson
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -39,7 +40,7 @@ import kotlin.math.roundToLong
 @SkyHanniModule
 object EstimatedItemValue {
 
-    val config get() = SkyHanniMod.feature.inventory.estimatedItemValues
+    val config: EstimatedItemValueConfig get() = SkyHanniMod.feature.inventory.estimatedItemValues
     private var display = emptyList<List<Any>>()
     private val cache = mutableMapOf<ItemStack, List<List<Any>>>()
     private var lastToolTipTime = 0L
@@ -90,13 +91,14 @@ object EstimatedItemValue {
         currentlyShowing = checkCurrentlyVisible()
         if (!currentlyShowing) return
 
-        // TODO add "is debug enabled" check once users notice this easteregg
-        if (Keyboard.KEY_RIGHT.isKeyClicked()) {
-            EstimatedItemValueCalculator.starChange += 1
-            cache.clear()
-        } else if (Keyboard.KEY_LEFT.isKeyClicked()) {
-            EstimatedItemValueCalculator.starChange -= 1
-            cache.clear()
+        if (SkyHanniMod.feature.dev.debug.enabled) {
+            if (Keyboard.KEY_RIGHT.isKeyClicked()) {
+                EstimatedItemValueCalculator.starChange += 1
+                cache.clear()
+            } else if (Keyboard.KEY_LEFT.isKeyClicked()) {
+                EstimatedItemValueCalculator.starChange -= 1
+                cache.clear()
+            }
         }
 
         config.itemPriceDataPos.renderStringsAndItems(display, posLabel = "Estimated Item Value")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index fb1ce6b4488f..15c55e02e7fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
@@ -72,6 +72,7 @@ object EstimatedItemValueCalculator {
     private val kuudraSets = listOf("AURORA", "CRIMSON", "TERROR", "HOLLOW", "FERVOR")
 
     var starChange = 0
+        get() = if (SkyHanniMod.feature.dev.debug.enabled) field else 0
 
     private val additionalCostFunctions = listOf(
         ::addAttributeCost,
@@ -449,7 +450,7 @@ object EstimatedItemValueCalculator {
         var totalStars = stack.getDungeonStarCount() ?: stack.getStarCount() ?: 0
 
         starChange.takeIf { it != 0 }?.let {
-            list.add("change: $it")
+            list.add("[Debug] added stars: $it")
             totalStars += it
         }
 

From d503510e9afd77f55c1c8d76aae298393de1c846 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 12 Oct 2024 05:38:53 +1100
Subject: [PATCH 710/721] Backend: Update upload artifact action version
 (#2701)

---
 .github/workflows/build.yml               | 4 ++--
 .github/workflows/generate-constants.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 143c59466cd1..7ab0e6c7543f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,14 +23,14 @@ jobs:
             -   uses: ./.github/actions/setup-normal-workspace
             -   name: Build with Gradle
                 run: ./gradlew assemble -x test --stacktrace
-            -   uses: actions/upload-artifact@v3
+            -   uses: actions/upload-artifact@v4
                 name: Upload development build
                 with:
                     name: "Development Build"
                     path: build/libs/*.jar
             -   name: Test with Gradle
                 run: ./gradlew test
-            -   uses: actions/upload-artifact@v3
+            -   uses: actions/upload-artifact@v4
                 name: "Upload test report"
                 if: ${{ !cancelled() }}
                 with:
diff --git a/.github/workflows/generate-constants.yaml b/.github/workflows/generate-constants.yaml
index c589676d0e2f..a125550331a3 100644
--- a/.github/workflows/generate-constants.yaml
+++ b/.github/workflows/generate-constants.yaml
@@ -29,7 +29,7 @@ jobs:
             -   name: Generate Repo Patterns using Gradle
                 run: |
                     ./gradlew generateRepoPatterns --stacktrace
-            -   uses: actions/upload-artifact@v3
+            -   uses: actions/upload-artifact@v4
                 name: Upload generated repo regexes
                 with:
                     name: Repo Regexes

From d763b99107a0a9da4f0a9e59ebe51d4a2704bc0e Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 12 Oct 2024 05:39:53 +1100
Subject: [PATCH 711/721] Backend: Add Changelog Verification (#2692)

---
 .github/workflows/pr-check.yml                | 57 +++++++++++++++++
 build.gradle.kts                              | 12 +++-
 buildSrc/build.gradle.kts                     | 17 +++++
 .../ChangelogVerification.kt                  | 63 +++++++++++++++++++
 4 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/pr-check.yml
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
new file mode 100644
index 000000000000..cabb09c1d029
--- /dev/null
+++ b/.github/workflows/pr-check.yml
@@ -0,0 +1,57 @@
+name: "PR Changelog Verification"
+
+on:
+    pull_request_target:
+        types: [ opened, edited ]
+
+jobs:
+    verify-changelog:
+        if: github.event.pull_request.state == 'open' && '511310721' == github.repository_id
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v4
+
+            -   uses: ./.github/actions/setup-normal-workspace
+
+            -   name: Grant execute permission for gradlew
+                run: chmod +x gradlew
+
+            -   name: Run ChangeLog verification
+                env:
+                    PR_TITLE: ${{ github.event.pull_request.title }}
+                    PR_BODY: ${{ github.event.pull_request.body }}
+                run: |
+                    ./gradlew checkPrDescription -PprTitle="${PR_TITLE}" -PprBody="${PR_BODY}"
+
+            -   name: Add label if changelog verification fails
+                if: failure()
+                uses: actions-ecosystem/action-add-labels@v1
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    labels: 'Wrong Title/Changelog'
+
+            -   name: Remove label if changelog verification passes
+                if: success()
+                uses: actions-ecosystem/action-remove-labels@v1
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    labels: 'Wrong Title/Changelog'
+
+            -   name: Add comment to PR if changelog verification fails
+                if: failure()
+                uses: actions/github-script@v6
+                with:
+                    github-token: ${{ secrets.GITHUB_TOKEN }}
+                    script: |
+                        const fs = require('fs');
+                        const test = fs.readFileSync('build/changelog_errors.txt', 'utf8');
+                        const commentBody = `${test}`
+                        
+                        github.rest.issues.createComment({
+                          issue_number: context.issue.number,
+                          owner: context.repo.owner,
+                          repo: context.repo.repo,
+                          body: commentBody
+                        })
diff --git a/build.gradle.kts b/build.gradle.kts
index 190385c1e4ee..dde5ac410ed2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,11 +3,12 @@ import at.skyhanni.sharedvariables.MultiVersionStage
 import at.skyhanni.sharedvariables.ProjectTarget
 import at.skyhanni.sharedvariables.SHVersionInfo
 import at.skyhanni.sharedvariables.versionString
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import io.gitlab.arturbosch.detekt.Detekt
-import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import skyhannibuildsystem.ChangelogVerification
 
 plugins {
     idea
@@ -102,6 +103,13 @@ tasks.runClient {
         },
     )
 }
+
+tasks.register("checkPrDescription", ChangelogVerification::class) {
+    this.outputDirectory.set(layout.buildDirectory)
+    this.prTitle = project.findProperty("prTitle") as String
+    this.prBody = project.findProperty("prBody") as String
+}
+
 val shot = shots.shot("minecraft", rootProject.file("shots.txt"))
 
 dependencies {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 000000000000..505f438b98c2
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    maven("https://jitpack.io") {
+        content {
+            includeGroupByRegex("com\\.github\\..*")
+        }
+    }
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation("com.github.SkyHanniStudios:SkyHanniChangelogBuilder:1.0.1")
+}
diff --git a/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt b/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt
new file mode 100644
index 000000000000..422a62cb1d9b
--- /dev/null
+++ b/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt
@@ -0,0 +1,63 @@
+package skyhannibuildsystem
+
+import at.hannibal2.changelog.SkyHanniChangelogBuilder
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+abstract class ChangelogVerification : DefaultTask() {
+
+    @get:OutputDirectory
+    abstract val outputDirectory: DirectoryProperty
+
+    @Input
+    var prTitle: String = ""
+
+    @Input
+    var prBody: String = ""
+
+    @get:Internal
+    val prBodyLines get() = prBody.lines()
+
+    private val prLink = "ignored"
+    private val templateLocation = "https://github.com/hannibal002/SkyHanni/blob/beta/pull_request_template.md"
+
+    @TaskAction
+    fun scanChangelog() {
+        if (prBodyLines.contains("exclude_from_changelog")) {
+            println("PR is excluded from changelog verification")
+            return
+        }
+
+        val (changes, bodyErrors) = SkyHanniChangelogBuilder.findChanges(prBodyLines, prLink)
+        val titleErrors = SkyHanniChangelogBuilder.findPullRequestNameErrors(prTitle, changes)
+
+        if (bodyErrors.isEmpty() && titleErrors.isEmpty()) {
+            println("Changelog and title verification successful")
+        } else {
+            bodyErrors.forEach { println(it.message) }
+            titleErrors.forEach { println(it.message) }
+
+            // Export errors so that they can be listed in the PR comment
+            val errorFile = File(outputDirectory.get().asFile, "changelog_errors.txt")
+
+            errorFile.appendText("I have detected some issues with your pull request:\n\n")
+
+            if (bodyErrors.isNotEmpty()) {
+                errorFile.appendText("Body issues:\n${bodyErrors.joinToString("\n") { it.formatLine() }}\n\n")
+            }
+            if (titleErrors.isNotEmpty()) {
+                errorFile.appendText("Title issues:\n${titleErrors.joinToString("\n") { it.message }}\n\n")
+            }
+
+            errorFile.appendText("Please fix these issues. For the correct format, refer to the [pull request template]($templateLocation).")
+
+            throw GradleException("Changelog verification failed")
+        }
+    }
+}

From a1c8bfd7f9d43855205926071e4191d72386f57d Mon Sep 17 00:00:00 2001
From: martimavocado <39881008+martimavocado@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:04:38 +0100
Subject: [PATCH 712/721] Backend: Add dungeon phases (#1865)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../events/DungeonBossPhaseChangeEvent.kt     |   6 +
 .../features/dungeon/DungeonBossAPI.kt        | 171 ++++++++++++++++++
 .../features/dungeon/TerracottaPhase.kt       |  27 +--
 3 files changed, 183 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/DungeonBossPhaseChangeEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossPhaseChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossPhaseChangeEvent.kt
new file mode 100644
index 000000000000..92d6be3d5892
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossPhaseChangeEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonBossAPI
+
+class DungeonBossPhaseChangeEvent(val newPhase: DungeonBossAPI.DungeonBossPhase) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt
new file mode 100644
index 000000000000..5a7d0ff313a8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt
@@ -0,0 +1,171 @@
+package at.hannibal2.skyhanni.features.dungeon
+
+import at.hannibal2.skyhanni.events.DungeonBossPhaseChangeEvent
+import at.hannibal2.skyhanni.events.DungeonCompleteEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonAPI.dungeonFloor
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object DungeonBossAPI {
+    var bossPhase: DungeonBossPhase? = null
+
+    enum class DungeonBossPhase {
+        F6_TERRACOTTA,
+        F6_GIANTS,
+        F6_SADAN,
+        F7_MAXOR,
+        F7_STORM,
+        F7_GOLDOR_1,
+        F7_GOLDOR_2,
+        F7_GOLDOR_3,
+        F7_GOLDOR_4,
+        F7_GOLDOR_5,
+        F7_NECRON,
+        M7_WITHER_KING,
+    }
+
+    private val patternGroup = RepoPattern.group("dungeon.boss.message")
+
+    /**
+     * REGEX-TEST: §c[BOSS] Sadan§r§f: So you made it all the way here... Now you wish to defy me\? Sadan\?!
+     */
+    private val terracottaStartPattern by patternGroup.pattern(
+        "f6.terracotta",
+        "§c\\[BOSS] Sadan§r§f: So you made it all the way here\\.\\.\\. Now you wish to defy me\\? Sadan\\?!",
+    )
+
+    /**
+     * REGEX-TEST: §c[BOSS] Sadan§r§f: ENOUGH!
+     */
+    private val giantsStartPattern by patternGroup.pattern(
+        "f6.giants",
+        "§c\\[BOSS] Sadan§r§f: ENOUGH!",
+    )
+
+    /**
+     * REGEX-TEST: §c[BOSS] Sadan§r§f: You did it. I understand now, you have earned my respect.
+     */
+    private val sadanStartPattern by patternGroup.pattern(
+        "f6.sadan",
+        "§c\\[BOSS] Sadan§r§f: You did it\\. I understand now, you have earned my respect\\.",
+    )
+
+    /**
+     * REGEX-TEST: §4[BOSS] Maxor§r§c: §r§cWELL! WELL! WELL! LOOK WHO'S HERE!
+     */
+    private val maxorStartPattern by patternGroup.pattern(
+        "f7.maxor",
+        "§4\\[BOSS] Maxor§r§c: §r§cWELL! WELL! WELL! LOOK WHO'S HERE!",
+    )
+
+    /**
+     * REGEX-TEST: §4[BOSS] Storm§r§c: §r§cPathetic Maxor, just like expected.
+     */
+    private val stormStartPattern by patternGroup.pattern(
+        "f7.storm",
+        "§4\\[BOSS] Storm§r§c: §r§cPathetic Maxor, just like expected\\.",
+    )
+
+    /**
+     * REGEX-TEST: §4[BOSS] Goldor§r§c: §r§cWho dares trespass into my domain?
+     */
+    private val goldorStartPattern by patternGroup.pattern(
+        "f7.goldor.start",
+        "§4\\[BOSS] Goldor§r§c: §r§cWho dares trespass into my domain\\?",
+    )
+
+    /**
+     * REGEX-TEST: §bmartimavocado§r§a activated a lever! (§r§c7§r§a/7)
+     * REGEX-TEST: §bmartimavocado§r§a completed a device! (§r§c3§r§a/8)
+     * REGEX-TEST: §bmartimavocado§r§a activated a terminal! (§r§c4§r§a/7)
+     */
+    private val goldorTerminalPattern by patternGroup.pattern(
+        "f7.goldor.terminalcomplete",
+        "§.(?<playerName>\\w+)§r§a (?:activated|completed) a (?<type>lever|terminal|device)! \\(§r§c(?<currentTerminal>\\d)§r§a/(?<total>\\d)\\)",
+    )
+
+    /**
+     * REGEX-TEST: §aThe Core entrance is opening!
+     */
+    private val goldor5StartPattern by patternGroup.pattern(
+        "f7.goldor.5",
+        "§aThe Core entrance is opening!",
+    )
+
+    /**
+     * REGEX-TEST: §4[BOSS] Necron§r§c: §r§cYou went further than any human before, congratulations.
+     */
+    private val necronStartPattern by patternGroup.pattern(
+        "f7.necron.start",
+        "§4\\[BOSS] Necron§r§c: §r§cYou went further than any human before, congratulations\\.",
+    )
+
+    /**
+     * REGEX-TEST: §4[BOSS] Necron§r§c: §r§cAll this, for nothing...
+     */
+    private val witherKingStartPattern by patternGroup.pattern(
+        "m7.witherking",
+        "§4\\[BOSS] Necron§r§c: §r§cAll this, for nothing\\.\\.\\.",
+    )
+
+    private fun handlePhaseMessage(message: String) {
+        if (dungeonFloor == "F6" || dungeonFloor == "M6") when { //move to enum
+            terracottaStartPattern.matches(message) -> changePhase(DungeonBossPhase.F6_TERRACOTTA)
+            giantsStartPattern.matches(message) -> changePhase(DungeonBossPhase.F6_GIANTS)
+            sadanStartPattern.matches(message) -> changePhase(DungeonBossPhase.F6_SADAN)
+        }
+
+        if (dungeonFloor == "F7" || dungeonFloor == "M7") { //move to enum
+            goldorTerminalPattern.matchMatcher(message) {
+                val currentTerminal = group("currentTerminal").toIntOrNull() ?: return
+                val totalTerminals = group("total").toIntOrNull() ?: return
+                if (currentTerminal != totalTerminals) return
+                changePhase(
+                    when (bossPhase) {
+                        DungeonBossPhase.F7_GOLDOR_1 -> DungeonBossPhase.F7_GOLDOR_2
+                        DungeonBossPhase.F7_GOLDOR_2 -> DungeonBossPhase.F7_GOLDOR_3
+                        DungeonBossPhase.F7_GOLDOR_3 -> DungeonBossPhase.F7_GOLDOR_4
+                        else -> return
+                    },
+                )
+            }
+            when {
+                maxorStartPattern.matches(message) -> changePhase(DungeonBossPhase.F7_MAXOR)
+                stormStartPattern.matches(message) -> changePhase(DungeonBossPhase.F7_STORM)
+                goldorStartPattern.matches(message) -> changePhase(DungeonBossPhase.F7_GOLDOR_1)
+                goldor5StartPattern.matches(message) -> changePhase(DungeonBossPhase.F7_GOLDOR_5)
+                necronStartPattern.matches(message) -> changePhase(DungeonBossPhase.F7_NECRON)
+                witherKingStartPattern.matches(message) -> if (bossPhase != null) changePhase(DungeonBossPhase.M7_WITHER_KING)
+            }
+        }
+    }
+
+    private fun changePhase(newPhase: DungeonBossPhase) {
+        DungeonBossPhaseChangeEvent(newPhase).post()
+        bossPhase = newPhase
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        bossPhase = null
+    }
+
+    @SubscribeEvent
+    fun onDungeonEnd(event: DungeonCompleteEvent) {
+        bossPhase = null
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+
+        handlePhaseMessage(event.message)
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
index 14e359c29114..69b8ab077f6f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
 import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
@@ -15,37 +14,23 @@ object TerracottaPhase {
 
     private val config get() = SkyHanniMod.feature.dungeon.terracottaPhase
 
-    private var inTerracottaPhase = false
-
-    @SubscribeEvent
-    fun onChat(event: LorenzChatEvent) {
-        if (!isEnabled()) return
-
-        if (event.message == "§c[BOSS] Sadan§r§f: So you made it all the way here... Now you wish to defy me? Sadan?!") {
-            inTerracottaPhase = true
-        }
-
-        if (event.message == "§c[BOSS] Sadan§r§f: ENOUGH!") {
-            inTerracottaPhase = false
-        }
-    }
-
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityLivingBase>) {
-        if (isActive() && config.hideDamageSplash && DamageIndicatorManager.isDamageSplash(event.entity)) {
+        if (isEnabled() && config.hideDamageSplash && DamageIndicatorManager.isDamageSplash(event.entity)) {
             event.cancel()
         }
     }
 
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
-        if (isActive() && config.hideParticles) {
+        if (isEnabled() && config.hideParticles) {
             event.cancel()
         }
     }
 
-    private fun isActive() = isEnabled() && inTerracottaPhase
-
     private fun isEnabled() =
-        DungeonAPI.inDungeon() && DungeonAPI.inBossRoom && DungeonAPI.getCurrentBoss() == DungeonFloor.F6
+        DungeonAPI.inDungeon() &&
+            DungeonAPI.inBossRoom &&
+            DungeonAPI.getCurrentBoss() == DungeonFloor.F6 &&
+            DungeonBossAPI.bossPhase == DungeonBossAPI.DungeonBossPhase.F6_TERRACOTTA
 }

From 19158f28ae6a2aaa005f150bfa5d1d6677c2a67a Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 12 Oct 2024 07:25:03 +1100
Subject: [PATCH 713/721] Fix: Failed tests (#2721)

---
 .github/workflows/generate-constants.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-constants.yaml b/.github/workflows/generate-constants.yaml
index a125550331a3..f6fab6f243ac 100644
--- a/.github/workflows/generate-constants.yaml
+++ b/.github/workflows/generate-constants.yaml
@@ -45,7 +45,7 @@ jobs:
                 with:
                     repository: ${{ env.data_repo }}
                     branch: main
-            -   uses: actions/download-artifact@v3
+            -   uses: actions/download-artifact@v4
                 name: Upload generated repo regexes
                 with:
                     name: Repo Regexes

From a89531972dbe1b686a50512d51ea87a7a020f8bc Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 12 Oct 2024 07:47:33 +1100
Subject: [PATCH 714/721] Fix: Verify Changelog not adding comment describing
 problem (Maybe) (#2723)

---
 .github/workflows/pr-check.yml                                  | 2 +-
 .../main/kotlin/skyhannibuildsystem/ChangelogVerification.kt    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index cabb09c1d029..3702088f8387 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -46,7 +46,7 @@ jobs:
                     github-token: ${{ secrets.GITHUB_TOKEN }}
                     script: |
                         const fs = require('fs');
-                        const test = fs.readFileSync('build/changelog_errors.txt', 'utf8');
+                        const test = fs.readFileSync('versions/1.8.9/build/changelog_errors.txt', 'utf8');
                         const commentBody = `${test}`
                         
                         github.rest.issues.createComment({
diff --git a/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt b/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt
index 422a62cb1d9b..8ac54d6fc0b1 100644
--- a/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt
+++ b/buildSrc/src/main/kotlin/skyhannibuildsystem/ChangelogVerification.kt
@@ -45,6 +45,7 @@ abstract class ChangelogVerification : DefaultTask() {
 
             // Export errors so that they can be listed in the PR comment
             val errorFile = File(outputDirectory.get().asFile, "changelog_errors.txt")
+            println("saved error file to: ${errorFile.path}")
 
             errorFile.appendText("I have detected some issues with your pull request:\n\n")
 

From 1f35f9f0989b4338edd18248d0240d5a1309dbb7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:58:24 +0200
Subject: [PATCH 715/721] Version 0.28 Beta 2

---
 docs/CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 docs/FEATURES.md  |  6 ++++++
 root.gradle.kts   |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 6f2dcbba0155..a65aebe3eefb 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -15,6 +15,18 @@
 + Added Focus Mode. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2694)
     +  In Focus Mode, only the name of the item is displayed instead of the full description.
 
+#### Fishing Features
+
++ Added Lava Replacement. - HiZe (https://github.com/hannibal002/SkyHanni/pull/1885)
+    +  Replaces the lava texture with the water texture.
+    +  Primarily used for lava fishing in the Crimson Isle, but can be used anywhere else if the option is enabled.
+
+#### Mining Features
+
++ Added Precision Mining Highlighter. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2614)
+    +  Draws a box over the Precision Mining particles.
++ Added highlighting boxes to Crystal Nucleus crystals during Hoppity's Hunt. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2598)
+
 ### Improvements
 
 #### Inventory Improvements
@@ -27,8 +39,20 @@
 + Added support for Guilds in player-related tab completions. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
 + Added support for all Guild and Friend commands in tab completions. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
 
+#### Combat Improvements
+
++ Added Totem of Corruption and Enrager to the Ability Cooldown feature. - DungeonHub (https://github.com/hannibal002/SkyHanni/pull/2706)
+
+#### Misc Improvements
+
++ Added distance display to waypoints created by Patcher's Send Coords feature. - jani (https://github.com/hannibal002/SkyHanni/pull/2704)
+
 ### Fixes
 
+#### Dungeon Fixes
+
++ Fixed Magical Power resetting to 0 when opening "Your Bags" in the Catacombs. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2710)
+
 #### Fishing Fixes
 
 + Fixed fishing displays showing in dungeons. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2697)
@@ -37,11 +61,25 @@
 
 + Fixed "No Guardian Pet warning" not supporting Pet Rule "On open Experimentation Table". - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2699)
 + Fixed an error with compact experiment rewards chat messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2702)
++ Fixed Craft Materials Bazaar not working with long item names. - Fazfoxy (https://github.com/hannibal002/SkyHanni/pull/2703)
++ Fixed the debug feature that allows you to add/remove stars being enabled by default. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2715)
 
 #### Combat Fixes
 
 + Fixed Ghost Counter display appearing while in incorrect areas on the map. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2696)
 
+#### Custom Scoreboard Fixes
+
++ Fixed Custom Scoreboard not showing the Second Barbarian Quest. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2709)
+
+#### Hoppity Fixes
+
++ Fixed the chocolate egg share message sometimes displaying the wrong location name. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/2711)
+
+#### Commands Fixes
+
++ Fixed /shtranslate not working in most cases. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2693)
+
 ### Technical Details
 
 + Assigned 'backend' label to PRs with 'backend' in the title. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2690)
@@ -49,6 +87,13 @@
 + Added SuggestionProvider. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2637)
     +  This new class simplifies building suggestion trees.
 + Added Stats API. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2253)
++ Cleaned up LorenzVec and added drawLineToEye. - Empa (https://github.com/hannibal002/SkyHanni/pull/2056)
++ Added SkyHanni event inheritance. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/2047)
++ Added /shtranslateadvanced command. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2693)
+    +  Allows specifying both the source and target language.
++ Added changelog verification. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2692)
+    +  This action ensures your PR is in the correct format so that it can be used by the release notes tool.
++ Added dungeon phase detection. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1865)
 
 ## Version 0.27
 
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index ed5c74ad3e0b..24c8e437252f 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -376,6 +376,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added an alert for Gold or Diamond Trophy Fish catches. - ReyMaratov (https://github.com/hannibal002/SkyHanni/pull/2615)
     + Displays a popup with the trophy name, rarity, and amount of the catch.
     + Optionally, also plays a sound.
++ Added Lava Replacement. - HiZe (https://github.com/hannibal002/SkyHanni/pull/1885)
+    +  Replaces the lava texture with the water texture.
+    +  Primarily used for lava fishing in the Crimson Isle, but can be used anywhere else if the option is enabled.
 
 </details>
 <details open><summary>
@@ -911,6 +914,9 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added a "Get from Sack" button in the forge recipe menu to retrieve ingredients. - minhperry (https://github.com/hannibal002/SkyHanni/pull/2106)
 + Added Tracker for Glacite Corpses. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2306)
     + Tracks overall loot and loot per type.
++ Added Precision Mining Highlighter. - Cuz_Im_Clicks (https://github.com/hannibal002/SkyHanni/pull/2614)
+    +  Draws a box over the Precision Mining particles.
++ Added highlighting boxes to Crystal Nucleus crystals during Hoppity's Hunt. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2598)
 
 </details>
 <details open><summary>
diff --git a/root.gradle.kts b/root.gradle.kts
index e3af39d26071..f97425b88a97 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.28.Beta.1"
+    version = "0.28.Beta.2"
     repositories {
         mavenCentral()
         mavenLocal()

From ee5b8b22c04e85e8eca2354b27ad979b26a4ad0f Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Sat, 12 Oct 2024 02:10:08 +0200
Subject: [PATCH 716/721] Merge pull request #2724
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improvement: Make Breaking Power chat filter match more than just gem…

* add regex test
---
 .../hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
index 624a2d0c2b95..61658a9de62e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt
@@ -62,10 +62,11 @@ object PowderMiningChatFilter {
 
     /**
      * REGEX-TEST: §cYou need a tool with a §r§aBreaking Power §r§cof §r§66§r§c to mine Ruby Gemstone Block§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!
+     * REGEX-TEST: §cYou need a tool with a §r§aBreaking Power §r§cof §r§64§r§c to mine Mithril§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!
      */
     private val breakingPowerPattern by patternGroup.pattern(
         "warning.breakingpower",
-        "§cYou need a tool with a §r§aBreaking Power §r§cof (?:§.)*\\d+§r§c to mine (Ruby|Amethyst|Jade|Amber|Sapphire|Topaz) Gemstone Block§r§c!.+",
+        "§cYou need a tool with a §r§aBreaking Power §r§cof (?:§.)*\\d+§r§c to mine .+",
     )
 
     /**

From 015352cdc9913a60c544433df1992b5f0e7b7723 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sat, 12 Oct 2024 09:43:39 +0200
Subject: [PATCH 717/721] Fix: Guardian warn text (#2718)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../experimentationtable/ExperimentationTableAPI.kt      | 5 ++++-
 .../inventory/experimentationtable/GuardianReminder.kt   | 9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
index 4965a988324e..be0f08a5bafc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentationTableAPI.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -169,8 +170,10 @@ object ExperimentationTableAPI {
      * REGEX-TEST: §dGuardian
      * REGEX-TEST: §9Guardian§e
      */
-    val petNamePattern by patternGroup.pattern(
+    private val petNamePattern by patternGroup.pattern(
         "guardianpet",
         "§[956d]Guardian.*",
     )
+
+    fun hasGuardianPet(): Boolean = petNamePattern.matches(PetAPI.currentPet)
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
index 32157adf7ebe..03748c5d5d5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/GuardianReminder.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.inventory.experimentationtable
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.PetAPI
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
@@ -12,7 +11,6 @@ import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SoundUtils
@@ -31,7 +29,6 @@ object GuardianReminder {
 
     private val config get() = SkyHanniMod.feature.inventory.experimentationTable
     private var lastInventoryOpen = SimpleTimeMark.farPast()
-    private var lastWarn = SimpleTimeMark.farPast()
     private var lastErrorSound = SimpleTimeMark.farPast()
 
     @SubscribeEvent
@@ -44,10 +41,7 @@ object GuardianReminder {
     }
 
     private fun warn() {
-        if (ExperimentationTableAPI.petNamePattern.matches(PetAPI.currentPet)) return
-
-        if (lastWarn.passedSince() < 5.seconds) return
-        lastWarn = SimpleTimeMark.now()
+        if (ExperimentationTableAPI.hasGuardianPet()) return
 
         ChatUtils.clickToActionOrDisable(
             "Use a §9§lGuardian Pet §efor more Exp in the Experimentation Table.",
@@ -62,6 +56,7 @@ object GuardianReminder {
         if (!isEnabled()) return
         if (InventoryUtils.openInventoryName() != "Experimentation Table") return
         if (lastInventoryOpen.passedSince() > 2.seconds) return
+        if (ExperimentationTableAPI.hasGuardianPet()) return
         val gui = Minecraft.getMinecraft().currentScreen as? GuiContainer ?: return
 
         sendTitle(gui.width, gui.height)

From 37a06d12289f76ee01903454bf47d4a2b9538934 Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sat, 12 Oct 2024 21:27:39 +0200
Subject: [PATCH 718/721] Backend fix: Module Inspection (#2728)

Co-authored-by: Empa <itsempa@users.noreply.github.com>
---
 .live-plugins/module/plugin.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.live-plugins/module/plugin.kts b/.live-plugins/module/plugin.kts
index c0a65d3f431b..f7471e9fd98c 100644
--- a/.live-plugins/module/plugin.kts
+++ b/.live-plugins/module/plugin.kts
@@ -18,6 +18,7 @@ val forgeEvent = "SubscribeEvent"
 val handleEvent = "HandleEvent"
 val skyHanniModule = "SkyHanniModule"
 
+val skyhanniPath = "at.hannibal2.skyhanni"
 val patternGroup = "at.hannibal2.skyhanni.utils.repopatterns.RepoPatternGroup"
 val pattern = "java.util.regex.Pattern"
 
@@ -36,12 +37,17 @@ fun isRepoPattern(property: KtProperty): Boolean {
     return false
 }
 
+fun isFromSkyhanni(declaration: KtNamedDeclaration): Boolean {
+    return declaration.fqName?.asString()?.startsWith(skyhanniPath) ?: false
+}
+
 class ModuleInspectionKotlin : AbstractKotlinInspection() {
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
 
         val visitor = object : KtVisitorVoid() {
 
             override fun visitClass(klass: KtClass) {
+                if (!isFromSkyhanni(klass)) return
                 val hasAnnotation = klass.annotationEntries.any { it.shortName?.asString() == skyHanniModule }
 
                 if (hasAnnotation) {
@@ -54,6 +60,7 @@ class ModuleInspectionKotlin : AbstractKotlinInspection() {
             }
 
             override fun visitObjectDeclaration(declaration: KtObjectDeclaration) {
+                if (!isFromSkyhanni(declaration)) return
                 val hasAnnotation = declaration.annotationEntries.any { it.shortName?.asString() == skyHanniModule }
                 if (hasAnnotation) return
 

From 486231d369a8e2e8cf54f079d6105dac99dec6aa Mon Sep 17 00:00:00 2001
From: Empa <42304516+ItsEmpa@users.noreply.github.com>
Date: Sun, 13 Oct 2024 12:08:11 +0200
Subject: [PATCH 719/721] Improvement + Fix: Ashfang Features with Mob
 Detection (#2112)

Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
---
 .../at/hannibal2/skyhanni/data/EntityData.kt  |  56 ++++----
 .../at/hannibal2/skyhanni/data/mob/Mob.kt     |   4 +-
 .../at/hannibal2/skyhanni/data/mob/MobData.kt |   5 -
 .../skyhanni/data/mob/MobDetection.kt         |  16 ++-
 .../at/hannibal2/skyhanni/events/MobEvent.kt  |   2 -
 .../events/entity/EntityLeaveWorldEvent.kt    |   6 +
 .../features/nether/ashfang/AshfangBlazes.kt  | 124 ------------------
 .../nether/ashfang/AshfangBlazingSouls.kt     |  71 ----------
 .../nether/ashfang/AshfangFreezeCooldown.kt   |  45 ++-----
 .../nether/ashfang/AshfangGravityOrbs.kt      |  75 -----------
 .../ashfang/AshfangHideDamageIndicator.kt     |  34 -----
 .../nether/ashfang/AshfangHideParticles.kt    |  60 ---------
 .../features/nether/ashfang/AshfangHider.kt   |  46 +++++++
 .../nether/ashfang/AshfangHighlights.kt       | 106 +++++++++++++++
 .../features/nether/ashfang/AshfangManager.kt |  93 +++++++++++++
 .../ashfang/AshfangNextResetCooldown.kt       |  53 ++------
 .../mixins/transformers/MixinWorld.java       |  25 ++++
 .../at/hannibal2/skyhanni/utils/ColorUtils.kt |   7 +-
 .../skyhanni/utils/ExtendedChatColor.kt       |   2 +-
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |   9 ++
 20 files changed, 355 insertions(+), 484 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/entity/EntityLeaveWorldEvent.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHider.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHighlights.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangManager.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinWorld.java

diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
index d2f81a6d8191..04147ce7794c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt
@@ -5,9 +5,9 @@ import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent
 import at.hannibal2.skyhanni.events.EntityMaxHealthUpdateEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.events.entity.EntityDisplayNameEvent
 import at.hannibal2.skyhanni.events.entity.EntityHealthDisplayEvent
+import at.hannibal2.skyhanni.events.entity.EntityLeaveWorldEvent
 import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.EntityUtils
@@ -31,27 +31,35 @@ import kotlin.time.Duration.Companion.milliseconds
 @SkyHanniModule
 object EntityData {
 
-    private val maxHealthMap = mutableMapOf<EntityLivingBase, Int>()
+    private val maxHealthMap = mutableMapOf<Int, Int>()
     private val nametagCache = TimeLimitedCache<Entity, ChatComponentText>(50.milliseconds)
     private val healthDisplayCache = TimeLimitedCache<String, String>(50.milliseconds)
 
+    private val ignoredEntities = setOf(
+        EntityArmorStand::class.java,
+        EntityXPOrb::class.java,
+        EntityItem::class.java,
+        EntityItemFrame::class.java,
+        EntityOtherPlayerMP::class.java,
+        EntityPlayerSP::class.java,
+    )
+
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
-        for (entity in EntityUtils.getEntities<EntityLivingBase>()) {
+        for (entity in EntityUtils.getEntities<EntityLivingBase>()) { // this completely ignores the ignored entities list?
             val maxHealth = entity.baseMaxHealth
-            val oldMaxHealth = maxHealthMap.getOrDefault(entity, -1)
+            val id = entity.entityId
+            val oldMaxHealth = maxHealthMap.getOrDefault(id, -1)
             if (oldMaxHealth != maxHealth) {
-                maxHealthMap[entity] = maxHealth
+                maxHealthMap[id] = maxHealth
                 EntityMaxHealthUpdateEvent(entity, maxHealth.derpy()).postAndCatch()
             }
         }
     }
 
-    @SubscribeEvent
-    fun onSecondPassed(event: SecondPassedEvent) {
-        if (event.repeatSeconds(30)) {
-            maxHealthMap.keys.removeIf { it.isDead }
-        }
+    @HandleEvent
+    fun onEntityLeaveWorld(event: EntityLeaveWorldEvent<EntityLivingBase>) {
+        maxHealthMap -= event.entity.entityId
     }
 
     @SubscribeEvent
@@ -69,26 +77,11 @@ object EntityData {
         val entityId = packet.entityId
 
         val entity = EntityUtils.getEntityByID(entityId) ?: return
-        if (entity is EntityArmorStand) return
-        if (entity is EntityXPOrb) return
-        if (entity is EntityItem) return
-        if (entity is EntityItemFrame) return
-
-        if (entity is EntityOtherPlayerMP) return
-        if (entity is EntityPlayerSP) return
-
-        for (watchableObject in watchableObjects) {
-
-            val dataValueId = watchableObject.dataValueId
-            val any = watchableObject.`object`
-            if (dataValueId != 6) continue
-
-            val health = (any as Float).toInt()
-
-            if (entity is EntityWither && health == 300 && entityId < 0) {
-                return
-            }
+        if (entity.javaClass in ignoredEntities) return
 
+        watchableObjects.find { it.dataValueId == 6 }?.let {
+            val health = (it.`object` as Float).toInt()
+            if (entity is EntityWither && health == 300 && entityId < 0) return
             if (entity is EntityLivingBase) {
                 EntityHealthUpdateEvent(entity, health.derpy()).postAndCatch()
             }
@@ -100,6 +93,11 @@ object EntityData {
         return postRenderNametag(entity, oldValue)
     }
 
+    @JvmStatic
+    fun despawnEntity(entity: Entity) {
+        EntityLeaveWorldEvent(entity).post()
+    }
+
     private fun postRenderNametag(entity: Entity, chatComponent: ChatComponentText) = nametagCache.getOrPut(entity) {
         val event = EntityDisplayNameEvent(entity, chatComponent)
         event.postAndCatch()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
index e9eb6729de43..062acc4b3d6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.toSingletonListOrEmpty
 import at.hannibal2.skyhanni.utils.ColorUtils.addAlpha
 import at.hannibal2.skyhanni.utils.EntityUtils.canBeSeen
 import at.hannibal2.skyhanni.utils.EntityUtils.cleanName
+import at.hannibal2.skyhanni.utils.EntityUtils.getArmorInventory
 import at.hannibal2.skyhanni.utils.EntityUtils.isCorrupted
 import at.hannibal2.skyhanni.utils.EntityUtils.isRunic
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
@@ -17,6 +18,7 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.monster.EntityZombie
+import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.util.AxisAlignedBB
 import java.awt.Color
 import java.util.UUID
@@ -111,7 +113,7 @@ class Mob(
 
     fun canBeSeen() = baseEntity.canBeSeen()
 
-    fun isInvisible() = if (baseEntity !is EntityZombie) baseEntity.isInvisible else false
+    fun isInvisible() = baseEntity !is EntityZombie && baseEntity.isInvisible && baseEntity.inventory.isNullOrEmpty()
 
     private var highlightColor: Color? = null
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
index f955384c5f4e..2363945d21df 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
@@ -103,11 +103,6 @@ object MobData {
         notSeenMobs.remove(event.mob)
     }
 
-    @SubscribeEvent
-    fun onMobFirstSeen(event: MobEvent.FirstSeen) {
-        notSeenMobs.remove(event.mob)
-    }
-
     @SubscribeEvent
     fun onSkyblockMobSpawnEvent(event: MobEvent.Spawn.SkyblockMob) {
         skyblockMobs.add(event.mob)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 014e0a846613..b075ab312070 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -159,13 +159,15 @@ object MobDetection {
 
     private fun canBeSeen(mob: Mob): Boolean {
         val isVisible = !mob.isInvisible() && mob.canBeSeen()
-        if (isVisible) when (mob.mobType) {
-            Mob.Type.PLAYER -> MobEvent.FirstSeen.Player(mob)
-            Mob.Type.SUMMON -> MobEvent.FirstSeen.Summon(mob)
-            Mob.Type.SPECIAL -> MobEvent.FirstSeen.Special(mob)
-            Mob.Type.PROJECTILE -> MobEvent.FirstSeen.Projectile(mob)
-            Mob.Type.DISPLAY_NPC -> MobEvent.FirstSeen.DisplayNPC(mob)
-            Mob.Type.BASIC, Mob.Type.DUNGEON, Mob.Type.BOSS, Mob.Type.SLAYER -> MobEvent.FirstSeen.SkyblockMob(mob)
+        if (isVisible) {
+            when (mob.mobType) {
+                Mob.Type.PLAYER -> MobEvent.FirstSeen.Player(mob)
+                Mob.Type.SUMMON -> MobEvent.FirstSeen.Summon(mob)
+                Mob.Type.SPECIAL -> MobEvent.FirstSeen.Special(mob)
+                Mob.Type.PROJECTILE -> MobEvent.FirstSeen.Projectile(mob)
+                Mob.Type.DISPLAY_NPC -> MobEvent.FirstSeen.DisplayNPC(mob)
+                Mob.Type.BASIC, Mob.Type.DUNGEON, Mob.Type.BOSS, Mob.Type.SLAYER -> MobEvent.FirstSeen.SkyblockMob(mob)
+            }.postAndCatch()
         }
         return isVisible
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
index 10172cb5fcd8..07990ff222c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt
@@ -21,8 +21,6 @@ open class MobEvent(val mob: Mob) : LorenzEvent() {
         class Projectile(mob: Mob) : DeSpawn(mob)
     }
 
-    // TODO replace with "isFirstTime" parameter in the Spawn event. Also create an actual "player sees the mob for the first time" event
-    @Deprecated("Old. Will get replaced soon.")
     open class FirstSeen(mob: Mob) : MobEvent(mob) {
         class SkyblockMob(mob: Mob) : FirstSeen(mob)
         class Summon(mob: Mob) : FirstSeen(mob)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityLeaveWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityLeaveWorldEvent.kt
new file mode 100644
index 000000000000..74d885e1190e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityLeaveWorldEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.entity
+
+import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent
+import net.minecraft.entity.Entity
+
+class EntityLeaveWorldEvent<T : Entity>(val entity: T) : GenericSkyHanniEvent<T>(entity.javaClass)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
deleted file mode 100644
index 9c152e1432dd..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package at.hannibal2.skyhanni.features.nether.ashfang
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.IslandType
-import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
-import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha
-import at.hannibal2.skyhanni.utils.EntityUtils
-import at.hannibal2.skyhanni.utils.EntityUtils.getAllNameTagsWith
-import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
-import net.minecraft.entity.EntityLivingBase
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraft.entity.monster.EntityBlaze
-import net.minecraftforge.fml.common.eventhandler.EventPriority
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-@SkyHanniModule
-object AshfangBlazes {
-
-    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang
-
-    private val blazeColor = mutableMapOf<EntityBlaze, LorenzColor>()
-    private var blazeArmorStand = mapOf<EntityBlaze, EntityArmorStand>()
-
-    private var nearAshfang = false
-
-    @SubscribeEvent
-    fun onSecondPassed(event: SecondPassedEvent) {
-        if (!isEnabled()) return
-
-        checkNearAshfang()
-
-        if (nearAshfang) {
-            for (entity in EntityUtils.getEntities<EntityBlaze>()
-                .filter { it !in blazeColor.keys }) {
-                val list = entity.getAllNameTagsWith(2, "Ashfang")
-                if (list.size == 1) {
-                    val armorStand = list[0]
-                    val color = when {
-                        armorStand.name.contains("Ashfang Follower") -> LorenzColor.DARK_GRAY
-                        armorStand.name.contains("Ashfang Underling") -> LorenzColor.RED
-                        armorStand.name.contains("Ashfang Acolyte") -> LorenzColor.BLUE
-                        else -> {
-                            blazeArmorStand = blazeArmorStand.editCopy {
-                                remove(entity)
-                            }
-                            continue
-                        }
-                    }
-                    blazeArmorStand = blazeArmorStand.editCopy {
-                        this[entity] = armorStand
-                    }
-                    entity setBlazeColor color
-                }
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onEntityHealthUpdate(event: EntityHealthUpdateEvent) {
-        if (!isEnabled()) return
-
-        val entityId = event.entity.entityId
-        if (entityId !in blazeArmorStand.keys.map { it.entityId }) return
-
-        if (event.health % 10_000_000 != 0) {
-            blazeArmorStand = blazeArmorStand.editCopy {
-                keys.removeIf { it.entityId == entityId }
-            }
-        }
-    }
-
-    private fun checkNearAshfang() {
-        nearAshfang = EntityUtils.getEntities<EntityArmorStand>().any { it.name.contains("Ashfang") }
-    }
-
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityLivingBase>) {
-        if (!isEnabled()) return
-        if (!config.hide.fullNames) return
-
-        val entity = event.entity
-        if (entity !is EntityArmorStand) return
-        if (!entity.hasCustomName()) return
-        if (entity.isDead) return
-        if (entity in blazeArmorStand.values) {
-            event.cancel()
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        blazeColor.clear()
-        blazeArmorStand = emptyMap()
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(2, "ashfang.nextResetCooldown", "crimsonIsle.ashfang.nextResetCooldown")
-        event.move(2, "ashfang.highlightBlazes", "crimsonIsle.ashfang.highlightBlazes")
-        event.move(2, "ashfang.hideNames", "crimsonIsle.ashfang.hide.fullNames")
-    }
-
-    private fun isEnabled(): Boolean {
-        return IslandType.CRIMSON_ISLE.isInIsland() && DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
-    }
-
-    private infix fun EntityBlaze.setBlazeColor(color: LorenzColor) {
-        blazeColor[this] = color
-        RenderLivingEntityHelper.setEntityColorWithNoHurtTime(
-            this,
-            color.toColor().withAlpha(40),
-        ) { isEnabled() && config.highlightBlazes }
-    }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
deleted file mode 100644
index de4db8f833da..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package at.hannibal2.skyhanni.features.nether.ashfang
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
-import at.hannibal2.skyhanni.events.LorenzTickEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
-import at.hannibal2.skyhanni.utils.EntityUtils
-import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
-import at.hannibal2.skyhanni.utils.LocationUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RenderUtils.drawString
-import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.utils.getLorenzVec
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-@SkyHanniModule
-object AshfangBlazingSouls {
-
-    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang.blazingSouls
-
-    private const val TEXTURE =
-        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODI4N2IzOTdkYWY5NTE2YTBiZDc2ZjVmMWI3YmY5Nzk1MTVkZjNkNWQ4MzNlMDYzNWZhNjhiMzdlZTA4MjIxMiJ9fX0="
-    private val souls = mutableListOf<EntityArmorStand>()
-
-    @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!isEnabled()) return
-
-        EntityUtils.getEntities<EntityArmorStand>()
-            .filter { it !in souls && it.hasSkullTexture(TEXTURE) }
-            .forEach { souls.add(it) }
-    }
-
-    @SubscribeEvent
-    fun onRenderWorld(event: LorenzRenderWorldEvent) {
-        if (!isEnabled()) return
-
-        val color = config.color.toChromaColor()
-
-        val playerLocation = LocationUtils.playerLocation()
-        for (orb in souls) {
-            if (orb.isDead) continue
-            val orbLocation = orb.getLorenzVec()
-            event.drawWaypointFilled(orbLocation.add(-0.5, 1.25, -0.5), color, extraSize = -0.15)
-            if (orbLocation.distance(playerLocation) < 10) {
-                // TODO find way to dynamically change color
-                event.drawString(orbLocation.up(2.5), "§bBlazing Soul")
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        souls.clear()
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(2, "ashfang.blazingSouls", "crimsonIsle.ashfang.blazingSouls.enabled")
-        event.move(2, "ashfang.blazingSoulsColor", "crimsonIsle.ashfang.blazingSouls.color")
-    }
-
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled &&
-        DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt
index 68684ef49ece..07cf723fa6f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt
@@ -1,14 +1,10 @@
 package at.hannibal2.skyhanni.features.nether.ashfang
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
@@ -19,47 +15,35 @@ import kotlin.time.Duration.Companion.seconds
 @SkyHanniModule
 object AshfangFreezeCooldown {
 
-    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang
+    private val config get() = AshfangManager.config
 
     private val cryogenicBlastPattern by RepoPattern.pattern(
         "ashfang.freeze.cryogenic",
-        "§cAshfang Follower's Cryogenic Blast hit you for .* damage!"
+        "§cAshfang Follower's Cryogenic Blast hit you for .* damage!",
     )
 
-    private var lastHit = SimpleTimeMark.farPast()
+    private var unfrozenTime = SimpleTimeMark.farPast()
+    private val duration = 3.seconds
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
-
-        val message = event.message
-        cryogenicBlastPattern.matchMatcher(message) {
-            lastHit = SimpleTimeMark.now()
-        }
+        if (cryogenicBlastPattern.matches(event.message)) unfrozenTime = SimpleTimeMark.now() + duration
     }
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
+        if (!isCurrentlyFrozen()) return
 
-        val passedSince = lastHit.passedSince()
-        val maxDuration = 3.seconds
-        val duration = maxDuration - passedSince
-        if (duration > 0.seconds) {
-            val format = duration.format(showMilliSeconds = true)
-            config.freezeCooldownPos.renderString(
-                "§cAshfang Freeze: §a$format",
-                posLabel = "Ashfang Freeze Cooldown"
-            )
-        }
+        val format = unfrozenTime.timeUntil().format(showMilliSeconds = true)
+        config.freezeCooldownPos.renderString(
+            "§cAshfang Freeze: §a$format",
+            posLabel = "Ashfang Freeze Cooldown",
+        )
     }
 
-    fun isCurrentlyFrozen(): Boolean {
-        val passedSince = lastHit.passedSince()
-        val maxDuration = 3.seconds
-        val duration = maxDuration - passedSince
-        return duration > 0.seconds
-    }
+    fun isCurrentlyFrozen() = unfrozenTime.isInFuture()
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
@@ -67,6 +51,5 @@ object AshfangFreezeCooldown {
         event.move(2, "ashfang.freezeCooldownPos", "crimsonIsle.ashfang.freezeCooldownPos")
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.freezeCooldown &&
-        DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
+    private fun isEnabled() = AshfangManager.active && config.freezeCooldown
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
deleted file mode 100644
index 1eaa1dd5e921..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package at.hannibal2.skyhanni.features.nether.ashfang
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
-import at.hannibal2.skyhanni.events.LorenzTickEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.EntityUtils
-import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
-import at.hannibal2.skyhanni.utils.LocationUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RenderUtils
-import at.hannibal2.skyhanni.utils.RenderUtils.drawString
-import at.hannibal2.skyhanni.utils.SpecialColor
-import at.hannibal2.skyhanni.utils.getLorenzVec
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.awt.Color
-
-@SkyHanniModule
-object AshfangGravityOrbs {
-
-    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang.gravityOrbs
-
-    private const val TEXTURE = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV" +
-        "0L3RleHR1cmUvMWE2OWNjZjdhZDkwNGM5YTg1MmVhMmZmM2Y1YjRlMjNhZGViZjcyZWQxMmQ1ZjI0Yjc4Y2UyZDQ0YjRhMiJ9fX0="
-    private val orbs = mutableListOf<EntityArmorStand>()
-
-    @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!isEnabled()) return
-
-        EntityUtils.getEntities<EntityArmorStand>()
-            .filter { it !in orbs && it.hasSkullTexture(TEXTURE) }
-            .forEach { orbs.add(it) }
-    }
-
-    @SubscribeEvent
-    fun onRenderWorld(event: LorenzRenderWorldEvent) {
-        if (!isEnabled()) return
-
-        val color = Color(SpecialColor.specialToChromaRGB(config.color), true)
-        val playerLocation = LocationUtils.playerLocation()
-        for (orb in orbs) {
-            if (orb.isDead) continue
-            val orbLocation = orb.getLorenzVec()
-            val center = orbLocation.add(-0.5, -2.0, -0.5)
-            RenderUtils.drawCylinderInWorld(color, center.x, center.y, center.z, 3.5f, 4.5f, event.partialTicks)
-
-            if (orbLocation.distance(playerLocation) < 15) {
-                // TODO find way to dynamically change color
-                event.drawString(orbLocation.up(2.5), "§cGravity Orb")
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        orbs.clear()
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(1, "ashfang.gravityOrbs", "ashfang.gravityOrbs.enabled")
-        event.move(1, "ashfang.gravityOrbsColor", "ashfang.gravityOrbs.color")
-
-        event.move(2, "ashfang.gravityOrbs", "crimsonIsle.ashfang.gravityOrbs")
-    }
-
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled &&
-        DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt
deleted file mode 100644
index 606f7d17f8bc..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.hannibal2.skyhanni.features.nether.ashfang
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.entity.EntityLivingBase
-import net.minecraftforge.fml.common.eventhandler.EventPriority
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-@SkyHanniModule
-object AshfangHideDamageIndicator {
-
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityLivingBase>) {
-        if (!isEnabled()) return
-
-        if (DamageIndicatorManager.isDamageSplash(event.entity)) {
-            event.cancel()
-        }
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(2, "ashfang.hideDamageSplash", "crimsonIsle.ashfang.hide.damageSplash")
-    }
-
-    private fun isEnabled() =
-        LorenzUtils.inSkyBlock && SkyHanniMod.feature.crimsonIsle.ashfang.hide.damageSplash &&
-            DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
deleted file mode 100644
index 4c228a436f66..000000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.hannibal2.skyhanni.features.nether.ashfang
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
-import at.hannibal2.skyhanni.events.ReceiveParticleEvent
-import at.hannibal2.skyhanni.events.SecondPassedEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.ItemUtils.name
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraftforge.fml.common.eventhandler.EventPriority
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-@SkyHanniModule
-object AshfangHideParticles {
-
-    private var nearAshfang = false
-
-    @SubscribeEvent
-    fun onSecondPassed(event: SecondPassedEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-
-        nearAshfang = DamageIndicatorManager.getDistanceTo(BossType.NETHER_ASHFANG) < 40
-    }
-
-    @SubscribeEvent
-    fun onReceiveParticle(event: ReceiveParticleEvent) {
-        if (isEnabled()) {
-            event.cancel()
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    fun onCheckRender(event: CheckRenderEntityEvent<*>) {
-        if (!isEnabled()) return
-
-        val entity = event.entity
-        if (entity is EntityArmorStand) {
-            for (stack in entity.inventory) {
-                if (stack == null) continue
-                val name = stack.name
-                if (name == "§aFairy Souls") continue
-                if (name == "Glowstone") {
-                    event.cancel()
-                }
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(2, "ashfang.hideParticles", "crimsonIsle.ashfang.hide.particles")
-    }
-
-    private fun isEnabled() =
-        LorenzUtils.inSkyBlock && SkyHanniMod.feature.crimsonIsle.ashfang.hide.particles && nearAshfang
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHider.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHider.kt
new file mode 100644
index 000000000000..4e40ed77cc64
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHider.kt
@@ -0,0 +1,46 @@
+package at.hannibal2.skyhanni.features.nether.ashfang
+
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
+import at.hannibal2.skyhanni.events.ReceiveParticleEvent
+import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
+import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object AshfangHider {
+
+    private val config get() = AshfangManager.config.hide
+
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityArmorStand>) {
+        if (!AshfangManager.active || !config.damageSplash) return
+
+        if (DamageIndicatorManager.isDamageSplash(event.entity)) {
+            event.cancel()
+        }
+    }
+
+    @SubscribeEvent
+    fun onReceiveParticle(event: ReceiveParticleEvent) {
+        if (!AshfangManager.active || !config.particles) return
+        event.cancel()
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onCheckRender(event: CheckRenderEntityEvent<*>) {
+        if (!AshfangManager.active || !config.particles) return
+        val entity = event.entity as? EntityArmorStand ?: return
+        if (entity.inventory.any { it?.name == "Glowstone" }) event.cancel()
+    }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "ashfang.hideDamageSplash", "crimsonIsle.ashfang.hide.damageSplash")
+        event.move(2, "ashfang.hideParticles", "crimsonIsle.ashfang.hide.particles")
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHighlights.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHighlights.kt
new file mode 100644
index 000000000000..312cfc469cfb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHighlights.kt
@@ -0,0 +1,106 @@
+package at.hannibal2.skyhanni.features.nether.ashfang
+
+import at.hannibal2.skyhanni.api.event.HandleEvent
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.entity.EntityEnterWorldEvent
+import at.hannibal2.skyhanni.events.entity.EntityLeaveWorldEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ColorUtils
+import at.hannibal2.skyhanni.utils.ColorUtils.getExtendedColorCode
+import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColor
+import at.hannibal2.skyhanni.utils.DelayedRun
+import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.RenderUtils.drawCylinderInWorld
+import at.hannibal2.skyhanni.utils.RenderUtils.drawString
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object AshfangHighlights {
+
+    private val config get() = AshfangManager.config
+
+    private const val BLAZING_SOUL =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODI4N2IzOTdkYWY5NTE2YTBiZDc2ZjVmMWI3YmY5Nzk1MTVkZjNkNWQ4MzNlMDYzNWZhNjhiMzdlZTA4MjIxMiJ9fX0="
+    private const val GRAVITY_ORB =
+        "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWE2OWNjZjdhZDkwNGM5YTg1MmVhMmZmM2Y1YjRlMjNhZGViZjcyZWQxMmQ1ZjI0Yjc4Y2UyZDQ0YjRhMiJ9fX0="
+    private val blazingSouls = mutableSetOf<EntityArmorStand>()
+    private val gravityOrbs = mutableSetOf<EntityArmorStand>()
+    private const val MAX_DISTANCE = 15.0
+
+    @HandleEvent(onlyOnSkyblock = true, onlyOnIsland = IslandType.CRIMSON_ISLE)
+    fun onEntityJoin(event: EntityEnterWorldEvent<EntityArmorStand>) {
+        if (!AshfangManager.active) return
+        val entity = event.entity
+        DelayedRun.runNextTick {
+            when {
+                entity.hasSkullTexture(BLAZING_SOUL) -> blazingSouls += entity
+                entity.hasSkullTexture(GRAVITY_ORB) -> gravityOrbs += entity
+            }
+        }
+    }
+
+    @HandleEvent(onlyOnSkyblock = true, onlyOnIsland = IslandType.CRIMSON_ISLE)
+    fun onEntityLeave(event: EntityLeaveWorldEvent<EntityArmorStand>) {
+        blazingSouls -= event.entity
+        gravityOrbs -= event.entity
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!AshfangManager.active) return
+
+        if (config.blazingSouls.enabled) {
+            val color = config.blazingSouls.color.toChromaColor()
+            blazingSouls.forEach {
+                val location = event.exactLocation(it)
+                event.drawWaypointFilled(location.add(-0.5, 1.25, -0.5), color, extraSize = -0.15)
+                event.drawBlendedColorString(location, "Blazing Soul")
+            }
+        }
+
+        if (config.gravityOrbs.enabled) {
+            val color = config.gravityOrbs.color.toChromaColor()
+            gravityOrbs.forEach {
+                val location = event.exactLocation(it)
+                event.drawCylinderInWorld(color, location.add(-0.5, -2.0, -0.5), 3.5f, 4.5f)
+                event.drawBlendedColorString(location, "Gravity Orb")
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        blazingSouls.clear()
+        gravityOrbs.clear()
+    }
+
+    private fun LorenzRenderWorldEvent.drawBlendedColorString(location: LorenzVec, text: String) {
+        val distance = location.distanceToPlayer()
+        if (distance < MAX_DISTANCE) {
+            val colorCode = getColorCode(distance)
+            drawString(location.add(y = 2.5), colorCode + text)
+        }
+    }
+
+    private fun getColorCode(distance: Double): String =
+        ColorUtils.blendRGB(LorenzColor.GREEN.toColor(), LorenzColor.RED.toColor(), distance / MAX_DISTANCE).getExtendedColorCode()
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "ashfang.blazingSouls", "crimsonIsle.ashfang.blazingSouls.enabled")
+        event.move(2, "ashfang.blazingSoulsColor", "crimsonIsle.ashfang.blazingSouls.color")
+
+        event.move(1, "ashfang.gravityOrbs", "ashfang.gravityOrbs.enabled")
+        event.move(1, "ashfang.gravityOrbsColor", "ashfang.gravityOrbs.color")
+        event.move(2, "ashfang.gravityOrbs", "crimsonIsle.ashfang.gravityOrbs")
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangManager.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangManager.kt
new file mode 100644
index 000000000000..edf7dbd6489d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangManager.kt
@@ -0,0 +1,93 @@
+package at.hannibal2.skyhanni.features.nether.ashfang
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
+import at.hannibal2.skyhanni.config.features.crimsonisle.ashfang.AshfangConfig
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.mob.Mob
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.MobEvent
+import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.ColorUtils.addAlpha
+import at.hannibal2.skyhanni.utils.EntityUtils.isAtFullHealth
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.MobUtils.mob
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import net.minecraft.entity.item.EntityArmorStand
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+@SkyHanniModule
+object AshfangManager {
+
+    val config: AshfangConfig get() = SkyHanniMod.feature.crimsonIsle.ashfang
+
+    private val ashfangMobs = mutableSetOf<Mob>()
+    var ashfang: Mob? = null
+        private set
+    var lastSpawnTime = SimpleTimeMark.farPast()
+        private set
+    
+    val active get() = ashfang != null
+
+    @SubscribeEvent
+    fun onMobSpawn(event: MobEvent.Spawn.SkyblockMob) {
+        if (!IslandType.CRIMSON_ISLE.isInIsland()) return
+        val mob = event.mob
+        val color = when (mob.name) {
+            "Ashfang Follower" -> LorenzColor.DARK_GRAY
+            "Ashfang Underling" -> LorenzColor.RED
+            "Ashfang Acolyte" -> LorenzColor.BLUE
+            "Ashfang" -> {
+                ashfang = mob
+                return
+            }
+
+            else -> return
+        }
+        ashfangMobs += mob
+        if (config.highlightBlazes) mob.highlight(color.toColor().addAlpha(40))
+    }
+
+    @SubscribeEvent
+    fun onMobFirstSeen(event: MobEvent.FirstSeen.SkyblockMob) {
+        if (!IslandType.CRIMSON_ISLE.isInIsland()) return
+        if (!event.mob.name.contains("Ashfang ")) return
+        if (lastSpawnTime.passedSince() < 10.seconds) return
+        lastSpawnTime = SimpleTimeMark.now()
+    }
+
+    @SubscribeEvent
+    fun onMobDeSpawn(event: MobEvent.DeSpawn.SkyblockMob) {
+        val mob = event.mob
+        ashfangMobs -= mob
+        if (ashfang == mob) {
+            ashfang = null
+            if (mob.isInRender()) lastSpawnTime = SimpleTimeMark.farPast()
+        }
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityArmorStand>) {
+        if (!active || !config.hide.fullNames) return
+        val mob = event.entity.mob ?: return
+        if (mob !in ashfangMobs) return
+        if (mob.baseEntity.isAtFullHealth()) event.cancel()
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        lastSpawnTime = SimpleTimeMark.farPast()
+    }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "ashfang.nextResetCooldown", "crimsonIsle.ashfang.nextResetCooldown")
+        event.move(2, "ashfang.highlightBlazes", "crimsonIsle.ashfang.highlightBlazes")
+        event.move(2, "ashfang.hideNames", "crimsonIsle.ashfang.hide.fullNames")
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
index c555ec6d29f3..b77301edc06d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
@@ -1,61 +1,33 @@
 package at.hannibal2.skyhanni.features.nether.ashfang
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.LorenzTickEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.features.combat.damageindicator.BossType
-import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
-import at.hannibal2.skyhanni.utils.EntityUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
-import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUnit
 import at.hannibal2.skyhanni.utils.TimeUtils.format
-import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 @SkyHanniModule
 object AshfangNextResetCooldown {
 
-    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang
-    private var spawnTime = SimpleTimeMark.farPast()
-
-    @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!isEnabled()) return
-
-        if (EntityUtils.getEntities<EntityArmorStand>().any {
-                it.posY > 145 && (it.name.contains("§c§9Ashfang Acolyte§r") || it.name.contains("§c§cAshfang Underling§r"))
-            }
-        ) {
-            spawnTime = SimpleTimeMark.now()
-        }
-    }
+    private val config get() = AshfangManager.config
+    private val ashfangResetTime = 46.1.seconds
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
-        if (spawnTime.isFarPast()) return
+        if (AshfangManager.lastSpawnTime.isFarPast()) return
+        val nextSpawn = AshfangManager.lastSpawnTime + ashfangResetTime
 
-        val passedSince = spawnTime.passedSince()
-        if (passedSince < 46.1.seconds) {
-            val format = passedSince.format(TimeUnit.SECOND, showMilliSeconds = true)
-            config.nextResetCooldownPos.renderString(
-                "§cAshfang next reset in: §a$format",
-                posLabel = "Ashfang Reset Cooldown"
-            )
-        } else {
-            spawnTime = SimpleTimeMark.farPast()
-        }
-    }
+        val format = if (nextSpawn.isInPast()) "§aNow!"
+        else "§b${nextSpawn.timeUntil().format(TimeUnit.SECOND, showMilliSeconds = true)}"
 
-    @SubscribeEvent
-    fun onWorldChange(event: LorenzWorldChangeEvent) {
-        spawnTime = SimpleTimeMark.farPast()
+        config.nextResetCooldownPos.renderString(
+            "§cAshfang next reset in: $format",
+            posLabel = "Ashfang Reset Cooldown",
+        )
     }
 
     @SubscribeEvent
@@ -64,8 +36,5 @@ object AshfangNextResetCooldown {
         event.move(2, "ashfang.nextResetCooldownPos", "crimsonIsle.ashfang.nextResetCooldownPos")
     }
 
-    private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && config.nextResetCooldown &&
-            DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG)
-    }
+    private fun isEnabled() = AshfangManager.active && config.nextResetCooldown
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinWorld.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinWorld.java
new file mode 100644
index 000000000000..1569416d4e20
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinWorld.java
@@ -0,0 +1,25 @@
+package at.hannibal2.skyhanni.mixins.transformers;
+
+import at.hannibal2.skyhanni.data.EntityData;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Collection;
+
+@Mixin(World.class)
+public class MixinWorld {
+
+    @Inject(method = "unloadEntities", at = @At("HEAD"))
+    private void unloadEntities(Collection<Entity> entityCollection, CallbackInfo ci) {
+        for (Entity entity : entityCollection) EntityData.despawnEntity(entity);
+    }
+
+    @Inject(method = "onEntityRemoved", at = @At("HEAD"))
+    private void onEntityRemoved(Entity entityIn, CallbackInfo ci) {
+        EntityData.despawnEntity(entityIn);
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
index 7b941aebedc3..52b1eb68da40 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt
@@ -8,7 +8,7 @@ object ColorUtils {
     fun String.toChromaColor() = Color(toChromaColorInt(), true)
     fun String.toChromaColorInt() = SpecialColor.specialToChromaRGB(this)
 
-    fun String.getFirstColorCode() = this.takeIf { it.firstOrNull() == '§' }?.getOrNull(1)
+    fun String.getFirstColorCode() = takeIf { it.firstOrNull() == '§' }?.getOrNull(1)
 
     fun getRed(color: Int) = color shr 16 and 0xFF
 
@@ -24,6 +24,8 @@ object ColorUtils {
         (start.blue * (1 - percent) + end.blue * percent).toInt(),
     )
 
+    fun Color.getExtendedColorCode(hasAlpha: Boolean = false): String = ExtendedChatColor(rgb, hasAlpha).toString()
+
     /** Darkens a color by a [factor]. The lower the [factor], the darker the color. */
     fun Color.darker(factor: Double = 0.7) = Color(
         (red * factor).toInt().coerceIn(0, 255),
@@ -34,7 +36,8 @@ object ColorUtils {
 
     val TRANSPARENT_COLOR = Color(0, 0, 0, 0)
 
-    fun Color.withAlpha(alpha: Int): Int = (alpha.coerceIn(0, 255) shl 24) or (this.rgb and 0x00ffffff)
+    @Deprecated("Don't use int colors", ReplaceWith("this.addAlpha()"))
+    fun Color.withAlpha(alpha: Int): Int = (alpha.coerceIn(0, 255) shl 24) or (rgb and 0x00ffffff)
 
     fun Color.addAlpha(alpha: Int): Color = Color(red, green, blue, alpha)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ExtendedChatColor.kt b/src/main/java/at/hannibal2/skyhanni/utils/ExtendedChatColor.kt
index f4a64017d55b..e4cb2f448161 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ExtendedChatColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ExtendedChatColor.kt
@@ -4,7 +4,7 @@ import java.awt.Color
 
 class ExtendedChatColor(
     val rgb: Int,
-    val hasAlpha: Boolean,
+    val hasAlpha: Boolean = false,
 ) {
     override fun toString(): String {
         val stringBuilder = StringBuilder()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 14241f314a32..47bdb3976441 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -768,6 +768,15 @@ object RenderUtils {
         GlStateManager.popMatrix()
     }
 
+    fun LorenzRenderWorldEvent.drawCylinderInWorld(
+        color: Color,
+        location: LorenzVec,
+        radius: Float,
+        height: Float,
+    ) {
+        drawCylinderInWorld(color, location.x, location.y, location.z, radius, height, partialTicks)
+    }
+
     fun drawCylinderInWorld(
         color: Color,
         x: Double,

From 6f52ce2e3e42ac794c28a8a6eb7f0ae04553b1f6 Mon Sep 17 00:00:00 2001
From: Stella <stellaarnott1@gmail.com>
Date: Sun, 13 Oct 2024 03:43:48 -0700
Subject: [PATCH 720/721] Feature: Terminal Waypoints (#2719)

Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: Empa <itsempa@users.noreply.github.com>
Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/commands/Commands.kt      |  5 ++
 .../features/dungeon/DungeonConfig.java       |  6 ++
 .../features/dungeon/DungeonBossAPI.kt        |  5 +-
 .../features/dungeon/floor7/TerminalInfo.kt   | 52 +++++++++++++++++
 .../dungeon/floor7/TerminalWaypoints.kt       | 56 +++++++++++++++++++
 5 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalInfo.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalWaypoints.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index bd94a16587f1..c5a28679e394 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.features.commands.PartyChatCommands
 import at.hannibal2.skyhanni.features.commands.PartyCommands
 import at.hannibal2.skyhanni.features.commands.WikiManager
 import at.hannibal2.skyhanni.features.dungeon.CroesusChestTracker
+import at.hannibal2.skyhanni.features.dungeon.floor7.TerminalInfo
 import at.hannibal2.skyhanni.features.event.diana.AllBurrowsList
 import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper
 import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker
@@ -501,6 +502,10 @@ object Commands {
             "shdebugscoreboard",
             "Monitors the scoreboard changes: Prints the raw scoreboard lines in the console after each update, with time since last update.",
         ) { ScoreboardData.toggleMonitor() }
+        registerCommand(
+            "shresetterminal",
+            "Resets terminal highlights in F7.",
+        ) { TerminalInfo.resetTerminals() }
     }
 
     @Suppress("LongMethod")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
index ec2bc0c4b0f9..0be6c1e853f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java
@@ -138,6 +138,12 @@ public class DungeonConfig {
     @FeatureToggle
     public boolean shadowAssassinJumpNotifier = false;
 
+    @Expose
+    @ConfigOption(name = "Terminal Waypoints", desc = "Displays Waypoints in the F7/M7 Goldor Phase.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean terminalWaypoints = false;
+
     @Expose
     @ConfigOption(name = "Dungeon Races Guide", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt
index 5a7d0ff313a8..d30553a28581 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossAPI.kt
@@ -29,6 +29,9 @@ object DungeonBossAPI {
         F7_GOLDOR_5,
         F7_NECRON,
         M7_WITHER_KING,
+        ;
+
+        fun isCurrent(): Boolean = bossPhase == this
     }
 
     private val patternGroup = RepoPattern.group("dungeon.boss.message")
@@ -86,7 +89,7 @@ object DungeonBossAPI {
      * REGEX-TEST: §bmartimavocado§r§a completed a device! (§r§c3§r§a/8)
      * REGEX-TEST: §bmartimavocado§r§a activated a terminal! (§r§c4§r§a/7)
      */
-    private val goldorTerminalPattern by patternGroup.pattern(
+    val goldorTerminalPattern by patternGroup.pattern(
         "f7.goldor.terminalcomplete",
         "§.(?<playerName>\\w+)§r§a (?:activated|completed) a (?<type>lever|terminal|device)! \\(§r§c(?<currentTerminal>\\d)§r§a/(?<total>\\d)\\)",
     )
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalInfo.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalInfo.kt
new file mode 100644
index 000000000000..bd7b8a4ee7a6
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalInfo.kt
@@ -0,0 +1,52 @@
+package at.hannibal2.skyhanni.features.dungeon.floor7
+
+import at.hannibal2.skyhanni.features.dungeon.DungeonBossAPI
+import at.hannibal2.skyhanni.utils.LorenzVec
+
+private typealias BossPhase = DungeonBossAPI.DungeonBossPhase
+
+enum class TerminalInfo(val location: LorenzVec, val phase: BossPhase, val text: String) {
+    P1_TERMINAL_1(LorenzVec(111, 113, 73), BossPhase.F7_GOLDOR_1, "Terminal"),
+    P1_TERMINAL_2(LorenzVec(111, 119, 79), BossPhase.F7_GOLDOR_1, "Terminal"),
+    P1_TERMINAL_3(LorenzVec(89, 112, 92), BossPhase.F7_GOLDOR_1, "Terminal"),
+    P1_TERMINAL_4(LorenzVec(89, 122, 101), BossPhase.F7_GOLDOR_1, "Terminal"),
+    P1_LEVER_1(LorenzVec(106, 124, 113), BossPhase.F7_GOLDOR_1, "Lever"),
+    P1_LEVER_2(LorenzVec(94, 124, 113), BossPhase.F7_GOLDOR_1, "Lever"),
+    P1_DEVICE(LorenzVec(110, 119, 93), BossPhase.F7_GOLDOR_1, "Device"),
+
+    P2_TERMINAL_1(LorenzVec(68, 109, 121), BossPhase.F7_GOLDOR_2, "Terminal"),
+    P2_TERMINAL_2(LorenzVec(59, 120, 122), BossPhase.F7_GOLDOR_2, "Terminal"),
+    P2_TERMINAL_3(LorenzVec(47, 109, 121), BossPhase.F7_GOLDOR_2, "Terminal"),
+    P2_TERMINAL_4(LorenzVec(40, 124, 122), BossPhase.F7_GOLDOR_2, "Terminal"),
+    P2_TERMINAL_5(LorenzVec(39, 108, 143), BossPhase.F7_GOLDOR_2, "Terminal"),
+    P2_LEVER_1(LorenzVec(23, 132, 138), BossPhase.F7_GOLDOR_2, "Lever"),
+    P2_LEVER_2(LorenzVec(27, 124, 127), BossPhase.F7_GOLDOR_2, "Lever"),
+    P2_DEVICE(LorenzVec(60, 131, 142), BossPhase.F7_GOLDOR_2, "Device"),
+
+    P3_TERMINAL_1(LorenzVec(-3, 109, 112), BossPhase.F7_GOLDOR_3, "Terminal"),
+    P3_TERMINAL_2(LorenzVec(-3, 119, 93), BossPhase.F7_GOLDOR_3, "Terminal"),
+    P3_TERMINAL_3(LorenzVec(19, 123, 93), BossPhase.F7_GOLDOR_3, "Terminal"),
+    P3_TERMINAL_4(LorenzVec(-3, 109, 77), BossPhase.F7_GOLDOR_3, "Terminal"),
+    P3_LEVER_1(LorenzVec(14, 122, 55), BossPhase.F7_GOLDOR_3, "Lever"),
+    P3_LEVER_2(LorenzVec(2, 122, 55), BossPhase.F7_GOLDOR_3, "Lever"),
+    P3_DEVICE(LorenzVec(-2, 119, 77), BossPhase.F7_GOLDOR_3, "Device"),
+
+    P4_TERMINAL_1(LorenzVec(41, 109, 29), BossPhase.F7_GOLDOR_4, "Terminal"),
+    P4_TERMINAL_2(LorenzVec(44, 121, 29), BossPhase.F7_GOLDOR_4, "Terminal"),
+    P4_TERMINAL_3(LorenzVec(67, 109, 29), BossPhase.F7_GOLDOR_4, "Terminal"),
+    P4_TERMINAL_4(LorenzVec(72, 115, 48), BossPhase.F7_GOLDOR_4, "Terminal"),
+    P4_LEVER_1(LorenzVec(84, 121, 34), BossPhase.F7_GOLDOR_4, "Lever"),
+    P4_LEVER_2(LorenzVec(86, 128, 46), BossPhase.F7_GOLDOR_4, "Lever"),
+    P4_DEVICE(LorenzVec(63, 126, 35), BossPhase.F7_GOLDOR_4, "Device"),
+    ;
+
+    var highlight: Boolean = true
+
+    companion object {
+        fun resetTerminals() = entries.forEach { it.highlight = true }
+
+        fun getClosestTerminal(input: LorenzVec): TerminalInfo? {
+            return entries.filter { it.highlight }.minByOrNull { it.location.distance(input) }
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalWaypoints.kt
new file mode 100644
index 000000000000..f8479507a402
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/floor7/TerminalWaypoints.kt
@@ -0,0 +1,56 @@
+package at.hannibal2.skyhanni.features.dungeon.floor7
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
+import at.hannibal2.skyhanni.features.dungeon.DungeonBossAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.EntityUtils
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.getLorenzVec
+import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+@SkyHanniModule
+object TerminalWaypoints {
+
+    private val config get() = SkyHanniMod.feature.dungeon
+
+    @SubscribeEvent
+    fun onRenderWorld(event: LorenzRenderWorldEvent) {
+        if (!isEnabled()) return
+
+        for (term in TerminalInfo.entries) {
+            if (!term.highlight || !term.phase.isCurrent()) continue
+            event.drawWaypointFilled(term.location, LorenzColor.GREEN.toColor(), seeThroughBlocks = true)
+            event.drawDynamicText(term.location, term.text, 1.0)
+        }
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        TerminalInfo.resetTerminals()
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!inBoss()) return
+
+        val playerName = DungeonBossAPI.goldorTerminalPattern.matchMatcher(event.message) {
+            group("playerName")
+        } ?: return
+
+        val playerEntity = EntityUtils.getEntities<EntityPlayerMP>().find { it.name == playerName } ?: return
+        val terminal = TerminalInfo.getClosestTerminal(playerEntity.getLorenzVec())
+        terminal?.highlight = false
+    }
+
+    private fun inBoss() = DungeonAPI.inBossRoom && DungeonAPI.isOneOf("F7", "M7")
+
+    private fun isEnabled() = inBoss() && config.terminalWaypoints
+}

From d8bb53773ba3f1e36e8822e58f3175c2847f7b61 Mon Sep 17 00:00:00 2001
From: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Date: Sun, 13 Oct 2024 06:45:06 -0400
Subject: [PATCH 721/721] Fix: Farming Weight Overlay (#2731)

---
 .../features/garden/farming/FarmingWeightDisplay.kt      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 3da9945b59d9..640661bd9797 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -360,12 +360,9 @@ object FarmingWeightDisplay {
         )
     }
 
-    private fun isEnabled() = (
-        config.display && (
-            OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock
-            ) ||
-            (LorenzUtils.inSkyBlock && (GardenAPI.inGarden() || config.showOutsideGarden))
-        )
+    private fun isEnabled() = config.display && (outsideEnabled() || inGardenEnabled())
+    private fun outsideEnabled() = OutsideSbFeature.FARMING_WEIGHT.isSelected() && !LorenzUtils.inSkyBlock
+    private fun inGardenEnabled() = (LorenzUtils.inSkyBlock && GardenAPI.inGarden()) || config.showOutsideGarden
 
     private fun isEtaEnabled() = config.overtakeETA