From 98913e16902ce95a80a299e0e828fe2cf76181e5 Mon Sep 17 00:00:00 2001 From: Starmism Date: Thu, 4 Dec 2025 02:48:57 -0700 Subject: [PATCH] feat: CustomModelDataComponent --- build.gradle.kts | 2 +- .../net/axay/kspigot/items/KSpigotItems.kt | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 305e289c..3112450f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "net.axay" -version = "1.21.8-VAL" +version = "1.21.8.2-VAL" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" diff --git a/src/main/kotlin/net/axay/kspigot/items/KSpigotItems.kt b/src/main/kotlin/net/axay/kspigot/items/KSpigotItems.kt index acab4647..fcdd7a3b 100644 --- a/src/main/kotlin/net/axay/kspigot/items/KSpigotItems.kt +++ b/src/main/kotlin/net/axay/kspigot/items/KSpigotItems.kt @@ -11,6 +11,7 @@ import org.bukkit.Material import org.bukkit.inventory.ItemFlag import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.ItemMeta +import org.bukkit.inventory.meta.components.CustomModelDataComponent /** * Creates a new [ItemStack] and opens a builder for it. @@ -129,21 +130,16 @@ var ItemMeta.name: Component? get() = if (hasDisplayName()) displayName() else null set(value) = displayName(value ?: Component.space()) -/** - * Provides safe access to the items' displayName. - */ -@Suppress("DEPRECATION") -@Deprecated("displaynames are saved as Components in Paper", ReplaceWith("name", "net.axay.kspigot.Items.name")) -var ItemMeta.stringName: String? - get() = if (hasDisplayName()) displayName else null - set(value) = setDisplayName(if (value == null || value == "") " " else value) +//var ItemMeta.customModel: Int? +// get() = if (hasCustomModelData()) customModelData else null +// set(value) = setCustomModelData(value) /** * Provides safe access to the items' customModelData. */ -var ItemMeta.customModel: Int? - get() = if (hasCustomModelData()) customModelData else null - set(value) = setCustomModelData(value) +var ItemMeta.customModel: CustomModelDataComponent? + get() = if (hasCustomModelDataComponent()) customModelDataComponent else null + set(value) = setCustomModelDataComponent(value) /** * Provides more consistent access to the items' localizedName.