Merge branch 'master' into spigot

This commit is contained in:
sekwah 2018-01-23 16:50:36 +00:00
commit b6cc53dd6c

View File

@ -12,7 +12,7 @@ public class CommandWithSubCommands implements CommandTemplate {
private final SubCommandRegistry subCommandRegistry; private final SubCommandRegistry subCommandRegistry;
private final int subCommandsPerPage = 5; private final int subCommandsPerPage = 7;
public CommandWithSubCommands() { public CommandWithSubCommands() {
this.subCommandRegistry = new SubCommandRegistry(); this.subCommandRegistry = new SubCommandRegistry();
@ -57,16 +57,19 @@ public class CommandWithSubCommands implements CommandTemplate {
return; return;
} }
} }
commandExecuted = commandExecuted.substring(0,1).toUpperCase() + commandExecuted.substring(1).toLowerCase(); sender.sendMessage(Lang.translateInsertVariablesColor("command.help.header",
sender.sendMessage(Lang.translateInsertVariablesColor("command.help.header", commandExecuted, helpPage, pages)); commandExecuted.substring(0,1).toUpperCase() + commandExecuted.substring(1).toLowerCase(), helpPage, pages));
sender.sendMessage("\u00A7a█ = Permission \u00A7c█ = No Permission");
int subCommandOffset = (helpPage - 1) * this.subCommandsPerPage; int subCommandOffset = (helpPage - 1) * this.subCommandsPerPage;
int displayEnd = subCommandOffset + this.subCommandsPerPage; int displayEnd = subCommandOffset + this.subCommandsPerPage;
if(displayEnd > subCommands.length) { if(displayEnd > subCommands.length) {
displayEnd = subCommands.length; displayEnd = subCommands.length;
} }
for(; subCommandOffset < displayEnd; subCommandOffset++) { for(; subCommandOffset < displayEnd; subCommandOffset++) {
sender.sendMessage("\u00A76/" + commandExecuted + " " + subCommands[subCommandOffset] SubCommand subCommand = this.getSubCommand(subCommands[subCommandOffset]);
+ "\u00A7a - " + this.getSubCommand(subCommands[subCommandOffset]).getBasicHelpText()); String colorCode = "\u00A7" + (subCommand.hasPermission(sender) ? "a" : "c");
sender.sendMessage("\u00A7e/" + commandExecuted + " " + subCommands[subCommandOffset]
+ colorCode + " - " + subCommand.getBasicHelpText());
} }
} }
else { else {