diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-10-15 00:29:06 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-10-15 00:29:06 +0200 |
| commit | eb565f975abd394aa7b43bea00c8df219e7831d3 (patch) | |
| tree | f0a6e1b990b759896995b16e1e91b1e672429f7c /src/main | |
| parent | 12ab95f7e800f42e25e70465bedc22002a75dd44 (diff) | |
| download | Firmament-eb565f975abd394aa7b43bea00c8df219e7831d3.tar.gz Firmament-eb565f975abd394aa7b43bea00c8df219e7831d3.tar.bz2 Firmament-eb565f975abd394aa7b43bea00c8df219e7831d3.zip | |
feat: add ids to enchantment guide books3.10.0+mc1.21.7
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/kotlin/util/SkyblockId.kt | 3 | ||||
| -rw-r--r-- | src/main/kotlin/util/skyblock/ScreenIdentification.kt | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt index b58b75c..1b1d158 100644 --- a/src/main/kotlin/util/SkyblockId.kt +++ b/src/main/kotlin/util/SkyblockId.kt @@ -38,6 +38,7 @@ import moe.nea.firmament.util.mc.displayNameAccordingToNbt import moe.nea.firmament.util.mc.loreAccordingToNbt import moe.nea.firmament.util.skyblock.isBazaarUi import moe.nea.firmament.util.skyblock.isDyeCompendium +import moe.nea.firmament.util.skyblock.isEnchantmentGuide import moe.nea.firmament.util.skyblock.isExperimentationRngMeter import moe.nea.firmament.util.skyblock.isSuperPairs @@ -243,7 +244,7 @@ fun ItemStack.guessContextualSkyBlockId(): SkyblockId? { } return ItemNameLookup.guessItemByName(name, false) } - if (screen?.isExperimentationRngMeter() == true || screen?.isSuperPairs() == true) { + if (screen != null && (screen.isExperimentationRngMeter() || screen.isSuperPairs() || screen.isEnchantmentGuide())) { val name = displayNameAccordingToNbt.unformattedString return RepoManager.enchantedBookCache.byName[name] ?: ItemNameLookup.guessItemByName(name, false) diff --git a/src/main/kotlin/util/skyblock/ScreenIdentification.kt b/src/main/kotlin/util/skyblock/ScreenIdentification.kt index 7ddc481..4fea3df 100644 --- a/src/main/kotlin/util/skyblock/ScreenIdentification.kt +++ b/src/main/kotlin/util/skyblock/ScreenIdentification.kt @@ -20,6 +20,10 @@ fun Screen.isBazaarUi(): Boolean { }) } +fun Screen.isEnchantmentGuide(): Boolean { + return title.unformattedString.endsWith("Enchantments Guide") +} + fun Screen.isSuperPairs(): Boolean { return title.unformattedString.startsWith("Superpairs") } |
