diff options
Diffstat (limited to 'src/test/kotlin/testutil/ItemResources.kt')
| -rw-r--r-- | src/test/kotlin/testutil/ItemResources.kt | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/test/kotlin/testutil/ItemResources.kt b/src/test/kotlin/testutil/ItemResources.kt index 17198f1..e996fc2 100644 --- a/src/test/kotlin/testutil/ItemResources.kt +++ b/src/test/kotlin/testutil/ItemResources.kt @@ -1,8 +1,6 @@ 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 @@ -20,6 +18,7 @@ import net.minecraft.text.TextCodecs import moe.nea.firmament.features.debug.ExportedTestConstantMeta import moe.nea.firmament.test.FirmTestBootstrap import moe.nea.firmament.util.MC +import moe.nea.firmament.util.mc.MCTabListAPI object ItemResources { init { @@ -36,11 +35,12 @@ object ItemResources { fun loadSNbt(path: String): NbtCompound { return StringNbtReader.readCompound(loadString(path)) } + fun getNbtOps(): RegistryOps<NbtElement> = MC.currentOrDefaultRegistries.getOps(NbtOps.INSTANCE) fun tryMigrateNbt( nbtCompound: NbtCompound, - typ: DSL.TypeReference, + typ: DSL.TypeReference?, ): NbtElement { val source = nbtCompound.get("source", ExportedTestConstantMeta.CODEC) nbtCompound.remove("source") @@ -49,21 +49,33 @@ object ItemResources { // 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()) + .toString() + ) } else { nbtCompound } - return Schemas.getFixer() - .update( - typ, - Dynamic(NbtOps.INSTANCE, wrappedNbtSource), - source.get().dataVersion, - SharedConstants.getGameVersion().saveVersion.id - ).value + if (typ != null) { + return Schemas.getFixer() + .update( + typ, + Dynamic(NbtOps.INSTANCE, wrappedNbtSource), + source.get().dataVersion, + SharedConstants.getGameVersion().saveVersion.id + ).value + } else { + wrappedNbtSource + } } return nbtCompound } + fun loadTablist(name: String): MCTabListAPI.CurrentTabList { + return MCTabListAPI.CurrentTabList.CODEC.parse( + getNbtOps(), + tryMigrateNbt(loadSNbt("testdata/tablist/$name.snbt"), null), + ).getOrThrow { IllegalStateException("Could not load tablist '$name': $it") } + } + fun loadText(name: String): Text { return TextCodecs.CODEC.parse( getNbtOps(), |