mcbe-leveldb 1.17.0 → 1.18.0-jsonly

package/Changelog.md

@@ -1,3 +1,31 @@
+# v1.18.0
+
+## Breaking Changes
+
+-   The `dirty_columns` field of the `LegacyTerrain` NBT schema and parser/serializer has been renamed to `height_map`.
+-   The `Data2D` NBT schema and parser/serializer now includes a `version` field.
+
+## Additions
+
+-   Added the `Item_ItemStackBase` NBT schema, which is equivalent to the old `Item_ItemStack` NBT schema.
+-   The `Item_ItemStack` NBT schema now references the `Item_GeneralTags` and `Item_EnchantmentTags` NBT schemas.
+-   Added the `Item_GeneralTags` NBT schema.
+-   Added the `Item_EnchantmentTags` NBT schema, which includes autocomplete and validation for enchantment IDs.
+-   The NBT schema to TypeScript interface converter now supports `anyOf`.
+-   Added support for the newer `Data2D` format version used in `v1.18.0+` which uses 16-bit little-endian integers for biome IDs instead of 8-bit integers.
+-   The package now has the [`type-fest`](https://www.npmjs.com/package/type-fest) package as a dependency.
+
+## Changes
+
+-   Updated the `BiomeData` from `v1.21.110` to `v1.26.30` (also manually added definitions for the dappled forest, since that is not in `v1.26.30` and there is no newer definitions file available).
+-   The NBT schema to TypeScript interface converter now wraps generated `oneOf` types in the `ExclusifyUnion` generic type from the [`type-fest`](https://www.npmjs.com/package/type-fest) package, this makes the typings more accurate.
+-   The `Data2D` content type is no longer marked as deprecated as it is actually still written by the game for worlds using the Old world type or an older base game version.
+
+## Fixes
+
+-   Fixed a bug where many properties of NBT schemas that were items did not have a reference to the `Item_ItemStack` NBT schema.
+-   Many fixes for the NBT schema to JSON schema converter.
+
 # v1.17.0
 
 ## Additions

package/LevelUtils.d.ts

@@ -221,7 +221,7 @@ export declare const entryContentTypeToFormatMap: {
      *
      * Unlike {@link entryContentTypeToFormatMap.Data3D | Data3D}, this only stores biome data for xz coordinates, so in this format all y coordinates have the same biome.
      *
-     * @deprecated Only used in versions < 1.18.0.
+     * Only used in versions < 1.18.0, and for worlds using the Old world type or using an older base game version.
      */
     readonly Data2D: {
         /**

package/LevelUtils.js

@@ -678,7 +678,7 @@ export const entryContentTypeToFormatMap = {
      *
      * Unlike {@link entryContentTypeToFormatMap.Data3D | Data3D}, this only stores biome data for xz coordinates, so in this format all y coordinates have the same biome.
      *
-     * @deprecated Only used in versions < 1.18.0.
+     * Only used in versions < 1.18.0, and for worlds using the Old world type or using an older base game version.
      */
     Data2D: {
         /**
@@ -698,6 +698,11 @@ export const entryContentTypeToFormatMap = {
          * @returns The parsed data.
          */
         parse(data) {
+            const formatVersion = data.length === 768 ? 1
+                : data.length === 1024 ? 2
+                    : -1;
+            if (formatVersion === -1)
+                throw new Error(`Unknown Data2D format, expected 768 or 1024 bytes, got ${data.length} bytes`);
             const heightMap = Array.from({ length: 16 }, () => Array(16).fill(0));
             for (let i = 0; i < 256; i++) {
                 const val = readInt16LE(data, i * 2);
@@ -706,37 +711,82 @@ export const entryContentTypeToFormatMap = {
                 heightMap[x][z] = val;
             }
             const biomeData = Array.from({ length: 16 }, () => Array(16).fill(0));
-            for (let i = 0; i < 256; i++) {
-                const val = data.readUInt8(512 + i);
-                const x = i % 16;
-                const z = Math.floor(i / 16);
-                biomeData[x][z] = val;
-            }
-            return {
-                type: "compound",
-                value: {
-                    heightMap: {
-                        type: "list",
+            switch (formatVersion) {
+                case 1:
+                    for (let i = 0; i < 256; i++) {
+                        const val = data.readUInt8(512 + i);
+                        const x = i % 16;
+                        const z = Math.floor(i / 16);
+                        biomeData[x][z] = val;
+                    }
+                    return {
+                        type: "compound",
                         value: {
-                            type: "list",
-                            value: heightMap.map((row) => ({
-                                type: "short",
-                                value: row,
-                            })),
+                            version: {
+                                type: "byte",
+                                value: formatVersion,
+                            },
+                            heightMap: {
+                                type: "list",
+                                value: {
+                                    type: "list",
+                                    value: heightMap.map((row) => ({
+                                        type: "short",
+                                        value: row,
+                                    })),
+                                },
+                            },
+                            biomeData: {
+                                type: "list",
+                                value: {
+                                    type: "list",
+                                    value: biomeData.map((row) => ({
+                                        type: "byte",
+                                        value: row,
+                                    })),
+                                },
+                            },
                         },
-                    },
-                    biomeData: {
-                        type: "list",
+                    };
+                case 2:
+                    for (let i = 0; i < 256; i++) {
+                        const val = data.readUInt16LE(512 + i * 2);
+                        const x = i % 16;
+                        const z = Math.floor(i / 16);
+                        biomeData[x][z] = val;
+                    }
+                    return {
+                        type: "compound",
                         value: {
-                            type: "list",
-                            value: biomeData.map((row) => ({
+                            version: {
                                 type: "byte",
-                                value: row,
-                            })),
+                                value: formatVersion,
+                            },
+                            heightMap: {
+                                type: "list",
+                                value: {
+                                    type: "list",
+                                    value: heightMap.map((row) => ({
+                                        type: "short",
+                                        value: row,
+                                    })),
+                                },
+                            },
+                            biomeData: {
+                                type: "list",
+                                value: {
+                                    type: "list",
+                                    value: biomeData.map((row) => ({
+                                        type: "short",
+                                        value: row,
+                                    })),
+                                },
+                            },
                         },
-                    },
-                },
-            };
+                    };
+                default:
+                    throw new Error(`Missing parser for Data2D format: ${formatVersion}`);
+            }
         },
         /**
          * The function to serialize the data.
@@ -747,24 +797,49 @@ export const entryContentTypeToFormatMap = {
          * @returns The serialized data, as a buffer.
          */
         serialize(data) {
+            const formatVersion = data.value.version.value;
             const heightMap = data.value.heightMap.value.value;
             const biomeData = data.value.biomeData.value.value;
-            const buffer = Buffer.alloc(512 + 256);
-            for (let z = 0; z < 16; z++) {
-                for (let x = 0; x < 16; x++) {
-                    const i = z * 16 + x;
-                    const val = heightMap[x].value[z];
-                    buffer.writeInt16LE(val, i * 2);
+            switch (formatVersion) {
+                case 1: {
+                    const buffer = Buffer.alloc(512 + 256);
+                    for (let z = 0; z < 16; z++) {
+                        for (let x = 0; x < 16; x++) {
+                            const i = z * 16 + x;
+                            const val = heightMap[x].value[z];
+                            buffer.writeInt16LE(val, i * 2);
+                        }
+                    }
+                    for (let z = 0; z < 16; z++) {
+                        for (let x = 0; x < 16; x++) {
+                            const i = z * 16 + x;
+                            const val = biomeData[x].value[z];
+                            buffer.writeUInt8(val, 512 + i);
+                        }
+                    }
+                    return buffer;
                 }
-            }
-            for (let z = 0; z < 16; z++) {
-                for (let x = 0; x < 16; x++) {
-                    const i = z * 16 + x;
-                    const val = biomeData[x].value[z];
-                    buffer.writeUInt8(val, 512 + i);
+                case 2: {
+                    const buffer = Buffer.alloc(512 + 512);
+                    for (let z = 0; z < 16; z++) {
+                        for (let x = 0; x < 16; x++) {
+                            const i = z * 16 + x;
+                            const val = heightMap[x].value[z];
+                            buffer.writeInt16LE(val, i * 2);
+                        }
+                    }
+                    for (let z = 0; z < 16; z++) {
+                        for (let x = 0; x < 16; x++) {
+                            const i = z * 16 + x;
+                            const val = biomeData[x].value[z];
+                            buffer.writeUInt16LE(val, 512 + i * 2);
+                        }
+                    }
+                    return buffer;
                 }
+                default:
+                    throw new TypeError(`Unknown Data2D format: ${formatVersion}`);
             }
-            return buffer;
         },
     },
     /**
@@ -1116,7 +1191,7 @@ export const entryContentTypeToFormatMap = {
             const block_data = unpackNibbleArray(16384);
             const sky_light = unpackNibbleArray(16384);
             const block_light = unpackNibbleArray(16384);
-            const dirty_columns = [...data.subarray(currentOffset, currentOffset + 256)];
+            const height_map = [...data.subarray(currentOffset, currentOffset + 256)];
             currentOffset += 256;
             const grass_color = [...data.subarray(currentOffset, currentOffset + 1024)];
             currentOffset += 1024;
@@ -1125,7 +1200,7 @@ export const entryContentTypeToFormatMap = {
                 block_data: { type: "list", value: { type: "byte", value: block_data } },
                 sky_light: { type: "list", value: { type: "byte", value: sky_light } },
                 block_light: { type: "list", value: { type: "byte", value: block_light } },
-                dirty_columns: { type: "list", value: { type: "byte", value: dirty_columns } },
+                height_map: { type: "list", value: { type: "byte", value: height_map } },
                 grass_color: { type: "list", value: { type: "byte", value: grass_color } },
             });
         },
@@ -1146,7 +1221,7 @@ export const entryContentTypeToFormatMap = {
                 Buffer.from(packNibbles(data.value.block_data.value.value)),
                 Buffer.from(packNibbles(data.value.sky_light.value.value)),
                 Buffer.from(packNibbles(data.value.block_light.value.value)),
-                Buffer.from(data.value.dirty_columns.value.value),
+                Buffer.from(data.value.height_map.value.value),
                 Buffer.from(data.value.grass_color.value.value),
             ]);
         },