Allow using block tags where multiple blocks were allowed already

Author: ZacSharp

src/main/java/baritone/command/defaults/MineCommand.java

@@ -21,8 +21,9 @@
 import baritone.api.IBaritone;
 import baritone.api.command.Command;
 import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.datatypes.ForBlockOptionalMeta;
+import baritone.api.command.datatypes.ForBlockOptionalMetaLookup;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.utils.BlockOptionalMeta;
 
 import java.util.ArrayList;
@@ -42,7 +43,10 @@ public void execute(String label, IArgConsumer args) throws CommandException {
         args.requireMin(1);
         List<BlockOptionalMeta> boms = new ArrayList<>();
         while (args.hasAny()) {
-            boms.add(args.getDatatypeFor(ForBlockOptionalMeta.INSTANCE));
+            boms.addAll(args.getDatatypeFor(ForBlockOptionalMetaLookup.INSTANCE).blocks());
+        }
+        if (boms.size() == 0) {
+            throw new CommandInvalidStateException("No target blocks specified");
         }
         BaritoneAPI.getProvider().getWorldScanner().repack(ctx);
         logDirect(String.format("Mining %s", boms.toString()));

src/main/java/baritone/command/defaults/SelCommand.java

@@ -23,6 +23,7 @@
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.ForAxis;
 import baritone.api.command.datatypes.ForBlockOptionalMeta;
+import baritone.api.command.datatypes.ForBlockOptionalMetaLookup;
 import baritone.api.command.datatypes.ForDirection;
 import baritone.api.command.datatypes.RelativeBlockPos;
 import baritone.api.command.exception.CommandException;
@@ -133,9 +134,12 @@ public void execute(String label, IArgConsumer args) throws CommandException {
                 List<BlockOptionalMeta> replacesList = new ArrayList<>();
                 replacesList.add(type);
                 while (args.has(2)) {
-                    replacesList.add(args.getDatatypeFor(ForBlockOptionalMeta.INSTANCE));
+                    replacesList.addAll(args.getDatatypeFor(ForBlockOptionalMetaLookup.INSTANCE).blocks());
                 }
                 type = args.getDatatypeFor(ForBlockOptionalMeta.INSTANCE);
+                if (replacesList.size() == 0) {
+                    throw new CommandInvalidStateException("No target blocks specified");
+                }
                 replaces = new BlockOptionalMetaLookup(replacesList.toArray(new BlockOptionalMeta[0]));
                 alignment = null;
             } else if (action == Action.CYLINDER || action == Action.HCYLINDER) {