fix: Pets missing an item rarity

2 files changed, 82 insertions, 0 deletions

diff --git a/src/main/kotlin/util/skyblock/ItemType.kt b/src/main/kotlin/util/skyblock/ItemType.kt
new file mode 100644
index 0000000..7d53c0d
--- /dev/null
+++ b/src/main/kotlin/util/skyblock/ItemType.kt
@@ -0,0 +1,21 @@
+package moe.nea.firmament.util.skyblock
+
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+
+class ItemType(val name: String) {
+	companion object {
+		private val generated = object : ReadOnlyProperty<Any?, ItemType> {
+			override fun getValue(thisRef: Any?, property: KProperty<*>): ItemType {
+				return ItemType.ofName(property.name)
+			}
+		}
+
+		fun ofName(name: String): ItemType {
+			return ItemType(name)
+		}
+
+		val SWORD by generated
+	}
+}
diff --git a/src/main/kotlin/util/skyblock/Rarity.kt b/src/main/kotlin/util/skyblock/Rarity.kt
new file mode 100644
index 0000000..f26cefe
--- /dev/null
+++ b/src/main/kotlin/util/skyblock/Rarity.kt
@@ -0,0 +1,61 @@
+package moe.nea.firmament.util.skyblock
+
+import net.minecraft.item.ItemStack
+import net.minecraft.text.Text
+import moe.nea.firmament.util.StringUtil.words
+import moe.nea.firmament.util.collections.lastNotNullOfOrNull
+import moe.nea.firmament.util.mc.loreAccordingToNbt
+import moe.nea.firmament.util.petData
+import moe.nea.firmament.util.unformattedString
+
+typealias RepoRarity = io.github.moulberry.repo.data.Rarity
+
+enum class Rarity(vararg altNames: String) {
+	COMMON,
+	UNCOMMON,
+	RARE,
+	EPIC,
+	LEGENDARY("LEGENJERRY"),
+	MYTHIC,
+	DIVINE,
+	SUPREME,
+	SPECIAL,
+	VERY_SPECIAL,
+	UNKNOWN
+	;
+
+	val names = setOf(name) + altNames
+
+	val neuRepoRarity: RepoRarity? = RepoRarity.entries.find { it.name == name }
+
+	companion object {
+		val byName = entries.flatMap { en -> en.names.map { it to en } }.toMap()
+		val fromNeuRepo = entries.associateBy { it.neuRepoRarity }
+
+		fun fromNeuRepo(repo: RepoRarity): Rarity? {
+			return fromNeuRepo[repo]
+		}
+
+		fun fromString(name: String): Rarity? {
+			return byName[name]
+		}
+
+		fun fromTier(tier: Int): Rarity? {
+			return entries.getOrNull(tier)
+		}
+
+		fun fromItem(itemStack: ItemStack): Rarity? {
+			return fromLore(itemStack.loreAccordingToNbt) ?: fromPetItem(itemStack)
+		}
+
+		fun fromPetItem(itemStack: ItemStack): Rarity? =
+			itemStack.petData?.tier?.let(::fromNeuRepo)
+
+		fun fromLore(lore: List<Text>): Rarity? =
+			lore.lastNotNullOfOrNull {
+				it.unformattedString.words()
+					.firstNotNullOfOrNull(::fromString)
+			}
+
+	}
+}