Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2025-02-16 12:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Updated tab complete with filters

Browse Source
This commit is contained in:
sekwah41 2018-02-02 09:21:41 +00:00 committed by Sekwah
parent 2d9594c8c5
commit 964bc466b4
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java
View File

@ -38,7 +38,6 @@ public class CommandWithSubCommands implements CommandTemplate {
return this.subCommandRegistry.getSubCommand(arg);
}
@Override
public void onCommand(CommandSenderContainer sender, String commandExecuted, String[] args) {
if(args.length > 0) {
@ -113,14 +112,15 @@ public class CommandWithSubCommands implements CommandTemplate {
List<String> allowedCommands = new ArrayList<>();
allowedCommands.addAll(this.subCommandRegistry.getSubCommands());
Collections.sort(allowedCommands);
return allowedCommands;
return this.filterTabResults(allowedCommands, args[args.length - 1]);
}
else {
for (String subCommandName : this.subCommandRegistry.getSubCommands()) {
if (subCommandName.equalsIgnoreCase(args[0])) {
SubCommand subCommand = this.getSubCommand(subCommandName);
if (subCommand.hasPermission(sender)) {
this.getSubCommand(subCommandName).onTabComplete(sender, args);
return this.filterTabResults(this.getSubCommand(subCommandName).onTabComplete(sender, args),
args[args.length - 1]);
} else {
return null;
}
@ -136,12 +136,19 @@ public class CommandWithSubCommands implements CommandTemplate {
allowedCommands.add(subCommandName);
}
}
if(args.length == 1) {
allowedCommands.add("help");
}
allowedCommands.add("help");
Collections.sort(allowedCommands);
return allowedCommands;
return this.filterTabResults(allowedCommands, args[0]);
}
return null;
}
public List<String> filterTabResults(List<String> tabList, String lastArg) {
for(String arg : tabList) {
if(!arg.startsWith(lastArg.toLowerCase())) {
tabList.remove(arg);
}
}
return tabList;
}
}