pw-js-world 0.4.5-dev.85d024b → 0.4.5-dev.e92914f

package/cm/Block.d.ts

@@ -39,6 +39,26 @@ export default class Block {
      */
     static getArgsAsArray(block: Block): BlockArg[];
     static getArgsAsArray(bId: number, args?: Record<string, BlockArg>): BlockArg[];
+    /**
+     * Checks if all required fields are present, it will also check if there are extra fields that are not used.
+     *
+     * Returns an object with two lists: values and keys. The indexes of values also point to keys.
+     *
+     * For example:
+     * ```js
+     * { values: [3, "Text is awesome."], keys: ["rotation", "text"] }
+     * ```
+     *
+     * NOTE: This will not error if a required field is missing. This also doesn't validate string against patterns for now.
+     */
+    static validateArgs(block: Block): {
+        values: BlockArg[];
+        keys: string[];
+    };
+    static validateArgs(bId: number, args?: Record<string, BlockArg>): {
+        values: BlockArg[];
+        keys: string[];
+    };
     /**
      * This is sort of for internal use,
      * this will convert the packet form of fields

package/cm/Block.js

@@ -65,9 +65,12 @@ class Block {
             args !== null && args !== void 0 ? args : (args = bId.args);
             bId = bId.bId;
         }
-        if (args === undefined)
-            return {};
         const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${(0, Misc_js_1.map)(fields, v => v.Name).join(", ")}.`);
+            return [];
+        }
         const obj = {};
         for (let i = 0, len = fields.length; i < len; i++) {
             const f = fields[i];
@@ -86,13 +89,16 @@ class Block {
     }
     static getArgsAsArray(bId, args) {
         if (bId instanceof Block) {
-            args = bId.args;
+            args !== null && args !== void 0 ? args : (args = bId.args);
             bId = bId.bId;
         }
-        if (args === undefined)
-            return [];
         const arr = [];
         const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${(0, Misc_js_1.map)(fields, v => v.Name).join(", ")}.`);
+            return [];
+        }
         for (let i = 0, len = fields.length; i < len; i++) {
             const f = fields[i];
             const val = args[f.Name];
@@ -104,6 +110,60 @@ class Block {
         }
         return arr;
     }
+    static validateArgs(bId, args) {
+        var _a;
+        if (bId instanceof Block) {
+            args !== null && args !== void 0 ? args : (args = bId.args);
+            bId = bId.bId;
+        }
+        const obj = { keys: [], values: [] };
+        const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${(0, Misc_js_1.map)(fields, v => v.Name).join(", ")}.`);
+            return obj;
+        }
+        const argNames = Object.keys(args);
+        for (let i = 0, len = fields.length; i < len; i++) {
+            const f = fields[i];
+            const val = args[f.Name];
+            if (f.Required === true && val === undefined)
+                throw Error(`Missing required argument: ${f.Name} (Type: ${f.Type})`);
+            ;
+            // else if (f.Required === false && args[f.Name] === undefined) arr.push(undefined);
+            if (val !== undefined)
+                switch (f.Type) {
+                    case "String":
+                        if (typeof val !== "string")
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        break;
+                    case "Int32":
+                    case "UInt32":
+                        if (typeof val !== "number")
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        if ((_a = f.ExcludedValues) === null || _a === void 0 ? void 0 : _a.includes(val))
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' value is in the excluded values`, bId, val);
+                        if (f.MinValue > val)
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' value lower than the minimum value (${f.MinValue})`, bId, val);
+                        if (f.MaxValue < val)
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' value lower than the maximum value (${f.MaxValue})`, bId, val);
+                        break;
+                    case "Boolean":
+                        if (typeof val !== "boolean")
+                            throw new Error_js_1.LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        break;
+                }
+            for (let j = 0; j < argNames.length; j++) {
+                if (argNames[j] === f.Name) {
+                    obj.keys.push(f.Name);
+                    obj.values.push(val);
+                    argNames.splice(j, 1);
+                    break;
+                }
+            }
+        }
+        return obj;
+    }
     /**
      * This is sort of for internal use,
      * this will convert the packet form of fields
@@ -230,4 +290,4 @@ class Block {
     }
 }
 exports.default = Block;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Block.js","sourceRoot":"","sources":["../lib/Block.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Block.js","sourceRoot":"","sources":["../lib/Block.ts"],"names":[],"mappings":"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"}

package/cm/Structure.d.ts

@@ -39,7 +39,7 @@ export declare class DeserialisedStructure {
      *
      * NOTE: This requires you to have called API getlistblocks (unless you have joined the world)
      */
-    getSerialisedBlocks(): IStructureBlocks;
+    getSerialisedBlocks(): IStructureBlocksV2;
     /**
      * This will return the structure form, giving you the freedom to choose your own way of saving.
      */
@@ -75,11 +75,12 @@ export declare class DeserialisedStructure {
      */
     toPackets(x: number, y: number, helper: PWGameWorldHelper): SendableBlockPacket[];
 }
-export interface IStructure {
+export type IStructure = IStructureV1 | IStructureV2;
+export interface IStructureV1 {
     /**
      * Version of the structure object, not the world.
      */
-    version: number;
+    version: 1;
     /**
      * The maximum width of the structure.
      */
@@ -91,11 +92,30 @@ export interface IStructure {
     /**
      * Object containing the mappings and the blocks.
      */
-    blocks: IStructureBlocks;
+    blocks: IStructureBlocksV1;
 }
-export interface IStructureBlocks {
+export interface IStructureV2 {
     /**
-     * Index starts at 0, this is the mapping of blocks (in block name ids in UPPER_CASE)
+     * Version of the structure object, not the world.
+     */
+    version: 2;
+    /**
+     * The maximum width of the structure.
+     */
+    width: number;
+    /**
+     * The maximum height of the structure.
+     */
+    height: number;
+    /**
+     * Object containing the mappings and the blocks.
+     */
+    blocks: IStructureBlocksV2;
+}
+export type IStructureBlocks = IStructureBlocksV1 | IStructureBlocksV2;
+export interface IStructureBlocksV1 {
+    /**
+     * Index starts at 0, this is the mapping of palette IDs (block name ids in UPPER_CASE)
      */
     mapping: string[];
     /**
@@ -107,8 +127,49 @@ export interface IStructureBlocks {
      * (while impossible, it's for possible compatibility with mirrored blocks, foreground block in background layer etc)
      *
      * If argMapping exists in a block, it'll be an index that corresponds to the block's arguments in args array.
+     */
+    blocks: [
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][],
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][],
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][]
+    ][];
+}
+export interface IStructureBlocksV2 {
+    /**
+     * Version of the structured blocks.
+     */
+    version: 2;
+    /**
+     * Index starts at 0, this is the mapping of palette IDs (block name ids in UPPER_CASE)
+     */
+    mapping: string[];
+    /**
+     * Index starts at 0, this is the mapping of field names (for example, a portal block will have "rotation" and "id" so 0 - rotation, 1 - id)
+     */
+    fieldsMapping: string[];
+    /**
+     * Index starts at 0, this is the mapping of args in blocks, after the y (see blocks for further desc)
+     */
+    argsMapping: BlockArg[];
+    /**
+     * If array, it's index corresponds to the mapping, the element will be array of locations and args indexed by layers
+     * (while impossible, it's for possible compatibility with mirrored blocks, foreground block in background layer etc)
      *
-     * If string, it's the encoded version of the object, use atob then JSON parse.
+     * If argMapping exists in a block, there will be 2 elements for every arg
+     * - 1st is the pointer to the field/arg value in argsMapping.
+     * - 2nd is the pointer to the field/arg name in fieldsMapping.
      */
     blocks: [
         [

package/cm/Structure.js

@@ -4,6 +4,7 @@ exports.DeserialisedStructure = void 0;
 const tslib_1 = require("tslib");
 const Block_js_1 = tslib_1.__importDefault(require("./Block.js"));
 const Misc_js_1 = require("./util/Misc.js");
+const Error_js_1 = require("./util/Error.js");
 /**
  * This is external to the main Helper, it will allow developers to use the structure without needing to use helper if they so wish.
  *
@@ -23,10 +24,14 @@ class StructureHelper {
             data = JSON.parse(decoder.decode(data));
         }
         const json = "version" in data ? data : JSON.parse(data.toString());
-        if (json.version === undefined || json.version < 1 || json.version > 1)
-            throw Error("Unknown file format");
-        const desed = this.deserialiseStructBlocks(json.blocks, json.width, json.height);
-        return new DeserialisedStructure(desed.blocks, { width: desed.width, height: desed.height });
+        switch (json.version) {
+            case 1:
+            case 2:
+                const desed = this.deserialiseStructBlocks(json.blocks, json.width, json.height);
+                return new DeserialisedStructure(desed.blocks, { width: desed.width, height: desed.height });
+            default:
+                throw Error("Unknown file format");
+        }
     }
     /**
      * If width or height are not provided, the structure may be trimmed (empty blocks).
@@ -36,7 +41,6 @@ class StructureHelper {
     static deserialiseStructBlocks(struct, width, height) {
         var _a, _b, _c, _d, _e, _f;
         var _g, _h, _j, _k, _l, _m;
-        const { args, blocks, mapping } = struct;
         const deBlocks = [[], [], []];
         let isMissing = width === undefined || height === undefined;
         if (width !== undefined && height !== undefined) {
@@ -52,6 +56,22 @@ class StructureHelper {
             }
         }
         let big = { x: 0, y: 0 };
+        const { blocks, mapping } = struct;
+        // TODO: if v3 is created in the future, this will require a significant code revamp but for now this will work
+        let version = -1;
+        let argsMapping;
+        let fieldsMapping = [];
+        if ("version" in struct) {
+            // TODO: change if v3 or above
+            version = struct.version;
+            argsMapping = struct.argsMapping;
+            fieldsMapping = struct.fieldsMapping;
+        }
+        else {
+            // legacy support
+            argsMapping = struct.args;
+            version = 1;
+        }
         for (let i = 0, ien = blocks.length; i < ien; i++) {
             // While foreground and background layers are only supported for now, it's possible there are more layers in the future.
             for (let l = 0, len = blocks[i].length; l < len; l++) {
@@ -72,10 +92,19 @@ class StructureHelper {
                     const deBlock = deBlocks[l][block[0]][block[1]] = new Block_js_1.default(mapping[i]);
                     const fields = Block_js_1.default.getFieldsByBlockId(deBlock.bId);
                     for (let a = 2, alen = block.length; a < alen; a++) {
-                        let arg = args[block[a]];
-                        const field = fields[a - 2];
+                        let arg = argsMapping[block[a]];
+                        let field;
+                        if (version > 1) {
+                            const fieldName = fieldsMapping[block[++a]];
+                            field = (0, Misc_js_1.find)(fields, v => v.Name === fieldName);
+                            if (field === undefined)
+                                throw new Error_js_1.LegacyIncorrectArgError(`The field '${fieldName}' no longer exists for block '${mapping[i]}'`, deBlock.bId, fieldName);
+                        }
+                        else {
+                            field = fields[a - 2];
+                        }
                         if (typeof arg === "string" && arg.startsWith("\x00"))
-                            arg = Uint8Array.from(arg.slice(1));
+                            arg = Uint8Array.from(arg.slice(1).split(","));
                         else {
                             switch (field.Type) {
                                 case "Boolean":
@@ -86,7 +115,7 @@ class StructureHelper {
                                     break; // legacy support: world portal ids are now string.
                             }
                         }
-                        deBlock.args[fields[a - 2].Name] = arg;
+                        deBlock.args[field.Name] = arg;
                     }
                 }
             }
@@ -131,11 +160,13 @@ class DeserialisedStructure {
     getSerialisedBlocks() {
         var _a;
         const blocks = [];
-        const args = [];
+        const argsMapping = [];
+        const fieldsMapping = [];
         const mapping = [];
         // corresponds to the index in mapping array.
-        const mappingDone = {};
         const argDone = new Map();
+        const fieldDone = new Map();
+        const mappingDone = {};
         for (let l = 0; l < this.blocks.length; l++) {
             for (let x = 0; x < this.width; x++) {
                 for (let y = 0; y < this.height; y++) {
@@ -151,35 +182,35 @@ class DeserialisedStructure {
                     if (blocks[index][l] === undefined)
                         blocks[index][l] = [];
                     const toPut = [x, y];
-                    // const keys = Object.keys(block.args);
-                    const args = Block_js_1.default.getArgsAsArray(block);
-                    for (let a = 0, argsLen = args.length; a < argsLen; a++) {
-                        const arg = (args[a] instanceof Uint8Array) ? "\x00" + ((_a = args[a]) === null || _a === void 0 ? void 0 : _a.toString()) : args[a];
-                        let argIndex = argDone.get(arg);
+                    const blockArgs = Block_js_1.default.validateArgs(block);
+                    for (let a = 0, len = blockArgs.keys.length; a < len; a++) {
+                        const key = blockArgs.keys[a];
+                        const val = (blockArgs.values[a] instanceof Uint8Array) ? "\x00" + ((_a = blockArgs.values[a]) === null || _a === void 0 ? void 0 : _a.toString()) : blockArgs.values[a];
+                        let argIndex = argDone.get(val);
+                        let fieldIndex = fieldDone.get(key);
                         if (argIndex === undefined) {
-                            argIndex = argDone.set(arg, args.push(arg) - 1).get(arg);
+                            argIndex = argDone.set(val, argsMapping.push(val) - 1).get(val);
+                        }
+                        if (fieldIndex === undefined) {
+                            fieldIndex = fieldDone.set(key, fieldsMapping.push(key) - 1).get(key);
                         }
-                        if (argIndex === undefined)
+                        if (argIndex === undefined || fieldIndex === undefined)
                             throw Error("This should be impossible at this point, but left for type safety.");
-                        toPut[2 + a] = argIndex;
+                        // 0 - 2, 3
+                        // 1 - 4, 5
+                        // 2 - 6, 7
+                        toPut[2 + (a * 2)] = argIndex;
+                        toPut[2 + (a * 2) + 1] = fieldIndex;
                     }
-                    // for (let a = 0, argsLen = keys.length; a < argsLen; a++) {
-                    //     const arg = Buffer.isBuffer(block.args[keys[a]]) ? "\x00" + block.args[keys[a]].toString() : block.args[keys[a]];
-                    //     let argIndex = argDone.get(arg);
-                    //     if (argIndex === undefined) {
-                    //         argDone.set(arg, args.push(arg) - 1);
-                    //         argIndex = argDone.get(arg);
-                    //     }
-                    //     if (argIndex === undefined)
-                    //     toPut[2 + a] = argIndex;
-                    // }
                     blocks[index][l].push(toPut);
                 }
             }
         }
         return {
+            version: 2,
+            argsMapping,
+            fieldsMapping,
             mapping,
-            args,
             blocks
         };
     }
@@ -189,9 +220,9 @@ class DeserialisedStructure {
     toStruct() {
         const struct = this.getSerialisedBlocks();
         return {
+            version: 2,
             width: this.width,
             height: this.height,
-            version: 1,
             blocks: struct
         };
     }
@@ -254,4 +285,4 @@ class DeserialisedStructure {
     }
 }
 exports.DeserialisedStructure = DeserialisedStructure;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../lib/Structure.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../lib/Structure.ts"],"names":[],"mappings":"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"}

package/cm/util/Error.d.ts

@@ -43,9 +43,9 @@ export declare class LegacyIncorrectArgError extends Error {
      */
     arg: any;
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
-    field: AnyBlockField;
+    field?: AnyBlockField | undefined;
     constructor(msg: string, 
     /**
      * The offending block ID.
@@ -56,7 +56,7 @@ export declare class LegacyIncorrectArgError extends Error {
      */
     arg: any, 
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
-    field: AnyBlockField);
+    field?: AnyBlockField | undefined);
 }

package/cm/util/Error.js

@@ -40,7 +40,7 @@ class LegacyIncorrectArgError extends Error {
      */
     arg, 
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
     field) {
         super(msg);
@@ -50,4 +50,4 @@ class LegacyIncorrectArgError extends Error {
     }
 }
 exports.LegacyIncorrectArgError = LegacyIncorrectArgError;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbC9FcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxNQUFhLGlCQUFrQixTQUFRLEtBQUs7SUFNeEMsWUFBWSxHQUFXLEVBQUUsT0FBd0I7UUFDN0MsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ1gsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDM0IsQ0FBQztDQUNKO0FBVkQsOENBVUM7QUFFRCxNQUFhLDJCQUE0QixTQUFRLEtBQUs7SUFDbEQsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxXQUFtQjtJQUMxQjs7T0FFRztJQUNJLGVBQXVCO1FBRTlCLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQVZKLFlBQU8sR0FBUCxPQUFPLENBQWlCO1FBSXhCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBSW5CLG9CQUFlLEdBQWYsZUFBZSxDQUFRO0lBR2xDLENBQUM7Q0FDSjtBQWpCRCxrRUFpQkM7QUFFRCxNQUFhLHVCQUF3QixTQUFRLEtBQUs7SUFDOUMsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxHQUFRO0lBQ2Y7O09BRUc7SUFDSSxLQUFvQjtRQUUzQixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFWSixZQUFPLEdBQVAsT0FBTyxDQUFpQjtRQUl4QixRQUFHLEdBQUgsR0FBRyxDQUFLO1FBSVIsVUFBSyxHQUFMLEtBQUssQ0FBZTtJQUcvQixDQUFDO0NBQ0o7QUFqQkQsMERBaUJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbC9FcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxNQUFhLGlCQUFrQixTQUFRLEtBQUs7SUFNeEMsWUFBWSxHQUFXLEVBQUUsT0FBd0I7UUFDN0MsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ1gsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDM0IsQ0FBQztDQUNKO0FBVkQsOENBVUM7QUFFRCxNQUFhLDJCQUE0QixTQUFRLEtBQUs7SUFDbEQsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxXQUFtQjtJQUMxQjs7T0FFRztJQUNJLGVBQXVCO1FBRTlCLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQVZKLFlBQU8sR0FBUCxPQUFPLENBQWlCO1FBSXhCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBSW5CLG9CQUFlLEdBQWYsZUFBZSxDQUFRO0lBR2xDLENBQUM7Q0FDSjtBQWpCRCxrRUFpQkM7QUFFRCxNQUFhLHVCQUF3QixTQUFRLEtBQUs7SUFDOUMsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxHQUFRO0lBQ2Y7O09BRUc7SUFDSSxLQUFxQjtRQUU1QixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFWSixZQUFPLEdBQVAsT0FBTyxDQUFpQjtRQUl4QixRQUFHLEdBQUgsR0FBRyxDQUFLO1FBSVIsVUFBSyxHQUFMLEtBQUssQ0FBZ0I7SUFHaEMsQ0FBQztDQUNKO0FBakJELDBEQWlCQyJ9

package/esm/Block.d.ts

@@ -39,6 +39,26 @@ export default class Block {
      */
     static getArgsAsArray(block: Block): BlockArg[];
     static getArgsAsArray(bId: number, args?: Record<string, BlockArg>): BlockArg[];
+    /**
+     * Checks if all required fields are present, it will also check if there are extra fields that are not used.
+     *
+     * Returns an object with two lists: values and keys. The indexes of values also point to keys.
+     *
+     * For example:
+     * ```js
+     * { values: [3, "Text is awesome."], keys: ["rotation", "text"] }
+     * ```
+     *
+     * NOTE: This will not error if a required field is missing. This also doesn't validate string against patterns for now.
+     */
+    static validateArgs(block: Block): {
+        values: BlockArg[];
+        keys: string[];
+    };
+    static validateArgs(bId: number, args?: Record<string, BlockArg>): {
+        values: BlockArg[];
+        keys: string[];
+    };
     /**
      * This is sort of for internal use,
      * this will convert the packet form of fields

package/esm/Block.js

@@ -1,6 +1,6 @@
 import { PWApiClient } from "pw-js-api";
 import { LegacyIncorrectArgError, LegacyIncorrectArgsLenError, MissingBlockError } from "./util/Error.js";
-import { compareObjs, listedFieldTypeToGameType } from "./util/Misc.js";
+import { compareObjs, listedFieldTypeToGameType, map } from "./util/Misc.js";
 export default class Block {
     /**
      * @param bId ID of the block, can be the current numeric block ID, or string ID (from /listblocks).
@@ -63,9 +63,12 @@ export default class Block {
             args !== null && args !== void 0 ? args : (args = bId.args);
             bId = bId.bId;
         }
-        if (args === undefined)
-            return {};
         const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${map(fields, v => v.Name).join(", ")}.`);
+            return [];
+        }
         const obj = {};
         for (let i = 0, len = fields.length; i < len; i++) {
             const f = fields[i];
@@ -84,13 +87,16 @@ export default class Block {
     }
     static getArgsAsArray(bId, args) {
         if (bId instanceof Block) {
-            args = bId.args;
+            args !== null && args !== void 0 ? args : (args = bId.args);
             bId = bId.bId;
         }
-        if (args === undefined)
-            return [];
         const arr = [];
         const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${map(fields, v => v.Name).join(", ")}.`);
+            return [];
+        }
         for (let i = 0, len = fields.length; i < len; i++) {
             const f = fields[i];
             const val = args[f.Name];
@@ -102,6 +108,60 @@ export default class Block {
         }
         return arr;
     }
+    static validateArgs(bId, args) {
+        var _a;
+        if (bId instanceof Block) {
+            args !== null && args !== void 0 ? args : (args = bId.args);
+            bId = bId.bId;
+        }
+        const obj = { keys: [], values: [] };
+        const fields = Block.getFieldsByBlockId(bId);
+        if (args === undefined) {
+            if (fields.length > 0)
+                throw Error(`Missing arguments: ${map(fields, v => v.Name).join(", ")}.`);
+            return obj;
+        }
+        const argNames = Object.keys(args);
+        for (let i = 0, len = fields.length; i < len; i++) {
+            const f = fields[i];
+            const val = args[f.Name];
+            if (f.Required === true && val === undefined)
+                throw Error(`Missing required argument: ${f.Name} (Type: ${f.Type})`);
+            ;
+            // else if (f.Required === false && args[f.Name] === undefined) arr.push(undefined);
+            if (val !== undefined)
+                switch (f.Type) {
+                    case "String":
+                        if (typeof val !== "string")
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        break;
+                    case "Int32":
+                    case "UInt32":
+                        if (typeof val !== "number")
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        if ((_a = f.ExcludedValues) === null || _a === void 0 ? void 0 : _a.includes(val))
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' value is in the excluded values`, bId, val);
+                        if (f.MinValue > val)
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' value lower than the minimum value (${f.MinValue})`, bId, val);
+                        if (f.MaxValue < val)
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' value lower than the maximum value (${f.MaxValue})`, bId, val);
+                        break;
+                    case "Boolean":
+                        if (typeof val !== "boolean")
+                            throw new LegacyIncorrectArgError(`Argument '${f.Name}' is not of correct type (${f.Type})`, bId, val);
+                        break;
+                }
+            for (let j = 0; j < argNames.length; j++) {
+                if (argNames[j] === f.Name) {
+                    obj.keys.push(f.Name);
+                    obj.values.push(val);
+                    argNames.splice(j, 1);
+                    break;
+                }
+            }
+        }
+        return obj;
+    }
     /**
      * This is sort of for internal use,
      * this will convert the packet form of fields
@@ -227,4 +287,4 @@ export default class Block {
         return (_b = (_a = PWApiClient.listBlocksObj) === null || _a === void 0 ? void 0 : _a[paletteId].Fields) !== null && _b !== void 0 ? _b : [];
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Block.js","sourceRoot":"","sources":["../lib/Block.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4C,WAAW,EAAkB,MAAM,WAAW,CAAC;AAClG,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,KAAK;IAiBtB;;;OAGG;IACH,YAAY,GAAgC,EAAE,IAA4C;QAnB1F;;;;WAIG;QACH,SAAI,GAA6B,EAAE,CAAC;QAehC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;aACvC,CAAC;YACF,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACP,iBAAiB;YACjB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAElD,gDAAgD;gBAEhD,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;oBAAE,MAAM,IAAI,2BAA2B,CAAC,6DAA6D,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE9K,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChD,oCAAoC;oBACpC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBACxB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBAEpB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ;2BAC/C,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,GAAG,KAAK,SAAS;2BACpD,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,GAAG,KAAK,QAAQ;2BACjD,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ;wBAAE,MAAM,IAAI,uBAAuB,CAAC,uCAAuC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;oBAC5J,oBAAoB;oBAEpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;gBAChC,CAAC;YACL,CAAC;;gBAAM,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAC5B,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAuF;QAC7F,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAEvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,OAAO;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7C,CAAC;IASD,MAAM,CAAC,eAAe,CAAC,GAAmB,EAAE,IAA+B;QACvE,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACvB,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,GAAG,CAAC,IAAI,EAAC;YAClB,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QAClB,CAAC;QAED,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE7C,MAAM,GAAG,GAA2E,EAAE,CAAC;QAEvF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAEpB,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS;gBAAE,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;iBAC/G,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS;gBAAE,SAAS;YAEtE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG;gBACV,KAAK,EAAE;oBACH,IAAI,EAAE,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC;oBACvC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;iBACoB;aAC9C,CAAA;QACL,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAMD,MAAM,CAAC,cAAc,CAAC,GAAmB,EAAE,IAA+B;QACtE,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YAChB,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QAClB,CAAC;QAED,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,GAAG,GAAc,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAEzB,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;gBAAE,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;iBACtG,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEjF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,IAA6E;QAC/F,MAAM,GAAG,GAA4B,EAAE,CAAC;QAExC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;YAEtB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBACf,QAAQ;gBACJ,wBAAwB;gBAC5B,KAAK,WAAW;oBACZ,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,sBAAsB;oBAClD,MAAM;gBACV,KAAK,gBAAgB,CAAC;gBAAC,KAAK,aAAa,CAAC;gBAC1C,KAAK,aAAa,CAAC;gBAAC,KAAK,YAAY;oBACjC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAgE,CAAC;YAC5F,CAAC;QACL,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAQD,QAAQ,CAAC,GAAqB,EAAE,CAAS,EAAE,KAAiB;QACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,GAAG,CAAC;oBACH,CAAC,EAAE,GAAG,EAAE,CAAC;iBACZ,CAAC,CAAC;YAEH,KAAK,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC,CAAC;QACvB,CAAC;;YAAM,KAAK,GAAG,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,CAAC,CAAC;QAEtB,OAAO;YACH,eAAe,EAAE,KAAK;YACtB,OAAO,EAAE,IAAI,CAAC,GAAG;YACjB,KAAK;YACL,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC;YACnC,+GAA+G;SACpF,CAAC;IACpC,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,IAAI;;QACJ,MAAM,KAAK,GAAG,MAAA,WAAW,CAAC,UAAU,0CAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjD,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,IAAI,iBAAiB,CAAC,0DAA0D,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3H,OAAO,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACzC,CAAC;IAOD,KAAK,CAAC,GAAG,GAAG,KAAK;QACb,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAE7E,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9B,CAAC,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,CAAC,CAAQ;QACd,OAAO,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG;eACd,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,WAAW,CAAC,SAAiB;;QAChC,MAAM,KAAK,GAAG,MAAA,WAAW,CAAC,aAAa,0CAAG,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;QAEnE,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,IAAI,iBAAiB,CAAC,0DAA0D,EAAE,SAAS,CAAC,CAAC;QAE5H,OAAO,KAAK,CAAC,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAe;;QACnC,MAAM,KAAK,GAAG,MAAA,WAAW,CAAC,UAAU,0CAAG,OAAO,CAAC,CAAC;QAEhD,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,IAAI,iBAAiB,CAAC,0DAA0D,EAAE,OAAO,CAAC,CAAC;QAE1H,OAAO,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACzC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAe;;QACrC,OAAO,MAAA,MAAA,WAAW,CAAC,UAAU,0CAAG,OAAO,EAAE,MAAM,mCAAI,EAAE,CAAC;IAC1D,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAiB;;QACzC,OAAO,MAAA,MAAA,WAAW,CAAC,aAAa,0CAAG,SAAS,EAAE,MAAM,mCAAI,EAAE,CAAC;IAC/D,CAAC;CACJ"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Block.js","sourceRoot":"","sources":["../lib/Block.ts"],"names":[],"mappings":"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"}

package/esm/Structure.d.ts

@@ -39,7 +39,7 @@ export declare class DeserialisedStructure {
      *
      * NOTE: This requires you to have called API getlistblocks (unless you have joined the world)
      */
-    getSerialisedBlocks(): IStructureBlocks;
+    getSerialisedBlocks(): IStructureBlocksV2;
     /**
      * This will return the structure form, giving you the freedom to choose your own way of saving.
      */
@@ -75,11 +75,12 @@ export declare class DeserialisedStructure {
      */
     toPackets(x: number, y: number, helper: PWGameWorldHelper): SendableBlockPacket[];
 }
-export interface IStructure {
+export type IStructure = IStructureV1 | IStructureV2;
+export interface IStructureV1 {
     /**
      * Version of the structure object, not the world.
      */
-    version: number;
+    version: 1;
     /**
      * The maximum width of the structure.
      */
@@ -91,11 +92,30 @@ export interface IStructure {
     /**
      * Object containing the mappings and the blocks.
      */
-    blocks: IStructureBlocks;
+    blocks: IStructureBlocksV1;
 }
-export interface IStructureBlocks {
+export interface IStructureV2 {
     /**
-     * Index starts at 0, this is the mapping of blocks (in block name ids in UPPER_CASE)
+     * Version of the structure object, not the world.
+     */
+    version: 2;
+    /**
+     * The maximum width of the structure.
+     */
+    width: number;
+    /**
+     * The maximum height of the structure.
+     */
+    height: number;
+    /**
+     * Object containing the mappings and the blocks.
+     */
+    blocks: IStructureBlocksV2;
+}
+export type IStructureBlocks = IStructureBlocksV1 | IStructureBlocksV2;
+export interface IStructureBlocksV1 {
+    /**
+     * Index starts at 0, this is the mapping of palette IDs (block name ids in UPPER_CASE)
      */
     mapping: string[];
     /**
@@ -107,8 +127,49 @@ export interface IStructureBlocks {
      * (while impossible, it's for possible compatibility with mirrored blocks, foreground block in background layer etc)
      *
      * If argMapping exists in a block, it'll be an index that corresponds to the block's arguments in args array.
+     */
+    blocks: [
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][],
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][],
+        [
+            x: number,
+            y: number,
+            ...argMapping: number[]
+        ][]
+    ][];
+}
+export interface IStructureBlocksV2 {
+    /**
+     * Version of the structured blocks.
+     */
+    version: 2;
+    /**
+     * Index starts at 0, this is the mapping of palette IDs (block name ids in UPPER_CASE)
+     */
+    mapping: string[];
+    /**
+     * Index starts at 0, this is the mapping of field names (for example, a portal block will have "rotation" and "id" so 0 - rotation, 1 - id)
+     */
+    fieldsMapping: string[];
+    /**
+     * Index starts at 0, this is the mapping of args in blocks, after the y (see blocks for further desc)
+     */
+    argsMapping: BlockArg[];
+    /**
+     * If array, it's index corresponds to the mapping, the element will be array of locations and args indexed by layers
+     * (while impossible, it's for possible compatibility with mirrored blocks, foreground block in background layer etc)
      *
-     * If string, it's the encoded version of the object, use atob then JSON parse.
+     * If argMapping exists in a block, there will be 2 elements for every arg
+     * - 1st is the pointer to the field/arg value in argsMapping.
+     * - 2nd is the pointer to the field/arg name in fieldsMapping.
      */
     blocks: [
         [

package/esm/Structure.js

@@ -1,5 +1,6 @@
 import Block from "./Block.js";
-import { createBlockPackets } from "./util/Misc.js";
+import { createBlockPackets, find } from "./util/Misc.js";
+import { LegacyIncorrectArgError } from "./util/Error.js";
 /**
  * This is external to the main Helper, it will allow developers to use the structure without needing to use helper if they so wish.
  *
@@ -19,10 +20,14 @@ export default class StructureHelper {
             data = JSON.parse(decoder.decode(data));
         }
         const json = "version" in data ? data : JSON.parse(data.toString());
-        if (json.version === undefined || json.version < 1 || json.version > 1)
-            throw Error("Unknown file format");
-        const desed = this.deserialiseStructBlocks(json.blocks, json.width, json.height);
-        return new DeserialisedStructure(desed.blocks, { width: desed.width, height: desed.height });
+        switch (json.version) {
+            case 1:
+            case 2:
+                const desed = this.deserialiseStructBlocks(json.blocks, json.width, json.height);
+                return new DeserialisedStructure(desed.blocks, { width: desed.width, height: desed.height });
+            default:
+                throw Error("Unknown file format");
+        }
     }
     /**
      * If width or height are not provided, the structure may be trimmed (empty blocks).
@@ -32,7 +37,6 @@ export default class StructureHelper {
     static deserialiseStructBlocks(struct, width, height) {
         var _a, _b, _c, _d, _e, _f;
         var _g, _h, _j, _k, _l, _m;
-        const { args, blocks, mapping } = struct;
         const deBlocks = [[], [], []];
         let isMissing = width === undefined || height === undefined;
         if (width !== undefined && height !== undefined) {
@@ -48,6 +52,22 @@ export default class StructureHelper {
             }
         }
         let big = { x: 0, y: 0 };
+        const { blocks, mapping } = struct;
+        // TODO: if v3 is created in the future, this will require a significant code revamp but for now this will work
+        let version = -1;
+        let argsMapping;
+        let fieldsMapping = [];
+        if ("version" in struct) {
+            // TODO: change if v3 or above
+            version = struct.version;
+            argsMapping = struct.argsMapping;
+            fieldsMapping = struct.fieldsMapping;
+        }
+        else {
+            // legacy support
+            argsMapping = struct.args;
+            version = 1;
+        }
         for (let i = 0, ien = blocks.length; i < ien; i++) {
             // While foreground and background layers are only supported for now, it's possible there are more layers in the future.
             for (let l = 0, len = blocks[i].length; l < len; l++) {
@@ -68,10 +88,19 @@ export default class StructureHelper {
                     const deBlock = deBlocks[l][block[0]][block[1]] = new Block(mapping[i]);
                     const fields = Block.getFieldsByBlockId(deBlock.bId);
                     for (let a = 2, alen = block.length; a < alen; a++) {
-                        let arg = args[block[a]];
-                        const field = fields[a - 2];
+                        let arg = argsMapping[block[a]];
+                        let field;
+                        if (version > 1) {
+                            const fieldName = fieldsMapping[block[++a]];
+                            field = find(fields, v => v.Name === fieldName);
+                            if (field === undefined)
+                                throw new LegacyIncorrectArgError(`The field '${fieldName}' no longer exists for block '${mapping[i]}'`, deBlock.bId, fieldName);
+                        }
+                        else {
+                            field = fields[a - 2];
+                        }
                         if (typeof arg === "string" && arg.startsWith("\x00"))
-                            arg = Uint8Array.from(arg.slice(1));
+                            arg = Uint8Array.from(arg.slice(1).split(","));
                         else {
                             switch (field.Type) {
                                 case "Boolean":
@@ -82,7 +111,7 @@ export default class StructureHelper {
                                     break; // legacy support: world portal ids are now string.
                             }
                         }
-                        deBlock.args[fields[a - 2].Name] = arg;
+                        deBlock.args[field.Name] = arg;
                     }
                 }
             }
@@ -126,11 +155,13 @@ export class DeserialisedStructure {
     getSerialisedBlocks() {
         var _a;
         const blocks = [];
-        const args = [];
+        const argsMapping = [];
+        const fieldsMapping = [];
         const mapping = [];
         // corresponds to the index in mapping array.
-        const mappingDone = {};
         const argDone = new Map();
+        const fieldDone = new Map();
+        const mappingDone = {};
         for (let l = 0; l < this.blocks.length; l++) {
             for (let x = 0; x < this.width; x++) {
                 for (let y = 0; y < this.height; y++) {
@@ -146,35 +177,35 @@ export class DeserialisedStructure {
                     if (blocks[index][l] === undefined)
                         blocks[index][l] = [];
                     const toPut = [x, y];
-                    // const keys = Object.keys(block.args);
-                    const args = Block.getArgsAsArray(block);
-                    for (let a = 0, argsLen = args.length; a < argsLen; a++) {
-                        const arg = (args[a] instanceof Uint8Array) ? "\x00" + ((_a = args[a]) === null || _a === void 0 ? void 0 : _a.toString()) : args[a];
-                        let argIndex = argDone.get(arg);
+                    const blockArgs = Block.validateArgs(block);
+                    for (let a = 0, len = blockArgs.keys.length; a < len; a++) {
+                        const key = blockArgs.keys[a];
+                        const val = (blockArgs.values[a] instanceof Uint8Array) ? "\x00" + ((_a = blockArgs.values[a]) === null || _a === void 0 ? void 0 : _a.toString()) : blockArgs.values[a];
+                        let argIndex = argDone.get(val);
+                        let fieldIndex = fieldDone.get(key);
                         if (argIndex === undefined) {
-                            argIndex = argDone.set(arg, args.push(arg) - 1).get(arg);
+                            argIndex = argDone.set(val, argsMapping.push(val) - 1).get(val);
+                        }
+                        if (fieldIndex === undefined) {
+                            fieldIndex = fieldDone.set(key, fieldsMapping.push(key) - 1).get(key);
                         }
-                        if (argIndex === undefined)
+                        if (argIndex === undefined || fieldIndex === undefined)
                             throw Error("This should be impossible at this point, but left for type safety.");
-                        toPut[2 + a] = argIndex;
+                        // 0 - 2, 3
+                        // 1 - 4, 5
+                        // 2 - 6, 7
+                        toPut[2 + (a * 2)] = argIndex;
+                        toPut[2 + (a * 2) + 1] = fieldIndex;
                     }
-                    // for (let a = 0, argsLen = keys.length; a < argsLen; a++) {
-                    //     const arg = Buffer.isBuffer(block.args[keys[a]]) ? "\x00" + block.args[keys[a]].toString() : block.args[keys[a]];
-                    //     let argIndex = argDone.get(arg);
-                    //     if (argIndex === undefined) {
-                    //         argDone.set(arg, args.push(arg) - 1);
-                    //         argIndex = argDone.get(arg);
-                    //     }
-                    //     if (argIndex === undefined)
-                    //     toPut[2 + a] = argIndex;
-                    // }
                     blocks[index][l].push(toPut);
                 }
             }
         }
         return {
+            version: 2,
+            argsMapping,
+            fieldsMapping,
             mapping,
-            args,
             blocks
         };
     }
@@ -184,9 +215,9 @@ export class DeserialisedStructure {
     toStruct() {
         const struct = this.getSerialisedBlocks();
         return {
+            version: 2,
             width: this.width,
             height: this.height,
-            version: 1,
             blocks: struct
         };
     }
@@ -248,4 +279,4 @@ export class DeserialisedStructure {
         return createBlockPackets(blockies);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../lib/Structure.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../lib/Structure.ts"],"names":[],"mappings":"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"}

package/esm/util/Error.d.ts

@@ -43,9 +43,9 @@ export declare class LegacyIncorrectArgError extends Error {
      */
     arg: any;
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
-    field: AnyBlockField;
+    field?: AnyBlockField | undefined;
     constructor(msg: string, 
     /**
      * The offending block ID.
@@ -56,7 +56,7 @@ export declare class LegacyIncorrectArgError extends Error {
      */
     arg: any, 
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
-    field: AnyBlockField);
+    field?: AnyBlockField | undefined);
 }

package/esm/util/Error.js

@@ -35,7 +35,7 @@ export class LegacyIncorrectArgError extends Error {
      */
     arg, 
     /**
-     * The expected field.
+     * The expected field. This may be undefined if it no longer exists.
      */
     field) {
         super(msg);
@@ -44,4 +44,4 @@ export class LegacyIncorrectArgError extends Error {
         this.field = field;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbC9FcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8saUJBQWtCLFNBQVEsS0FBSztJQU14QyxZQUFZLEdBQVcsRUFBRSxPQUF3QjtRQUM3QyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDWCxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUMzQixDQUFDO0NBQ0o7QUFFRCxNQUFNLE9BQU8sMkJBQTRCLFNBQVEsS0FBSztJQUNsRCxZQUFZLEdBQVc7SUFDbkI7O09BRUc7SUFDSSxPQUF3QjtJQUMvQjs7T0FFRztJQUNJLFdBQW1CO0lBQzFCOztPQUVHO0lBQ0ksZUFBdUI7UUFFOUIsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBVkosWUFBTyxHQUFQLE9BQU8sQ0FBaUI7UUFJeEIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFJbkIsb0JBQWUsR0FBZixlQUFlLENBQVE7SUFHbEMsQ0FBQztDQUNKO0FBRUQsTUFBTSxPQUFPLHVCQUF3QixTQUFRLEtBQUs7SUFDOUMsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxHQUFRO0lBQ2Y7O09BRUc7SUFDSSxLQUFvQjtRQUUzQixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFWSixZQUFPLEdBQVAsT0FBTyxDQUFpQjtRQUl4QixRQUFHLEdBQUgsR0FBRyxDQUFLO1FBSVIsVUFBSyxHQUFMLEtBQUssQ0FBZTtJQUcvQixDQUFDO0NBQ0oifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbC9FcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8saUJBQWtCLFNBQVEsS0FBSztJQU14QyxZQUFZLEdBQVcsRUFBRSxPQUF3QjtRQUM3QyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDWCxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUMzQixDQUFDO0NBQ0o7QUFFRCxNQUFNLE9BQU8sMkJBQTRCLFNBQVEsS0FBSztJQUNsRCxZQUFZLEdBQVc7SUFDbkI7O09BRUc7SUFDSSxPQUF3QjtJQUMvQjs7T0FFRztJQUNJLFdBQW1CO0lBQzFCOztPQUVHO0lBQ0ksZUFBdUI7UUFFOUIsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBVkosWUFBTyxHQUFQLE9BQU8sQ0FBaUI7UUFJeEIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFJbkIsb0JBQWUsR0FBZixlQUFlLENBQVE7SUFHbEMsQ0FBQztDQUNKO0FBRUQsTUFBTSxPQUFPLHVCQUF3QixTQUFRLEtBQUs7SUFDOUMsWUFBWSxHQUFXO0lBQ25COztPQUVHO0lBQ0ksT0FBd0I7SUFDL0I7O09BRUc7SUFDSSxHQUFRO0lBQ2Y7O09BRUc7SUFDSSxLQUFxQjtRQUU1QixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFWSixZQUFPLEdBQVAsT0FBTyxDQUFpQjtRQUl4QixRQUFHLEdBQUgsR0FBRyxDQUFLO1FBSVIsVUFBSyxHQUFMLEtBQUssQ0FBZ0I7SUFHaEMsQ0FBQztDQUNKIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pw-js-world",
-  "version": "0.4.5-dev.85d024b",
+  "version": "0.4.5-dev.e92914f",
   "description": "An optional package for PW-JS-Api, aims to serve world purposes.",
   "exports": {
     "types": "./esm/index.js",