From 50555e7dfeffcb805781953e263c5132384a1a82 Mon Sep 17 00:00:00 2001 From: Luki Zainur <113521176+lzif@users.noreply.github.com> Date: Mon, 16 Nov 2026 09:24:34 +0000 Subject: [PATCH] Add real-tool .schem fixtures, flat-v3 codec support and importer tests Add the real-tool .schem and legacy .schematic fixtures from schem-file.zip under fixtures/real/: - fixtures/real/worldedit/fantasyhouse2.schem (WorldEdit 7.4.6, Sponge v3, DataVersion 5023) - fixtures/real/shulkr/{castelo-medieval,raifox-medivial-house,simple-survival-mansion}.schem (Shulkr, Sponge v3) - fixtures/real/flat-v3/smp_lobby_{big,center_dense,medieval}.schem (flat Sponge v2 layout stamped Version 3) - fixtures/real/legacy/storageroom-medieval.schematic (pre-1.13 MCEdit Alpha format) Update readSchem() to accept real-world .schem files that declare Version 3 while using Sponge v2's flat top-level layout (Palette and BlockData without Schematic/Blocks) with a warning, and rebuild skills/voxwright/scripts/voxwright-cli.mjs. Add real-fixture, convert, skill-CLI inspect, and end-to-end scripts/convert.ts -> mcbuilder importer tests verifying block-for-block identity across real .schem builds (issues #10 and #11). --- PLAN.md | 4 +- README.md | 16 +- fixtures/README.md | 22 +- fixtures/real/flat-v3/smp_lobby_big.schem | Bin 0 -> 2092 bytes .../real/flat-v3/smp_lobby_center_dense.schem | Bin 0 -> 8948 bytes .../real/flat-v3/smp_lobby_medieval.schem | Bin 0 -> 5974 bytes .../legacy/storageroom-medieval.schematic | Bin 0 -> 2465 bytes fixtures/real/shulkr/castelo-medieval.schem | Bin 0 -> 4572 bytes .../real/shulkr/raifox-medivial-house.schem | Bin 0 -> 4663 bytes .../real/shulkr/simple-survival-mansion.schem | Bin 0 -> 8906 bytes fixtures/real/worldedit/fantasyhouse2.schem | Bin 0 -> 16351 bytes packages/core/src/codecs/schem.ts | 25 +- packages/core/test/convert.test.ts | 49 +++- packages/core/test/real-fixtures.test.ts | 226 +++++++++++++++++- packages/core/test/schem.test.ts | 21 +- packages/mcbuilder/test/importer.test.ts | 71 +++++- packages/mcbuilder/test/skill-cli.test.ts | 32 +++ skills/voxwright/scripts/voxwright-cli.mjs | 15 +- 18 files changed, 451 insertions(+), 30 deletions(-) create mode 100644 fixtures/real/flat-v3/smp_lobby_big.schem create mode 100644 fixtures/real/flat-v3/smp_lobby_center_dense.schem create mode 100644 fixtures/real/flat-v3/smp_lobby_medieval.schem create mode 100644 fixtures/real/legacy/storageroom-medieval.schematic create mode 100644 fixtures/real/shulkr/castelo-medieval.schem create mode 100644 fixtures/real/shulkr/raifox-medivial-house.schem create mode 100644 fixtures/real/shulkr/simple-survival-mansion.schem create mode 100644 fixtures/real/worldedit/fantasyhouse2.schem diff --git a/PLAN.md b/PLAN.md index 796d6a5..a5e8613 100644 --- a/PLAN.md +++ b/PLAN.md @@ -65,7 +65,7 @@ Each task becomes one GitHub issue under milestone M0, in this order. **Exit criteria:** the vectors pass, the round-trip suite is green, CI is green, and `convert` turns a real `.schem` into a `.nbt` that mcbuilder's importer reads back. -**Where that stands (2026-11-08):** the vectors pass, the round-trip suite is green, and CI is green on GitHub. No `.schem` saved by a real tool exists yet (see Open items), and no automated test feeds `convert`'s output to mcbuilder's importer. +**Where that stands (2026-11-16):** the vectors pass, the round-trip suite is green, CI is green on GitHub, `fixtures/real/` now holds real-tool `.schem` files (`worldedit/fantasyhouse2.schem`, three `shulkr/*.schem`, and three `flat-v3/smp_lobby_*.schem`), and `packages/mcbuilder/test/importer.test.ts` runs `scripts/convert.ts` on them and feeds the converted `.nbt` files into mcbuilder's importer, rebuilding identical blocks. ## Golden vectors @@ -273,7 +273,7 @@ The code differs from the v1 spec in the ways below. Luki decided all fourteen o - [x] Create the repository `lzif/voxwright` so the scaffold can start (created **private**; it is **public** now, checked 2026-11-11) - [x] Choose `AGPL-3.0-only` or `AGPL-3.0-or-later` for the SPDX headers, before M0 (`AGPL-3.0-only`) -- [ ] Before M2, send fixtures saved by real tools: two or three `.schem` from WorldEdit (`.nbt`, `.litematic` and `.mcstructure` of one build are in `fixtures/real/`, saved by bloxelizer.com, not Litematica or Bedrock). M2 was built without them, so this is late +- [x] Before M2, send fixtures saved by real tools: two or three `.schem` from WorldEdit (`.nbt`, `.litematic` and `.mcstructure` of `Rafeals_house` in `fixtures/real/rafeals-house/`, saved by bloxelizer.com, plus `worldedit/fantasyhouse2.schem`, three `shulkr/*.schem`, three `flat-v3/smp_lobby_*.schem`, and `legacy/storageroom-medieval.schematic` added 2026-11-16) - [ ] Check the domain and trademark (npm is settled, decided 2026-11-14: only the command line is published, unscoped as `voxmc`; the `@voxwright` npm scope holds only the old `@voxwright/mcbuild` and is not used otherwise) - [ ] Pick the open source Bedrock to Java block-mapping table and confirm its license is AGPL-compatible (needed by M2; the code uses hand-written rules meanwhile) - [x] Decide each entry under "Differences from the v1 spec" (all 14 decided 2026-11-07; see that section) diff --git a/README.md b/README.md index 1250201..c4fed51 100644 --- a/README.md +++ b/README.md @@ -320,9 +320,11 @@ Built: the renderer (see [vectors/README.md](vectors/README.md)). - `core`: NBT reader and writer (big and little endian, gzip), block strings, rotation, sectioned volume, and codecs for `.nbt`, `.schem`, `.litematic` and - `.mcstructure`, all tested. A real build saved in three of those formats - decodes to the same blocks in each, once the Java default properties that - Bedrock leaves out (such as `waterlogged=false`) are set aside. + `.mcstructure`, all tested (including real-tool `.schem` builds from WorldEdit + and Shulkr, plus flat-v2-layout files tagged `Version: 3`). A real build + saved in three of those formats decodes to the same blocks in each, once the + Java default properties that Bedrock leaves out (such as `waterlogged=false`) + are set aside. - `convert` script between all four formats. - The Agent Skill in `skills/voxwright/`: `SKILL.md`, the references, and the skill CLI (`build`, `inspect`, `preview` / `view`) as a committed zero-dependency bundle, with the web app opening a build from a @@ -341,10 +343,10 @@ Not done yet: trapdoors, beds, pillars, fences, panes, walls, torches, lanterns, leaves and blocks with `facing`), not every block in the game. The summary lists each dropped property. - Block-entity data (chest contents, sign text) and entities cannot be written from a recipe. -- `.schem` files saved by a real tool, and a run on a real phone (the touch editor - has only been driven by emulated touch so far; `docs/phone-test-checklist.md` - lists what to try). Luki checked an edited export in Litematica and smooth - navigation on a real GPU by hand on 2026-11-11; no GPU numbers were recorded. +- A run on a real phone (the touch editor has only been driven by emulated touch so + far; `docs/phone-test-checklist.md` lists what to try). Luki checked an edited + export in Litematica and smooth navigation on a real GPU by hand on 2026-11-11; + no GPU numbers were recorded. - The 0.1.0 release: the 0.1.0 version bump and tag (`voxmc` is on npm at 0.0.3). - Deferred, not in 0.1.0: the parts catalog (the spec names it, nothing defines it, so it needs a definition first) and the fast and trusted preview tiers. diff --git a/fixtures/README.md b/fixtures/README.md index 1b6794a..1f5f2b1 100644 --- a/fixtures/README.md +++ b/fixtures/README.md @@ -14,5 +14,23 @@ Schematic files shared by all tests. `packages/core/test/litematic.test.ts` and `mcstructure.test.ts` check the other two against the `.nbt`. -Still needed: files saved by real tools (two or three `.schem` from -WorldEdit). Put them in a directory per tool and add tests that read them. +- `real/worldedit/` holds `fantasyhouse2.schem`, a Sponge v3 schematic saved by + WorldEdit 7.4.6 (`enginehub:fabric`, DataVersion 5023; 22,953 blocks, 342 + block states, 93 block entities, 41 entities, non-zero `Offset`). + +- `real/shulkr/` holds three Sponge v3 builds exported by Shulkr (DataVersion + 5023): `castelo-medieval.schem` (4,895 blocks, 6 block entities), + `raifox-medivial-house.schem` (1,595 blocks, 138 block entities) and + `simple-survival-mansion.schem` (6,218 blocks, 77 block entities). + +- `real/flat-v3/` holds three real-world `.schem` files (`smp_lobby_big.schem`, + `smp_lobby_center_dense.schem`, `smp_lobby_medieval.schem`, DataVersion 3465) + that declare `Version: 3` while writing Sponge v2's flat layout (top-level + `Palette` and `BlockData` without `Schematic`/`Blocks`). `readSchem` accepts + this layout with a warning. + +- `real/legacy/` holds `storageroom-medieval.schematic` (pre-1.13 MCEdit + `Materials: "Alpha"` format), used to verify legacy `.schematic` rejection. + +`packages/core/test/real-fixtures.test.ts`, `convert.test.ts` and +`packages/mcbuilder/test/importer.test.ts` read and convert these fixtures. diff --git a/fixtures/real/flat-v3/smp_lobby_big.schem b/fixtures/real/flat-v3/smp_lobby_big.schem new file mode 100644 index 0000000000000000000000000000000000000000..95771ff77ad9374afdf847fbc1eb18b73abc2461 GIT binary patch literal 2092 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 TzIQ{Ujs$E)5a%g-rgN>))2LUHH_ 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 f=0%aRt@Vpzrx?pvMq{7 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 GtN;LkR`o~# literal 0 HcmV?d00001 diff --git a/fixtures/real/shulkr/raifox-medivial-house.schem b/fixtures/real/shulkr/raifox-medivial-house.schem new file mode 100644 index 0000000000000000000000000000000000000000..db1a9dfaf40618d52dd5c135298ce251b7dd25f2 GIT binary patch literal 4663 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 literal 0 HcmV?d00001 diff --git a/fixtures/real/shulkr/simple-survival-mansion.schem b/fixtures/real/shulkr/simple-survival-mansion.schem new file mode 100644 index 0000000000000000000000000000000000000000..a5222c97675901d6b07426c1615d9d80e5b5e514 GIT binary patch literal 8906 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 0) { warnings.push(`Metadata not carried over (${[...metadata.value.keys()].join(", ")})`); } // v3 keeps biomes in a "Biomes" compound; v2 in "BiomeData" with a "BiomePalette". - if (child(schem, version === 3 ? "Biomes" : "BiomeData") !== undefined) { + if ( + child(schem, layoutVersion === 3 ? "Biomes" : "BiomeData") !== undefined || + (flatV2WithV3Tag && child(schem, "Biomes") !== undefined) + ) { warnings.push("biomes not carried over (a volume holds no biomes)"); } diff --git a/packages/core/test/convert.test.ts b/packages/core/test/convert.test.ts index 1d2e69b..8aa8f9f 100644 --- a/packages/core/test/convert.test.ts +++ b/packages/core/test/convert.test.ts @@ -86,6 +86,41 @@ describe("scripts/convert.ts", () => { expect(final.volume.size).toBe(762); }); + it("turns a real WorldEdit .schem into a .nbt with identical blocks and entities", async () => { + const src = join(root, "fixtures/real/worldedit/fantasyhouse2.schem"); + const out = join(dir, "fantasyhouse2.nbt"); + const log = run(src, out); + expect(log).toContain("22953 blocks, 342 palette entries, DataVersion 5023"); + const original = await readSchem(new Uint8Array(readFileSync(src))); + const converted = await readStructureNbt(new Uint8Array(readFileSync(out))); + expect(converted.volume.size).toBe(original.volume.size); + expect(converted.volume.blockEntityCount).toBe(93); + expect(converted.volume.entities).toHaveLength(41); + expect(converted.meta.dataVersion).toBe(5023); + let mismatches = 0; + original.volume.eachCell((x, y, z, idx) => { + if (converted.volume.get(x, y, z) !== original.volume.palette[idx]) mismatches++; + }); + expect(mismatches).toBe(0); + }); + + it("converts a flat-v3 .schem into .nbt and prints the layout warning on stderr", async () => { + const src = join(root, "fixtures/real/flat-v3/smp_lobby_big.schem"); + const out = join(dir, "smp_lobby_big.nbt"); + const res = spawnSync(process.execPath, [script, src, out], { encoding: "utf8" }); + expect(res.status).toBe(0); + expect(res.stdout).toContain("18295 blocks, 41 palette entries, DataVersion 3465"); + expect(res.stderr).toContain("Version is 3, but layout is Sponge v2"); + const original = await readSchem(new Uint8Array(readFileSync(src))); + const converted = await readStructureNbt(new Uint8Array(readFileSync(out))); + expect(converted.volume.size).toBe(original.volume.size); + let mismatches = 0; + original.volume.eachCell((x, y, z, idx) => { + if (converted.volume.get(x, y, z) !== original.volume.palette[idx]) mismatches++; + }); + expect(mismatches).toBe(0); + }); + it("keeps the .schem Offset from .schem to .schem", async () => { const v = new Volume(); v.set(0, 0, 0, "minecraft:stone"); @@ -135,12 +170,14 @@ describe("scripts/convert.ts", () => { it("tells the user to re-save a legacy .schematic as .schem", () => { const legacy = join(dir, "old.schematic"); writeFileSync(legacy, new Uint8Array(0)); - const bad = spawnSync(process.execPath, [script, legacy, join(dir, "x.nbt")], { - encoding: "utf8", - }); - expect(bad.status).toBe(1); - expect(bad.stderr).toContain("legacy .schematic"); - expect(bad.stderr).toContain("re-save it as .schem"); + for (const src of [legacy, join(root, "fixtures/real/legacy/storageroom-medieval.schematic")]) { + const bad = spawnSync(process.execPath, [script, src, join(dir, "x.nbt")], { + encoding: "utf8", + }); + expect(bad.status).toBe(1); + expect(bad.stderr).toContain("legacy .schematic"); + expect(bad.stderr).toContain("re-save it as .schem"); + } }); it("fails clearly on bad input", () => { diff --git a/packages/core/test/real-fixtures.test.ts b/packages/core/test/real-fixtures.test.ts index f1e68bd..477019a 100644 --- a/packages/core/test/real-fixtures.test.ts +++ b/packages/core/test/real-fixtures.test.ts @@ -1,8 +1,27 @@ // SPDX-License-Identifier: AGPL-3.0-only import { describe, expect, it } from "vitest"; -import { AIR, readStructureNbt } from "../src/index.ts"; +import { + AIR, + LEGACY_SCHEMATIC_MESSAGE, + readLitematic, + readSchem, + readStructureNbt, + type Volume, + writeLitematic, + writeSchem, + writeStructureNbt, +} from "../src/index.ts"; import { loadFixture } from "./helpers.ts"; +function expectSameCells(actual: Volume, expected: Volume): void { + expect(actual.size).toBe(expected.size); + let mismatches = 0; + actual.eachCell((x, y, z, idx) => { + if (expected.get(x, y, z) !== actual.palette[idx]) mismatches++; + }); + expect(mismatches).toBe(0); +} + // Rafeals_house was saved by a real tool (bloxelizer.com) in three formats. // The .nbt uses DataVersion 5023, whose palette entries are spelled // `id` and `properties`. @@ -26,3 +45,208 @@ describe("Rafeals_house.nbt (saved by a real tool)", () => { expect(volume.palette).not.toContain(AIR); }); }); + +describe("WorldEdit fantasyhouse2.schem (Sponge v3)", () => { + const file = () => loadFixture("real/worldedit/fantasyhouse2.schem"); + + it("reads blocks, 2-byte palette varints, block entities, entities and offset", async () => { + const { volume, meta, warnings } = await readSchem(file()); + expect(meta).toEqual({ + version: 3, + dataVersion: 5023, + offset: [-18, -13, -32], + width: 44, + height: 39, + length: 34, + droppedBlockEntities: 0, + droppedEntities: 0, + }); + expect(volume.size).toBe(22953); + expect(volume.countNonAir()).toBe(22953); + expect(volume.palette).toHaveLength(342); + expect(volume.blockEntityCount).toBe(93); + expect(volume.entities).toHaveLength(41); + expect(volume.bounds()).toEqual([ + [0, 0, 0], + [43, 35, 33], + ]); + expect(warnings).toEqual(["Metadata not carried over (Date, WorldEdit)"]); + + const entityIds = new Set(volume.entities.map((e) => e.nbt.value.get("id")?.value)); + expect(entityIds).toEqual( + new Set([ + "minecraft:painting", + "minecraft:cushion", + "minecraft:spruce_boat", + "minecraft:cod", + "minecraft:armor_stand", + "minecraft:item_frame", + ]), + ); + }); + + it("keeps air across the full declared volume when requested", async () => { + const { volume } = await readSchem(file(), { keepAir: true }); + expect(volume.size).toBe(44 * 39 * 34); + expect(volume.countNonAir()).toBe(22953); + }); + + it("round-trips through .schem (v2/v3), .nbt and .litematic without losing blocks or entities", async () => { + const { volume, meta } = await readSchem(file()); + const dv = meta.dataVersion as number; + + for (const version of [2, 3] as const) { + const written = await writeSchem(volume, { dataVersion: dv, version, offset: meta.offset }); + expect(written.warnings).toEqual([]); + const back = await readSchem(written.bytes); + expect(back.meta).toMatchObject({ version, dataVersion: dv, offset: meta.offset }); + expectSameCells(back.volume, volume); + expect(back.volume.blockEntityCount).toBe(93); + expect(back.volume.entities).toHaveLength(41); + } + + const nbt = await writeStructureNbt(volume, { dataVersion: dv }); + expect(nbt.warnings).toEqual([]); + const nbtBack = await readStructureNbt(nbt.bytes); + expectSameCells(nbtBack.volume, volume); + expect(nbtBack.volume.blockEntityCount).toBe(93); + expect(nbtBack.volume.entities).toHaveLength(41); + + const lit = await writeLitematic(volume, { dataVersion: dv }); + expect(lit.warnings).toEqual([]); + const litBack = await readLitematic(lit.bytes); + expectSameCells(litBack.volume, volume); + expect(litBack.volume.blockEntityCount).toBe(93); + expect(litBack.volume.entities).toHaveLength(41); + }); +}); + +describe("Shulkr Sponge v3 .schem fixtures", () => { + const cases = [ + { + file: "real/shulkr/castelo-medieval.schem", + width: 29, + height: 39, + length: 27, + blocks: 4895, + states: 143, + blockEntities: 6, + }, + { + file: "real/shulkr/raifox-medivial-house.schem", + width: 14, + height: 20, + length: 15, + blocks: 1595, + states: 146, + blockEntities: 138, + }, + { + file: "real/shulkr/simple-survival-mansion.schem", + width: 25, + height: 26, + length: 47, + blocks: 6218, + states: 277, + blockEntities: 77, + }, + ]; + + it.each(cases)( + "reads $file ($blocks blocks, $blockEntities block entities)", + async ({ file, width, height, length, blocks, states, blockEntities }) => { + const { volume, meta, warnings } = await readSchem(loadFixture(file)); + expect(meta).toEqual({ + version: 3, + dataVersion: 5023, + offset: [0, 0, 0], + width, + height, + length, + droppedBlockEntities: 0, + droppedEntities: 0, + }); + expect(volume.size).toBe(blocks); + expect(volume.countNonAir()).toBe(blocks); + expect(volume.palette).toHaveLength(states); + expect(volume.blockEntityCount).toBe(blockEntities); + expect(volume.entities).toHaveLength(0); + expect(warnings).toEqual([ + "Metadata not carried over (Name, Author, Description, Date, Software)", + ]); + }, + ); +}); + +describe("Flat Sponge v2 layout stamped Version 3 (.schem)", () => { + const cases = [ + { + file: "real/flat-v3/smp_lobby_big.schem", + width: 81, + height: 24, + length: 81, + blocks: 18295, + states: 41, + max: [80, 13, 80] as [number, number, number], + }, + { + file: "real/flat-v3/smp_lobby_center_dense.schem", + width: 101, + height: 38, + length: 101, + blocks: 33882, + states: 88, + max: [100, 25, 100] as [number, number, number], + }, + { + file: "real/flat-v3/smp_lobby_medieval.schem", + width: 101, + height: 32, + length: 101, + blocks: 31699, + states: 40, + max: [100, 24, 100] as [number, number, number], + }, + ]; + + it.each(cases)( + "reads $file ($blocks blocks) and warns about the layout mismatch", + async ({ file, width, height, length, blocks, states, max }) => { + const { volume, meta, warnings } = await readSchem(loadFixture(file)); + expect(meta).toEqual({ + version: 3, + dataVersion: 3465, + offset: [0, 0, 0], + width, + height, + length, + droppedBlockEntities: 0, + droppedEntities: 0, + }); + expect(volume.size).toBe(blocks); + expect(volume.countNonAir()).toBe(blocks); + expect(volume.palette).toHaveLength(states); + expect(volume.bounds()).toEqual([[0, 0, 0], max]); + expect(warnings).toEqual(["Version is 3, but layout is Sponge v2 (read using v2 layout)"]); + }, + ); + + it("re-writes a flat-v3 build into standard Sponge v3 cleanly", async () => { + const orig = await readSchem(loadFixture("real/flat-v3/smp_lobby_big.schem")); + const written = await writeSchem(orig.volume, { + dataVersion: orig.meta.dataVersion as number, + }); + expect(written.warnings).toEqual([]); + const back = await readSchem(written.bytes); + expect(back.warnings).toEqual([]); + expectSameCells(back.volume, orig.volume); + }); +}); + +describe("Legacy pre-1.13 .schematic fixture", () => { + it("refuses storageroom-medieval.schematic with guidance to re-save as .schem", async () => { + await expect( + readSchem(loadFixture("real/legacy/storageroom-medieval.schematic")), + ).rejects.toThrow(LEGACY_SCHEMATIC_MESSAGE); + }); +}); diff --git a/packages/core/test/schem.test.ts b/packages/core/test/schem.test.ts index 40faa55..ccbaff5 100644 --- a/packages/core/test/schem.test.ts +++ b/packages/core/test/schem.test.ts @@ -15,7 +15,7 @@ import { writeSchem, writeStructureNbt, } from "../src/index.ts"; -import { loadFixture, tagToJson } from "./helpers.ts"; +import { CHEST, chestEntity, cow, loadFixture, tagToJson } from "./helpers.ts"; interface Expected { files: Record< @@ -127,6 +127,23 @@ describe(".schem round trips", () => { expect((await readSchem(bytes)).volume.get(0, 0, 0)).toBe("minecraft:chest[facing=north]"); }); + it("reads a flat Sponge v2 layout stamped Version 3 with a warning", async () => { + const v = new Volume(); + v.set(0, 0, 0, "minecraft:stone"); + v.set(1, 0, 0, CHEST); + v.setBlockEntity(1, 0, 0, chestEntity()); + v.addEntity(cow(0.5, 1, 0.5)); + const { root } = buildSchem(v, { dataVersion: 3465, version: 2 }); + root.value.set("Version", int(3)); + const bytes = writeNbt({ name: "", tag: root }); + const read = await readSchem(bytes); + expect(read.meta.version).toBe(3); + expect(read.warnings).toContain("Version is 3, but layout is Sponge v2 (read using v2 layout)"); + expect(cellsOf(read.volume)).toEqual(cellsOf(v)); + expect(read.volume.blockEntityCount).toBe(1); + expect(read.volume.entities).toHaveLength(1); + }); + it("refuses an empty volume", () => { expect(() => buildSchem(new Volume(), { dataVersion: 1 })).toThrow(CodecError); }); @@ -154,6 +171,8 @@ describe(".schem error handling", () => { tag: compound([["Schematic", compound([["Version", int(2)]])]]), }); await expect(readSchem(lying)).rejects.toThrow(/wrong layout/); + const flatWithoutBody = writeNbt({ name: "", tag: compound([["Version", int(3)]]) }); + await expect(readSchem(flatWithoutBody)).rejects.toThrow(/wrong layout/); }); it("rejects block data shorter than the volume, and undefined palette ids", async () => { diff --git a/packages/mcbuilder/test/importer.test.ts b/packages/mcbuilder/test/importer.test.ts index 35ea10a..9e5f26e 100644 --- a/packages/mcbuilder/test/importer.test.ts +++ b/packages/mcbuilder/test/importer.test.ts @@ -1,5 +1,11 @@ // SPDX-License-Identifier: AGPL-3.0-only -import { describe, expect, it } from "vitest"; +import { execFileSync } from "node:child_process"; +import { mkdtempSync, readFileSync, rmSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { basename, join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { readSchem, readStructureNbt } from "@voxwright/core"; +import { afterAll, describe, expect, it } from "vitest"; import { Build, cleanProperties, @@ -11,6 +17,7 @@ import { RENAMED_BLOCKS, Registry, type Structure, + structureFromVolume, summary, toScript, } from "../src/index.ts"; @@ -216,3 +223,65 @@ describe("import: specifier and renamed blocks", () => { expect(Object.keys(RENAMED_BLOCKS)).toContain("minecraft:chain"); }); }); + +describe("convert.ts -> mcbuilder importer on real .schem fixtures", () => { + const repoRoot = fileURLToPath(new URL("../../../", import.meta.url)); + const convertScript = join(repoRoot, "scripts/convert.ts"); + const workDir = mkdtempSync(join(tmpdir(), "voxwright-convert-import-")); + afterAll(() => rmSync(workDir, { recursive: true, force: true })); + + it.each([ + "fixtures/real/worldedit/fantasyhouse2.schem", + "fixtures/real/shulkr/raifox-medivial-house.schem", + "fixtures/real/flat-v3/smp_lobby_big.schem", + ])("converts %s to .nbt and imports back with identical blocks", async (relPath) => { + const src = join(repoRoot, relPath); + const outNbt = join(workDir, `${basename(relPath, ".schem")}.nbt`); + execFileSync(process.execPath, [convertScript, src, outNbt], { stdio: "pipe" }); + + const original = await readSchem(new Uint8Array(readFileSync(src))); + const converted = await readStructureNbt(new Uint8Array(readFileSync(outNbt))); + const structure = structureFromVolume(converted.volume, basename(outNbt), { + dataVersion: converted.meta.dataVersion, + droppedBlockEntities: converted.meta.droppedBlockEntities + converted.volume.blockEntityCount, + droppedEntities: converted.meta.droppedEntities + converted.volume.entities.length, + }); + const code = toScript(structure) + .replace('import { Build } from "@voxwright/mcbuilder";', "") + .replace("export const BUILD", "const BUILD"); + const rebuilt = (new Function("Build", `${code}\nreturn BUILD;`)(Build) as Build).grid.volume; + + expect(rebuilt.size).toBe(original.volume.size); + let mismatches = 0; + rebuilt.eachCell((x, y, z, idx) => { + if (original.volume.get(x, y, z) !== rebuilt.palette[idx]) mismatches++; + }); + expect(mismatches).toBe(0); + }); + + it("renames legacy 1.20 block ids when cleaning an imported flat-v3 build for 26.2", async () => { + const src = join(repoRoot, "fixtures/real/flat-v3/smp_lobby_big.schem"); + const outNbt = join(workDir, "smp_lobby_big_rename.nbt"); + execFileSync(process.execPath, [convertScript, src, outNbt], { stdio: "pipe" }); + const converted = await readStructureNbt(new Uint8Array(readFileSync(outNbt))); + const st = structureFromVolume(converted.volume, basename(outNbt), { + dataVersion: converted.meta.dataVersion, + }); + const reg = new Registry( + normalizeBlockData([ + { + name: "iron_chain", + states: [ + { name: "axis", type: "enum", values: ["x", "y", "z"] }, + { name: "waterlogged", type: "bool", values: ["true", "false"] }, + ], + }, + ]), + "26.2", + ); + const cleaned = cleanProperties(st, reg); + expect(cleaned.renamedBlocks?.get("chain -> iron_chain")).toBeGreaterThan(0); + expect(cleaned.blocks.some(([, , , b]) => b.startsWith("minecraft:iron_chain["))).toBe(true); + expect(cleaned.blocks.some(([, , , b]) => b.startsWith("minecraft:chain["))).toBe(false); + }); +}); diff --git a/packages/mcbuilder/test/skill-cli.test.ts b/packages/mcbuilder/test/skill-cli.test.ts index e7e9e0f..c1a115a 100644 --- a/packages/mcbuilder/test/skill-cli.test.ts +++ b/packages/mcbuilder/test/skill-cli.test.ts @@ -887,6 +887,38 @@ BUILD.scope(() => { expect(n).toBe(5); }); + it("inspects real-tool WorldEdit and flat-v3 .schem files", async () => { + const we = await cli([ + "inspect", + join(repo, "fixtures/real/worldedit/fantasyhouse2.schem"), + "--json", + ]); + expect(we.code).toBe(0); + expect(JSON.parse(we.stdout)).toMatchObject({ + format: "schem", + formatVersion: 3, + dataVersion: 5023, + blocks: 22953, + blockStates: 342, + blockEntities: 93, + entities: 41, + }); + + const flat = await cli([ + "inspect", + join(repo, "fixtures/real/flat-v3/smp_lobby_big.schem"), + "--json", + ]); + expect(flat.code).toBe(0); + expect(JSON.parse(flat.stdout)).toMatchObject({ + format: "schem", + formatVersion: 3, + dataVersion: 3465, + blocks: 18295, + warnings: ["Version is 3, but layout is Sponge v2 (read using v2 layout)"], + }); + }); + it("is what scripts/build-skill.ts produces from the current sources", async () => { const r = await run(process.execPath, [join(repo, "scripts/build-skill.ts"), "--check"]).then( (ok) => ({ code: 0, ...ok }), diff --git a/skills/voxwright/scripts/voxwright-cli.mjs b/skills/voxwright/scripts/voxwright-cli.mjs index d29a182..c8435c3 100644 --- a/skills/voxwright/scripts/voxwright-cli.mjs +++ b/skills/voxwright/scripts/voxwright-cli.mjs @@ -4725,9 +4725,11 @@ async function readSchem(bytes, options = {}) { if (version !== 2 && version !== 3) { throw new CodecError(`unsupported Sponge schematic version ${version} (expected 2 or 3)`); } - if (version === 3 !== isV3) { + const flatV2WithV3Tag = version === 3 && !isV3 && child(schem, "Blocks") === void 0 && child(schem, "Palette")?.type === "compound" && child(schem, "BlockData")?.type === "byteArray"; + if (version === 3 !== isV3 && !flatV2WithV3Tag) { throw new CodecError(`Sponge schematic version ${version} has the wrong layout`); } + const layoutVersion = flatV2WithV3Tag ? 2 : version; const width = dimension(schem, "Width"); const height = dimension(schem, "Height"); const length = dimension(schem, "Length"); @@ -4735,7 +4737,7 @@ async function readSchem(bytes, options = {}) { let paletteTag; let dataTag; let blockEntities; - if (version === 3) { + if (layoutVersion === 3) { const blocks = asCompound(child(schem, "Blocks"), "Blocks"); paletteTag = child(blocks, "Palette"); dataTag = child(blocks, "Data"); @@ -4791,15 +4793,18 @@ async function readSchem(bytes, options = {}) { volume.set(x2, y, z, kind === "air" ? AIR : state); } const lost = new Tally(); - readBlockEntities(volume, compoundList(blockEntities), version, lost); - readEntities(volume, compoundList(child(schem, "Entities")), version, lost); + readBlockEntities(volume, compoundList(blockEntities), layoutVersion, lost); + readEntities(volume, compoundList(child(schem, "Entities")), layoutVersion, lost); const warnings = [...lost.lines("their position holds no block, or is missing or malformed")]; warnings.push(...dropped.lines()); + if (flatV2WithV3Tag) { + warnings.push("Version is 3, but layout is Sponge v2 (read using v2 layout)"); + } const metadata = child(schem, "Metadata"); if (metadata?.type === "compound" && metadata.value.size > 0) { warnings.push(`Metadata not carried over (${[...metadata.value.keys()].join(", ")})`); } - if (child(schem, version === 3 ? "Biomes" : "BiomeData") !== void 0) { + if (child(schem, layoutVersion === 3 ? "Biomes" : "BiomeData") !== void 0 || flatV2WithV3Tag && child(schem, "Biomes") !== void 0) { warnings.push("biomes not carried over (a volume holds no biomes)"); } const dv = child(schem, "DataVersion");