mirror of
https://github.com/songoda/UltimateStacker.git
synced 2024-11-23 18:45:39 +01:00
Added TabComplete
This commit is contained in:
parent
1c4487d848
commit
ea027616a4
@ -3,18 +3,36 @@ package com.songoda.ultimatestacker.command;
|
|||||||
import com.songoda.ultimatestacker.UltimateStacker;
|
import com.songoda.ultimatestacker.UltimateStacker;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class AbstractCommand {
|
public abstract class AbstractCommand {
|
||||||
|
|
||||||
private final AbstractCommand parent;
|
|
||||||
private final String command;
|
|
||||||
private final boolean noConsole;
|
private final boolean noConsole;
|
||||||
|
private AbstractCommand parent = null;
|
||||||
|
private boolean hasArgs = false;
|
||||||
|
private String command;
|
||||||
|
|
||||||
protected AbstractCommand(String command, AbstractCommand parent, boolean noConsole) {
|
private List<String> subCommand = new ArrayList<>();
|
||||||
this.command = command;
|
|
||||||
|
protected AbstractCommand(AbstractCommand parent, boolean noConsole, String... command) {
|
||||||
|
if (parent != null) {
|
||||||
|
this.subCommand = Arrays.asList(command);
|
||||||
|
} else {
|
||||||
|
this.command = Arrays.asList(command).get(0);
|
||||||
|
}
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.noConsole = noConsole;
|
this.noConsole = noConsole;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected AbstractCommand(boolean noConsole, boolean hasArgs, String... command) {
|
||||||
|
this.command = Arrays.asList(command).get(0);
|
||||||
|
|
||||||
|
this.hasArgs = hasArgs;
|
||||||
|
this.noConsole = noConsole;
|
||||||
|
}
|
||||||
|
|
||||||
public AbstractCommand getParent() {
|
public AbstractCommand getParent() {
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
@ -23,17 +41,32 @@ public abstract class AbstractCommand {
|
|||||||
return command;
|
return command;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isNoConsole() {
|
public List<String> getSubCommand() {
|
||||||
return noConsole;
|
return subCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addSubCommand(String command) {
|
||||||
|
subCommand.add(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract ReturnType runCommand(UltimateStacker instance, CommandSender sender, String... args);
|
protected abstract ReturnType runCommand(UltimateStacker instance, CommandSender sender, String... args);
|
||||||
|
|
||||||
|
protected abstract List<String> onTab(UltimateStacker instance, CommandSender sender, String... args);
|
||||||
|
|
||||||
public abstract String getPermissionNode();
|
public abstract String getPermissionNode();
|
||||||
|
|
||||||
public abstract String getSyntax();
|
public abstract String getSyntax();
|
||||||
|
|
||||||
public abstract String getDescription();
|
public abstract String getDescription();
|
||||||
|
|
||||||
|
public boolean hasArgs() {
|
||||||
|
return hasArgs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isNoConsole() {
|
||||||
|
return noConsole;
|
||||||
|
}
|
||||||
|
|
||||||
public enum ReturnType {SUCCESS, FAILURE, SYNTAX_ERROR}
|
public enum ReturnType {SUCCESS, FAILURE, SYNTAX_ERROR}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,6 @@ package com.songoda.ultimatestacker.command;
|
|||||||
|
|
||||||
import com.songoda.ultimatestacker.UltimateStacker;
|
import com.songoda.ultimatestacker.UltimateStacker;
|
||||||
import com.songoda.ultimatestacker.command.commands.*;
|
import com.songoda.ultimatestacker.command.commands.*;
|
||||||
import com.songoda.ultimatestacker.utils.Methods;
|
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandExecutor;
|
import org.bukkit.command.CommandExecutor;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@ -15,20 +14,27 @@ import java.util.List;
|
|||||||
public class CommandManager implements CommandExecutor {
|
public class CommandManager implements CommandExecutor {
|
||||||
|
|
||||||
private static final List<AbstractCommand> commands = new ArrayList<>();
|
private static final List<AbstractCommand> commands = new ArrayList<>();
|
||||||
private UltimateStacker instance;
|
private UltimateStacker plugin;
|
||||||
|
private TabManager tabManager;
|
||||||
|
|
||||||
public CommandManager(UltimateStacker instance) {
|
public CommandManager(UltimateStacker plugin) {
|
||||||
this.instance = instance;
|
this.plugin = plugin;
|
||||||
|
this.tabManager = new TabManager(this);
|
||||||
|
|
||||||
instance.getCommand("UltimateStacker").setExecutor(this);
|
plugin.getCommand("UltimateStacker").setExecutor(this);
|
||||||
|
|
||||||
AbstractCommand commandUltimateStacker = addCommand(new CommandUltimateStacker());
|
AbstractCommand commandUltimateStacker = addCommand(new CommandUltimateStacker());
|
||||||
|
|
||||||
addCommand(new CommandSettings(commandUltimateStacker));
|
addCommand(new CommandSettings(commandUltimateStacker));
|
||||||
addCommand(new CommandRemoveAll(commandUltimateStacker));
|
addCommand(new CommandRemoveAll(commandUltimateStacker));
|
||||||
addCommand(new CommandReload(commandUltimateStacker));
|
addCommand(new CommandReload(commandUltimateStacker));
|
||||||
addCommand(new CommandGive(commandUltimateStacker));
|
addCommand(new CommandGiveSpawner(commandUltimateStacker));
|
||||||
addCommand(new CommandConvert(commandUltimateStacker));
|
addCommand(new CommandConvert(commandUltimateStacker));
|
||||||
|
|
||||||
|
for (AbstractCommand abstractCommand : commands) {
|
||||||
|
if (abstractCommand.getParent() != null) continue;
|
||||||
|
plugin.getCommand(abstractCommand.getCommand()).setTabCompleter(tabManager);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private AbstractCommand addCommand(AbstractCommand abstractCommand) {
|
private AbstractCommand addCommand(AbstractCommand abstractCommand) {
|
||||||
@ -39,20 +45,23 @@ public class CommandManager implements CommandExecutor {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
|
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
|
||||||
for (AbstractCommand abstractCommand : commands) {
|
for (AbstractCommand abstractCommand : commands) {
|
||||||
if (abstractCommand.getCommand().equalsIgnoreCase(command.getName())) {
|
if (abstractCommand.getCommand() != null && abstractCommand.getCommand().equalsIgnoreCase(command.getName().toLowerCase())) {
|
||||||
if (strings.length == 0) {
|
if (strings.length == 0 || abstractCommand.hasArgs()) {
|
||||||
processRequirements(abstractCommand, commandSender, strings);
|
processRequirements(abstractCommand, commandSender, strings);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (strings.length != 0 && abstractCommand.getParent() != null && abstractCommand.getParent().getCommand().equalsIgnoreCase(command.getName())) {
|
} else if (strings.length != 0 && abstractCommand.getParent() != null && abstractCommand.getParent().getCommand().equalsIgnoreCase(command.getName())) {
|
||||||
String cmd = strings[0];
|
String cmd = strings[0];
|
||||||
if (cmd.equalsIgnoreCase(abstractCommand.getCommand())) {
|
String cmd2 = strings.length >= 2 ? String.join(" ", strings[0], strings[1]) : null;
|
||||||
processRequirements(abstractCommand, commandSender, strings);
|
for (String cmds : abstractCommand.getSubCommand()) {
|
||||||
return true;
|
if (cmd.equalsIgnoreCase(cmds) || (cmd2 != null && cmd2.equalsIgnoreCase(cmds))) {
|
||||||
|
processRequirements(abstractCommand, commandSender, strings);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
instance.getLocale().newMessage("&7The command you entered does not exist or is spelt incorrectly.").sendPrefixedMessage(commandSender);
|
plugin.getLocale().newMessage("&7The command you entered does not exist or is spelt incorrectly.").sendPrefixedMessage(commandSender);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,14 +71,14 @@ public class CommandManager implements CommandExecutor {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) {
|
if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) {
|
||||||
AbstractCommand.ReturnType returnType = command.runCommand(instance, sender, strings);
|
AbstractCommand.ReturnType returnType = command.runCommand(plugin, sender, strings);
|
||||||
if (returnType == AbstractCommand.ReturnType.SYNTAX_ERROR) {
|
if (returnType == AbstractCommand.ReturnType.SYNTAX_ERROR) {
|
||||||
instance.getLocale().newMessage("&cInvalid Syntax!").sendPrefixedMessage(sender);
|
plugin.getLocale().newMessage("&cInvalid Syntax!").sendPrefixedMessage(sender);
|
||||||
instance.getLocale().newMessage("&7The valid syntax is: &6" + command.getSyntax() + "&7.").sendPrefixedMessage(sender);
|
plugin.getLocale().newMessage("&7The valid syntax is: &6" + command.getSyntax() + "&7.").sendPrefixedMessage(sender);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
instance.getLocale().getMessage("event.general.nopermission").sendPrefixedMessage(sender);
|
plugin.getLocale().getMessage("event.general.nopermission").sendPrefixedMessage(sender);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<AbstractCommand> getCommands() {
|
public List<AbstractCommand> getCommands() {
|
||||||
|
@ -0,0 +1,64 @@
|
|||||||
|
package com.songoda.ultimatestacker.command;
|
||||||
|
|
||||||
|
import com.songoda.ultimatestacker.UltimateStacker;
|
||||||
|
import org.apache.commons.lang.ArrayUtils;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.command.TabCompleter;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class TabManager implements TabCompleter {
|
||||||
|
|
||||||
|
private final CommandManager commandManager;
|
||||||
|
|
||||||
|
TabManager(CommandManager commandManager) {
|
||||||
|
this.commandManager = commandManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] strings) {
|
||||||
|
for (AbstractCommand abstractCommand : commandManager.getCommands()) {
|
||||||
|
if (abstractCommand.getCommand() != null && abstractCommand.getCommand().equalsIgnoreCase(command.getName()) && !abstractCommand.hasArgs()) {
|
||||||
|
if (strings.length == 1) {
|
||||||
|
List<String> subs = new ArrayList<>();
|
||||||
|
for (AbstractCommand ac : commandManager.getCommands()) {
|
||||||
|
if (ac.getSubCommand() == null) continue;
|
||||||
|
subs.addAll(ac.getSubCommand());
|
||||||
|
}
|
||||||
|
subs.removeIf(s -> !s.toLowerCase().startsWith(strings[0].toLowerCase()));
|
||||||
|
return subs;
|
||||||
|
}
|
||||||
|
} else if (strings.length != 0 && abstractCommand.getParent() != null && abstractCommand.getParent().getCommand().equalsIgnoreCase(command.getName())
|
||||||
|
|| abstractCommand.hasArgs() && abstractCommand.getCommand().equalsIgnoreCase(command.getName())) {
|
||||||
|
String[] args = abstractCommand.hasArgs() ? (String[]) ArrayUtils.add(strings, 0, command.getName()) : strings;
|
||||||
|
String cmd = abstractCommand.hasArgs() ? command.getName() : args[0];
|
||||||
|
String cmd2 = args.length >= 2 ? String.join(" ", args[0], args[1]) : null;
|
||||||
|
if (!abstractCommand.hasArgs()) {
|
||||||
|
for (String cmds : abstractCommand.getSubCommand()) {
|
||||||
|
if (cmd.equalsIgnoreCase(cmds) || (cmd2 != null && cmd2.equalsIgnoreCase(cmds))) {
|
||||||
|
return fetchList(abstractCommand, args, sender);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return fetchList(abstractCommand, args, sender);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<String> fetchList(AbstractCommand abstractCommand, String[] args, CommandSender sender) {
|
||||||
|
List<String> list = abstractCommand.onTab(UltimateStacker.getInstance(), sender, args);
|
||||||
|
String str = args[args.length - 1];
|
||||||
|
if (list != null && str != null && str.length() >= 1) {
|
||||||
|
try {
|
||||||
|
list.removeIf(s -> !s.toLowerCase().startsWith(str.toLowerCase()));
|
||||||
|
} catch (UnsupportedOperationException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -8,10 +8,12 @@ import org.bukkit.Bukkit;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandConvert extends AbstractCommand {
|
public class CommandConvert extends AbstractCommand {
|
||||||
|
|
||||||
public CommandConvert(AbstractCommand parent) {
|
public CommandConvert(AbstractCommand parent) {
|
||||||
super("convert", parent, true);
|
super(parent, true, "convert");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -26,6 +28,11 @@ public class CommandConvert extends AbstractCommand {
|
|||||||
return ReturnType.SUCCESS;
|
return ReturnType.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<String> onTab(UltimateStacker instance, CommandSender sender, String... args) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPermissionNode() {
|
public String getPermissionNode() {
|
||||||
return "ultimatestacker.admin";
|
return "ultimatestacker.admin";
|
||||||
|
@ -2,13 +2,14 @@ package com.songoda.ultimatestacker.command.commands;
|
|||||||
|
|
||||||
import com.songoda.ultimatestacker.UltimateStacker;
|
import com.songoda.ultimatestacker.UltimateStacker;
|
||||||
import com.songoda.ultimatestacker.command.AbstractCommand;
|
import com.songoda.ultimatestacker.command.AbstractCommand;
|
||||||
import com.songoda.ultimatestacker.utils.Methods;
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandReload extends AbstractCommand {
|
public class CommandReload extends AbstractCommand {
|
||||||
|
|
||||||
public CommandReload(AbstractCommand parent) {
|
public CommandReload(AbstractCommand parent) {
|
||||||
super("reload", parent, false);
|
super(parent, false, "reload");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -18,6 +19,11 @@ public class CommandReload extends AbstractCommand {
|
|||||||
return ReturnType.SUCCESS;
|
return ReturnType.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<String> onTab(UltimateStacker instance, CommandSender sender, String... args) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPermissionNode() {
|
public String getPermissionNode() {
|
||||||
return "ultimatestacker.admin";
|
return "ultimatestacker.admin";
|
||||||
|
@ -13,10 +13,12 @@ import org.bukkit.entity.Item;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandRemoveAll extends AbstractCommand {
|
public class CommandRemoveAll extends AbstractCommand {
|
||||||
|
|
||||||
public CommandRemoveAll(AbstractCommand parent) {
|
public CommandRemoveAll(AbstractCommand parent) {
|
||||||
super("removeall", parent, false);
|
super(parent, false, "removeall");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -62,6 +64,11 @@ public class CommandRemoveAll extends AbstractCommand {
|
|||||||
return ReturnType.SUCCESS;
|
return ReturnType.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<String> onTab(UltimateStacker instance, CommandSender sender, String... args) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPermissionNode() {
|
public String getPermissionNode() {
|
||||||
return "ultimatestacker.admin";
|
return "ultimatestacker.admin";
|
||||||
|
@ -5,10 +5,12 @@ import com.songoda.ultimatestacker.command.AbstractCommand;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandSettings extends AbstractCommand {
|
public class CommandSettings extends AbstractCommand {
|
||||||
|
|
||||||
public CommandSettings(AbstractCommand parent) {
|
public CommandSettings(AbstractCommand parent) {
|
||||||
super("Settings", parent, true);
|
super(parent, true, "Settings");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -17,6 +19,11 @@ public class CommandSettings extends AbstractCommand {
|
|||||||
return ReturnType.SUCCESS;
|
return ReturnType.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<String> onTab(UltimateStacker instance, CommandSender sender, String... args) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPermissionNode() {
|
public String getPermissionNode() {
|
||||||
return "ultimatestacker.admin";
|
return "ultimatestacker.admin";
|
||||||
|
@ -5,10 +5,12 @@ import com.songoda.ultimatestacker.command.AbstractCommand;
|
|||||||
import com.songoda.ultimatestacker.utils.Methods;
|
import com.songoda.ultimatestacker.utils.Methods;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandUltimateStacker extends AbstractCommand {
|
public class CommandUltimateStacker extends AbstractCommand {
|
||||||
|
|
||||||
public CommandUltimateStacker() {
|
public CommandUltimateStacker() {
|
||||||
super("UltimateStacker", null, false);
|
super(null, false, "UltimateStacker");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -27,6 +29,11 @@ public class CommandUltimateStacker extends AbstractCommand {
|
|||||||
return ReturnType.SUCCESS;
|
return ReturnType.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<String> onTab(UltimateStacker instance, CommandSender sender, String... args) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPermissionNode() {
|
public String getPermissionNode() {
|
||||||
return null;
|
return null;
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user