From be65b11379fa17869b99bbbe0fe8ea529ad39e44 Mon Sep 17 00:00:00 2001 From: Tristan Date: Fri, 27 May 2022 17:29:06 -0400 Subject: [PATCH] Bump Minestom --- build.gradle.kts | 10 +++++----- .../world/cepi/itemextension/combat/TargetHandler.kt | 2 +- .../cepi/itemextension/combat/events/CombatHandler.kt | 2 +- .../cepi/itemextension/combat/events/DeathHandler.kt | 2 +- .../world/cepi/itemextension/command/GiveCommand.kt | 4 ++-- .../world/cepi/itemextension/command/NBTCommand.kt | 10 +++++----- .../itemcommand/loaders/actions/CreateSubcommand.kt | 4 ++-- .../itemcommand/loaders/actions/RemoveSubcommand.kt | 4 ++-- .../itemcommand/loaders/actions/ResetSubcommand.kt | 4 ++-- .../itemcommand/loaders/actions/SetSubcommand.kt | 2 +- .../itemcommand/loaders/actions/UpdateSubcommand.kt | 4 ++-- src/main/kotlin/world/cepi/itemextension/item/Item.kt | 4 ++-- .../itemextension/item/context/ItemContextParser.kt | 2 +- .../item/context/ItemOffHandContextParser.kt | 2 +- .../world/cepi/itemextension/item/traits/ItemTrait.kt | 5 +++-- .../cepi/itemextension/item/traits/list/DamageTrait.kt | 5 +++-- .../itemextension/item/traits/list/DurabilityTrait.kt | 5 +++-- .../itemextension/item/traits/list/KnockbackTrait.kt | 4 ++-- .../itemextension/item/traits/list/MaterialTrait.kt | 4 ++-- .../cepi/itemextension/item/traits/list/NameTrait.kt | 4 ++-- .../cepi/itemextension/item/traits/list/PriceTrait.kt | 4 ++-- .../world/cepi/itemextension/stats/StatsHandler.kt | 4 ++-- 22 files changed, 47 insertions(+), 44 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7eb8684b..658d1cff 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,19 +35,19 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") // Compile Minestom into project - compileOnly("com.github.Minestom", "Minestom", "4ee5cbe424") + compileOnly("com.github.Minestom", "Minestom", "7867313290") // implement KStom - compileOnly("com.github.Project-Cepi:KStom:15bab227a2") + compileOnly("com.github.Project-Cepi:KStom:82f7000079") // add energy compileOnly("com.github.Project-Cepi:EnergyExtension:f2bcdfc79e") // import kotlinx serialization - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") + compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") // Add MiniMessage - compileOnly("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT") + compileOnly("net.kyori:adventure-text-minimessage:4.10.1") // Add Kepi compileOnly("com.github.Project-Cepi:Kepi:071b288ed0") @@ -71,7 +71,7 @@ dependencies { compileOnly("com.github.Project-Cepi:MinestomPVP:b9cb14d4bf") // Add canvas - implementation("com.mattworzala:canvas:1.1.5") + implementation("com.github.Project-Cepi:canvas:a61710f9e2") } tasks.withType { diff --git a/src/main/kotlin/world/cepi/itemextension/combat/TargetHandler.kt b/src/main/kotlin/world/cepi/itemextension/combat/TargetHandler.kt index 79cd6b5a..615391a3 100644 --- a/src/main/kotlin/world/cepi/itemextension/combat/TargetHandler.kt +++ b/src/main/kotlin/world/cepi/itemextension/combat/TargetHandler.kt @@ -100,7 +100,7 @@ object TargetHandler { if (!checkIsItem(item)) return false - val cepiItem: Item = item.meta.get(Item.key, itemSerializationModule)!! + val cepiItem: Item = item.meta().get(Item.key, itemSerializationModule)!! // Check if any action of an item requires a target return cepiItem.softGet().any { it.useTargeting } diff --git a/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt b/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt index 774cb22e..71563993 100644 --- a/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt +++ b/src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt @@ -218,7 +218,7 @@ object CombatHandler { run set@ { (entity as? LivingEntity)?.itemInMainHand = cepiItem.renderItem( - (entity as? LivingEntity)?.itemInMainHand?.amount ?: return@set + (entity as? LivingEntity)?.itemInMainHand?.amount() ?: return@set ) } } diff --git a/src/main/kotlin/world/cepi/itemextension/combat/events/DeathHandler.kt b/src/main/kotlin/world/cepi/itemextension/combat/events/DeathHandler.kt index 65ebbf9e..c9c8be2d 100644 --- a/src/main/kotlin/world/cepi/itemextension/combat/events/DeathHandler.kt +++ b/src/main/kotlin/world/cepi/itemextension/combat/events/DeathHandler.kt @@ -20,7 +20,7 @@ object DeathHandler { private fun deathMessage(player: Player, secondsLeft: Int) = player.showTitle(Title.title( Component.text("You died!", NamedTextColor.RED), Component.text("Respawning in $secondsLeft...", NamedTextColor.WHITE), - Title.Times.of(Ticks.duration(0), Ticks.duration(21), Ticks.duration(0)) + Title.Times.times(Ticks.duration(0), Ticks.duration(21), Ticks.duration(0)) )) diff --git a/src/main/kotlin/world/cepi/itemextension/command/GiveCommand.kt b/src/main/kotlin/world/cepi/itemextension/command/GiveCommand.kt index 900f7c90..1d517200 100644 --- a/src/main/kotlin/world/cepi/itemextension/command/GiveCommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/GiveCommand.kt @@ -55,8 +55,8 @@ object GiveCommand : Kommand({ Component.text(context.get(amountArg), NamedTextColor.BLUE) .append(Component.space()) .append(context.get(itemArg).displayName ?: Component.text( - context.get(itemArg).material - .namespace().path + context.get(itemArg).material() + .namespace().path() .lowercase() .split("_") .joinToString(" ") { it.replaceFirstChar { it.uppercase() } } diff --git a/src/main/kotlin/world/cepi/itemextension/command/NBTCommand.kt b/src/main/kotlin/world/cepi/itemextension/command/NBTCommand.kt index ef362db9..112c469e 100644 --- a/src/main/kotlin/world/cepi/itemextension/command/NBTCommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/NBTCommand.kt @@ -37,9 +37,9 @@ internal object NBTCommand : Kommand({ val item = player.itemInMainHand player.sendMessage( - Component.text(item.meta.toSNBT(), NamedTextColor.GRAY) + Component.text(item.meta().toSNBT(), NamedTextColor.GRAY) .hoverEvent(HoverEvent.showText(Component.text("Click to copy", NamedTextColor.YELLOW))) - .clickEvent(ClickEvent.copyToClipboard(item.meta.toSNBT())) + .clickEvent(ClickEvent.copyToClipboard(item.meta().toSNBT())) ) } @@ -47,15 +47,15 @@ internal object NBTCommand : Kommand({ val item = player.itemInMainHand player.sendMessage( - Component.text(item.meta.toNBT().withRemovedKeys("display").toSNBT(), NamedTextColor.GRAY) + Component.text(item.meta().toNBT().withRemovedKeys("display").toSNBT(), NamedTextColor.GRAY) .hoverEvent(HoverEvent.showText(Component.text("Click to copy", NamedTextColor.YELLOW))) - .clickEvent(ClickEvent.copyToClipboard(item.meta.toSNBT())) + .clickEvent(ClickEvent.copyToClipboard(item.meta().toSNBT())) ) } syntax(set, nbt, material) { player.itemInMainHand = ItemStack.fromNBT( - context[material].material, + context[material].material(), context[nbt] ) } diff --git a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/CreateSubcommand.kt b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/CreateSubcommand.kt index 9418090e..fd734356 100755 --- a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/CreateSubcommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/CreateSubcommand.kt @@ -25,10 +25,10 @@ object CreateSubcommand : Kommand({ val item = Item() if (context[materialArgument] != ItemStack.of(Material.PAPER)) { - item.put(MaterialTrait(context[materialArgument].material, context[materialArgument].meta.customModelData)) + item.put(MaterialTrait(context[materialArgument].material(), context[materialArgument].meta().customModelData)) } - AddCreationalItem.put(player, item.renderItem(if (itemStack.amount == 0) 1 else itemStack.amount)) + AddCreationalItem.put(player, item.renderItem(if (itemStack.amount() == 0) 1 else itemStack.amount())) player.sendFormattedTranslatableMessage("item", "create") player.playSound(Kepi.newItemSound) diff --git a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/RemoveSubcommand.kt b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/RemoveSubcommand.kt index 84f03efb..a217e9f4 100755 --- a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/RemoveSubcommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/RemoveSubcommand.kt @@ -22,7 +22,7 @@ object RemoveSubcommand : Kommand(name = "remove") { syntax(traitList) { val itemStack = player.itemInMainHand - if (itemStack.material == Material.AIR) { + if (itemStack.material() == Material.AIR) { player.sendFormattedTranslatableMessage("item", "main.required") return@syntax } @@ -43,7 +43,7 @@ object RemoveSubcommand : Kommand(name = "remove") { Component.text(processTraitName(trait.simpleName!!), NamedTextColor.BLUE) .append(Component.text("", NamedTextColor.GRAY)) ) - player.itemInMainHand = item.renderItem(player.itemInMainHand.amount) + player.itemInMainHand = item.renderItem(player.itemInMainHand.amount()) player.playSound(Kepi.editItemSound) } else player.sendFormattedTranslatableMessage("item", "trait.none", Component.text(context.get(traitList), NamedTextColor.BLUE)) diff --git a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/ResetSubcommand.kt b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/ResetSubcommand.kt index 8d91ea1f..b29690ba 100755 --- a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/ResetSubcommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/ResetSubcommand.kt @@ -12,7 +12,7 @@ object ResetSubcommand : Kommand({ syntax { val itemStack = player.itemInMainHand - if (itemStack.material == Material.AIR) { + if (itemStack.material() == Material.AIR) { player.sendFormattedTranslatableMessage("mob", "main.required") return@syntax } @@ -22,7 +22,7 @@ object ResetSubcommand : Kommand({ if (isCepiItem) { val item = itemStack.cepiItem!! item.removeAllTraits() - player.itemInMainHand = item.renderItem(itemStack.amount) + player.itemInMainHand = item.renderItem(itemStack.amount()) player.sendFormattedTranslatableMessage("item", "reset") player.playSound(Kepi.editItemSound) } else diff --git a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/SetSubcommand.kt b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/SetSubcommand.kt index 2d04714d..2cc9ebcb 100755 --- a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/SetSubcommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/SetSubcommand.kt @@ -82,7 +82,7 @@ object SetSubcommand : Kommand(name = "set") { item.put(instance) - player.itemInMainHand = item.renderItem(player.itemInMainHand.amount.coerceIn(1, Integer.MAX_VALUE)) + player.itemInMainHand = item.renderItem(player.itemInMainHand.amount().coerceIn(1, Integer.MAX_VALUE)) player.sendFormattedTranslatableMessage("item", "trait.add", Component.text(processTraitName(lastTrait.simpleName!!), NamedTextColor.BLUE)) diff --git a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/UpdateSubcommand.kt b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/UpdateSubcommand.kt index 534e7169..32706cb7 100755 --- a/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/UpdateSubcommand.kt +++ b/src/main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/UpdateSubcommand.kt @@ -11,7 +11,7 @@ object UpdateSubcommand : Kommand({ syntax { val itemStack = player.itemInMainHand - if (itemStack.material == Material.AIR) { + if (itemStack.material() == Material.AIR) { player.sendFormattedTranslatableMessage("item", "main.required") return@syntax } @@ -20,7 +20,7 @@ object UpdateSubcommand : Kommand({ if (isCepiItem) { val item = itemStack.cepiItem!! - player.itemInMainHand = item.renderItem(itemStack.amount) + player.itemInMainHand = item.renderItem(itemStack.amount()) player.sendFormattedTranslatableMessage("item", "render") } else player.sendFormattedTranslatableMessage("item", "formatted.required") diff --git a/src/main/kotlin/world/cepi/itemextension/item/Item.kt b/src/main/kotlin/world/cepi/itemextension/item/Item.kt index 6ce4c0f0..6d23947d 100755 --- a/src/main/kotlin/world/cepi/itemextension/item/Item.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/Item.kt @@ -98,11 +98,11 @@ fun checkIsItem(itemStack: ItemStack): Boolean { if (itemStack.isAir) return false - return itemStack.meta.get(key, itemSerializationModule) != null + return itemStack.meta().get(key, itemSerializationModule) != null } val ItemStack.cepiItem: Item? - get() = this.meta.get(key, itemSerializationModule) + get() = this.meta().get(key, itemSerializationModule) /** * DSL for creating cepi items diff --git a/src/main/kotlin/world/cepi/itemextension/item/context/ItemContextParser.kt b/src/main/kotlin/world/cepi/itemextension/item/context/ItemContextParser.kt index c9b691c6..994a62bd 100644 --- a/src/main/kotlin/world/cepi/itemextension/item/context/ItemContextParser.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/context/ItemContextParser.kt @@ -14,7 +14,7 @@ import world.cepi.kstom.item.get object ItemContextParser : ContextParser { override fun parse(sender: CommandSender): Item? = - (sender as? Player)?.itemInMainHand?.meta?.get(Item.key, itemSerializationModule) + (sender as? Player)?.itemInMainHand?.meta()?.get(Item.key, itemSerializationModule) override val callbackMessage = Component.text("No cepi item found in main hand!") diff --git a/src/main/kotlin/world/cepi/itemextension/item/context/ItemOffHandContextParser.kt b/src/main/kotlin/world/cepi/itemextension/item/context/ItemOffHandContextParser.kt index 0a81847a..d20647d3 100644 --- a/src/main/kotlin/world/cepi/itemextension/item/context/ItemOffHandContextParser.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/context/ItemOffHandContextParser.kt @@ -14,7 +14,7 @@ import world.cepi.kstom.item.get object ItemOffHandContextParser : ContextParser { override fun parse(sender: CommandSender): Item? = - (sender as? Player)?.itemInOffHand?.meta?.get(Item.key, itemSerializationModule) + (sender as? Player)?.itemInOffHand?.meta()?.get(Item.key, itemSerializationModule) override val callbackMessage = Component.text("No cepi item found in main hand!") diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/ItemTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/ItemTrait.kt index 50c8022e..6abfa7b6 100755 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/ItemTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/ItemTrait.kt @@ -2,7 +2,8 @@ package world.cepi.itemextension.item.traits import kotlinx.serialization.Serializable import net.kyori.adventure.text.Component -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta +import net.minestom.server.item.ItemStack import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.list.* import world.cepi.itemextension.item.traits.list.actions.PrimaryActionTrait @@ -24,7 +25,7 @@ abstract class ItemTrait { * * @param item The item that is being rendered. */ - open fun task(item: ItemMetaBuilder, originalItem: Item) { } + open fun task(item: ItemMeta.Builder, originalItem: Item) { } /** * This function is called based on the [ItemTrait.Companion.classList] of the [ItemTrait] diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/DamageTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/DamageTrait.kt index 7d749625..2da5cf8d 100755 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/DamageTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/DamageTrait.kt @@ -5,7 +5,8 @@ import kotlinx.serialization.Serializable import net.kyori.adventure.text.Component import net.kyori.adventure.text.format.NamedTextColor import net.kyori.adventure.text.format.TextDecoration -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta +import net.minestom.server.item.ItemStack import net.minestom.server.tag.Tag import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -28,7 +29,7 @@ data class DamageTrait( ) } - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { set(Tag.Float("damage"), damage) } diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/DurabilityTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/DurabilityTrait.kt index f09158bd..c6644d95 100644 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/DurabilityTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/DurabilityTrait.kt @@ -5,7 +5,8 @@ import kotlinx.serialization.Serializable import net.kyori.adventure.text.Component import net.kyori.adventure.text.format.NamedTextColor import net.kyori.adventure.text.format.TextDecoration -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta +import net.minestom.server.item.ItemStack import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -15,7 +16,7 @@ class DurabilityTrait(val maxDurability: Int, val currentDurability: Int) : Item override val taskIndex = 1f - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { damage( (maxDurability - currentDurability) * (originalItem.get()!!.material.registry().maxDamage() / maxDurability) diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/KnockbackTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/KnockbackTrait.kt index 75994e03..de4b76ef 100644 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/KnockbackTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/KnockbackTrait.kt @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta import net.minestom.server.tag.Tag import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -13,7 +13,7 @@ data class KnockbackTrait(val amount: Float): ItemTrait() { override val taskIndex = 0f - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { set(Tag.Float("knockback"), amount) } diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/MaterialTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/MaterialTrait.kt index 3989cdd2..1f4899bb 100755 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/MaterialTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/MaterialTrait.kt @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta import net.minestom.server.item.Material import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -24,7 +24,7 @@ data class MaterialTrait( override val taskIndex = -1f - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { if (customModelData != 0) customModelData(customModelData) } diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/NameTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/NameTrait.kt index 4ce67e89..659b4964 100755 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/NameTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/NameTrait.kt @@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable import net.kyori.adventure.text.Component import net.kyori.adventure.text.format.NamedTextColor import net.kyori.adventure.text.format.TextDecoration -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -19,7 +19,7 @@ data class NameTrait( override val taskIndex = 10f - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { val color = originalItem.get()?.rarity?.color ?: NamedTextColor.WHITE displayName(Component.text(name, color).decoration(TextDecoration.ITALIC, false)) } diff --git a/src/main/kotlin/world/cepi/itemextension/item/traits/list/PriceTrait.kt b/src/main/kotlin/world/cepi/itemextension/item/traits/list/PriceTrait.kt index 46994675..10b0c6d7 100644 --- a/src/main/kotlin/world/cepi/itemextension/item/traits/list/PriceTrait.kt +++ b/src/main/kotlin/world/cepi/itemextension/item/traits/list/PriceTrait.kt @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import net.minestom.server.item.ItemMetaBuilder +import net.minestom.server.item.ItemMeta import net.minestom.server.tag.Tag import world.cepi.itemextension.item.Item import world.cepi.itemextension.item.traits.ItemTrait @@ -20,7 +20,7 @@ data class PriceTrait( override val taskIndex = 0f - override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) { + override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) { set(Tag.Integer("price"), price) } diff --git a/src/main/kotlin/world/cepi/itemextension/stats/StatsHandler.kt b/src/main/kotlin/world/cepi/itemextension/stats/StatsHandler.kt index def792a0..e34a4869 100644 --- a/src/main/kotlin/world/cepi/itemextension/stats/StatsHandler.kt +++ b/src/main/kotlin/world/cepi/itemextension/stats/StatsHandler.kt @@ -64,10 +64,10 @@ object StatsHandler { val item: Item = ( if (isSlotChanged) - changedSlots[it]?.meta?.get(Item.key, itemSerializationModule) ?: return@mapNotNull null + changedSlots[it]?.meta()?.get(Item.key, itemSerializationModule) ?: return@mapNotNull null else null - ) ?: entity.getEquipment(it).meta.get(Item.key, itemSerializationModule) ?: return@mapNotNull null + ) ?: entity.getEquipment(it).meta().get(Item.key, itemSerializationModule) ?: return@mapNotNull null it to item }.toMap()