Up to 26.2 every entry is {@code {Name: "...", Properties: {...}}}. From + * 26.3 a block in its default state is written as a bare string + * ({@code "minecraft:stone"}) and any other state as + * {@code {id: "...", properties: {...}}}; a list mixing both shapes has to be + * all compounds, so the bare strings are wrapped as {@code {"": "..."}}. + * A region keeps chunks in both formats until every chunk has been re-saved, + * so the old shape stays supported. No properties means the default state, + * which is also how Xaero reads a state written without them.
+ */ + private static BlockState parsePaletteEntry(Tag entry) { + if (entry instanceof Tag.StringTag str) { + return new BlockState(str.value(), BlockState.EMPTY_PROPERTIES); + } + if (entry instanceof Tag.Compound compound) { + return parseBlockState(compound); + } + // Keeps palette indices aligned with the data array. + return new BlockState("minecraft:air", BlockState.EMPTY_PROPERTIES); + } + /** * 解析单个方块状态的NBT * - *格式: {Name: "minecraft:grass_block", Properties: {snowy: "false"}}
+ *格式: {Name: "minecraft:grass_block", Properties: {snowy: "false"}} + * (26.3+: {@code id} / {@code properties}, or {@code ""} for a wrapped bare name)
* * @param stateTag 方块状态的NBT复合标签 * @return 解析后的BlockState对象 */ private static BlockState parseBlockState(Tag.Compound stateTag) { String name = stateTag.getString("Name"); + if (name.isEmpty()) { + name = stateTag.getString("id"); + } + if (name.isEmpty()) { + name = stateTag.getString(""); + } + if (name.isEmpty()) { + name = "minecraft:air"; + } - if (!stateTag.contains("Properties", Tag.TAG_COMPOUND)) { + String propsKey = stateTag.contains("Properties", Tag.TAG_COMPOUND) ? "Properties" : "properties"; + if (!stateTag.contains(propsKey, Tag.TAG_COMPOUND)) { return new BlockState(name, BlockState.EMPTY_PROPERTIES); } - Tag.Compound propsTag = stateTag.getCompound("Properties"); + Tag.Compound propsTag = stateTag.getCompound(propsKey); if (propsTag.children().isEmpty()) { return new BlockState(name, BlockState.EMPTY_PROPERTIES); } diff --git a/src/main/java/com/mapsyncer/mca/convert/io/McaRegionLoader.java b/src/main/java/com/mapsyncer/mca/convert/io/McaRegionLoader.java index 5c19fc3..e7424e5 100644 --- a/src/main/java/com/mapsyncer/mca/convert/io/McaRegionLoader.java +++ b/src/main/java/com/mapsyncer/mca/convert/io/McaRegionLoader.java @@ -136,7 +136,12 @@ public final class McaRegionLoader { if (nbt == null) { continue; } - grid[localX][localZ] = ChunkDataParser.parseChunk(localX, localZ, nbt, worldHeightRange); + try { + grid[localX][localZ] = ChunkDataParser.parseChunk(localX, localZ, nbt, worldHeightRange); + } catch (RuntimeException e) { + // One malformed chunk must not cost the whole region. + LOGGER.warn("Failed to parse chunk ({}, {}), skipping: {}", localX, localZ, e.toString()); + } } } return grid; diff --git a/src/test/java/com/mapsyncer/mca/ChunkSectionParserTest.java b/src/test/java/com/mapsyncer/mca/ChunkSectionParserTest.java new file mode 100644 index 0000000..dcbad71 --- /dev/null +++ b/src/test/java/com/mapsyncer/mca/ChunkSectionParserTest.java @@ -0,0 +1,58 @@ +package com.mapsyncer.mca; + +import com.mapsyncer.nbt.Tag; +import org.junit.jupiter.api.Test; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** Palette shapes as written by 26.2 and 26.3 servers (DataVersion 4790 / 5023). */ +class ChunkSectionParserTest { + + @Test + void readsPre263Compounds() { + var section = parse(List.of( + compound(Map.of("Name", str("minecraft:stone"))), + compound(Map.of("Name", str("minecraft:oak_log"), + "Properties", compound(Map.of("axis", str("x"))))))); + assertEquals(List.of("minecraft:stone", "minecraft:oak_log"), section.blockNames()); + assertEquals(Map.of("axis", "x"), section.blockPalette().get(1).properties()); + } + + @Test + void readsBareStrings() { + var section = parse(List.of(str("minecraft:bedrock"), str("minecraft:deepslate"))); + assertEquals(List.of("minecraft:bedrock", "minecraft:deepslate"), section.blockNames()); + assertEquals(Map.of(), section.blockPalette().get(1).properties()); + } + + @Test + void readsMixed263Compounds() { + var section = parse(List.of( + compound(Map.of("", str("minecraft:deepslate"))), + compound(Map.of("id", str("minecraft:pointed_dripstone"), + "properties", compound(Map.of("vertical_direction", str("down"))))))); + assertEquals(List.of("minecraft:deepslate", "minecraft:pointed_dripstone"), section.blockNames()); + assertEquals(Map.of("vertical_direction", "down"), section.blockPalette().get(1).properties()); + } + + private static ChunkSectionParser.SectionData parse(List