v1.5.3

.vscode/tasks.json

@@ -18,7 +18,32 @@
         {
             "label": "regolith: watch",
             "type": "shell",
-            "command": "regolith watch",
+            "command": "regolith watch default",
+            "isBackground": true,
+            "problemMatcher": {
+                "pattern": [
+                    {
+                        "regexp": ".",
+                        "file": 1,
+                        "location": 2,
+                        "message": 3
+                    }
+                ],
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": ".",
+                    "endsPattern": "."
+                }
+            },
+            "presentation": {
+                "echo": true,
+                "close": true
+            }
+        },
+        {
+            "label": "regolith: watch preview",
+            "type": "shell",
+            "command": "regolith watch preview",
             "isBackground": true,
             "problemMatcher": {
                 "pattern": [

Canopy [BP]/manifest.json

@@ -1,11 +1,11 @@
 {
 	"format_version": 2,
 	"header": {
-		"name": "Canopy [BP] v1.5.2",
+		"name": "Canopy [BP] v1.5.3",
 		"description": "Technical informatics & features addon by §aForestOfLight§r.",
 		"uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
-		"version": [1, 5, 2],
-		"min_engine_version": [1, 21, 130]
+		"version": [1, 5, 3],
+		"min_engine_version": [1, 26, 0]
 	},
 	"modules": [
 		{
@@ -26,7 +26,7 @@
 	"dependencies": [
 		{
 			"module_name": "@minecraft/server",
-			"version": "2.5.0-beta"
+			"version": "2.6.0-beta"
 		},
 		{
 			"module_name": "@minecraft/server-ui",
@@ -38,7 +38,7 @@
 		},
 		{
 			"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
-			"version": [1, 5, 2]
+			"version": [1, 5, 3]
 		}
 	],
 	"metadata": {

Canopy [BP]/scripts/constants.js

@@ -1,4 +1,4 @@
-const PACK_VERSION = '1.5.2';
-const MC_VERSION = '1.21.130.3';
+const PACK_VERSION = '1.5.3';
+const MC_VERSION = '1.26.0.2';
 
 export { PACK_VERSION, MC_VERSION };

Canopy [BP]/scripts/lib/MCBE-IPC/ipc.js

@@ -306,16 +306,18 @@ export var PROTO;
     function Array(value) {
         return {
             *serialize(array, stream) {
+                const actualValue = typeof value === 'function' ? value() : value;
                 yield* PROTO.UVarInt32.serialize(array.length, stream);
                 for (const item of array) {
-                    yield* value.serialize(item, stream);
+                    yield* actualValue.serialize(item, stream);
                 }
             },
             *deserialize(stream) {
+                const actualValue = typeof value === 'function' ? value() : value;
                 const result = [];
                 const length = yield* PROTO.UVarInt32.deserialize(stream);
                 for (let i = 0; i < length; i++) {
-                    result[i] = yield* value.deserialize(stream);
+                    result[i] = yield* actualValue.deserialize(stream);
                 }
                 return result;
             }

Canopy [BP]/scripts/lib/canopy/Extension.js

@@ -2,6 +2,8 @@ import { Command } from "./commands/Command";
 import IPC from "../MCBE-IPC/ipc";
 import { RegisterCommand, RegisterRule, RuleValueRequest, RuleValueSet, CommandCallbackRequest, Ready, RuleValueResponse } from "./extension.ipc";
 import { BooleanRule } from "./rules/BooleanRule";
+import { IntegerRule } from "./rules/IntegerRule";  
+import { FloatRule } from "./rules/FloatRule";
 
 class Extension {
     id = null;
@@ -77,7 +79,7 @@ class Extension {
     }
 
     setRuleValue(identifier, value) {
-        IPC.send(`canopyExtension:${this.id}:ruleValueSet`, RuleValueSet, { ruleID: identifier, value: value });
+        IPC.send(`canopyExtension:${this.id}:ruleValueSet`, RuleValueSet, { ruleID: identifier, value: String(value) });
     }
 
     runCommand(sender, commandName, args) {
@@ -107,7 +109,23 @@ class Extension {
 
     #setupRuleRegistration() {
         IPC.on(`canopyExtension:${this.id}:registerRule`, RegisterRule, (ruleData) => {
-            this.rules.push(new BooleanRule({ category: "Rules", ...ruleData }));
+            ruleData.extension = this;
+            switch (ruleData.type) {
+                case 'boolean':
+                    ruleData.defaultValue = Boolean(ruleData.defaultValue);
+                    this.rules.push(new BooleanRule({ category: "Rules", ...ruleData }));
+                    break;
+                case 'integer':
+                    ruleData.defaultValue = parseInt(ruleData.defaultValue, 10);
+                    this.rules.push(new IntegerRule({ category: "Rules", ...ruleData }));
+                    break;
+                case 'float':
+                    ruleData.defaultValue = parseFloat(ruleData.defaultValue);
+                    this.rules.push(new FloatRule({ category: "Rules", ...ruleData }));
+                    break;
+                default:
+                    throw new Error(`[Canopy] Could not register rule: ${ruleData.identifier}. Invalid data type.`);
+            }
         });
     }
 

Canopy [BP]/scripts/lib/canopy/extension.ipc.js

@@ -1,25 +1,26 @@
 /* eslint-disable new-cap */
 import { PROTO } from '../MCBE-IPC/ipc'
 
-export const Ready = PROTO.Void;
-
-const description = PROTO.Object({
+const rawtext = PROTO.Object({
     text: PROTO.Optional(PROTO.String),
     translate: PROTO.Optional(PROTO.String),
-    with: PROTO.Optional(PROTO.Array(PROTO.String))
+    with: PROTO.Optional(PROTO.Array(PROTO.String)),
+    rawtext: PROTO.Optional(PROTO.Array(() => rawtext))
 });
 
+export const Ready = PROTO.Void;
+
 export const RegisterExtension = PROTO.Object({
     name: PROTO.String,
     version: PROTO.String,
     author: PROTO.String,
-    description: description,
+    description: rawtext,
     isEndstone: PROTO.Boolean
 });
 
 export const RegisterCommand = PROTO.Object({
     name: PROTO.String,
-    description: description,
+    description: rawtext,
     usage: PROTO.String,
     callback: PROTO.Optional(PROTO.Undefined),
     args: PROTO.Optional(PROTO.Array(PROTO.Object({
@@ -30,17 +31,26 @@ export const RegisterCommand = PROTO.Object({
     adminOnly: PROTO.Optional(PROTO.Boolean),
     helpEntries: PROTO.Optional(PROTO.Array(PROTO.Object({
         usage: PROTO.String,
-        description: description
+        description: rawtext
     }))),
     helpHidden: PROTO.Optional(PROTO.Boolean),
     extensionName: PROTO.Optional(PROTO.String)
 });
 
 export const RegisterRule = PROTO.Object({
     identifier: PROTO.String,
-    description: description,
+    description: rawtext,
+    defaultValue: PROTO.String,
     contingentRules: PROTO.Optional(PROTO.Array(PROTO.String)),
     independentRules: PROTO.Optional(PROTO.Array(PROTO.String)),
+    type: PROTO.String,
+    valueRange: PROTO.Optional(PROTO.Object({
+        range: PROTO.Optional(PROTO.Object({
+            min: PROTO.Float64,
+            max: PROTO.Float64
+        })),
+        other: PROTO.Optional(PROTO.Array(PROTO.Float64))
+    })),
     extensionName: PROTO.Optional(PROTO.String)
 });
 
@@ -49,12 +59,12 @@ export const RuleValueRequest = PROTO.Object({
 });
 
 export const RuleValueResponse = PROTO.Object({
-    value: PROTO.Boolean
+    value: PROTO.String
 });
 
 export const RuleValueSet = PROTO.Object({
     ruleID: PROTO.String,
-    value: PROTO.Boolean
+    value: PROTO.String
 });
 
 export const CommandCallbackRequest = PROTO.Object({

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

@@ -4,7 +4,7 @@ export class FloatRule extends Rule {
     valueRange;
 
     constructor(options) {
-        options.defaulValue = options.defaultValue || 0;
+        options.defaultValue = options.defaultValue || 0;
         super({ ...options });
         this.valueRange = options.valueRange;
     }

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

@@ -4,7 +4,7 @@ export class IntegerRule extends Rule {
     valueRange;
 
     constructor(options) {
-        options.defaulValue = options.defaultValue || 0;
+        options.defaultValue = options.defaultValue || 0;
         super({ ...options });
         this.valueRange = options.valueRange;
     }

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

@@ -1,6 +1,5 @@
 import { world } from '@minecraft/server';
 import { Rules } from "./Rules";
-import { Extensions } from '../Extensions';
 
 export class Rule {
     #category;
@@ -12,17 +11,17 @@ export class Rule {
     #extension;
 
     constructor({ category, identifier, description = '', defaultValue = void 0,
-                contingentRules = [], independentRules = [], onModifyCallback = () => {}, extensionName = false }) {
+                contingentRules = [], independentRules = [], onModifyCallback = () => {}, extension = false }) {
         if (this.constructor === Rule) 
             throw new TypeError("Abstract class 'Rule' cannot be instantiated directly.");
         this.#category = category;
         this.#identifier = identifier;
-        this.#description = this.#parseDescription(description)
+        this.#description = this.#parseDescription(description);
         this.#defaultValue = defaultValue;
         this.#contingentRules = contingentRules;
         this.#independentRules = independentRules;
         this.onModify = onModifyCallback;
-        this.#extension = Extensions.getFromName(extensionName);
+        this.#extension = extension;
         Rules.register(this);
     }
 
@@ -67,8 +66,8 @@ export class Rule {
     }
 
     async getValue() {
-        if (this.#extension)
-            return await this.#extension.getRuleValue(this.#identifier);
+        if (this.#extension) 
+            return this.#parseRuleValueString(await this.#extension.getRuleValue(this.#identifier));
         return this.#parseRuleValueString(world.getDynamicProperty(this.#identifier));
     }
 
@@ -106,8 +105,10 @@ export class Rule {
     }
 
     #parseRuleValueString(value) {
-        if (value === 'undefined' || value === void 0)
+        if (value === 'undefined' || value === void 0) {
+            this.resetToDefaultValue();
             return this.getDefaultValue();
+        }
         try {
             return JSON.parse(value);
         } catch {

Canopy [BP]/scripts/main.js

@@ -76,6 +76,7 @@ import './src/rules/spawnEggSpawnWithMinecart'
 import './src/rules/chunkBorders'
 import './src/rules/echoShardsEnableShriekers'
 import './src/rules/collisionBoxes'
+import './src/rules/potionBoostedBreeding'
 
 // Load Time Processes
 import './src/onStart'

Canopy [BP]/scripts/src/classes/BiomeEdgeRenderer.js

@@ -138,7 +138,7 @@ export class BiomeEdgeRenderer {
         changeInFinalAxis[finalAxis] = quadHeight;
         const bound = new Vector(...changeInMiddleAxis).add(new Vector(...changeInFinalAxis));
 
-        const worldLocation = Vector.from(this.blockVolume.getMin()).add(new Vector(...localLocation));
+        const worldLocation = Vector.from(this.blockVolume.getMin()).add(bound.multiply(0.5)).add(new Vector(...localLocation));
         worldLocation.dimension = this.dimension;
         const sidedBox = new DebugBox(worldLocation);
         sidedBox.bound = bound;
@@ -168,7 +168,8 @@ export class BiomeEdgeRenderer {
     }
 
     renderAnalysisLocation(location) {
-        const dimensionLocation = { ...location, dimension: this.dimension };
+        const dimensionLocation = Vector.from(location).add(new Vector(0.5, 0.5, 0.5));
+        dimensionLocation.dimension = this.dimension;
         const tempBox = new DebugBox(dimensionLocation);
         tempBox.color = { red: 1, green: 1, blue: 1 };
         debugDrawer.addShape(tempBox);
@@ -180,7 +181,8 @@ export class BiomeEdgeRenderer {
     drawAnalysisBoundingBox() {
         if (this.analysisBoundingBoxShape)
             this.analysisBoundingBoxShape.remove();
-        const dimensionLocation = { ...this.blockVolume.getMin(), dimension: this.dimension };
+        const dimensionLocation = Vector.from(this.blockVolume.getMin()).add(Vector.from(this.blockVolume.getSpan()).multiply(0.5));
+        dimensionLocation.dimension = this.dimension;
         const boundingBox = new DebugBox(dimensionLocation);
         boundingBox.bound = this.blockVolume.getSpan();
         boundingBox.color = this.analysisColor;

Canopy [BP]/scripts/src/classes/ChunkBorderRender.js

@@ -7,9 +7,10 @@ export class ChunkBorderRender {
     dimension;
     debugShapes;
 
-    constructor(location, dimension) {
-        this.location = location;
-        this.dimension = dimension;
+    constructor(player) {
+        this.player = player;
+        this.location = player.location;
+        this.dimension = player.dimension;
         this.debugShapes = [];
         this.render();
     }
@@ -98,6 +99,7 @@ export class ChunkBorderRender {
     }
 
     drawShape(shape) {
+        shape.visibleTo = [this.player];
         debugDrawer.addShape(shape);
         this.debugShapes.push(shape);
     }

Canopy [BP]/scripts/src/classes/CollisionBoxRenderer.js

@@ -10,20 +10,20 @@ export class CollisionBoxRenderer {
     viewDirectionVector;
     runner = void 0;
 
-    constructor(entity) {
+    constructor(entity, visibleToPlayer) {
         this.entity = entity;
-        this.startRender();
+        this.startRender(visibleToPlayer);
     }
 
     destroy() {
         this.stopRender();
         this.entity = void 0;
     }
 
-    startRender() {
-        this.collisionBox = new CollisionBox(this.entity);
-        this.eyeLevel = new EyeLevel(this.entity);
-        this.viewDirectionVector = new ViewDirectionVector(this.entity);
+    startRender(visibleToPlayer) {
+        this.collisionBox = new CollisionBox(this.entity, visibleToPlayer);
+        this.eyeLevel = new EyeLevel(this.entity, visibleToPlayer);
+        this.viewDirectionVector = new ViewDirectionVector(this.entity, visibleToPlayer);
         this.runner = system.runInterval(this.onTick.bind(this));
     }
 

Canopy [BP]/scripts/src/classes/HSSFinder.js

@@ -93,10 +93,11 @@ export class HSSFinder {
             return;
         const bottom = this.findStructureBottom(dimension, flooredLocation, "minecraft:fortress");
         const top = this.findStructureTop(dimension, flooredLocation, "minecraft:fortress");
-        const height = top.y - bottom.y;
+        const height = top.y - bottom.y + 1;
 
-        bottom.dimension = dimension;
-        const box = new DebugBox(bottom);
+        const dimensionLocation = bottom.add(new Vector(0.5, height * 0.5, 0.5));
+        dimensionLocation.dimension = dimension;
+        const box = new DebugBox(dimensionLocation);
         box.bound = new Vector(1, height, 1);
         box.color = { red: 0, green: 1, blue: 0 };
         this.fortressHSSShapes.push(box);