Many changes for TFM 5.0

Refractoring
Reworked /saconfig
Reworked part of the command system
Removed unused config sections
Refractored part of the config
Fixed bugs with admin list
Actually allow CONSOLE to have senior perms

src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java

@@ -0,0 +1,162 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import lombok.Getter;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import net.pravian.aero.command.AbstractCommandBase;
+import net.pravian.aero.command.TooledCommandBase;
+import net.pravian.aero.util.Players;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
+
+public abstract class FreedomCommand extends AbstractCommandBase<TotalFreedomMod>
+{
+
+    public static final String YOU_ARE_OP = ChatColor.YELLOW + "You are now op!";
+    public static final String YOU_ARE_NOT_OP = ChatColor.YELLOW + "You are no longer op!";
+    public static final String NOT_FROM_CONSOLE = "This command may not be used from the console.";
+    public static final String PLAYER_NOT_FOUND = ChatColor.GRAY + "Player not found!";
+    //
+    @Getter
+    private final CommandParameters params;
+    @Getter
+    private final CommandPermissions perms;
+
+    public FreedomCommand()
+    {
+        this.params = getClass().getAnnotation(CommandParameters.class);
+        if (params == null)
+        {
+            FLog.warning("Ignoring command usage for command " + getClass().getSimpleName() + ". Command is not annotated!");
+        }
+
+        this.perms = getClass().getAnnotation(CommandPermissions.class);
+        if (perms == null)
+        {
+            FLog.warning("Ignoring permissions for command " + getClass().getSimpleName() + ". Command is not annotated!");
+        }
+    }
+
+    @Override
+    public final boolean runCommand(final CommandSender sender, final Command command, final String label, final String[] args)
+    {
+        setVariables(sender, command, label, args);
+
+        try
+        {
+            return run(sender, playerSender, command, label, args, isConsole());
+        }
+        catch (CommandFailException ex)
+        {
+            msg(isConsole() ? ex.getMessage() : ChatColor.RED + ex.getMessage());
+            return true;
+        }
+        catch (Exception ex)
+        {
+            FLog.severe("Uncaught exception executing command: " + command.getName());
+            FLog.severe(ex);
+            sender.sendMessage(ChatColor.RED + "Command error: " + (ex.getMessage() == null ? "Unknown cause" : ex.getMessage()));
+            return true;
+        }
+    }
+
+    protected abstract boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole);
+
+    protected void checkConsole()
+    {
+        if (!isConsole())
+        {
+            throw new CommandFailException("This command may only be used from the console.");
+        }
+    }
+
+    protected void checkPlayer()
+    {
+        if (isConsole())
+        {
+            throw new CommandFailException("This command may only be used by players.");
+        }
+    }
+
+    protected void checkRank(Rank rank)
+    {
+        if (!plugin.rm.getRank(sender).isAtLeast(rank))
+        {
+            noPerms();
+        }
+    }
+
+    protected boolean noPerms() {
+        throw new CommandFailException("You do not have permissions for this command.");
+    }
+
+    protected boolean isConsole() {
+        return !(sender instanceof Player);
+    }
+
+    protected Player getPlayer(String name) {
+        return Players.getPlayer(name);
+    }
+
+    protected void msg(final CommandSender sender, final String message, final ChatColor color)
+    {
+        if (sender == null)
+        {
+            return;
+        }
+        sender.sendMessage(color + message);
+    }
+
+    protected void msg(final String message, final ChatColor color)
+    {
+        msg(playerSender, message, color);
+    }
+
+    protected void msg(final CommandSender sender, final String message)
+    {
+        msg(sender, message, ChatColor.GRAY);
+    }
+
+    protected void msg(final String message)
+    {
+        FreedomCommand.this.msg(playerSender, message);
+    }
+
+    protected boolean isAdmin(CommandSender sender)
+    {
+        return plugin.al.isAdmin(sender);
+    }
+
+    protected Admin getAdmin(CommandSender sender)
+    {
+        return plugin.al.getAdmin(sender);
+    }
+
+    protected Admin getAdmin(Player player)
+    {
+        return plugin.al.getAdmin(player);
+    }
+
+    protected PlayerData getData(Player player)
+    {
+        return plugin.pl.getData(player);
+    }
+
+    public static FreedomCommand getFrom(Command command)
+    {
+        try
+        {
+            return (FreedomCommand) ((FreedomCommandExecutor) (((PluginCommand) command).getExecutor())).getCommandBase();
+        }
+        catch (Exception ex)
+        {
+            return null;
+        }
+    }
+}