diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index e74e1dad..641319a0 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -2330,7 +2330,7 @@ This function is tentative - will likely change when chunk ticket API is properl These functions help scan larger areas of blocks without using generic loop functions, like nested `loop`. -### `scan(cx, cy, cz, dx, dy, dz, px?, py?, pz?, expr)`, `scan(center, range, lower_range?, expr)` +### `scan(center, range, lower_range?, expr)` Evaluates expression over area of blocks defined by its center `center = (cx, cy, cz)`, expanded in all directions by `range = (dx, dy, dz)` blocks, or optionally in negative with `range` coords, and `upper_range` coords in @@ -2346,7 +2346,7 @@ which would cause the expression not be evaluated for their boolean value. `scan` also handles `continue` and `break` statements, using `continue`'s return value to use in place of expression return value. `break` return value has no effect. -### `volume(x1, y1, z1, x2, y2, z2, expr), volume(pos1, pos2, expr)` +### `volume(from_pos, to_pos, expr)` Evaluates expression for each block in the area, the same as the `scan` function, but using two opposite corners of the rectangular cuboid. Any corners can be specified, its like you would do with `/fill` command. @@ -2354,7 +2354,7 @@ You can use a position or three coordinates to specify, it doesn't matter. For return value and handling `break` and `continue` statements, see `scan` function above. -### `neighbours(x, y, z), neighbours(block), neighbours(l(x,y,z))` +### `neighbours(pos)` Returns the list of 6 neighbouring blocks to the argument. Commonly used with other loop functions like `for`. @@ -2362,19 +2362,20 @@ Returns the list of 6 neighbouring blocks to the argument. Commonly used with ot for(neighbours(x,y,z),air(_)) => 4 // number of air blocks around a block -### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?), rect(centre, difference?, positive_diff?)` +### `rect(centre, range?, positive_range?)` Returns an iterator, just like `range` function that iterates over a rectangular area of blocks. If only center -point is specified, it iterates over 27 blocks. If `d` (`difference`) arguments are specified, expands selection by the respective -number of blocks in each direction. If `p` (`positive_diff`) arguments are specified, it uses `d` (`difference`) for negative offset, and `p` for positive. +point is specified, it iterates over 27 blocks. If `range` arguments are specified, expands selection by the respective +number of blocks in each direction. If `positive_range` arguments are specified, + it uses `range` for negative offset, and `positive_range` for positive. `centre` can be defined either as three coordinates, a list of three coords, or a block value. -`difference` and `positive_diff` can have the same representations, just if its a block, it computes the distance to the center +`range` and `positive_range` can have the same representations, just if its a block, it computes the distance to the center as range instead of taking the values as is.` -### `diamond(cx, cy, cz, radius?, height?), diamond(centre, radius?, height?)` +### `diamond(centre_pos, radius?, height?)` -Iterates over a diamond like area of blocks. With no radius and height, its 7 blocks centered around the middle `centre = l(cx, cy, cz)` +Iterates over a diamond like area of blocks. With no radius and height, its 7 blocks centered around the middle (block + neighbours). With a radius specified, it expands shape on x and z coords, and with a custom height, on y. Any of these can be zero as well. radius of 0 makes a stick, height of 0 makes a diamond shape pad. # Entity API diff --git a/docs/scarpet/api/BlockIterations.md b/docs/scarpet/api/BlockIterations.md index d8f87e25..29d39cf3 100644 --- a/docs/scarpet/api/BlockIterations.md +++ b/docs/scarpet/api/BlockIterations.md @@ -2,7 +2,7 @@ These functions help scan larger areas of blocks without using generic loop functions, like nested `loop`. -### `scan(cx, cy, cz, dx, dy, dz, px?, py?, pz?, expr)`, `scan(center, range, lower_range?, expr)` +### `scan(center, range, lower_range?, expr)` Evaluates expression over area of blocks defined by its center `center = (cx, cy, cz)`, expanded in all directions by `range = (dx, dy, dz)` blocks, or optionally in negative with `range` coords, and `upper_range` coords in @@ -18,7 +18,7 @@ which would cause the expression not be evaluated for their boolean value. `scan` also handles `continue` and `break` statements, using `continue`'s return value to use in place of expression return value. `break` return value has no effect. -### `volume(x1, y1, z1, x2, y2, z2, expr), volume(pos1, pos2, expr)` +### `volume(from_pos, to_pos, expr)` Evaluates expression for each block in the area, the same as the `scan` function, but using two opposite corners of the rectangular cuboid. Any corners can be specified, its like you would do with `/fill` command. @@ -26,7 +26,7 @@ You can use a position or three coordinates to specify, it doesn't matter. For return value and handling `break` and `continue` statements, see `scan` function above. -### `neighbours(x, y, z), neighbours(block), neighbours(l(x,y,z))` +### `neighbours(pos)` Returns the list of 6 neighbouring blocks to the argument. Commonly used with other loop functions like `for`. @@ -34,17 +34,18 @@ Returns the list of 6 neighbouring blocks to the argument. Commonly used with ot for(neighbours(x,y,z),air(_)) => 4 // number of air blocks around a block -### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?), rect(centre, difference?, positive_diff?)` +### `rect(centre, range?, positive_range?)` Returns an iterator, just like `range` function that iterates over a rectangular area of blocks. If only center -point is specified, it iterates over 27 blocks. If `d` (`difference`) arguments are specified, expands selection by the respective -number of blocks in each direction. If `p` (`positive_diff`) arguments are specified, it uses `d` (`difference`) for negative offset, and `p` for positive. +point is specified, it iterates over 27 blocks. If `range` arguments are specified, expands selection by the respective +number of blocks in each direction. If `positive_range` arguments are specified, + it uses `range` for negative offset, and `positive_range` for positive. `centre` can be defined either as three coordinates, a list of three coords, or a block value. -`difference` and `positive_diff` can have the same representations, just if its a block, it computes the distance to the center +`range` and `positive_range` can have the same representations, just if its a block, it computes the distance to the center as range instead of taking the values as is.` -### `diamond(cx, cy, cz, radius?, height?), diamond(centre, radius?, height?)` +### `diamond(centre_pos, radius?, height?)` Iterates over a diamond like area of blocks. With no radius and height, its 7 blocks centered around the middle (block + neighbours). With a radius specified, it expands shape on x and z coords, and with a custom height, on y. diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 04e2be88..ec802386 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -119,6 +119,7 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.EulerAngle; import net.minecraft.util.math.BlockBox; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.util.registry.Registry; @@ -2227,8 +2228,8 @@ public class CarpetExpression BlockArgument pos1Locator = BlockArgument.findIn(cc, lv, 0); BlockArgument pos2Locator = BlockArgument.findIn(cc, lv, pos1Locator.offset); - BlockPos pos2 = pos2Locator.block.getPos(); BlockPos pos1 = pos1Locator.block.getPos(); + BlockPos pos2 = pos2Locator.block.getPos(); int x1 = pos1.getX(); int y1 = pos1.getY(); @@ -2313,41 +2314,54 @@ public class CarpetExpression this.expr.addLazyFunction("rect", -1, (c, t, lv)-> { CarpetContext cc = (CarpetContext) c; - - int cx; - int cy; - int cz; - int sminx; - int sminy; - int sminz; - int smaxx; - int smaxy; - int smaxz; - + int cx, cy, cz; + int sminx, sminy, sminz; + int smaxx, smaxy, smaxz; BlockArgument cposLocator = BlockArgument.findIn(cc, lv, 0); BlockPos cpos = cposLocator.block.getPos(); - cx = cpos.getX(); cy = cpos.getY(); cz = cpos.getZ(); - - if(lv.size()>cposLocator.offset){ - BlockArgument diff_Locator = BlockArgument.findIn(cc, lv, cposLocator.offset); - BlockPos difference = diff_Locator.block.getPos(); - sminx = difference.getX(); - sminy = difference.getY(); - sminz = difference.getZ(); - if(lv.size()>diff_Locator.offset){ - BlockPos pos_diff=BlockArgument.findIn(cc,lv,diff_Locator.offset).block.getPos(); - smaxx = pos_diff.getX(); - smaxy = pos_diff.getY(); - smaxz = pos_diff.getZ(); - }else{ + if (lv.size() > cposLocator.offset) + { + Vector3Argument diffLocator = Vector3Argument.findIn(cc, lv, cposLocator.offset); + if (diffLocator.fromBlock) + { + sminx = MathHelper.floor(abs(diffLocator.vec.x - cx)); + sminy = MathHelper.floor(abs(diffLocator.vec.y - cx)); + sminz = MathHelper.floor(abs(diffLocator.vec.z - cx)); + } + else + { + sminx = MathHelper.floor(abs(diffLocator.vec.x)); + sminy = MathHelper.floor(abs(diffLocator.vec.y)); + sminz = MathHelper.floor(abs(diffLocator.vec.z)); + } + if (lv.size() > diffLocator.offset) + { + Vector3Argument posDiff = Vector3Argument.findIn(cc, lv, diffLocator.offset); + if (posDiff.fromBlock) + { + smaxx = MathHelper.floor(abs(posDiff.vec.x - cx)); + smaxy = MathHelper.floor(abs(posDiff.vec.y - cx)); + smaxz = MathHelper.floor(abs(posDiff.vec.z - cx)); + } + else + { + smaxx = MathHelper.floor(abs(posDiff.vec.x)); + smaxy = MathHelper.floor(abs(posDiff.vec.y)); + smaxz = MathHelper.floor(abs(posDiff.vec.z)); + } + } + else + { smaxx = sminx; smaxy = sminy; smaxz = sminz; } - }else{ + } + else + { sminx = 1; sminy = 1; sminz = 1; @@ -2439,7 +2453,7 @@ public class CarpetExpression cy = cpos.getY(); cz = cpos.getZ(); - if (lv.size()==1+cposLocator.offset) + if (lv.size()==cposLocator.offset) { Value retval = ListValue.of( BlockValue.fromCoords(cc, cx, cy-1, cz), @@ -2452,22 +2466,22 @@ public class CarpetExpression ); return (_c, _t ) -> retval; } - else if (lv.size()==2+cposLocator.offset) + else if (lv.size()==1+cposLocator.offset) { width = (int) ((NumericValue) lv.get(cposLocator.offset).evalValue(c)).getLong(); height = 0; } - else if(lv.size()==3+cposLocator.offset) + else if(lv.size()==2+cposLocator.offset) { width = (int) ((NumericValue) lv.get(cposLocator.offset).evalValue(c)).getLong(); height = (int) ((NumericValue) lv.get(cposLocator.offset+1).evalValue(c)).getLong(); } else{ - throw new InternalExpressionException("Incorrect number of arguments for diamond"); + throw new InternalExpressionException("Incorrect number of arguments for 'diamond'"); } } catch (ClassCastException exc) { - throw new InternalExpressionException("Attempted to pass a non-number to diamond"); + throw new InternalExpressionException("Attempted to pass a non-number to 'diamond'"); } if (height == 0) {