diff options
Diffstat (limited to 'src/main/kotlin')
| -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") } |