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

structures API call 1.15

Browse Source
This commit is contained in:
gnembon committed 2020-01-12 22:19:31 -04:00
1 parent f2427c6c07
commit 6a6c8ac597
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/CarpetExpression.java
+3 -3
View File
@@ -87,7 +87,7 @@ import net.minecraft.util.math.Box;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.EulerAngle; import net.minecraft.util.math.EulerAngle;
import net.minecraft.util.math.MutableIntBoundingBox; import net.minecraft.util.math.BlockBox;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
@@ -1247,7 +1247,7 @@ public class CarpetExpression
StructureStart start = entry.getValue(); StructureStart start = entry.getValue();
if (start == StructureStart.DEFAULT) if (start == StructureStart.DEFAULT)
continue; continue;
MutableIntBoundingBox box = start.getBoundingBox(); BlockBox box = start.getBoundingBox();
ListValue coord1 = ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)); ListValue coord1 = ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ));
ListValue coord2 = ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ)); ListValue coord2 = ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ));
strucutureList.put(new StringValue(entry.getKey()), ListValue.of(coord1, coord2)); strucutureList.put(new StringValue(entry.getKey()), ListValue.of(coord1, coord2));
@@ -1262,7 +1262,7 @@ public class CarpetExpression
List<Value> pieces = new ArrayList<>(); List<Value> pieces = new ArrayList<>();
for (StructurePiece piece : start.getChildren()) for (StructurePiece piece : start.getChildren())
{ {
MutableIntBoundingBox box = piece.getBoundingBox(); BlockBox box = piece.getBoundingBox();
pieces.add(ListValue.of( pieces.add(ListValue.of(
new StringValue( NBTSerializableValue.nameFromRegistryId(Registry.STRUCTURE_PIECE.getId(piece.getType()))), new StringValue( NBTSerializableValue.nameFromRegistryId(Registry.STRUCTURE_PIECE.getId(piece.getType()))),
(piece.getFacing()== null)?Value.NULL: new StringValue(piece.getFacing().getName()), (piece.getFacing()== null)?Value.NULL: new StringValue(piece.getFacing().getName()),