1
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2026-06-04 16:48:16 +08:00

feat(command): 为SubCommand支持Alias构造函数

This commit is contained in:
2022-05-23 00:32:02 +08:00
parent bbdfe313d5
commit be798a981a
3 changed files with 15 additions and 7 deletions
@@ -16,6 +16,7 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
protected final @NotNull JavaPlugin plugin; protected final @NotNull JavaPlugin plugin;
protected final @NotNull String cmd; 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, SubCommand> registeredCommands = new HashMap<>();
protected final @NotNull Map<String, CommandHandler> registeredHandlers = new HashMap<>(); protected final @NotNull Map<String, CommandHandler> registeredHandlers = new HashMap<>();
@@ -27,8 +28,13 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
} }
public CommandHandler(@NotNull JavaPlugin plugin, @NotNull String cmd) { 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.plugin = plugin;
this.cmd = cmd; this.cmd = cmd;
this.aliases = Arrays.asList(aliases);
} }
public abstract void noArgs(CommandSender sender); public abstract void noArgs(CommandSender sender);
@@ -37,6 +43,11 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
public abstract void noPermission(CommandSender sender); public abstract void noPermission(CommandSender sender);
@Override
public @NotNull List<String> getAliases() {
return aliases;
}
@Override @Override
public String getName() { public String getName() {
return this.cmd; return this.cmd;
@@ -2,16 +2,13 @@ package cc.carm.lib.easyplugin.command;
import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permissible;
import java.util.Collections;
import java.util.List; import java.util.List;
public interface NamedExecutor { public interface NamedExecutor {
String getName(); String getName();
default List<String> getAliases() { List<String> getAliases();
return Collections.singletonList(getName());
}
default boolean hasPermission(Permissible permissible) { default boolean hasPermission(Permissible permissible) {
return true; return true;
@@ -11,7 +11,7 @@ import java.util.List;
public abstract class SubCommand implements NamedExecutor { public abstract class SubCommand implements NamedExecutor {
private final String name; private final String name;
private final String[] aliases; private final List<String> aliases;
public SubCommand(String name) { public SubCommand(String name) {
this(name, new String[0]); this(name, new String[0]);
@@ -19,7 +19,7 @@ public abstract class SubCommand implements NamedExecutor {
public SubCommand(String name, String... aliases) { public SubCommand(String name, String... aliases) {
this.name = name; this.name = name;
this.aliases = aliases; this.aliases = Arrays.asList(aliases);
} }
@@ -30,7 +30,7 @@ public abstract class SubCommand implements NamedExecutor {
@Override @Override
public List<String> getAliases() { public List<String> getAliases() {
return Arrays.asList(this.aliases); return this.aliases;
} }
public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args); public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args);