[publish] 6.0.12 fix nbt

Author: Bkm016

common/src/main/kotlin/taboolib/common/Test.kt

@@ -9,6 +9,7 @@ import taboolib.common.platform.function.info
  * @author 坏黑
  * @since 2023/8/4 02:33
  */
+@Isolated
 abstract class Test {
 
     /**

module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTag.kt

@@ -47,6 +47,10 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
         return GsonBuilder().setPrettyPrinting().create().toJson(serializeTag(this))
     }
 
+    override fun asCompound(): ItemTag {
+        return this
+    }
+
     override fun toJsonSimplified(): String {
         return toJsonSimplified(0)
     }
@@ -96,7 +100,7 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
      */
     fun removeDeep(key: String): ItemTagData? {
         return if (key.contains('.')) {
-            getDeepWith(key) { it.remove(key.substringAfterLast('.')) }
+            getDeepWith(key, false) { it.remove(key.substringAfterLast('.')) }
         } else {
             remove(key)
         }
@@ -119,7 +123,7 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
      */
     fun putDeep(key: String, value: Any): ItemTagData? {
         return if (key.contains('.')) {
-            getDeepWith(key) { it.put(key.substringAfterLast('.'), toNBT(value)) }
+            getDeepWith(key, true) { it.put(key.substringAfterLast('.'), toNBT(value)) }
         } else {
             put(key, value)
         }
@@ -138,7 +142,7 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
      */
     fun getDeep(key: String): ItemTagData? {
         return if (key.contains('.')) {
-            getDeepWith(key) { it[key.substringAfterLast('.')] }
+            getDeepWith(key, false) { it[key.substringAfterLast('.')] }
         } else {
             get(key)
         }
@@ -147,14 +151,22 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
     /**
      * 针对 getDeep, putDeep, removeDeep 的重复代码做出的优化
      */
-    fun getDeepWith(key: String, action: (ItemTag) -> ItemTagData?): ItemTagData? {
+    fun getDeepWith(key: String, create: Boolean, action: (ItemTag) -> ItemTagData?): ItemTagData? {
         val keys = key.split('.').dropLast(1)
         if (keys.isEmpty()) {
             return null
         }
         var find: ItemTag = this
         for (element in keys) {
-            val next = find[element] ?: return null
+            var next = find[element]
+            if (next == null) {
+                if (create) {
+                    next = ItemTag()
+                    find[element] = next
+                } else {
+                    return null
+                }
+            }
             if (next.type == ItemTagType.COMPOUND) {
                 find = next.asCompound()
             } else {

module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTagData.kt

@@ -157,6 +157,7 @@ open class ItemTagData(val type: ItemTagType, protected var data: Any) {
                 is Byte -> ItemTagData(obj)
                 is ByteArray -> ItemTagData(obj)
                 is IntArray -> ItemTagData(obj)
+                is List<*> -> translateList(ItemTagList(), obj)
                 is Map<*, *> -> ItemTag(obj.map { (k, v) -> k.toString() to toNBT(v) }.toMap())
                 is ConfigurationSection -> translateSection(ItemTag(), obj)
                 else -> error("Unsupported nbt: $obj (${obj.javaClass})")

module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTagList.kt

@@ -23,6 +23,10 @@ class ItemTagList : ItemTagData, MutableList<ItemTagData> {
         this.value += list
     }
 
+    override fun asList(): ItemTagList {
+        return this
+    }
+
     override fun toJsonSimplified(): String {
         return toJsonSimplified(0)
     }

module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTagType.kt

@@ -8,7 +8,7 @@ import com.google.common.base.Enums
  * @author 坏黑
  * @since 2019-05-24 17:46
  */
-enum class ItemTagType(@JvmField val id: Int) {
+enum class ItemTagType(@JvmField val id: Byte) {
 
     END(0),
     BYTE(1),

module/module-nms-util/src/main/kotlin/taboolib/module/nms/NMSItemTag.kt

@@ -3,6 +3,7 @@ package taboolib.module.nms
 import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
 import org.tabooproject.reflex.UnsafeAccess
+import taboolib.common.platform.function.info
 import java.lang.invoke.MethodHandle
 
 /**
@@ -59,6 +60,7 @@ class NMSItemTagImpl : NMSItemTag() {
 
     val nbtTagCompoundGetter = unreflectGetter<net.minecraft.server.v1_12_R1.NBTTagCompound>(if (MinecraftVersion.isUniversal) "x" else "map")
     val nbtTagListGetter = unreflectGetter<net.minecraft.server.v1_12_R1.NBTTagList>(if (MinecraftVersion.isUniversal) "c" else "list")
+    val nbtTagListTypeSetter = unreflectSetter<net.minecraft.server.v1_12_R1.NBTTagList>(if (MinecraftVersion.isUniversal) "w" else "type")
     val nbtTagByteGetter = unreflectGetter<net.minecraft.server.v1_12_R1.NBTTagByte>(if (MinecraftVersion.isUniversal) "x" else "data")
     val nbtTagShortGetter = unreflectGetter<net.minecraft.server.v1_12_R1.NBTTagShort>(if (MinecraftVersion.isUniversal) "c" else "data")
     val nbtTagIntGetter = unreflectGetter<net.minecraft.server.v1_12_R1.NBTTagInt>(if (MinecraftVersion.isUniversal) "c" else "data")
@@ -106,7 +108,12 @@ class NMSItemTagImpl : NMSItemTag() {
                     // 反射获取字段：
                     // private final List<NBTBase> list;
                     val list = nbtTagListGetter.get<MutableList<Any>>(nmsList)
-                    itemTagData.asList().forEach { list += itemTagToNMSCopy(it) }
+                    val dataList = itemTagData.asList()
+                    if (dataList.isNotEmpty()) {
+                        dataList.forEach { list += itemTagToNMSCopy(it) }
+                        // 修改 NBTTagList 的类型，不改他妈这条 List 作废，天坑。。。
+                        nbtTagListTypeSetter.set(nmsList, dataList.first().type.id)
+                    }
                 }
             }
 
@@ -117,6 +124,7 @@ class NMSItemTagImpl : NMSItemTag() {
                     // private final Map<String, NBTBase> map
                     val map = nbtTagCompoundGetter.get<MutableMap<String, Any>>(nmsCompound)
                     itemTagData.asCompound().entries.forEach { (key, value) -> map[key] = itemTagToNMSCopy(value) }
+                    info("nmsCompound $nmsCompound")
                 }
             }
 
@@ -142,12 +150,12 @@ class NMSItemTagImpl : NMSItemTag() {
 
             // 列表类型特殊处理
             is net.minecraft.server.v1_12_R1.NBTTagList -> {
-                ItemTagData(ItemTagType.LIST, ItemTagList(nbtTagListGetter.get<List<Any>>(nbtTag).map { itemTagToBukkitCopy(it) }))
+                ItemTagList(nbtTagListGetter.get<List<Any>>(nbtTag).map { itemTagToBukkitCopy(it) })
             }
 
             // 复合类型特殊处理
             is net.minecraft.server.v1_12_R1.NBTTagCompound -> {
-                ItemTagData(ItemTagType.COMPOUND, ItemTag().apply { nbtTagCompoundGetter.get<Map<String, Any>>(nbtTag).forEach { put(it.key, itemTagToBukkitCopy(it.value)) } })
+                ItemTag().apply { nbtTagCompoundGetter.get<Map<String, Any>>(nbtTag).forEach { put(it.key, itemTagToBukkitCopy(it.value)) } }
             }
 
             // 不支持的类型
@@ -159,9 +167,17 @@ class NMSItemTagImpl : NMSItemTag() {
         return UnsafeAccess.lookup.unreflectGetter(T::class.java.getDeclaredField(name).apply { isAccessible = true })
     }
 
+    private inline fun <reified T> unreflectSetter(name: String): MethodHandle {
+        return UnsafeAccess.lookup.unreflectSetter(T::class.java.getDeclaredField(name).apply { isAccessible = true })
+    }
+
     private fun <T> MethodHandle.get(src: Any): T {
         return bindTo(src).invoke() as T
     }
+
+    private fun <T> MethodHandle.set(src: Any, value: T) {
+        bindTo(src).invoke(value)
+    }
 }
 
 /**