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/Command_saconfig.java

@@ -0,0 +1,228 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.Date;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.PlayerRank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.util.Ips;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = PlayerRank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Manage admins.", usage = "/<command> <list | clean | clearme [ip] | <add | remove | info> <username>>")
+public class Command_saconfig extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
+        switch (args[0])
+        {
+            case "list":
+            {
+                msg("Superadmins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
+
+                return true;
+            }
+
+            case "clean":
+            {
+                checkConsole();
+
+                FUtil.adminAction(sender.getName(), "Cleaning admin list", true);
+                plugin.al.deactivateOldEntries(true);
+                msg("Superadmins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.YELLOW);
+
+                return true;
+            }
+
+            case "clearme":
+            {
+                checkPlayer();
+                checkRank(PlayerRank.SUPER_ADMIN);
+
+                final Admin admin = plugin.al.getAdmin(playerSender);
+
+                if (admin == null)
+                {
+                    msg("Could not find your admin entry! Please notify a developer.", ChatColor.RED);
+                    return true;
+                }
+
+                final String ip = Ips.getIp(playerSender);
+
+                if (args.length == 1)
+                {
+                    FUtil.adminAction(sender.getName(), "Cleaning my supered IPs", true);
+
+                    int counter = admin.getIps().size() - 1;
+                    admin.clearIPs();
+                    admin.addIp(ip);
+
+                    plugin.al.save(admin);
+
+                    msg(counter + " IPs removed.");
+                    msg(admin.getIps().get(0) + " is now your only IP address");
+                }
+                else
+                {
+                    if (!admin.getIps().contains(args[1]))
+                    {
+                        msg("That IP is not registered to you.");
+                    }
+                    else if (ip.equals(args[1]))
+                    {
+                        msg("You cannot remove your current IP.");
+                    }
+                    else
+                    {
+                        FUtil.adminAction(sender.getName(), "Removing a supered IP", true);
+
+                        admin.removeIp(args[1]);
+
+                        plugin.al.save(admin);
+
+                        msg("Removed IP " + args[1]);
+                        msg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
+                    }
+                }
+
+                return true;
+            }
+
+            case "info":
+            {
+                if (args.length < 2)
+                {
+                    return false;
+                }
+
+                checkRank(PlayerRank.SUPER_ADMIN);
+
+                Admin admin = plugin.al.getEntryByName(args[1]);
+
+                if (admin == null)
+                {
+                    final Player player = getPlayer(args[1]);
+                    if (player != null)
+                    {
+                        admin = plugin.al.getAdmin(player);
+                    }
+                }
+
+                if (admin == null)
+                {
+                    msg("Superadmin not found: " + args[1]);
+                }
+                else
+                {
+                    msg(admin.toString());
+                }
+
+                return true;
+            }
+
+            case "add":
+            {
+                if (args.length < 2)
+                {
+                    return false;
+                }
+
+                checkConsole();
+                checkRank(PlayerRank.TELNET_ADMIN);
+
+                final Player player = getPlayer(args[1]);
+
+                if (plugin.al.isAdmin(player))
+                {
+                    msg("That player is already admin.");
+                    return true;
+                }
+
+                final Admin admin = player != null ? plugin.al.getEntryByName(player.getName()) : plugin.al.getEntryByName(args[1]);
+
+                if (admin != null) // Existing admin
+                {
+
+                    FUtil.adminAction(sender.getName(), "Readding " + admin.getName() + " to the admin list", true);
+
+                    if (player != null)
+                    {
+                        admin.loadFrom(player); // Reset IP, username
+                    }
+
+                    admin.setActivated(true);
+                    admin.setLastLogin(new Date());
+                    plugin.al.save(admin);
+                    plugin.al.updateTables();
+                }
+                else // New admin
+                {
+
+                    if (player == null)
+                    {
+                        msg(FreedomCommand.PLAYER_NOT_FOUND);
+                        return true;
+                    }
+
+                    FUtil.adminAction(sender.getName(), "Adding " + player.getName() + " to the admin list", true);
+                    plugin.al.addAdmin(new Admin(player));
+
+                }
+
+                if (player != null) {
+                    final FPlayer fPlayer = plugin.pl.getPlayer(player);
+                    if (fPlayer.getFreezeData().isFrozen())
+                    {
+                        fPlayer.getFreezeData().setFrozen(false);
+                        msg(player.getPlayer(), "You have been unfrozen.");
+                    }
+                }
+
+                return true;
+            }
+
+            case "remove":
+            {
+                if (args.length < 2)
+                {
+                    return false;
+                }
+
+                checkConsole();
+                checkRank(PlayerRank.TELNET_ADMIN);
+
+                Player player = getPlayer(args[1]);
+                Admin admin = player == null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]);
+
+                if (admin == null)
+                {
+                    msg("Superadmin not found: " + args[1]);
+                    return true;
+                }
+
+                FUtil.adminAction(sender.getName(), "Removing " + admin.getName() + " from the admin list", true);
+                plugin.al.removeAdmin(admin);
+
+                return true;
+            }
+
+            default:
+            {
+                return false;
+            }
+        }
+    }
+
+}