Tweak command syntax for beacons & boxes

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommandBuilder.java b/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommandBuilder.java
index ab9e7d5c65360bc4ca79dffa11eae5d48bb87883..fa3b55b94e3f27191152a2de15e1a211a3d2c53c 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommandBuilder.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommandBuilder.java
@@ -14,11 +14,11 @@ class BeaconCommandBuilder {
     static LiteralArgumentBuilder<CommandSource> build(String command) {
         return Commands.literal(command)
                 .then(Commands.literal(ArgumentNames.ADD)
-                        .then(Commands.argument(LEVEL, Arguments.integer(1,4))
-                                .executes(BeaconCommandBuilder::addBeacon)
-                                .then(Commands.argument(ArgumentNames.POS, Arguments.coords())
+                        .then(Commands.argument(ArgumentNames.POS, Arguments.coords())
+                                .then(Commands.argument(LEVEL, Arguments.integer(1, 4))
                                         .executes(BeaconCommandBuilder::addBeacon)))
-                )
+                        .then(Commands.argument(LEVEL, Arguments.integer(1, 4))
+                                .executes(BeaconCommandBuilder::addBeacon)))
                 .then(Commands.literal(ArgumentNames.CLEAR)
                         .executes(context -> {
                             CustomBeaconProvider.clear();

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/BoxCommandBuilder.java b/src/main/java/com/irtimaled/bbor/client/commands/BoxCommandBuilder.java
index 422eda0fca8f0db10ea48efb54cd9c79766841b3..7670bbc88e420f018a78c7be93d892c289272a4a 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/BoxCommandBuilder.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/BoxCommandBuilder.java
@@ -13,7 +13,6 @@ class BoxCommandBuilder {
         return Commands.literal(command)
                 .then(Commands.literal(ArgumentNames.ADD)
                         .then(Commands.argument(ArgumentNames.FROM, Arguments.coords())
-                                .executes(BoxCommandBuilder::addBox)
                                 .then(Commands.argument(ArgumentNames.TO, Arguments.coords())
                                         .executes(BoxCommandBuilder::addBox))))
                 .then(Commands.literal(ArgumentNames.CLEAR)