diff --git a/acf.iml b/acf.iml index 79935937..edbef7c7 100644 --- a/acf.iml +++ b/acf.iml @@ -21,7 +21,7 @@ - + diff --git a/example/acf-example.iml b/example/acf-example.iml index 7e1a936b..e51fb445 100644 --- a/example/acf-example.iml +++ b/example/acf-example.iml @@ -36,6 +36,6 @@ - + \ No newline at end of file diff --git a/example/src/main/java/co/aikar/acfexample/ACFExample.java b/example/src/main/java/co/aikar/acfexample/ACFExample.java index 8ddc3116..39e0a90e 100644 --- a/example/src/main/java/co/aikar/acfexample/ACFExample.java +++ b/example/src/main/java/co/aikar/acfexample/ACFExample.java @@ -45,6 +45,7 @@ public final class ACFExample extends JavaPlugin { Lists.newArrayList("foo", "bar", "baz") )); commandManager.registerCommand(new SomeCommand()); + commandManager.registerCommand(new SomeCommand_ExtraSubs()); } public static ACFExample getPlugin() { diff --git a/example/src/main/java/co/aikar/acfexample/SomeCommand.java b/example/src/main/java/co/aikar/acfexample/SomeCommand.java index 90fa8a4d..7c4b24a4 100644 --- a/example/src/main/java/co/aikar/acfexample/SomeCommand.java +++ b/example/src/main/java/co/aikar/acfexample/SomeCommand.java @@ -73,4 +73,10 @@ public class SomeCommand extends BaseCommand { sender.sendMessage("You got " + player.getPlayer().getName() + " - " + world.getName() + " - " + test + " - " + misc); } + + @Subcommand("testsub test1") + @CommandCompletion("Foo") + public void onTestSub1(CommandSender sender, String hi) { + sender.sendMessage(hi); + } } diff --git a/example/src/main/java/co/aikar/acfexample/SomeCommand_ExtraSubs.java b/example/src/main/java/co/aikar/acfexample/SomeCommand_ExtraSubs.java new file mode 100644 index 00000000..ce200bd8 --- /dev/null +++ b/example/src/main/java/co/aikar/acfexample/SomeCommand_ExtraSubs.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package co.aikar.acfexample; + +import co.aikar.commands.BaseCommand; +import co.aikar.commands.annotation.CommandAlias; +import co.aikar.commands.annotation.CommandCompletion; +import co.aikar.commands.annotation.Subcommand; +import org.bukkit.command.CommandSender; + +@CommandAlias("acf") +public class SomeCommand_ExtraSubs extends BaseCommand { + + @Subcommand("testsub test2") + @CommandCompletion("Foo2") + public void onTestSub2(CommandSender sender, String hi) { + sender.sendMessage(hi); + } +} diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/src/main/java/co/aikar/commands/BaseCommand.java index bf01adbb..8071178e 100644 --- a/src/main/java/co/aikar/commands/BaseCommand.java +++ b/src/main/java/co/aikar/commands/BaseCommand.java @@ -55,7 +55,7 @@ import java.util.stream.Collectors; @SuppressWarnings("unused") public abstract class BaseCommand extends Command { - private final SetMultimap subCommands = HashMultimap.create(); + final SetMultimap subCommands = HashMultimap.create(); @SuppressWarnings("WeakerAccess") private String execLabel; @@ -64,7 +64,7 @@ public abstract class BaseCommand extends Command { @SuppressWarnings("WeakerAccess") private String[] origArgs; CommandManager manager = null; - Map registeredCommands = new HashMap<>(); + Map registeredCommands = new HashMap<>(); public BaseCommand() { this(null); @@ -161,6 +161,7 @@ public abstract class BaseCommand extends Command { } try { + // TODO: Annotation based Method unknown = self.getMethod("onUnknown", CommandSender.class, String.class, String[].class); unknown.setAccessible(true); registerSubcommand(unknown, "__unknown"); @@ -180,7 +181,10 @@ public abstract class BaseCommand extends Command { } private void register(String name, Command cmd) { - this.registeredCommands.put(name.toLowerCase(), cmd); + String nameLower = name.toLowerCase(); + RootCommand rootCommand = manager.obtainRootCommand(nameLower); + rootCommand.addChild(this); + this.registeredCommands.put(nameLower, rootCommand); } private void registerSubcommand(Method method, String subCommand) { @@ -251,9 +255,6 @@ public abstract class BaseCommand extends Command { @Override public final boolean execute(CommandSender sender, String commandLabel, String[] args) { - if (!testPermission(sender)) { - return true; - } commandLabel = commandLabel.toLowerCase(); execSubcommand = null; @@ -345,7 +346,6 @@ public abstract class BaseCommand extends Command { commandLabel = commandLabel.toLowerCase(); - final CommandSearch search = findSubCommand(args, true); String argString = StringUtils.join(args, " ").toLowerCase(); @@ -370,17 +370,6 @@ public abstract class BaseCommand extends Command { } } - final Set unknownCmds = subCommands.get("__unknown"); - if (cmds.isEmpty() && !unknownCmds.isEmpty()) { - RegisteredCommand unknownCommand = null; - if (unknownCmds.size() == 1) { - unknownCommand = Iterables.getOnlyElement(unknownCmds); - } - if (unknownCommand != null) { - return completeCommand(sender, unknownCommand, args, commandLabel); - } - } - return filterTabComplete(args[args.length-1], cmds); } diff --git a/src/main/java/co/aikar/commands/BukkitCommandManager.java b/src/main/java/co/aikar/commands/BukkitCommandManager.java index 7521c9dc..20f01a83 100644 --- a/src/main/java/co/aikar/commands/BukkitCommandManager.java +++ b/src/main/java/co/aikar/commands/BukkitCommandManager.java @@ -38,7 +38,7 @@ import java.lang.reflect.Method; import java.util.*; @SuppressWarnings("WeakerAccess") -public class BukkitCommandManager implements CommandManager { +public class BukkitCommandManager extends CommandManager { @SuppressWarnings("WeakerAccess") protected final Plugin plugin; @@ -70,17 +70,12 @@ public class BukkitCommandManager implements CommandManager { Bukkit.getPluginManager().registerEvents(new ACFBukkitListener(plugin), plugin); } - @Override public Plugin getPlugin() { return this.plugin; } - public CommandMap getCommandMap() { - return commandMap; - } - @Override - public CommandContexts getCommandContexts() { + public synchronized CommandContexts getCommandContexts() { if (this.contexts == null) { this.contexts = new BukkitCommandContexts(); } @@ -88,7 +83,7 @@ public class BukkitCommandManager implements CommandManager { } @Override - public CommandCompletions getCommandCompletions() { + public synchronized CommandCompletions getCommandCompletions() { if (this.completions == null) { this.completions = new BukkitCommandCompletions(); } @@ -100,11 +95,13 @@ public class BukkitCommandManager implements CommandManager { final String plugin = this.plugin.getName().toLowerCase(); command.onRegister(this); boolean allSuccess = true; - for (Map.Entry entry : command.registeredCommands.entrySet()) { + for (Map.Entry entry : command.registeredCommands.entrySet()) { String key = entry.getKey().toLowerCase(); - if (!(commandMap.register(key, plugin, entry.getValue()))) { + RootCommand value = entry.getValue(); + if (!value.isRegistered && !(commandMap.register(key, plugin, value))) { allSuccess = false; } + value.isRegistered = true; registeredCommands.put(key, command); } diff --git a/src/main/java/co/aikar/commands/CommandManager.java b/src/main/java/co/aikar/commands/CommandManager.java index afcb9d8e..f96f6762 100644 --- a/src/main/java/co/aikar/commands/CommandManager.java +++ b/src/main/java/co/aikar/commands/CommandManager.java @@ -24,23 +24,25 @@ package co.aikar.commands; import co.aikar.timings.lib.TimingManager; -import org.bukkit.plugin.Plugin; -public interface CommandManager { +import java.util.HashMap; +import java.util.Map; - Plugin getPlugin(); +public abstract class CommandManager { + + protected Map rootCommands = new HashMap<>(); /** * Gets the command contexts manager * @return Command Contexts */ - CommandContexts getCommandContexts(); + public abstract CommandContexts getCommandContexts(); /** * Gets the command completions manager * @return Command Completions */ - CommandCompletions getCommandCompletions(); + public abstract CommandCompletions getCommandCompletions(); /** * Registers a command with ACF @@ -48,7 +50,11 @@ public interface CommandManager { * @param command The command to register * @return boolean */ - boolean registerCommand(BaseCommand command); + public abstract boolean registerCommand(BaseCommand command); - TimingManager getTimings(); + public abstract TimingManager getTimings(); + + public synchronized RootCommand obtainRootCommand(String cmd) { + return rootCommands.computeIfAbsent(cmd.toLowerCase(), k -> new RootCommand(cmd)); + } } diff --git a/src/main/java/co/aikar/commands/PaperCommandManager.java b/src/main/java/co/aikar/commands/PaperCommandManager.java index 916ad283..9ae2855a 100644 --- a/src/main/java/co/aikar/commands/PaperCommandManager.java +++ b/src/main/java/co/aikar/commands/PaperCommandManager.java @@ -34,7 +34,7 @@ public class PaperCommandManager extends BukkitCommandManager { } @Override - public CommandContexts getCommandContexts() { + public synchronized CommandContexts getCommandContexts() { if (this.contexts == null) { this.contexts = new PaperCommandContexts(); } @@ -42,7 +42,7 @@ public class PaperCommandManager extends BukkitCommandManager { } @Override - public CommandCompletions getCommandCompletions() { + public synchronized CommandCompletions getCommandCompletions() { if (this.completions == null) { this.completions = new PaperCommandCompletions(); } diff --git a/src/main/java/co/aikar/commands/RootCommand.java b/src/main/java/co/aikar/commands/RootCommand.java new file mode 100644 index 00000000..e6e78e24 --- /dev/null +++ b/src/main/java/co/aikar/commands/RootCommand.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package co.aikar.commands; + +import org.apache.commons.lang.StringUtils; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class RootCommand extends Command { + + private BaseCommand defCommand; + private Map subCommands = new HashMap<>(); + private List children = new ArrayList<>(); + boolean isRegistered = false; + + RootCommand(String name) { + super(name); + } + + @Override + public List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { + Set completions = new HashSet<>(); + this.children.forEach(child -> completions.addAll(child.tabComplete(sender, alias, args))); + return new ArrayList<>(completions); + } + + @Override + public boolean execute(CommandSender sender, String commandLabel, String[] args) { + if (!this.defCommand.testPermission(sender)) { + return true; + } + for (int i = args.length; i >= 0; i--) { + String checkSub = StringUtils.join(args, " ", 0, i).toLowerCase(); + BaseCommand subHandler = this.subCommands.get(checkSub); + if (subHandler != null) { + subHandler.execute(sender, commandLabel, args); + return false; + } + } + this.defCommand.execute(sender, commandLabel, args); + return false; + } + + void addChild(BaseCommand command) { + if (this.defCommand == null || command.subCommands.get("__default") != null) { + this.defCommand = command; + } + command.subCommands.keySet().forEach(key -> this.subCommands.put(key, command)); + this.children.add(command); + } +}