diff options
| author | Linnea Gräf <nea@nea.moe> | 2024-10-28 12:07:55 +0100 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2024-10-28 12:07:55 +0100 |
| commit | c38dcee2c5f483ef5990ae9204355e1bc3c2bf74 (patch) | |
| tree | 3b70359076001e14514c496e3c44980fdbd92d01 /src/main/kotlin/util/SkyblockId.kt | |
| parent | 8ab44088546bf3360564e1a09f0831fea7659d2e (diff) | |
| download | Firmament-c38dcee2c5f483ef5990ae9204355e1bc3c2bf74.tar.gz Firmament-c38dcee2c5f483ef5990ae9204355e1bc3c2bf74.tar.bz2 Firmament-c38dcee2c5f483ef5990ae9204355e1bc3c2bf74.zip | |
Make REI optional
Diffstat (limited to 'src/main/kotlin/util/SkyblockId.kt')
| -rw-r--r-- | src/main/kotlin/util/SkyblockId.kt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt index 31227e2..059e746 100644 --- a/src/main/kotlin/util/SkyblockId.kt +++ b/src/main/kotlin/util/SkyblockId.kt @@ -2,6 +2,7 @@ package moe.nea.firmament.util +import io.github.moulberry.repo.data.NEUIngredient import io.github.moulberry.repo.data.NEUItem import io.github.moulberry.repo.data.Rarity import java.util.Optional @@ -61,7 +62,8 @@ value class SkyblockId(val neuItem: String) { } companion object { - val COINS: SkyblockId = SkyblockId("SKYBLOCK_COIN") + val COINS: SkyblockId = SkyblockId(NEUIngredient.NEU_SENTINEL_COINS) + val SENTINEL_EMPTY: SkyblockId = SkyblockId(NEUIngredient.NEU_SENTINEL_EMPTY) private val bazaarEnchantmentRegex = "ENCHANTMENT_(\\D*)_(\\d+)".toRegex() val NULL: SkyblockId = SkyblockId("null") val PET_NULL: SkyblockId = SkyblockId("null_pet") @@ -70,6 +72,7 @@ value class SkyblockId(val neuItem: String) { } val NEUItem.skyblockId get() = SkyblockId(skyblockItemId) +val NEUIngredient.skyblockId get() = SkyblockId(itemId) fun NEUItem.guessRecipeId(): String? { if (!skyblockItemId.contains(";")) return skyblockItemId |