fix(command): 修复SimpleCompleter使用异常

新增指令相关API，便于快速制作指令与子指令。

README.md

@@ -37,7 +37,7 @@
 ### 主要部分 (`/base`)
 
 - Main [`easyplugin-main`](base/main)
-- ~~Command*~~ (已独立项目到 [**MineCommands**](https://github.com/CarmJos/MineCommands))
+- Command [`easyplugin-command`](base/command)
 - ~~Messages*~~ (已独立项目到 [**EasyMessages**](https://github.com/CarmJos/EasyMessages))
 - ~~Configuration~~ (已独立项目到 [**MineConfiguration**](https://github.com/CarmJos/MineConfiguration))
 - ~~Database~~ (已独立项目到 [**EasySQL**](https://github.com/CarmJos/EasySQL))

base/command/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>easyplugin-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>1.4.3</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>easyplugin-command</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java

@@ -0,0 +1,164 @@
+
+package cc.carm.lib.easyplugin.command;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public abstract class CommandHandler implements TabExecutor, NamedExecutor {
+
+    protected final @NotNull JavaPlugin plugin;
+    protected final @NotNull String cmd;
+    protected final @NotNull List<String> aliases;
+
+    protected final @NotNull Map<String, SubCommand> registeredCommands = new HashMap<>();
+    protected final @NotNull Map<String, CommandHandler> registeredHandlers = new HashMap<>();
+
+    protected final @NotNull Map<String, String> aliasesMap = new HashMap<>();
+
+    public CommandHandler(@NotNull JavaPlugin plugin) {
+        this(plugin, plugin.getName());
+    }
+
+    public CommandHandler(@NotNull JavaPlugin plugin, @NotNull String cmd) {
+        this(plugin, cmd, new String[0]);
+    }
+
+    public CommandHandler(@NotNull JavaPlugin plugin, @NotNull String cmd, @NotNull String... aliases) {
+        this.plugin = plugin;
+        this.cmd = cmd;
+        this.aliases = Arrays.asList(aliases);
+    }
+
+    public abstract void noArgs(CommandSender sender);
+
+    public abstract void unknownCommand(CommandSender sender, String[] args);
+
+    public abstract void noPermission(CommandSender sender);
+
+    @Override
+    public @NotNull List<String> getAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getName() {
+        return this.cmd;
+    }
+
+    public void registerSubCommand(SubCommand command) {
+        String name = command.getName().toLowerCase();
+        this.registeredCommands.put(name, command);
+        command.getAliases().forEach(alias -> this.aliasesMap.put(alias.toLowerCase(), name));
+    }
+
+    public void registerHandler(CommandHandler handler) {
+        String name = handler.getName().toLowerCase();
+        this.registeredHandlers.put(name, handler);
+        handler.getAliases().forEach(alias -> this.aliasesMap.put(alias.toLowerCase(), name));
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (args.length == 0) {
+            this.noArgs(sender);
+        } else {
+            String input = args[0].toLowerCase();
+
+            CommandHandler handler = getHandler(input);
+            if (handler != null) {
+                if (!handler.hasPermission(sender)) {
+                    this.noPermission(sender);
+                } else {
+                    handler.onCommand(sender, command, label, this.shortenArgs(args));
+                }
+            }
+
+            SubCommand subCommand = getSubCommand(input);
+            if (subCommand == null) {
+                this.unknownCommand(sender, args);
+            } else if (!subCommand.hasPermission(sender)) {
+                this.noPermission(sender);
+            } else {
+                try {
+                    subCommand.execute(this.plugin, sender, this.shortenArgs(args));
+                } catch (ArrayIndexOutOfBoundsException var9) {
+                    this.unknownCommand(sender, args);
+                }
+            }
+
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
+        if (args.length == 0) return Collections.emptyList();
+
+        String input = args[0].toLowerCase();
+        if (args.length == 1) {
+            return getExecutors().stream()
+                    .filter(e -> e.hasPermission(sender))
+                    .map(NamedExecutor::getName)
+                    .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                    .collect(Collectors.toList());
+        } else {
+
+            CommandHandler handler = getHandler(input);
+            if (handler != null && handler.hasPermission(sender)) {
+                return handler.onTabComplete(sender, command, alias, this.shortenArgs(args));
+            }
+
+            SubCommand subCommand = getSubCommand(input);
+            if (subCommand != null && subCommand.hasPermission(sender)) {
+                return subCommand.tabComplete(this.plugin, sender, this.shortenArgs(args));
+            }
+
+            return Collections.emptyList();
+        }
+    }
+
+    public List<NamedExecutor> getExecutors() {
+        Set<NamedExecutor> executors = new HashSet<>();
+        executors.addAll(this.registeredHandlers.values());
+        executors.addAll(this.registeredCommands.values());
+        List<NamedExecutor> sortedExecutors = new ArrayList<>(executors);
+        sortedExecutors.sort(Comparator.comparing(NamedExecutor::getName));
+        return sortedExecutors;
+    }
+
+    protected @Nullable CommandHandler getHandler(@NotNull String name) {
+        CommandHandler fromName = this.registeredHandlers.get(name);
+        if (fromName != null) return fromName;
+
+        String nameFromAlias = this.aliasesMap.get(name);
+        if (nameFromAlias == null) return null;
+        else return this.registeredHandlers.get(nameFromAlias);
+    }
+
+    protected @Nullable SubCommand getSubCommand(@NotNull String name) {
+        SubCommand fromName = this.registeredCommands.get(name);
+        if (fromName != null) return fromName;
+
+        String nameFromAlias = this.aliasesMap.get(name);
+        if (nameFromAlias == null) return null;
+        else return this.registeredCommands.get(nameFromAlias);
+    }
+
+    protected String[] shortenArgs(String[] args) {
+        if (args.length == 0) {
+            return args;
+        } else {
+            List<String> argList = new ArrayList<>(Arrays.asList(args).subList(1, args.length));
+            return argList.toArray(new String[0]);
+        }
+    }
+
+}

base/command/src/main/java/cc/carm/lib/easyplugin/command/NamedExecutor.java

@@ -0,0 +1,17 @@
+package cc.carm.lib.easyplugin.command;
+
+import org.bukkit.permissions.Permissible;
+
+import java.util.List;
+
+public interface NamedExecutor {
+
+    String getName();
+
+    List<String> getAliases();
+
+    default boolean hasPermission(Permissible permissible) {
+        return true;
+    }
+
+}

base/command/src/main/java/cc/carm/lib/easyplugin/command/SimpleCompleter.java

@@ -0,0 +1,90 @@
+package cc.carm.lib.easyplugin.command;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class SimpleCompleter {
+
+    public static @NotNull List<String> objects(@NotNull String input, List<?> objects) {
+        return objects(input, objects.size(), objects);
+    }
+
+    public static @NotNull List<String> objects(@NotNull String input, int limit, List<?> objects) {
+        return objects(input, limit, objects.stream());
+    }
+
+    public static @NotNull List<String> objects(@NotNull String input, int limit, Stream<?> stream) {
+        return stream.filter(Objects::nonNull).map(Object::toString)
+                .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                .limit(Math.max(0, limit)).collect(Collectors.toList());
+    }
+
+    public static @NotNull List<String> text(@NotNull String input, String... texts) {
+        return text(input, texts.length, texts);
+    }
+
+    public static @NotNull List<String> text(@NotNull String input, int limit, String... texts) {
+        return text(input, limit, Arrays.asList(texts));
+    }
+
+    public static @NotNull List<String> text(@NotNull String input, List<String> texts) {
+        return text(input, texts.size(), texts);
+    }
+
+    public static @NotNull List<String> text(@NotNull String input, int limit, List<String> texts) {
+        return objects(input, limit, texts);
+    }
+
+    public static @NotNull List<String> onlinePlayers(@NotNull String input) {
+        return onlinePlayers(input, 10);
+    }
+
+    public static @NotNull List<String> onlinePlayers(@NotNull String input, int limit) {
+        return objects(input, limit, Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName));
+    }
+
+    public static @NotNull List<String> allPlayers(@NotNull String input) {
+        return allPlayers(input, 10);
+    }
+
+    public static @NotNull List<String> allPlayers(@NotNull String input, int limit) {
+        return objects(input, limit, Arrays.stream(Bukkit.getOfflinePlayers()).map(OfflinePlayer::getName));
+    }
+
+    public static @NotNull List<String> worlds(@NotNull String input) {
+        return worlds(input, 10);
+    }
+
+    public static @NotNull List<String> worlds(@NotNull String input, int limit) {
+        return objects(input, limit, Bukkit.getWorlds().stream().map(World::getName));
+    }
+
+    public static @NotNull List<String> materials(@NotNull String input) {
+        return materials(input, 10);
+    }
+
+    public static @NotNull List<String> materials(@NotNull String input, int limit) {
+        return objects(input, limit, Arrays.stream(Material.values()).map(Enum::name));
+    }
+
+    public static @NotNull List<String> effects(@NotNull String input) {
+        return effects(input, 10);
+    }
+
+    public static @NotNull List<String> effects(@NotNull String input, int limit) {
+        return objects(input, limit, Arrays.stream(PotionEffectType.values()).map(PotionEffectType::getName));
+    }
+
+}

base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java

@@ -0,0 +1,43 @@
+package cc.carm.lib.easyplugin.command;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("UnusedReturnValue")
+public abstract class SubCommand implements NamedExecutor {
+
+    private final String name;
+    private final List<String> aliases;
+
+    public SubCommand(String name) {
+        this(name, new String[0]);
+    }
+
+    public SubCommand(String name, String... aliases) {
+        this.name = name;
+        this.aliases = Arrays.asList(aliases);
+    }
+
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public List<String> getAliases() {
+        return this.aliases;
+    }
+
+    public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args);
+
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        return Collections.emptyList();
+    }
+
+
+}

base/gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/papi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.0</version>
+        <version>1.4.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,10 +15,11 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.0</version>
+    <version>1.4.3</version>
     <modules>
 
         <module>base/main</module>
+        <module>base/command</module>
         <module>base/gui</module>
 
         <module>extension/papi</module>