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

Added pyramid literal

Browse Source 
FIrst step towards adding other shape pyramids
This commit is contained in:
Nameless-123 committed 2020-04-20 17:00:51 +02:00
1 parent fe0ecccd4f
commit e0828513fa
1 file changed
+64 -61
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/commands/DrawCommand.java
+64 -61
View File
@@ -70,77 +70,79 @@ public class DrawCommand {
) )
) )
) )
.then(literal("cone") .then(literal("pyramid")
.then(argument("center", BlockPosArgumentType.blockPos()) .then(literal("cone")
.then(argument("radius", IntegerArgumentType.integer(1)) .then(argument("center", BlockPosArgumentType.blockPos())
.then(argument("height",IntegerArgumentType.integer(1)) .then(argument("radius", IntegerArgumentType.integer(1))
.then(argument("pointing up?",BoolArgumentType.bool()) .then(argument("height",IntegerArgumentType.integer(1))
.then(literal("x") .then(argument("pointing up?",BoolArgumentType.bool())
.then(argument("block", BlockStateArgumentType.blockState()) .then(literal("x")
.executes((c) -> drawCone(c.getSource(), .then(argument("block", BlockStateArgumentType.blockState())
BlockPosArgumentType.getBlockPos(c, "center"), .executes((c) -> drawCone(c.getSource(),
IntegerArgumentType.getInteger(c, "radius"), BlockPosArgumentType.getBlockPos(c, "center"),
IntegerArgumentType.getInteger(c, "height"), IntegerArgumentType.getInteger(c, "radius"),
BoolArgumentType.getBool(c,"pointing up?"),"x", IntegerArgumentType.getInteger(c, "height"),
BlockStateArgumentType.getBlockState(c, "block"), null) BoolArgumentType.getBool(c,"pointing up?"),"x",
) BlockStateArgumentType.getBlockState(c, "block"), null)
.then(literal("replace") )
.then(argument("filter", BlockPredicateArgumentType.blockPredicate()) .then(literal("replace")
.executes((c) -> drawCone(c.getSource(), .then(argument("filter", BlockPredicateArgumentType.blockPredicate())
BlockPosArgumentType.getBlockPos(c, "center"), .executes((c) -> drawCone(c.getSource(),
IntegerArgumentType.getInteger(c, "radius"), BlockPosArgumentType.getBlockPos(c, "center"),
IntegerArgumentType.getInteger(c, "height"), IntegerArgumentType.getInteger(c, "radius"),
BoolArgumentType.getBool(c,"pointing up?"),"x", IntegerArgumentType.getInteger(c, "height"),
BlockStateArgumentType.getBlockState(c, "block"), BoolArgumentType.getBool(c,"pointing up?"),"x",
BlockPredicateArgumentType.getBlockPredicate(c,"filter") BlockStateArgumentType.getBlockState(c, "block"),
BlockPredicateArgumentType.getBlockPredicate(c,"filter")
)
) )
) )
) )
) )
) )
) .then(literal("y")
.then(literal("y") .then(argument("block", BlockStateArgumentType.blockState())
.then(argument("block", BlockStateArgumentType.blockState()) .executes((c) -> drawCone(c.getSource(),
.executes((c) -> drawCone(c.getSource(), BlockPosArgumentType.getBlockPos(c, "center"),
BlockPosArgumentType.getBlockPos(c, "center"), IntegerArgumentType.getInteger(c, "radius"),
IntegerArgumentType.getInteger(c, "radius"), IntegerArgumentType.getInteger(c, "height"),
IntegerArgumentType.getInteger(c, "height"), BoolArgumentType.getBool(c,"pointing up?"),"y",
BoolArgumentType.getBool(c,"pointing up?"),"y", BlockStateArgumentType.getBlockState(c, "block"), null)
BlockStateArgumentType.getBlockState(c, "block"), null) )
) .then(literal("replace")
.then(literal("replace") .then(argument("filter", BlockPredicateArgumentType.blockPredicate())
.then(argument("filter", BlockPredicateArgumentType.blockPredicate()) .executes((c) -> drawCone(c.getSource(),
.executes((c) -> drawCone(c.getSource(), BlockPosArgumentType.getBlockPos(c, "center"),
BlockPosArgumentType.getBlockPos(c, "center"), IntegerArgumentType.getInteger(c, "radius"),
IntegerArgumentType.getInteger(c, "radius"), IntegerArgumentType.getInteger(c, "height"),
IntegerArgumentType.getInteger(c, "height"), BoolArgumentType.getBool(c,"pointing up?"),"y",
BoolArgumentType.getBool(c,"pointing up?"),"y", BlockStateArgumentType.getBlockState(c, "block"),
BlockStateArgumentType.getBlockState(c, "block"), BlockPredicateArgumentType.getBlockPredicate(c,"filter")
BlockPredicateArgumentType.getBlockPredicate(c,"filter") )
) )
) )
) )
) )
) )
) .then(literal("z")
.then(literal("z") .then(argument("block", BlockStateArgumentType.blockState())
.then(argument("block", BlockStateArgumentType.blockState()) .executes((c) -> drawCone(c.getSource(),
.executes((c) -> drawCone(c.getSource(), BlockPosArgumentType.getBlockPos(c, "center"),
BlockPosArgumentType.getBlockPos(c, "center"), IntegerArgumentType.getInteger(c, "radius"),
IntegerArgumentType.getInteger(c, "radius"), IntegerArgumentType.getInteger(c, "height"),
IntegerArgumentType.getInteger(c, "height"), BoolArgumentType.getBool(c,"pointing up?"),"z",
BoolArgumentType.getBool(c,"pointing up?"),"z", BlockStateArgumentType.getBlockState(c, "block"), null)
BlockStateArgumentType.getBlockState(c, "block"), null) )
) .then(literal("replace")
.then(literal("replace") .then(argument("filter", BlockPredicateArgumentType.blockPredicate())
.then(argument("filter", BlockPredicateArgumentType.blockPredicate()) .executes((c) -> drawCone(c.getSource(),
.executes((c) -> drawCone(c.getSource(), BlockPosArgumentType.getBlockPos(c, "center"),
BlockPosArgumentType.getBlockPos(c, "center"), IntegerArgumentType.getInteger(c, "radius"),
IntegerArgumentType.getInteger(c, "radius"), IntegerArgumentType.getInteger(c, "height"),
IntegerArgumentType.getInteger(c, "height"), BoolArgumentType.getBool(c,"pointing up?"),"z",
BoolArgumentType.getBool(c,"pointing up?"),"z", BlockStateArgumentType.getBlockState(c, "block"),
BlockStateArgumentType.getBlockState(c, "block"), BlockPredicateArgumentType.getBlockPredicate(c,"filter")
BlockPredicateArgumentType.getBlockPredicate(c,"filter") )
) )
) )
) )
@@ -151,6 +153,7 @@ public class DrawCommand {
) )
) )
) )
); );
dispatcher.register(command); dispatcher.register(command);
} }