Fix #343 AbstractMethodError from Command's getRequiredPermissionLevel()

This commit is contained in:
mezz committed 2014-11-26 21:34:56 -08:00
1 parent dba8b5448a
commit 14b34e0b01
4 files changed
+34 -21

No files matched your search

@@ -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);
@@ -26,7 +26,7 @@ public interface IForestryCommand extends ICommand {
@Override
List<String> getCommandAliases();
int getRequiredPermissionLevel();
int getPermissionLevel();
SortedSet<SubCommand> getChildren();
@@ -40,28 +40,13 @@ public class RootCommand extends CommandBase implements IForestryCommand {
children.add(child);
}
@Override
public SortedSet<SubCommand> getChildren() {
return children;
}
/* CommandBase */
@Override
public String getCommandName() {
return ROOT_COMMAND_NAME;
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public List<String> getCommandAliases() {
List<String> aliases = new ArrayList<String>();
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<String> getCommandAliases() {
List<String> aliases = new ArrayList<String>();
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<SubCommand> getChildren() {
return children;
}
@Override
public void printHelp(ICommandSender sender) {
CommandHelpers.printHelp(sender, this);
@@ -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