mca-json 1.0.5 → 1.1.1

package/src/lib/chunk.ts

@@ -10,8 +10,10 @@ import { Block, BlockInstance } from '../block/block';
 import { BlockData } from './block-data';
 import { Coords2d, Coords3d } from '../types/coords';
 import { NbtBase } from '../nbt/nbt-base';
+import { NbtByte } from '../nbt/nbt-byte';
 import { NbtCompound } from '../nbt/nbt-compound';
 import { NbtInt } from '../nbt/nbt-int';
+import { NbtIntArray } from '../nbt/nbt-int-array';
 import { NbtList } from '../nbt/nbt-list';
 import { NbtLong } from '../nbt/nbt-long';
 import { NbtLongArray } from '../nbt/nbt-long-array';
@@ -75,21 +77,28 @@ export class Chunk {
      */
     chunkCoordinates(): Coords2d | undefined {
         const x =
-            // 1.18+
+            // 1.18+ region chunks
             this.rootNbt.findChild<NbtInt>('xPos') ||
-            // up to 1.17
+            // up to 1.17 region chunks
             this.rootNbt.findChild<NbtInt>('Level/xPos');
         const z =
-            // 1.18+
+            // 1.18+ region chunks
             this.rootNbt.findChild<NbtInt>('zPos') ||
-            // up to 1.17
+            // up to 1.17 region chunks
             this.rootNbt.findChild<NbtInt>('Level/zPos');
 
-        if (typeof x?.data !== 'number' || typeof z?.data !== 'number') {
-            return;
+        if (typeof x?.data === 'number' && typeof z?.data === 'number') {
+            return [x.data, z.data];
+        }
+
+        // Check for entity chunks
+        const position = this.rootNbt.findChild<NbtIntArray>('Position');
+
+        if (position && position.data.length === 2) {
+            return [position.data[0], position.data[1]];
         }
 
-        return [x.data, z.data];
+        return;
     }
 
     /**
@@ -141,7 +150,7 @@ export class Chunk {
 
         const index = blockData.chunkCoordinatesToIndex([
             xChunk,
-            coords[1] % 16,
+            ((coords[1] % 16) + 16) % 16, // Handle negative Y coordinates
             zChunk,
         ]);
         const name = blockData.getBlockByIndex(index);
@@ -369,21 +378,22 @@ export class Chunk {
     }
 
     /**
-     * Returns the Y coordinate of a section, which goes from 0 to 256. If you want the world coordinate, pass true to get -128 to 4031.
+     * Returns the Y coordinate of a section, which goes from -4 to 19. If you
+     * want the world coordinate, pass true to get -64 to 304. The maximum supported
+     * range is -128 to 127 (chunk coordinates) or -2048 to 2032 (world coordinates).
      */
     private sectionY(section: NbtCompound, useWorldCoordinate = false): number {
-        const ySection = section.findChild<NbtInt>('Y')?.data || 0;
+        let ySection = section.findChild<NbtByte>('Y')?.data || 0;
 
-        if (!useWorldCoordinate) {
-            return ySection;
+        // If the high bit is on, it's negative because this byte is a signed short.
+        if (ySection >= 128) {
+            ySection -= 256;
         }
 
-        let yWorld = ySection * 16;
-
-        if (yWorld >= 4032) {
-            yWorld -= 4096;
+        if (!useWorldCoordinate) {
+            return ySection;
         }
 
-        return yWorld;
+        return ySection * 16;
     }
 }

package/dist/bin/mca-find-chunks-with-signs.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=mca-find-chunks-with-signs.d.ts.map

package/dist/bin/mca-find-chunks-with-signs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mca-find-chunks-with-signs.d.ts","sourceRoot":"","sources":["../../src/bin/mca-find-chunks-with-signs.ts"],"names":[],"mappings":""}

package/dist/bin/mca-find-chunks-with-signs.js

@@ -1,79 +0,0 @@
-#!/usr/bin/env node
-import debug from 'debug';
-import neodoc from 'neodoc';
-import { Anvil } from '../lib/anvil';
-import { Sign } from '../block/sign';
-import { readFile } from 'node:fs/promises';
-const debugLog = debug('mca-find-chunks-with-signs');
-const args = neodoc.run(`Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...
-
-Displays chunk X and Z coordinates, separated by a tab, for all chunks in MCA
-files that contain a sign block. Signs need to have at least one letter or
-number on them to differentiate them from naturally generated signs.
-
-Options:
-    -h, --help      Show this message.
-    -v, --verbose   Show more information during processing.
-`, {
-    argv: [...process.argv].slice(2),
-    laxPlacement: true,
-});
-if (!args.MCA_FILE?.length) {
-    console.error('No files specified.');
-    process.exit(1);
-}
-for (const file of args.MCA_FILE) {
-    try {
-        await processFile(file);
-    }
-    catch (e) {
-        console.error(`Error processing file ${file}: ${e}`);
-        process.exit(1);
-    }
-}
-async function processFile(filename) {
-    debugLog(`Reading file: ${filename}`);
-    if (args['--verbose']) {
-        console.log(`Reading file: ${filename}`);
-    }
-    const contents = await readFile(filename);
-    const anvil = Anvil.fromBuffer(contents.buffer);
-    const chunks = anvil.getAllChunks();
-    for (const chunk of chunks) {
-        const chunkKey = chunk.chunkKey() || '';
-        if (processChunk(chunk)) {
-            const coords = chunk.chunkCoordinates();
-            if (!coords) {
-                throw new Error(`Chunk ${chunkKey} has no coordinates.`);
-            }
-            console.log(`${coords[0]}\t${coords[1]}`);
-        }
-    }
-}
-function processChunk(chunk) {
-    const blockNames = chunk.uniqueBlockNames();
-    for (const blockName of blockNames) {
-        if (blockName.match(/^minecraft:.+_sign$/)) {
-            debugLog(`Found sign: ${blockName}`);
-            for (const coords of chunk.findBlocksByName(blockName)) {
-                const block = chunk.getBlock(coords);
-                if (!(block instanceof Sign)) {
-                    throw new Error(`Block is supposed to be a sign: ${block.name}`);
-                }
-                const front = block.frontText();
-                const back = block.backText();
-                debugLog(`Front: ${JSON.stringify(front)}`);
-                debugLog(`Back: ${JSON.stringify(back)}`);
-                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {
-                    debugLog(`Found a user-created sign. Preserving chunk.`);
-                    if (args['--verbose']) {
-                        console.log(`Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`);
-                    }
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-//# sourceMappingURL=mca-find-chunks-with-signs.js.map

package/dist/bin/mca-find-chunks-with-signs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mca-find-chunks-with-signs.js","sourceRoot":"","sources":["../../src/bin/mca-find-chunks-with-signs.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\n\nimport debug from 'debug';\nimport neodoc from 'neodoc';\nimport { Anvil } from '../lib/anvil';\nimport { Chunk } from '../lib/chunk';\nimport { Sign } from '../block/sign';\nimport { readFile } from 'node:fs/promises';\n\nconst debugLog = debug('mca-find-chunks-with-signs');\nconst args: {\n    '--verbose'?: boolean;\n    MCA_FILE?: string[];\n} = neodoc.run(\n    `Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...\n\nDisplays chunk X and Z coordinates, separated by a tab, for all chunks in MCA\nfiles that contain a sign block. Signs need to have at least one letter or\nnumber on them to differentiate them from naturally generated signs.\n\nOptions:\n    -h, --help      Show this message.\n    -v, --verbose   Show more information during processing.\n`,\n    {\n        argv: [...process.argv].slice(2),\n        laxPlacement: true,\n    }\n);\n\nif (!args.MCA_FILE?.length) {\n    console.error('No files specified.');\n    process.exit(1);\n}\n\nfor (const file of args.MCA_FILE) {\n    try {\n        await processFile(file);\n    } catch (e) {\n        console.error(`Error processing file ${file}: ${e}`);\n\n        process.exit(1);\n    }\n}\n\nasync function processFile(filename: string) {\n    debugLog(`Reading file: ${filename}`);\n\n    if (args['--verbose']) {\n        console.log(`Reading file: ${filename}`);\n    }\n\n    const contents = await readFile(filename);\n    const anvil = Anvil.fromBuffer(contents.buffer);\n    const chunks = anvil.getAllChunks();\n\n    for (const chunk of chunks) {\n        const chunkKey = chunk.chunkKey() || '';\n\n        if (processChunk(chunk)) {\n            const coords = chunk.chunkCoordinates();\n\n            if (!coords) {\n                throw new Error(`Chunk ${chunkKey} has no coordinates.`);\n            }\n\n            console.log(`${coords[0]}\\t${coords[1]}`);\n        }\n    }\n}\n\nfunction processChunk(chunk: Chunk): boolean {\n    const blockNames = chunk.uniqueBlockNames();\n\n    for (const blockName of blockNames) {\n        if (blockName.match(/^minecraft:.+_sign$/)) {\n            debugLog(`Found sign: ${blockName}`);\n\n            for (const coords of chunk.findBlocksByName(blockName)) {\n                const block = chunk.getBlock(coords);\n\n                if (!(block instanceof Sign)) {\n                    throw new Error(\n                        `Block is supposed to be a sign: ${block.name}`\n                    );\n                }\n\n                const front = block.frontText();\n                const back = block.backText();\n                debugLog(`Front: ${JSON.stringify(front)}`);\n                debugLog(`Back: ${JSON.stringify(back)}`);\n\n                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {\n                    debugLog(`Found a user-created sign. Preserving chunk.`);\n\n                    if (args['--verbose']) {\n                        console.log(\n                            `Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`\n                        );\n                    }\n\n                    return true;\n                }\n            }\n        }\n    }\n\n    return false;\n}\n"]}

package/dist/bin/mca-trim-chunks-without-signs.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=mca-trim-chunks-without-signs.d.ts.map

package/dist/bin/mca-trim-chunks-without-signs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mca-trim-chunks-without-signs.d.ts","sourceRoot":"","sources":["../../src/bin/mca-trim-chunks-without-signs.ts"],"names":[],"mappings":""}

package/dist/bin/mca-trim-chunks-without-signs.js

@@ -1,117 +0,0 @@
-#!/usr/bin/env node
-import debug from 'debug';
-import neodoc from 'neodoc';
-import { Anvil } from '../lib/anvil';
-import { Sign } from '../block/sign';
-import { readFile, writeFile } from 'node:fs/promises';
-const debugLog = debug('mca-trim-chunks-without-signs');
-const args = neodoc.run(`Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...
-
-Removes chunks from MCA files that do not contain a matching sign block. Signs
-need to have at least one letter or number on them to differentiate them from
-naturally generated signs.
-
-This does not change the file size. Similar to deleting a file on a hard drive,
-the space is marked as free but not overwritten.
-
-Options:
-    -h, --help      Show this message.
-    -n, --dry-run   Do not write changes to the file.
-    --preserve CHUNK_COORDINATES...
-                    Do not remove chunks with these coordinates. Coordinates
-                    are in the format "x,z". May be specified multiple times.
-    -v, --verbose   Show more information during processing.
-`, {
-    argv: [...process.argv].slice(2),
-    laxPlacement: true,
-});
-if (!args.MCA_FILE?.length) {
-    console.error('No files specified.');
-    process.exit(1);
-}
-if (!args['--preserve']) {
-    args['--preserve'] = [];
-}
-if (args['--preserve'].length) {
-    console.log(`Preserving coordinates: ${args['--preserve'].join(' ')}`);
-}
-for (const file of args.MCA_FILE) {
-    try {
-        await processFile(file);
-    }
-    catch (e) {
-        console.error(`Error processing file ${file}: ${e}`);
-        process.exit(1);
-    }
-}
-async function processFile(filename) {
-    debugLog(`Reading file: ${filename}`);
-    if (args['--verbose']) {
-        console.log(`Reading file: ${filename}`);
-    }
-    const contents = await readFile(filename);
-    const anvil = Anvil.fromBuffer(contents.buffer);
-    const chunks = anvil.getAllChunks();
-    let changes = 0;
-    const preservedCoordinates = new Set(args['--preserve']);
-    for (const chunk of chunks) {
-        const chunkKey = chunk.chunkKey() || '';
-        if (preservedCoordinates.has(chunkKey)) {
-            debugLog(`Preserving chunk (via command-line): ${chunkKey}`);
-            if (args['--verbose']) {
-                console.log(`Preserving chunk (via command-line): ${chunkKey}`);
-            }
-        }
-        else if (processChunk(chunk)) {
-            debugLog(`Preserving chunk (sign detected): ${chunkKey}`);
-            if (args['--verbose']) {
-                console.log(`Preserving chunk (sign detected): ${chunkKey}`);
-            }
-        }
-        else {
-            debugLog(`Removing chunk: ${chunkKey}`);
-            anvil.deleteChunk(chunk);
-            changes += 1;
-        }
-    }
-    if (args['--verbose']) {
-        console.log(`Chunks removed: ${changes}/${chunks.length}`);
-    }
-    if (changes) {
-        if (args['--dry-run']) {
-            console.log(`DRY RUN: Would write changes to file: ${filename}`);
-        }
-        else {
-            console.log(`Writing changes to file: ${filename}`);
-            const modifiedBuffer = Buffer.from(anvil.buffer());
-            await writeFile(filename, modifiedBuffer);
-        }
-    }
-}
-function processChunk(chunk) {
-    const blockNames = chunk.uniqueBlockNames();
-    for (const blockName of blockNames) {
-        if (blockName.match(/^minecraft:.+_sign$/)) {
-            debugLog(`Found sign: ${blockName}`);
-            for (const coords of chunk.findBlocksByName(blockName)) {
-                const block = chunk.getBlock(coords);
-                if (!(block instanceof Sign)) {
-                    throw new Error(`Block is supposed to be a sign: ${block.name}`);
-                }
-                const front = block.frontText();
-                const back = block.backText();
-                debugLog(`Front: ${JSON.stringify(front)}`);
-                debugLog(`Back: ${JSON.stringify(back)}`);
-                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {
-                    debugLog(`Found a user-created sign. Preserving chunk.`);
-                    if (args['--verbose']) {
-                        console.log(`Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`);
-                    }
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-//# sourceMappingURL=mca-trim-chunks-without-signs.js.map

package/dist/bin/mca-trim-chunks-without-signs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mca-trim-chunks-without-signs.js","sourceRoot":"","sources":["../../src/bin/mca-trim-chunks-without-signs.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\n\nimport debug from 'debug';\nimport neodoc from 'neodoc';\nimport { Anvil } from '../lib/anvil';\nimport { Chunk } from '../lib/chunk';\nimport { Sign } from '../block/sign';\nimport { readFile, writeFile } from 'node:fs/promises';\n\nconst debugLog = debug('mca-trim-chunks-without-signs');\nconst args: {\n    '--dry-run'?: boolean;\n    '--preserve'?: string[];\n    '--verbose'?: boolean;\n    'MCA_FILE'?: string[];\n} = neodoc.run(\n`Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...\n\nRemoves chunks from MCA files that do not contain a matching sign block. Signs\nneed to have at least one letter or number on them to differentiate them from\nnaturally generated signs.\n\nThis does not change the file size. Similar to deleting a file on a hard drive,\nthe space is marked as free but not overwritten.\n\nOptions:\n    -h, --help      Show this message.\n    -n, --dry-run   Do not write changes to the file.\n    --preserve CHUNK_COORDINATES...\n                    Do not remove chunks with these coordinates. Coordinates\n                    are in the format \"x,z\". May be specified multiple times.\n    -v, --verbose   Show more information during processing.\n`,\n    {\n        argv: [...process.argv].slice(2),\n        laxPlacement: true,\n    }\n);\n\nif (!args.MCA_FILE?.length) {\n    console.error('No files specified.');\n    process.exit(1);\n}\n\nif (!args['--preserve']) {\n    args['--preserve'] = [];\n}\n\nif (args['--preserve'].length) {\n    console.log(`Preserving coordinates: ${args['--preserve'].join(' ')}`);\n}\n\nfor (const file of args.MCA_FILE) {\n    try {\n        await processFile(file);\n    } catch (e) {\n        console.error(`Error processing file ${file}: ${e}`);\n\n        process.exit(1);\n    }\n}\n\nasync function processFile(filename: string) {\n    debugLog(`Reading file: ${filename}`);\n\n    if (args['--verbose']) {\n        console.log(`Reading file: ${filename}`);\n    }\n\n    const contents = await readFile(filename);\n    const anvil = Anvil.fromBuffer(contents.buffer);\n    const chunks = anvil.getAllChunks();\n    let changes = 0;\n    const preservedCoordinates = new Set(args['--preserve']);\n\n    for (const chunk of chunks) {\n        const chunkKey = chunk.chunkKey() || '';\n\n        if (preservedCoordinates.has(chunkKey)) {\n            debugLog(`Preserving chunk (via command-line): ${chunkKey}`);\n\n            if (args['--verbose']) {\n                console.log(`Preserving chunk (via command-line): ${chunkKey}`);\n            }\n        } else if (processChunk(chunk)) {\n            debugLog(`Preserving chunk (sign detected): ${chunkKey}`);\n\n            if (args['--verbose']) {\n                console.log(`Preserving chunk (sign detected): ${chunkKey}`);\n            }\n        } else {\n            debugLog(`Removing chunk: ${chunkKey}`);\n            anvil.deleteChunk(chunk);\n            changes += 1;\n        }\n    }\n\n    if (args['--verbose']) {\n        console.log(`Chunks removed: ${changes}/${chunks.length}`);\n    }\n\n    if (changes) {\n        if (args['--dry-run']) {\n            console.log(`DRY RUN: Would write changes to file: ${filename}`);\n        } else {\n            console.log(`Writing changes to file: ${filename}`);\n            const modifiedBuffer = Buffer.from(anvil.buffer());\n            await writeFile(filename, modifiedBuffer);\n        }\n    }\n}\n\nfunction processChunk(chunk: Chunk): boolean {\n    const blockNames = chunk.uniqueBlockNames();\n\n    for (const blockName of blockNames) {\n        if (blockName.match(/^minecraft:.+_sign$/)) {\n            debugLog(`Found sign: ${blockName}`);\n\n            for (const coords of chunk.findBlocksByName(blockName)) {\n                const block = chunk.getBlock(coords);\n\n                if (!(block instanceof Sign)) {\n                    throw new Error(`Block is supposed to be a sign: ${block.name}`);\n                }\n\n                const front = block.frontText();\n                const back = block.backText();\n                debugLog(`Front: ${JSON.stringify(front)}`);\n                debugLog(`Back: ${JSON.stringify(back)}`);\n\n                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {\n                    debugLog(`Found a user-created sign. Preserving chunk.`);\n\n                    if (args['--verbose']) {\n                        console.log(`Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`);\n                    }\n\n                    return true;\n                }\n            }\n        }\n    }\n\n    return false;\n}\n"]}

package/src/bin/mca-find-chunks-with-signs.ts

@@ -1,109 +0,0 @@
-#!/usr/bin/env node
-
-import debug from 'debug';
-import neodoc from 'neodoc';
-import { Anvil } from '../lib/anvil';
-import { Chunk } from '../lib/chunk';
-import { Sign } from '../block/sign';
-import { readFile } from 'node:fs/promises';
-
-const debugLog = debug('mca-find-chunks-with-signs');
-const args: {
-    '--verbose'?: boolean;
-    MCA_FILE?: string[];
-} = neodoc.run(
-    `Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...
-
-Displays chunk X and Z coordinates, separated by a tab, for all chunks in MCA
-files that contain a sign block. Signs need to have at least one letter or
-number on them to differentiate them from naturally generated signs.
-
-Options:
-    -h, --help      Show this message.
-    -v, --verbose   Show more information during processing.
-`,
-    {
-        argv: [...process.argv].slice(2),
-        laxPlacement: true,
-    }
-);
-
-if (!args.MCA_FILE?.length) {
-    console.error('No files specified.');
-    process.exit(1);
-}
-
-for (const file of args.MCA_FILE) {
-    try {
-        await processFile(file);
-    } catch (e) {
-        console.error(`Error processing file ${file}: ${e}`);
-
-        process.exit(1);
-    }
-}
-
-async function processFile(filename: string) {
-    debugLog(`Reading file: ${filename}`);
-
-    if (args['--verbose']) {
-        console.log(`Reading file: ${filename}`);
-    }
-
-    const contents = await readFile(filename);
-    const anvil = Anvil.fromBuffer(contents.buffer);
-    const chunks = anvil.getAllChunks();
-
-    for (const chunk of chunks) {
-        const chunkKey = chunk.chunkKey() || '';
-
-        if (processChunk(chunk)) {
-            const coords = chunk.chunkCoordinates();
-
-            if (!coords) {
-                throw new Error(`Chunk ${chunkKey} has no coordinates.`);
-            }
-
-            console.log(`${coords[0]}\t${coords[1]}`);
-        }
-    }
-}
-
-function processChunk(chunk: Chunk): boolean {
-    const blockNames = chunk.uniqueBlockNames();
-
-    for (const blockName of blockNames) {
-        if (blockName.match(/^minecraft:.+_sign$/)) {
-            debugLog(`Found sign: ${blockName}`);
-
-            for (const coords of chunk.findBlocksByName(blockName)) {
-                const block = chunk.getBlock(coords);
-
-                if (!(block instanceof Sign)) {
-                    throw new Error(
-                        `Block is supposed to be a sign: ${block.name}`
-                    );
-                }
-
-                const front = block.frontText();
-                const back = block.backText();
-                debugLog(`Front: ${JSON.stringify(front)}`);
-                debugLog(`Back: ${JSON.stringify(back)}`);
-
-                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {
-                    debugLog(`Found a user-created sign. Preserving chunk.`);
-
-                    if (args['--verbose']) {
-                        console.log(
-                            `Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`
-                        );
-                    }
-
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}

package/src/bin/mca-trim-chunks-without-signs.ts

@@ -1,146 +0,0 @@
-#!/usr/bin/env node
-
-import debug from 'debug';
-import neodoc from 'neodoc';
-import { Anvil } from '../lib/anvil';
-import { Chunk } from '../lib/chunk';
-import { Sign } from '../block/sign';
-import { readFile, writeFile } from 'node:fs/promises';
-
-const debugLog = debug('mca-trim-chunks-without-signs');
-const args: {
-    '--dry-run'?: boolean;
-    '--preserve'?: string[];
-    '--verbose'?: boolean;
-    'MCA_FILE'?: string[];
-} = neodoc.run(
-`Usage: mca-trim-chunks-without-signs [OPTIONS] MCA_FILE...
-
-Removes chunks from MCA files that do not contain a matching sign block. Signs
-need to have at least one letter or number on them to differentiate them from
-naturally generated signs.
-
-This does not change the file size. Similar to deleting a file on a hard drive,
-the space is marked as free but not overwritten.
-
-Options:
-    -h, --help      Show this message.
-    -n, --dry-run   Do not write changes to the file.
-    --preserve CHUNK_COORDINATES...
-                    Do not remove chunks with these coordinates. Coordinates
-                    are in the format "x,z". May be specified multiple times.
-    -v, --verbose   Show more information during processing.
-`,
-    {
-        argv: [...process.argv].slice(2),
-        laxPlacement: true,
-    }
-);
-
-if (!args.MCA_FILE?.length) {
-    console.error('No files specified.');
-    process.exit(1);
-}
-
-if (!args['--preserve']) {
-    args['--preserve'] = [];
-}
-
-if (args['--preserve'].length) {
-    console.log(`Preserving coordinates: ${args['--preserve'].join(' ')}`);
-}
-
-for (const file of args.MCA_FILE) {
-    try {
-        await processFile(file);
-    } catch (e) {
-        console.error(`Error processing file ${file}: ${e}`);
-
-        process.exit(1);
-    }
-}
-
-async function processFile(filename: string) {
-    debugLog(`Reading file: ${filename}`);
-
-    if (args['--verbose']) {
-        console.log(`Reading file: ${filename}`);
-    }
-
-    const contents = await readFile(filename);
-    const anvil = Anvil.fromBuffer(contents.buffer);
-    const chunks = anvil.getAllChunks();
-    let changes = 0;
-    const preservedCoordinates = new Set(args['--preserve']);
-
-    for (const chunk of chunks) {
-        const chunkKey = chunk.chunkKey() || '';
-
-        if (preservedCoordinates.has(chunkKey)) {
-            debugLog(`Preserving chunk (via command-line): ${chunkKey}`);
-
-            if (args['--verbose']) {
-                console.log(`Preserving chunk (via command-line): ${chunkKey}`);
-            }
-        } else if (processChunk(chunk)) {
-            debugLog(`Preserving chunk (sign detected): ${chunkKey}`);
-
-            if (args['--verbose']) {
-                console.log(`Preserving chunk (sign detected): ${chunkKey}`);
-            }
-        } else {
-            debugLog(`Removing chunk: ${chunkKey}`);
-            anvil.deleteChunk(chunk);
-            changes += 1;
-        }
-    }
-
-    if (args['--verbose']) {
-        console.log(`Chunks removed: ${changes}/${chunks.length}`);
-    }
-
-    if (changes) {
-        if (args['--dry-run']) {
-            console.log(`DRY RUN: Would write changes to file: ${filename}`);
-        } else {
-            console.log(`Writing changes to file: ${filename}`);
-            const modifiedBuffer = Buffer.from(anvil.buffer());
-            await writeFile(filename, modifiedBuffer);
-        }
-    }
-}
-
-function processChunk(chunk: Chunk): boolean {
-    const blockNames = chunk.uniqueBlockNames();
-
-    for (const blockName of blockNames) {
-        if (blockName.match(/^minecraft:.+_sign$/)) {
-            debugLog(`Found sign: ${blockName}`);
-
-            for (const coords of chunk.findBlocksByName(blockName)) {
-                const block = chunk.getBlock(coords);
-
-                if (!(block instanceof Sign)) {
-                    throw new Error(`Block is supposed to be a sign: ${block.name}`);
-                }
-
-                const front = block.frontText();
-                const back = block.backText();
-                debugLog(`Front: ${JSON.stringify(front)}`);
-                debugLog(`Back: ${JSON.stringify(back)}`);
-
-                if ([...front, ...(back || [])].join('').match(/[a-z0-9]/i)) {
-                    debugLog(`Found a user-created sign. Preserving chunk.`);
-
-                    if (args['--verbose']) {
-                        console.log(`Found a user-created sign: ${JSON.stringify(front)} and ${JSON.stringify(back)}`);
-                    }
-
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}