v1.6.0

Canopy[BP]/manifest.json

@@ -1,18 +1,18 @@
 {
 	"format_version": 2,
 	"header": {
-		"name": "Canopy [BP] v1.5.7",
+		"name": "Canopy [BP] v1.6.0",
 		"description": "Technical informatics & features addon by §aForestOfLight§r.",
 		"uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
 		"version": [
 			1,
-			5,
-			7
+			6,
+			0
 		],
 		"min_engine_version": [
 			1,
 			26,
-			30
+			40
 		]
 	},
 	"modules": [
@@ -42,7 +42,7 @@
 	"dependencies": [
 		{
 			"module_name": "@minecraft/server",
-			"version": "2.9.0-beta"
+			"version": "2.10.0-beta"
 		},
 		{
 			"module_name": "@minecraft/server-ui",
@@ -52,12 +52,16 @@
 			"module_name": "@minecraft/debug-utilities",
 			"version": "1.0.0-beta"
 		},
+		{
+			"module_name": "@minecraft/server-gametest",
+			"version": "1.0.0-beta"
+		},
 		{
 			"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
 			"version": [
 				1,
-				5,
-				7
+				6,
+				0
 			]
 		}
 	],

Canopy[BP]/scripts/constants.js

@@ -1,4 +1,4 @@
-const PACK_VERSION = '1.5.7';
-const MC_VERSION = '1.26.30.5';
+const PACK_VERSION = '1.6.0';
+const MC_VERSION = '1.26.40.5';
 
 export { PACK_VERSION, MC_VERSION };

Canopy[BP]/scripts/include/utils.js

@@ -281,7 +281,7 @@ export function getNameFromEntityId(id) {
 	let entityName = id;
 	try {
 		const entity = world.getEntity(id);
-		entityName = entity?.name || entity?.nameTag || entityName;
+		entityName = entity?.name || entity?.nameTag || id;
 	} catch (error) {
 		if (!error.message.includes("is invalid") && error.name !== 'InvalidArgumentError')
 			throw error;

Canopy[BP]/scripts/lib/SRCItemDatabase/ItemDatabase.js

@@ -13,10 +13,21 @@ class AsyncQueue {
         this.processing = false;
     }
     enqueue(callback) {
-        this.queue.push(callback);
-        if (!this.processing) {
-            this.dequeue();
-        }
+        return new Promise((resolve, reject) => {
+            this.queue.push(async () => {
+                try {
+                    const result = await callback();
+                    resolve(result);
+                    return result;
+                } catch (error) {
+                    reject(error);
+                    throw error;
+                }
+            });
+            if (!this.processing) {
+                this.dequeue();
+            }
+        });
     }
     async dequeue() {
         if (this.processing || this.queue.length === 0) return;
@@ -78,8 +89,7 @@ class SRCItemDatabase {
     async set(key, itemStack) {
         if (key.length > 12)
             throw new Error(`The provided key "${key}" exceeds the maximum allowed length of 12 characters (actual length: ${key.length}).`);
-        let success = false;
-        this.asyncQueue.enqueue(() => {
+        return this.asyncQueue.enqueue(() => {
             const newId = this.table + key, existingStructure = world.structureManager.get(newId), location = SRCItemDatabase.location;
             if (existingStructure) {
                 world.structureManager.delete(newId);
@@ -98,9 +108,8 @@ class SRCItemDatabase {
             const structureIds = Array.from(Databases.structureIds.get(this.table) ?? []);
             structureIds.push(newId);
             Databases.structureIds.set(this.table, structureIds);
-            success = true;
+            return true;
         });
-        return success;
     };
     setMany(items) { return items.map(item => this.set(item.key, item.item)) };
     getAsync(key) {
@@ -139,7 +148,6 @@ class SRCItemDatabase {
     setItems(key, items) {
         if (key.length > 12)
             throw new Error(`The provided key "${key}" exceeds the maximum allowed length of 12 characters (actual length: ${key.length}).`);
-        let success = false;
         return this.asyncQueue.enqueue(() => {
             const newId = this.table + key, existingStructure = world.structureManager.get(newId);
             if (existingStructure) {
@@ -157,21 +165,21 @@ class SRCItemDatabase {
                 saveMode: this.saveMode
             });
             itemMemory.set(newId, items);
-            Databases.structureIds.set(this.table, Array.from(Databases.structureIds.get(this.table) ?? []).push(newId));
-            success = true;
-            return success;
+            const structureIds = Array.from(Databases.structureIds.get(this.table) ?? []).filter(id => id !== newId);
+            structureIds.push(newId);
+            Databases.structureIds.set(this.table, structureIds);
+            return true;
         });
     }
     getItems(key) {
         if (key.length > 12)
             throw new Error(`The provided key "${key}" exceeds the maximum allowed length of 12 characters (actual length: ${key.length}).`);
         const newId = this.table + key, location = SRCItemDatabase.location;
-        if (!itemMemory.get(newId)) return [];
         if (!world.structureManager.get(newId)) return [];
         SRCItemDatabase.dimension.getEntities({ type: 'minecraft:item', location, maxDistance: 3 }).forEach(item => item.remove())
         world.structureManager.place(newId, SRCItemDatabase.dimension, location, { includeBlocks: false, includeEntities: true });
         const items = SRCItemDatabase.dimension.getEntities({ type: 'minecraft:item', location: location, maxDistance: 3 });
-        if (items.length === 0) return undefined;
+        if (items.length === 0) return [];
         const itemStacksArray = [];
         for (const item of items) {
             itemStacksArray.push(item.getComponent(EntityItemComponent.componentId).itemStack);

Canopy[BP]/scripts/lib/canopy/commands/BlockCommandOrigin.js

@@ -2,6 +2,10 @@ import { CommandOrigin } from "./CommandOrigin";
 import { FeedbackMessageType } from "./FeedbackMessageType";
 
 export class BlockCommandOrigin extends CommandOrigin {
+    getName() {
+        return 'Command Block';
+    }
+
     getSource() {
         return this.source.sourceBlock;
     }

Canopy[BP]/scripts/lib/canopy/commands/CommandOrigin.js

@@ -9,6 +9,10 @@ export class CommandOrigin {
         return this.source.sourceType;
     }
 
+    getName() {
+        throw new Error("getName() not implemented");
+    }
+
     getSource() {
         throw new Error("getSource() not implemented");
     }

Canopy[BP]/scripts/lib/canopy/commands/EntityCommandOrigin.js

@@ -2,6 +2,11 @@ import { CommandOrigin } from "./CommandOrigin";
 import { FeedbackMessageType } from "./FeedbackMessageType";
 
 export class EntityCommandOrigin extends CommandOrigin {
+    getName() {
+        const source = this.getSource();
+        return source.nameTag || source.typeId;
+    }
+
     getSource() {
         return this.source.sourceEntity;
     }

Canopy[BP]/scripts/lib/canopy/commands/PlayerCommandOrigin.js

@@ -6,6 +6,10 @@ export class PlayerCommandOrigin extends CommandOrigin {
         return "Player";
     }
 
+    getName() {
+        return this.getSource().name;
+    }
+
     getSource() {
         return this.source.sourceEntity;
     }

Canopy[BP]/scripts/lib/canopy/commands/ServerCommandOrigin.js

@@ -2,6 +2,10 @@ import { CommandOrigin } from "./CommandOrigin";
 import { FeedbackMessageType } from "./FeedbackMessageType";
 
 export class ServerCommandOrigin extends CommandOrigin {
+    getName() {
+        return "Server";
+    }
+
     getSource() {
         return this.source.sourceType;
     }

Canopy[BP]/scripts/lib/canopy/commands/VanillaCommand.js

@@ -1,4 +1,4 @@
-import { CustomCommandSource, CustomCommandStatus, Player, system } from "@minecraft/server";
+import { CustomCommandError, CustomCommandErrorReason, CustomCommandSource, CustomCommandStatus, Player, system } from "@minecraft/server";
 import { Rules } from "../rules/Rules";
 import { VanillaCommands } from "./VanillaCommands";
 import { BlockCommandOrigin } from "./BlockCommandOrigin";
@@ -48,8 +48,18 @@ export class VanillaCommand {
 
     registerEnums(customCommandRegistry) {
         if (this.customCommand.enums) {
-            for (const customEnum of this.customCommand.enums)
-                customCommandRegistry.registerEnum(customEnum.name, customEnum.values);
+            for (const customEnum of this.customCommand.enums) {
+                const values = typeof customEnum.values === 'function'
+                    ? customEnum.values()
+                    : customEnum.values;
+                try {
+                    customCommandRegistry.registerEnum(customEnum.name, values);
+                } catch (error) {
+                    if (error instanceof CustomCommandError && error.reason === CustomCommandErrorReason.AlreadyRegistered)
+                        continue;
+                    throw error;
+                }
+            }
         }
     }
 

Canopy[BP]/scripts/lib/canopy/rules/Rules.js

@@ -6,10 +6,11 @@ class Rules {
     static worldLoaded = false;
 
     static async register(rule) {
+        const ruleID = rule.getID();
         if (this.worldLoaded) {
-            if (this.exists(rule.getID())) 
-                throw new Error(`[Canopy] Rule with identifier '${rule.getID()}' already exists.`);
-            this.#rules[rule.getID()] = rule;
+            if (this.exists(ruleID)) 
+                throw new Error(`[Canopy] Rule with identifier '${ruleID}' already exists.`);
+            this.#rules[ruleID] = rule;
             if (rule.getCategory() === "Rules") {
                 await Promise.resolve();
                 const value = await rule.getValue();
@@ -19,6 +20,9 @@ class Rules {
                     rule.onModify(value);
             }
         } else {
+            const alreadyQueued = this.rulesToRegister.some(queuedRule => queuedRule.getID() === ruleID);
+            if (alreadyQueued || this.exists(ruleID))
+                return;
             this.rulesToRegister.push(rule);
         }
     }
@@ -79,6 +83,17 @@ class Rules {
         return this.getAll().filter(rule => rule.getCategory() === category);
     }
 
+    static getRuleIDsByCategory(category) {
+        const registered = this.getByCategory(category);
+        const queued = this.rulesToRegister.filter(rule => rule.getCategory() === category);
+        const ids = new Set([...registered, ...queued].map(rule => rule.getID()));
+        return [...ids];
+    }
+
+    static getSettableRuleIDs() {
+        return this.getRuleIDsByCategory("Rules");
+    }
+
     static registerQueuedRules() {
         for (const rule of this.rulesToRegister)
             this.register(rule);

Canopy[BP]/scripts/lib/jsep/README.md

@@ -0,0 +1,7 @@
+# jsep (vendored)
+
+Vendored ESM build of [jsep](https://github.com/EricSmekens/jsep) v1.4.0, copied from
+`node_modules/jsep/dist/jsep.js`. Do not edit. Used by
+`src/classes/analyzearea/ExpressionEvaluator.js` to parse block-analysis expressions.
+
+To update: `npm install jsep@<version>` then copy `dist/jsep.js` here.