reworked Command

removed CommandExecutor
added methods execute and tabComplete to Command
made Command keep track of the command name
CommandManager now only takes a CommandBuilder, since the built Command will supply the command's name

Author: DatAsianBoi123

src/main/java/com/datasiqn/commandcore/CommandCore.java

@@ -173,7 +173,7 @@ public static CommandCore getInstance() {
         command.setExecutor(mainCommand);
         command.setTabCompleter(mainCommand);
 
-        if (options.createHelpCommand()) instance.commandManager.registerCommand("help", new CommandBuilder()
+        if (options.createHelpCommand()) instance.commandManager.registerCommand(new CommandBuilder("help")
                 .description("Shows the help menu")
                 .then(ArgumentBuilder.argument(ArgumentType.COMMAND, "command")
                         .executes(context -> {

src/main/java/com/datasiqn/commandcore/MainCommand.java

@@ -39,7 +39,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
             }
             List<String> listArgs = new ArrayList<>(Arrays.asList(args));
             listArgs.remove(0);
-            Result<None, List<String>> output = cmd.getExecutor().execute(CommandCore.createContext(CommandCore.createSource(sender), cmd, args[0], new ListArguments(listArgs)));
+            Result<None, List<String>> output = cmd.execute(CommandCore.createContext(CommandCore.createSource(sender), cmd, args[0], new ListArguments(listArgs)));
             output.ifError(messages -> {
                 for (String message : messages) sender.sendMessage(ChatColor.RED + message);
                 sender.sendMessage(ChatColor.GRAY + "Usage(s):");
@@ -65,7 +65,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull org.bu
             if (cmd == null || (cmd.getPermissionString() != null && !sender.hasPermission(cmd.getPermissionString()))) return new ArrayList<>();
             List<String> listArgs = new ArrayList<>(Arrays.asList(args));
             listArgs.remove(0);
-            TabComplete complete = cmd.getExecutor().getTabComplete(CommandCore.createContext(CommandCore.createSource(sender), cmd, args[0], new ListArguments(listArgs)));
+            TabComplete complete = cmd.tabComplete(CommandCore.createContext(CommandCore.createSource(sender), cmd, args[0], new ListArguments(listArgs)));
             matchingString = complete.getMatchingString();
             tabComplete.addAll(complete.values());
         }

src/main/java/com/datasiqn/commandcore/command/Command.java

@@ -1,19 +1,45 @@
 package com.datasiqn.commandcore.command;
 
+import com.datasiqn.resultapi.None;
+import com.datasiqn.resultapi.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
  * Represents a command
  */
 public interface Command {
     /**
-     * Gets the executor for this command
-     * @return The executor
+     * Gets this command's name
+     * @return The name
      */
-    @NotNull CommandExecutor getExecutor();
+    @NotNull String getName();
+
+    /**
+     * Gets the aliases of this command
+     * @return The aliases
+     */
+    @NotNull String @NotNull [] getAliases();
+
+    /**
+     * Executes this command executor
+     * @param context The context in which this command was executed
+     * @return The result of the command
+     */
+    @NotNull Result<None, List<String>> execute(CommandContext context);
+
+    /**
+     * Gets the tabcomplete for this command executor
+     * @param context The context in which this command was tab completed
+     * @return The tab completions
+     */
+    default @NotNull TabComplete tabComplete(CommandContext context) {
+        // matching string is blank because tab complete is an empty list
+        return new TabComplete(Collections.emptyList(), "");
+    }
 
     /**
      * Gets the permission for this command, registered in the plugin.yml file
@@ -44,10 +70,4 @@ public interface Command {
      * @return The usages
      */
     @NotNull List<String> getUsages();
-
-    /**
-     * Gets the aliases of this command
-     * @return The aliases
-     */
-    @NotNull String[] getAliases();
 }

src/main/java/com/datasiqn/commandcore/command/CommandExecutor.java

@@ -4,32 +4,53 @@
 import com.datasiqn.commandcore.argument.ArgumentReader;
 import com.datasiqn.commandcore.argument.Arguments;
 import com.datasiqn.commandcore.argument.ListArguments;
-import com.datasiqn.commandcore.command.CommandExecutor;
+import com.datasiqn.commandcore.command.Command;
 import com.datasiqn.commandcore.command.TabComplete;
-import com.datasiqn.commandcore.command.context.CommandContext;
+import com.datasiqn.commandcore.command.CommandContext;
 import com.datasiqn.resultapi.None;
 import com.datasiqn.resultapi.Result;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
-class BuilderExecutor implements CommandExecutor {
+class BuilderCommand implements Command {
+    private final String name;
+    private final String[] aliases;
+    private final String description;
+    private final String permission;
+    private final List<String> usages;
+
     private final Set<CommandNode<?>> nodes;
     private final Consumer<CommandContext> executor;
-    private final List<Function<CommandContext, Result<None, String>>> requires;
+    private final List<CommandLink.Require> requires;
+
+    public BuilderCommand(@NotNull CommandBuilder commandBuilder, List<String> usages) {
+        this.name = commandBuilder.name;
+        this.aliases = commandBuilder.aliases;
+        this.description = commandBuilder.description;
+        this.permission = commandBuilder.permission;
+        this.usages = usages;
+        this.nodes = commandBuilder.children;
+        this.executor = commandBuilder.executor;
+        this.requires = commandBuilder.requires;
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return name;
+    }
 
-    BuilderExecutor(Consumer<CommandContext> executor, Set<CommandNode<?>> nodes, List<Function<CommandContext, Result<None, String>>> requires) {
-        this.nodes = nodes;
-        this.executor = executor;
-        this.requires = requires;
+    @Override
+    public @NotNull String @NotNull [] getAliases() {
+        return aliases;
     }
 
     @Override
@@ -43,7 +64,7 @@ class BuilderExecutor implements CommandExecutor {
         if (size >= 1) {
             if (nodes.isEmpty()) return Result.error(Collections.singletonList("Expected no parameters, but got parameters instead"));
 
-            CurrentNode current = findCurrentNode(reader);
+            BuilderCommand.CurrentNode current = findCurrentNode(reader);
             Result<CommandNode<?>, List<String>> resultNode = current.node;
             if (resultNode.isError()) {
                 if (current.extraInput) {
@@ -80,7 +101,7 @@ class BuilderExecutor implements CommandExecutor {
     }
 
     @Override
-    public @NotNull TabComplete getTabComplete(@NotNull CommandContext context) {
+    public @NotNull TabComplete tabComplete(@NotNull CommandContext context) {
         Arguments args = context.getArguments();
 
         if (args.size() >= 1) {
@@ -91,7 +112,7 @@ class BuilderExecutor implements CommandExecutor {
             String matchingString = args.getString(args.size() - 1);
 
             if (args.size() != 1) {
-                CurrentNode current = findCurrentNode(reader);
+                BuilderCommand.CurrentNode current = findCurrentNode(reader);
                 List<CommandNode<?>> nodeList = current.nodes;
                 if (nodeList.size() != 0) {
                     CommandNode<?> node = nodeList.get(nodeList.size() - 1);
@@ -106,15 +127,40 @@ class BuilderExecutor implements CommandExecutor {
             }
             return new TabComplete(tabcomplete, matchingString);
         }
-        return CommandExecutor.super.getTabComplete(context);
+        return Command.super.tabComplete(context);
+    }
+
+    @Override
+    public @Nullable String getPermissionString() {
+        return permission;
+    }
+
+    @Override
+    public boolean hasPermission() {
+        return permission != null;
+    }
+
+    @Override
+    public @Nullable String getDescription() {
+        return description;
+    }
+
+    @Override
+    public boolean hasDescription() {
+        return description != null;
+    }
+
+    @Override
+    public @NotNull List<String> getUsages() {
+        return usages;
     }
 
     @Contract("_, _ -> new")
-    private @NotNull CommandContext buildContext(@NotNull CommandContext context, @NotNull CurrentNode result) {
+    private @NotNull CommandContext buildContext(@NotNull CommandContext context, @NotNull BuilderCommand.CurrentNode result) {
         return CommandCore.createContext(context.getSource(), context.getCommand(), context.getLabel(), new ListArguments(result.args));
     }
 
-    private @NotNull Result<ApplicableNode, List<String>> checkApplicable(@NotNull ArgumentReader reader, @NotNull Set<CommandNode<?>> nodes) {
+    private @NotNull Result<BuilderCommand.ApplicableNode, List<String>> checkApplicable(@NotNull ArgumentReader reader, @NotNull Set<CommandNode<?>> nodes) {
         List<CommandNode<?>> options = new ArrayList<>();
         List<String> exceptions = new ArrayList<>();
         if (reader.index() != 0) reader.next();
@@ -131,25 +177,25 @@ class BuilderExecutor implements CommandExecutor {
         String arg;
         if (reader.atEnd()) arg = reader.splice(beforeIndex);
         else arg = reader.splice(beforeIndex, reader.index());
-        return Result.ok(new ApplicableNode(options.get(0), arg));
+        return Result.ok(new BuilderCommand.ApplicableNode(options.get(0), arg));
     }
 
     @Contract("_ -> new")
-    private @NotNull BuilderExecutor.CurrentNode findCurrentNode(@NotNull ArgumentReader reader) {
+    private @NotNull BuilderCommand.CurrentNode findCurrentNode(@NotNull ArgumentReader reader) {
         Set<CommandNode<?>> nodeSet = nodes;
         List<String> args = new ArrayList<>();
         List<CommandNode<?>> nodeList = new ArrayList<>();
         CommandNode<?> node = null;
         while (!reader.atEnd()) {
-            if (nodeSet.isEmpty()) return new CurrentNode(Result.error(Collections.emptyList()), nodeList, args, true);
-            Result<ApplicableNode, List<String>> parseResult = checkApplicable(reader, nodeSet);
+            if (nodeSet.isEmpty()) return new BuilderCommand.CurrentNode(Result.error(Collections.emptyList()), nodeList, args, true);
+            Result<BuilderCommand.ApplicableNode, List<String>> parseResult = checkApplicable(reader, nodeSet);
             if (parseResult.isError()) {
                 System.out.println("errors: " + String.join(",", parseResult.unwrapError()));
                 System.out.println("args is " + String.join(",", args));
                 args.add(reader.splice(reader.index()));
-                return new CurrentNode(Result.error(parseResult.unwrapError()), nodeList, args, false);
+                return new BuilderCommand.CurrentNode(Result.error(parseResult.unwrapError()), nodeList, args, false);
             }
-            ApplicableNode applicableNode = parseResult.unwrap();
+            BuilderCommand.ApplicableNode applicableNode = parseResult.unwrap();
             node = applicableNode.node;
             nodeSet = node.getChildren();
             nodeList.add(node);
@@ -158,7 +204,7 @@ class BuilderExecutor implements CommandExecutor {
             if (reader.atEnd() && reader.get() == ' ') args.add("");
         }
         System.out.println("args is " + String.join(",", args));
-        return new CurrentNode(Result.ok(node), nodeList, args, false);
+        return new BuilderCommand.CurrentNode(Result.ok(node), nodeList, args, false);
     }
 
     private static class ApplicableNode {

src/main/java/com/datasiqn/commandcore/command/builder/BuilderExecutor.java renamed to src/main/java/com/datasiqn/commandcore/command/builder/BuilderCommand.java

@@ -1,7 +1,6 @@
 package com.datasiqn.commandcore.command.builder;
 
 import com.datasiqn.commandcore.command.Command;
-import com.datasiqn.commandcore.command.CommandExecutor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,14 +11,18 @@
  * Represents a builder that creates commands
  */
 public class CommandBuilder extends CommandLink<CommandBuilder> {
-    private String permission;
-    private String description;
-    private String[] aliases;
+    protected final String name;
+    protected String permission;
+    protected String description;
+    protected String[] aliases = new String[0];
 
     /**
      * Creates a new {@code CommandBuilder}
+     * @param name The name of the command
      */
-    public CommandBuilder() {}
+    public CommandBuilder(@NotNull String name) {
+        this.name = name;
+    }
 
     /**
      * Sets the permission of the command
@@ -46,7 +49,7 @@ public CommandBuilder description(@Nullable String description) {
      * @param aliases The aliases
      * @return The builder, for chaining
      */
-    public CommandBuilder alias(@NotNull String @Nullable ... aliases) {
+    public CommandBuilder alias(@NotNull String @NotNull ... aliases) {
         this.aliases = aliases;
         return this;
     }
@@ -67,61 +70,11 @@ public CommandBuilder alias(@NotNull String @Nullable ... aliases) {
         }
         if (executor != null && hasOptional && canBeOptional) usages.remove(0);
 
-        return new BuilderCommand(usages);
+        return new BuilderCommand(this, usages);
     }
 
     @Override
     protected @NotNull CommandBuilder getThis() {
         return this;
     }
-
-    private class BuilderCommand implements Command {
-        private final String description;
-        private final String permission;
-        private final List<String> usages;
-        private final CommandExecutor commandExecutor;
-
-        public BuilderCommand(List<String> usages) {
-            this.description = CommandBuilder.this.description;
-            this.permission = CommandBuilder.this.permission;
-            this.usages = usages;
-
-            this.commandExecutor = new BuilderExecutor(executor, children, requires);
-        }
-
-        @Override
-        public @NotNull CommandExecutor getExecutor() {
-            return commandExecutor;
-        }
-
-        @Override
-        public @Nullable String getPermissionString() {
-            return permission;
-        }
-
-        @Override
-        public boolean hasPermission() {
-            return permission != null;
-        }
-
-        @Override
-        public @Nullable String getDescription() {
-            return description;
-        }
-
-        @Override
-        public boolean hasDescription() {
-            return description != null;
-        }
-
-        @Override
-        public @NotNull List<String> getUsages() {
-            return usages;
-        }
-
-        @Override
-        public @NotNull String[] getAliases() {
-            return aliases == null ? new String[0] : aliases;
-        }
-    }
 }