From 59366daaa6ccdad237ab5f8949aef45a686e048f Mon Sep 17 00:00:00 2001
From: alexia <me@alexia.lol>
Date: Tue, 16 Jan 2024 16:13:14 +0100
Subject: [PATCH 01/46] Fix daily city project reminder triggering for released
 projects (#928)

Fixed Daily City Project Reminder still working on already released projects. #928
---
 .../features/fame/CityProjectFeatures.kt      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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 62aa76289f73..5bd8be726858 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt
@@ -21,8 +21,10 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.TimeUtils
 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.client.gui.inventory.GuiEditSign
@@ -35,8 +37,15 @@ class CityProjectFeatures {
     private var inInventory = false
     private var lastReminderSend = 0L
 
-    // TODO USE SH-REPO
-    private val contributeAgainPattern = "§7Contribute again: §e(?<time>.*)".toPattern()
+    private val patternGroup = RepoPattern.group("fame.projects")
+    private val contributeAgainPattern by patternGroup.pattern(
+        "contribute",
+        "§7Contribute again: §e(?<time>.*)"
+    )
+    private val completedPattern by patternGroup.pattern(
+        "completed",
+        "§aProject is (?:being built|released)!"
+    )
 
     companion object {
         private val config get() = SkyHanniMod.feature.event.cityProject
@@ -104,7 +113,8 @@ class CityProjectFeatures {
                 val itemName = item.name ?: continue
 
                 val lore = item.getLore()
-                if (lore.lastOrNull() == "§aProject is being built!") continue
+                val completed = lore.lastOrNull()?.let { completedPattern.matches(it) } ?: false
+                if (completed) continue
                 for (line in lore) {
                     contributeAgainPattern.matchMatcher(line) {
                         val rawTime = group("time")
@@ -163,7 +173,8 @@ class CityProjectFeatures {
     private fun fetchMaterials(item: ItemStack, materials: MutableMap<String, Int>) {
         var next = false
         val lore = item.getLore()
-        if (lore.lastOrNull() == "§aProject is being built!") return
+        val completed = lore.lastOrNull()?.let { completedPattern.matches(it) } ?: false
+        if (completed) return
         for (line in lore) {
             if (line == "§7Cost") {
                 next = true

From 69cfa25c720884f44d6ed99e24d2eb4176f09e37 Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Tue, 16 Jan 2024 09:23:55 -0600
Subject: [PATCH 02/46] Cleanup calculate() (#689)

Cleanup calculate() in Estimated Item Value. #689
---
 .../items/EstimatedItemValueCalculator.kt     | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 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 c7a70f12ce25..6014130658ce 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
@@ -56,48 +56,47 @@ import java.util.Locale
 
 object EstimatedItemValueCalculator {
     private val config get() = SkyHanniMod.feature.misc.estimatedItemValues
-
-    fun calculate(stack: ItemStack, list: MutableList<String>): Pair<Double, Double> {
-        var totalPrice = 0.0
-        val basePrice = addBaseItem(stack, list)
-        totalPrice += basePrice
-
-        totalPrice += addAttributeCost(stack, list)
-
-        totalPrice += addReforgeStone(stack, list)
+    private val additionalCostFunctions = listOf(
+        ::addAttributeCost,
+        ::addReforgeStone,
 
         // once
-        totalPrice += addRecomb(stack, list)
-        totalPrice += addArtOfWar(stack, list)
-        totalPrice += addArtOfPeace(stack, list)
-        totalPrice += addEtherwarp(stack, list)
-        totalPrice += addPowerScrolls(stack, list)
-        totalPrice += addWoodSingularity(stack, list)
-        totalPrice += addJalapenoBook(stack, list)
-        totalPrice += addStatsBook(stack, list)
-        totalPrice += addEnrichment(stack, list)
+        ::addRecomb,
+        ::addArtOfWar,
+        ::addArtOfPeace,
+        ::addEtherwarp,
+        ::addPowerScrolls,
+        ::addWoodSingularity,
+        ::addJalapenoBook,
+        ::addStatsBook,
+        ::addEnrichment,
 
         // counted
-        totalPrice += addMasterStars(stack, list)
-        totalPrice += addHotPotatoBooks(stack, list)
-        totalPrice += addFarmingForDummies(stack, list)
-        totalPrice += addSilex(stack, list)
-        totalPrice += addTransmissionTuners(stack, list)
-        totalPrice += addManaDisintegrators(stack, list)
-        totalPrice += addPolarvoidBook(stack, list)
-        totalPrice += addBookwormBook(stack, list)
+        ::addMasterStars,
+        ::addHotPotatoBooks,
+        ::addFarmingForDummies,
+        ::addSilex,
+        ::addTransmissionTuners,
+        ::addManaDisintegrators,
+        ::addPolarvoidBook,
+        ::addBookwormBook,
 
         // cosmetic
-        totalPrice += addHelmetSkin(stack, list)
-        totalPrice += addArmorDye(stack, list)
-        totalPrice += addRune(stack, list)
+        ::addHelmetSkin,
+        ::addArmorDye,
+        ::addRune,
 
         // dynamic
-        totalPrice += addAbilityScrolls(stack, list)
-        totalPrice += addDrillUpgrades(stack, list)
-        totalPrice += addGemstoneSlotUnlockCost(stack, list)
-        totalPrice += addGemstones(stack, list)
-        totalPrice += addEnchantments(stack, list)
+        ::addAbilityScrolls,
+        ::addDrillUpgrades,
+        ::addGemstoneSlotUnlockCost,
+        ::addGemstones,
+        ::addEnchantments
+    )
+
+    fun calculate(stack: ItemStack, list: MutableList<String>): Pair<Double, Double> {
+        val basePrice = addBaseItem(stack, list)
+        val totalPrice = additionalCostFunctions.fold(basePrice) { total, function -> total + function(stack, list) }
         return Pair(totalPrice, basePrice)
     }
 

From ec1aefdaae5490d264d4d932394896f861981045 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:02:43 +0100
Subject: [PATCH 03/46] Feature: Pet Item Display (#850)

Show Pet Items Xp Share core and Tier Boost as small icon next to the pet in an inventory. #850
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  4 +++
 .../config/features/misc/pets/PetConfig.java  | 32 +++++++++++++++++++
 .../skyhanni/features/misc/PetItemDisplay.kt  | 28 ++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index f584951dfa81..16499a6a9e7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -248,6 +248,7 @@ import at.hannibal2.skyhanni.features.misc.PartyMemberOutlines
 import at.hannibal2.skyhanni.features.misc.PatcherSendCoordinates
 import at.hannibal2.skyhanni.features.misc.PetCandyUsedDisplay
 import at.hannibal2.skyhanni.features.misc.PetExpTooltip
+import at.hannibal2.skyhanni.features.misc.PetItemDisplay
 import at.hannibal2.skyhanni.features.misc.PlayerChatSymbols
 import at.hannibal2.skyhanni.features.misc.PocketSackInASackDisplay
 import at.hannibal2.skyhanni.features.misc.QuickModMenuSwitch
@@ -370,6 +371,7 @@ import org.apache.logging.log4j.Logger
     version = "0.23.Beta.8",
 )
 class SkyHanniMod {
+
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent?) {
         checkIfNeuIsLoaded()
@@ -578,6 +580,7 @@ class SkyHanniMod {
         loadModule(MinionCollectLogic())
         loadModule(BetterSignEditing())
         loadModule(PatcherSendCoordinates())
+        loadModule(PetItemDisplay())
         loadModule(EstimatedItemValue)
         loadModule(EstimatedWardrobePrice())
         loadModule(ComposterInventoryNumbers())
@@ -757,6 +760,7 @@ class SkyHanniMod {
     }
 
     companion object {
+
         const val MODID = "skyhanni"
 
         @JvmStatic
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 265c26a2941d..cf5cda6541f5 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
@@ -5,7 +5,11 @@
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class PetConfig {
     @Expose
@@ -28,4 +32,32 @@ public class PetConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean hideAutopet = false;
+
+    @Expose
+    @ConfigOption(name = "Show Pet Item", desc = "Specifies the pet items for which icons should be displayed next to pets.")
+    @ConfigEditorDraggableList
+    public List<PetItemsDisplay> petItemDisplay = new ArrayList<>(Arrays.asList(
+        PetItemsDisplay.XP_SHARE,
+        PetItemsDisplay.TIER_BOOST
+    ));
+
+    public enum PetItemsDisplay {
+        XP_SHARE("§5⚘", "Exp Share", "PET_ITEM_EXP_SHARE"),
+        TIER_BOOST("§c●", "Tier Boost", "PET_ITEM_TIER_BOOST"),
+        ;
+        private final String str;
+        public final String icon;
+        public final String item;
+
+        PetItemsDisplay(String icon, String name, String item) {
+            this.icon = icon;
+            this.item = item;
+            this.str = icon + " §ffor " + name;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
new file mode 100644
index 000000000000..35d0c81ccf19
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
@@ -0,0 +1,28 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiRenderItemEvent
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.drawSlotText
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPetItem
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class PetItemDisplay {
+
+    private val configList get() = SkyHanniMod.feature.misc.pets.petItemDisplay
+
+    @SubscribeEvent
+    fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
+        val stack = event.stack ?: return
+        if (!LorenzUtils.inSkyBlock || stack.stackSize != 1) return
+        if (configList.isEmpty()) return
+
+        val petItem = stack.getPetItem() ?: return
+        val icon = configList.firstOrNull { it.item == petItem }?.icon ?: return
+
+        val x = event.x + 17
+        val y = event.y - 1
+
+        event.drawSlotText(x, y, icon, .9f)
+    }
+}

From b43be2f141e96e98c334371eccc17a823f26696c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:11:54 +0100
Subject: [PATCH 04/46] using sendTitle from lorenz utils everywhere

---
 src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt    | 6 +++---
 .../skyhanni/features/fishing/SeaCreatureFeatures.kt        | 5 ++---
 src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt    | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
index 3de2298a695f..8cd45d76d995 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
@@ -19,9 +19,9 @@ class TitleManager {
         private var display = ""
         private var endTime = SimpleTimeMark.farPast()
         private var heightModifier = 1.8
-        private var fontSizeModifier = 4.0
+        private var fontSizeModifier = 4f
 
-        fun sendTitle(text: String, duration: Duration, height: Double = 1.8, fontSize: Double = 4.0) {
+        fun sendTitle(text: String, duration: Duration, height: Double, fontSize: Float) {
             display = "§f$text"
             endTime = SimpleTimeMark.now() + duration
             heightModifier = height
@@ -36,7 +36,7 @@ class TitleManager {
 
             val duration = args[0].toInt().seconds
             val height = args[1].toDouble()
-            val fontSize = args[2].toDouble()
+            val fontSize = args[2].toFloat()
             val title = "§6" + args.drop(3).joinToString(" ").replace("&", "§")
 
             sendTitle(title, duration, height, fontSize)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
index c02643a65eb1..0d9bbb9c9a92 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.data.TitleManager
 import at.hannibal2.skyhanni.events.EntityMaxHealthUpdateEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RenderEntityOutlineEvent
@@ -59,7 +58,7 @@ class SeaCreatureFeatures {
 
             if (config.alertOtherCatches && lastRareCatch.passedSince() > 1.seconds) {
                 val creature = SeaCreatureManager.allFishingMobs[creatureType.nametag]
-                TitleManager.sendTitle("${creature?.rarity?.chatColorCode ?: "§6"}RARE SEA CREATURE!", 1.5.seconds, 3.6, 7.0)
+                LorenzUtils.sendTitle("${creature?.rarity?.chatColorCode ?: "§6"}RARE SEA CREATURE!", 1.5.seconds, 3.6, 7f)
                 if (config.playSound) SoundUtils.playBeepSound()
             }
         }
@@ -71,7 +70,7 @@ class SeaCreatureFeatures {
         if (!config.alertOwnCatches) return
 
         if (event.seaCreature.rare) {
-            TitleManager.sendTitle("${event.seaCreature.rarity.chatColorCode}RARE CATCH!", 3.seconds, 2.8, 7.0)
+            LorenzUtils.sendTitle("${event.seaCreature.rarity.chatColorCode}RARE CATCH!", 3.seconds, 2.8, 7f)
             if (config.playSound) SoundUtils.playBeepSound()
             lastRareCatch = SimpleTimeMark.now()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index aa1b8e95db62..f931e0f1d0f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -639,8 +639,8 @@ object LorenzUtils {
     fun <T> T.conditionalTransform(condition: Boolean, ifTrue: T.() -> Any, ifFalse: T.() -> Any) =
         if (condition) ifTrue(this) else ifFalse(this)
 
-    fun sendTitle(text: String, duration: Duration, height: Double = 1.8) {
-        TitleManager.sendTitle(text, duration, height)
+    fun sendTitle(text: String, duration: Duration, height: Double = 1.8, fontSize: Float = 4f) {
+        TitleManager.sendTitle(text, duration, height, fontSize)
     }
 
     @Deprecated("Dont use this approach at all. check with regex or equals instead.", ReplaceWith("Regex or equals"))

From a0579007f8723ec6a29b7f9c626a9768c7ba2f6a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:12:28 +0100
Subject: [PATCH 05/46] adding comments

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

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 2d97c05641a0..3614eb39dc6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -63,6 +63,7 @@ object SkyBlockItemModifierUtils {
         return data.petCandies
     }
 
+    // TODO use NeuInternalName here
     fun ItemStack.getPetItem(): String? {
         val data = cachedData
         if (data.heldItem == "") {

From c1586dec2e458388b8b669995bcac8a9bdafba95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Wed, 17 Jan 2024 19:19:20 +0100
Subject: [PATCH 06/46] Add annotations to MC classes (#930)

---
 build.gradle.kts    |  6 +++++
 settings.gradle.kts |  1 +
 shots.txt           | 56 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 shots.txt

diff --git a/build.gradle.kts b/build.gradle.kts
index 0b8bebb1ba1d..3573835f37d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     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("moe.nea.shot") version "1.0.0"
 }
 
 group = "at.hannibal2.skyhanni"
@@ -68,6 +69,8 @@ val headlessLwjgl by configurations.creating {
     isVisible = false
 }
 
+val shot = shots.shot("minecraft", project.file("shots.txt"))
+
 dependencies {
     minecraft("com.mojang:minecraft:1.8.9")
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
@@ -117,6 +120,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     testImplementation("io.mockk:mockk:1.12.5")
 }
+configurations.getByName("minecraftNamed").dependencies.forEach {
+    shot.applyTo(it as HasConfigurableAttributes<*>)
+}
 
 tasks.withType(Test::class) {
     useJUnitPlatform()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 616c8c8a9d20..12734a34a3e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,6 +7,7 @@ pluginManagement {
         maven("https://maven.fabricmc.net")
         maven("https://maven.minecraftforge.net/")
         maven("https://repo.spongepowered.org/maven/")
+        maven("https://repo.nea.moe/releases")
         maven("https://repo.sk1er.club/repository/maven-releases/")
     }
     resolutionStrategy {
diff --git a/shots.txt b/shots.txt
new file mode 100644
index 000000000000..db77870c875c
--- /dev/null
+++ b/shots.txt
@@ -0,0 +1,56 @@
+net.minecraft.client.entity.EntityPlayerSP:
+    sendQueue:
+        annotate org.jetbrains.annotations.NotNull
+net.minecraft.client.Minecraft:
+    renderEngine:
+        annotate org.jetbrains.annotations.NotNull
+    renderGlobal:
+        annotate org.jetbrains.annotations.NotNull
+    thePlayer:
+        annotate org.jetbrains.annotations.Nullable
+    pointedEntity:
+        annotate org.jetbrains.annotations.Nullable
+    effectRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    fontRendererObj:
+        annotate org.jetbrains.annotations.NotNull
+    standardGalacticFontRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    currentScreen:
+        annotate org.jetbrains.annotations.Nullable
+    entityRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    guiAchievement:
+        annotate org.jetbrains.annotations.NotNull
+    ingameGUI:
+        annotate org.jetbrains.annotations.NotNull
+    objectMouseOver:
+        annotate org.jetbrains.annotations.Nullable
+    gameSettings:
+        annotate org.jetbrains.annotations.NotNull
+    mouseHelper:
+        annotate org.jetbrains.annotations.NotNull
+    mcDataDir:
+        annotate org.jetbrains.annotations.NotNull
+    frameTimer:
+        annotate org.jetbrains.annotations.NotNull
+    mcProfiler:
+        annotate org.jetbrains.annotations.NotNull
+    mcDefaultResourcePack:
+        annotate org.jetbrains.annotations.NotNull
+    theWorld:
+        annotate org.jetbrains.annotations.Nullable
+    <init>(net.minecraft.client.main.GameConfiguration):
+        annotateParameter 0 org.jetbrains.annotations.NotNull
+    getFrameBuffer():
+        annotate org.jetbrains.annotations.NotNull
+    getVersion():
+        annotate org.jetbrains.annotations.NotNull
+    drawSplashScreen(net.minecraft.client.renderer.texture.TextureManager):
+        annotate org.jetbrains.annotations.NotNull
+    getSaveLoader():
+        annotate org.jetbrains.annotations.NotNull
+    displayGuiScreen(net.minecraft.client.gui.GuiScreen):
+        annotateParameter 0 org.jetbrains.annotations.Nullable
+    getMusicTicker():
+        annotate org.jetbrains.annotations.NotNull

From 9929b1b60f22a087369d7a8560d5388f8168872c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 17 Jan 2024 21:59:35 +0100
Subject: [PATCH 07/46] Fixing Ghost Entities.

---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  4 +-
 .../config/features/misc/MiscConfig.java      |  6 ++
 .../features/misc/FixGhostEntities.kt         | 58 +++++++++++++++++++
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   |  4 +-
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 16499a6a9e7c..cb9e5f1a330c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -232,6 +232,7 @@ import at.hannibal2.skyhanni.features.misc.CurrentPetDisplay
 import at.hannibal2.skyhanni.features.misc.CustomTextBox
 import at.hannibal2.skyhanni.features.misc.ExpOrbsOnGroundHider
 import at.hannibal2.skyhanni.features.misc.FandomWikiFromMenus
+import at.hannibal2.skyhanni.features.misc.FixGhostEntities
 import at.hannibal2.skyhanni.features.misc.FixNEUHeavyPearls
 import at.hannibal2.skyhanni.features.misc.HideArmor
 import at.hannibal2.skyhanni.features.misc.InGameDateDisplay
@@ -368,7 +369,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.8",
+    version = "0.23.Beta.9",
 )
 class SkyHanniMod {
 
@@ -710,6 +711,7 @@ class SkyHanniMod {
 
         // test stuff
         loadModule(SkyHanniDebugsAndTests())
+        loadModule(FixGhostEntities)
         loadModule(CopyNearbyParticlesCommand)
         loadModule(ButtonOnPause())
         loadModule(PacketTest())
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 69db7f53d1b0..9b3f414172b0 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
@@ -229,4 +229,10 @@ public class MiscConfig {
 
     @Expose
     public int limboTimePB = 0;
+
+    @Expose
+    @ConfigOption(name = "Fix Ghost Entities", desc = "Removes ghost entities caused by a Hypixel bug.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean fixGhostEntities = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
new file mode 100644
index 000000000000..69a1c6ee6ee1
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -0,0 +1,58 @@
+package at.hannibal2.skyhanni.features.misc
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.events.PacketEvent
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer
+import net.minecraft.network.play.server.S0FPacketSpawnMob
+import net.minecraft.network.play.server.S13PacketDestroyEntities
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+/**
+ * This feature fixes ghost entities sent by hypixel that are not properly deleted in the correct order.
+ * E.g. Diana or Dingeon mobs or nametags.
+ */
+object FixGhostEntities {
+
+    private val config get() = SkyHanniMod.feature.misc
+
+    private var recentlyRemovedEntities = ArrayDeque<Int>()
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        recentlyRemovedEntities = ArrayDeque()
+    }
+
+    @SubscribeEvent
+    fun onReceiveCurrentShield(event: PacketEvent.ReceiveEvent) {
+        if (!isEnabled()) return
+
+        val packet = event.packet
+
+        if (packet is S0CPacketSpawnPlayer) {
+            if (packet.entityID in recentlyRemovedEntities) {
+                event.cancel()
+                LorenzUtils.debug("Removed bugged hypixel mob id Player")
+            }
+        }
+
+        if (packet is S0FPacketSpawnMob) {
+            if (packet.entityID in recentlyRemovedEntities) {
+                event.cancel()
+                LorenzUtils.debug("Removed bugged hypixel mob id Mob")
+            }
+        }
+
+        if (packet is S13PacketDestroyEntities) {
+            for (entityID in packet.entityIDs) {
+                recentlyRemovedEntities.add(entityID)
+                if (recentlyRemovedEntities.size == 10) {
+                    recentlyRemovedEntities.removeFirst()
+                }
+            }
+        }
+    }
+
+    fun isEnabled() = LorenzUtils.connectedToHypixel && config.fixGhostEntities
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index f931e0f1d0f4..c86dd3688d26 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -52,7 +52,9 @@ import kotlin.time.Duration.Companion.seconds
 
 object LorenzUtils {
 
-    val onHypixel get() = (HypixelData.hypixelLive || HypixelData.hypixelAlpha) && Minecraft.getMinecraft().thePlayer != null
+    val connectedToHypixel get() = HypixelData.hypixelLive || HypixelData.hypixelAlpha
+
+    val onHypixel get() = connectedToHypixel && Minecraft.getMinecraft().thePlayer != null
 
     val isOnAlphaServer get() = onHypixel && HypixelData.hypixelAlpha
 

From 326ab83e6890d6015ebf7a04cf03dcc0c5d9eb2b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 17 Jan 2024 22:02:26 +0100
Subject: [PATCH 08/46] better explanations

---
 .../at/hannibal2/skyhanni/config/features/misc/MiscConfig.java | 3 ++-
 .../at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt    | 2 +-
 2 files changed, 3 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 9b3f414172b0..757e5495b49c 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
@@ -231,7 +231,8 @@ public class MiscConfig {
     public int limboTimePB = 0;
 
     @Expose
-    @ConfigOption(name = "Fix Ghost Entities", desc = "Removes ghost entities caused by a Hypixel bug.")
+    @ConfigOption(name = "Fix Ghost Entities", desc = "Removes ghost entities caused by a Hypixel bug. " +
+            "This included Diana, Dungeon and Crimson Isle mobs and nametags.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean fixGhostEntities = true;
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 69a1c6ee6ee1..c489700a693c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 /**
  * This feature fixes ghost entities sent by hypixel that are not properly deleted in the correct order.
- * E.g. Diana or Dingeon mobs or nametags.
+ * This included Diana, Dungeon and Crimson Isle mobs and nametags.
  */
 object FixGhostEntities {
 

From 6336b78e1800a483b16bc8782db19d342f12252c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 17 Jan 2024 22:03:43 +0100
Subject: [PATCH 09/46] removed debug message

---
 .../at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt     | 2 --
 1 file changed, 2 deletions(-)

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 c489700a693c..dc8c267ee49c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -33,14 +33,12 @@ object FixGhostEntities {
         if (packet is S0CPacketSpawnPlayer) {
             if (packet.entityID in recentlyRemovedEntities) {
                 event.cancel()
-                LorenzUtils.debug("Removed bugged hypixel mob id Player")
             }
         }
 
         if (packet is S0FPacketSpawnMob) {
             if (packet.entityID in recentlyRemovedEntities) {
                 event.cancel()
-                LorenzUtils.debug("Removed bugged hypixel mob id Mob")
             }
         }
 

From 9b489cf827aacd0dccf079793e2e74b0b4d9aa51 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 17 Jan 2024 22:19:21 +0100
Subject: [PATCH 10/46] code cleanup

---
 .../hannibal2/skyhanni/features/misc/FixGhostEntities.kt  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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 dc8c267ee49c..acd68022c419 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -34,15 +34,11 @@ object FixGhostEntities {
             if (packet.entityID in recentlyRemovedEntities) {
                 event.cancel()
             }
-        }
-
-        if (packet is S0FPacketSpawnMob) {
+        } else if (packet is S0FPacketSpawnMob) {
             if (packet.entityID in recentlyRemovedEntities) {
                 event.cancel()
             }
-        }
-
-        if (packet is S13PacketDestroyEntities) {
+        } else if (packet is S13PacketDestroyEntities) {
             for (entityID in packet.entityIDs) {
                 recentlyRemovedEntities.add(entityID)
                 if (recentlyRemovedEntities.size == 10) {

From a97d183a0718f6d8520432dff40e7cc09cbb08bd Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 17 Jan 2024 22:19:32 +0100
Subject: [PATCH 11/46] not yet

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

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index cb9e5f1a330c..3685ba22f54b 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -369,7 +369,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.9",
+    version = "0.23.Beta.8",
 )
 class SkyHanniMod {
 

From 72153ec78a94bcedd26e9087b4f5713f2bcf69c7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 16:12:47 +0100
Subject: [PATCH 12/46] Changed griffin burrow guess text to a centered title
 instead of a odd line that goes down.

---
 .../hannibal2/skyhanni/data/TitleManager.kt   |  9 +++++++
 .../features/event/diana/BurrowWarpHelper.kt  |  7 ++++-
 .../event/diana/GriffinBurrowHelper.kt        | 27 ++++++++++++-------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
index 8cd45d76d995..275a6f9f7e77 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt
@@ -11,23 +11,32 @@ import net.minecraft.client.renderer.GlStateManager
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class TitleManager {
 
     companion object {
+        private var originalText = ""
         private var display = ""
         private var endTime = SimpleTimeMark.farPast()
         private var heightModifier = 1.8
         private var fontSizeModifier = 4f
 
         fun sendTitle(text: String, duration: Duration, height: Double, fontSize: Float) {
+            originalText = text
             display = "§f$text"
             endTime = SimpleTimeMark.now() + duration
             heightModifier = height
             fontSizeModifier = fontSize
         }
 
+        fun optionalResetTitle(condition: (String) -> Boolean) {
+            if (condition(originalText)) {
+                sendTitle("", 1.milliseconds, 1.8, 4f)
+            }
+        }
+
         fun command(args: Array<String>) {
             if (args.size < 4) {
                 LorenzUtils.userError("Usage: /shsendtitle <duration> <height> <fontSize> <text ..>")
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 64219be36737..1125b8c8c76d 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
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.TitleManager
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -31,6 +32,10 @@ class BurrowWarpHelper {
                 lastWarpTime = SimpleTimeMark.now()
                 LorenzUtils.sendCommandToServer("warp " + currentWarp?.name)
                 lastWarp = currentWarp
+                GriffinBurrowHelper.lastTitleSentTime = SimpleTimeMark.now() + 2.seconds
+                TitleManager.optionalResetTitle {
+                    it.startsWith("§bWarp to ")
+                }
             }
         }
     }
@@ -88,7 +93,7 @@ class BurrowWarpHelper {
 
     enum class WarpPoint(
         val displayName: String,
-        private val location: LorenzVec,
+        val location: LorenzVec,
         private val extraBlocks: Int,
         val ignored: () -> Boolean = { false },
         var unlocked: Boolean = true,
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 da26ce43f9b9..a940403fbfc2 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
@@ -24,8 +24,8 @@ 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.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.exactPlayerEyeLocation
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Blocks
@@ -41,6 +41,7 @@ object GriffinBurrowHelper {
     private var particleBurrows = mapOf<LorenzVec, BurrowType>()
 
     private var lastGuessTime = 0L
+    var lastTitleSentTime = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
@@ -153,7 +154,7 @@ object GriffinBurrowHelper {
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!isEnabled()) return
-        sendTip(event)
+        showWarpSuggestions()
 
         val playerLocation = LocationUtils.playerLocation()
         if (config.inquisitorSharing.enabled) {
@@ -180,13 +181,14 @@ object GriffinBurrowHelper {
             }
         }
 
+        val currentWarp = BurrowWarpHelper.currentWarp
         if (config.lineToNext) {
             val player = event.exactPlayerEyeLocation()
 
             var color: LorenzColor?
-            val renderLocation = if (BurrowWarpHelper.currentWarp != null) {
+            val renderLocation = if (currentWarp != null) {
                 color = LorenzColor.AQUA
-                player.add(y = -5)
+                currentWarp.location
             } else {
                 color = LorenzColor.WHITE
                 targetLocation?.add(0.5, 0.5, 0.5) ?: return
@@ -196,7 +198,9 @@ object GriffinBurrowHelper {
                 color = particleBurrows[targetLocation]!!.color
                 3
             } else 2
-            event.draw3DLine(player, renderLocation, color.toColor(), lineWidth, false)
+            if (currentWarp == null) {
+                event.draw3DLine(player, renderLocation, color.toColor(), lineWidth, false)
+            }
         }
 
         if (InquisitorWaypointShare.waypoints.isNotEmpty() && config.inquisitorSharing.focusInquisitor) {
@@ -218,7 +222,7 @@ object GriffinBurrowHelper {
                 val guessLocation = findBlock(it)
                 val distance = guessLocation.distance(playerLocation)
                 event.drawColor(guessLocation, LorenzColor.WHITE, distance > 10)
-                val color = if (BurrowWarpHelper.currentWarp == null) "§f" else "§b"
+                val color = if (currentWarp == null) "§f" else "§b"
                 event.drawDynamicText(guessLocation.add(y = 1), "${color}Guess", 1.5)
                 if (distance > 5) {
                     val formattedDistance = LorenzUtils.formatInteger(distance.toInt())
@@ -233,18 +237,20 @@ object GriffinBurrowHelper {
         event.move(2, "diana", "event.diana")
     }
 
-    private fun sendTip(event: LorenzRenderWorldEvent) {
-
+    private fun showWarpSuggestions() {
         if (!config.burrowNearestWarp) return
         val warp = BurrowWarpHelper.currentWarp ?: return
 
-        val location = event.exactPlayerEyeLocation().add(y = -5)
+
         val text = "§bWarp to " + warp.displayName
         val keybindSuffix = if (config.keyBindWarp != Keyboard.KEY_NONE) {
             val keyname = KeyboardManager.getKeyName(config.keyBindWarp)
             " §7(§ePress $keyname§7)"
         } else ""
-        event.drawString(location, text + keybindSuffix, true)
+        if (lastTitleSentTime.passedSince() > 2.seconds) {
+            lastTitleSentTime = SimpleTimeMark.now()
+            LorenzUtils.sendTitle(text + keybindSuffix, 2.seconds, fontSize = 3f)
+        }
     }
 
     private fun isEnabled() = DianaAPI.isDoingDiana()
@@ -276,6 +282,7 @@ object GriffinBurrowHelper {
                 LorenzUtils.chat("Manually reset all burrow waypoints.")
                 return
             }
+
             "1", "start" -> BurrowType.START
             "2", "mob" -> BurrowType.MOB
             "3", "treasure" -> BurrowType.TREASURE

From 59153335492f16d1220e2ce6057bfa5c204c4e0d Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 16:14:10 +0100
Subject: [PATCH 13/46] code cleanup

---
 .../at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 acd68022c419..bb273efe7b20 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt
@@ -40,7 +40,7 @@ object FixGhostEntities {
             }
         } else if (packet is S13PacketDestroyEntities) {
             for (entityID in packet.entityIDs) {
-                recentlyRemovedEntities.add(entityID)
+                recentlyRemovedEntities.addLast(entityID)
                 if (recentlyRemovedEntities.size == 10) {
                     recentlyRemovedEntities.removeFirst()
                 }

From ff75f3d0da65a06e9bde3afccb898326186c5317 Mon Sep 17 00:00:00 2001
From: alexia <me@alexia.lol>
Date: Thu, 18 Jan 2024 16:15:10 +0100
Subject: [PATCH 14/46] Fix names of Crystal Hollows mining areas (#931)

Fixed names of Crystal Hollows Mining Areas feature. #931
---
 .../mining/crystalhollows/CrystalHollowsNamesInCore.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt
index b1682baadfde..4647866e8580 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt
@@ -14,10 +14,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class CrystalHollowsNamesInCore {
     private val config get() = SkyHanniMod.feature.mining
     private val coreLocations = mapOf(
-        LorenzVec(550, 116, 550) to "§8Precursor City",
+        LorenzVec(550, 116, 550) to "§8Precursor Remnants",
         LorenzVec(552, 116, 474) to "§bMithril Deposits",
         LorenzVec(477, 116, 476) to "§aJungle",
-        LorenzVec(474, 116, 554) to "§6Goblin Hideout"
+        LorenzVec(474, 116, 554) to "§6Goblin Holdout"
     )
 
     private var showWaypoints = false

From 9827e764ea8e686d8e0a7b1d5b320da7ce85c227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Thu, 18 Jan 2024 16:50:17 +0100
Subject: [PATCH 15/46] feat: Party kick with reason (#874)

Party kick with reason #874
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 ++
 .../features/commands/CommandsConfig.java     |  6 +++++
 .../features/commands/PartyCommands.kt        | 22 +++++++++++++++
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   | 27 ++++++++++++++-----
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 3685ba22f54b..c1ef48932e1c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -343,6 +343,7 @@ import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
 import at.hannibal2.skyhanni.utils.EntityOutlineRenderer
 import at.hannibal2.skyhanni.utils.KeyboardManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging
 import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
@@ -445,6 +446,7 @@ class SkyHanniMod {
         loadModule(SackAPI)
         loadModule(BingoAPI)
         loadModule(FishingAPI)
+        loadModule(LorenzUtils)
 
         // features
         loadModule(BazaarOrderHelper())
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 777d543a3148..f6ff5ade2fb7 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
@@ -25,6 +25,12 @@ public class CommandsConfig {
     @FeatureToggle
     public boolean shortCommands = true;
 
+    @ConfigOption(name = "Party Kick Reason", desc = "Kick people while sending a reason when using §e/pk lrg89 Dupe Archer§7 or §e/party kick nea89o Low Cata Level§7.")
+    @Expose
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean partyKickReason = true;
+
     @Expose
     @ConfigOption(name = "Replace Warp Is", desc = "Adds §e/warp is §7alongside §e/is§7. Idk why. Ask §cKaeso")
     @ConfigEditorBoolean
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 fea58deefd17..79df780dbd4b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
@@ -4,6 +4,7 @@ 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.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -26,6 +27,8 @@ object PartyCommands {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
         if (args.isEmpty()) return
+        if (args.size > 1 && config.partyKickReason)
+            LorenzUtils.sendCommandToServer("pc Kicking ${args[0]}: ${args.drop(1).joinToString(" ").trim()}")
         LorenzUtils.sendCommandToServer("party kick ${args[0]}")
     }
 
@@ -46,6 +49,25 @@ object PartyCommands {
         LorenzUtils.sendCommandToServer("party promote ${args[0]}")
     }
 
+    @SubscribeEvent
+    fun onSendCommand(event: MessageSendToServerEvent) {
+        if (!config.partyKickReason) {
+            return
+        }
+        if (!event.message.startsWith("/party kick ", ignoreCase = true)
+            && !event.message.startsWith("/p kick ", ignoreCase = true)) {
+            return
+        }
+        val args = event.message.split(" ")
+        if (args.size < 3) return
+        val kickedPlayer = args[2]
+        val kickReason = args.drop(3).joinToString(" ").trim()
+        if (kickReason.isEmpty()) return
+        event.cancel()
+        LorenzUtils.sendCommandToServer("pc Kicking $kickedPlayer: $kickReason")
+        LorenzUtils.sendCommandToServer("p kick $kickedPlayer")
+    }
+
     fun customTabComplete(command: String): List<String>? {
         if (command == "pk" || command == "pt" || command == "pp" && config.shortCommands) {
             return PartyAPI.partyMembers
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index c86dd3688d26..9e8fc6b8e3e0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.MayorElection
 import at.hannibal2.skyhanni.data.TitleManager
+import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiEditSign
 import at.hannibal2.skyhanni.test.TestBingo
@@ -26,6 +27,7 @@ import net.minecraft.event.HoverEvent
 import net.minecraft.launchwrapper.Launch
 import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.FMLCommonHandler
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import java.lang.reflect.Constructor
 import java.lang.reflect.Field
@@ -34,6 +36,8 @@ import java.text.DecimalFormat
 import java.text.NumberFormat
 import java.text.SimpleDateFormat
 import java.util.Collections
+import java.util.LinkedList
+import java.util.Queue
 import java.util.Timer
 import java.util.TimerTask
 import java.util.WeakHashMap
@@ -48,6 +52,7 @@ import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.starProjectedType
 import kotlin.reflect.jvm.isAccessible
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 object LorenzUtils {
@@ -371,18 +376,28 @@ object LorenzUtils {
         return this
     }
 
-    private var lastMessageSent = 0L
+    private var lastMessageSent = SimpleTimeMark.farPast()
+    private val sendQueue: Queue<String> = LinkedList()
+
+    @SubscribeEvent
+    fun sendQueuedChatMessages(event: LorenzTickEvent) {
+        val player = Minecraft.getMinecraft().thePlayer
+        if (player == null) {
+            sendQueue.clear()
+            return
+        }
+        if (lastMessageSent.passedSince() > 300.milliseconds) {
+            player.sendChatMessage(sendQueue.poll() ?: return)
+            lastMessageSent = SimpleTimeMark.now()
+        }
+    }
 
     fun sendCommandToServer(command: String) {
         sendMessageToServer("/$command")
     }
 
     fun sendMessageToServer(message: String) {
-        if (System.currentTimeMillis() > lastMessageSent + 1_000) {
-            lastMessageSent = System.currentTimeMillis()
-            val thePlayer = Minecraft.getMinecraft().thePlayer
-            thePlayer.sendChatMessage(message)
-        }
+        sendQueue.add(message)
     }
 
     // MoulConfig is in Java, I don't want to downgrade this logic

From 1f76e3ac81571dca35b710df62de25e8f4956da2 Mon Sep 17 00:00:00 2001
From: alexia <me@alexia.lol>
Date: Thu, 18 Jan 2024 17:10:24 +0100
Subject: [PATCH 16/46] Check if sneaking for optimal speed in garden (#898)

Check if sneaking for optimal speed in garden and show  current speed when wrong. #898
---
 .../features/garden/GardenOptimalSpeed.kt     | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

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 9e83f8ba8697..3e5888868272 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.garden
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GardenToolChangeEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign
@@ -15,18 +16,36 @@ 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
 
 class GardenOptimalSpeed {
     private val config get() = GardenAPI.config.optimalSpeeds
     private val configCustomSpeed get() = config.customSpeed
-    private var currentSpeed = 100
+    private var sneakingTime = 0.seconds
+    private val sneaking get() = Minecraft.getMinecraft().thePlayer.isSneaking
+    private val sneakingPersistent get() = sneakingTime > 5.seconds
+    private var _currentSpeed = 100
+    private var currentSpeed: Int
+        get() = (_currentSpeed * (if (sneaking) 0.3 else 1.0)).toInt()
+        set(value) {
+            _currentSpeed = value
+        }
     private var optimalSpeed = -1
     private val currentSpeedPattern = " Speed: §r§f✦(?<speed>.*)".toPattern()
     private var lastWarnTime = 0L
     private var cropInHand: CropType? = null
     private var rancherOverlayList: List<List<Any?>> = emptyList()
 
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (sneaking) {
+            sneakingTime += 50.milliseconds
+        } else {
+            sneakingTime = 0.seconds
+        }
+    }
+
     @SubscribeEvent
     fun onTabListUpdate(event: TabListUpdateEvent) {
         for (line in event.tabList) {
@@ -84,9 +103,14 @@ class GardenOptimalSpeed {
 
         if (GardenAPI.hideExtraGuis()) return
 
-        val text = "Optimal Speed: §f$optimalSpeed"
+        var text = "Optimal Speed: §f$optimalSpeed"
         if (optimalSpeed != currentSpeed) {
+            text += " (§eCurrent: §f$currentSpeed"
+            if (sneaking) text += " §7[Sneaking]"
+            text += "§f)"
+
             if (config.showOnHUD) config.pos.renderString("§c$text", posLabel = "Garden Optimal Speed")
+            if (sneaking && !sneakingPersistent) return
             warn()
         } else {
             if (config.showOnHUD) config.pos.renderString("§a$text", posLabel = "Garden Optimal Speed")
@@ -102,7 +126,11 @@ class GardenOptimalSpeed {
         lastWarnTime = System.currentTimeMillis()
         LorenzUtils.sendTitle("§cWrong speed!", 3.seconds)
         cropInHand?.let {
-            LorenzUtils.chat("Wrong speed for ${it.cropName}: §f$currentSpeed §e(§f$optimalSpeed §eis optimal)")
+            var text = "Wrong speed for ${it.cropName}: §f$currentSpeed"
+            if (sneaking) text += " §7[Sneaking]"
+            text += " §e(§f$optimalSpeed §eis optimal)"
+
+            LorenzUtils.chat(text)
         }
     }
 

From 0ea3a11fcb7a76fdfc539d049e3e323306500d60 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:44:42 +0100
Subject: [PATCH 17/46] Add fire sale ended message to Fire Sale Chat Hider.

---
 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 18849f415bca..54fb67c0c2e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -305,6 +305,7 @@ class ChatFilter {
         "§c\\s*♨ .* (?:Skin|Rune) §e(?:for a limited time )?\\(.* §eleft\\)(?:§c|!)".toPattern(),
         "§c♨ §eVisit the Community Shop in the next §c.* §eto grab yours! §a§l\\[WARP]".toPattern(),
         "§c♨ §eA Fire Sale for .* §eis starting soon!".toPattern(),
+        "§c♨ §r§eFire Sale for .* §r§eended!".toPattern(),
     )
     private val powderMiningMessages = listOf(
         "§aYou uncovered a treasure chest!",

From 3d3f1f8cc911d02cfdc89074a8b49866f1db5085 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:59:48 +0100
Subject: [PATCH 18/46] Fixed Fire Veil Wand circle shows on left clicking.

---
 .../at/hannibal2/skyhanni/data/ItemClickData.kt |  2 +-
 .../itemabilities/FireVeilWandParticles.kt      | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
index 0219634b4133..f4621877a013 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt
@@ -31,7 +31,7 @@ class ItemClickData {
         if (packet is C07PacketPlayerDigging && packet.status == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK) {
             val position = packet.position.toLorenzVec()
             BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).postAndCatch()
-            ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.RIGHT_CLICK).postAndCatch()
+            ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).postAndCatch()
         }
         if (packet is C0APacketAnimation) {
             ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).postAndCatch()
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 2bbf8050254c..3841df89992e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
@@ -13,22 +13,23 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
 
 class FireVeilWandParticles {
     private val config get() = SkyHanniMod.feature.itemAbilities.fireVeilWands
+    private val item by lazy { "FIRE_VEIL_WAND".asInternalName() }
 
-    private var lastClick = 0L
-
-    val item by lazy { "FIRE_VEIL_WAND".asInternalName() }
+    private var lastClick = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onChatPacket(event: ReceiveParticleEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (config.display == DisplayEntry.PARTICLES) return
-        if (System.currentTimeMillis() > lastClick + 5_500) return
+        if (lastClick.passedSince() > 5.5.seconds) return
         if (event.type == EnumParticleTypes.FLAME && event.speed == 0.55f) {
             event.isCanceled = true
         }
@@ -38,11 +39,10 @@ class FireVeilWandParticles {
     fun onItemClick(event: ItemClickEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (event.clickType != ClickType.RIGHT_CLICK) return
-
-        val internalName = event.itemInHand?.getInternalName() ?: return
+        val internalName = event.itemInHand?.getInternalName()
 
         if (internalName == item) {
-            lastClick = System.currentTimeMillis()
+            lastClick = SimpleTimeMark.now()
         }
     }
 
@@ -50,10 +50,9 @@ class FireVeilWandParticles {
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (config.display != DisplayEntry.LINE) return
-        if (System.currentTimeMillis() > lastClick + 5_500) return
+        if (lastClick.passedSince() > 5.5.seconds) return
 
         val color = config.displayColor.toChromaColor()
-
         RenderUtils.drawCircle(Minecraft.getMinecraft().thePlayer, event.partialTicks, 3.5, color)
     }
 

From 4c83ab3595adf8af8588c2bca3b4f7e472b62af0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:47:22 +0100
Subject: [PATCH 19/46] Add DebugDataCollectEvent and add Diana Burrow Nearest
 Warp to /shdebugdata

---
 .../skyhanni/events/DebugDataCollectEvent.kt  | 26 ++++++++++++
 .../features/event/diana/BurrowWarpHelper.kt  | 41 ++++++++++++++++---
 .../event/diana/GriffinBurrowHelper.kt        |  2 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  5 ++-
 4 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
new file mode 100644
index 000000000000..1cb72c4f83f7
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
@@ -0,0 +1,26 @@
+package at.hannibal2.skyhanni.events
+
+class DebugDataCollectEvent(private val builder: StringBuilder) : LorenzEvent() {
+
+    private var currentTitle = ""
+
+    fun title(title: String) {
+        if (currentTitle != "") error("Title already set")
+
+        currentTitle = title
+    }
+
+    fun exit(text: String) {
+        addData(listOf(text))
+    }
+
+    fun addData(text: List<String>) {
+        if (currentTitle == "") error("Title not set")
+
+        builder.append("\n$currentTitle\n")
+        for (line in text) {
+            builder.append(" $line\n")
+        }
+        currentTitle = ""
+    }
+}
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 1125b8c8c76d..396501104cb7 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
@@ -2,11 +2,13 @@ package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.TitleManager
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzUtils.sorted
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -63,22 +65,49 @@ class BurrowWarpHelper {
         currentWarp = null
     }
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Diana Burrow Nearest Warp")
+
+        if (!DianaAPI.isDoingDiana()) {
+            event.exit("not doing diana")
+            return
+        }
+        if (!config.burrowNearestWarp) {
+            event.exit("disabled in config")
+            return
+        }
+        val target = GriffinBurrowHelper.targetLocation
+        if (target == null) {
+            event.exit("targetLocation is null")
+            return
+        }
+
+        val list = mutableListOf<String>()
+        shouldUseWarps(target, list)
+        event.addData(list)
+    }
+
     companion object {
         private val config get() = SkyHanniMod.feature.event.diana
         var currentWarp: WarpPoint? = null
 
-        fun shouldUseWarps(target: LorenzVec) {
+        fun shouldUseWarps(target: LorenzVec, debug: MutableList<String>? = null) {
+            debug?.add("target: ${target.printWithAccuracy(1)}")
             val playerLocation = LocationUtils.playerLocation()
+            debug?.add("playerLocation: ${playerLocation.printWithAccuracy(1)}")
             val warpPoint = getNearestWarpPoint(target)
+            debug?.add("warpPoint: ${warpPoint.displayName}")
 
             val playerDistance = playerLocation.distance(target)
+            debug?.add("playerDistance: ${playerDistance.round(1)}")
             val warpDistance = warpPoint.distance(target)
+            debug?.add("warpDistance: ${warpDistance.round(1)}")
             val difference = playerDistance - warpDistance
-            currentWarp = if (difference > 10) {
-                warpPoint
-            } else {
-                null
-            }
+            debug?.add("difference: ${difference.round(1)}")
+            val setWarpPoint = difference > 10
+            debug?.add("setWarpPoint: $setWarpPoint")
+            currentWarp = if (setWarpPoint) warpPoint else null
         }
 
         private fun getNearestWarpPoint(location: LorenzVec) =
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 a940403fbfc2..2d88024fc503 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
@@ -36,7 +36,7 @@ import kotlin.time.Duration.Companion.seconds
 object GriffinBurrowHelper {
     private val config get() = SkyHanniMod.feature.event.diana
 
-    private var targetLocation: LorenzVec? = null
+    var targetLocation: LorenzVec? = null
     private var guessLocation: LorenzVec? = null
     private var particleBurrows = mapOf<LorenzVec, BurrowType>()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 1adf858c7423..a648144fe917 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.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.core.config.Position
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.SlayerAPI
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -400,8 +401,10 @@ class SkyHanniDebugsAndTests {
                     builder.append(" isInCorrectArea: ${SlayerAPI.isInCorrectArea}\n")
                     builder.append(" isInAnyArea: ${SlayerAPI.isInAnyArea}\n")
                 }
-
             }
+
+            DebugDataCollectEvent(builder).postAndCatch()
+
             builder.append("```")
             OSUtils.copyToClipboard(builder.toString())
             LorenzUtils.chat("§eCopied SkyHanni debug data to clipboard.")

From 829aea323a35e88384e2e258049b5c74c7fafb7e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:53:16 +0100
Subject: [PATCH 20/46] /shdebugwaypoint -> /shtestwaypoint & /shdebugtablist
 -> /shtesttablist & /shdebugdata -> /shdebug

---
 .../at/hannibal2/skyhanni/config/commands/Commands.kt     | 8 ++++----
 .../at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt  | 2 +-
 2 files changed, 5 insertions(+), 5 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 dd08c4f93b7f..2f70c7e5589e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -262,8 +262,8 @@ object Commands {
             "Search or reset config elements §c(warning, dangerous!)"
         ) { SkyHanniConfigSearchResetCommand.command(it) }
         registerCommand(
-            "shdebugdata",
-            "Prints debug data in the clipboard"
+            "shdebug",
+            "Copies SkyHanni debug data in the clipboard."
         ) { SkyHanniDebugsAndTests.debugData(it) }
         registerCommand(
             "shversion",
@@ -322,8 +322,8 @@ object Commands {
             "shfindnullconfig",
             "Find config elements that are null and prints them into the console"
         ) { SkyHanniDebugsAndTests.findNullConfig(it) }
-        registerCommand("shdebugwaypoint", "Mark a waypoint on that location") { SkyHanniDebugsAndTests.waypoint(it) }
-        registerCommand("shdebugtablist", "Set your clipboard as a fake tab list.") { TabListData.toggleDebugCommand() }
+        registerCommand("shtestwaypoint", "Set a waypoint on that location") { SkyHanniDebugsAndTests.waypoint(it) }
+        registerCommand("shtesttablist", "Set your clipboard as a fake tab list.") { TabListData.toggleDebugCommand() }
         registerCommand("shreloadlocalrepo", "Reloading the local repo data") { SkyHanniMod.repo.reloadLocalRepo() }
         registerCommand("shchathistory", "Show the unfiltered chat history") { ChatManager.openChatFilterGUI() }
         registerCommand(
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index a648144fe917..e611757c35c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -407,7 +407,7 @@ class SkyHanniDebugsAndTests {
 
             builder.append("```")
             OSUtils.copyToClipboard(builder.toString())
-            LorenzUtils.chat("§eCopied SkyHanni debug data to clipboard.")
+            LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
         }
 
         fun copyItemInternalName() {

From fc19b7274edc318de60bc9628f1e87d36f285c63 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:18:53 +0100
Subject: [PATCH 21/46] moving dungeons and slayer related debug data into
 DebugDataCollectEvent. allowing to hide or search for specific debug data
 with /shdebug <search>

---
 .../at/hannibal2/skyhanni/data/SlayerAPI.kt   | 22 +++++++++++-
 .../skyhanni/events/DebugDataCollectEvent.kt  | 24 ++++++++++---
 .../skyhanni/features/dungeon/DungeonAPI.kt   | 24 +++++++++++++
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 34 +++++++------------
 4 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 2a6b99297f73..2829bcb8d92f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.SlayerChangeEvent
@@ -62,13 +63,32 @@ object SlayerAPI {
         return result
     }
 
-    fun getNameWithEnchantmentFor(internalName: NEUInternalName): String {
+    private fun getNameWithEnchantmentFor(internalName: NEUInternalName): String {
         if (internalName.asString() == "WISP_POTION") {
             return "§fWisp's Ice-Flavored Water"
         }
         return internalName.getItemStack().nameWithEnchantment ?: error("Could not find name for $internalName")
     }
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Slayer")
+
+        if (!hasActiveSlayerQuest()) {
+            event.exit("no active slayer quest")
+            return
+        }
+
+        event.addData(
+            buildList {
+                add("activeSlayer: ${getActiveSlayer()}")
+                add("isInCorrectArea: $isInCorrectArea")
+                add("isInAnyArea: $isInAnyArea")
+                add("latestSlayerProgress: $latestSlayerProgress")
+            }
+        )
+    }
+
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
index 1cb72c4f83f7..a53a144cf8bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
@@ -1,26 +1,42 @@
 package at.hannibal2.skyhanni.events
 
-class DebugDataCollectEvent(private val builder: StringBuilder) : LorenzEvent() {
+import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor
+
+class DebugDataCollectEvent(private val builder: StringBuilder, private val search: String?) : LorenzEvent() {
 
     private var currentTitle = ""
+    private var exit = false
 
     fun title(title: String) {
-        if (currentTitle != "") error("Title already set")
+        if (currentTitle != "") error("Title already set: '$currentTitle'")
 
         currentTitle = title
     }
 
     fun exit(text: String) {
+        exit = true
         addData(listOf(text))
     }
 
     fun addData(text: List<String>) {
         if (currentTitle == "") error("Title not set")
+        writeData(text)
+        currentTitle = ""
+        exit = false
+    }
 
-        builder.append("\n$currentTitle\n")
+    private fun writeData(text: List<String>) {
+        if (exit && search == null) return
+        search?.let {
+            if (!search.equalsIgnoreColor("all")) {
+                if (!currentTitle.contains(search, ignoreCase = true)) {
+                    return
+                }
+            }
+        }
+        builder.append("\n== $currentTitle ==\n")
         for (line in text) {
             builder.append(" $line\n")
         }
-        currentTitle = ""
     }
 }
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 2840565df28d..fb141ad30dcf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.ScoreboardData
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.DungeonBossRoomEnterEvent
 import at.hannibal2.skyhanni.events.DungeonEnterEvent
 import at.hannibal2.skyhanni.events.DungeonStartEvent
@@ -220,6 +221,29 @@ class DungeonAPI {
         }
     }
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Dungeon")
+
+        if (!LorenzUtils.inDungeons) {
+            event.exit("not in dungeons")
+            return
+        }
+
+        event.addData(
+            buildList {
+                add("dungeonFloor: $dungeonFloor")
+                add("started: $started")
+                add("getRoomID: ${getRoomID()}")
+                add("inBossRoom: $inBossRoom")
+                add("")
+                add("playerClass: $playerClass")
+                add("isUniqueClass: $isUniqueClass")
+                add("playerClassLevel: $playerClassLevel")
+            }
+        )
+    }
+
     enum class DungeonFloor(private val bossName: String) {
         ENTRANCE("The Watcher"),
         F1("Bonzo"),
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index e611757c35c4..2855662f6781 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -7,7 +7,6 @@ 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.SlayerAPI
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -15,7 +14,6 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.PlaySoundEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
-import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorColorNames
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
@@ -42,6 +40,7 @@ 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.StringUtils.equalsIgnoreColor
 import kotlinx.coroutines.launch
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
@@ -381,29 +380,20 @@ class SkyHanniDebugsAndTests {
                 builder.append("ironman: ${HypixelData.ironman}\n")
                 builder.append("stranded: ${HypixelData.stranded}\n")
                 builder.append("bingo: ${HypixelData.bingo}\n")
+            }
 
-                if (LorenzUtils.inDungeons) {
-                    builder.append("\n")
-                    builder.append("In dungeon!\n")
-                    builder.append(" dungeonFloor: ${DungeonAPI.dungeonFloor}\n")
-                    builder.append(" started: ${DungeonAPI.started}\n")
-                    builder.append(" getRoomID: ${DungeonAPI.getRoomID()}\n")
-                    builder.append(" inBossRoom: ${DungeonAPI.inBossRoom}\n")
-                    builder.append(" ")
-                    builder.append(" playerClass: ${DungeonAPI.playerClass}\n")
-                    builder.append(" isUniqueClass: ${DungeonAPI.isUniqueClass}\n")
-                    builder.append(" playerClassLevel: ${DungeonAPI.playerClassLevel}\n")
-                }
-                if (SlayerAPI.hasActiveSlayerQuest()) {
-                    builder.append("\n")
-                    builder.append("Doing slayer!\n")
-                    builder.append(" activeSlayer: ${SlayerAPI.getActiveSlayer()}\n")
-                    builder.append(" isInCorrectArea: ${SlayerAPI.isInCorrectArea}\n")
-                    builder.append(" isInAnyArea: ${SlayerAPI.isInAnyArea}\n")
+            val search = args.getOrNull(0)
+            builder.append("\n")
+            if (search != null) {
+                if (search.equalsIgnoreColor("all")) {
+                    builder.append("search for everything.\n")
+                } else {
+                    builder.append("search: '$search'\n")
                 }
+            } else {
+                builder.append("search not set.\n")
             }
-
-            DebugDataCollectEvent(builder).postAndCatch()
+            DebugDataCollectEvent(builder, search).postAndCatch()
 
             builder.append("```")
             OSUtils.copyToClipboard(builder.toString())

From e1ee9ac488dbba5e6898e92bc9ebf93096e671b1 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:20:12 +0100
Subject: [PATCH 22/46] moved all shdebug stuff into categories

---
 .../at/hannibal2/skyhanni/data/SlayerAPI.kt   |  16 +--
 .../skyhanni/events/DebugDataCollectEvent.kt  |  39 ++++--
 .../skyhanni/features/dungeon/DungeonAPI.kt   |  24 ++--
 .../features/event/diana/BurrowWarpHelper.kt  |   6 +-
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 132 ++++++++++++------
 5 files changed, 145 insertions(+), 72 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 2829bcb8d92f..c86563361b56 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -75,18 +75,16 @@ object SlayerAPI {
         event.title("Slayer")
 
         if (!hasActiveSlayerQuest()) {
-            event.exit("no active slayer quest")
+            event.ignore("no active slayer quest")
             return
         }
 
-        event.addData(
-            buildList {
-                add("activeSlayer: ${getActiveSlayer()}")
-                add("isInCorrectArea: $isInCorrectArea")
-                add("isInAnyArea: $isInAnyArea")
-                add("latestSlayerProgress: $latestSlayerProgress")
-            }
-        )
+        event.addData {
+            add("activeSlayer: ${getActiveSlayer()}")
+            add("isInCorrectArea: $isInCorrectArea")
+            add("isInAnyArea: $isInAnyArea")
+            add("latestSlayerProgress: $latestSlayerProgress")
+        }
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
index a53a144cf8bd..1a4eabb92c76 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
@@ -2,10 +2,11 @@ package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor
 
-class DebugDataCollectEvent(private val builder: StringBuilder, private val search: String?) : LorenzEvent() {
+class DebugDataCollectEvent(private val list: MutableList<String>, private val search: String?) : LorenzEvent() {
 
+    var empty = true
     private var currentTitle = ""
-    private var exit = false
+    private var ignore = false
 
     fun title(title: String) {
         if (currentTitle != "") error("Title already set: '$currentTitle'")
@@ -13,8 +14,28 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear
         currentTitle = title
     }
 
-    fun exit(text: String) {
-        exit = true
+    fun ignore(block: MutableList<String>.() -> Unit) {
+        val list = mutableListOf<String>()
+        block(list)
+        ignore(list)
+    }
+
+    fun ignore(text: String) {
+        ignore(listOf(text))
+    }
+
+    private fun ignore(text: List<String>) {
+        ignore = true
+        addData(text)
+    }
+
+    fun addData(block: MutableList<String>.() -> Unit) {
+        val list = mutableListOf<String>()
+        block(list)
+        addData(list)
+    }
+
+    fun addData(text: String) {
         addData(listOf(text))
     }
 
@@ -22,11 +43,11 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear
         if (currentTitle == "") error("Title not set")
         writeData(text)
         currentTitle = ""
-        exit = false
+        ignore = false
     }
 
     private fun writeData(text: List<String>) {
-        if (exit && search == null) return
+        if (ignore && search == null) return
         search?.let {
             if (!search.equalsIgnoreColor("all")) {
                 if (!currentTitle.contains(search, ignoreCase = true)) {
@@ -34,9 +55,11 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear
                 }
             }
         }
-        builder.append("\n== $currentTitle ==\n")
+        empty = false
+        list.add("")
+        list.add("== $currentTitle ==")
         for (line in text) {
-            builder.append(" $line\n")
+            list.add(" $line")
         }
     }
 }
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 fb141ad30dcf..7657a27e4e02 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -226,22 +226,20 @@ class DungeonAPI {
         event.title("Dungeon")
 
         if (!LorenzUtils.inDungeons) {
-            event.exit("not in dungeons")
+            event.ignore("not in dungeons")
             return
         }
 
-        event.addData(
-            buildList {
-                add("dungeonFloor: $dungeonFloor")
-                add("started: $started")
-                add("getRoomID: ${getRoomID()}")
-                add("inBossRoom: $inBossRoom")
-                add("")
-                add("playerClass: $playerClass")
-                add("isUniqueClass: $isUniqueClass")
-                add("playerClassLevel: $playerClassLevel")
-            }
-        )
+        event.addData {
+            add("dungeonFloor: $dungeonFloor")
+            add("started: $started")
+            add("getRoomID: ${getRoomID()}")
+            add("inBossRoom: $inBossRoom")
+            add("")
+            add("playerClass: $playerClass")
+            add("isUniqueClass: $isUniqueClass")
+            add("playerClassLevel: $playerClassLevel")
+        }
     }
 
     enum class DungeonFloor(private val bossName: String) {
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 396501104cb7..27c7b1b0d075 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
@@ -70,16 +70,16 @@ class BurrowWarpHelper {
         event.title("Diana Burrow Nearest Warp")
 
         if (!DianaAPI.isDoingDiana()) {
-            event.exit("not doing diana")
+            event.ignore("not doing diana")
             return
         }
         if (!config.burrowNearestWarp) {
-            event.exit("disabled in config")
+            event.ignore("disabled in config")
             return
         }
         val target = GriffinBurrowHelper.targetLocation
         if (target == null) {
-            event.exit("targetLocation is null")
+            event.ignore("targetLocation is null")
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 2855662f6781..091ddf49904f 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -7,6 +7,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.IslandType
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -349,54 +350,107 @@ class SkyHanniDebugsAndTests {
                 LorenzUtils.chat("§eManually set profileName to '${HypixelData.profileName}'")
                 return
             }
-            val builder = StringBuilder()
-            builder.append("```\n")
-            builder.append("= Debug Information = \n")
-            builder.append("\n")
-            builder.append("SkyHanni ${SkyHanniMod.version}\n")
-            builder.append("\n")
-            builder.append("player name: '${LorenzUtils.getPlayerName()}'\n")
-            builder.append("player uuid: '${LorenzUtils.getPlayerUuid()}'\n")
-            builder.append("repoAutoUpdate: ${config.repoAutoUpdate}\n")
-            if (!config.repoAutoUpdate) {
-                builder.append("REPO DOES NOT AUTO UPDATE\n")
+            val list = mutableListOf<String>()
+            list.add("```")
+            list.add("= Debug Information for SkyHanni ${SkyHanniMod.version} =")
+            list.add("")
+
+            val search = args.getOrNull(0)
+            list.add(
+                if (search != null) {
+                    if (search.equalsIgnoreColor("all")) {
+                        "search for everything."
+                    } else "search: '$search'"
+                } else "search not specified, showing only interesting stuff"
+            )
+
+            val event = DebugDataCollectEvent(list, search)
+
+            event.title("Player")
+            event.ignore {
+                add("name: '${LorenzUtils.getPlayerName()}'")
+                add("uuid: '${LorenzUtils.getPlayerUuid()}'")
             }
-            builder.append("globalRender: ${globalRender}\n")
-            if (!globalRender) {
-                builder.append("GLOBAL RENDERER IS DISABLED\n")
+
+            event.title("Repo Auto Update")
+            if (config.repoAutoUpdate) {
+                event.ignore("normally enabled")
+            } else {
+                event.addData("The repo does not auto update because auto update is disabled!")
             }
-            builder.append("\n")
-
-            builder.append("onHypixel: ${LorenzUtils.onHypixel}\n")
-            val inSkyBlock = LorenzUtils.inSkyBlock
-            builder.append("inSkyBlock: $inSkyBlock\n")
-
-            if (inSkyBlock) {
-                builder.append("\n")
-                builder.append("skyBlockIsland: ${LorenzUtils.skyBlockIsland}\n")
-                builder.append("skyBlockArea: '${LorenzUtils.skyBlockArea}'\n")
-                builder.append("profileName: '${HypixelData.profileName}'\n")
-                builder.append("\n")
-                builder.append("ironman: ${HypixelData.ironman}\n")
-                builder.append("stranded: ${HypixelData.stranded}\n")
-                builder.append("bingo: ${HypixelData.bingo}\n")
+
+            event.title("Global Render")
+            if (globalRender) {
+                event.ignore("normally enabled")
+            } else {
+                event.addData {
+                    add("Global renderer is disabled!")
+                    add("No renderable elements from SkyHanni will show up anywhere!")
+                }
             }
 
-            val search = args.getOrNull(0)
-            builder.append("\n")
-            if (search != null) {
-                if (search.equalsIgnoreColor("all")) {
-                    builder.append("search for everything.\n")
+            event.title("SkyBlock Status")
+            if (!LorenzUtils.onHypixel) {
+                event.addData("not on Hypixel")
+            } else {
+                if (!LorenzUtils.inSkyBlock) {
+                    event.addData("not on SkyBlock, but on Hypixel")
+                } else {
+                    if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
+                        event.addData("Unknown SkyBlock island!")
+                    } else {
+                        event.ignore {
+                            add("on Hypixel SkyBlock")
+                            add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
+                            add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
+                        }
+                    }
+                }
+            }
+
+            event.title("Profile Name")
+            if (!LorenzUtils.inSkyBlock) {
+                event.ignore("Not on SkyBlcok")
+            } else {
+                if (HypixelData.profileName != "") {
+                    event.ignore("profileName: '${HypixelData.profileName}'")
                 } else {
-                    builder.append("search: '$search'\n")
+                    event.addData("profile name is empty!")
                 }
+            }
+
+
+            event.title("Profile Type")
+            if (!LorenzUtils.inSkyBlock) {
+                event.ignore("Not on SkyBlcok")
             } else {
-                builder.append("search not set.\n")
+                val classic = !LorenzUtils.noTradeMode
+                if (classic) {
+                    event.ignore("on classic")
+                } else {
+                    if (HypixelData.ironman) {
+                        event.addData("on ironman")
+                    }
+                    if (HypixelData.stranded) {
+                        event.addData("on stranded")
+                    }
+                    if (HypixelData.bingo) {
+                        event.addData("on bingo")
+                    }
+                }
+            }
+
+            event.postAndCatch()
+
+            if (event.empty) {
+                list.add("")
+                list.add("Nothing interesting to show right now!")
+                list.add("Looking for something specific? /shdebug <search>")
+                list.add("Wanna see everything? /shdebug all")
             }
-            DebugDataCollectEvent(builder, search).postAndCatch()
 
-            builder.append("```")
-            OSUtils.copyToClipboard(builder.toString())
+            list.add("```")
+            OSUtils.copyToClipboard(list.joinToString("\n"))
             LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
         }
 

From 4b44988d83f1522c8279d9571e7b438d8f17cac0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:22:08 +0100
Subject: [PATCH 23/46] moving debug command into own class

---
 .../skyhanni/config/commands/Commands.kt      |   3 +-
 .../hannibal2/skyhanni/test/DebugCommand.kt   | 122 ++++++++++++++++++
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   | 113 ----------------
 3 files changed, 124 insertions(+), 114 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/DebugCommand.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 2f70c7e5589e..bb05b8aee0c1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -48,6 +48,7 @@ import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatur
 import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui
 import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker
 import at.hannibal2.skyhanni.features.slayer.SlayerProfitTracker
+import at.hannibal2.skyhanni.test.DebugCommand
 import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
@@ -264,7 +265,7 @@ object Commands {
         registerCommand(
             "shdebug",
             "Copies SkyHanni debug data in the clipboard."
-        ) { SkyHanniDebugsAndTests.debugData(it) }
+        ) { DebugCommand.command(it) }
         registerCommand(
             "shversion",
             "Prints the SkyHanni version in the chat"
diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
new file mode 100644
index 000000000000..a89a3bb05d9c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
@@ -0,0 +1,122 @@
+package at.hannibal2.skyhanni.test
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor
+
+object DebugCommand {
+
+    fun command(args: Array<String>) {
+        if (args.size == 2 && args[0] == "profileName") {
+            HypixelData.profileName = args[1].lowercase()
+            LorenzUtils.chat("§eManually set profileName to '${HypixelData.profileName}'")
+            return
+        }
+        val list = mutableListOf<String>()
+        list.add("```")
+        list.add("= Debug Information for SkyHanni ${SkyHanniMod.version} =")
+        list.add("")
+
+        val search = args.getOrNull(0)
+        list.add(
+            if (search != null) {
+                if (search.equalsIgnoreColor("all")) {
+                    "search for everything."
+                } else "search: '$search'"
+            } else "search not specified, showing only interesting stuff"
+        )
+
+        val event = DebugDataCollectEvent(list, search)
+
+        event.title("Player")
+        event.ignore {
+            add("name: '${LorenzUtils.getPlayerName()}'")
+            add("uuid: '${LorenzUtils.getPlayerUuid()}'")
+        }
+
+        event.title("Repo Auto Update")
+        if (SkyHanniMod.feature.dev.repoAutoUpdate) {
+            event.ignore("normal enabled")
+        } else {
+            event.addData("The repo does not auto update because auto update is disabled!")
+        }
+
+        event.title("Global Render")
+        if (SkyHanniDebugsAndTests.globalRender) {
+            event.ignore("normal enabled")
+        } else {
+            event.addData {
+                add("Global renderer is disabled!")
+                add("No renderable elements from SkyHanni will show up anywhere!")
+            }
+        }
+
+        event.title("SkyBlock Status")
+        if (!LorenzUtils.onHypixel) {
+            event.addData("not on Hypixel")
+        } else {
+            if (!LorenzUtils.inSkyBlock) {
+                event.addData("not on SkyBlock, but on Hypixel")
+            } else {
+                if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
+                    event.addData("Unknown SkyBlock island!")
+                } else {
+                    event.ignore {
+                        add("on Hypixel SkyBlock")
+                        add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
+                        add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
+                    }
+                }
+            }
+        }
+
+        event.title("Profile Name")
+        if (!LorenzUtils.inSkyBlock) {
+            event.ignore("Not on SkyBlcok")
+        } else {
+            if (HypixelData.profileName != "") {
+                event.ignore("profileName: '${HypixelData.profileName}'")
+            } else {
+                event.addData("profile name is empty!")
+            }
+        }
+
+
+        event.title("Profile Type")
+        if (!LorenzUtils.inSkyBlock) {
+            event.ignore("Not on SkyBlcok")
+        } else {
+            val classic = !LorenzUtils.noTradeMode
+            if (classic) {
+                event.ignore("on classic")
+            } else {
+                if (HypixelData.ironman) {
+                    event.addData("on ironman")
+                }
+                if (HypixelData.stranded) {
+                    event.addData("on stranded")
+                }
+                if (HypixelData.bingo) {
+                    event.addData("on bingo")
+                }
+            }
+        }
+
+        event.postAndCatch()
+
+        if (event.empty) {
+            list.add("")
+            list.add("Nothing interesting to show right now!")
+            list.add("Looking for something specific? /shdebug <search>")
+            list.add("Wanna see everything? /shdebug all")
+        }
+
+        list.add("```")
+        OSUtils.copyToClipboard(list.joinToString("\n"))
+        LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 091ddf49904f..ec850f5dd9ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -7,8 +7,6 @@ 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.IslandType
-import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
@@ -41,7 +39,6 @@ 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.StringUtils.equalsIgnoreColor
 import kotlinx.coroutines.launch
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
@@ -344,116 +341,6 @@ class SkyHanniDebugsAndTests {
             OSUtils.copyToClipboard(name)
         }
 
-        fun debugData(args: Array<String>) {
-            if (args.size == 2 && args[0] == "profileName") {
-                HypixelData.profileName = args[1].lowercase()
-                LorenzUtils.chat("§eManually set profileName to '${HypixelData.profileName}'")
-                return
-            }
-            val list = mutableListOf<String>()
-            list.add("```")
-            list.add("= Debug Information for SkyHanni ${SkyHanniMod.version} =")
-            list.add("")
-
-            val search = args.getOrNull(0)
-            list.add(
-                if (search != null) {
-                    if (search.equalsIgnoreColor("all")) {
-                        "search for everything."
-                    } else "search: '$search'"
-                } else "search not specified, showing only interesting stuff"
-            )
-
-            val event = DebugDataCollectEvent(list, search)
-
-            event.title("Player")
-            event.ignore {
-                add("name: '${LorenzUtils.getPlayerName()}'")
-                add("uuid: '${LorenzUtils.getPlayerUuid()}'")
-            }
-
-            event.title("Repo Auto Update")
-            if (config.repoAutoUpdate) {
-                event.ignore("normally enabled")
-            } else {
-                event.addData("The repo does not auto update because auto update is disabled!")
-            }
-
-            event.title("Global Render")
-            if (globalRender) {
-                event.ignore("normally enabled")
-            } else {
-                event.addData {
-                    add("Global renderer is disabled!")
-                    add("No renderable elements from SkyHanni will show up anywhere!")
-                }
-            }
-
-            event.title("SkyBlock Status")
-            if (!LorenzUtils.onHypixel) {
-                event.addData("not on Hypixel")
-            } else {
-                if (!LorenzUtils.inSkyBlock) {
-                    event.addData("not on SkyBlock, but on Hypixel")
-                } else {
-                    if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
-                        event.addData("Unknown SkyBlock island!")
-                    } else {
-                        event.ignore {
-                            add("on Hypixel SkyBlock")
-                            add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
-                            add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
-                        }
-                    }
-                }
-            }
-
-            event.title("Profile Name")
-            if (!LorenzUtils.inSkyBlock) {
-                event.ignore("Not on SkyBlcok")
-            } else {
-                if (HypixelData.profileName != "") {
-                    event.ignore("profileName: '${HypixelData.profileName}'")
-                } else {
-                    event.addData("profile name is empty!")
-                }
-            }
-
-
-            event.title("Profile Type")
-            if (!LorenzUtils.inSkyBlock) {
-                event.ignore("Not on SkyBlcok")
-            } else {
-                val classic = !LorenzUtils.noTradeMode
-                if (classic) {
-                    event.ignore("on classic")
-                } else {
-                    if (HypixelData.ironman) {
-                        event.addData("on ironman")
-                    }
-                    if (HypixelData.stranded) {
-                        event.addData("on stranded")
-                    }
-                    if (HypixelData.bingo) {
-                        event.addData("on bingo")
-                    }
-                }
-            }
-
-            event.postAndCatch()
-
-            if (event.empty) {
-                list.add("")
-                list.add("Nothing interesting to show right now!")
-                list.add("Looking for something specific? /shdebug <search>")
-                list.add("Wanna see everything? /shdebug all")
-            }
-
-            list.add("```")
-            OSUtils.copyToClipboard(list.joinToString("\n"))
-            LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
-        }
-
         fun copyItemInternalName() {
             val hand = InventoryUtils.getItemInHand()
             if (hand == null) {

From 16e9a946212a270f63dfc5647374581dd122586f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:23:49 +0100
Subject: [PATCH 24/46] move into own functions

---
 .../hannibal2/skyhanni/test/DebugCommand.kt   | 119 ++++++++++--------
 1 file changed, 69 insertions(+), 50 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
index a89a3bb05d9c..ded048300493 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
@@ -32,29 +32,64 @@ object DebugCommand {
 
         val event = DebugDataCollectEvent(list, search)
 
-        event.title("Player")
-        event.ignore {
-            add("name: '${LorenzUtils.getPlayerName()}'")
-            add("uuid: '${LorenzUtils.getPlayerUuid()}'")
+        // calling default debug stuff
+        player(event)
+        repoAutoUpdate(event)
+        globalRender(event)
+        skyblockStatus(event)
+        profileName(event)
+        profileType(event)
+
+        event.postAndCatch()
+
+        if (event.empty) {
+            list.add("")
+            list.add("Nothing interesting to show right now!")
+            list.add("Looking for something specific? /shdebug <search>")
+            list.add("Wanna see everything? /shdebug all")
         }
 
-        event.title("Repo Auto Update")
-        if (SkyHanniMod.feature.dev.repoAutoUpdate) {
-            event.ignore("normal enabled")
+        list.add("```")
+        OSUtils.copyToClipboard(list.joinToString("\n"))
+        LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
+    }
+
+    private fun profileType(event: DebugDataCollectEvent) {
+        event.title("Profile Type")
+        if (!LorenzUtils.inSkyBlock) {
+            event.ignore("Not on SkyBlcok")
         } else {
-            event.addData("The repo does not auto update because auto update is disabled!")
+            val classic = !LorenzUtils.noTradeMode
+            if (classic) {
+                event.ignore("on classic")
+            } else {
+                if (HypixelData.ironman) {
+                    event.addData("on ironman")
+                }
+                if (HypixelData.stranded) {
+                    event.addData("on stranded")
+                }
+                if (HypixelData.bingo) {
+                    event.addData("on bingo")
+                }
+            }
         }
+    }
 
-        event.title("Global Render")
-        if (SkyHanniDebugsAndTests.globalRender) {
-            event.ignore("normal enabled")
+    private fun profileName(event: DebugDataCollectEvent) {
+        event.title("Profile Name")
+        if (!LorenzUtils.inSkyBlock) {
+            event.ignore("Not on SkyBlcok")
         } else {
-            event.addData {
-                add("Global renderer is disabled!")
-                add("No renderable elements from SkyHanni will show up anywhere!")
+            if (HypixelData.profileName != "") {
+                event.ignore("profileName: '${HypixelData.profileName}'")
+            } else {
+                event.addData("profile name is empty!")
             }
         }
+    }
 
+    private fun skyblockStatus(event: DebugDataCollectEvent) {
         event.title("SkyBlock Status")
         if (!LorenzUtils.onHypixel) {
             event.addData("not on Hypixel")
@@ -73,50 +108,34 @@ object DebugCommand {
                 }
             }
         }
+    }
 
-        event.title("Profile Name")
-        if (!LorenzUtils.inSkyBlock) {
-            event.ignore("Not on SkyBlcok")
+    private fun globalRender(event: DebugDataCollectEvent) {
+        event.title("Global Render")
+        if (SkyHanniDebugsAndTests.globalRender) {
+            event.ignore("normal enabled")
         } else {
-            if (HypixelData.profileName != "") {
-                event.ignore("profileName: '${HypixelData.profileName}'")
-            } else {
-                event.addData("profile name is empty!")
+            event.addData {
+                add("Global renderer is disabled!")
+                add("No renderable elements from SkyHanni will show up anywhere!")
             }
         }
+    }
 
-
-        event.title("Profile Type")
-        if (!LorenzUtils.inSkyBlock) {
-            event.ignore("Not on SkyBlcok")
+    private fun repoAutoUpdate(event: DebugDataCollectEvent) {
+        event.title("Repo Auto Update")
+        if (SkyHanniMod.feature.dev.repoAutoUpdate) {
+            event.ignore("normal enabled")
         } else {
-            val classic = !LorenzUtils.noTradeMode
-            if (classic) {
-                event.ignore("on classic")
-            } else {
-                if (HypixelData.ironman) {
-                    event.addData("on ironman")
-                }
-                if (HypixelData.stranded) {
-                    event.addData("on stranded")
-                }
-                if (HypixelData.bingo) {
-                    event.addData("on bingo")
-                }
-            }
+            event.addData("The repo does not auto update because auto update is disabled!")
         }
+    }
 
-        event.postAndCatch()
-
-        if (event.empty) {
-            list.add("")
-            list.add("Nothing interesting to show right now!")
-            list.add("Looking for something specific? /shdebug <search>")
-            list.add("Wanna see everything? /shdebug all")
+    private fun player(event: DebugDataCollectEvent) {
+        event.title("Player")
+        event.ignore {
+            add("name: '${LorenzUtils.getPlayerName()}'")
+            add("uuid: '${LorenzUtils.getPlayerUuid()}'")
         }
-
-        list.add("```")
-        OSUtils.copyToClipboard(list.joinToString("\n"))
-        LorenzUtils.chat("§eCopied SkyHanni debug data in the clipboard.")
     }
 }

From 934e6a7d106238d80f0f986ac99c044de8515e31 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:41:59 +0100
Subject: [PATCH 25/46] code cleanup

---
 .../hannibal2/skyhanni/test/DebugCommand.kt   | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
index ded048300493..0cf0e4b5adfc 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
@@ -25,9 +25,9 @@ object DebugCommand {
         list.add(
             if (search != null) {
                 if (search.equalsIgnoreColor("all")) {
-                    "search for everything."
-                } else "search: '$search'"
-            } else "search not specified, showing only interesting stuff"
+                    "search for everything:"
+                } else "search '$search':"
+            } else "search is not specified, show only interesting stuff:"
         )
 
         val event = DebugDataCollectEvent(list, search)
@@ -58,20 +58,21 @@ object DebugCommand {
         event.title("Profile Type")
         if (!LorenzUtils.inSkyBlock) {
             event.ignore("Not on SkyBlcok")
+            return
+        }
+
+        val classic = !LorenzUtils.noTradeMode
+        if (classic) {
+            event.ignore("on classic")
         } else {
-            val classic = !LorenzUtils.noTradeMode
-            if (classic) {
-                event.ignore("on classic")
-            } else {
-                if (HypixelData.ironman) {
-                    event.addData("on ironman")
-                }
-                if (HypixelData.stranded) {
-                    event.addData("on stranded")
-                }
-                if (HypixelData.bingo) {
-                    event.addData("on bingo")
-                }
+            if (HypixelData.ironman) {
+                event.addData("on ironman")
+            }
+            if (HypixelData.stranded) {
+                event.addData("on stranded")
+            }
+            if (HypixelData.bingo) {
+                event.addData("on bingo")
             }
         }
     }
@@ -80,12 +81,13 @@ object DebugCommand {
         event.title("Profile Name")
         if (!LorenzUtils.inSkyBlock) {
             event.ignore("Not on SkyBlcok")
+            return
+        }
+
+        if (HypixelData.profileName != "") {
+            event.ignore("profileName: '${HypixelData.profileName}'")
         } else {
-            if (HypixelData.profileName != "") {
-                event.ignore("profileName: '${HypixelData.profileName}'")
-            } else {
-                event.addData("profile name is empty!")
-            }
+            event.addData("profile name is empty!")
         }
     }
 
@@ -93,20 +95,20 @@ object DebugCommand {
         event.title("SkyBlock Status")
         if (!LorenzUtils.onHypixel) {
             event.addData("not on Hypixel")
-        } else {
-            if (!LorenzUtils.inSkyBlock) {
-                event.addData("not on SkyBlock, but on Hypixel")
-            } else {
-                if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
-                    event.addData("Unknown SkyBlock island!")
-                } else {
-                    event.ignore {
-                        add("on Hypixel SkyBlock")
-                        add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
-                        add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
-                    }
-                }
-            }
+            return
+        }
+        if (!LorenzUtils.inSkyBlock) {
+            event.addData("not on SkyBlock, but on Hypixel")
+            return
+        }
+        if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
+            event.addData("Unknown SkyBlock island!")
+            return
+        }
+        event.ignore {
+            add("on Hypixel SkyBlock")
+            add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
+            add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
         }
     }
 

From a5753a95f4726005a8ad854f684f07e483037ade Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:42:27 +0100
Subject: [PATCH 26/46] adding repo status to /shdebug

---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  1 +
 .../skyhanni/data/repo/RepoManager.kt         | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index c1ef48932e1c..f7c25770643c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -738,6 +738,7 @@ class SkyHanniMod {
             configManager.saveConfig(ConfigFileType.FEATURES, "shutdown-hook")
         })
         repo = RepoManager(ConfigManager.configDirectory)
+        loadModule(repo)
         try {
             repo.loadRepoInformation()
         } catch (e: Exception) {
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 9dcba5e8fbb3..8c12444ac26d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -2,11 +2,13 @@ package at.hannibal2.skyhanni.data.repo
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import com.google.gson.JsonObject
 import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.apache.commons.io.FileUtils
 import java.io.BufferedReader
 import java.io.BufferedWriter
@@ -172,6 +174,27 @@ class RepoManager(private val configLocation: File) {
         return comp
     }
 
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Repo Status")
+
+        if (unsuccessfulConstants.isEmpty() && successfulConstants.isNotEmpty()) {
+            event.ignore("Repo working fine")
+            return
+        }
+
+        event.addData {
+            if (successfulConstants.isNotEmpty()) add("Successful Constants (${successfulConstants.size}):")
+            for (constant in successfulConstants) {
+                add("   - $constant")
+            }
+            add("Unsuccessful Constants (${unsuccessfulConstants.size}):")
+            for (constant in unsuccessfulConstants) {
+                add("   - $constant")
+            }
+        }
+    }
+
     fun displayRepoStatus(joinEvent: Boolean) {
         if (joinEvent) {
             if (unsuccessfulConstants.isNotEmpty()) {

From 41df011a8b1892ac69a8903949fddc1b6bcc913c Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:45:23 +0100
Subject: [PATCH 27/46] removed unnecessary stuff

---
 .../skyhanni/data/repo/RepoManager.kt          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 8c12444ac26d..4e8b95080d97 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -184,13 +184,16 @@ class RepoManager(private val configLocation: File) {
         }
 
         event.addData {
-            if (successfulConstants.isNotEmpty()) add("Successful Constants (${successfulConstants.size}):")
-            for (constant in successfulConstants) {
-                add("   - $constant")
-            }
+            add("Successful Constants (${successfulConstants.size}):")
+
             add("Unsuccessful Constants (${unsuccessfulConstants.size}):")
-            for (constant in unsuccessfulConstants) {
+
+            for ((i, constant) in unsuccessfulConstants.withIndex()) {
                 add("   - $constant")
+                if (i == 5) {
+                    add("...")
+                    break
+                }
             }
         }
     }
@@ -214,7 +217,10 @@ class RepoManager(private val configLocation: File) {
             LorenzUtils.chat("Repo working fine!", prefixColor = "§a")
             return
         }
-        if (successfulConstants.isNotEmpty()) LorenzUtils.chat("Successful Constants §7(${successfulConstants.size}):", prefixColor = "§a")
+        if (successfulConstants.isNotEmpty()) LorenzUtils.chat(
+            "Successful Constants §7(${successfulConstants.size}):",
+            prefixColor = "§a"
+        )
         for (constant in successfulConstants) {
             LorenzUtils.chat("   §a- §7$constant")
         }

From 1a2abbef994d493d9e7d3c8dc421dc5b2f47e342 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:16:05 +0100
Subject: [PATCH 28/46] adding visitor status to /shdebug

---
 .../garden/visitor/GardenVisitorFeatures.kt   | 38 +++++++++++++++++++
 .../features/garden/visitor/VisitorAPI.kt     |  2 +-
 2 files changed, 39 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 1c17d38f60a8..6a9ef7c8c579 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
@@ -5,6 +5,8 @@ import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.Highli
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.SackAPI
 import at.hannibal2.skyhanni.data.SackStatus
+import at.hannibal2.skyhanni.events.BurrowGuessEvent
+import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -604,6 +606,42 @@ class GardenVisitorFeatures {
         }
     }
 
+    @SubscribeEvent
+    fun onBurrowGuess(event: BurrowGuessEvent) {
+        LorenzUtils.chat("gues the burrow!!")
+    }
+
+    @SubscribeEvent
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Garden Visitor Stats")
+
+        if (!GardenAPI.inGarden()) {
+            event.ignore("not in garden")
+            return
+        }
+
+        event.addData {
+            val visitors = VisitorAPI.visitors
+
+            add("visitors: ${visitors.size}")
+
+            for (visitor in visitors.values) {
+                add(" ")
+                add("visitorName: '${visitor.visitorName}'")
+                add("status: '${visitor.status}'")
+                if (visitor.inSacks) {
+                    add("inSacks!")
+                }
+                if (visitor.shoppingList.isNotEmpty()) {
+                    add("shoppingList: '${visitor.shoppingList}'")
+                }
+                visitor.offer?.offerItem?.getInternalName()?.let {
+                    add("offer: '${it}'")
+                }
+            }
+        }
+    }
+
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "garden.visitorNeedsDisplay", "garden.visitors.needs.display")
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 c3c832d787c9..4d892528adc1 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
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import net.minecraft.item.ItemStack
 
 object VisitorAPI {
-    private var visitors = mapOf<String, Visitor>()
+    var visitors = mapOf<String, Visitor>()
     var inInventory = false
     val config get() = GardenAPI.config.visitors
     private val logger = LorenzLogger("garden/visitors/api")

From 1bf29e31e35c4eb1a40fe0a7dfd111955ef48322 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:32:19 +0100
Subject: [PATCH 29/46] renamed ignore to irrelevant

---
 .../at/hannibal2/skyhanni/data/SlayerAPI.kt   |  2 +-
 .../skyhanni/data/repo/RepoManager.kt         |  2 +-
 .../skyhanni/events/DebugDataCollectEvent.kt  | 30 ++++++-------------
 .../skyhanni/features/dungeon/DungeonAPI.kt   |  2 +-
 .../features/event/diana/BurrowWarpHelper.kt  |  6 ++--
 .../garden/visitor/GardenVisitorFeatures.kt   |  2 +-
 .../hannibal2/skyhanni/test/DebugCommand.kt   | 16 +++++-----
 7 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index c86563361b56..ee6899340344 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -75,7 +75,7 @@ object SlayerAPI {
         event.title("Slayer")
 
         if (!hasActiveSlayerQuest()) {
-            event.ignore("no active slayer quest")
+            event.addIrrelevant("no active slayer quest")
             return
         }
 
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 4e8b95080d97..5296053d1f2a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -179,7 +179,7 @@ class RepoManager(private val configLocation: File) {
         event.title("Repo Status")
 
         if (unsuccessfulConstants.isEmpty() && successfulConstants.isNotEmpty()) {
-            event.ignore("Repo working fine")
+            event.addIrrelevant("Repo working fine")
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
index 1a4eabb92c76..eb8dd5bfcfe8 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt
@@ -6,7 +6,7 @@ class DebugDataCollectEvent(private val list: MutableList<String>, private val s
 
     var empty = true
     private var currentTitle = ""
-    private var ignore = false
+    private var irrelevant = false
 
     fun title(title: String) {
         if (currentTitle != "") error("Title already set: '$currentTitle'")
@@ -14,40 +14,28 @@ class DebugDataCollectEvent(private val list: MutableList<String>, private val s
         currentTitle = title
     }
 
-    fun ignore(block: MutableList<String>.() -> Unit) {
-        val list = mutableListOf<String>()
-        block(list)
-        ignore(list)
-    }
+    fun addIrrelevant(builder: MutableList<String>.() -> Unit) = addIrrelevant(buildList(builder))
 
-    fun ignore(text: String) {
-        ignore(listOf(text))
-    }
+    fun addIrrelevant(text: String) = addIrrelevant(listOf(text))
 
-    private fun ignore(text: List<String>) {
-        ignore = true
+    private fun addIrrelevant(text: List<String>) {
+        irrelevant = true
         addData(text)
     }
 
-    fun addData(block: MutableList<String>.() -> Unit) {
-        val list = mutableListOf<String>()
-        block(list)
-        addData(list)
-    }
+    fun addData(builder: MutableList<String>.() -> Unit) = addData(buildList(builder))
 
-    fun addData(text: String) {
-        addData(listOf(text))
-    }
+    fun addData(text: String) = addData(listOf(text))
 
     fun addData(text: List<String>) {
         if (currentTitle == "") error("Title not set")
         writeData(text)
         currentTitle = ""
-        ignore = false
+        irrelevant = false
     }
 
     private fun writeData(text: List<String>) {
-        if (ignore && search == null) return
+        if (irrelevant && search == null) return
         search?.let {
             if (!search.equalsIgnoreColor("all")) {
                 if (!currentTitle.contains(search, ignoreCase = true)) {
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 7657a27e4e02..af351814171b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -226,7 +226,7 @@ class DungeonAPI {
         event.title("Dungeon")
 
         if (!LorenzUtils.inDungeons) {
-            event.ignore("not in dungeons")
+            event.addIrrelevant("not in dungeons")
             return
         }
 
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 27c7b1b0d075..1b9e12195d12 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
@@ -70,16 +70,16 @@ class BurrowWarpHelper {
         event.title("Diana Burrow Nearest Warp")
 
         if (!DianaAPI.isDoingDiana()) {
-            event.ignore("not doing diana")
+            event.addIrrelevant("not doing diana")
             return
         }
         if (!config.burrowNearestWarp) {
-            event.ignore("disabled in config")
+            event.addIrrelevant("disabled in config")
             return
         }
         val target = GriffinBurrowHelper.targetLocation
         if (target == null) {
-            event.ignore("targetLocation is null")
+            event.addIrrelevant("targetLocation is null")
             return
         }
 
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 6a9ef7c8c579..0fcb4c4b29d9 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
@@ -616,7 +616,7 @@ class GardenVisitorFeatures {
         event.title("Garden Visitor Stats")
 
         if (!GardenAPI.inGarden()) {
-            event.ignore("not in garden")
+            event.addIrrelevant("not in garden")
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
index 0cf0e4b5adfc..e2ff4dbb42e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
@@ -57,13 +57,13 @@ object DebugCommand {
     private fun profileType(event: DebugDataCollectEvent) {
         event.title("Profile Type")
         if (!LorenzUtils.inSkyBlock) {
-            event.ignore("Not on SkyBlcok")
+            event.addIrrelevant("Not on SkyBlcok")
             return
         }
 
         val classic = !LorenzUtils.noTradeMode
         if (classic) {
-            event.ignore("on classic")
+            event.addIrrelevant("on classic")
         } else {
             if (HypixelData.ironman) {
                 event.addData("on ironman")
@@ -80,12 +80,12 @@ object DebugCommand {
     private fun profileName(event: DebugDataCollectEvent) {
         event.title("Profile Name")
         if (!LorenzUtils.inSkyBlock) {
-            event.ignore("Not on SkyBlcok")
+            event.addIrrelevant("Not on SkyBlcok")
             return
         }
 
         if (HypixelData.profileName != "") {
-            event.ignore("profileName: '${HypixelData.profileName}'")
+            event.addIrrelevant("profileName: '${HypixelData.profileName}'")
         } else {
             event.addData("profile name is empty!")
         }
@@ -105,7 +105,7 @@ object DebugCommand {
             event.addData("Unknown SkyBlock island!")
             return
         }
-        event.ignore {
+        event.addIrrelevant {
             add("on Hypixel SkyBlock")
             add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
             add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
@@ -115,7 +115,7 @@ object DebugCommand {
     private fun globalRender(event: DebugDataCollectEvent) {
         event.title("Global Render")
         if (SkyHanniDebugsAndTests.globalRender) {
-            event.ignore("normal enabled")
+            event.addIrrelevant("normal enabled")
         } else {
             event.addData {
                 add("Global renderer is disabled!")
@@ -127,7 +127,7 @@ object DebugCommand {
     private fun repoAutoUpdate(event: DebugDataCollectEvent) {
         event.title("Repo Auto Update")
         if (SkyHanniMod.feature.dev.repoAutoUpdate) {
-            event.ignore("normal enabled")
+            event.addIrrelevant("normal enabled")
         } else {
             event.addData("The repo does not auto update because auto update is disabled!")
         }
@@ -135,7 +135,7 @@ object DebugCommand {
 
     private fun player(event: DebugDataCollectEvent) {
         event.title("Player")
-        event.ignore {
+        event.addIrrelevant {
             add("name: '${LorenzUtils.getPlayerName()}'")
             add("uuid: '${LorenzUtils.getPlayerUuid()}'")
         }

From b8adb961f50d17c02dbccbbb00376a2f728c819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Thu, 18 Jan 2024 21:39:21 +0100
Subject: [PATCH 30/46] Add hotswap agent support (#910)

Added hotswap detection and reloading all listeners on hotswap. #910
---
 build.gradle.kts                              |  1 +
 gradle/libs.versions.toml                     |  1 +
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  3 +
 .../skyhanni/test/hotswap/HotswapSupport.kt   | 22 +++++++
 .../test/hotswap/HotswapSupportHandle.kt      |  6 ++
 .../test/hotswap/HotswapSupportImpl.kt        | 57 +++++++++++++++++++
 src/main/resources/hotswap-agent.properties   |  1 +
 7 files changed, 91 insertions(+)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupport.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportHandle.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
 create mode 100644 src/main/resources/hotswap-agent.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index 3573835f37d0..e2d7e04fa174 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -111,6 +111,7 @@ dependencies {
     shadowModImpl(libs.moulconfig)
     shadowImpl(libs.libautoupdate)
     shadowImpl("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
+    implementation(libs.hotswapagentforge)
 
 //    testImplementation(kotlin("test"))
     testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ce1a1690829f..99aad13305b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,3 +9,4 @@ moulconfig = { module = "org.notenoughupdates.moulconfig:legacy", version.ref =
 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" }
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index f7c25770643c..addfbf1f0d4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -341,6 +341,7 @@ import at.hannibal2.skyhanni.test.TestExportTools
 import at.hannibal2.skyhanni.test.TestShowSlotNumber
 import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
+import at.hannibal2.skyhanni.test.hotswap.HotswapSupport
 import at.hannibal2.skyhanni.utils.EntityOutlineRenderer
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -378,6 +379,8 @@ class SkyHanniMod {
     fun preInit(event: FMLPreInitializationEvent?) {
         checkIfNeuIsLoaded()
 
+        HotswapSupport.load()
+
         // data
         loadModule(this)
         loadModule(ChatManager)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupport.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupport.kt
new file mode 100644
index 000000000000..87acab62dd74
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupport.kt
@@ -0,0 +1,22 @@
+package at.hannibal2.skyhanni.test.hotswap
+
+import java.util.function.Supplier
+
+object HotswapSupport {
+    private val isForgeSidePresent =
+        runCatching { Class.forName("moe.nea.hotswapagentforge.forge.HotswapEvent") }.isSuccess
+    private val obj = if (isForgeSidePresent) {
+        Supplier<HotswapSupportHandle?> { HotswapSupportImpl() }
+    } else {
+        Supplier<HotswapSupportHandle?> { null }
+    }.get()
+
+    fun isLoaded(): Boolean {
+        return obj?.isLoaded() ?: false
+    }
+
+    fun load() {
+        obj?.load()
+    }
+}
+
diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportHandle.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportHandle.kt
new file mode 100644
index 000000000000..c006753a09f5
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportHandle.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.test.hotswap
+
+interface HotswapSupportHandle {
+    fun load()
+    fun isLoaded(): Boolean
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
new file mode 100644
index 000000000000..df74eedbba9f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
@@ -0,0 +1,57 @@
+package at.hannibal2.skyhanni.test.hotswap
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.makeAccessible
+import at.hannibal2.skyhanni.utils.LorenzUtils.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
+
+class HotswapSupportImpl : HotswapSupportHandle {
+    override fun load() {
+        MinecraftForge.EVENT_BUS.register(this)
+        println("Hotswap Client in Skyhanni loaded")
+    }
+
+    @SubscribeEvent
+    fun onHotswapClass(event: ClassDefinitionEvent.Redefinition) {
+        val instance = SkyHanniMod.modules.find { it.javaClass.name == event.fullyQualifiedName }
+        if (instance == null) return
+        val primaryConstructor = runCatching { instance.javaClass.getDeclaredConstructor() }.getOrNull()
+        Minecraft.getMinecraft().addScheduledTask(Runnable {
+            LorenzUtils.chat("Refreshing event subscriptions for module $instance!")
+            MinecraftForge.EVENT_BUS.unregister(instance)
+            if (primaryConstructor == null) {
+                MinecraftForge.EVENT_BUS.register(instance)
+            } else {
+                SkyHanniMod.modules.remove(instance)
+                primaryConstructor.isAccessible = true
+                val newInstance = primaryConstructor.newInstance()
+                LorenzUtils.chat("Reconstructing $instance -> $newInstance!")
+                val instanceField = runCatching { instance.javaClass.getDeclaredField("INSTANCE") }.getOrNull()
+                    ?.takeIf { it.type == instance.javaClass }
+                    ?.makeAccessible()
+                    ?.removeFinal()
+                if (instanceField != null) {
+                    LorenzUtils.chat("Reinjected static instance $newInstance!")
+                    instanceField.set(null, newInstance)
+                }
+                SkyHanniMod.modules.add(newInstance)
+                MinecraftForge.EVENT_BUS.register(newInstance)
+            }
+        })
+    }
+
+    @SubscribeEvent
+    fun onHotswapDetected(event: HotswapFinishedEvent) {
+        LorenzUtils.chat("Hotswap finished!")
+    }
+
+    override fun isLoaded(): Boolean {
+        return HotswapEvent.isReady()
+    }
+}
diff --git a/src/main/resources/hotswap-agent.properties b/src/main/resources/hotswap-agent.properties
new file mode 100644
index 000000000000..230a7d99ac0a
--- /dev/null
+++ b/src/main/resources/hotswap-agent.properties
@@ -0,0 +1 @@
+pluginPackages=moe.nea.hotswapagentforge.plugin

From bfff84d82f1020419e9732dd8fff4053345af45f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:40:06 +0100
Subject: [PATCH 31/46] code cleanup

---
 .../hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 df74eedbba9f..044f5c817e49 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt
@@ -19,10 +19,9 @@ class HotswapSupportImpl : HotswapSupportHandle {
 
     @SubscribeEvent
     fun onHotswapClass(event: ClassDefinitionEvent.Redefinition) {
-        val instance = SkyHanniMod.modules.find { it.javaClass.name == event.fullyQualifiedName }
-        if (instance == null) return
+        val instance = SkyHanniMod.modules.find { it.javaClass.name == event.fullyQualifiedName } ?: return
         val primaryConstructor = runCatching { instance.javaClass.getDeclaredConstructor() }.getOrNull()
-        Minecraft.getMinecraft().addScheduledTask(Runnable {
+        Minecraft.getMinecraft().addScheduledTask {
             LorenzUtils.chat("Refreshing event subscriptions for module $instance!")
             MinecraftForge.EVENT_BUS.unregister(instance)
             if (primaryConstructor == null) {
@@ -43,7 +42,7 @@ class HotswapSupportImpl : HotswapSupportHandle {
                 SkyHanniMod.modules.add(newInstance)
                 MinecraftForge.EVENT_BUS.register(newInstance)
             }
-        })
+        }
     }
 
     @SubscribeEvent

From 95732ca3dd1a90e0e206d80e0dc386d317a7d31b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:40:58 +0100
Subject: [PATCH 32/46] deleted old hotswap deletion

---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 -
 .../skyhanni/test/HotSwapDetection.kt         | 50 -------------------
 2 files changed, 52 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index addfbf1f0d4d..40af07f900bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -329,7 +329,6 @@ import at.hannibal2.skyhanni.features.summonings.SummoningMobManager
 import at.hannibal2.skyhanni.features.summonings.SummoningSoulsName
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.test.HighlightMissingRepoItems
-import at.hannibal2.skyhanni.test.HotSwapDetection
 import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.ParkourWaypointSaver
 import at.hannibal2.skyhanni.test.ShowItemUuid
@@ -728,7 +727,6 @@ class SkyHanniMod {
         loadModule(TestShowSlotNumber())
         loadModule(SkyHanniDebugsAndTests)
         loadModule(WorldEdit)
-        loadModule(HotSwapDetection)
         PreInitFinishedEvent().postAndCatch()
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt b/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt
index f1044057dc0f..e69de29bb2d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt
@@ -1,50 +0,0 @@
-package at.hannibal2.skyhanni.test
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.MinecraftData
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.client.Minecraft
-import kotlin.concurrent.fixedRateTimer
-
-object HotSwapDetection {
-    private val config get() = SkyHanniMod.feature.dev.debug
-
-    private var latestTick = 0
-    private var beforeThatTick = 0
-    private var lastTps = 0
-    private var hotswap = false
-
-    init {
-        fixedRateTimer(name = "skyhanni-hot-swap-detection", period = 250) {
-            val currentTick = MinecraftData.totalTicks
-            val diff = currentTick - latestTick
-            latestTick = currentTick
-
-            // we count 2 client ticks per tick, we are bad
-            handleTps(diff * 2)
-        }
-    }
-
-    private fun handleTps(tps: Int) {
-        Minecraft.getMinecraft().theWorld ?: return
-        if (!config.hotSwapDetection) return
-
-        // ignore below one minute
-        if (latestTick < 20 * 60) return
-
-        if (!hotswap) {
-            if (tps < 5) {
-                if (beforeThatTick > 18) {
-                    LorenzUtils.debug("Detected hotswap now!")
-                    hotswap = true
-                }
-            }
-        } else {
-            if (tps > 15) {
-                hotswap = false
-            }
-        }
-        beforeThatTick = lastTps
-        lastTps = tps
-    }
-}

From 761f9a72e53f962e3c6906a8e27ba42240c93a2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:41:15 +0100
Subject: [PATCH 33/46] deleted old hotswap deletion v2

---
 src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt b/src/main/java/at/hannibal2/skyhanni/test/HotSwapDetection.kt
deleted file mode 100644
index e69de29bb2d1..000000000000

From 422aef39d8a6c26eac7f883ec2648f7557d8c0e4 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 22:06:21 +0100
Subject: [PATCH 34/46] fixed mock test

---
 .../skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 4 ++--
 .../hannibal2/skyhanni/features/garden/visitor/VisitorAPI.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 0fcb4c4b29d9..566a8c99b20a 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
@@ -621,11 +621,11 @@ class GardenVisitorFeatures {
         }
 
         event.addData {
-            val visitors = VisitorAPI.visitors
+            val visitors = VisitorAPI.getVisitors()
 
             add("visitors: ${visitors.size}")
 
-            for (visitor in visitors.values) {
+            for (visitor in visitors) {
                 add(" ")
                 add("visitorName: '${visitor.visitorName}'")
                 add("status: '${visitor.status}'")
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 4d892528adc1..c3c832d787c9 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
@@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
 import net.minecraft.item.ItemStack
 
 object VisitorAPI {
-    var visitors = mapOf<String, Visitor>()
+    private var visitors = mapOf<String, Visitor>()
     var inInventory = false
     val config get() = GardenAPI.config.visitors
     private val logger = LorenzLogger("garden/visitors/api")

From e8bfe63417de890f4ff34d93766ccc882841e48a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 22:14:43 +0100
Subject: [PATCH 35/46] Version 0.23 Beta 9

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b783ad7d41b..dc67375b0801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
     + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
       items in the Power Stone Guide.
 + Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
++ Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 
 #### Item Features
 
@@ -33,6 +34,17 @@
 
 + Add tab list fire sale advertisement hider. - nea
 
+#### Command Features
+
++ Party Kick with reason. - nea
+    + Added support for the Hypixel command /p kick /pk to add a reason. The reason will be sent in party chat before
+      kicking the player.
+
+#### Misc Features
+
++ Fixes Ghost Entities. - hannibal2 & nea & Thunderblade73
+    + Removes ghost entities caused by a Hypixel bug. This included Diana, Dungeon and Crimson Isle mobs and nametags.
+
 ### Changes
 
 #### Garden Changes
@@ -47,6 +59,7 @@
 + Jacob Contest feature now has clickable calendar open command when Elite API is not ready yet. - alexia
 + Mark carrot/pumpkin fortune as completed when giving to Carrolyn after already done. - alexia
 + Added ability to get unique visitors served without Green Thumb. - alexia
++ Check if you are sneaking for optimal speed in the Garden and show current speed when wrong. - alexia
 
 #### Rift Changes
 
@@ -81,6 +94,10 @@
 + Changed the description of the Dungeon Chat Filter feature to be more descriptive. - Wambo
 + Added options to change exactly what part of the Dungeon Chat Filter should be used. - Wambo
 
+#### Diana Changes
+
++ Changed the Griffin Burrow Guess text to a centered title instead of an odd line that goes down. - hannibal2
+
 #### Chat Changes
 
 + Hide new Fire Sale message format. - Thunderblade73
@@ -88,6 +105,7 @@
 + Added more messages to Hypixel Lobby spam hider.
     + SMP and Snow Particles. - walker
     + Earned mystery dust. - alexia
++ Added the fire sale ended message to the Fire Sale Chat Hider. - hannibal2
 
 #### Misc Changes
 
@@ -116,12 +134,14 @@
 + Fixed wrong calculation when zero bosses killed in slayer profit trackers. - hannibal2
 + Hide No Fishing Bait warning during Kuudra fight. - hannibal2
 + Fixed Dungeon and Kuudra party finder join message not detecting in party member tab complete. - CalMWolfs
++ Fixed Fire Veil Wand circle shows on left-clicking. - hannibal2
 
 #### Mining Fixes
 
 + Fixed an error when showing all elements in Powder Tracker. - hannibal2
 + Fixed powder tracker detecting gemstone chat messages. - CalMWolfs
 + Fixed Mining Chat Filter not hiding gemstone messages. - CalMWolfs
++ Fixed names for the Crystal Hollows Mining Areas feature. - alexia
 
 #### Rift Fixes
 
@@ -165,6 +185,7 @@
 + Maybe fixed Tia Relay Helper. - Thunderblade73
 + Fixed wording in trackers when the item is newly obtained. - hannibal2
 + Fixed titles not showing above other SkyHanni GUI elements all the time. - Thunderblade73
++ Fixed Daily City Project Reminder is still working on already-released projects. - alexia
 
 ### Technical Changes
 
@@ -191,6 +212,18 @@
 + Don't allow uppercase Repo Pattern keys and added a more descriptive error. - CalMWolfs
 + Moved party API chat messages to Repo Pattern. - CalMWolfs
 + Allowing nullable parameters for regex functions matches() and find(). - hannibal2
++ Cleanup calculate() in Estimated Item Value. - walker
++ Added DebugDataCollectEvent. - hannibal2
++ Added Diana Burrow Nearest Warp to /shdebugdata - hannibal2
++ Changed debug commands: - hannibal2
+    + /shdebugwaypoint -> /shtestwaypoint
+    + /shdebugtablist -> /shtesttablist
+    + /shdebugdata -> /shdebug
++ Moving dungeons and slayer related debug data into DebugDataCollectEvent. - hannibal2
+    + Allowing to hide/search for specific debug data with /shdebug <search> - hannibal2
++ Per default only active/relevant data is shown.
++ Added visitor status to /shdebug - hannibal2
++ Added hotswap detection and reloading all listeners on hotswap. - nea
 
 ## Version 0.22
 
diff --git a/FEATURES.md b/FEATURES.md
index 76a8ee2e16a7..a958b9fd4eb5 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -137,6 +137,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
       items in the Power Stone Guide.
 + Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
++ Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 
 </details>
 <details open><summary>
@@ -917,6 +918,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added AFK time to Discord RPC. - NetheriteMiner
 + Added the option to change Hypixel Wiki to the fandom Wiki in more areas than just the /wiki command. - Erymanthus
     + E.g. inside the SkyBlock leveling guide.
++ Fixes Ghost Entities. - hannibal2 & nea & Thunderblade73
+    + Removes ghost entities caused by a Hypixel bug. This included Diana, Dungeon and Crimson Isle mobs and nametags.
++ Party Kick with reason. - nea
+    + Added support for the Hypixel command /p kick /pk to add a reason. The reason will be sent in party chat before
+      kicking the player.
 
 </details>
 <details open><summary>
diff --git a/build.gradle.kts b/build.gradle.kts
index e2d7e04fa174..eba41e4ecc09 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.8"
+version = "0.23.Beta.9"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 40af07f900bb..029a9dac97a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -370,7 +370,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.8",
+    version = "0.23.Beta.9",
 )
 class SkyHanniMod {
 

From ba50ceb84f6992a4150b0f3afd6aad163dc2137f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 18 Jan 2024 22:16:19 +0100
Subject: [PATCH 36/46] nothing to see here

---
 .../features/garden/visitor/GardenVisitorFeatures.kt        | 6 ------
 1 file changed, 6 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 566a8c99b20a..de9e9bd8a690 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
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.Highli
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.SackAPI
 import at.hannibal2.skyhanni.data.SackStatus
-import at.hannibal2.skyhanni.events.BurrowGuessEvent
 import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -606,11 +605,6 @@ class GardenVisitorFeatures {
         }
     }
 
-    @SubscribeEvent
-    fun onBurrowGuess(event: BurrowGuessEvent) {
-        LorenzUtils.chat("gues the burrow!!")
-    }
-
     @SubscribeEvent
     fun onDebugDataCollect(event: DebugDataCollectEvent) {
         event.title("Garden Visitor Stats")

From cae50abbda2f5e2e53e81231b9f3a01215b0871e Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:01:45 +1100
Subject: [PATCH 37/46] add crop milestone commands (#869)

Added /shcalccrop and /shcalccroptime #869
---
 .../skyhanni/config/commands/Commands.kt      |  7 ++
 .../skyhanni/features/garden/CropType.kt      | 47 +++++++-----
 .../garden/FarmingMilestoneCommand.kt         | 72 +++++++++++++++++++
 3 files changed, 108 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.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 bb05b8aee0c1..d6f3d2fbd855 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -24,6 +24,7 @@ import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder
 import at.hannibal2.skyhanni.features.fame.CityProjectFeatures
 import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker
 import at.hannibal2.skyhanni.features.fishing.tracker.SeaCreatureTracker
+import at.hannibal2.skyhanni.features.garden.FarmingMilestoneCommand
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.features.garden.GardenCropTimeCommand
 import at.hannibal2.skyhanni.features.garden.GardenCropsInCommand
@@ -230,6 +231,12 @@ object Commands {
             "shresetseacreaturetracker",
             "Resets the Sea Creature Tracker"
         ) { SeaCreatureTracker.resetCommand(it) }
+        registerCommand0("shcalccrop", "Calculate how many crops need to be farmed between different crop milestones.", {
+            FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), false)
+        }, FarmingMilestoneCommand::onComplete)
+        registerCommand0("shcalccroptime", "Calculate how long you need to farm crops between different crop milestones.", {
+            FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), true)
+        }, FarmingMilestoneCommand::onComplete)
     }
 
     private fun usersBugFix() {
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 05abfe7441b5..3a7226cc4a59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt
@@ -12,28 +12,39 @@ enum class CropType(
     val specialDropType: String,
     val baseDrops: Double,
     iconSupplier: () -> ItemStack,
+    val simpleName: String,
     val replenish: Boolean = false,
 ) {
-    WHEAT("Wheat", "THEORETICAL_HOE_WHEAT", "CROPIE", 1.0, { ItemStack(Items.wheat) }),
-    CARROT("Carrot", "THEORETICAL_HOE_CARROT", "CROPIE", 3.0, { ItemStack(Items.carrot) }, replenish = true),
-    POTATO("Potato", "THEORETICAL_HOE_POTATO", "CROPIE", 3.0, { ItemStack(Items.potato) }, replenish = true),
-    NETHER_WART(
-        "Nether Wart",
-        "THEORETICAL_HOE_WARTS",
-        "FERMENTO",
-        2.5,
-        { ItemStack(Items.nether_wart) },
-        replenish = true
+    WHEAT("Wheat", "THEORETICAL_HOE_WHEAT", "CROPIE", 1.0,
+        { ItemStack(Items.wheat) }, "wheat"
     ),
-    PUMPKIN("Pumpkin", "PUMPKIN_DICER", "SQUASH", 1.0, { ItemStack(Blocks.pumpkin) }),
-    MELON("Melon", "MELON_DICER", "SQUASH", 5.0, { ItemStack(Items.melon) }),
-    COCOA_BEANS(
-        "Cocoa Beans", "COCO_CHOPPER", "SQUASH",
-        3.0, { ItemStack(Items.dye, 1, EnumDyeColor.BROWN.dyeDamage) }, replenish = true
+    CARROT("Carrot", "THEORETICAL_HOE_CARROT", "CROPIE", 3.0,
+        { ItemStack(Items.carrot) }, "carrot", replenish = true
+    ),
+    POTATO("Potato", "THEORETICAL_HOE_POTATO", "CROPIE", 3.0,
+        { ItemStack(Items.potato) }, "potato", replenish = true
+    ),
+    NETHER_WART("Nether Wart", "THEORETICAL_HOE_WARTS", "FERMENTO", 2.5,
+        { ItemStack(Items.nether_wart) }, "wart", replenish = true
+    ),
+    PUMPKIN("Pumpkin", "PUMPKIN_DICER", "SQUASH", 1.0,
+        { ItemStack(Blocks.pumpkin) }, "pumpkin"
+    ),
+    MELON("Melon", "MELON_DICER", "SQUASH", 5.0,
+        { ItemStack(Items.melon) }, "melon"
+    ),
+    COCOA_BEANS("Cocoa Beans", "COCO_CHOPPER", "SQUASH", 3.0,
+        { ItemStack(Items.dye, 1, EnumDyeColor.BROWN.dyeDamage) }, "cocoa", replenish = true
+    ),
+    SUGAR_CANE("Sugar Cane", "THEORETICAL_HOE_CANE", "FERMENTO", 2.0,
+        { ItemStack(Items.reeds) }, "cane"
+    ),
+    CACTUS("Cactus", "CACTUS_KNIFE", "FERMENTO", 2.0,
+        { ItemStack(Blocks.cactus) }, "cactus"
+    ),
+    MUSHROOM("Mushroom", "FUNGI_CUTTER", "FERMENTO", 1.0,
+        { ItemStack(Blocks.red_mushroom_block) }, "mushroom"
     ),
-    SUGAR_CANE("Sugar Cane", "THEORETICAL_HOE_CANE", "FERMENTO", 2.0, { ItemStack(Items.reeds) }),
-    CACTUS("Cactus", "CACTUS_KNIFE", "FERMENTO", 2.0, { ItemStack(Blocks.cactus) }),
-    MUSHROOM("Mushroom", "FUNGI_CUTTER", "FERMENTO", 1.0, { ItemStack(Blocks.red_mushroom_block) }),
     ;
 
     val icon by lazy { iconSupplier() }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
new file mode 100644
index 000000000000..cdfae78e805f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
@@ -0,0 +1,72 @@
+package at.hannibal2.skyhanni.features.garden
+
+import at.hannibal2.skyhanni.data.GardenCropMilestones
+import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
+import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.TimeUtils
+import net.minecraft.command.CommandBase
+
+object FarmingMilestoneCommand {
+
+    fun onCommand(crop: String?, current: String?, target: String?, needsTime: Boolean) {
+        if (crop == null) {
+            LorenzUtils.userError("No crop type entered")
+            return
+        }
+
+        val enteredCrop = CropType.entries.firstOrNull { it.simpleName == crop.lowercase() } ?: run {
+            LorenzUtils.userError("Invalid crop type entered")
+            return
+        }
+
+        val currentMilestone = getValidNumber(current)
+        val targetMilestone = getValidNumber(target)
+
+        if (currentMilestone == null) {
+            val currentProgress = enteredCrop.getCounter()
+            val currentCropMilestone = GardenCropMilestones.getTierForCropCount(currentProgress, enteredCrop) + 1
+            val output = (GardenCropMilestones.getCropsForTier(currentCropMilestone, enteredCrop) - currentProgress).formatOutput(needsTime, enteredCrop)
+
+            LorenzUtils.chat("§7$output needed to reach the next milestone")
+            return
+        }
+
+        if (targetMilestone == null) {
+            val output = GardenCropMilestones.getCropsForTier(currentMilestone, enteredCrop).formatOutput(needsTime, enteredCrop)
+
+            LorenzUtils.chat("§7$output needed for milestone §7$currentMilestone")
+            return
+        }
+        if (currentMilestone >= targetMilestone) {
+            LorenzUtils.userError("Entered milestone is greater than or the same as target milestone")
+            return
+        }
+
+        val currentAmount = GardenCropMilestones.getCropsForTier(currentMilestone, enteredCrop)
+        val targetAmount = GardenCropMilestones.getCropsForTier(targetMilestone, enteredCrop)
+        val output = (targetAmount - currentAmount).formatOutput(needsTime, enteredCrop)
+
+        LorenzUtils.chat("§7$output needed for milestone §7$currentMilestone §a-> §7$targetMilestone")
+    }
+
+    fun onComplete(strings: Array<String>): List<String> {
+        return if (strings.size <= 1) {
+            CommandBase.getListOfStringsMatchingLastWord(
+                strings,
+                CropType.entries.map { it.simpleName }
+            )
+        }
+        else listOf()
+    }
+
+    private fun getValidNumber(entry: String?) = entry?.toIntOrNull()?.coerceIn(0, 46)
+
+    private fun Long.formatOutput(needsTime: Boolean, crop: CropType): String {
+        if (!needsTime) return "${this.addSeparators()} §a${crop.cropName}"
+        val speed = crop.getSpeed() ?: -1
+        val missingTimeSeconds = this / speed
+        return "${TimeUtils.formatDuration(missingTimeSeconds * 1000)}§a"
+    }
+}

From 1f950c47b505a47ca49be67b7f0d85c2c65ae1da Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 20 Jan 2024 10:02:14 +0100
Subject: [PATCH 38/46] code cleanup

---
 .../skyhanni/features/garden/FarmingMilestoneCommand.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
index cdfae78e805f..7f7832ff15e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt
@@ -27,14 +27,16 @@ object FarmingMilestoneCommand {
         if (currentMilestone == null) {
             val currentProgress = enteredCrop.getCounter()
             val currentCropMilestone = GardenCropMilestones.getTierForCropCount(currentProgress, enteredCrop) + 1
-            val output = (GardenCropMilestones.getCropsForTier(currentCropMilestone, enteredCrop) - currentProgress).formatOutput(needsTime, enteredCrop)
+            val cropsForTier = GardenCropMilestones.getCropsForTier(currentCropMilestone, enteredCrop)
+            val output = (cropsForTier - currentProgress).formatOutput(needsTime, enteredCrop)
 
             LorenzUtils.chat("§7$output needed to reach the next milestone")
             return
         }
 
         if (targetMilestone == null) {
-            val output = GardenCropMilestones.getCropsForTier(currentMilestone, enteredCrop).formatOutput(needsTime, enteredCrop)
+            val cropsForTier = GardenCropMilestones.getCropsForTier(currentMilestone, enteredCrop)
+            val output = cropsForTier.formatOutput(needsTime, enteredCrop)
 
             LorenzUtils.chat("§7$output needed for milestone §7$currentMilestone")
             return
@@ -57,8 +59,7 @@ object FarmingMilestoneCommand {
                 strings,
                 CropType.entries.map { it.simpleName }
             )
-        }
-        else listOf()
+        } else listOf()
     }
 
     private fun getValidNumber(entry: String?) = entry?.toIntOrNull()?.coerceIn(0, 46)

From 2d11b0cfe4adf7b6535d91cbdf339e47898d925e Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 20 Jan 2024 10:06:38 +0100
Subject: [PATCH 39/46] Feature: SkyblockXPInChat (#919)

Added Skyblock XP Chat. #919
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 +
 .../config/features/chat/ChatConfig.java      |  9 ++-
 .../skyhanni/data/ActionBarStatsData.kt       | 70 ++++++++++++++-----
 .../skyhanni/events/ActionBarValueUpdate.kt   |  5 ++
 .../skyhanni/events/LorenzActionBarEvent.kt   |  2 +-
 .../features/chat/SkyblockXPInChat.kt         | 19 +++++
 .../features/misc/discordrpc/DiscordStatus.kt |  7 +-
 7 files changed, 88 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdate.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/chat/SkyblockXPInChat.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 029a9dac97a0..31816f28cbf1 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -66,6 +66,7 @@ import at.hannibal2.skyhanni.features.chat.ChatFilter
 import at.hannibal2.skyhanni.features.chat.CompactBestiaryChatMessage
 import at.hannibal2.skyhanni.features.chat.CompactSplashPotionMessage
 import at.hannibal2.skyhanni.features.chat.PlayerDeathMessages
+import at.hannibal2.skyhanni.features.chat.SkyblockXPInChat
 import at.hannibal2.skyhanni.features.chat.Translator
 import at.hannibal2.skyhanni.features.chat.WatchdogHider
 import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFilter
@@ -497,6 +498,7 @@ class SkyHanniMod {
         loadModule(ViewRecipeCommand)
         loadModule(PartyCommands)
         loadModule(SummoningMobManager())
+        loadModule(SkyblockXPInChat())
         loadModule(AreaMiniBossFeatures())
         loadModule(MobHighlight())
         loadModule(SpawnTimers())
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 1784d916dcf9..4e9a351a74cf 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
@@ -7,10 +7,9 @@
 import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
-import org.lwjgl.input.Keyboard;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.lwjgl.input.Keyboard;
 
 public class ChatConfig {
 
@@ -118,4 +117,10 @@ public String toString() {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean translator = false;
+
+    @Expose
+    @ConfigOption(name = "Skyblock XP Chat", desc = "Sends the Skyblock XP message into the chat.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean skyBlockXPInChat = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt
index cddf83d0bdcb..e4f78142f716 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt
@@ -1,29 +1,61 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.events.ActionBarValueUpdate
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.intellij.lang.annotations.Language
 
-object ActionBarStatsData {
-    // TODO USE SH-REPO
-    private val patterns = mapOf(
-        "health" to "§[c6](?<health>[\\d,]+)/[\\d,]+❤.*".toPattern(),
-        "defense" to ".*§a(?<defense>[\\d,]+)§a❈.*".toPattern(),
-        "mana" to ".*§b(?<mana>[\\d,]+)/[\\d,]+✎.*".toPattern(),
-        "riftTime" to "§[a7](?<riftTime>[\\dms ]+)ф.*".toPattern(),
-    )
-
-    var groups = mutableMapOf("health" to "", "riftTime" to "", "defense" to "", "mana" to "")
-
-    @SubscribeEvent
-    fun onActionBar(event: LorenzActionBarEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-
-        for ((groupName, pattern) in patterns) {
-            pattern.matchMatcher(event.message) {
-                groups[groupName] = group(groupName)
-            }
+enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) {
+    HEALTH(
+        // language=RegExp
+        "§[c6](?<health>[\\d,]+)/[\\d,]+❤.*"
+    ),
+    DEFENSE(
+        // language=RegExp
+        ".*§a(?<defense>[\\d,]+)§a❈.*"
+    ),
+    MANA(
+        // language=RegExp
+        ".*§b(?<mana>[\\d,]+)/[\\d,]+✎.*"
+    ),
+    RIFT_TIME(
+        // language=RegExp
+        "§[a7](?<riftTime>[\\dms ]+)ф.*"
+    ),
+    SKYBLOCK_XP(
+        // language=RegExp
+        ".*(§b\\+\\d+ SkyBlock XP §.\\([^()]+\\)§b \\(\\d+/\\d+\\)).*"
+    ),
+    ;
+
+    private val repoKey = name.replace("_", ".").lowercase()
+
+    internal val pattern by RepoPattern.pattern("actionbar.$repoKey", rawPattern)
+    var value: String = ""
+        private set
+
+    companion object {
+
+        init {
+            entries.forEach { it.pattern }
+        }
+
+        @SubscribeEvent
+        fun onActionBar(event: LorenzActionBarEvent) {
+            if (!LorenzUtils.inSkyBlock) return
+
+            entries.mapNotNull { data ->
+                data.pattern.matchMatcher(event.message) {
+                    val newValue = group(1)
+                    if (data.value != newValue) {
+                        data.value = newValue
+                        ActionBarValueUpdate(data)
+                    } else null
+                }
+            }.forEach { it.postAndCatch() }
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdate.kt b/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdate.kt
new file mode 100644
index 000000000000..f6afd98e2d25
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdate.kt
@@ -0,0 +1,5 @@
+package at.hannibal2.skyhanni.events
+
+import at.hannibal2.skyhanni.data.ActionBarStatsData
+
+class ActionBarValueUpdate(val updated: ActionBarStatsData) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt
index e5e936fb07bd..83cddb287f06 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt
@@ -1,3 +1,3 @@
 package at.hannibal2.skyhanni.events
 
-class LorenzActionBarEvent(val message: String) : LorenzEvent()
\ No newline at end of file
+class LorenzActionBarEvent(val message: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/SkyblockXPInChat.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/SkyblockXPInChat.kt
new file mode 100644
index 000000000000..a4b7604cecda
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/SkyblockXPInChat.kt
@@ -0,0 +1,19 @@
+package at.hannibal2.skyhanni.features.chat
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ActionBarStatsData
+import at.hannibal2.skyhanni.events.ActionBarValueUpdate
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class SkyblockXPInChat {
+
+    val config get() = SkyHanniMod.feature.chat.skyBlockXPInChat
+
+    @SubscribeEvent
+    fun onActionBarValueUpdate(event: ActionBarValueUpdate) {
+        if (event.updated != ActionBarStatsData.SKYBLOCK_XP) return
+        if (!config) return
+        LorenzUtils.chat(event.updated.value)
+    }
+}
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 2f7be15ec76d..4c972750d5f6 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
@@ -166,13 +166,12 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?)
     }),
 
     STATS({
-        val groups = ActionBarStatsData.groups
         val statString = if (!RiftAPI.inRift()) {
-            "❤${groups["health"]} ❈${groups["defense"]} ✎${groups["mana"]}"
+            "❤${ActionBarStatsData.HEALTH.value} ❈${ActionBarStatsData.DEFENSE.value} ✎${ActionBarStatsData.MANA.value}"
         } else {
-            "${groups["riftTime"]}ф ✎${groups["mana"]}"
+            "${ActionBarStatsData.RIFT_TIME.value}ф ✎${ActionBarStatsData.MANA.value}"
         }
-        if (groups["mana"] != "") {
+        if (ActionBarStatsData.MANA.value != "") {
             lastKnownDisplayStrings[STATS] = statString
         }
         lastKnownDisplayStrings[STATS] ?: ""

From 8024af3c90343899ace8060f2ddda427e6c7dc10 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 20 Jan 2024 10:08:30 +0100
Subject: [PATCH 40/46] Backend: ItemCategory + better LorenzeRarity (#811)

Categorizes every item using the rarity lore line. Also a better way of getting the item rarity Rarity #811
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |   2 +
 .../config/features/dev/DebugConfig.java      |   5 +
 .../skyhanni/test/SkyHanniDebugsAndTests.kt   |  29 +++--
 .../skyhanni/utils/CachedItemData.kt          |   2 +
 .../hannibal2/skyhanni/utils/ItemCategory.kt  |  51 +++++++++
 .../at/hannibal2/skyhanni/utils/ItemUtils.kt  | 102 +++++++++++++-----
 .../hannibal2/skyhanni/utils/LorenzRarity.kt  |  28 +----
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   |   9 +-
 .../hannibal2/skyhanni/utils/UtilsPatterns.kt |  38 +++++++
 9 files changed, 207 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 31816f28cbf1..2935c8222151 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -349,6 +349,7 @@ import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging
 import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.TabListData
+import at.hannibal2.skyhanni.utils.UtilsPatterns
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPatternManager
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -432,6 +433,7 @@ class SkyHanniMod {
         loadModule(GardenBestCropTime())
         loadModule(TrackerManager)
         loadModule(SkyBlockItemModifierUtils)
+        loadModule(UtilsPatterns)
 
         // APIs
         loadModule(BazaarApi())
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 7aba8033b178..9b7db7584622 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
@@ -41,6 +41,11 @@ public class DebugConfig {
     @ConfigEditorBoolean
     public boolean showItemRarity = false;
 
+    @Expose
+    @ConfigOption(name = "Show Item Category", desc = "Show item categories in item lore.")
+    @ConfigEditorBoolean
+    public boolean showItemCategory = false;
+
     @Expose
     @ConfigOption(name = "Copy Internal Name", desc = "Copies the internal name of an item on key press in the clipboard.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index ec850f5dd9ee..776d0fca1ad3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -19,6 +19,7 @@ import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.InventoryUtils
 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.name
 import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
@@ -398,10 +399,20 @@ class SkyHanniDebugsAndTests {
         if (!debugConfig.showItemRarity) return
         val itemStack = event.itemStack
 
-        val rarity = itemStack.getItemRarityOrNull(logError = false)
+        val rarity = itemStack.getItemRarityOrNull()
         event.toolTip.add("Item rarity: $rarity")
     }
 
+    @SubscribeEvent
+    fun showItemCategory(event: LorenzToolTipEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!debugConfig.showItemCategory) return
+        val itemStack = event.itemStack
+
+        val category = itemStack.getItemCategoryOrNull()?.name ?: "UNCLASSIFIED"
+        event.toolTip.add("Item category: $category")
+    }
+
     @SubscribeEvent
     fun onSHowNpcPrice(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -446,7 +457,7 @@ class SkyHanniDebugsAndTests {
 //        val pitch = event.pitch
 //        val volume = event.volume
 
-        //background music
+        // background music
 //        if (soundName == "note.harp") {
 ////                if (distance < 2) {
 //
@@ -481,7 +492,7 @@ class SkyHanniDebugsAndTests {
 //            }
 //        }
 
-        //diana ancestral spade
+        // diana ancestral spade
 //        if (soundName == "note.harp") {
 //            val list = mutableListOf<Float>()
 //            list.add(0.52380955f)
@@ -556,7 +567,7 @@ class SkyHanniDebugsAndTests {
 //            }
 //        }
 
-        //use ancestral spade
+        // use ancestral spade
 //        if (soundName == "mob.zombie.infect") {
 //            if (pitch == 1.968254f) {
 //                if (volume == 0.3f) {
@@ -566,7 +577,7 @@ class SkyHanniDebugsAndTests {
 //            }
 //        }
 
-        //wither shield activated
+        // wither shield activated
 //        if (soundName == "mob.zombie.remedy") {
 //            if (pitch == 0.6984127f) {
 //                if (volume == 1f) {
@@ -575,7 +586,7 @@ class SkyHanniDebugsAndTests {
 //            }
 //        }
 
-        //wither shield cooldown over
+        // wither shield cooldown over
 //        if (soundName == "random.levelup") {
 //            if (pitch == 3f) {
 //                if (volume == 1f) {
@@ -584,21 +595,21 @@ class SkyHanniDebugsAndTests {
 //            }
 //        }
 
-        //teleport (hyp or aote)
+        // teleport (hyp or aote)
 //        if (soundName == "mob.endermen.portal") {
 //            if (pitch == 1f && volume == 1f) {
 //                return
 //            }
 //        }
 
-        //hyp wither impact
+        // hyp wither impact
 //        if (soundName == "random.explode") {
 //            if (pitch == 1f && volume == 1f) {
 //                return
 //            }
 //        }
 
-        //pick coins up
+        // pick coins up
 //        if (soundName == "random.orb") {
 //            if (pitch == 1.4920635f && volume == 1f) {
 //                return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
index 9d00958f2a14..e22f1cba58c7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
@@ -21,4 +21,6 @@ data class CachedItemData(
 
     // null = not loaded
     var itemRarity: LorenzRarity? = null,
+
+    var itemCategory: ItemCategory? = null,
 )
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
new file mode 100644
index 000000000000..fa8003ca512b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.utils
+
+enum class ItemCategory {
+    SWORD,
+    LONGSWORD,
+    BOW,
+    SHORT_BOW,
+    WAND,
+    FISHING_WEAPON,
+    FISHING_ROD,
+    AXE,
+    GAUNTLET,
+    HOE,
+    PICKAXE,
+    SHOVEL,
+    DRILL,
+    SHEARS,
+    DEPLOYABLE,
+    VACUUM,
+    ABIPHONE,
+    BELT,
+    NECKLACE,
+    CLOAK,
+    GLOVES,
+    BRACELET,
+    HELMET,
+    CHESTPLATE,
+    LEGGINGS,
+    BOOTS,
+    HATCESSORY,
+    ACCESSORY,
+    POWER_STONE,
+    TRAVEL_SCROLL,
+    REFORGE_STONE,
+    BAIT,
+    PET,
+    TROPHY_FISH,
+    ARROW,
+    ARROW_POISON,
+    ITEM,
+    PET_ITEM,
+    ENCHANTED_BOOK,
+    POTION,
+    RIFT_TIMECHARM,
+    COSMETIC,
+    MEMENTO,
+    PORTAL,
+
+    NONE,
+    ;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 38e1c40c07c3..3bc79dbf29f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.cachedData
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.GsonBuilder
@@ -205,42 +206,95 @@ object ItemUtils {
 
     fun ItemStack.getItemRarityOrCommon() = getItemRarityOrNull() ?: LorenzRarity.COMMON
 
-    fun ItemStack.getItemRarityOrNull(logError: Boolean = true): LorenzRarity? {
-        val data = cachedData
-        if (data.itemRarityLastCheck.asTimeMark().passedSince() < 1.seconds) {
-            return data.itemRarity
+    private fun ItemStack.readItemCategoryAndRarity(): Pair<LorenzRarity?, ItemCategory?> {
+        val name = this.name ?: ""
+        val cleanName = this.cleanName()
+
+        if (isPet(cleanName)) {
+            return getPetRarity(this) to ItemCategory.PET
         }
-        data.itemRarityLastCheck = SimpleTimeMark.now().toMillis()
 
+        for (line in this.getLore().reversed()) {
+            val (category, rarity) = UtilsPatterns.rarityLoreLinePattern.matchMatcher(line) {
+                group("itemCategory").replace(" ", "_") to
+                    group("rarity").replace(" ", "_")
+            } ?: continue
+
+            val itemCategory = getItemCategory(category, name, cleanName)
+            val itemRarity = LorenzRarity.getByName(rarity)
+
+            if (itemCategory == null) {
+                ErrorManager.logErrorStateWithData(
+                    "Could not read category for item $name",
+                    "Failed to read category from item rarity via item lore",
+                    "internal name" to getInternalName(),
+                    "item name" to name,
+                    "inventory name" to InventoryUtils.openInventoryName(),
+                    "pattern result" to category,
+                    "lore" to getLore(),
+                )
+            }
+            if (itemRarity == null) {
+                ErrorManager.logErrorStateWithData(
+                    "Could not read rarity for item $name",
+                    "Failed to read rarity from item rarity via item lore",
+                    "internal name" to getInternalName(),
+                    "item name" to name,
+                    "inventory name" to InventoryUtils.openInventoryName(),
+                    "lore" to getLore(),
+                )
+            }
+
+            return itemRarity to itemCategory
+        }
+        return null to null
+    }
+
+    private fun getItemCategory(itemCategory: String, name: String, cleanName: String = name.removeColor()) =
+        if (itemCategory.isEmpty()) when {
+            UtilsPatterns.abiPhonePattern.matches(name) -> ItemCategory.ABIPHONE
+            isPet(cleanName) -> ItemCategory.PET
+            UtilsPatterns.enchantedBookPattern.matches(name) -> ItemCategory.ENCHANTED_BOOK
+            UtilsPatterns.potionPattern.matches(name) -> ItemCategory.POTION
+            else -> ItemCategory.NONE
+        } else {
+            LorenzUtils.enumValueOfOrNull<ItemCategory>(itemCategory)
+        }
+
+    private fun ItemStack.updateCategoryAndRarity() {
+        val data = cachedData
+        data.itemRarityLastCheck = SimpleTimeMark.now().toMillis()
         val internalName = getInternalName()
         if (internalName == NEUInternalName.NONE) {
             data.itemRarity = null
-            return null
+            data.itemCategory = null
+            return
         }
+        val pair = this.readItemCategoryAndRarity()
+        data.itemRarity = pair.first
+        data.itemCategory = pair.second
+    }
 
-
-        if (isPet(cleanName())) {
-            val petRarity = getPetRarity(this)
-            data.itemRarity = petRarity
-            return petRarity
+    fun ItemStack.getItemCategoryOrNull(): ItemCategory? {
+        val data = cachedData
+        if (itemRarityLastCheck(data)) {
+            this.updateCategoryAndRarity()
         }
+        return data.itemCategory
+    }
 
-        val rarity = LorenzRarity.readItemRarity(this)
-        data.itemRarity = rarity
-        if (rarity == null && logError) {
-            ErrorManager.logErrorStateWithData(
-                "Could not read rarity for item $name",
-                "Failed to read rarity from item rarity via item lore",
-                "internal name" to internalName,
-                "item name" to name,
-                "inventory name" to InventoryUtils.openInventoryName(),
-                "lore" to getLore(),
-            )
+    fun ItemStack.getItemRarityOrNull(): LorenzRarity? {
+        val data = cachedData
+        if (itemRarityLastCheck(data)) {
+            this.updateCategoryAndRarity()
         }
-        return rarity
+        return data.itemRarity
     }
 
-    //extra method for shorter name and kotlin nullability logic
+    private fun itemRarityLastCheck(data: CachedItemData) =
+        data.itemRarityLastCheck.asTimeMark().passedSince() > 10.seconds
+
+    // extra method for shorter name and kotlin nullability logic
     var ItemStack.name: String?
         get() = this.displayName
         set(value) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
index 64d5f85389bc..75412b83f997 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
@@ -1,12 +1,10 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import net.minecraft.item.ItemStack
-
 
 // TODO: replace id with ordinal
 enum class LorenzRarity(val color: LorenzColor, val id: Int) {
+
     COMMON(LorenzColor.WHITE, 0),
     UNCOMMON(LorenzColor.GREEN, 1),
     RARE(LorenzColor.BLUE, 2),
@@ -17,15 +15,11 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
     SUPREME(LorenzColor.DARK_RED, 7),
     SPECIAL(LorenzColor.RED, 8),
     VERY_SPECIAL(LorenzColor.RED, 9),
-    ULTIMATE_COSMETIC(LorenzColor.DARK_RED, 10),
+    ULTIMATE(LorenzColor.DARK_RED, 10),
     ;
 
     val chatColorCode by lazy { color.getChatColor() }
-    private val rawName by lazy { name.replace("_", " ") }
-    private val normalName by lazy { "$chatColorCode§l$rawName" }
-    private val recombName by lazy { "$chatColorCode§l§ka§r $chatColorCode§l$chatColorCode§l$rawName" }
-
-    //§d§l§ka§r §d§l§d§lMYTHIC
+    val rawName = name.replace("_", " ")
 
     fun oneBelow(logError: Boolean = true): LorenzRarity? {
         val rarityBelow = getById(ordinal - 1)
@@ -54,20 +48,8 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
     fun isAtLeast(other: LorenzRarity): Boolean = this.ordinal >= other.ordinal
 
     companion object {
-        fun getById(id: Int) = entries.firstOrNull { it.ordinal == id }
-        fun getByName(name: String) = entries.firstOrNull { it.name == name }
 
-        fun readItemRarity(itemStack: ItemStack): LorenzRarity? {
-            for (line in itemStack.getLore()) {
-                val string = line.replace("SHINY ", "")
-                for (rarity in LorenzRarity.entries) {
-                    if (string.startsWith(rarity.normalName) || string.startsWith(rarity.recombName)) {
-                        return rarity
-                    }
-                }
-            }
-            return null
-        }
+        fun getById(id: Int) = if (entries.size > id) entries[id] else null
+        fun getByName(name: String) = entries.firstOrNull { it.name == name }
     }
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 9e8fc6b8e3e0..572aa147f48f 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -265,7 +265,7 @@ object LorenzUtils {
 
     fun getSBMonthByName(month: String): Int {
         var monthNr = 0
-        for (i in 1..12) {
+        for (i in 1 .. 12) {
             val monthName = SkyBlockTime.monthName(i)
             if (month == monthName) {
                 monthNr = i
@@ -352,7 +352,7 @@ object LorenzUtils {
         hover: List<String>,
         command: String? = null,
         prefix: Boolean = true,
-        prefixColor: String = "§e"
+        prefixColor: String = "§e",
     ) {
         val msgPrefix = if (prefix) prefixColor + CHAT_PREFIX else ""
         val text = ChatComponentText(msgPrefix + message)
@@ -452,7 +452,7 @@ object LorenzUtils {
         prefix: String,
         getName: (T) -> String,
         isCurrent: (T) -> Boolean,
-        crossinline onChange: (T) -> Unit
+        crossinline onChange: (T) -> Unit,
     ) = buildList {
         add(prefix)
         for (entry in enumValues<T>()) {
@@ -672,6 +672,9 @@ object LorenzUtils {
         enumValueOfOrNull<T>(name)
             ?: kotlin.error("Unknown enum constant for ${enumValues<T>().first().name.javaClass.simpleName}: '$name'")
 
+    inline fun <reified T : Enum<T>> enumJoinToPattern(noinline transform: (T) -> CharSequence = { it.name }) =
+        enumValues<T>().joinToString("|", transform = transform)
+
     fun isInDevEnviromen() = Launch.blackboard["fml.deobfuscatedEnvironment"] as Boolean
 
     fun shutdownMinecraft(reason: String? = null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
new file mode 100644
index 000000000000..fdaa65050a68
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
@@ -0,0 +1,38 @@
+package at.hannibal2.skyhanni.utils
+
+import at.hannibal2.skyhanni.utils.LorenzUtils.enumJoinToPattern
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+
+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
+    §6§lSHINY LEGENDARY DUNGEON BOOTS
+    §6§lLEGENDARY DUNGEON BOOTS
+    §5§lEPIC BOOTS
+    §f§lCOMMON
+     **/
+    val rarityLoreLinePattern by patternGroup.pattern(
+        "item.lore.rarity.line",
+        "^(?:§.){2,3}(?:.§. (?:§.){4})?(?:SHINY )?(?<rarity>${enumJoinToPattern<LorenzRarity> { it.name.replace("_", " ") }}) ?(?:DUNGEON )?(?<itemCategory>[^§]*)(?: (?:§.){3}.)?$"
+    )
+
+    val abiPhonePattern by patternGroup.pattern(
+        "item.name.abiphone",
+        ".{2}Abiphone .*"
+    )
+
+    val enchantedBookPattern by patternGroup.pattern(
+        "item.name.enchanted.book",
+        ".{2}?Enchanted Book"
+    )
+
+    val potionPattern by patternGroup.pattern(
+        "item.name.potion",
+        ".*Potion"
+    )
+}

From a4fe926ce0765fdb5c776f8b8501c5d5c38e1f76 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:13:37 +1100
Subject: [PATCH 41/46] update powder message (#940)

Fixed detection of gold and diamond essence gain chat message when powder mining. #940
---
 .../java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt    | 2 +-
 .../features/mining/powdertracker/PowderChestReward.kt        | 4 ++--
 2 files changed, 3 insertions(+), 3 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 54fb67c0c2e2..416f498428f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -298,7 +298,7 @@ class ChatFilter {
 
         // 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".toPattern(),
+        "§aYou received §r(§6|§b)\\+[1-2] (Diamond|Gold) Essence§r§a.".toPattern(),
     )
     private val fireSalePatterns = listOf(
         "§c♨ §eFire Sales for .* §eare starting soon!".toPattern(),
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 8ae17eaf68af..3df832563034 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
@@ -145,8 +145,8 @@ enum class PowderChestReward(val displayName: String, pattern: String) {
     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."),
 
-    DIAMOND_ESSENCE("§bDiamond Essence", "§aYou received §r§b[+](?<amount>.*) Diamond Essence"),
-    GOLD_ESSENCE("§6Gold Essence", "§aYou received §r§6[+](?<amount>.*) Gold Essence"),
+    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."),
     ;
 
     val chatPattern by RepoPattern.pattern("mining.powder.tracker.reward." + this.patternName(), pattern)

From 3b3487deaea5cbfda16382f6eeaeb7856ec368f0 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 20 Jan 2024 10:39:13 +0100
Subject: [PATCH 42/46] Feature: Shift Click in Brewing Stand (#921)

Added Shift Click Brewing. #921
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |  2 ++
 .../features/inventory/InventoryConfig.java   |  6 +++++
 .../features/inventory/ShiftClickBrewing.kt   | 27 +++++++++++++++++++
 .../features/inventory/ShiftClickEquipment.kt | 13 +++------
 .../features/inventory/ShiftClickNPCSell.kt   |  7 ++---
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   | 15 ++++++++---
 6 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickBrewing.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 2935c8222151..bedfd4b334e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -209,6 +209,7 @@ import at.hannibal2.skyhanni.features.inventory.PowerStoneGuideFeatures
 import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures
 import at.hannibal2.skyhanni.features.inventory.RngMeterInventory
 import at.hannibal2.skyhanni.features.inventory.SackDisplay
+import at.hannibal2.skyhanni.features.inventory.ShiftClickBrewing
 import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment
 import at.hannibal2.skyhanni.features.inventory.ShiftClickNPCSell
 import at.hannibal2.skyhanni.features.inventory.SkyBlockLevelGuideHelper
@@ -478,6 +479,7 @@ class SkyHanniMod {
         loadModule(TrophyFishFillet())
         loadModule(TrophyFishMessages())
         loadModule(BazaarBestSellMethod())
+        loadModule(ShiftClickBrewing())
         loadModule(BazaarOpenPriceWebsite())
         loadModule(AuctionHouseCopyUnderbidPrice())
         loadModule(AnvilCombineHelper())
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 0aed8ec3f7c3..b01498728615 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
@@ -194,4 +194,10 @@ public String toString() {
     @FeatureToggle
     public boolean shiftClickNPCSell = false;
 
+    @Expose
+    @ConfigOption(name = "Shift Click Brewing", desc = "Makes normal clicks to shift clicks in Brewing Stand inventory.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean shiftClickBrewing = false;
+
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickBrewing.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickBrewing.kt
new file mode 100644
index 000000000000..0e7337bc0cbe
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickBrewing.kt
@@ -0,0 +1,27 @@
+package at.hannibal2.skyhanni.features.inventory
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.makeShiftClick
+import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class ShiftClickBrewing {
+
+    @SubscribeEvent
+    fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!SkyHanniMod.feature.inventory.shiftClickBrewing) return
+
+        if (event.gui !is GuiChest) return
+
+        if (event.slot == null) return
+
+        val chestName = InventoryUtils.openInventoryName()
+        if (!chestName.startsWith("Brewing Stand")) return
+
+        event.makeShiftClick()
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickEquipment.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickEquipment.kt
index a472d4b9000f..4f9b08b20523 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickEquipment.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickEquipment.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.client.Minecraft
+import at.hannibal2.skyhanni.utils.LorenzUtils.makeShiftClick
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -26,13 +26,6 @@ class ShiftClickEquipment {
         val chestName = InventoryUtils.openInventoryName()
         if (!chestName.startsWith("Your Equipment")) return
 
-        event.isCanceled = true
-        Minecraft.getMinecraft().playerController.windowClick(
-            event.container.windowId,
-            event.slot.slotNumber,
-            event.clickedButton,
-            1,
-            Minecraft.getMinecraft().thePlayer
-        )
+        event.makeShiftClick()
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt
index 9a18572b1b52..5e6c8bf6b9c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt
@@ -6,9 +6,9 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.makeShiftClick
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object ShiftClickNPCSell {
@@ -46,9 +46,6 @@ object ShiftClickNPCSell {
 
         if (slot.slotNumber == slot.slotIndex) return
 
-        event.isCanceled = true
-        Minecraft.getMinecraft().playerController.windowClick(
-            event.container.windowId, event.slot.slotNumber, event.clickedButton, 1, Minecraft.getMinecraft().thePlayer
-        )
+        event.makeShiftClick()
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 572aa147f48f..666ea54ea51e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.MayorElection
 import at.hannibal2.skyhanni.data.TitleManager
+import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiEditSign
@@ -265,7 +266,7 @@ object LorenzUtils {
 
     fun getSBMonthByName(month: String): Int {
         var monthNr = 0
-        for (i in 1 .. 12) {
+        for (i in 1..12) {
             val monthName = SkyBlockTime.monthName(i)
             if (month == monthName) {
                 monthNr = i
@@ -555,8 +556,8 @@ object LorenzUtils {
 
         val tileSign = (this as AccessorGuiEditSign).tileSign
         return (tileSign.signText[1].unformattedText.removeColor() == "^^^^^^"
-                && tileSign.signText[2].unformattedText.removeColor() == "Set your"
-                && tileSign.signText[3].unformattedText.removeColor() == "speed cap!")
+            && tileSign.signText[2].unformattedText.removeColor() == "Set your"
+            && tileSign.signText[3].unformattedText.removeColor() == "speed cap!")
     }
 
     fun IslandType.isInIsland() = inSkyBlock && skyBlockIsland == this
@@ -629,6 +630,13 @@ object LorenzUtils {
         return this
     }
 
+    fun GuiContainerEvent.SlotClickEvent.makeShiftClick() =
+        slot?.slotNumber?.let { slotNumber ->
+            Minecraft.getMinecraft().playerController.windowClick(
+                container.windowId, slotNumber, 0, 1, Minecraft.getMinecraft().thePlayer
+            )?.also { isCanceled = true }
+        }
+
     fun <T> List<T>.indexOfFirst(vararg args: T) = args.map { indexOf(it) }.firstOrNull { it != -1 }
 
     private val recalculateDerpy =
@@ -696,6 +704,5 @@ object LorenzUtils {
     // Let garbage collector handle the removal of entries in this list
     fun <T> weakReferenceList(): MutableSet<T> = Collections.newSetFromMap(WeakHashMap<T, Boolean>())
 
-
     fun <T> MutableCollection<T>.filterToMutable(predicate: (T) -> Boolean) = filterTo(mutableListOf(), predicate)
 }

From bc21cce34cc8a52d1ce1c01c91e907fa989297fc Mon Sep 17 00:00:00 2001
From: Erymanthus | RayDeeUx <51521765+RayDeeUx@users.noreply.github.com>
Date: Sat, 20 Jan 2024 05:06:34 -0500
Subject: [PATCH 43/46] Option to show visitor shopping list in Farming Islands
 (#923)

Visitor Shopping List in Farming Areas. #923
---
 .../features/garden/visitor/ShoppingListConfig.java   |  6 ++++++
 .../features/garden/visitor/GardenVisitorFeatures.kt  | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

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 cbfa9e451d11..86e64d3f962b 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
@@ -29,6 +29,12 @@ public class ShoppingListConfig {
     @ConfigEditorBoolean
     public boolean inBazaarAlley = true;
 
+    @Expose
+    @ConfigOption(name = "Farming Areas", desc = "Show the Visitor Items List while on the Farming Islands or inside the Farm in the Hub. " +
+        "This helps farming the correct amount, especially when in the early game.")
+    @ConfigEditorBoolean
+    public boolean inFarmingAreas = false;
+
     @Expose
     @ConfigOption(name = "Show Price", desc = "Show the coin price in the shopping list.")
     @ConfigEditorBoolean
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 de9e9bd8a690..dc375174fec8 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
@@ -581,10 +581,15 @@ class GardenVisitorFeatures {
     }
 
     private fun showGui(): Boolean {
-        if (config.shoppingList.inBazaarAlley && IslandType.HUB.isInIsland() && LorenzUtils.skyBlockArea == "Bazaar Alley") {
-            return true
+        if (IslandType.HUB.isInIsland()) {
+            if (config.shoppingList.inBazaarAlley && LorenzUtils.skyBlockArea == "Bazaar Alley") {
+                return true
+            }
+            if (config.shoppingList.inFarmingAreas && LorenzUtils.skyBlockArea == "Farm") {
+                return true
+            }
         }
-
+        if (config.shoppingList.inFarmingAreas && IslandType.THE_FARMING_ISLANDS.isInIsland()) return true
         if (hideExtraGuis()) return false
         if (GardenAPI.inGarden()) {
             if (GardenAPI.onBarnPlot) return true

From b1b25111e714e370340efbd11abe87ba99748f69 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 20 Jan 2024 11:08:41 +0100
Subject: [PATCH 44/46] shopping list everywhere

---
 .../config/features/garden/visitor/ShoppingListConfig.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 86e64d3f962b..3b5d4da6b99d 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
@@ -30,7 +30,7 @@ public class ShoppingListConfig {
     public boolean inBazaarAlley = true;
 
     @Expose
-    @ConfigOption(name = "Farming Areas", desc = "Show the Visitor Items List while on the Farming Islands or inside the Farm in the Hub. " +
+    @ConfigOption(name = "Farming Areas", desc = "Show the Visitor Shopping List while on the Farming Islands or inside the Farm in the Hub. " +
         "This helps farming the correct amount, especially when in the early game.")
     @ConfigEditorBoolean
     public boolean inFarmingAreas = false;

From beb38f11b4309392c5a14bb6747b581f27a50ff8 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 20 Jan 2024 12:25:15 +0100
Subject: [PATCH 45/46] Change: Pet item display scale (#939)

Added option to change the size of the Pet Item Display Icon in inventories. #939
---
 .../config/features/misc/pets/PetConfig.java         |  7 +++++++
 .../skyhanni/features/misc/PetItemDisplay.kt         | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

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 cf5cda6541f5..dc1919042bed 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
@@ -6,6 +6,7 @@
 import io.github.moulberry.moulconfig.annotations.Accordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,6 +42,12 @@ public class PetConfig {
         PetItemsDisplay.TIER_BOOST
     ));
 
+    @Expose
+    @ConfigOption(name = "Pet Item Scale", desc = "The scale at which the Pet Item will be displayed.")
+    @ConfigEditorSlider(minValue = 0.7f, maxValue = 1.5f, minStep = 0.05f)
+    public float petItemDisplayScale = 0.9f;
+
+
     public enum PetItemsDisplay {
         XP_SHARE("§5⚘", "Exp Share", "PET_ITEM_EXP_SHARE"),
         TIER_BOOST("§c●", "Tier Boost", "PET_ITEM_TIER_BOOST"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
index 35d0c81ccf19..2f692708342a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PetItemDisplay.kt
@@ -5,24 +5,26 @@ import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawSlotText
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPetItem
+import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class PetItemDisplay {
 
-    private val configList get() = SkyHanniMod.feature.misc.pets.petItemDisplay
+    private val config get() = SkyHanniMod.feature.misc.pets
 
     @SubscribeEvent
     fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
         val stack = event.stack ?: return
         if (!LorenzUtils.inSkyBlock || stack.stackSize != 1) return
-        if (configList.isEmpty()) return
+        if (config.petItemDisplay.isEmpty()) return
 
         val petItem = stack.getPetItem() ?: return
-        val icon = configList.firstOrNull { it.item == petItem }?.icon ?: return
+        val icon = config.petItemDisplay.firstOrNull { it.item == petItem }?.icon ?: return
 
-        val x = event.x + 17
+        val width = (Minecraft.getMinecraft().fontRendererObj.getStringWidth(icon) * config.petItemDisplayScale).toInt()
+        val x = event.x + 22 - width
         val y = event.y - 1
 
-        event.drawSlotText(x, y, icon, .9f)
+        event.drawSlotText(x, y, icon, config.petItemDisplayScale)
     }
 }

From dd86bbaf6dd31b3b9c3340cf1ecf80eae1e94eff Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Sat, 20 Jan 2024 13:12:12 +0100
Subject: [PATCH 46/46] Backend: DelayedRun sync (#746)

Used a better bug fix for DelayedRun sync issues. #746
---
 .../at/hannibal2/skyhanni/utils/DelayedRun.kt | 30 ++++++++-----------
 .../hannibal2/skyhanni/utils/LorenzUtils.kt   |  7 +++++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt b/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
index f90237588b7b..284946072b11 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/DelayedRun.kt
@@ -1,34 +1,30 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
+import at.hannibal2.skyhanni.utils.LorenzUtils.drainTo
+import java.util.concurrent.ConcurrentLinkedQueue
 import kotlin.time.Duration
 
-// TODO find better sync bug fix than creating a new map for each use
 object DelayedRun {
-    var map = mapOf<() -> Any, SimpleTimeMark>()
+    private val tasks = mutableListOf<Pair<() -> Any, SimpleTimeMark>>()
+    private val futureTasks = ConcurrentLinkedQueue<Pair<() -> Any, SimpleTimeMark>>()
 
     fun runDelayed(duration: Duration, run: () -> Unit) {
-        map = map.editCopy {
-            this[run] = SimpleTimeMark.now() + duration
-        }
+        futureTasks.add(Pair(run, SimpleTimeMark.now() + duration))
     }
 
+    /** Runs in the next full Tick so the delay is between 50ms to 100ms**/
     fun runNextTick(run: () -> Unit) {
-        map = map.editCopy {
-            this[run] = SimpleTimeMark.now()
-        }
+        futureTasks.add(Pair(run, SimpleTimeMark.farPast()))
     }
 
     fun checkRuns() {
-        if (map.isEmpty()) return
-        map = map.editCopy {
-            entries.removeIf { (runnable, time) ->
-                val inPast = time.isInPast()
-                if (inPast) {
-                    runnable()
-                }
-                inPast
+        tasks.removeIf { (runnable, time) ->
+            val inPast = time.isInPast()
+            if (inPast) {
+                runnable()
             }
+            inPast
         }
+        futureTasks.drainTo(tasks)
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 666ea54ea51e..8371c9176ae3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -43,6 +43,7 @@ import java.util.Timer
 import java.util.TimerTask
 import java.util.WeakHashMap
 import java.util.regex.Matcher
+import java.util.concurrent.ConcurrentLinkedQueue
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.KProperty
@@ -701,8 +702,14 @@ object LorenzUtils {
         return runCatching { this.group(groupName) }.getOrNull()
     }
 
+    fun <E> ConcurrentLinkedQueue<E>.drainTo(list: MutableCollection<E>) {
+        while (true)
+            list.add(this.poll() ?: break)
+    }
+    
     // Let garbage collector handle the removal of entries in this list
     fun <T> weakReferenceList(): MutableSet<T> = Collections.newSetFromMap(WeakHashMap<T, Boolean>())
 
     fun <T> MutableCollection<T>.filterToMutable(predicate: (T) -> Boolean) = filterTo(mutableListOf(), predicate)
+
 }