icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for triples of positions in volume (#321)

Browse Source 
* Add support for triples of positions in volume

it work good!

* Updating docs

* made it work with 5 arguments

so like volume(x,y,z,pos) or volume(pos,x,y,z).
Also renamed previous variables

* updated docs

* making it smarter

* made it work for rect and diamond

and cleaned up some earlier code

* updated docs

* did all ur stuffs

* fixin the issues
This commit is contained in:
Ghoulboy authored and GitHub committed 2020-06-17 12:11:01 -03:00
1 parent 29a81d53d6
commit 986909c1f4
3 files changed
+88 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/scarpet/Full.md
+12 -7
View File
@@ -2346,10 +2346,11 @@ 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 `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. return value. `break` return value has no effect.
### `volume(x1, y1, z1, x2, y2, z2, expr)` ### `volume(x1, y1, z1, x2, y2, z2, expr), volume(pos1, pos2, expr)`
Evaluates expression for each block in the area, the same as the `scan` function, but using two opposite corners of 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. the rectangular cuboid. Any corners can be specified, its like you would do with `/fill` command.
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. For return value and handling `break` and `continue` statements, see `scan` function above.
@@ -2361,15 +2362,19 @@ 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 for(neighbours(x,y,z),air(_)) => 4 // number of air blocks around a block
</pre> </pre>
### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?)` ### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?), rect(centre, difference?, positive_diff?)`
returns an iterator, just like `range` function that iterates over rectangular cubarea of blocks. If only center 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` arguments are specified, expands selection by the respective 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` arguments are specified, it uses `d` for negative offset, and `p` for positive. number of blocks in each direction. If `p` (`positive_diff`) arguments are specified, it uses `d` (`difference`) for negative offset, and `p` for positive.
### `diamond(cx, cy, cz, radius?, height?)` `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
as range instead of taking the values as is.`
Iterates over a diamond like area of blocks. With no radius and height, its 7 blocks centered around the middle ### `diamond(cx, cy, cz, radius?, height?), diamond(centre, 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)`
(block + neighbours). With a radius specified, it expands shape on x and z coords, and with a custom height, on y. (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. Any of these can be zero as well. radius of 0 makes a stick, height of 0 makes a diamond shape pad.
# Entity API # Entity API
docs/scarpet/api/BlockIterations.md
+11 -6
View File
@@ -18,10 +18,11 @@ 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 `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. return value. `break` return value has no effect.
### `volume(x1, y1, z1, x2, y2, z2, expr)` ### `volume(x1, y1, z1, x2, y2, z2, expr), volume(pos1, pos2, expr)`
Evaluates expression for each block in the area, the same as the `scan` function, but using two opposite corners of 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. the rectangular cuboid. Any corners can be specified, its like you would do with `/fill` command.
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. For return value and handling `break` and `continue` statements, see `scan` function above.
@@ -33,13 +34,17 @@ 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 for(neighbours(x,y,z),air(_)) => 4 // number of air blocks around a block
</pre> </pre>
### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?)` ### `rect(cx, cy, cz, dx?, dy?, dz?, px?, py?, pz?), rect(centre, difference?, positive_diff?)`
returns an iterator, just like `range` function that iterates over rectangular cubarea of blocks. If only center 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` arguments are specified, expands selection by the respective 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` arguments are specified, it uses `d` for negative offset, and `p` for positive. number of blocks in each direction. If `p` (`positive_diff`) arguments are specified, it uses `d` (`difference`) for negative offset, and `p` for positive.
### `diamond(cx, cy, cz, radius?, height?)` `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
as range instead of taking the values as is.`
### `diamond(cx, cy, cz, radius?, height?), diamond(centre, radius?, height?)`
Iterates over a diamond like area of blocks. With no radius and height, its 7 blocks centered around the middle 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. (block + neighbours). With a radius specified, it expands shape on x and z coords, and with a custom height, on y.
src/main/java/carpet/script/CarpetExpression.java
+65 -62
View File
@@ -2221,21 +2221,28 @@ public class CarpetExpression
return (c_, t_) -> new NumericValue(finalSCount); return (c_, t_) -> new NumericValue(finalSCount);
}); });
this.expr.addLazyFunction("volume", 7, (c, t, lv) -> this.expr.addLazyFunction("volume", -1, (c, t, lv) ->
{ {
int xi = (int) NumericValue.asNumber(lv.get(0).evalValue(c)).getLong(); CarpetContext cc = (CarpetContext)c;
int yi = (int) NumericValue.asNumber(lv.get(1).evalValue(c)).getLong();
int zi = (int) NumericValue.asNumber(lv.get(2).evalValue(c)).getLong(); BlockArgument pos1Locator = BlockArgument.findIn(cc, lv, 0);
int xj = (int) NumericValue.asNumber(lv.get(3).evalValue(c)).getLong(); BlockArgument pos2Locator = BlockArgument.findIn(cc, lv, pos1Locator.offset);
int yj = (int) NumericValue.asNumber(lv.get(4).evalValue(c)).getLong(); BlockPos pos2 = pos2Locator.block.getPos();
int zj = (int) NumericValue.asNumber(lv.get(5).evalValue(c)).getLong(); BlockPos pos1 = pos1Locator.block.getPos();
int minx = min(xi, xj);
int miny = min(yi, yj); int x1 = pos1.getX();
int minz = min(zi, zj); int y1 = pos1.getY();
int maxx = max(xi, xj); int z1 = pos1.getZ();
int maxy = max(yi, yj); int x2 = pos2.getX();
int maxz = max(zi, zj); int y2 = pos2.getY();
LazyValue expr = lv.get(6); int z2 = pos2.getZ();
int minx = min(x1, x2);
int miny = min(y1, y2);
int minz = min(z1, z2);
int maxx = max(x1, x2);
int maxy = max(y1, y2);
int maxz = max(z1, z2);
LazyValue expr = lv.get(pos2Locator.offset);
//saving outer scope //saving outer scope
LazyValue _x = c.getVariable("_x"); LazyValue _x = c.getVariable("_x");
@@ -2305,10 +2312,8 @@ public class CarpetExpression
this.expr.addLazyFunction("rect", -1, (c, t, lv)-> this.expr.addLazyFunction("rect", -1, (c, t, lv)->
{ {
if (lv.size() != 3 && lv.size() != 6 && lv.size() != 9) CarpetContext cc = (CarpetContext) c;
{
throw new InternalExpressionException("Rectangular region should be specified with 3, 6, or 9 coordinates");
}
int cx; int cx;
int cy; int cy;
int cz; int cz;
@@ -2318,13 +2323,31 @@ public class CarpetExpression
int smaxx; int smaxx;
int smaxy; int smaxy;
int smaxz; int smaxz;
try
{ BlockArgument cposLocator = BlockArgument.findIn(cc, lv, 0);
cx = (int)((NumericValue) lv.get(0).evalValue(c)).getLong(); BlockPos cpos = cposLocator.block.getPos();
cy = (int)((NumericValue) lv.get(1).evalValue(c)).getLong();
cz = (int)((NumericValue) lv.get(2).evalValue(c)).getLong(); cx = cpos.getX();
if (lv.size()==3) // only done this way because of stupid Java lambda final reqs 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{
smaxx = sminx;
smaxy = sminy;
smaxz = sminz;
}
}else{
sminx = 1; sminx = 1;
sminy = 1; sminy = 1;
sminz = 1; sminz = 1;
@@ -2332,30 +2355,7 @@ public class CarpetExpression
smaxy = 1; smaxy = 1;
smaxz = 1; smaxz = 1;
} }
else if (lv.size()==6)
{
sminx = (int) ((NumericValue) lv.get(3).evalValue(c)).getLong();
sminy = (int) ((NumericValue) lv.get(4).evalValue(c)).getLong();
sminz = (int) ((NumericValue) lv.get(5).evalValue(c)).getLong();
smaxx = sminx;
smaxy = sminy;
smaxz = sminz;
}
else // size == 9
{
sminx = (int) ((NumericValue) lv.get(3).evalValue(c)).getLong();
sminy = (int) ((NumericValue) lv.get(4).evalValue(c)).getLong();
sminz = (int) ((NumericValue) lv.get(5).evalValue(c)).getLong();
smaxx = (int)((NumericValue) lv.get(6).evalValue(c)).getLong();
smaxy = (int)((NumericValue) lv.get(7).evalValue(c)).getLong();
smaxz = (int)((NumericValue) lv.get(8).evalValue(c)).getLong();
}
}
catch (ClassCastException exc)
{
throw new InternalExpressionException("Attempted to pass a non-number to rect");
}
CarpetContext cc = (CarpetContext)c;
return (c_, t_) -> new LazyListValue() return (c_, t_) -> new LazyListValue()
{ {
final int minx = cx-sminx; final int minx = cx-sminx;
@@ -2364,6 +2364,7 @@ public class CarpetExpression
final int maxx = cx+smaxx; final int maxx = cx+smaxx;
final int maxy = cy+smaxy; final int maxy = cy+smaxy;
final int maxz = cz+smaxz; final int maxz = cz+smaxz;
int x; int x;
int y; int y;
int z; int z;
@@ -2423,10 +2424,9 @@ public class CarpetExpression
this.expr.addLazyFunction("diamond", -1, (c, t, lv)-> this.expr.addLazyFunction("diamond", -1, (c, t, lv)->
{ {
CarpetContext cc = (CarpetContext)c; CarpetContext cc = (CarpetContext)c;
if (lv.size() != 3 && lv.size() != 4 && lv.size() != 5)
{ BlockArgument cposLocator=BlockArgument.findIn((CarpetContext)c,lv,0);
throw new InternalExpressionException("'diamond' region should be specified with 3 to 5 coordinates"); BlockPos cpos = cposLocator.block.getPos();
}
int cx; int cx;
int cy; int cy;
@@ -2435,10 +2435,11 @@ public class CarpetExpression
int height; int height;
try try
{ {
cx = (int)((NumericValue) lv.get(0).evalValue(c)).getLong(); cx = cpos.getX();
cy = (int)((NumericValue) lv.get(1).evalValue(c)).getLong(); cy = cpos.getY();
cz = (int)((NumericValue) lv.get(2).evalValue(c)).getLong(); cz = cpos.getZ();
if (lv.size()==3)
if (lv.size()==1+cposLocator.offset)
{ {
Value retval = ListValue.of( Value retval = ListValue.of(
BlockValue.fromCoords(cc, cx, cy-1, cz), BlockValue.fromCoords(cc, cx, cy-1, cz),
@@ -2451,15 +2452,17 @@ public class CarpetExpression
); );
return (_c, _t ) -> retval; return (_c, _t ) -> retval;
} }
else if (lv.size()==4) else if (lv.size()==2+cposLocator.offset)
{ {
width = (int) ((NumericValue) lv.get(3).evalValue(c)).getLong(); width = (int) ((NumericValue) lv.get(cposLocator.offset).evalValue(c)).getLong();
height = 0; height = 0;
} }
else // size == 5 else if(lv.size()==3+cposLocator.offset)
{ {
width = (int) ((NumericValue) lv.get(3).evalValue(c)).getLong(); width = (int) ((NumericValue) lv.get(cposLocator.offset).evalValue(c)).getLong();
height = (int) ((NumericValue) lv.get(4).evalValue(c)).getLong(); height = (int) ((NumericValue) lv.get(cposLocator.offset+1).evalValue(c)).getLong();
} else{
throw new InternalExpressionException("Incorrect number of arguments for diamond");
} }
} }
catch (ClassCastException exc) catch (ClassCastException exc)