3 files changed, 64 insertions, 2 deletions

diff --git a/src/main/kotlin/util/skyblock/ItemType.kt b/src/main/kotlin/util/skyblock/ItemType.kt
index 6ddb077..7149379 100644
--- a/src/main/kotlin/util/skyblock/ItemType.kt
+++ b/src/main/kotlin/util/skyblock/ItemType.kt
@@ -13,6 +13,13 @@ value class ItemType private constructor(val name: String) {
 			return ItemType(name)
 		}
 
+		private val obfuscatedRegex = "§[kK].*?(§[0-9a-fA-FrR]|$)".toRegex()
+		fun fromEscapeCodeLore(lore: String): ItemType? {
+			return lore.replace(obfuscatedRegex, "").trim().substringAfter(" ", "")
+				.takeIf { it.isNotEmpty() }
+				?.let(::ofName)
+		}
+
 		fun fromItemStack(itemStack: ItemStack): ItemType? {
 			if (itemStack.petData != null)
 				return PET
@@ -26,13 +33,31 @@ value class ItemType private constructor(val name: String) {
 				if (type.isEmpty()) return null
 				return ofName(type)
 			}
-			return null
+			return itemStack.loreAccordingToNbt.lastOrNull()?.directLiteralStringContent?.let(::fromEscapeCodeLore)
 		}
 
+		// TODO: some of those are not actual in game item types, but rather ones included in the repository to splat to multiple in game types. codify those somehow
+
 		val SWORD = ofName("SWORD")
 		val DRILL = ofName("DRILL")
 		val PICKAXE = ofName("PICKAXE")
 		val GAUNTLET = ofName("GAUNTLET")
+		val LONGSWORD = ofName("LONG SWORD")
+		val EQUIPMENT = ofName("EQUIPMENT")
+		val FISHING_WEAPON = ofName("FISHING WEAPON")
+		val CLOAK = ofName("CLOAK")
+		val BELT = ofName("BELT")
+		val NECKLACE = ofName("NECKLACE")
+		val BRACELET = ofName("BRACELET")
+		val GLOVES = ofName("GLOVES")
+		val ROD = ofName("ROD")
+		val FISHING_ROD = ofName("FISHING ROD")
+		val VACUUM = ofName("VACUUM")
+		val CHESTPLATE = ofName("CHESTPLATE")
+		val LEGGINGS = ofName("LEGGINGS")
+		val HELMET = ofName("HELMET")
+		val BOOTS = ofName("BOOTS")
+		val NIL = ofName("__NIL")
 
 		/**
 		 * This one is not really official (it never shows up in game).
diff --git a/src/main/kotlin/util/skyblock/Rarity.kt b/src/main/kotlin/util/skyblock/Rarity.kt
index f26cefe..b19f371 100644
--- a/src/main/kotlin/util/skyblock/Rarity.kt
+++ b/src/main/kotlin/util/skyblock/Rarity.kt
@@ -1,7 +1,16 @@
 package moe.nea.firmament.util.skyblock
 
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import net.minecraft.item.ItemStack
+import net.minecraft.text.Style
 import net.minecraft.text.Text
+import net.minecraft.util.Formatting
 import moe.nea.firmament.util.StringUtil.words
 import moe.nea.firmament.util.collections.lastNotNullOfOrNull
 import moe.nea.firmament.util.mc.loreAccordingToNbt
@@ -10,6 +19,7 @@ import moe.nea.firmament.util.unformattedString
 
 typealias RepoRarity = io.github.moulberry.repo.data.Rarity
 
+@Serializable(with = Rarity.Serializer::class)
 enum class Rarity(vararg altNames: String) {
 	COMMON,
 	UNCOMMON,
@@ -24,11 +34,37 @@ enum class Rarity(vararg altNames: String) {
 	UNKNOWN
 	;
 
-	val names = setOf(name) + altNames
+	object Serializer : KSerializer<Rarity> {
+		override val descriptor: SerialDescriptor
+			get() = PrimitiveSerialDescriptor(Rarity::class.java.name, PrimitiveKind.STRING)
+
+		override fun deserialize(decoder: Decoder): Rarity {
+			return valueOf(decoder.decodeString().replace(" ", "_"))
+		}
 
+		override fun serialize(encoder: Encoder, value: Rarity) {
+			encoder.encodeString(value.name)
+		}
+	}
+
+	val names = setOf(name) + altNames
+	val text: Text get() = Text.literal(name).setStyle(Style.EMPTY.withColor(colourMap[this]))
 	val neuRepoRarity: RepoRarity? = RepoRarity.entries.find { it.name == name }
 
 	companion object {
+		// TODO: inline those formattings as fields
+		val colourMap = mapOf(
+			Rarity.COMMON to Formatting.WHITE,
+			Rarity.UNCOMMON to Formatting.GREEN,
+			Rarity.RARE to Formatting.BLUE,
+			Rarity.EPIC to Formatting.DARK_PURPLE,
+			Rarity.LEGENDARY to Formatting.GOLD,
+			Rarity.MYTHIC to Formatting.LIGHT_PURPLE,
+			Rarity.DIVINE to Formatting.AQUA,
+			Rarity.SPECIAL to Formatting.RED,
+			Rarity.VERY_SPECIAL to Formatting.RED,
+			Rarity.SUPREME 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/SkyBlockItems.kt b/src/main/kotlin/util/skyblock/SkyBlockItems.kt
index c94ebfe..cfd8429 100644
--- a/src/main/kotlin/util/skyblock/SkyBlockItems.kt
+++ b/src/main/kotlin/util/skyblock/SkyBlockItems.kt
@@ -7,4 +7,5 @@ object SkyBlockItems {
 	val ENCHANTED_DIAMOND = SkyblockId("ENCHANTED_DIAMOND")
 	val DIAMOND = SkyblockId("DIAMOND")
 	val ANCESTRAL_SPADE = SkyblockId("ANCESTRAL_SPADE")
+	val REFORGE_ANVIL = SkyblockId("REFORGE_ANVIL")
 }