Fixed item SNBT conversions

Auxilor · May 7, 2024 · bff502c · bff502c
1 parent 2500258
commit bff502c
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 19 deletions.
diff --git a/...s/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt b/...s/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt b/...s/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_18_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt b/...s/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt b/...s/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt
@@ -8,6 +8,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -19,7 +20,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt b/...s/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt b/...s/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_19_R3.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/SNBTConverter.kt b/...nms/v1_20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/SNBTConverter.kt
@@ -1,37 +1,63 @@
 package com.willfp.eco.internal.spigot.proxy.v1_20_6
 
+import com.mojang.serialization.Dynamic
 import com.willfp.eco.core.items.TestableItem
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
 import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
+import net.minecraft.server.MinecraftServer
+import net.minecraft.util.datafix.fixes.References
 import org.bukkit.Bukkit
 import org.bukkit.craftbukkit.CraftServer
 import org.bukkit.craftbukkit.inventory.CraftItemStack
+import org.bukkit.craftbukkit.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
-private val holderLookupProvider = (Bukkit.getServer() as CraftServer).server.registryAccess()
+private val registryAccess = (Bukkit.getServer() as CraftServer).server.registryAccess()
 
 class SNBTConverter : SNBTConverterProxy {
-    override fun fromSNBT(snbt: String): ItemStack? {
+    private fun parseItemSNBT(snbt: String): CompoundTag? {
         val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
-        val nms = net.minecraft.world.item.ItemStack.parse(holderLookupProvider, nbt).orElse(null) ?: return null
+        val dataVersion = if (nbt.contains("DataVersion")) {
+            nbt.getInt("DataVersion")
+        } else null
+
+        // If the data version is the same as the server's data version, we don't need to fix it
+        if (dataVersion == CraftMagicNumbers.INSTANCE.dataVersion) {
+            return nbt
+        }
+
+        return MinecraftServer.getServer().fixerUpper.update(
+            References.ITEM_STACK,
+            Dynamic(NbtOps.INSTANCE, nbt),
+            dataVersion ?: 3700, // 3700 is the 1.20.4 data version
+            CraftMagicNumbers.INSTANCE.dataVersion
+        ).value as CompoundTag
+    }
+
+    override fun fromSNBT(snbt: String): ItemStack? {
+        val tag = parseItemSNBT(snbt) ?: return null
+        val nms = net.minecraft.world.item.ItemStack.parse(registryAccess, tag).orElse(null) ?: return null
         return CraftItemStack.asBukkitCopy(nms)
     }
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(holderLookupProvider))
+        val tag = nms.save(registryAccess) as CompoundTag
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {
-        val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
-        val nms = net.minecraft.world.item.ItemStack.parse(holderLookupProvider, nbt).orElse(null)
+        val tag = parseItemSNBT(snbt) ?: return EmptyTestableItem()
+        val nms = net.minecraft.world.item.ItemStack.parse(registryAccess, tag).orElse(null)
             ?: return EmptyTestableItem()
 
-        nbt.remove("Count")
-        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
+        tag.remove("Count")
+        return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), tag)
     }
 
     class SNBTTestableItem(
@@ -44,7 +70,7 @@ class SNBTConverter : SNBTConverterProxy {
             }
 
             val nms = CraftItemStack.asNMSCopy(itemStack)
-            val nmsTag = nms.save(holderLookupProvider) as CompoundTag
+            val nmsTag = nms.save(registryAccess) as CompoundTag
             nmsTag.remove("Count")
             return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }

diff --git a/...tlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/packet/NewItemsPacketSetCreativeSlot.kt b/...tlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/packet/NewItemsPacketSetCreativeSlot.kt
@@ -16,4 +16,4 @@ object NewItemsPacketSetCreativeSlot : PacketListener {
 
         event.player.lastDisplayFrame = DisplayFrame.EMPTY
     }
-}
+}
diff --git a/...s/v1_20_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/SNBTConverter.kt b/...s/v1_20_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R1/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/SNBTConverter.kt b/...s/v1_20_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R2/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R2.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {

diff --git a/...s/v1_20_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R3/SNBTConverter.kt b/...s/v1_20_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_R3/SNBTConverter.kt
@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
 import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R3.util.CraftMagicNumbers
 import org.bukkit.inventory.ItemStack
 
 class SNBTConverter : SNBTConverterProxy {
@@ -18,7 +19,9 @@ class SNBTConverter : SNBTConverterProxy {
 
     override fun toSNBT(itemStack: ItemStack): String {
         val nms = CraftItemStack.asNMSCopy(itemStack)
-        return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
+        val tag = nms.save(CompoundTag())
+        tag.putInt("DataVersion", CraftMagicNumbers.INSTANCE.dataVersion)
+        return SnbtPrinterTagVisitor().visit(tag)
     }
 
     override fun makeSNBTTestable(snbt: String): TestableItem {