From e674e93a15435a9fba18fe9fc87104a6953f05c0 Mon Sep 17 00:00:00 2001 From: Irtimaled Date: Thu, 14 May 2020 12:16:57 -0700 Subject: [PATCH] Tweak command syntax for beacons & boxes --- .../bbor/client/commands/BeaconCommandBuilder.java | 8 ++++---- .../irtimaled/bbor/client/commands/BoxCommandBuilder.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) 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 ab9e7d5..fa3b55b 100644 --- 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 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 422eda0..7670bbc 100644 --- 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) -- 2.44.0