From 2cc7d668eacba1919208ba6b131b01fe10bbf0ed Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Thu, 16 Jan 2025 20:46:41 +0100 Subject: refactor: Move some basetypes and fix: Kuudra chest and dungeon chest detection mixing --- basetypes/src/main/kotlin/moe/nea/ledger/ItemId.kt | 35 ++++++++++++++++++++++ .../kotlin/moe/nea/ledger/utils/RemoveInRelease.kt | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 basetypes/src/main/kotlin/moe/nea/ledger/ItemId.kt create mode 100644 basetypes/src/main/kotlin/moe/nea/ledger/utils/RemoveInRelease.kt (limited to 'basetypes') diff --git a/basetypes/src/main/kotlin/moe/nea/ledger/ItemId.kt b/basetypes/src/main/kotlin/moe/nea/ledger/ItemId.kt new file mode 100644 index 0000000..8dcfa27 --- /dev/null +++ b/basetypes/src/main/kotlin/moe/nea/ledger/ItemId.kt @@ -0,0 +1,35 @@ +package moe.nea.ledger + +import moe.nea.ledger.utils.RemoveInRelease + +data class ItemId( + val string: String +) { + @RemoveInRelease + fun singleItem(): Pair { + return withStackSize(1) + } + + @RemoveInRelease + fun withStackSize(size: Number): Pair { + return Pair(this, size.toDouble()) + } + + + companion object { + + @JvmStatic + @RemoveInRelease + fun forName(string: String) = ItemId(string) + fun skill(skill: String) = ItemId("SKYBLOCK_SKILL_$skill") + + val GARDEN = skill("GARDEN") + val FARMING = skill("FARMING") + + + val COINS = ItemId("SKYBLOCK_COIN") + val GEMSTONE_POWDER = ItemId("SKYBLOCK_POWDER_GEMSTONE") + val MITHRIL_POWDER = ItemId("SKYBLOCK_POWDER_MITHRIL") + val NIL = ItemId("SKYBLOCK_NIL") + } +} \ No newline at end of file diff --git a/basetypes/src/main/kotlin/moe/nea/ledger/utils/RemoveInRelease.kt b/basetypes/src/main/kotlin/moe/nea/ledger/utils/RemoveInRelease.kt new file mode 100644 index 0000000..319fb63 --- /dev/null +++ b/basetypes/src/main/kotlin/moe/nea/ledger/utils/RemoveInRelease.kt @@ -0,0 +1,4 @@ +package moe.nea.ledger.utils + +@Retention(AnnotationRetention.BINARY) +annotation class RemoveInRelease -- cgit