TabooLib · Bkm016 · Jan 5, 2026 · Nov 20, 2025 · Nov 20, 2025 · Nov 20, 2025
diff --git a/...ukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt b/...ukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt
@@ -194,7 +194,7 @@ class NMSItemTag12005 : NMSItemTag() {
             }
 
             // 不支持的类型
-            else -> error("Unsupported type: ${nbtTag::class.java}}")
+            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
         }
     }
 }

diff --git a/...ukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt b/...ukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt
@@ -11,6 +11,7 @@ import net.minecraft.world.item.component.CustomData
 import org.bukkit.craftbukkit.v1_21_R4.CraftRegistry
 import org.bukkit.craftbukkit.v1_21_R4.inventory.CraftItemStack
 import org.bukkit.inventory.ItemStack
+import java.lang.reflect.Modifier
 import kotlin.jvm.optionals.getOrNull
 
 /**
@@ -44,11 +45,19 @@ class NMSItemTag12105 : NMSItemTag() {
         return CraftItemStack.asBukkitCopy(itemStack as net.minecraft.world.item.ItemStack)
     }
 
+    val any by lazy {
+        DataComponents::class.java.declaredFields.filter {
+            Modifier.isStatic(it.modifiers) && it.type == DataComponentType::class.java
+        }.map {
+            it.get(null) as DataComponentType<*>
+        }
+    }
+
     override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
         val nmsItem = getNMSCopy(itemStack)
         return if (onlyCustom) {
-            val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
-            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
+            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 })
         } else {
             val tag = nmsItem.save(CraftRegistry.getMinecraftRegistry())
             if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12105() // 返回一个特殊的 ItemTag
@@ -171,34 +180,44 @@ class NMSItemTag12105 : NMSItemTag() {
         return when (nbtTag) {
             // 基本类型
             is NBTTagByte -> ItemTagData(ItemTagType.BYTE, nbtTag.value)
+            is Byte -> ItemTagData(ItemTagType.BYTE, nbtTag)
             is NBTTagShort -> ItemTagData(ItemTagType.SHORT, nbtTag.value)
+            is Short -> ItemTagData(ItemTagType.SHORT, nbtTag)
             is NBTTagInt -> ItemTagData(ItemTagType.INT, nbtTag.value)
+            is Int -> ItemTagData(ItemTagType.INT, nbtTag)
             is NBTTagLong -> ItemTagData(ItemTagType.LONG, nbtTag.value)
+            is Long -> ItemTagData(ItemTagType.LONG, nbtTag)
             is NBTTagFloat -> ItemTagData(ItemTagType.FLOAT, nbtTag.value)
+            is Float -> ItemTagData(ItemTagType.FLOAT, nbtTag)
             is NBTTagDouble -> ItemTagData(ItemTagType.DOUBLE, nbtTag.value)
+            is Double -> ItemTagData(ItemTagType.DOUBLE, nbtTag)
             is NBTTagString -> ItemTagData(ItemTagType.STRING, nbtTag.value)
 
             // 数组类型特殊处理
             is NBTTagByteArray -> ItemTagData(ItemTagType.BYTE_ARRAY, nbtTag.asByteArray.copyOf())
+            is ByteArray -> ItemTagData(ItemTagType.BYTE_ARRAY, nbtTag)
             is NBTTagIntArray -> ItemTagData(ItemTagType.INT_ARRAY, nbtTag.asIntArray.copyOf())
+            is IntArray -> ItemTagData(ItemTagType.INT_ARRAY, nbtTag)
             is NBTTagLongArray -> ItemTagData(ItemTagType.LONG_ARRAY, nbtTag.asLongArray.copyOf())
+            is LongArray -> ItemTagData(ItemTagType.LONG_ARRAY, nbtTag)
 
             // 列表类型特殊处理
-            is NBTTagList -> {
-                ItemTagList(nbtTag.map { itemTagToBukkitCopy(it) })
-            }
+            is NBTTagList -> ItemTagList(nbtTag.map { itemTagToBukkitCopy(it, onlyCustom) })
+            is List<*> -> ItemTagList(nbtTag.map { itemTagToBukkitCopy(it!!, onlyCustom) })
 
             // 复合类型特殊处理
             is NBTTagCompound -> {
                 // 1.20.5 -> nbtTag.allKeys.xxx
                 // 1.21.5 -> nbtTag.keySet()
-                nbtTag.keySet().associateWith { itemTagToBukkitCopy(nbtTag.get(it)!!) }.let {
+                nbtTag.keySet().associateWith { itemTagToBukkitCopy(nbtTag.get(it)!!, onlyCustom) }.let {
                     if (onlyCustom) ItemTag(it) else ItemTag12105(it)
                 }
             }
 
+            is Boolean -> ItemTagData(nbtTag)
+
             // 不支持的类型
-            else -> error("Unsupported type: ${nbtTag::class.java}}")
+            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
         }
     }
 }

diff --git a/...ukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt b/...ukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt
@@ -11,13 +11,26 @@ import net.minecraft.world.item.component.CustomData
 import org.bukkit.craftbukkit.v1_21_R5.CraftRegistry
 import org.bukkit.craftbukkit.v1_21_R5.inventory.CraftItemStack
 import org.bukkit.inventory.ItemStack
+import org.tabooproject.reflex.Reflex.Companion.invokeMethod
+import java.lang.reflect.Modifier
+import java.util.*
 import kotlin.jvm.optionals.getOrNull
 
 /**
  * [NMSItemTag] 的实现类
  */
 class NMSItemTag12106 : NMSItemTag() {
 
+    val components by lazy {
+        try {
+            DataComponents::class.java.declaredFields.filter {
+                Modifier.isStatic(it.modifiers) && it.type == DataComponentType::class.java
+            }.map { it.get(null) as DataComponentType<*> }
+        } catch (_: ClassNotFoundException) {
+            emptyList()
+        }
+    }
+
     override fun newItemTag(): ItemTag {
         return ItemTag12106()
     }
@@ -43,11 +56,11 @@ class NMSItemTag12106 : NMSItemTag() {
     override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
         val nmsItem = getNMSCopy(itemStack)
         return if (onlyCustom) {
-            val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
-            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
+            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 })
         } else {
             val tag = nmsItem.toNbt()
-            if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
+            if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
         }
     }
 
