From 787cf750b5b88fbd10cea96b8d6efa8208c54f1e Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 13 Jan 2020 08:34:32 -0400 Subject: [PATCH 1/2] structures API call 1.15 --- src/main/java/carpet/script/CarpetExpression.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 8fdaa0ca..0467770b 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -616,6 +616,13 @@ public class CarpetExpression * but chunks can only be valid in a few states: full, features, liquid_carvers, * and structure_starts. Returns null if the chunk is not in memory unless called with optional * true.

+ *

structures(pos), structures(pos, structure_name)

+ *

Returns structure information for a given block position. Note that strucuture information is the same for + * all the blocks from the same chunk. structures function can be called with a block, or a block and + * structure name. In the first case it returns a map of structures at a given position, keyed by structure name, + * with values indicating the bounding box of the structure - a pair of two 3-value coords (see examples). When + * called with extra structure name, returns list of components for that structure, with their name, direction + * and two sets of coordinates indicating the bounding box of the structure piece.

*

suffocates(pos)

*

Boolean function, true if the block causes suffocation.

*

power(pos)

From 1bf1dd254fe3aa6e8cde4bbac627dcf26543abdf Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 13 Jan 2020 23:08:08 -0400 Subject: [PATCH 2/2] docs --- .../java/carpet/script/CarpetExpression.java | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 0467770b..5bdde4ad 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; +import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.objects.ObjectSortedSet; import net.minecraft.block.BarrierBlock; import net.minecraft.block.BedrockBlock; @@ -619,10 +620,17 @@ public class CarpetExpression *

structures(pos), structures(pos, structure_name)

*

Returns structure information for a given block position. Note that strucuture information is the same for * all the blocks from the same chunk. structures function can be called with a block, or a block and - * structure name. In the first case it returns a map of structures at a given position, keyed by structure name, + * a structure name. In the first case it returns a map of structures at a given position, keyed by structure name, * with values indicating the bounding box of the structure - a pair of two 3-value coords (see examples). When - * called with extra structure name, returns list of components for that structure, with their name, direction + * called with an extra structure name, returns list of components for that structure, with their name, direction * and two sets of coordinates indicating the bounding box of the structure piece.

+ *

structure_references(pos), structure_references(pos, structure_name)

+ *

Returns structure information that a chunk with a given block position is part of. + * structure_references function can be called with a block, or a block and + * a structure name. In the first case it returns a list of structure names that give chunk belongs to. When + * called with an extra structure name, returns list of positions pointing to the lowest block position in chunks that + * hold structure starts for these structures. You can query that chunk structures then to get its bounding boxes.

+ *

suffocates(pos)

*

Boolean function, true if the block causes suffocation.

*

power(pos)

@@ -1237,6 +1245,33 @@ public class CarpetExpression return LazyValue.NULL; }); + this.expr.addLazyFunction("structure_references", -1, (c, t, lv) -> { + CarpetContext cc = (CarpetContext)c; + BlockValue.LocatorResult locator = BlockValue.fromParams(cc, lv, 0); + ServerWorld world = cc.s.getWorld(); + BlockPos pos = locator.block.getPos(); + Map references = world.getChunk(pos).getStructureReferences(); + if (lv.size() == locator.offset) + { + List referenceList = references.entrySet().stream(). + filter(e -> e.getValue()!= null && !e.getValue().isEmpty()). + map(e -> new StringValue(e.getKey())).collect(Collectors.toList()); + return (_c, _t ) -> ListValue.wrap(referenceList); + } + String structureName = lv.get(locator.offset).evalValue(c).getString(); + LongSet structureReferences = references.get(structureName); + if (structureReferences == null || structureReferences.isEmpty()) + { + Value ret = ListValue.of(); + return (_c, _t) -> ret; + } + Value ret = ListValue.wrap(structureReferences.stream().map(l -> ListValue.of( + new NumericValue(16*ChunkPos.getPackedX(l)), + Value.ZERO, + new NumericValue(16*ChunkPos.getPackedZ(l)))).collect(Collectors.toList())); + return (_c, _t) -> ret; + }); + this.expr.addLazyFunction("structures", -1, (c, t, lv) -> { CarpetContext cc = (CarpetContext)c; BlockValue.LocatorResult locator = BlockValue.fromParams(cc, lv, 0);