From 8e882724c15c0b1981afda587313ff449a6a7814 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 6 Feb 2024 03:42:18 +1100
Subject: [PATCH 1/8] Fix: shupdaterepo (#976)

Made /shupdaterepo better. #976
---
 .../at/hannibal2/skyhanni/data/repo/RepoManager.kt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 5296053d1f2a..b686602bb3d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -6,6 +6,7 @@ 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 at.hannibal2.skyhanni.utils.SimpleTimeMark
 import com.google.gson.JsonObject
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -22,12 +23,14 @@ import java.net.URL
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.time.Duration.Companion.minutes
 
 class RepoManager(private val configLocation: File) {
     private val gson get() = ConfigManager.gson
     private var latestRepoCommit: String? = null
     private val repoLocation: File = File(configLocation, "repo")
     private var error = false
+    private var lastRepoUpdate = SimpleTimeMark.farPast()
 
     companion object {
         val successfulConstants = mutableListOf<String>()
@@ -82,8 +85,7 @@ class RepoManager(private val configLocation: File) {
                 val file = File(configLocation, "repo")
                 if (file.exists() && currentCommitJSON != null && currentCommitJSON["sha"].asString == latestRepoCommit
                 ) {
-                    if (unsuccessfulConstants.isEmpty()) {
-
+                    if (unsuccessfulConstants.isEmpty() && lastRepoUpdate.passedSince() < 1.minutes) {
                         if (command) {
                             LorenzUtils.chat("§7The repo is already up to date!")
                             atomicShouldManuallyReload.set(false)
@@ -91,6 +93,7 @@ class RepoManager(private val configLocation: File) {
                         return@supplyAsync false
                     }
                 }
+                lastRepoUpdate = SimpleTimeMark.now()
                 RepoUtils.recursiveDelete(repoLocation)
                 repoLocation.mkdirs()
                 val itemsZip = File(repoLocation, "sh-repo-main.zip")
@@ -214,19 +217,20 @@ class RepoManager(private val configLocation: File) {
             return
         }
         if (unsuccessfulConstants.isEmpty() && successfulConstants.isNotEmpty()) {
-            LorenzUtils.chat("Repo working fine!", prefixColor = "§a")
+            LorenzUtils.chat("Repo working fine! Commit hash: $latestRepoCommit", prefixColor = "§a")
             return
         }
+        LorenzUtils.chat("Repo has errors! Commit has: ${latestRepoCommit ?: "null"}", prefixColor = "§c")
         if (successfulConstants.isNotEmpty()) LorenzUtils.chat(
             "Successful Constants §7(${successfulConstants.size}):",
             prefixColor = "§a"
         )
         for (constant in successfulConstants) {
-            LorenzUtils.chat("   §a- §7$constant")
+            LorenzUtils.chat("   §a- §7$constant", false)
         }
         LorenzUtils.chat("Unsuccessful Constants §7(${unsuccessfulConstants.size}):")
         for (constant in unsuccessfulConstants) {
-            LorenzUtils.chat("   §e- §7$constant")
+            LorenzUtils.chat("   §e- §7$constant", false)
         }
     }
 

From 9ff71b4b53f4c97933cf22c2d3425e3b208d44d5 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:49:04 +0100
Subject: [PATCH 2/8] Fixed Divine Gift and Flash showing the wrong/no price in
 EstimatedItemValue (#981)

Fixed Divine Gift and Flash enchants showing the wrong/no price in EstimatedItemValue. #981
---
 .../features/misc/items/EstimatedItemValueCalculator.kt       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt
index fbaed21a9abb..df915988deec 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
@@ -546,6 +546,8 @@ object EstimatedItemValueCalculator {
         val map = mutableMapOf<String, Double>()
 
         val tieredEnchants = listOf("compact", "cultivating", "champion", "expertise", "hecatomb")
+        val onlyTierOnePrices =
+            listOf("ultimate_chimera", "ultimate_fatal_tempo", "smoldering", "ultimate_flash", "divine_gift")
 
         val internalName = stack.getInternalName()
         for ((rawName, rawLevel) in enchantments) {
@@ -562,7 +564,7 @@ object EstimatedItemValueCalculator {
 
             var level = rawLevel
             var multiplier = 1
-            if (rawName == "ultimate_chimera" || rawName == "ultimate_fatal_tempo" || rawName == "smoldering") {
+            if (rawName in onlyTierOnePrices) {
 
                 when (rawLevel) {
                     2 -> multiplier = 2

From 9c1352f880dd626d766d1477da4962ae7da457a7 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 5 Feb 2024 21:07:27 +0100
Subject: [PATCH 3/8] Backend: Renderable added Alignment (#885)

Added alignment support to Renderable. #885
---
 .../hannibal2/skyhanni/utils/RenderUtils.kt   |  3 +
 .../skyhanni/utils/renderables/Renderable.kt  | 63 ++++++++++++++-----
 .../utils/renderables/RenderableUtils.kt      | 43 +++++++++++++
 3 files changed, 94 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index b7bbf948778a..68e20ac8b7b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -34,6 +34,9 @@ import kotlin.time.DurationUnit
 
 object RenderUtils {
 
+    enum class HorizontalAlignment { LEFT, CENTER, RIGHT }
+    enum class VerticalAlignment { TOP, CENTER, BOTTOM }
+
     private val beaconBeam = ResourceLocation("textures/entity/beacon_beam.png")
 
     infix fun Slot.highlight(color: LorenzColor) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 142fd81658e2..68b29e2fcc3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -4,6 +4,8 @@ import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor
 import at.hannibal2.skyhanni.data.ToolTipData
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.NEUItems.renderOnScreen
+import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
+import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
 import io.github.moulberry.moulconfig.gui.GuiScreenElementWrapper
 import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
@@ -18,6 +20,9 @@ import kotlin.math.max
 interface Renderable {
     val width: Int
     val height: Int
+
+    val horizontalAlign: HorizontalAlignment
+    val verticalAlign: VerticalAlignment
     fun isHovered(posX: Int, posY: Int) = currentRenderPassMousePosition?.let { (x, y) ->
         x in (posX..posX + width)
             && y in (posY..posY + height) // TODO: adjust for variable height?
@@ -97,9 +102,10 @@ interface Renderable {
             condition: () -> Boolean = { true },
         ) =
             object : Renderable {
-                override val width: Int
-                    get() = render.width
-                override val height = 10
+                override val width = render.width
+                override val height = render.height
+                override val horizontalAlign = render.horizontalAlign
+                override val verticalAlign = render.verticalAlign
 
                 private var wasDown = false
 
@@ -128,9 +134,10 @@ interface Renderable {
 
             val render = string(text)
             return object : Renderable {
-                override val width: Int
-                    get() = render.width
-                override val height = 11
+                override val width = render.width
+                override val height = render.height
+                override val horizontalAlign = render.horizontalAlign
+                override val verticalAlign = render.verticalAlign
 
                 override fun render(posX: Int, posY: Int) {
                     render.render(posX, posY)
@@ -198,6 +205,8 @@ interface Renderable {
             override val width: Int
                 get() = renderable.width
             override val height = 10
+            override val horizontalAlign = renderable.horizontalAlign
+            override val verticalAlign = renderable.verticalAlign
 
             override fun render(posX: Int, posY: Int) {
                 Gui.drawRect(0, 10, width, 11, 0xFFFFFFFF.toInt())
@@ -216,19 +225,34 @@ interface Renderable {
                 override val width: Int
                     get() = max(hovered.width, unhovered.width)
                 override val height = 10
+                override val horizontalAlign get() = if (isHovered) hovered.horizontalAlign else unhovered.horizontalAlign
+                override val verticalAlign get() = if (isHovered) hovered.verticalAlign else unhovered.verticalAlign
+
+                var isHovered = false
 
                 override fun render(posX: Int, posY: Int) {
-                    if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks))
+                    if (isHovered(posX, posY) && condition() && shouldAllowLink(true, bypassChecks)) {
                         hovered.render(posX, posY)
-                    else
+                        isHovered = true
+                    } else {
                         unhovered.render(posX, posY)
+                        isHovered = false
+                    }
+
                 }
             }
 
-        fun itemStack(any: ItemStack, scale: Double = 1.0) = object : Renderable {
+        fun itemStack(
+            any: ItemStack,
+            scale: Double = 1.0,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
             override val width: Int
                 get() = 12
             override val height = 10
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
 
             override fun render(posX: Int, posY: Int) {
                 GlStateManager.pushMatrix()
@@ -241,19 +265,28 @@ interface Renderable {
             return Collections.singletonList(string(string))
         }
 
-        fun string(string: String) = object : Renderable {
+        fun string(
+            text: String,
+            horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT,
+            verticalAlign: VerticalAlignment = VerticalAlignment.TOP,
+        ) = object : Renderable {
+
             override val width: Int
-                get() = Minecraft.getMinecraft().fontRendererObj.getStringWidth(string)
+                get() = Minecraft.getMinecraft().fontRendererObj.getStringWidth(text)
             override val height = 10
+            override val horizontalAlign = horizontalAlign
+            override val verticalAlign = verticalAlign
 
             override fun render(posX: Int, posY: Int) {
-                Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("§f$string", 1f, 1f, 0)
+                Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("§f$text", 1f, 1f, 0)
             }
         }
 
-        fun placeholder(width: Int) = object : Renderable {
-            override val width: Int = width
-            override val height = 10
+        fun placeholder(width: Int, height: Int = 10) = object : Renderable {
+            override val width = width
+            override val height = height
+            override val horizontalAlign = HorizontalAlignment.LEFT
+            override val verticalAlign = VerticalAlignment.TOP
 
             override fun render(posX: Int, posY: Int) {
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
new file mode 100644
index 000000000000..9c6b94a55675
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/RenderableUtils.kt
@@ -0,0 +1,43 @@
+package at.hannibal2.skyhanni.utils.renderables
+
+import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
+import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
+import net.minecraft.client.renderer.GlStateManager
+
+internal object RenderableUtils {
+
+    private fun calculateAlignmentXOffset(renderable: Renderable, xSpace: Int) = when (renderable.horizontalAlign) {
+        HorizontalAlignment.LEFT -> 0
+        HorizontalAlignment.CENTER -> (xSpace - renderable.width) / 2
+        HorizontalAlignment.RIGHT -> xSpace - renderable.width
+    }
+
+    private fun calculateAlignmentYOffset(renderable: Renderable, ySpace: Int) = when (renderable.verticalAlign) {
+        VerticalAlignment.TOP -> 0
+        VerticalAlignment.CENTER -> (ySpace - renderable.height) / 2
+        VerticalAlignment.BOTTOM -> ySpace - renderable.height
+    }
+
+    fun Renderable.renderXYAligned(posX: Int, posY: Int, xSpace: Int, ySpace: Int) {
+        val xOffset = calculateAlignmentXOffset(this, xSpace)
+        val yOffset = calculateAlignmentYOffset(this, ySpace)
+        GlStateManager.translate(xOffset.toFloat(), yOffset.toFloat(), 0f)
+        this.render(posX + xOffset, posY + yOffset)
+        GlStateManager.translate(-xOffset.toFloat(), -yOffset.toFloat(), 0f)
+    }
+
+    fun Renderable.renderXAligned(posX: Int, posY: Int, xSpace: Int) {
+        val xOffset = calculateAlignmentXOffset(this, xSpace)
+        GlStateManager.translate(xOffset.toFloat(), 0f, 0f)
+        this.render(posX + xOffset, posY)
+        GlStateManager.translate(-xOffset.toFloat(), 0f, 0f)
+    }
+
+    fun Renderable.renderYAligned(posX: Int, posY: Int, ySpace: Int) {
+        val yOffset = calculateAlignmentYOffset(this, ySpace)
+        GlStateManager.translate(0f, yOffset.toFloat(), 0f)
+        this.render(posX, posY + yOffset)
+        GlStateManager.translate(0f, -yOffset.toFloat(), 0f)
+    }
+
+}

From d392c8085486b7d6b3c6a0e0707dd0ffc72224fa Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 5 Feb 2024 22:05:53 +0100
Subject: [PATCH 4/8] Fix: "Piece of wizard portal earned" shows duplicate
 somtimes (#982)

Fixed showing the Piece of wizard portal earned duplicate. #982
---
 .../features/misc/RestorePieceOfWizardPortalLore.kt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
index fe21f488ff98..deedd7f98310 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RestorePieceOfWizardPortalLore.kt
@@ -3,8 +3,11 @@ package at.hannibal2.skyhanni.features.misc
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getRecipientName
+import at.hannibal2.skyhanni.utils.StringUtils.anyMatches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RestorePieceOfWizardPortalLore {
@@ -13,15 +16,15 @@ class RestorePieceOfWizardPortalLore {
 
     private val item by lazy { "WIZARD_PORTAL_MEMENTO".asInternalName() }
 
+    private val earnedPattern by RepoPattern.pattern("misc.restore.wizard.portal.earned", "§7Earned by:.*")
+
     @SubscribeEvent
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!config.restorePieceOfWizardPortalLore) return
         val stack = event.itemStack
         if (stack.getInternalName() != item) return
+        if (earnedPattern.anyMatches(stack.getLore())) return
         val recipient = stack.getRecipientName() ?: return
-        if (!event.toolTip[5].contains(recipient)) {
-            event.toolTip.add(5, "§7Earned by: $recipient")
-        }
+        event.toolTip.add(5, "§7Earned by: $recipient")
     }
-
-}
\ No newline at end of file
+}

From 8fd64fdf87da0b8e0f789847336890ceefdea975 Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 5 Feb 2024 22:20:06 +0100
Subject: [PATCH 5/8] Backend: Render Rendables rework (#846)

Added support for dynamic y size in Renderables. #846
---
 .../hannibal2/skyhanni/utils/RenderUtils.kt   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 68e20ac8b7b0..c85937309274 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -7,8 +7,8 @@ import at.hannibal2.skyhanni.data.GuiEditManager.Companion.getAbsY
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.test.command.ErrorManager
-import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
 import io.github.moulberry.moulconfig.internal.TextRenderUtils
 import io.github.moulberry.notenoughupdates.util.Utils
 import net.minecraft.client.Minecraft
@@ -416,15 +416,24 @@ object RenderUtils {
     fun Position.renderRenderables(
         renderables: List<Renderable>,
         extraSpace: Int = 0,
-        itemScale: Double = 1.0,
         posLabel: String,
     ) {
         if (renderables.isEmpty()) return
-        val list = mutableListOf<List<Any>>()
+        var longestY = 0
+        val longestX = renderables.maxOf { it.width }
         for (line in renderables) {
-            list.addAsSingletonList(line)
+            GlStateManager.pushMatrix()
+            val (x, y) = transform()
+            GlStateManager.translate(0f, longestY.toFloat(), 0F)
+            Renderable.withMousePosition(x, y) {
+                line.renderXAligned(0, longestY, longestX)
+            }
+
+            longestY += line.height + extraSpace + 2
+
+            GlStateManager.popMatrix()
         }
-        renderStringsAndItems(list, extraSpace, itemScale, posLabel)
+        GuiEditManager.add(this, posLabel, longestX, longestY)
     }
 
     /**

From ab43b1989ebb75d5ca3ddd59a71e6a8879f040b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= <nea@nea.moe>
Date: Mon, 5 Feb 2024 22:41:23 +0100
Subject: [PATCH 6/8] Add outgoing chat log to /shchathistory (#863)

Added outgoing chat log to /shchathistory. #863
---
 .../java/at/hannibal2/skyhanni/data/ChatManager.kt   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
index 34e4354dda34..08bef76ff387 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt
@@ -17,6 +17,7 @@ import net.minecraft.client.gui.GuiNewChat
 import net.minecraft.event.HoverEvent
 import net.minecraft.network.play.client.C01PacketChatMessage
 import net.minecraft.network.play.server.S02PacketChat
+import net.minecraft.util.ChatComponentText
 import net.minecraft.util.EnumChatFormatting
 import net.minecraft.util.IChatComponent
 import net.minecraftforge.client.event.ClientChatReceivedEvent
@@ -46,6 +47,8 @@ object ChatManager {
         RETRACTED(EnumChatFormatting.DARK_PURPLE.toString() + EnumChatFormatting.BOLD),
         MODIFIED(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD),
         ALLOWED(EnumChatFormatting.GREEN),
+        OUTGOING(EnumChatFormatting.BLUE),
+        OUTGOING_BLOCKED(EnumChatFormatting.BLUE.toString() + EnumChatFormatting.BOLD),
         ;
 
         val renderedString = "$format$name"
@@ -82,7 +85,14 @@ object ChatManager {
         val packet = event.packet as? C01PacketChatMessage ?: return
 
         val message = packet.message
-        event.isCanceled = MessageSendToServerEvent(message).postAndCatch()
+        val component = ChatComponentText(message)
+        messageHistory[IdentityCharacteristics(component)] =
+            MessageFilteringResult(component, ActionKind.OUTGOING, null, null)
+        if (MessageSendToServerEvent(message).postAndCatch()) {
+            event.isCanceled = true
+            messageHistory[IdentityCharacteristics(component)] =
+                MessageFilteringResult(component, ActionKind.OUTGOING_BLOCKED, null, null)
+        }
     }
 
     @SubscribeEvent(receiveCanceled = true)

From 6ed818521cd2c9e97743881966632488e598c20e Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Tue, 6 Feb 2024 09:01:12 +1100
Subject: [PATCH 7/8] Send Mining Island Events (#969)

Added sending mining events to Soopy's API to test for new Mining Event feature. #969
---
 .../java/at/hannibal2/skyhanni/SkyHanniMod.kt |   4 +
 .../skyhanni/config/commands/Commands.kt      |   5 +
 .../config/features/mining/MiningConfig.java  |   5 +
 .../features/mining/MiningEventConfig.java    |  61 +++++++
 .../at/hannibal2/skyhanni/data/BossbarData.kt |  33 ++++
 .../at/hannibal2/skyhanni/data/HypixelData.kt |  47 +++++-
 .../skyhanni/events/BossbarUpdateEvent.kt     |   3 +
 .../mining/eventtracker/MiningEvent.kt        |  26 +++
 .../mining/eventtracker/MiningEventData.kt    |  13 ++
 .../mining/eventtracker/MiningEventTracker.kt | 156 ++++++++++++++++++
 .../mining/powdertracker/PowderTracker.kt     |   6 +-
 .../test/command/CopyBossbarCommand.kt        |  20 +++
 .../at/hannibal2/skyhanni/utils/APIUtil.kt    |  37 ++++-
 .../at/hannibal2/skyhanni/utils/JsonUtils.kt  |  25 +++
 .../skyhanni/utils/MinecraftConsoleFilter.kt  |   6 +-
 15 files changed, 431 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEvent.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventData.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
 create mode 100644 src/main/java/at/hannibal2/skyhanni/test/command/CopyBossbarCommand.kt

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 42c4d70a01cb..2ab83b51235a 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.config.SackData
 import at.hannibal2.skyhanni.config.commands.Commands.init
 import at.hannibal2.skyhanni.data.ActionBarStatsData
 import at.hannibal2.skyhanni.data.BlockData
+import at.hannibal2.skyhanni.data.BossbarData
 import at.hannibal2.skyhanni.data.ChatManager
 import at.hannibal2.skyhanni.data.CropAccessoryData
 import at.hannibal2.skyhanni.data.EntityData
@@ -228,6 +229,7 @@ import at.hannibal2.skyhanni.features.mining.DeepCavernsParkour
 import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore
+import at.hannibal2.skyhanni.features.mining.eventtracker.MiningEventTracker
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionCollectLogic
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
@@ -443,6 +445,7 @@ class SkyHanniMod {
         loadModule(TrackerManager)
         loadModule(UtilsPatterns)
         loadModule(PetAPI)
+        loadModule(BossbarData)
 
         // APIs
         loadModule(BazaarApi())
@@ -725,6 +728,7 @@ class SkyHanniMod {
         loadModule(SprayDisplay())
         loadModule(HighlightPlaceableNpcs())
         loadModule(PresentWaypoints())
+        loadModule(MiningEventTracker())
         loadModule(JyrreTimer())
         loadModule(NewYearCakeReminder())
         loadModule(SulphurSkitterBox())
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 a2820fbfc525..69b096b3130a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -55,6 +55,7 @@ import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
 import at.hannibal2.skyhanni.test.TestBingo
 import at.hannibal2.skyhanni.test.WorldEdit
+import at.hannibal2.skyhanni.test.command.CopyBossbarCommand
 import at.hannibal2.skyhanni.test.command.CopyItemCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
@@ -355,6 +356,10 @@ object Commands {
             "shcopyscoreboard",
             "Copies the scoreboard data to the clipboard"
         ) { CopyScoreboardCommand.command(it) }
+        registerCommand(
+            "shcopybossbar",
+            "Copies the name of the bossbar to the clipboard, including formatting codes"
+        ) { CopyBossbarCommand.command(it) }
         registerCommand(
             "shcopyitem",
             "Copies information about the item in hand to the clipboard"
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
index 462908f6e8cd..9b385494bb08 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
@@ -3,11 +3,16 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
+import io.github.moulberry.moulconfig.annotations.Category;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
 public class MiningConfig {
 
+    @Expose
+    @Category(name = "Mining Event Tracker", desc = "Settings for the Mining Event Tracker")
+    public MiningEventConfig miningEvent = new MiningEventConfig();
+
     @Expose
     @ConfigOption(name = "Powder Tracker", desc = "")
     @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java
new file mode 100644
index 000000000000..261283c7bea4
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java
@@ -0,0 +1,61 @@
+package at.hannibal2.skyhanni.config.features.mining;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class MiningEventConfig {
+
+//     @Expose
+//     @ConfigOption(name = "Enabled", desc = "Show information about upcoming Dwarven Mines and Crystal Hollows mining events, also enables you sending data.")
+//     @ConfigEditorBoolean
+//     @FeatureToggle
+//     public boolean enabled = true;
+//
+//     @Expose
+//     @ConfigOption(name = "Show Outside Mining Islands", desc = "Shows the event tracker when you are not inside of the Dwarven Mines or Crystal Hollows.")
+//     @ConfigEditorBoolean
+//     public boolean outsideMining = true;
+//
+//     @Expose
+//     @ConfigOption(name = "What to Show", desc = "Choose which island's events are shown in the gui.")
+//     @ConfigEditorDropdown
+//     public ShowType showType = ShowType.BOTH;
+//
+//     @Expose
+//     @ConfigOption(name = "Show Warnings For Events", desc = "Shows the warnings when select mining events are about to start.")
+//     @ConfigEditorBoolean
+//     @FeatureToggle
+//     public boolean showWarnings = false;
+
+    //todo remove when released
+    @Expose
+    @ConfigOption(name = "Send Test data", desc = "Sends test data to make sure the api works.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean sendData = true;
+
+//     @Expose
+//     @ConfigOption(name = "Events to Warn for", desc = "Choose which mining events you get warned about.")
+//     @ConfigEditorDraggableList
+//     public List<MiningEvent> eventsToWarn = new ArrayList<>(Collections.singletonList(MiningEvent.DOUBLE_POWDER));
+
+    public enum ShowType {
+        BOTH("Both Mining Islands"),
+        CRYSTAL("Crystal Hollows Only"),
+        DWARVEN("Dwarven Mines Only")
+        ;
+
+        private final String str;
+
+        ShowType(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt b/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt
new file mode 100644
index 000000000000..75ad8df9bc51
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt
@@ -0,0 +1,33 @@
+package at.hannibal2.skyhanni.data
+
+import at.hannibal2.skyhanni.events.BossbarUpdateEvent
+import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import net.minecraft.entity.boss.BossStatus
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+object BossbarData {
+    private var bossbar: String? = null
+    private var previousServerBossbar = ""
+
+    fun getBossbar() = bossbar ?: ""
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        val oldBossbar = bossbar ?: return
+        previousServerBossbar = oldBossbar
+        bossbar = null
+    }
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        val bossbarLine = BossStatus.bossName ?: return
+        if (bossbarLine.isBlank() || bossbarLine.isEmpty()) return
+        if (bossbarLine == bossbar) return
+        if (bossbarLine == previousServerBossbar) return
+        if (previousServerBossbar.isNotEmpty()) previousServerBossbar = ""
+
+        bossbar = bossbarLine
+        BossbarUpdateEvent(bossbarLine).postAndCatch()
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 78017b7bcc76..3f6ec7051739 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -26,20 +26,40 @@ import net.minecraftforge.fml.common.network.FMLNetworkEvent
 import kotlin.concurrent.thread
 
 class HypixelData {
-    private val group = RepoPattern.group("data.hypixeldata")
-    private val tabListProfilePattern by group.pattern("tablistprofile", "§e§lProfile: §r§a(?<profile>.*)")
-    private val lobbyTypePattern by group.pattern("lobbytype", "(?<lobbyType>.*lobby)\\d+")
-    private val islandNamePattern by group.pattern("islandname", "(?:§.)*(Area|Dungeon): (?:§.)*(?<island>.*)")
+    private val patternGroup = RepoPattern.group("data.hypixeldata")
+    private val tabListProfilePattern by patternGroup.pattern(
+        "tablistprofile",
+        "§e§lProfile: §r§a(?<profile>.*)"
+    )
+    private val lobbyTypePattern by patternGroup.pattern(
+        "lobbytype",
+        "(?<lobbyType>.*lobby)\\d+"
+    )
+    private val islandNamePattern by patternGroup.pattern(
+        "islandname",
+        "(?:§.)*(Area|Dungeon): (?:§.)*(?<island>.*)"
+    )
 
     private var lastLocRaw = 0L
 
     companion object {
+        private val patternGroup = RepoPattern.group("data.hypixeldata")
+        private val serverIdScoreboardPattern by patternGroup.pattern(
+            "serverid.scoreboard",
+            "§7\\d+/\\d+/\\d+ §8(?<servertype>[mM])(?<serverid>\\S+)"
+        )
+        private val serverIdTablistPattern by patternGroup.pattern(
+            "serverid.tablist",
+            " Server: §r§8(?<serverid>\\S+)"
+        )
+
         var hypixelLive = false
         var hypixelAlpha = false
         var inLobby = false
         var inLimbo = false
         var skyBlock = false
         var skyBlockIsland = IslandType.UNKNOWN
+        var serverId: String? = null
 
         //Ironman, Stranded and Bingo
         var noTrade = false
@@ -70,6 +90,24 @@ class HypixelData {
         val lobbyType get() = locraw["lobbytype"] ?: ""
         val mode get() = locraw["mode"] ?: ""
         val map get() = locraw["map"] ?: ""
+
+        fun getCurrentServerId(): String? {
+            if (!LorenzUtils.inSkyBlock) return null
+            if (serverId != null) return serverId
+
+            ScoreboardData.sidebarLinesFormatted.forEach { serverIdScoreboardPattern.matchMatcher(it) {
+                val serverType = if (group("servertype") == "M") "mega" else "mini"
+                serverId = "$serverType${group("serverid")}"
+                return serverId
+            } }
+
+            TabListData.getTabList().forEach { serverIdTablistPattern.matchMatcher(it) {
+                serverId = group("serverid")
+                return serverId
+            } }
+
+            return serverId
+        }
     }
 
     private var loggerIslandChange = LorenzLogger("debug/island_change")
@@ -82,6 +120,7 @@ class HypixelData {
         inLobby = false
         locraw.forEach { locraw[it.key] = "" }
         joinedWorld = System.currentTimeMillis()
+        serverId = null
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt
new file mode 100644
index 000000000000..7dd0d10bbf31
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt
@@ -0,0 +1,3 @@
+package at.hannibal2.skyhanni.events
+
+class BossbarUpdateEvent(val bossbar: String) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEvent.kt
new file mode 100644
index 000000000000..f5d8e26d8066
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEvent.kt
@@ -0,0 +1,26 @@
+package at.hannibal2.skyhanni.features.mining.eventtracker
+
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+enum class MiningEvent(val eventName: String, val defaultLength: Duration, private val colourCode: Char) {
+    GONE_WITH_THE_WIND("GONE WITH THE WIND", 18.minutes, '9'),
+    DOUBLE_POWDER("2X POWDER", 15.minutes, 'b'),
+    GOBLIN_RAID("GOBLIN RAID", 5.minutes, 'c'),
+    BETTER_TOGETHER("BETTER TOGETHER", 18.minutes, 'd'),
+    RAFFLE("RAFFLE", 160.seconds, '6'),
+    MITHRIL_GOURMAND("MITHRIL GOURMAND", 10.minutes, 'b'),
+    ;
+
+    override fun toString(): String {
+        return "§$colourCode$eventName"
+    }
+
+    companion object {
+        fun fromBossbarName(bossbarName: String): MiningEvent? {
+            return MiningEvent.entries.find { it.eventName == bossbarName.removeColor() }
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventData.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventData.kt
new file mode 100644
index 000000000000..ee2033ed444e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventData.kt
@@ -0,0 +1,13 @@
+package at.hannibal2.skyhanni.features.mining.eventtracker
+
+import at.hannibal2.skyhanni.data.IslandType
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class MiningEventData(
+    @Expose @SerializedName("server_type") val serverType: IslandType,
+    @Expose @SerializedName("server_id") val serverId: String,
+    @Expose val event: MiningEvent,
+    @Expose @SerializedName("time_left") val timeRemaining: Long,
+    @Expose @SerializedName("reporter_uuid") val uuid: String
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
new file mode 100644
index 000000000000..1fef5b2ee544
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt
@@ -0,0 +1,156 @@
+package at.hannibal2.skyhanni.features.mining.eventtracker
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigManager
+import at.hannibal2.skyhanni.data.BossbarData
+import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.ScoreboardData
+import at.hannibal2.skyhanni.events.BossbarUpdateEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.test.command.ErrorManager
+import at.hannibal2.skyhanni.utils.APIUtil
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.TabListData
+import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.getBoolean
+import at.hannibal2.skyhanni.utils.getStringOrValue
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
+import kotlinx.coroutines.launch
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.seconds
+
+class MiningEventTracker {
+    private val config get() = SkyHanniMod.feature.mining.miningEvent
+
+    private val patternGroup = RepoPattern.group("mining.eventtracker")
+    private val bossbarPassivePattern by patternGroup.pattern(
+        "bossbar.passive",
+        "§e§lPASSIVE EVENT (?<event>.+) §e§lRUNNING FOR §a§l(?<time>\\S+)§r"
+    )
+    private val bossbarActivePattern by patternGroup.pattern(
+        "bossbar.active",
+        "§e§lEVENT (?<event>.+) §e§lACTIVE IN (?<area>.+) §e§lfor §a§l(?<time>\\S+)§r"
+    )
+    private val eventStartedPattern by patternGroup.pattern(
+        "started",
+        "(?:§.)*\\s+(?:§.)+§l(?<event>.+) STARTED!"
+    )
+    private val eventEndedPattern by patternGroup.pattern(
+        "ended",
+        "(?:§.)*\\s+(?:§.)+§l(?<event>.+) ENDED!"
+    )
+
+    private var lastRequestSent = SimpleTimeMark.farPast()
+    private var lastWorldSwitch = SimpleTimeMark.farPast()
+    private var eventEndTime = SimpleTimeMark.farPast()
+
+    private var lastSentEvent: MiningEvent? = null
+
+    @SubscribeEvent
+    fun onWorldChange(event: LorenzWorldChangeEvent) {
+        lastRequestSent = SimpleTimeMark.now()
+        lastWorldSwitch = SimpleTimeMark.farPast()
+        eventEndTime = SimpleTimeMark.farPast()
+
+        lastSentEvent = null
+    }
+
+    @SubscribeEvent
+    fun onBossbarChange(event: BossbarUpdateEvent) {
+        if (!isEnabled()) return
+        if (lastWorldSwitch.passedSince() < 2.seconds) return
+        if (!eventEndTime.isInPast()) {
+            return
+        }
+
+        bossbarPassivePattern.matchMatcher(event.bossbar) {
+            sendData(group("event"), group("time"))
+        }
+        bossbarActivePattern.matchMatcher(event.bossbar) {
+            sendData(group("event"), group("time"))
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!isEnabled()) return
+
+        eventStartedPattern.matchMatcher(event.message) {
+            sendData(group("event"), null)
+        }
+        eventEndedPattern.matchMatcher(event.message) {
+            lastSentEvent = null
+        }
+    }
+
+    private fun sendData(eventName: String, time: String?) {
+        val eventType = MiningEvent.fromBossbarName(eventName)
+        if (lastSentEvent == eventType) return
+        if (eventType == null) {
+            ErrorManager.logErrorWithData(
+                Exception("UnknownMiningEvent"), "Unknown mining event detected from string $eventName",
+                "eventName" to eventName,
+                "bossbar" to BossbarData.getBossbar(),
+                "serverType" to LorenzUtils.skyBlockIsland,
+                "fromChat" to (time == null)
+            )
+            return
+        }
+        lastSentEvent = eventType
+
+        val timeRemaining = if (time == null) {
+            eventType.defaultLength
+        } else {
+            TimeUtils.getDuration(time)
+        }
+        eventEndTime = SimpleTimeMark.now() + timeRemaining
+
+        val serverId = HypixelData.getCurrentServerId()
+        if (serverId == null) {
+            ErrorManager.logErrorWithData(
+                Exception("NoServerId"), "Could not find server id",
+                "islandType" to LorenzUtils.skyBlockIsland,
+                "tablist" to TabListData.getTabList(),
+                "scoreboard" to ScoreboardData.sidebarLinesFormatted
+            )
+            return
+        }
+
+        val miningEventData = MiningEventData(
+            LorenzUtils.skyBlockIsland,
+            serverId,
+            eventType,
+            timeRemaining.inWholeMilliseconds,
+            LorenzUtils.getPlayerUuid()
+        )
+        val miningEventJson = ConfigManager.gson.toJson(miningEventData)
+//         //todo remove
+//         println("\n```json$miningEventJson```")
+        SkyHanniMod.coroutineScope.launch {
+            sendData(miningEventJson)
+        }
+    }
+
+    private fun isEnabled() = (IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland()) && config.sendData
+//         && config.enabled
+
+
+    private fun sendData(json: String) {
+        val response = APIUtil.postJSON("https://api.soopy.dev/skyblock/chevents/set", json)
+        if (!response.success) return
+        val success = response.data.getBoolean("success")
+        if (!success) {
+            val cause = response.data.getStringOrValue("cause", "unknown")
+            ErrorManager.logErrorWithData(
+                Exception("PostFailure"), "Sending mining event data was unsuccessful",
+                "cause" to cause,
+                "sentData" to json
+            )
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index a328d12ce1d6..3c3b0dfd3e67 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.mining.powdertracker
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry
+import at.hannibal2.skyhanni.data.BossbarData
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -23,7 +24,6 @@ import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.JsonArray
 import com.google.gson.JsonNull
 import com.google.gson.annotations.Expose
-import net.minecraft.entity.boss.BossStatus
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.concurrent.fixedRateTimer
 
@@ -153,8 +153,8 @@ object PowderTracker {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
         if (event.repeatSeconds(1)) {
-            doublePowder = powderBossBarPattern.matcher(BossStatus.bossName).find()
-            powderBossBarPattern.matchMatcher(BossStatus.bossName) {
+            doublePowder = powderBossBarPattern.matcher(BossbarData.getBossbar()).find()
+            powderBossBarPattern.matchMatcher(BossbarData.getBossbar()) {
                 powderTimer = group("time")
                 doublePowder = powderTimer != "00:00"
 
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyBossbarCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyBossbarCommand.kt
new file mode 100644
index 000000000000..cac3ac02fedb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyBossbarCommand.kt
@@ -0,0 +1,20 @@
+package at.hannibal2.skyhanni.test.command
+
+import at.hannibal2.skyhanni.data.BossbarData
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+
+object CopyBossbarCommand {
+    fun command(args: Array<String>) {
+        val noFormattingCodes = args.size == 1 && args[0] == "true"
+        val bossbarName = if (noFormattingCodes) BossbarData.getBossbar().removeColor() else BossbarData.getBossbar()
+        val status = if (noFormattingCodes) "without" else "with"
+        if (bossbarName.isBlank()) {
+            LorenzUtils.chat("Boss bar appears to be blank.")
+        } else {
+            OSUtils.copyToClipboard(bossbarName)
+            LorenzUtils.chat("Boss bar name copied to clipboard $status formatting codes!")
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
index 43f262d5be8f..2fd634d261c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
@@ -6,6 +6,7 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.google.gson.JsonSyntaxException
+import org.apache.http.HttpEntity
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.client.methods.HttpPost
@@ -26,6 +27,8 @@ object APIUtil {
     private val parser = JsonParser()
     private var showApiErrors = false
 
+    data class ApiResponse(val success: Boolean, val message: String?, val data: JsonObject)
+
     private val builder: HttpClientBuilder =
         HttpClients.custom().setUserAgent("SkyHanni/${SkyHanniMod.version}")
             .setDefaultHeaders(
@@ -97,23 +100,26 @@ object APIUtil {
         return JsonObject()
     }
 
-    fun postJSONIsSuccessful(urlString: String, body: String, silentError: Boolean = false): Boolean {
+    fun postJSON(urlString: String, body: String, silentError: Boolean = false): ApiResponse {
         val client = builder.build()
+
         try {
             val method = HttpPost(urlString)
             method.entity = StringEntity(body, ContentType.APPLICATION_JSON)
 
             client.execute(method).use { response ->
                 val status = response.statusLine
+                val entity = response.entity
 
-                if (status.statusCode >= 200 || status.statusCode < 300) {
-                    return true
+                if (status.statusCode in 200..299) {
+                    val data = readResponse(entity)
+                    return ApiResponse(true, "Request successful", data)
                 }
 
-                println("POST request to '$urlString' returned status ${status.statusCode}")
-                LorenzUtils.error("SkyHanni ran into an error whilst sending data. Status: ${status.statusCode}")
-
-                return false
+                val message = "POST request to '$urlString' returned status ${status.statusCode}"
+                println(message)
+                LorenzUtils.error("SkyHanni ran into an error. Status: ${status.statusCode}")
+                return ApiResponse(false, message, JsonObject())
             }
         } catch (throwable: Throwable) {
             if (silentError) {
@@ -122,9 +128,26 @@ object APIUtil {
                 throwable.printStackTrace()
                 LorenzUtils.error("SkyHanni ran into an ${throwable::class.simpleName ?: "error"} whilst sending a resource. See logs for more details.")
             }
+            return ApiResponse(false, throwable.message, JsonObject())
         } finally {
             client.close()
         }
+    }
+
+    private fun readResponse(entity: HttpEntity): JsonObject {
+        val retSrc = EntityUtils.toString(entity)
+        return parser.parse(retSrc) as JsonObject
+    }
+
+    fun postJSONIsSuccessful(urlString: String, body: String, silentError: Boolean = false): Boolean {
+        val response = postJSON(urlString, body, silentError)
+
+        if (response.success) {
+            return true
+        }
+
+        println(response.message)
+        LorenzUtils.error(response.message ?: "An error occurred during the API request")
 
         return false
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt
index f9a279c46bde..e9d755fab2a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.utils
 
 import com.google.gson.Gson
 import com.google.gson.JsonElement
+import com.google.gson.JsonObject
 import java.io.Reader
 import kotlin.reflect.jvm.javaType
 import kotlin.reflect.typeOf
@@ -12,3 +13,27 @@ inline fun <reified T : Any> Gson.fromJson(jsonElement: JsonElement): T =
     this.fromJson(jsonElement, typeOf<T>().javaType)
 
 inline fun <reified T : Any> Gson.fromJson(reader: Reader): T = this.fromJson(reader, typeOf<T>().javaType)
+
+fun JsonObject.getBoolean(key: String): Boolean {
+    return if (has(key)) {
+        try {
+            get(key).asBoolean
+        } catch (_: Exception) {
+            false
+        }
+    } else {
+        false
+    }
+}
+
+fun JsonObject.getStringOrValue(key: String, alternative: String): String {
+    return if (has(key)) {
+        try {
+            get(key).asString
+        } catch (_: Exception) {
+            alternative
+        }
+    } else {
+        alternative
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
index 3aa432cde16f..3e1919d8b8c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
@@ -124,7 +124,8 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
                 val first = cause.stackTrace[0]
                 val firstName = first.toString()
                 if (firstName == "net.minecraft.scoreboard.Scoreboard.removeTeam(Scoreboard.java:229)" ||
-                    firstName == "net.minecraft.scoreboard.Scoreboard.removeTeam(Scoreboard.java:262)"
+                    firstName == "net.minecraft.scoreboard.Scoreboard.removeTeam(Scoreboard.java:262)" ||
+                    firstName == "net.minecraft.scoreboard.Scoreboard.removeTeam(Scoreboard.java:240)"
                 ) {
                     filterConsole("NullPointerException at Scoreboard.removeTeam")
                     return Filter.Result.DENY
@@ -134,7 +135,8 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
                     return Filter.Result.DENY
                 }
                 if (firstName == "net.minecraft.scoreboard.Scoreboard.removeObjective(Scoreboard.java:179)" ||
-                    firstName == "net.minecraft.scoreboard.Scoreboard.removeObjective(Scoreboard.java:198)"
+                    firstName == "net.minecraft.scoreboard.Scoreboard.removeObjective(Scoreboard.java:198)" ||
+                    firstName == "net.minecraft.scoreboard.Scoreboard.removeObjective(Scoreboard.java:186)"
                 ) {
                     filterConsole("IllegalArgumentException at Scoreboard.removeObjective")
                     return Filter.Result.DENY

From fc7a9d08b4d4e6fd1a089a58d789efc818a22430 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:59:19 +0100
Subject: [PATCH 8/8] Version 0.23 Beta 17

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1057e56e9780..3cf748d79dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,11 @@
 + Added Sea Creature Tracker. - hannibal2
     + Allows to only show single variants, e.g. water or lava or winter.
 
+#### Mining Features
+
++ Added Deep Caverns Parkour. - hannibal2
+    + Shows a parkour to the bottom of Deep Caverns and to Rhys.
+
 #### Dungeon Features
 
 + Hide particles and damage splashes during the terracotta phase in dungeons F6 and M6. - hannibal2
@@ -140,6 +145,7 @@
 #### Diana Changes
 
 + Changed the Griffin Burrow Guess text to a centered title instead of an odd line that goes down. - hannibal2
++ Removed unnecessary error messages in Diana Burrow detection. - hannibal2
 
 #### Chat Changes
 
@@ -181,6 +187,8 @@
 + Fixed rarity error for items thrown around when using Sprayanator. - hannibal2
 + Added cooldown to Garden Warp Commands. - Empa
 + Fixed the detection of Anita and Jacob visitors. - hannibal2
++ Fixed the pets menu detection for /ff. - martimavocado
++ Fixed Anita and Jacob workaround working outside of garden. - CalMWolfs
 
 #### Combat Fixes
 
@@ -220,6 +228,7 @@
 + Fixed Mining Chat Filter not hiding gemstone messages. - CalMWolfs
 + Fixed names for the Crystal Hollows Mining Areas feature. - alexia
 + Fixed detection of gold and diamond essence gain chat message when powder mining. - CalMWolfs
++ Fixed powder mining start/end detection in Powder Tracker. - CalMWolfs
 
 #### Rift Fixes
 
@@ -240,6 +249,8 @@
 + Fixed rune price calculation in Chest Value. - hannibal2
 + Fixed Power Stone Guide Highlight shows in other inventories when exiting via command. - hannibal2
 + Added options to hide Helmet Skins, Armor Dyes or Runes from Estimated Item Value Calculation. - hannibal2
++ Fixed Divine Gift and Flash enchants showing the wrong/no price in EstimatedItemValue. - jani
++ Fixed showing the Piece of Wizard Portal earned duplicate. - Thunderblade73
 
 #### Bingo Fixes
 
@@ -275,6 +286,7 @@
 + Fixed NPC typos in config. - absterge
 + Fixed rare error in Harp Features. - Thunderblade73
 + Fixed some getItemStack errors. - CalMWolfs
++ Fixed Minion XP calculation not working when having different mouse settings. - Thunderblade73
 
 ### Technical Changes
 
@@ -326,6 +338,12 @@
 + Using NEUInternalName in the Reputation Helper Quest. - CalMWolfs
 + Limit RAM to 4 GB in the developement enviroment. - CalMWolfs
     + This is just the default and can be changed if needed.
++ Made /shupdaterepo better. - CalMWolfs
++ Added alignment support to Renderable. - Thunderblade73
++ Added support for dynamic Y size in Renderables. - Thunderblade73
++ Added outgoing chat log to /shchathistory. - nea
++ Added sending mining events to Soopy's API to test for new Mining Event feature. - CalMWolfs
++ Added /shcopybossbar to copy bossbar - Erymanthus
 
 ## Version 0.22
 
diff --git a/FEATURES.md b/FEATURES.md
index c96ecc51e8a6..63b4ccd31d1b 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -688,6 +688,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Fully customizable: change what items or stats to show.
     + Has support for the maxed Great Explorer perk.
     + Option to hide while not grinding powder.
++ Added Deep Caverns Parkour. - hannibal2
+    + Shows a parkour to the bottom of Deep Caverns and to Rhys.
 
 </details>
 <details open><summary>
diff --git a/build.gradle.kts b/build.gradle.kts
index 484c6fe556da..fa6b47df088b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.16"
+version = "0.23.Beta.17"
 
 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 2ab83b51235a..f88b169e0dc8 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -382,7 +382,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.16",
+    version = "0.23.Beta.17",
 )
 class SkyHanniMod {