From 4c9900538af0fa4914d50a4d3299bd4772021e62 Mon Sep 17 00:00:00 2001
From: Jie <1503745098@qq.com>
Date: Sun, 1 Feb 2026 18:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9Anbt=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C,=E6=8A=8A=E5=85=BC=E5=AE=B9=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=BF=98=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/kotlin/taboolib/module/nms/NMSItemTag12005.kt    | 2 +-
 .../main/kotlin/taboolib/module/nms/NMSItemTag12105.kt    | 6 +++---
 .../main/kotlin/taboolib/module/nms/NMSItemTag12106.kt    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt
index 5168e0094..2eec9700a 100644
--- a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt
+++ b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt
@@ -194,7 +194,7 @@ class NMSItemTag12005 : NMSItemTag() {
             }
 
             // 不支持的类型
-            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
+            else -> error("Unsupported type: ${nbtTag::class.java}}")
         }
     }
 }
diff --git a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt
index caba18a18..2a194e881 100644
--- a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt
+++ b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt
@@ -56,8 +56,8 @@ class NMSItemTag12105 : NMSItemTag() {
     override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
         val nmsItem = getNMSCopy(itemStack)
         return if (onlyCustom) {
-            val a = any.filter { nmsItem.get(it) != null }.map { it.toString() to itemTagToBukkitCopy(nmsItem.get(it)!!, true) }
-            ItemTag(a.associate { it.first to it.second })
+            val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
+            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
         } else {
             val tag = nmsItem.save(CraftRegistry.getMinecraftRegistry())
             if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12105() // 返回一个特殊的 ItemTag
@@ -217,7 +217,7 @@ class NMSItemTag12105 : NMSItemTag() {
             is Boolean -> ItemTagData(nbtTag)
 
             // 不支持的类型
-            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
+            else -> error("Unsupported type: ${nbtTag::class.java}}")
         }
     }
 }
diff --git a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt
index bba289634..82305d78d 100644
--- a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt
+++ b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt
@@ -56,11 +56,11 @@ class NMSItemTag12106 : NMSItemTag() {
     override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
         val nmsItem = getNMSCopy(itemStack)
         return if (onlyCustom) {
-            val filter = components.filter { nmsItem.get(it) != null }.map { it.toString() to itemTagToBukkitCopy(nmsItem.get(it)!!, true) }
-            ItemTag(filter.associate { it.first to it.second })
+            val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
+            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
         } else {
             val tag = nmsItem.toNbt()
-            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
+            if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
         }
     }
 
@@ -220,7 +220,7 @@ class NMSItemTag12106 : NMSItemTag() {
             is Boolean -> ItemTagData(nbtTag)
 
             // 不支持的类型
-            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}")
+            else -> error("Unsupported type: ${nbtTag::class.java}")
         }
     }