From 1c0090ec301b87edebc29453287e585f88de2c4f Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Mon, 30 Dec 2024 21:48:56 +0100 Subject: feat: Add auto generated ItemIds class --- src/main/kotlin/moe/nea/ledger/ItemId.kt | 7 +++++-- src/main/kotlin/moe/nea/ledger/modules/GambleDetection.kt | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/kotlin/moe') diff --git a/src/main/kotlin/moe/nea/ledger/ItemId.kt b/src/main/kotlin/moe/nea/ledger/ItemId.kt index 6be23fb..f4786cd 100644 --- a/src/main/kotlin/moe/nea/ledger/ItemId.kt +++ b/src/main/kotlin/moe/nea/ledger/ItemId.kt @@ -1,7 +1,6 @@ package moe.nea.ledger -@JvmInline -value class ItemId( +data class ItemId( val string: String ) { fun singleItem(): Pair { @@ -14,11 +13,15 @@ value class ItemId( companion object { + + @JvmStatic + fun forName(string: String) = ItemId(string) fun skill(skill: String) = ItemId("SKYBLOCK_SKILL_$skill") val GARDEN = skill("GARDEN") val FARMING = skill("FARMING") + val ARCHFIEND_DYE = ItemId("DYE_ARCHFIEND") val ARCHFIEND_HIGH_CLASS = ItemId("HIGH_CLASS_ARCHFIEND_DICE") val ARCHFIEND_LOW_CLASS = ItemId("ARCHFIEND_DICE") diff --git a/src/main/kotlin/moe/nea/ledger/modules/GambleDetection.kt b/src/main/kotlin/moe/nea/ledger/modules/GambleDetection.kt index 6a339d7..0ef43a2 100644 --- a/src/main/kotlin/moe/nea/ledger/modules/GambleDetection.kt +++ b/src/main/kotlin/moe/nea/ledger/modules/GambleDetection.kt @@ -6,6 +6,7 @@ import moe.nea.ledger.LedgerEntry import moe.nea.ledger.LedgerLogger import moe.nea.ledger.TransactionType import moe.nea.ledger.events.ChatReceived +import moe.nea.ledger.gen.ItemIds import moe.nea.ledger.useMatcher import moe.nea.ledger.utils.di.Inject import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -33,7 +34,7 @@ class GambleDetection { listOf( ItemChange.lose(item, 1), ItemChange.loseCoins(rollCost), - ItemChange.gain(ItemId.ARCHFIEND_DYE, 1), + ItemChange.gain(ItemIds.DYE_ARCHFIEND, 1), ) )) } else if (face == "6") { -- cgit