diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-09-17 23:22:32 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-09-17 23:22:32 +0200 |
| commit | 171fa38ddc65de7c37356c12f3cafc584bbca801 (patch) | |
| tree | 207d0bb3303e391b276329729294f0d5e901bb0c /src/main/kotlin/util/SkyblockId.kt | |
| parent | 2b02a861a6f9a39c766dd4be18f30abefa2d9aec (diff) | |
| download | Firmament-171fa38ddc65de7c37356c12f3cafc584bbca801.tar.gz Firmament-171fa38ddc65de7c37356c12f3cafc584bbca801.tar.bz2 Firmament-171fa38ddc65de7c37356c12f3cafc584bbca801.zip | |
feat: add skyblock ids to superpairs (+rng meter)
Diffstat (limited to 'src/main/kotlin/util/SkyblockId.kt')
| -rw-r--r-- | src/main/kotlin/util/SkyblockId.kt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt index 43a9084..84c6564 100644 --- a/src/main/kotlin/util/SkyblockId.kt +++ b/src/main/kotlin/util/SkyblockId.kt @@ -37,6 +37,8 @@ import moe.nea.firmament.util.json.DashlessUUIDSerializer 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.isExperimentationRngMeter +import moe.nea.firmament.util.skyblock.isSuperPairs /** * A SkyBlock item id, as used by the NEU repo. @@ -230,7 +232,8 @@ fun ItemStack.getLogicalStackSize(): Long { val ItemStack.rawSkyBlockId: String? get() = extraAttributes.getString("id").getOrNull() fun ItemStack.guessContextualSkyBlockId(): SkyblockId? { - if (MC.screen?.isBazaarUi() == true) { + val screen = MC.screen + if (screen?.isBazaarUi() == true) { val name = displayNameAccordingToNbt.unformattedString .replaceFirst("SELL ", "") .replaceFirst("BUY ", "") @@ -239,6 +242,11 @@ fun ItemStack.guessContextualSkyBlockId(): SkyblockId? { } return ItemNameLookup.guessItemByName(name, false) } + if (screen?.isExperimentationRngMeter() == true || screen?.isSuperPairs() == true) { + val name = displayNameAccordingToNbt.unformattedString + return RepoManager.enchantedBookCache.byName[name] + ?: ItemNameLookup.guessItemByName(name, false) + } return null } |