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

Commit

Permalink
Merge pull request #106 from NorthernOceanS/issue104
Browse files Browse the repository at this point in the history 
Fix an generator and many small errors.
  • Loading branch information
@callstackexceed
callstackexceed committed Aug 6, 2021
2 parents f449c41 + 9290266 commit c81bc22
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 44 deletions.
2 changes: 1 addition & 1 deletion packs/behaviors/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": [
0,
13,
16
17
]
},
"modules": [
Expand Down
85 changes: 42 additions & 43 deletions packs/behaviors/scripts/plugin/nc/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand All @@ -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++) {
Expand All @@ -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);
Expand Down Expand Up @@ -173,7 +173,7 @@ system.registerCanonicalGenerator({
},
method: {
generate: function (e) {
let { state } = e;
let { state, runtime } = e;
if (state.generateByServer)
return [{
"type": "clone",
Expand Down Expand Up @@ -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 () {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"}}

Expand Down Expand Up @@ -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 = []
}
}
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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"]
}
Expand Down Expand Up @@ -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,
Expand All @@ -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(
Expand Down

0 comments on commit c81bc22

Please sign in to comment.