Extract shared argument names

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/ArgumentNames.java b/src/main/java/com/irtimaled/bbor/client/commands/ArgumentNames.java
new file mode 100644 (file)
index 0000000..58b7553
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/commands/ArgumentNames.java
@@ -0,0 +1,10 @@
+package com.irtimaled.bbor.client.commands;
+
+public class ArgumentNames {
+    static final String ADD = "add";
+    static final String CLEAR = "clear";
+    static final String FROM = "from";
+    static final String TO = "to";
+    static final String POS = "pos";
+    static final String SET = "set";
+}

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommand.java
index 752f8c3689e76156b117a230477a1ca09bd8b038..71b9357b843080b7e26032bcbbebcd53c0b36cae 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommand.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/BeaconCommand.java
@@ -16,14 +16,11 @@ import net.minecraft.util.math.BlockPos;
 
 public class BeaconCommand {
     private static final String COMMAND = "bbor:beacon";
-    private static final String ADD = "add";
-    private static final String CLEAR = "clear";
-    private static final String POS = "pos";
     private static final String LEVEL = "level";
 
     public static void register(CommandDispatcher<ISuggestionProvider> commandDispatcher) {
         LiteralArgumentBuilder command = Commands.literal(COMMAND)
-                .then(Commands.literal(ADD)
+                .then(Commands.literal(ArgumentNames.ADD)
                         .then(Commands.argument(LEVEL, IntegerArgumentType.integer())
                                 .executes(context -> {
                                     BlockPos pos = new BlockPos(context.getSource().getPos());
@@ -31,24 +28,24 @@ public class BeaconCommand {
                                     addBeacon(context, pos, level);
                                     return 0;
                                 })
-                                .then(Commands.argument(POS, BlockPosArgument.blockPos())
+                                .then(Commands.argument(ArgumentNames.POS, BlockPosArgument.blockPos())
                                         .executes(context -> {
-                                            BlockPos pos = BlockPosArgument.getBlockPos(context, POS);
+                                            BlockPos pos = BlockPosArgument.getBlockPos(context, ArgumentNames.POS);
                                             int level = IntegerArgumentType.getInteger(context, LEVEL);
                                             addBeacon(context, pos, level);
                                             return 0;
                                         })))
                 )
-                .then(Commands.literal(CLEAR)
+                .then(Commands.literal(ArgumentNames.CLEAR)
                         .executes(context -> {
                             CustomBeaconProvider.clear();
 
                             CommandHelper.feedback(context, "bbor.commands.beacon.cleared.all");
                             return 0;
                         })
-                        .then(Commands.argument(POS, BlockPosArgument.blockPos())
+                        .then(Commands.argument(ArgumentNames.POS, BlockPosArgument.blockPos())
                                 .executes(context -> {
-                                    BlockPos pos = BlockPosArgument.getBlockPos(context, POS);
+                                    BlockPos pos = BlockPosArgument.getBlockPos(context, ArgumentNames.POS);
                                     boolean removed = CustomBeaconProvider.remove(new Coords(pos));
 
                                     String format = removed ? "bbor.commands.beacon.cleared" : "bbor.commands.beacon.notFound";

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/BoxCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/BoxCommand.java
index 29d50a45b2400b78cae1fd49bf472efdb14e7fb1..b2397f61d869ffb0a56f9efa846a04596a462da5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/BoxCommand.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/BoxCommand.java
@@ -11,19 +11,15 @@ import net.minecraft.util.math.BlockPos;
 
 public class BoxCommand {
     private static final String COMMAND = "bbor:box";
-    private static final String ADD = "add";
-    private static final String CLEAR = "clear";
-    private static final String FROM = "from";
-    private static final String TO = "to";
 
     public static void register(CommandDispatcher<ISuggestionProvider> commandDispatcher) {
         LiteralArgumentBuilder command = Commands.literal(COMMAND)
-                .then(Commands.literal(ADD)
-                        .then(Commands.argument(FROM, BlockPosArgument.blockPos())
-                                .then(Commands.argument(TO, BlockPosArgument.blockPos())
+                .then(Commands.literal(ArgumentNames.ADD)
+                        .then(Commands.argument(ArgumentNames.FROM, BlockPosArgument.blockPos())
+                                .then(Commands.argument(ArgumentNames.TO, BlockPosArgument.blockPos())
                                         .executes(context -> {
-                                            BlockPos from = BlockPosArgument.getBlockPos(context, FROM);
-                                            BlockPos to = BlockPosArgument.getBlockPos(context, TO);
+                                            BlockPos from = BlockPosArgument.getBlockPos(context, ArgumentNames.FROM);
+                                            BlockPos to = BlockPosArgument.getBlockPos(context, ArgumentNames.TO);
                                             Coords minCoords = getMinCoords(from, to);
                                             Coords maxCoords = getMaxCoords(from, to);
                                             CustomBoxProvider.add(minCoords, maxCoords);
@@ -33,18 +29,18 @@ public class BoxCommand {
                                                     to.getX(), to.getY(), to.getZ());
                                             return 0;
                                         }))))
-                .then(Commands.literal(CLEAR)
+                .then(Commands.literal(ArgumentNames.CLEAR)
                         .executes(context -> {
                             CustomBoxProvider.clear();
 
                             CommandHelper.feedback(context, "bbor.commands.box.cleared.all");
                             return 0;
                         })
-                        .then(Commands.argument(FROM, BlockPosArgument.blockPos())
-                                .then(Commands.argument(TO, BlockPosArgument.blockPos())
+                        .then(Commands.argument(ArgumentNames.FROM, BlockPosArgument.blockPos())
+                                .then(Commands.argument(ArgumentNames.TO, BlockPosArgument.blockPos())
                                         .executes(context -> {
-                                            BlockPos from = BlockPosArgument.getBlockPos(context, FROM);
-                                            BlockPos to = BlockPosArgument.getBlockPos(context, TO);
+                                            BlockPos from = BlockPosArgument.getBlockPos(context, ArgumentNames.FROM);
+                                            BlockPos to = BlockPosArgument.getBlockPos(context, ArgumentNames.TO);
                                             Coords minCoords = getMinCoords(from, to);
                                             Coords maxCoords = getMaxCoords(from, to);
                                             boolean removed = CustomBoxProvider.remove(minCoords, maxCoords);

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java
index 48ab1ae11b457a4e16c19c25c52b56b713fc9c2c..0cb9a1be36d2d9f564ea3165386aac9f72bc8b76 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java
@@ -16,7 +16,6 @@ import java.util.function.Function;
 public class ConfigCommand {
     private static final String COMMAND = "bbor:config";
     private static final String GET = "get";
-    private static final String SET = "set";
     private static final String SAVE = "save";
     private static final String SHOW_GUI = "showGui";
     private static final String VALUE = "value";
@@ -24,7 +23,7 @@ public class ConfigCommand {
     public static void register(CommandDispatcher<ISuggestionProvider> commandDispatcher) {
         LiteralArgumentBuilder command = Commands.literal(COMMAND)
                 .then(buildCommands(GET, ConfigCommand::getCommandForSetting))
-                .then(buildCommands(SET, ConfigCommand::setCommandForSetting))
+                .then(buildCommands(ArgumentNames.SET, ConfigCommand::setCommandForSetting))
                 .then(Commands.literal(SAVE)
                         .executes(context -> {
                             ConfigManager.saveConfig();

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/SpawningSphereCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/SpawningSphereCommand.java
index c109863bb6d5f05b35292f0bf0bdbd919c2c705c..cf3594675920757d2c0b031048688ac92dff1e99 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/SpawningSphereCommand.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/SpawningSphereCommand.java
@@ -14,17 +14,14 @@ import net.minecraft.world.World;
 
 public class SpawningSphereCommand {
     private static final String COMMAND = "bbor:spawningSphere";
-    private static final String SET = "set";
-    private static final String POS = "pos";
-    private static final String CLEAR = "clear";
     private static final String CALCULATE_SPAWNABLE = "calculateSpawnable";
 
     public static void register(CommandDispatcher<ISuggestionProvider> commandDispatcher) {
         LiteralArgumentBuilder command = Commands.literal(COMMAND)
-                .then(Commands.literal(SET)
-                        .then(Commands.argument(POS, Vec3Argument.vec3())
+                .then(Commands.literal(ArgumentNames.SET)
+                        .then(Commands.argument(ArgumentNames.POS, Vec3Argument.vec3())
                                 .executes(context -> {
-                                    Vec3d pos = Vec3Argument.getVec3(context, POS);
+                                    Vec3d pos = Vec3Argument.getVec3(context, ArgumentNames.POS);
                                     SpawningSphereProvider.setSphere(pos.x, pos.y, pos.z);
 
                                     CommandHelper.feedback(context, "bbor.commands.spawningSphere.set");
@@ -37,7 +34,7 @@ public class SpawningSphereCommand {
                             CommandHelper.feedback(context, "bbor.commands.spawningSphere.set");
                             return 0;
                         }))
-                .then(Commands.literal(CLEAR)
+                .then(Commands.literal(ArgumentNames.CLEAR)
                         .executes(context -> {
                             boolean cleared = SpawningSphereProvider.clear();
 

diff --git a/src/main/java/com/irtimaled/bbor/client/commands/StructuresCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/StructuresCommand.java
index b0ef080a1405c467dab7ef442d65770f3cd42703..6b950d424ce286bdc3881f7de032bbe3bcb8fe99 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/commands/StructuresCommand.java
+++ b/src/main/java/com/irtimaled/bbor/client/commands/StructuresCommand.java
@@ -10,7 +10,6 @@ import net.minecraft.command.ISuggestionProvider;
 public class StructuresCommand {
     private static final String COMMAND = "bbor:structures";
     private static final String LOAD = "load";
-    private static final String CLEAR = "clear";
 
     public static void register(CommandDispatcher<ISuggestionProvider> commandDispatcher) {
         LiteralArgumentBuilder command = Commands.literal(COMMAND)
@@ -19,7 +18,7 @@ public class StructuresCommand {
                             LoadSavesScreen.show();
                             return 0;
                         }))
-                .then(Commands.literal(CLEAR)
+                .then(Commands.literal(ArgumentNames.CLEAR)
                         .executes(context -> {
                             ClientInterop.clearStructures();
                             return 0;