diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-03-06 23:36:57 +0100 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-03-08 16:01:00 +0100 |
| commit | 6ad259ca405d58f1956d67d7daeb05ae8590ca62 (patch) | |
| tree | f749625557c8eca45b1c7cc5f1f035f76935a7ff /src/main/kotlin/util | |
| parent | 8a4bfe24b364612e3e783ed9569082b130aa2bfc (diff) | |
| download | Firmament-6ad259ca405d58f1956d67d7daeb05ae8590ca62.tar.gz Firmament-6ad259ca405d58f1956d67d7daeb05ae8590ca62.tar.bz2 Firmament-6ad259ca405d58f1956d67d7daeb05ae8590ca62.zip | |
feat: Add tool/harvestability indicator
Diffstat (limited to 'src/main/kotlin/util')
| -rw-r--r-- | src/main/kotlin/util/MC.kt | 2 | ||||
| -rw-r--r-- | src/main/kotlin/util/SkyblockId.kt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/kotlin/util/MC.kt b/src/main/kotlin/util/MC.kt index ca3742d..a0d2fc0 100644 --- a/src/main/kotlin/util/MC.kt +++ b/src/main/kotlin/util/MC.kt @@ -99,7 +99,7 @@ object MC { inline val soundManager get() = instance.soundManager inline val player: ClientPlayerEntity? get() = TestUtil.unlessTesting { instance.player } inline val camera: Entity? get() = instance.cameraEntity - inline val stackInHand: ItemStack? get() = player?.inventory?.mainHandStack + inline val stackInHand: ItemStack get() = player?.inventory?.mainHandStack ?: ItemStack.EMPTY inline val guiAtlasManager get() = instance.guiAtlasManager inline val world: ClientWorld? get() = TestUtil.unlessTesting { instance.world } inline val playerName: String? get() = player?.name?.unformattedString diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt index a99afda..a31255c 100644 --- a/src/main/kotlin/util/SkyblockId.kt +++ b/src/main/kotlin/util/SkyblockId.kt @@ -34,7 +34,7 @@ import moe.nea.firmament.util.json.DashlessUUIDSerializer */ @JvmInline @Serializable -value class SkyblockId(val neuItem: String) { +value class SkyblockId(val neuItem: String) : Comparable<SkyblockId> { val identifier get() = Identifier.of("skyblockitem", neuItem.lowercase().replace(";", "__") @@ -48,6 +48,10 @@ value class SkyblockId(val neuItem: String) { return neuItem } + override fun compareTo(other: SkyblockId): Int { + return neuItem.compareTo(other.neuItem) + } + /** * 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 |