Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Custom Skyblock ID for Party & Balloon Hats (This means Party and Balloon Hats now show prices)

Browse Source
This commit is contained in:
jani270
2025-06-04 16:35:43 +02:00
committed by Linnea Gräf
parent cd35e18c9c
commit 620d189084
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/kotlin/util/SkyblockId.kt
View File

@@ -29,8 +29,8 @@ import moe.nea.firmament.util.json.DashlessUUIDSerializer
/** /**
* A SkyBlock item id, as used by the NEU repo. * A SkyBlock item id, as used by the NEU repo.
* This is not exactly the format used by HyPixel, but is mostly the same. * This is not exactly the format used by Hypixel, but is mostly the same.
* Usually this id splits an id used by HyPixel into more sub items. For example `PET` becomes `$PET_ID;$PET_RARITY`, * Usually this id splits an id used by Hypixel into more sub items. For example `PET` becomes `$PET_ID;$PET_RARITY`,
* with those values extracted from other metadata. * with those values extracted from other metadata.
*/ */
@JvmInline @JvmInline
@@ -54,7 +54,7 @@ value class SkyblockId(val neuItem: String) : Comparable<SkyblockId> {
} }
/** /**
* A bazaar stock item id, as returned by the HyPixel bazaar api endpoint. * A bazaar stock item id, as returned by the Hypixel bazaar api endpoint.
* These are not equivalent to the in-game ids, or the NEU repo ids, and in fact, do not refer to items, but instead * These are not equivalent to the in-game ids, or the NEU repo ids, and in fact, do not refer to items, but instead
* to bazaar stocks. The main difference from [SkyblockId]s is concerning enchanted books. There are probably more, * to bazaar stocks. The main difference from [SkyblockId]s is concerning enchanted books. There are probably more,
* but for now this holds. * but for now this holds.
@@ -226,7 +226,21 @@ val ItemStack.skyBlockId: SkyblockId?
} }
} }
// TODO: PARTY_HAT_CRAB{,_ANIMATED,_SLOTH} "PARTY_HAT_SLOTH", "PARTY_HAT_CRAB", "PARTY_HAT_CRAB_ANIMATED" -> {
val partyHatEmoji = extraAttributes.getString("party_hat_emoji").getOrNull()
val partyHatYear = extraAttributes.getInt("party_hat_year").getOrNull()
val partyHatColor = extraAttributes.getString("party_hat_color").getOrNull()
when {
partyHatEmoji != null -> SkyblockId("PARTY_HAT_SLOTH_${partyHatEmoji.uppercase()}")
partyHatYear == 2022 -> SkyblockId("PARTY_HAT_CRAB_${partyHatColor?.uppercase()}_ANIMATED")
else -> SkyblockId("PARTY_HAT_CRAB_${partyHatColor?.uppercase()}")
}
}
"BALLOON_HAT_2024" -> {
SkyblockId("BALLOON_HAT_2024_${extraAttributes.getString("party_hat_color").getOrNull()?.uppercase()}")
}
else -> { else -> {
SkyblockId(id) SkyblockId(id)
} }