diff --git a/src/main/java/forestry/core/commands/CommandHelpers.java b/src/main/java/forestry/core/commands/CommandHelpers.java index 1895241fd..71d440ca3 100644 --- a/src/main/java/forestry/core/commands/CommandHelpers.java +++ b/src/main/java/forestry/core/commands/CommandHelpers.java @@ -88,7 +88,7 @@ public class CommandHelpers { } public static void processChildCommand(ICommandSender sender, SubCommand child, String[] args) { - if (!sender.canCommandSenderUseCommand(child.getRequiredPermissionLevel(), child.getFullCommandString())) + if (!sender.canCommandSenderUseCommand(child.getPermissionLevel(), child.getFullCommandString())) throw new WrongUsageException(StringUtil.localize("chat.command.noperms")); String[] newargs = new String[args.length - 1]; System.arraycopy(args, 1, newargs, 0, newargs.length); @@ -110,7 +110,7 @@ public class CommandHelpers { if (commandAliases.size() > 0) sendLocalizedChatMessage(sender, body, "for.chat.command.aliases", commandAliases.toString().replace("[", "").replace("]", "")); - int permLevel = command.getRequiredPermissionLevel(); + int permLevel = command.getPermissionLevel(); if (permLevel > 0) sendLocalizedChatMessage(sender, body, "for.chat.command.permlevel", permLevel); diff --git a/src/main/java/forestry/core/commands/IForestryCommand.java b/src/main/java/forestry/core/commands/IForestryCommand.java index cccfc6a70..1c197f6e7 100644 --- a/src/main/java/forestry/core/commands/IForestryCommand.java +++ b/src/main/java/forestry/core/commands/IForestryCommand.java @@ -26,7 +26,7 @@ public interface IForestryCommand extends ICommand { @Override List getCommandAliases(); - int getRequiredPermissionLevel(); + int getPermissionLevel(); SortedSet getChildren(); diff --git a/src/main/java/forestry/core/commands/RootCommand.java b/src/main/java/forestry/core/commands/RootCommand.java index ce7e060cc..13ae671ee 100644 --- a/src/main/java/forestry/core/commands/RootCommand.java +++ b/src/main/java/forestry/core/commands/RootCommand.java @@ -40,28 +40,13 @@ public class RootCommand extends CommandBase implements IForestryCommand { children.add(child); } - @Override - public SortedSet getChildren() { - return children; - } + /* CommandBase */ @Override public String getCommandName() { return ROOT_COMMAND_NAME; } - @Override - public int getRequiredPermissionLevel() { - return 0; - } - - @Override - public List getCommandAliases() { - List aliases = new ArrayList(); - aliases.add(ROOT_COMMAND_ALIAS); - return aliases; - } - @Override public String getCommandUsage(ICommandSender sender) { return "/" + this.getCommandName() + " help"; @@ -73,16 +58,44 @@ public class RootCommand extends CommandBase implements IForestryCommand { CommandHelpers.throwWrongUsage(sender, this); } + /** + * Used only for CommandBase. + * It gets obfuscated, so the name needs to be different from the one in IForestryCommand. + */ + @Override + public int getRequiredPermissionLevel() { + return getPermissionLevel(); + } + + @Override + public List getCommandAliases() { + List aliases = new ArrayList(); + aliases.add(ROOT_COMMAND_ALIAS); + return aliases; + } + @Override public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { return CommandHelpers.addStandardTabCompletionOptions(this, sender, incomplete); } + /* IForestryCommand */ + @Override public String getFullCommandString() { return getCommandName(); } + @Override + public int getPermissionLevel() { + return 0; + } + + @Override + public SortedSet getChildren() { + return children; + } + @Override public void printHelp(ICommandSender sender) { CommandHelpers.printHelp(sender, this); diff --git a/src/main/java/forestry/core/commands/SubCommand.java b/src/main/java/forestry/core/commands/SubCommand.java index c2509327d..b5b826e6d 100644 --- a/src/main/java/forestry/core/commands/SubCommand.java +++ b/src/main/java/forestry/core/commands/SubCommand.java @@ -101,13 +101,13 @@ public abstract class SubCommand implements IForestryCommand { } @Override - public final int getRequiredPermissionLevel() { + public final int getPermissionLevel() { return permLevel.permLevel; } @Override public boolean canCommandSenderUseCommand(ICommandSender sender) { - return sender.canCommandSenderUseCommand(getRequiredPermissionLevel(), getCommandName()); + return sender.canCommandSenderUseCommand(getPermissionLevel(), getCommandName()); } @Override