From 1d4902da7d2da52ec23d9407b53929b81a61065a Mon Sep 17 00:00:00 2001 From: Shen Lang Date: Fri, 6 Aug 2021 23:20:29 +0800 Subject: [PATCH 1/2] fix(plugin): fix an generator and many small errors --- packs/behaviors/scripts/plugin/nc/index.js | 85 +++++++++++----------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/packs/behaviors/scripts/plugin/nc/index.js b/packs/behaviors/scripts/plugin/nc/index.js index e2c7aeb..65d720c 100644 --- a/packs/behaviors/scripts/plugin/nc/index.js +++ b/packs/behaviors/scripts/plugin/nc/index.js @@ -44,7 +44,7 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e + let { state, runtime } = e; let { positions, blockTypes, directions } = state let halt = false @@ -102,7 +102,7 @@ system.registerCanonicalGenerator({ else { let blocks = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let minCoordinate = new Coordinate( Math.min(positions[0].coordinate.x, positions[1].coordinate.x), @@ -115,7 +115,7 @@ system.registerCanonicalGenerator({ Math.max(positions[0].coordinate.z, positions[1].coordinate.z) ) - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") for (let x = minCoordinate.x; x <= maxCoordinate.x; x++) { for (let y = minCoordinate.y; y <= maxCoordinate.y; y++) { @@ -136,7 +136,7 @@ system.registerCanonicalGenerator({ } }, UIHandler: function (e) { - let { state, data } = e; + let { state, data, runtime } = e; let { positions, blockTypes, directions } = state; if (data == "resetAll") { positions.fill(undefined); @@ -173,7 +173,7 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; if (state.generateByServer) return [{ "type": "clone", @@ -238,17 +238,17 @@ let createLineGenerator = canonicalGeneratorFactory({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = []; //let logger = runtime.logger; - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes let directionArray = state.directions - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") let direction = (function () { @@ -319,7 +319,7 @@ let createLineGenerator = canonicalGeneratorFactory({ } }) -createLineGenerator.onAddPosition = function () { +createLineGenerator.onAddPosition = function (e) { let { state, position, runtime } = e; if (state.doAcceptNewPosition) { let indexOfVacancy = state.positions.indexOf(undefined) @@ -407,16 +407,16 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes let directionArray = state.directions - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") //{"blockIdentifier":"minecraft:stained_hardened_clay","blockState":{"color":"cyan"}} @@ -584,23 +584,22 @@ system.registerCanonicalGenerator({ // following are postGenerate state.positions = [undefined] if (state["roadStyle"] == "custom") state.blockTypes = [undefined, undefined, undefined, undefined]; - else state.blockTypeArray = []; - state.blockTypes = []; + else state.blockTypes = []; state.directions = [undefined]; return blockArray }, UIHandler: function (e) { - let { state, data } = e; + let { state, data, runtime } = e; if (data == "custom") { - //logger.log("info", "Using custom materials.") - //logger.log("info", "First block type for surface.") - //logger.log("info", "Second for white line.") - //logger.log("info", "Third for yellow line.") - //logger.log("info", "Fourth for bar.") + runtime.logger && runtime.logger.log("info", "Using custom materials.") + runtime.logger && runtime.logger.log("info", "First block type for surface.") + runtime.logger && runtime.logger.log("info", "Second for white line.") + runtime.logger && runtime.logger.log("info", "Third for yellow line.") + runtime.logger && runtime.logger.log("info", "Fourth for bar.") state.blockTypes = [undefined, undefined, undefined, undefined] } else { - //logger.log("info", "Using preset materials. Custom materials are erased!") + runtime.logger && runtime.logger.log("info", "Using preset materials. Custom materials are erased!") state.blockTypes = [] } } @@ -642,15 +641,15 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes let directionArray = state.directions - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") let directionMark = (function () { if (-45 <= directionArray[0].y && directionArray[0].y <= 45) return "+z" @@ -823,15 +822,15 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") let coordinateArray = utils.coordinateGeometry.generateFilledPlanarTriangle( positionArray[0].coordinate.x, positionArray[0].coordinate.y, positionArray[0].coordinate.z, @@ -873,9 +872,9 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; if (state.generateByServer) { - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let x_min = Math.min(state.positions[0].coordinate.x, state.positions[1].coordinate.x) let z_min = Math.min(state.positions[0].coordinate.z, state.positions[1].coordinate.z) @@ -900,7 +899,7 @@ system.registerCanonicalGenerator({ else { let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes @@ -968,10 +967,10 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = []; - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions @@ -1024,12 +1023,12 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes @@ -1091,12 +1090,12 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions let blockTypeArray = state.blockTypes @@ -1144,7 +1143,7 @@ let flagGenerator = canonicalGeneratorFactory({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] let positionArray = state.positions; let option = state; @@ -1228,16 +1227,16 @@ system.registerCanonicalGenerator({ }, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let blockArray = [] - //logger.log("verbose", "NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!") let positionArray = state.positions; let blockTypeArray = state.blockTypes; let directionArray = state.directions; let option = state; - //logger.log("verbose", "Yes, NZ is JULAO!") + runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!") const directionMark = utils.geometry.getDirectionMark.horizontal(directionArray[0].y) @@ -1296,7 +1295,7 @@ system.registerCanonicalGenerator({ }, "rail": function (coordinate) { return materials["rail"] }, "void/redstone": function (coordinate) { - //logger.logObject("debug", coordinate) + runtime.logger && runtime.logger.logObject("debug", coordinate) if (coordinate.x % 16 == 0) return materials["red_stone_torch"] else return materials["air"] } @@ -1569,7 +1568,7 @@ system.registerCanonicalGenerator({ option: {}, method: { UIHandler: function () { }, generate: function (e) { - let { state } = e; + let { state, runtime } = e; return new BuildInstruction("writeBuildingStructureToLog", { startCoordinate: state.positions[0].coordinate, endCoordinate: state.positions[1].coordinate, @@ -1586,7 +1585,7 @@ system.registerCanonicalGenerator({ option: {}, method: { generate: function (e) { - let { state } = e; + let { state, runtime } = e; let coordinate = state.positions[0].coordinate return Array.from(preset.presetBuildings.subway_station, a => new Block(new Position(new Coordinate( From 9290266cab8a6177d998948926bc9e6274cb0985 Mon Sep 17 00:00:00 2001 From: Shen Lang Date: Fri, 6 Aug 2021 23:25:40 +0800 Subject: [PATCH 2/2] feat(manifest): update the version to 0.13.17 --- packs/behaviors/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packs/behaviors/manifest.json b/packs/behaviors/manifest.json index 7b5de72..4b934dd 100644 --- a/packs/behaviors/manifest.json +++ b/packs/behaviors/manifest.json @@ -7,7 +7,7 @@ "version": [ 0, 13, - 16 + 17 ] }, "modules": [