Feature: SkyblockXPInChat (#919)

Added Skyblock XP Chat. #919

2 files changed, 22 insertions, 4 deletions

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 000000000..a4b7604ce
--- /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 2f7be15ec..4c972750d 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] ?: ""