Skip to content
This repository was archived by the owner on Feb 6, 2022. It is now read-only.

Commit c81bc22

Browse files
callstackexceedcallstackexceed
authored
Merge pull request #106 from NorthernOceanS/issue104
Fix an generator and many small errors.
2 parents f449c41 + 9290266 commit c81bc22

2 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎packs/behaviors/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": [
88
0,
99
13,
10-
16
10+
17
1111
]
1212
},
1313
"modules": [

‎packs/behaviors/scripts/plugin/nc/index.js‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ system.registerCanonicalGenerator({
4444
},
4545
method: {
4646
generate: function (e) {
47-
let { state } = e
47+
let { state, runtime } = e;
4848
let { positions, blockTypes, directions } = state
4949

5050
let halt = false
@@ -102,7 +102,7 @@ system.registerCanonicalGenerator({
102102
else {
103103
let blocks = []
104104

105-
//logger.log("verbose", "NZ is JULAO!")
105+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
106106

107107
let minCoordinate = new Coordinate(
108108
Math.min(positions[0].coordinate.x, positions[1].coordinate.x),
@@ -115,7 +115,7 @@ system.registerCanonicalGenerator({
115115
Math.max(positions[0].coordinate.z, positions[1].coordinate.z)
116116
)
117117

118-
//logger.log("verbose", "Yes, NZ is JULAO!")
118+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
119119

120120
for (let x = minCoordinate.x; x <= maxCoordinate.x; x++) {
121121
for (let y = minCoordinate.y; y <= maxCoordinate.y; y++) {
@@ -136,7 +136,7 @@ system.registerCanonicalGenerator({
136136
}
137137
},
138138
UIHandler: function (e) {
139-
let { state, data } = e;
139+
let { state, data, runtime } = e;
140140
let { positions, blockTypes, directions } = state;
141141
if (data == "resetAll") {
142142
positions.fill(undefined);
@@ -173,7 +173,7 @@ system.registerCanonicalGenerator({
173173
},
174174
method: {
175175
generate: function (e) {
176-
let { state } = e;
176+
let { state, runtime } = e;
177177
if (state.generateByServer)
178178
return [{
179179
"type": "clone",
@@ -238,17 +238,17 @@ let createLineGenerator = canonicalGeneratorFactory({
238238
},
239239
method: {
240240
generate: function (e) {
241-
let { state } = e;
241+
let { state, runtime } = e;
242242
let blockArray = [];
243243

244244
//let logger = runtime.logger;
245-
//logger.log("verbose", "NZ is JULAO!")
245+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
246246

247247
let positionArray = state.positions
248248
let blockTypeArray = state.blockTypes
249249
let directionArray = state.directions
250250

251-
//logger.log("verbose", "Yes, NZ is JULAO!")
251+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
252252

253253

254254
let direction = (function () {
@@ -319,7 +319,7 @@ let createLineGenerator = canonicalGeneratorFactory({
319319
}
320320
})
321321

322-
createLineGenerator.onAddPosition = function () {
322+
createLineGenerator.onAddPosition = function (e) {
323323
let { state, position, runtime } = e;
324324
if (state.doAcceptNewPosition) {
325325
let indexOfVacancy = state.positions.indexOf(undefined)
@@ -407,16 +407,16 @@ system.registerCanonicalGenerator({
407407
},
408408
method: {
409409
generate: function (e) {
410-
let { state } = e;
410+
let { state, runtime } = e;
411411
let blockArray = []
412412

413-
//logger.log("verbose", "NZ is JULAO!")
413+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
414414

415415
let positionArray = state.positions
416416
let blockTypeArray = state.blockTypes
417417
let directionArray = state.directions
418418

419-
//logger.log("verbose", "Yes, NZ is JULAO!")
419+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
420420

421421
//{"blockIdentifier":"minecraft:stained_hardened_clay","blockState":{"color":"cyan"}}
422422

@@ -584,23 +584,22 @@ system.registerCanonicalGenerator({
584584
// following are postGenerate
585585
state.positions = [undefined]
586586
if (state["roadStyle"] == "custom") state.blockTypes = [undefined, undefined, undefined, undefined];
587-
else state.blockTypeArray = [];
588-
state.blockTypes = [];
587+
else state.blockTypes = [];
589588
state.directions = [undefined];
590589
return blockArray
591590
},
592591
UIHandler: function (e) {
593-
let { state, data } = e;
592+
let { state, data, runtime } = e;
594593
if (data == "custom") {
595-
//logger.log("info", "Using custom materials.")
596-
//logger.log("info", "First block type for surface.")
597-
//logger.log("info", "Second for white line.")
598-
//logger.log("info", "Third for yellow line.")
599-
//logger.log("info", "Fourth for bar.")
594+
runtime.logger && runtime.logger.log("info", "Using custom materials.")
595+
runtime.logger && runtime.logger.log("info", "First block type for surface.")
596+
runtime.logger && runtime.logger.log("info", "Second for white line.")
597+
runtime.logger && runtime.logger.log("info", "Third for yellow line.")
598+
runtime.logger && runtime.logger.log("info", "Fourth for bar.")
600599
state.blockTypes = [undefined, undefined, undefined, undefined]
601600
}
602601
else {
603-
//logger.log("info", "Using preset materials. Custom materials are erased!")
602+
runtime.logger && runtime.logger.log("info", "Using preset materials. Custom materials are erased!")
604603
state.blockTypes = []
605604
}
606605
}
@@ -642,15 +641,15 @@ system.registerCanonicalGenerator({
642641
},
643642
method: {
644643
generate: function (e) {
645-
let { state } = e;
644+
let { state, runtime } = e;
646645
let blockArray = []
647646

648-
//logger.log("verbose", "NZ is JULAO!")
647+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
649648

650649
let positionArray = state.positions
651650
let blockTypeArray = state.blockTypes
652651
let directionArray = state.directions
653-
//logger.log("verbose", "Yes, NZ is JULAO!")
652+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
654653

655654
let directionMark = (function () {
656655
if (-45 <= directionArray[0].y && directionArray[0].y <= 45) return "+z"
@@ -823,15 +822,15 @@ system.registerCanonicalGenerator({
823822
},
824823
method: {
825824
generate: function (e) {
826-
let { state } = e;
825+
let { state, runtime } = e;
827826
let blockArray = []
828827

829-
//logger.log("verbose", "NZ is JULAO!")
828+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
830829

831830
let positionArray = state.positions
832831
let blockTypeArray = state.blockTypes
833832

834-
//logger.log("verbose", "Yes, NZ is JULAO!")
833+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
835834

836835
let coordinateArray = utils.coordinateGeometry.generateFilledPlanarTriangle(
837836
positionArray[0].coordinate.x, positionArray[0].coordinate.y, positionArray[0].coordinate.z,
@@ -873,9 +872,9 @@ system.registerCanonicalGenerator({
873872
},
874873
method: {
875874
generate: function (e) {
876-
let { state } = e;
875+
let { state, runtime } = e;
877876
if (state.generateByServer) {
878-
//logger.log("verbose", "NZ is JULAO!")
877+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
879878

880879
let x_min = Math.min(state.positions[0].coordinate.x, state.positions[1].coordinate.x)
881880
let z_min = Math.min(state.positions[0].coordinate.z, state.positions[1].coordinate.z)
@@ -900,7 +899,7 @@ system.registerCanonicalGenerator({
900899
else {
901900
let blockArray = []
902901

903-
//logger.log("verbose", "NZ is JULAO!")
902+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
904903

905904
let positionArray = state.positions
906905
let blockTypeArray = state.blockTypes
@@ -968,10 +967,10 @@ system.registerCanonicalGenerator({
968967
},
969968
method: {
970969
generate: function (e) {
971-
let { state } = e;
970+
let { state, runtime } = e;
972971
let blockArray = [];
973972

974-
//logger.log("verbose", "NZ is JULAO!")
973+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
975974

976975
let positionArray = state.positions
977976

@@ -1024,12 +1023,12 @@ system.registerCanonicalGenerator({
10241023
},
10251024
method: {
10261025
generate: function (e) {
1027-
let { state } = e;
1026+
let { state, runtime } = e;
10281027
let blockArray = []
10291028

10301029

10311030

1032-
//logger.log("verbose", "NZ is JULAO!")
1031+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
10331032

10341033
let positionArray = state.positions
10351034
let blockTypeArray = state.blockTypes
@@ -1091,12 +1090,12 @@ system.registerCanonicalGenerator({
10911090
},
10921091
method: {
10931092
generate: function (e) {
1094-
let { state } = e;
1093+
let { state, runtime } = e;
10951094
let blockArray = []
10961095

10971096

10981097

1099-
//logger.log("verbose", "NZ is JULAO!")
1098+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
11001099

11011100
let positionArray = state.positions
11021101
let blockTypeArray = state.blockTypes
@@ -1144,7 +1143,7 @@ let flagGenerator = canonicalGeneratorFactory({
11441143
},
11451144
method: {
11461145
generate: function (e) {
1147-
let { state } = e;
1146+
let { state, runtime } = e;
11481147
let blockArray = []
11491148
let positionArray = state.positions;
11501149
let option = state;
@@ -1228,16 +1227,16 @@ system.registerCanonicalGenerator({
12281227
},
12291228
method: {
12301229
generate: function (e) {
1231-
let { state } = e;
1230+
let { state, runtime } = e;
12321231
let blockArray = []
12331232

1234-
//logger.log("verbose", "NZ is JULAO!")
1233+
runtime.logger && runtime.logger.log("verbose", "NZ is JULAO!")
12351234

12361235
let positionArray = state.positions;
12371236
let blockTypeArray = state.blockTypes;
12381237
let directionArray = state.directions;
12391238
let option = state;
1240-
//logger.log("verbose", "Yes, NZ is JULAO!")
1239+
runtime.logger && runtime.logger.log("verbose", "Yes, NZ is JULAO!")
12411240

12421241
const directionMark = utils.geometry.getDirectionMark.horizontal(directionArray[0].y)
12431242

@@ -1296,7 +1295,7 @@ system.registerCanonicalGenerator({
12961295
},
12971296
"rail": function (coordinate) { return materials["rail"] },
12981297
"void/redstone": function (coordinate) {
1299-
//logger.logObject("debug", coordinate)
1298+
runtime.logger && runtime.logger.logObject("debug", coordinate)
13001299
if (coordinate.x % 16 == 0) return materials["red_stone_torch"]
13011300
else return materials["air"]
13021301
}
@@ -1569,7 +1568,7 @@ system.registerCanonicalGenerator({
15691568
option: {},
15701569
method: {
15711570
UIHandler: function () { }, generate: function (e) {
1572-
let { state } = e;
1571+
let { state, runtime } = e;
15731572
return new BuildInstruction("writeBuildingStructureToLog", {
15741573
startCoordinate: state.positions[0].coordinate,
15751574
endCoordinate: state.positions[1].coordinate,
@@ -1586,7 +1585,7 @@ system.registerCanonicalGenerator({
15861585
option: {},
15871586
method: {
15881587
generate: function (e) {
1589-
let { state } = e;
1588+
let { state, runtime } = e;
15901589
let coordinate = state.positions[0].coordinate
15911590

15921591
return Array.from(preset.presetBuildings.subway_station, a => new Block(new Position(new Coordinate(

0 commit comments

Comments
 (0)