4 files changed, 56 insertions, 1 deletions
diff --git a/src/main/kotlin/util/skyblock/Rarity.kt b/src/main/kotlin/util/skyblock/Rarity.kt
index b19f371..2507256 100644
--- a/src/main/kotlin/util/skyblock/Rarity.kt
+++ b/src/main/kotlin/util/skyblock/Rarity.kt
@@ -31,6 +31,7 @@ enum class Rarity(vararg altNames: String) {
 	SUPREME,
 	SPECIAL,
 	VERY_SPECIAL,
+	ULTIMATE,
 	UNKNOWN
 	;
 
@@ -64,6 +65,7 @@ enum class Rarity(vararg altNames: String) {
 			Rarity.SPECIAL to Formatting.RED,
 			Rarity.VERY_SPECIAL to Formatting.RED,
 			Rarity.SUPREME to Formatting.DARK_RED,
+			Rarity.ULTIMATE to Formatting.DARK_RED,
 		)
 		val byName = entries.flatMap { en -> en.names.map { it to en } }.toMap()
 		val fromNeuRepo = entries.associateBy { it.neuRepoRarity }
diff --git a/src/main/kotlin/util/skyblock/SackUtil.kt b/src/main/kotlin/util/skyblock/SackUtil.kt
index fd67c44..c46542e 100644
--- a/src/main/kotlin/util/skyblock/SackUtil.kt
+++ b/src/main/kotlin/util/skyblock/SackUtil.kt
@@ -93,7 +93,7 @@ object SackUtil {
 
 		fun updateFromHoverText(text: Text) {
 			text.siblings.forEach(::updateFromHoverText)
-			val hoverText = text.style.hoverEvent?.getValue(HoverEvent.Action.SHOW_TEXT) ?: return
+			val hoverText = (text.style.hoverEvent as? HoverEvent.ShowText)?.value ?: return
 			val cleanedText = hoverText.unformattedString
 			if (cleanedText.startsWith("Added items:\n")) {
 				if (!foundAdded) {
diff --git a/src/main/kotlin/util/skyblock/SkyBlockItems.kt b/src/main/kotlin/util/skyblock/SkyBlockItems.kt
index cfd8429..d552fd7 100644
--- a/src/main/kotlin/util/skyblock/SkyBlockItems.kt
+++ b/src/main/kotlin/util/skyblock/SkyBlockItems.kt
@@ -3,9 +3,21 @@ package moe.nea.firmament.util.skyblock
 import moe.nea.firmament.util.SkyblockId
 
 object SkyBlockItems {
+	val COINS = SkyblockId("SKYBLOCK_COIN")
 	val ROTTEN_FLESH = SkyblockId("ROTTEN_FLESH")
 	val ENCHANTED_DIAMOND = SkyblockId("ENCHANTED_DIAMOND")
 	val DIAMOND = SkyblockId("DIAMOND")
 	val ANCESTRAL_SPADE = SkyblockId("ANCESTRAL_SPADE")
 	val REFORGE_ANVIL = SkyblockId("REFORGE_ANVIL")
+	val SLICE_OF_BLUEBERRY_CAKE = SkyblockId("SLICE_OF_BLUEBERRY_CAKE")
+	val SLICE_OF_CHEESECAKE = SkyblockId("SLICE_OF_CHEESECAKE")
+	val SLICE_OF_GREEN_VELVET_CAKE = SkyblockId("SLICE_OF_GREEN_VELVET_CAKE")
+	val SLICE_OF_RED_VELVET_CAKE = SkyblockId("SLICE_OF_RED_VELVET_CAKE")
+	val SLICE_OF_STRAWBERRY_SHORTCAKE = SkyblockId("SLICE_OF_STRAWBERRY_SHORTCAKE")
+	val ASPECT_OF_THE_VOID = SkyblockId("ASPECT_OF_THE_VOID")
+	val ASPECT_OF_THE_END = SkyblockId("ASPECT_OF_THE_END")
+	val BONE_BOOMERANG = SkyblockId("BONE_BOOMERANG")
+	val STARRED_BONE_BOOMERANG = SkyblockId("STARRED_BONE_BOOMERANG")
+	val TRIBAL_SPEAR = SkyblockId("TRIBAL_SPEAR")
+	val HUNTING_TOOLKIT = SkyblockId("HUNTING_TOOLKIT")
 }
diff --git a/src/main/kotlin/util/skyblock/TabListAPI.kt b/src/main/kotlin/util/skyblock/TabListAPI.kt
new file mode 100644
index 0000000..6b937da
--- /dev/null
+++ b/src/main/kotlin/util/skyblock/TabListAPI.kt
@@ -0,0 +1,41 @@
+package moe.nea.firmament.util.skyblock
+
+import org.intellij.lang.annotations.Language
+import net.minecraft.text.Text
+import moe.nea.firmament.util.StringUtil.title
+import moe.nea.firmament.util.StringUtil.unwords
+import moe.nea.firmament.util.mc.MCTabListAPI
+import moe.nea.firmament.util.unformattedString
+
+object TabListAPI {
+
+	fun getWidgetLines(widgetName: WidgetName, includeTitle: Boolean = false, from: MCTabListAPI.CurrentTabList = MCTabListAPI.currentTabList): List<Text> {
+		return from.body
+			.dropWhile { !widgetName.matchesTitle(it) }
+			.takeWhile { it.string.isNotBlank() && !it.string.startsWith("               ") }
+			.let { if (includeTitle) it else it.drop(1) }
+	}
+
+	enum class WidgetName(regex: Regex?) {
+		COMMISSIONS,
+		SKILLS("Skills:( .*)?"),
+		PROFILE("Profile: (.*)"),
+		COLLECTION,
+		ESSENCE,
+		PET
+		;
+
+		fun matchesTitle(it: Text): Boolean {
+			return regex.matches(it.unformattedString)
+		}
+
+		constructor() : this(null)
+		constructor(@Language("RegExp") regex: String) : this(Regex(regex))
+
+		val label =
+			name.split("_").map { it.lowercase().title() }.unwords()
+		val regex = regex ?: Regex.fromLiteral("$label:")
+
+	}
+
+}