Added cookie buff

hannibal002 · Dec 8, 2023 · 954cb83 · 954cb83
1 parent bfcf6ed
commit 954cb83
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/CustomScoreboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/CustomScoreboardUtils.kt
@@ -48,7 +48,7 @@ object CustomScoreboardUtils {
     fun getTablistFooter(): String {
         val tabList = Minecraft.getMinecraft().ingameGUI.tabList as AccessorGuiPlayerTabOverlay
         if (tabList.footer_skyhanni == null) return ""
-        return tabList.footer_skyhanni.formattedText
+        return tabList.footer_skyhanni.formattedText.replace("§r", "")
     }
 
     class UndetectedScoreboardLines(message: String) : Exception(message)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/Events.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/Events.kt
@@ -252,9 +252,9 @@ enum class Events(private val displayLine: Supplier<List<String>>, private val s
         {
             listOf(ScoreboardData.sidebarLinesFormatted.firstOrNull { it.startsWith("§6Spooky Festival§f") }
                 ?: "<hidden>") + // Time
-                ("§r§r§7Your Candy: ") +
-                (CustomScoreboardUtils.getTablistFooter().split("\n").firstOrNull { it.startsWith("§r§r§7Your Candy:") }
-                    ?.removePrefix("§r§r§7Your Candy:") ?: "§cCandy not found") // Candy
+                ("§7Your Candy: ") +
+                (CustomScoreboardUtils.getTablistFooter().split("\n").firstOrNull { it.startsWith("§7Your Candy:") }
+                    ?.removePrefix("§7Your Candy:") ?: "§cCandy not found") // Candy
         },
         {
             ScoreboardData.sidebarLinesFormatted.any { it.startsWith("§6Spooky Festival§f") }

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/customscoreboard/ScoreboardElements.kt
@@ -254,6 +254,30 @@ enum class ScoreboardElements(
         },
         "Power: Sighted"
     ),
+    COOKIE(
+        {
+            val timeLine = CustomScoreboardUtils.getTablistFooter().split("\n")
+                .nextAfter("§d§lCookie Buff") ?: "<hidden>"
+
+            listOf(
+                "§d§lCookie Buff" to AlignmentEnum.LEFT
+            ) + when (timeLine.contains("Not active")){
+                true -> listOf(" §7- §cNot active" to AlignmentEnum.LEFT)
+                false -> listOf(" §7- §e${timeLine.substringAfter("§d§lCookie Buff").trim()}" to AlignmentEnum.LEFT)
+            }
+        },
+        {
+            if (config.informationFilteringConfig.hideEmptyLines){
+                CustomScoreboardUtils.getTablistFooter().split("\n").any {
+                    CustomScoreboardUtils.getTablistFooter().split("\n").nextAfter("§d§lCookie Buff")?.contains(it)
+                        ?: false
+                }
+            } else {
+                true
+            }
+        },
+        "§d§lCookie Buff\n §f3days, 17hours"
+    ),
     EMPTY_LINE2(
         {
             listOf("<empty>" to AlignmentEnum.LEFT)