Add BlockPaletteParser, for example to deal with minecraft:grass->min…

…ecraft:short_grass id upgrade

src/main/java/net/hollowcube/schem/SchematicReader.java

@@ -1,6 +1,8 @@
 package net.hollowcube.schem;
 
 
+import net.hollowcube.schem.blockpalette.BlockPaletteParser;
+import net.hollowcube.schem.blockpalette.CommandBlockPaletteParser;
 import net.kyori.adventure.nbt.BinaryTagIO;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.kyori.adventure.nbt.IntBinaryTag;
@@ -21,26 +23,30 @@
 public final class SchematicReader {
     private static final BinaryTagIO.Reader NBT_READER = BinaryTagIO.unlimitedReader();
 
-    private SchematicReader() {
+    private BlockPaletteParser paletteParser = new CommandBlockPaletteParser();
+
+    public SchematicReader withBlockPaletteParser(BlockPaletteParser parser) {
+        this.paletteParser = parser;
+        return this;
     }
 
-    public static @NotNull Schematic read(@NotNull InputStream stream) {
+    public @NotNull Schematic read(@NotNull InputStream stream) {
         try {
             return read(NBT_READER.readNamed(stream, BinaryTagIO.Compression.GZIP));
         } catch (Exception e) {
             throw new SchematicReadException("failed to read schematic NBT", e);
         }
     }
 
-    public static @NotNull Schematic read(@NotNull Path path) {
+    public @NotNull Schematic read(@NotNull Path path) {
         try {
             return read(NBT_READER.readNamed(path, BinaryTagIO.Compression.GZIP));
         } catch (Exception e) {
             throw new SchematicReadException("failed to read schematic NBT", e);
         }
     }
 
-    public static @NotNull Schematic read(@NotNull Map.Entry<String, CompoundBinaryTag> namedTag) {
+    public @NotNull Schematic read(@NotNull Map.Entry<String, CompoundBinaryTag> namedTag) {
         try {
             // If it has a Schematic tag is sponge v2 or 3
             var schematicTag = namedTag.getValue().get("Schematic");
@@ -55,7 +61,7 @@ private SchematicReader() {
         }
     }
 
-    private static @NotNull Schematic read(@NotNull CompoundBinaryTag tag, int version) {
+    private @NotNull Schematic read(@NotNull CompoundBinaryTag tag, int version) {
         short width = tag.getShort("Width");
         short height = tag.getShort("Height");
         short length = tag.getShort("Length");
@@ -97,7 +103,7 @@ private SchematicReader() {
         palette.forEach((entry) -> {
             try {
                 int assigned = ((IntBinaryTag) entry.getValue()).value();
-                Block block = ArgumentBlockState.staticParse(entry.getKey());
+                Block block = paletteParser.parse(entry.getKey());
                 paletteBlocks[assigned] = block;
             } catch (ArgumentSyntaxException e) {
                 throw new SchematicReadException("Failed to parse block state: " + entry.getKey(), e);

src/main/java/net/hollowcube/schem/SchematicWriter.java

@@ -13,9 +13,9 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-public class SchematicWriter {
+public final class SchematicWriter {
 
-    public static byte @NotNull [] write(@NotNull Schematic schematic) {
+    public byte @NotNull [] write(@NotNull Schematic schematic) {
         CompoundBinaryTag.Builder schematicNBT = CompoundBinaryTag.builder();
         schematicNBT.putInt("Version", 2);
         schematicNBT.putInt("DataVersion", MinecraftServer.DATA_VERSION);
@@ -56,7 +56,7 @@ public class SchematicWriter {
         return out.toByteArray();
     }
 
-    public static void write(@NotNull Schematic schematic, @NotNull Path schemPath) throws IOException {
+    public void write(@NotNull Schematic schematic, @NotNull Path schemPath) throws IOException {
         Files.write(schemPath, write(schematic));
     }
 }

src/main/java/net/hollowcube/schem/blockpalette/BlockPaletteParser.java

@@ -0,0 +1,7 @@
+package net.hollowcube.schem.blockpalette;
+
+import net.minestom.server.instance.block.Block;
+
+public interface BlockPaletteParser {
+    Block parse(String key);
+}

src/main/java/net/hollowcube/schem/blockpalette/CommandBlockPaletteParser.java

@@ -0,0 +1,11 @@
+package net.hollowcube.schem.blockpalette;
+
+import net.minestom.server.command.builder.arguments.minecraft.ArgumentBlockState;
+import net.minestom.server.instance.block.Block;
+
+public class CommandBlockPaletteParser implements BlockPaletteParser {
+    @Override
+    public Block parse(String key) {
+        return ArgumentBlockState.staticParse(key);
+    }
+}

src/test/java/net/hollowcube/schem/TestSchematicReaderRegressions.java

@@ -24,7 +24,7 @@ public void testReadFail1_20_1() {
     private @NotNull Schematic assertReadSchematic(@NotNull String path) {
         try (var is = getClass().getResourceAsStream(path)) {
             assertNotNull(is, "Failed to load resource: " + path);
-            return SchematicReader.read(is);
+            return new SchematicReader().read(is);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/test/java/net/hollowcube/schem/demo/DemoServer.java

@@ -1,6 +1,7 @@
 package net.hollowcube.schem.demo;
 
 import net.hollowcube.schem.Rotation;
+import net.hollowcube.schem.SchematicReader;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandSender;
 import net.minestom.server.command.builder.Command;
@@ -45,7 +46,7 @@ public void execute(@NotNull CommandSender sender, @NotNull CommandContext conte
                 var player = (Player) sender;
 
                 try (var is = getClass().getResourceAsStream("/" + String.join(" ", context.<String[]>get("path")) + ".schem")) {
-                    var schem = net.hollowcube.schem.SchematicReader.read(is);
+                    var schem = new SchematicReader().read(is);
                     schem.build(Rotation.NONE, false).apply(instance, player.getPosition(), () -> {
                         player.sendMessage("Done!");
                     });