@@ -164,42 +177,63 @@ class NMSItemTag12106 : NMSItemTag() {
         return when (nbtTag) {
             // 基本类型
             is NBTTagByte -> ItemTagData(ItemTagType.BYTE, nbtTag.value)
+            is Byte -> ItemTagData(ItemTagType.BYTE, nbtTag)
+
             is NBTTagShort -> ItemTagData(ItemTagType.SHORT, nbtTag.value)
+            is Short -> ItemTagData(ItemTagType.SHORT, nbtTag)
+
             is NBTTagInt -> ItemTagData(ItemTagType.INT, nbtTag.value)
+            is Int -> ItemTagData(ItemTagType.INT, nbtTag)
+
             is NBTTagLong -> ItemTagData(ItemTagType.LONG, nbtTag.value)
+            is Long -> ItemTagData(ItemTagType.LONG, nbtTag)
+
             is NBTTagFloat -> ItemTagData(ItemTagType.FLOAT, nbtTag.value)
+            is Float -> ItemTagData(ItemTagType.FLOAT, nbtTag)
+
             is NBTTagDouble -> ItemTagData(ItemTagType.DOUBLE, nbtTag.value)
+            is Double -> ItemTagData(ItemTagType.DOUBLE, nbtTag)
+
             is NBTTagString -> ItemTagData(ItemTagType.STRING, nbtTag.value)
 
             // 数组类型特殊处理
             is NBTTagByteArray -> ItemTagData(ItemTagType.BYTE_ARRAY, nbtTag.asByteArray.copyOf())
+            is ByteArray -> ItemTagData(ItemTagType.BYTE_ARRAY, nbtTag)
             is NBTTagIntArray -> ItemTagData(ItemTagType.INT_ARRAY, nbtTag.asIntArray.copyOf())
+            is IntArray -> ItemTagData(ItemTagType.INT_ARRAY, nbtTag)
             is NBTTagLongArray -> ItemTagData(ItemTagType.LONG_ARRAY, nbtTag.asLongArray.copyOf())
+            is LongArray -> ItemTagData(ItemTagType.LONG_ARRAY, nbtTag)
 
             // 列表类型特殊处理
-            is NBTTagList -> {
-                ItemTagList(nbtTag.map { itemTagToBukkitCopy(it) })
-            }
+            is NBTTagList -> ItemTagList(nbtTag.map { itemTagToBukkitCopy(it, onlyCustom) })
+            is List<*> -> ItemTagList(nbtTag.map { itemTagToBukkitCopy(it!!, onlyCustom) })
 
             // 复合类型特殊处理
             is NBTTagCompound -> {
                 // 1.20.5 -> nbtTag.allKeys.xxx
                 // 1.21.5 -> nbtTag.keySet()
-                nbtTag.keySet().associateWith { itemTagToBukkitCopy(nbtTag.get(it)!!) }.let {
+                nbtTag.keySet().associateWith { itemTagToBukkitCopy(nbtTag.get(it)!!, onlyCustom) }.let {
                     if (onlyCustom) ItemTag(it) else ItemTag12106(it)
                 }
             }
 
+            is Boolean -> ItemTagData(nbtTag)
+
             // 不支持的类型
-            else -> error("Unsupported type: ${nbtTag::class.java}}")
+            else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}")
         }
     }
 
     private fun net.minecraft.world.item.ItemStack.toNbt(): NBTBase? {
-        return net.minecraft.world.item.ItemStack.CODEC.encodeStart(
+        val encode = net.minecraft.world.item.ItemStack.CODEC.encodeStart(
             CraftRegistry.getMinecraftRegistry().createSerializationContext(DynamicOpsNBT.INSTANCE),
             this,
-        ).result().getOrNull()
+        )
+        return try {
+            encode.result()
+        } catch (_: Error) {
+            encode.invokeMethod<Optional<NBTBase>>("result")
+        }?.getOrNull()
     }
 
     private fun NBTBase.toItemStack(): ItemStack? {

diff --git a/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-component/build.gradle.kts b/module/bukkit-nms/bukkit-nms-tag/bukkit-nms-tag-component/build.gradle.kts
@@ -0,0 +1,14 @@
+dependencies {
+    compileOnly(project(":common"))
+    compileOnly(project(":common-env"))
+    compileOnly(project(":common-util"))
+    compileOnly(project(":module:bukkit-nms"))
+    compileOnly("com.mojang:brigadier:1.0.500")
+    compileOnly(project(":common-platform-api"))
+    compileOnly("ink.ptms.core:v12107:12107:mapped")
+    compileOnly(project(":platform:platform-bukkit"))
+    compileOnly(project(":platform:platform-bukkit-impl"))
+    compileOnly(project(":module:bukkit-nms:bukkit-nms-tag"))
+    compileOnly("com.mojang:authlib:7.1.61")
+    compileOnly("it.unimi.dsi:fastutil:8.5.15")
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -194,7 +194,7 @@ class NMSItemTag12005 : NMSItemTag() { @@
                 }
                 // 不支持的类型
-                else -> error("Unsupported type: ${nbtTag::class.java}}")
+                else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
             }
         }
     }
@@ Expand Down @@