3 files changed, 61 insertions, 22 deletions
diff --git a/src/test/kotlin/testutil/AutoBootstrapExtension.kt b/src/test/kotlin/testutil/AutoBootstrapExtension.kt
new file mode 100644
index 0000000..6f225a0
--- /dev/null
+++ b/src/test/kotlin/testutil/AutoBootstrapExtension.kt
@@ -0,0 +1,14 @@
+package moe.nea.firmament.test.testutil
+
+import com.google.auto.service.AutoService
+import org.junit.jupiter.api.extension.BeforeAllCallback
+import org.junit.jupiter.api.extension.Extension
+import org.junit.jupiter.api.extension.ExtensionContext
+import moe.nea.firmament.test.FirmTestBootstrap
+
+@AutoService(Extension::class)
+class AutoBootstrapExtension : Extension, BeforeAllCallback {
+	override fun beforeAll(p0: ExtensionContext) {
+		FirmTestBootstrap.bootstrapMinecraft()
+	}
+}
diff --git a/src/test/kotlin/testutil/ItemResources.kt b/src/test/kotlin/testutil/ItemResources.kt
index 107b565..17198f1 100644
--- a/src/test/kotlin/testutil/ItemResources.kt
+++ b/src/test/kotlin/testutil/ItemResources.kt
@@ -1,13 +1,23 @@
 package moe.nea.firmament.test.testutil
 
+import com.mojang.datafixers.DSL
+import com.mojang.datafixers.DataFixUtils
+import com.mojang.datafixers.types.templates.Named
+import com.mojang.serialization.Dynamic
+import com.mojang.serialization.JsonOps
+import net.minecraft.SharedConstants
+import net.minecraft.datafixer.Schemas
+import net.minecraft.datafixer.TypeReferences
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtOps
+import net.minecraft.nbt.NbtString
 import net.minecraft.nbt.StringNbtReader
 import net.minecraft.registry.RegistryOps
 import net.minecraft.text.Text
 import net.minecraft.text.TextCodecs
+import moe.nea.firmament.features.debug.ExportedTestConstantMeta
 import moe.nea.firmament.test.FirmTestBootstrap
 import moe.nea.firmament.util.MC
 
@@ -24,18 +34,49 @@ object ItemResources {
 	}
 
 	fun loadSNbt(path: String): NbtCompound {
-		return StringNbtReader.parse(loadString(path))
+		return StringNbtReader.readCompound(loadString(path))
 	}
 	fun getNbtOps(): RegistryOps<NbtElement> = MC.currentOrDefaultRegistries.getOps(NbtOps.INSTANCE)
 
+	fun tryMigrateNbt(
+		nbtCompound: NbtCompound,
+		typ: DSL.TypeReference,
+	): NbtElement {
+		val source = nbtCompound.get("source", ExportedTestConstantMeta.CODEC)
+		nbtCompound.remove("source")
+		if (source.isPresent) {
+			val wrappedNbtSource = if (typ == TypeReferences.TEXT_COMPONENT && source.get().dataVersion < 4325) {
+				// Per 1.21.5 text components are wrapped in a string, which firmament unwrapped in the snbt files
+				NbtString.of(
+					NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, nbtCompound)
+						.toString())
+			} else {
+				nbtCompound
+			}
+			return Schemas.getFixer()
+				.update(
+					typ,
+					Dynamic(NbtOps.INSTANCE, wrappedNbtSource),
+					source.get().dataVersion,
+					SharedConstants.getGameVersion().saveVersion.id
+				).value
+		}
+		return nbtCompound
+	}
+
 	fun loadText(name: String): Text {
-		return TextCodecs.CODEC.parse(getNbtOps(), loadSNbt("testdata/chat/$name.snbt"))
-			.getOrThrow { IllegalStateException("Could not load test chat '$name': $it") }
+		return TextCodecs.CODEC.parse(
+			getNbtOps(),
+			tryMigrateNbt(loadSNbt("testdata/chat/$name.snbt"), TypeReferences.TEXT_COMPONENT)
+		).getOrThrow { IllegalStateException("Could not load test chat '$name': $it") }
 	}
 
 	fun loadItem(name: String): ItemStack {
-		// TODO: make the load work with enchantments
-		return ItemStack.CODEC.parse(getNbtOps(), loadSNbt("testdata/items/$name.snbt"))
-			.getOrThrow { IllegalStateException("Could not load test item '$name': $it") }
+		try {
+			val itemNbt = loadSNbt("testdata/items/$name.snbt")
+			return ItemStack.CODEC.parse(getNbtOps(), tryMigrateNbt(itemNbt, TypeReferences.ITEM_STACK)).orThrow
+		} catch (ex: Exception) {
+			throw RuntimeException("Could not load item resource '$name'", ex)
+		}
 	}
 }
diff --git a/src/test/kotlin/testutil/KotestPlugin.kt b/src/test/kotlin/testutil/KotestPlugin.kt
deleted file mode 100644
index 6db50fb..0000000
--- a/src/test/kotlin/testutil/KotestPlugin.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package moe.nea.firmament.test.testutil
-
-import io.kotest.core.config.AbstractProjectConfig
-import io.kotest.core.extensions.Extension
-import moe.nea.firmament.test.FirmTestBootstrap
-
-class KotestPlugin : AbstractProjectConfig() {
-	override fun extensions(): List<Extension> {
-		return listOf()
-	}
-
-	override suspend fun beforeProject() {
-		FirmTestBootstrap.bootstrapMinecraft()
-		super.beforeProject()
-	}
-}