Incremented version to 4.0

List of changes:
- Switched over to UUID-based configs
- Revamped TFM_AdminList
- New banning system: TFM_BanList
- Refractoring
- Updated to CraftBukkit-1.7.8-R0.1
- Added BukkitTelnet, WorldEdit and Essentials as soft dependencies

LICENSE.md

@@ -5,6 +5,7 @@ We do, however, ask that you comply by several restrictions. These restrictions
 * A un-edited copy of this LICENSE.md shall always be included with this source code.
 * TotalFreedomMod source code and its derivations shall be freely distributable between anyone who chooses to download it.
 * You shall not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" or "JeromSar" from any part of the source code.
+* You shall not edit or remove the file Command_tfm.java
 * You may not modify the file TFM_FrontDoor.java. Removing it is fine, however.
 * Compiled binaries (*.jar's) shall not to be distributed.
   * If you wish to obtain a copy of TotalFreedomMod you must compile the original source code or it's derivations yourself.

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Jan 14 20:43:15 CET 2014
-build.number=698
+#Tue Apr 15 16:28:36 CEST 2014
+build.number=762

nbproject/project.properties

@@ -48,11 +48,11 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${libs.CraftBukkit.classpath}:\
     ${libs.WorldEdit.classpath}:\
     ${libs.DisguiseCraft.classpath}:\
     ${libs.Essentials.classpath}:\
-    ${libs.BukkitTelnet.classpath}
+    ${libs.BukkitTelnet.classpath}:\
+    ${libs.CraftBukkit.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=false

src/bans.yml

@@ -0,0 +1,13 @@
+#
+# TotalFreedomMod banning config
+# Warning: modification of this file is not reccomended
+#
+# Format:
+# Ip: [IP-address / UUID]:[Last login name]:[Expiry unix timestamp (0 = never)][Banned by]:[Reason]
+#
+
+ips:
+  - '192.168.1.254:Notch:DarthSalamon:0:IP ban example'
+
+uuids:
+  - '245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:DarthSalamon:0:UUID ban example'

src/config.yml

@@ -1,4 +1,4 @@
-# TotalFreedomMod v3.5 Configuration
+# TotalFreedomMod v4.0 Configuration
 # by Madgeek1450 and DarthSalamon
 
 # Block placement prevention:
@@ -61,7 +61,7 @@ blocked_commands:
   - 'n:b:/toggledownfall:_'
   - 'n:b:/effect:Please use /potion to set effects.'
   - 'n:b:/enderchest:_'
-  
+
   # Superadmin commands
   - 's:b:/kick:_'
   - 's:b:/socialspy:_'
@@ -74,7 +74,7 @@ blocked_commands:
   - 's:b:/tool:_'
   - 's:b://butcher:_'
   - 's:b:/scoreboard:_'
-  
+
   # Superadmin commands - Auto-eject
   - 's:a:/stop'
   - 's:a:/reload'
@@ -170,6 +170,9 @@ unbannable_usernames:
   - cavemanfilms
   - herobrine
   - whiteboy7thst
+  - stampylonghead
+  - stampylongnose
+  - dantdm
 
 # TwitterBot - Used to allow superadmins to verify themselves using twitter
 twitterbot_enabled: false
@@ -182,7 +185,7 @@ pet_protect_enabled: true
 # Logs Registration
 logs_register_password: ''
 logs_register_url: ''
-  
+
 # Mojang service checker
 service_checker_url: http://status.mojang.com/check
 

src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_DisguiseCraftBridge.java

@@ -1,5 +1,6 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Bridge;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import pgDev.bukkit.DisguiseCraft.DisguiseCraft;

src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_EssentialsBridge.java

@@ -1,7 +1,9 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Bridge;
 
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 

src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java

@@ -1,4 +1,4 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Bridge;
 
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
@@ -6,6 +6,10 @@ import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.regions.Region;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -118,7 +122,7 @@ public class TFM_WorldEditBridge
 
     public void validateSelection(final Player player)
     {
-        if (TFM_SuperadminList.isUserSuperadmin(player))
+        if (TFM_AdminList.isSuperAdmin(player))
         {
             return;
         }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -31,7 +31,7 @@ public class Command_adminmode extends TFM_Command
             TFM_Util.adminAction(sender.getName(), "Closing the server to non-superadmins.", true);
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     player.kickPlayer("Server is now closed to non-superadmins.");
                 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_AdminWorld;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.World;
@@ -217,7 +217,7 @@ public class Command_adminworld extends TFM_Command
 
     private void assertCommandPerms(CommandSender sender, Player sender_p) throws PermissionDeniedException
     {
-        if (!(sender instanceof Player) || sender_p == null || !TFM_SuperadminList.isUserSuperadmin(sender))
+        if (!(sender instanceof Player) || sender_p == null || !TFM_AdminList.isSuperAdmin(sender))
         {
             throw new PermissionDeniedException(TotalFreedomMod.MSG_NO_PERMS);
         }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
@@ -47,7 +47,7 @@ public class Command_blockcmd extends TFM_Command
             return true;
         }
 
-        if (TFM_SuperadminList.isUserSuperadmin(player))
+        if (TFM_AdminList.isSuperAdmin(player))
         {
             playerMsg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
             return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java

@@ -10,6 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
@@ -18,6 +19,7 @@ public class Command_cake extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+
         StringBuilder output = new StringBuilder();
         Random randomGenerator = new Random();
 
@@ -28,9 +30,13 @@ public class Command_cake extends TFM_Command
             output.append(ChatColor.COLOR_CHAR).append(color_code).append(word).append(" ");
         }
 
+        ItemStack heldItem = new ItemStack(Material.CAKE);
+        ItemMeta heldItemMeta = heldItem.getItemMeta();
+        heldItemMeta.setDisplayName((new StringBuilder()).append(ChatColor.WHITE).append("The ").append(ChatColor.BLACK).append("Lie").toString());
+        heldItem.setItemMeta(heldItemMeta);
+
         for (Player player : server.getOnlinePlayers())
         {
-            ItemStack heldItem = new ItemStack(Material.CAKE, 1);
             player.getInventory().setItem(player.getInventory().firstEmpty(), heldItem);
             player.awardAchievement(Achievement.MINE_WOOD);
             player.awardAchievement(Achievement.BUILD_WORKBENCH);

src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Minecart;
@@ -36,7 +36,7 @@ public class Command_cartsit extends TFM_Command
                 return true;
             }
         }
-        else if (targetPlayer != sender_p && !TFM_SuperadminList.isUserSuperadmin(sender))
+        else if (targetPlayer != sender_p && !TFM_AdminList.isSuperAdmin(sender))
         {
             sender.sendMessage("Only superadmins can select another player as a /cartsit target.");
             return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.Iterator;
 import java.util.Map;
-import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_config.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
@@ -33,7 +33,7 @@ public class Command_creative extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
                     sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -48,7 +48,7 @@ public class Command_creative extends TFM_Command
                 return true;
             }
 
-            if (!(senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender)))
+            if (!(senderIsConsole || TFM_AdminList.isSuperAdmin(sender)))
             {
                 playerMsg("Only superadmins can change other user's gamemode.");
                 return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_denick.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java

@@ -1,7 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
@@ -11,7 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "For the bad Superadmins.", usage = "/<command> <playername>")
+@CommandParameters(description = "For the bad Superadmins", usage = "/<command> <playername>")
 public class Command_doom extends TFM_Command
 {
     @Override
@@ -36,13 +38,13 @@ public class Command_doom extends TFM_Command
         TFM_Util.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
         TFM_Util.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
 
-        final String IP = player.getAddress().getAddress().getHostAddress().trim();
+        final String ip = player.getAddress().getAddress().getHostAddress().trim();
 
         // remove from superadmin
-        if (TFM_SuperadminList.isUserSuperadmin(player))
+        if (TFM_AdminList.isSuperAdmin(player))
         {
             TFM_Util.adminAction(sender.getName(), "Removing " + player.getName() + " from the superadmin list.", true);
-            TFM_SuperadminList.removeSuperadmin(player);
+            TFM_AdminList.removeSuperadmin(player);
         }
 
         // remove from whitelist
@@ -52,10 +54,10 @@ public class Command_doom extends TFM_Command
         player.setOp(false);
 
         // ban IP
-        TFM_ServerInterface.banIP(IP, null, null, null);
+        TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName()));
 
         // ban name
-        TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+        TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
 
         // set gamemode to survival
         player.setGameMode(GameMode.SURVIVAL);
@@ -89,7 +91,7 @@ public class Command_doom extends TFM_Command
             public void run()
             {
                 // message
-                TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + IP, true);
+                TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + ip, true);
 
                 // generate explosion
                 player.getWorld().createExplosion(player.getLocation(), 4F);

src/me/StevenLawson/TotalFreedomMod/Commands/Command_droptoggle.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
@@ -30,7 +30,7 @@ public class Command_findip extends TFM_Command
             return true;
         }
 
-        playerMsg("Player IPs: " + StringUtils.join(TFM_UserList.getInstance(TotalFreedomMod.plugin).getEntry(player).getIpAddresses(), ", "));
+        playerMsg("Player IPs: " + StringUtils.join(TFM_PlayerList.getInstance().getEntry(player).getIps(), ", "));
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_Flatlands;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.World.TFM_Flatlands;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java

@@ -1,9 +1,11 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -40,6 +42,13 @@ public class Command_fr extends TFM_Command
                 }.runTaskLater(plugin, 20L * 60L * 5L);
 
                 playerMsg("Players are now frozen.");
+                for (Player player : Bukkit.getOnlinePlayers())
+                {
+                    if (!TFM_AdminList.isSuperAdmin(player))
+                    {
+                        TFM_Util.playerMsg(player, "You have been frozen due to rule breaker(s), you will be unfrozen very soon.", ChatColor.RED);
+                    }
+                }
             }
             else
             {

src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java

@@ -1,5 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
@@ -49,33 +51,33 @@ public class Command_gadmin extends TFM_Command
                 }
                 else if (mode.equals("nameban"))
                 {
-                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
                     TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s.", player.getName()), true);
                     player.kickPlayer("Username banned by Administrator.");
                 }
                 else if (mode.equals("ipban"))
                 {
-                    String user_ip = player.getAddress().getAddress().getHostAddress();
-                    String[] ip_parts = user_ip.split("\\.");
+                    String ip = player.getAddress().getAddress().getHostAddress();
+                    String[] ip_parts = ip.split("\\.");
                     if (ip_parts.length == 4)
                     {
-                        user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+                        ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                     }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", player.getName(), user_ip), true);
-                    TFM_ServerInterface.banIP(user_ip, null, null, null);
+                    TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", player.getName(), ip), true);
+                    TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName()));
                     player.kickPlayer("IP address banned by Administrator.");
                 }
                 else if (mode.equals("ban"))
                 {
-                    String user_ip = player.getAddress().getAddress().getHostAddress();
-                    String[] ip_parts = user_ip.split("\\.");
+                    String ip = player.getAddress().getAddress().getHostAddress();
+                    String[] ip_parts = ip.split("\\.");
                     if (ip_parts.length == 4)
                     {
-                        user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+                        ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                     }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", player.getName(), user_ip), true);
-                    TFM_ServerInterface.banIP(user_ip, null, null, null);
-                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", player.getName(), ip), true);
+                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
+                    TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName()));
                     player.kickPlayer("IP and username banned by Administrator.");
                 }
                 else if (mode.equals("op"))

src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java

@@ -1,5 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,26 +30,17 @@ public class Command_gcmd extends TFM_Command
             return true;
         }
 
-        String outcommand = "";
-        try
+        final String outCommand = StringUtils.join(args, " ", 1, args.length);
+
+        if (TFM_CommandBlocker.getInstance().isCommandBlocked(outCommand, sender))
         {
-            StringBuilder outcommand_bldr = new StringBuilder();
-            for (int i = 1; i < args.length; i++)
-            {
-                outcommand_bldr.append(args[i]).append(" ");
-            }
-            outcommand = outcommand_bldr.toString().trim();
-        }
-        catch (Throwable ex)
-        {
-            sender.sendMessage(ChatColor.GRAY + "Error building command: " + ex.getMessage());
             return true;
         }
 
         try
         {
-            playerMsg("Sending command as " + player.getName() + ": " + outcommand);
-            if (server.dispatchCommand(player, outcommand))
+            playerMsg("Sending command as " + player.getName() + ": " + outCommand);
+            if (server.dispatchCommand(player, outCommand))
             {
                 playerMsg("Command sent.");
             }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java

@@ -3,11 +3,14 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList.TFM_UserListEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -29,9 +32,9 @@ public class Command_glist extends TFM_Command
             if (args[0].equalsIgnoreCase("purge"))
             {
                 //Purge does not clear the banlist! This is not for clearing bans! This is for clearing the yaml file that stores the player/IP database!
-                if (TFM_SuperadminList.isSeniorAdmin(sender))
+                if (TFM_AdminList.isSeniorAdmin(sender))
                 {
-                    TFM_UserList.getInstance(plugin).purge();
+                    TFM_PlayerList.getInstance().purgeAll();
                 }
                 else
                 {
@@ -47,18 +50,18 @@ public class Command_glist extends TFM_Command
         else if (args.length == 2)
         {
             String username;
-            List<String> ip_addresses = new ArrayList<String>();
+            List<String> ips = new ArrayList<String>();
 
             try
             {
                 Player player = getPlayer(args[1]);
 
                 username = player.getName();
-                ip_addresses.add(player.getAddress().getAddress().getHostAddress());
+                ips.add(player.getAddress().getAddress().getHostAddress());
             }
             catch (PlayerNotFoundException ex)
             {
-                TFM_UserListEntry entry = TFM_UserList.getInstance(plugin).getEntry(args[1]);
+                final TFM_PlayerEntry entry = TFM_PlayerList.getInstance().getEntry(args[1]);
 
                 if (entry == null)
                 {
@@ -66,44 +69,44 @@ public class Command_glist extends TFM_Command
                     return true;
                 }
 
-                username = entry.getUsername();
-                ip_addresses = entry.getIpAddresses();
+                username = entry.getLastJoinName();
+                ips = entry.getIps();
             }
 
             String mode = args[0].toLowerCase();
             if (mode.equalsIgnoreCase("ban"))
             {
-                TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true);
+                TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ips, ","), true);
 
                 Player player = server.getPlayerExact(username);
                 if (player != null)
                 {
-                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
                     player.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: http://www.totalfreedom.boards.net");
                 }
                 else
                 {
-                    TFM_ServerInterface.banUsername(username, null, null, null);
+                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(Bukkit.getOfflinePlayer(username).getUniqueId(), username));
                 }
 
-                for (String ip_address : ip_addresses)
+                for (String ip : ips)
                 {
-                    TFM_ServerInterface.banIP(ip_address, null, null, null);
-                    String[] ip_address_parts = ip_address.split("\\.");
-                    TFM_ServerInterface.banIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", null, null, null);
+                    TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, username));
+                    String[] ip_address_parts = ip.split("\\.");
+                    TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", username));
                 }
             }
             else if (mode.equalsIgnoreCase("unban") || mode.equalsIgnoreCase("pardon"))
             {
-                TFM_Util.adminAction(sender.getName(), "Unbanning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true);
+                TFM_Util.adminAction(sender.getName(), "Unbanning " + username + " and IPs: " + StringUtils.join(ips, ","), true);
 
-                TFM_ServerInterface.unbanUsername(username);
+                TFM_BanManager.getInstance().unbanUuid(Bukkit.getOfflinePlayer(username).getUniqueId());
 
-                for (String ip_address : ip_addresses)
+                for (String ip : ips)
                 {
-                    TFM_ServerInterface.unbanIP(ip_address);
-                    String[] ip_address_parts = ip_address.split("\\.");
-                    TFM_ServerInterface.unbanIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*");
+                    TFM_BanManager.getInstance().unbanIp(ip);
+                    String[] ipParts = ip.split("\\.");
+                    TFM_BanManager.getInstance().unbanIp(ipParts[0] + "." + ipParts[1] + ".*.*");
                 }
             }
             else

src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java

@@ -1,9 +1,11 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_WorldEditBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TFM_WorldEditBridge;
 import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
@@ -36,16 +38,22 @@ public class Command_gtfo extends TFM_Command
             return true;
         }
 
-        String ban_reason = null;
+        String reason = null;
         if (args.length >= 2)
         {
-            ban_reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         }
 
         TFM_Util.bcastMsg(player.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED);
 
         // Undo WorldEdits:
-        TFM_WorldEditBridge.getInstance().undo(player, 15);
+        try
+        {
+            TFM_WorldEditBridge.getInstance().undo(player, 15);
+        }
+        catch (NoClassDefFoundError ex)
+        {
+        }
 
         // rollback
         TFM_RollbackManager.rollback(player.getName());
@@ -71,20 +79,21 @@ public class Command_gtfo extends TFM_Command
         }
 
         // ban IP address:
-        String user_ip = player.getAddress().getAddress().getHostAddress();
-        String[] ip_parts = user_ip.split("\\.");
-        if (ip_parts.length == 4)
+        String ip = player.getAddress().getAddress().getHostAddress();
+        String[] ipParts = ip.split("\\.");
+        if (ipParts.length == 4)
         {
-            user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+            ip = String.format("%s.%s.*.*", ipParts[0], ipParts[1]);
         }
-        TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", player.getName(), user_ip), ChatColor.RED);
-        TFM_ServerInterface.banIP(user_ip, ban_reason, null, null);
+        TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", player.getName(), ip), ChatColor.RED);
+
+        TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName(), sender.getName(), null, reason));
 
         // ban username:
-        TFM_ServerInterface.banUsername(player.getName(), ban_reason, null, null);
+        TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName(), sender.getName(), null, reason));
 
         // kick Player:
-        player.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : ""));
+        player.kickPlayer(ChatColor.RED + "GTFO" + (reason != null ? ("\nReason: " + ChatColor.YELLOW + reason) : ""));
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -25,7 +25,7 @@ public class Command_halt extends TFM_Command
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     TFM_PlayerData.getPlayerData(player).setHalted(true);
                     counter++;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
@@ -38,9 +38,10 @@ public class Command_invis extends TFM_Command
             if (player.hasPotionEffect(PotionEffectType.INVISIBILITY))
             {
                 players.add(player.getName());
-                if (smite && !TFM_SuperadminList.isUserSuperadmin(player))
+                if (smite && !TFM_AdminList.isSuperAdmin(player))
                 {
-                    Command_smite.smite(player);
+                    TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
+                    player.setHealth(0.0);
                     smites++;
                 }
             }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -18,7 +18,7 @@ public class Command_kicknoob extends TFM_Command
 
         for (Player player : server.getOnlinePlayers())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 player.kickPlayer(ChatColor.RED + "Disconnected by admin.");
             }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.apache.commons.lang.StringUtils;
 
@@ -55,7 +55,7 @@ public class Command_list extends TFM_Command
         final List<String> names = new ArrayList<String>();
         for (Player player : server.getOnlinePlayers())
         {
-            final boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(player);
+            final boolean userSuperadmin = TFM_AdminList.isSuperAdmin(player);
 
             if (listFilter == Command_list.ListFilter.ADMINS && !userSuperadmin)
             {

src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java

@@ -9,9 +9,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
@@ -109,11 +109,11 @@ public class Command_logs extends TFM_Command
         }.runTaskAsynchronously(TotalFreedomMod.plugin);
     }
 
-    public static void deactivateSuperadmin(TFM_Superadmin superadmin)
+    public static void deactivateSuperadmin(TFM_Admin superadmin)
     {
         for (String ip : superadmin.getIps())
         {
-            updateLogsRegistration(null, superadmin.getName(), ip, Command_logs.LogsRegistrationMode.DELETE);
+            updateLogsRegistration(null, superadmin.getLastLoginName(), ip, Command_logs.LogsRegistrationMode.DELETE);
         }
     }
 

src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
@@ -26,7 +26,7 @@ public class Command_onlinemode extends TFM_Command
         {
             boolean online_mode;
 
-            if (sender instanceof Player && !TFM_SuperadminList.isSeniorAdmin(sender, true))
+            if (sender instanceof Player && !TFM_AdminList.isSeniorAdmin(sender, true))
             {
                 playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                 return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -38,7 +38,7 @@ public class Command_op extends TFM_Command
         // if the player is not online
         if (player == null)
         {
-            if (TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
+            if (TFM_AdminList.isSuperAdmin(sender) || senderIsConsole)
             {
                 player = server.getOfflinePlayer(args[0]);
             }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java

@@ -1,14 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage operators", usage = "/<command> <count | list | purge>")
+@CommandParameters(description = "Manage operators", usage = "/<command> <count | list>")
 public class Command_ops extends TFM_Command
 {
     @Override
@@ -51,29 +50,6 @@ public class Command_ops extends TFM_Command
             return true;
         }
 
-        if (args[0].equalsIgnoreCase("purge"))
-        {
-            if (!senderIsConsole)
-            {
-                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                return true;
-            }
-
-            TFM_Util.adminAction(sender.getName(), "Removing all operators", true);
-
-            for (OfflinePlayer player : server.getOperators())
-            {
-                player.setOp(false);
-
-                if (player.isOnline())
-                {
-                    player.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
-                }
-            }
-
-            return true;
-        }
-
         return true;
     }
 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_petprotect.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
@@ -38,7 +38,7 @@ public class Command_potion extends TFM_Command
             }
             else if (args[0].equalsIgnoreCase("clearall"))
             {
-                if (!(TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole))
+                if (!(TFM_AdminList.isSuperAdmin(sender) || senderIsConsole))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -71,7 +71,7 @@ public class Command_potion extends TFM_Command
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         playerMsg("Only superadmins can clear potion effects from other players.");
                         return true;
@@ -116,7 +116,7 @@ public class Command_potion extends TFM_Command
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         sender.sendMessage("Only superadmins can apply potion effects to other players.");
                         return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_DisguiseCraftBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_DisguiseCraftBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -99,7 +99,7 @@ public class Command_rollback extends TFM_Command
 
         if (playerName == null)
         {
-            playerName = TFM_UserList.getInstance(plugin).searchByPartialName(playerNameInput);
+            playerName = TFM_PlayerList.getInstance().getEntry(playerNameInput).getLastJoinName();
         }
 
         return playerName;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java

@@ -1,12 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -19,154 +20,146 @@ public class Command_saconfig extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length == 0 || args.length > 2)
+        {
+            return false;
+        }
         if (args.length == 1)
         {
             if (args[0].equals("list"))
             {
-                playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.GOLD);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperadminNames(), ", "), ChatColor.GOLD);
+                return true;
             }
-            else
+
+            if (args[0].equals("clean"))
             {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender, true))
+
+                if (!TFM_AdminList.isSeniorAdmin(sender, true))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
                 }
 
-                if (args[0].equals("clean"))
-                {
-                    TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
-                    TFM_SuperadminList.cleanSuperadminList(true);
-                    playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.YELLOW);
-                }
-                else
-                {
-                    return false;
-                }
-
+                TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
+                TFM_AdminList.cleanSuperadminList(true);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperadminUUIDs(), ", "), ChatColor.YELLOW);
                 return true;
             }
 
-            return true;
-        }
-        else if (args.length == 2)
-        {
-            if (args[0].equalsIgnoreCase("info"))
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
-                {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                    return true;
-                }
-
-                TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
-
-                if (superadmin == null)
-                {
-                    try
-                    {
-                        superadmin = TFM_SuperadminList.getAdminEntry(getPlayer(args[1]).getName().toLowerCase());
-                    }
-                    catch (PlayerNotFoundException ex)
-                    {
-                    }
-                }
-
-                if (superadmin == null)
-                {
-                    playerMsg("Superadmin not found: " + args[1]);
-                }
-                else
-                {
-                    playerMsg(ChatColor.stripColor(TFM_Util.colorize(superadmin.toString())));
-                }
-
-                return true;
-            }
-
-            if (!senderIsConsole)
-            {
-                playerMsg("This command may only be used from the console.");
-                return true;
-            }
-
-            if (args[0].equalsIgnoreCase("add"))
-            {
-                Player player = null;
-                String admin_name = null;
-
-                try
-                {
-                    player = getPlayer(args[1]);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
-                    if (superadmin != null)
-                    {
-                        admin_name = superadmin.getName();
-                    }
-                    else
-                    {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
-                        return true;
-                    }
-                }
-
-                if (player != null)
-                {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(player);
-                }
-                else if (admin_name != null)
-                {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + admin_name + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(admin_name);
-                }
-            }
-            else if (TFM_Util.isRemoveCommand(args[0]))
-            {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender))
-                {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                    return true;
-                }
-
-                String targetName = args[1];
-
-                try
-                {
-                    targetName = getPlayer(targetName).getName();
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                }
-
-                if (!TFM_SuperadminList.getSuperadminNames().contains(targetName.toLowerCase()))
-                {
-                    playerMsg("Superadmin not found: " + targetName);
-                    return true;
-                }
-
-                TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
-                TFM_SuperadminList.removeSuperadmin(targetName);
-
-                // Twitterbot
-                if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
-                {
-                    TFM_TwitterHandler.getInstance().delTwitterVerbose(targetName, sender);
-                }
-            }
-            else
-            {
-                return false;
-            }
-
-            return true;
-        }
-        else
-        {
             return false;
         }
+
+        if (args[0].equalsIgnoreCase("info"))
+        {
+            if (!TFM_AdminList.isSuperAdmin(sender))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
+            TFM_Admin superadmin = TFM_AdminList.getEntry(args[1].toLowerCase());
+
+            if (superadmin == null)
+            {
+                try
+                {
+                    superadmin = TFM_AdminList.getEntry(getPlayer(args[1]).getName().toLowerCase());
+                }
+                catch (PlayerNotFoundException ex)
+                {
+                }
+            }
+
+            if (superadmin == null)
+            {
+                playerMsg("Superadmin not found: " + args[1]);
+            }
+            else
+            {
+                playerMsg(superadmin.toString());
+            }
+
+            return true;
+        }
+
+        if (!senderIsConsole)
+        {
+            playerMsg("This command may only be used from the console.");
+            return true;
+        }
+
+        if (args[0].equalsIgnoreCase("add"))
+        {
+            Player player = null;
+            String playername = null;
+
+            try
+            {
+                player = getPlayer(args[1]);
+            }
+            catch (PlayerNotFoundException ex)
+            {
+                final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
+                if (superadmin != null)
+                {
+                    playername = superadmin.getLastLoginName();
+                }
+                else
+                {
+                    playerMsg(ex.getMessage(), ChatColor.RED);
+                    return true;
+                }
+            }
+
+            if (player != null)
+            {
+                TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true);
+                TFM_AdminList.addSuperadmin(player);
+            }
+            else if (playername != null)
+            {
+                TFM_Util.adminAction(sender.getName(), "Adding " + playername + " to the superadmin list.", true);
+                TFM_AdminList.addSuperadmin(player);
+            }
+            return true;
+        }
+
+        if (TFM_Util.isRemoveCommand(args[0]))
+        {
+            if (!TFM_AdminList.isSeniorAdmin(sender))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
+            String targetName = args[1];
+
+            try
+            {
+                targetName = getPlayer(targetName).getName();
+            }
+            catch (PlayerNotFoundException ex)
+            {
+            }
+
+            if (!TFM_AdminList.getLowerSuperadminNames().contains(targetName.toLowerCase()))
+            {
+                playerMsg("Superadmin not found: " + targetName);
+                return true;
+            }
+
+            TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
+            TFM_AdminList.removeSuperadmin(Bukkit.getOfflinePlayer(targetName));
+
+            // Twitterbot
+            if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
+            {
+                TFM_TwitterHandler.getInstance().delTwitterVerbose(targetName, sender);
+            }
+            return true;
+        }
+        return false;
+
     }
 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TFM_WorldEditBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_WorldEditBridge;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.Location;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
@@ -68,7 +68,7 @@ public class Command_stfu extends TFM_Command
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.setMuted(true);
@@ -118,7 +118,7 @@ public class Command_stfu extends TFM_Command
             }
             else
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     TFM_Util.adminAction(sender.getName(), "Muting " + player.getName(), true);
                     playerdata.setMuted(true);

src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
@@ -35,7 +35,7 @@ public class Command_survival extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
+                if (!TFM_AdminList.isSuperAdmin(sender) || senderIsConsole)
                 {
                     sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -50,7 +50,7 @@ public class Command_survival extends TFM_Command
                 return true;
             }
 
-            if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
+            if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender))
             {
                 try
                 {

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java

@@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.Arrays;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
@@ -27,7 +27,7 @@ public class Command_tag extends TFM_Command
         {
             if ("clearall".equals(args[0]))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -69,7 +69,7 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (!TFM_SuperadminList.isUserSuperadmin(sender))
+            if (!TFM_AdminList.isSuperAdmin(sender))
             {
                 for (String word : FORBIDDEN_WORDS)
                 {
@@ -98,7 +98,7 @@ public class Command_tag extends TFM_Command
         {
             if ("clear".equals(args[0]))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java

@@ -1,5 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
@@ -44,7 +46,8 @@ public class Command_tban extends TFM_Command
         }
 
         TFM_Util.adminAction(sender.getName(), "Tempbanning: " + player.getName() + " for 5 minutes.", true);
-        TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes.", sender.getName(), TFM_Util.parseDateOffset("5m"));
+        TFM_BanManager.getInstance().addUuidBan(
+                new TFM_Ban(player.getUniqueId(), player.getName(), sender.getName(), TFM_Util.parseDateOffset("5m"), ChatColor.RED + "You have been temporarily banned for 5 minutes."));
         player.kickPlayer(ChatColor.RED + "You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
 
         return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java

@@ -2,6 +2,8 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
@@ -37,24 +39,24 @@ public class Command_tempban extends TFM_Command
             return true;
         }
 
-        StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + player.getName());
+        final StringBuilder message = new StringBuilder("Temporarily banned " + player.getName());
 
-        Date ban_duration = TFM_Util.parseDateOffset("30m");
+        Date expires = TFM_Util.parseDateOffset("30m");
         if (args.length >= 2)
         {
             Date parsed_offset = TFM_Util.parseDateOffset(args[1]);
             if (parsed_offset != null)
             {
-                ban_duration = parsed_offset;
+                expires = parsed_offset;
             }
         }
-        bcast_msg.append(" until ").append(date_format.format(ban_duration));
+        message.append(" until ").append(date_format.format(expires));
 
-        String ban_reason = "Banned by " + sender.getName();
+        String reason = "Banned by " + sender.getName();
         if (args.length >= 3)
         {
-            ban_reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
-            bcast_msg.append(", Reason: \"").append(ban_reason).append("\"");
+            reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
+            message.append(", Reason: \"").append(reason).append("\"");
         }
 
 
@@ -69,10 +71,12 @@ public class Command_tempban extends TFM_Command
             }
         }
 
-        TFM_Util.adminAction(sender.getName(), bcast_msg.toString(), true);
-        TFM_ServerInterface.banUsername(player.getName(), ban_reason, sender.getName(), ban_duration);
-        TFM_ServerInterface.banIP(player.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration);
-        player.kickPlayer(sender.getName() + " - " + bcast_msg.toString());
+        TFM_Util.adminAction(sender.getName(), message.toString(), true);
+
+        TFM_BanManager.getInstance().addIpBan(new TFM_Ban(TFM_Util.getIp(player), player.getName(), sender.getName(), expires, reason));
+        TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName(), sender.getName(), expires, reason));
+
+        player.kickPlayer(sender.getName() + " - " + message.toString());
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java

@@ -2,7 +2,8 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -21,12 +22,12 @@ public class Command_tfbanlist extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("purge"))
             {
-                if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
+                if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender))
                 {
                     try
                     {
                         TFM_Util.adminAction(sender.getName(), "Purging the ban list", true);
-                        TFM_ServerInterface.wipeNameBans();
+                        TFM_BanManager.getInstance().purgeUuidBans();
                         sender.sendMessage(ChatColor.GRAY + "Ban list has been purged.");
                     }
                     catch (Exception ex)
@@ -43,20 +44,7 @@ public class Command_tfbanlist extends TFM_Command
             }
         }
 
-        StringBuilder banned_players = new StringBuilder();
-        banned_players.append("Banned Players: ");
-        boolean first = true;
-        for (OfflinePlayer player : server.getBannedPlayers())
-        {
-            if (!first)
-            {
-                banned_players.append(", ");
-            }
-            first = false;
-            banned_players.append(player.getName().trim());
-        }
-
-        playerMsg(banned_players.toString());
+        playerMsg(TFM_BanManager.getInstance().getUuidBanList().size() + " UUID bans total");
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java

@@ -5,7 +5,8 @@ import java.util.Collections;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -22,11 +23,11 @@ public class Command_tfipbanlist extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("purge"))
             {
-                if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
+                if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender))
                 {
                     try
                     {
-                        TFM_ServerInterface.wipeIpBans();
+                        TFM_BanManager.getInstance().purgeIpBans();
                         sender.sendMessage(ChatColor.GRAY + "IP ban list has been purged.");
                     }
                     catch (Exception ex)
@@ -43,26 +44,7 @@ public class Command_tfipbanlist extends TFM_Command
             }
         }
 
-        List<String> ip_bans = Arrays.asList(server.getIPBans().toArray(new String[0]));
-        Collections.sort(ip_bans);
-
-        StringBuilder banned_ips = new StringBuilder();
-        banned_ips.append("Banned IPs: ");
-        boolean first = true;
-        for (String ip : ip_bans)
-        {
-            if (!first)
-            {
-                banned_ips.append(", ");
-            }
-            if (ip.matches("^\\d{1,3}\\.\\d{1,3}\\.(\\d{1,3}|\\*)\\.(\\d{1,3}|\\*)$"))
-            {
-                first = false;
-                banned_ips.append(ip.trim());
-            }
-        }
-
-        playerMsg(banned_ips.toString());
+        playerMsg(TFM_BanManager.getInstance().getIpBanList().size() + " IPbans total");
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_DisguiseCraftBridge;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_DisguiseCraftBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.OfflinePlayer;
@@ -56,7 +56,7 @@ public class Command_whitelist extends TFM_Command
         }
 
         // all commands past this line are superadmin-only
-        if (!(senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender)))
+        if (!(senderIsConsole || TFM_AdminList.isSuperAdmin(sender)))
         {
             sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
             return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -57,7 +57,7 @@ public class Command_whohas extends TFM_Command
             if (player.getInventory().contains(material))
             {
                 players.add(player.getName());
-                if (smite & !TFM_SuperadminList.isUserSuperadmin(player))
+                if (smite & !TFM_AdminList.isSuperAdmin(player))
                 {
                     Command_smite.smite(player);
                 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java

@@ -13,6 +13,11 @@ public class Command_wildcard extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
         if (args[0].equals("wildcard"))
         {
             playerMsg("What the hell are you trying to do, you stupid idiot...", ChatColor.RED);

src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java

@@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
@@ -62,11 +62,11 @@ public abstract class TFM_Command
         CommandPermissions permissions = commandClass.getAnnotation(CommandPermissions.class);
         if (permissions != null)
         {
-            boolean is_super = TFM_SuperadminList.isUserSuperadmin(this.commandSender);
+            boolean is_super = TFM_AdminList.isSuperAdmin(this.commandSender);
             boolean is_senior = false;
             if (is_super)
             {
-                is_senior = TFM_SuperadminList.isSeniorAdmin(this.commandSender);
+                is_senior = TFM_AdminList.isSeniorAdmin(this.commandSender);
             }
 
             AdminLevel level = permissions.level();

src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java

@@ -0,0 +1,150 @@
+package me.StevenLawson.TotalFreedomMod.Config;
+
+import java.io.File;
+import java.io.IOException;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+
+/**
+ * Represents a definable YAML configuration.
+ *
+ * @see YamlConfiguration
+ */
+public class TFM_Config extends YamlConfiguration // BukkitLib @ https://github.com/Pravian/BukkitLib
+{
+    private final Plugin plugin;
+    private final File configFile;
+    private final boolean copyDefaults;
+
+    /**
+     * Creates a new YamlConfig instance.
+     *
+     * <p>Example:
+     * <pre>
+     * YamlConfig config = new YamlConfig(this, "config.yml", true);
+     * config.load();
+     * </pre></p>
+     *
+     * @param plugin The plugin to which the config belongs.
+     * @param fileName The filename of the config file.
+     * @param copyDefaults If the defaults should be copied and/loaded from a config in the plugin jar-file.
+     */
+    public TFM_Config(Plugin plugin, String fileName, boolean copyDefaults)
+    {
+        this(plugin, TFM_Util.getPluginFile(plugin, fileName), copyDefaults);
+    }
+
+    /**
+     * Creates a new YamlConfig instance.
+     *
+     * <p>Example:
+     * <pre>
+     * YamlConfig config = new YamlConfig(this, new File(plugin.getDataFolder() + "/players", "DarthSalamon.yml"), false);
+     * config.load();
+     * </pre></p>
+     *
+     * @param plugin The plugin to which the config belongs.
+     * @param file The file of the config file.
+     * @param copyDefaults If the defaults should be copied and/loaded from a config in the plugin jar-file.
+     */
+    public TFM_Config(Plugin plugin, File file, boolean copyDefaults)
+    {
+        this.plugin = plugin;
+        this.configFile = file;
+        this.copyDefaults = copyDefaults;
+    }
+
+    /**
+     * Saves the configuration to the predefined file.
+     *
+     * @see #YamlConfig(Plugin, String, boolean)
+     */
+    public void save()
+    {
+        try
+        {
+            super.save(configFile);
+        }
+        catch (Exception ex)
+        {
+            plugin.getLogger().severe("Could not save configuration file: " + configFile.getName());
+            plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex));
+        }
+    }
+
+    /**
+     * Loads the configuration from the predefined file.
+     *
+     * <p>Optionally, if loadDefaults has been set to true, the file will be copied over from the default inside the jar-file of the owning plugin.</p>
+     *
+     * @see #YamlConfig(Plugin, String, boolean)
+     */
+    public void load()
+    {
+        try
+        {
+            if (copyDefaults)
+            {
+                if (!configFile.exists())
+                {
+                    configFile.getParentFile().mkdirs();
+                    try
+                    {
+                        TFM_Util.copy(plugin.getResource(configFile.getName()), configFile);
+                    }
+                    catch (IOException ex)
+                    {
+                        plugin.getLogger().severe("Could not write default configuration file: " + configFile.getName());
+                        plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex));
+                    }
+                    plugin.getLogger().info("Installed default configuration " + configFile.getName());
+                }
+
+                super.addDefaults(getDefaultConfig());
+            }
+
+            if (configFile.exists())
+            {
+                super.load(configFile);
+            }
+        }
+        catch (Exception ex)
+        {
+            plugin.getLogger().severe("Could not load configuration file: " + configFile.getName());
+            plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex));
+        }
+    }
+
+    /**
+     * Returns the raw YamlConfiguration this config is based on.
+     *
+     * @return The YamlConfiguration.
+     * @see YamlConfiguration
+     */
+    public YamlConfiguration getConfig()
+    {
+        return this;
+    }
+
+    /**
+     * Returns the default configuration as been stored in the jar-file of the owning plugin.
+     * @return The default configuration.
+     */
+    public YamlConfiguration getDefaultConfig()
+    {
+        final YamlConfiguration DEFAULT_CONFIG = new YamlConfiguration();
+        try
+        {
+            DEFAULT_CONFIG.load(plugin.getResource(configFile.getName()));
+        }
+        catch (Throwable ex)
+        {
+            plugin.getLogger().severe("Could not load default configuration: " + configFile.getName());
+            plugin.getLogger().severe(ExceptionUtils.getStackTrace(ex));
+            return null;
+        }
+        return DEFAULT_CONFIG;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java

@@ -1,4 +1,4 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Config;
 
 import java.util.List;
 
@@ -79,51 +79,51 @@ public enum TFM_ConfigEntry
 
     public String getString()
     {
-        return TFM_Config.getInstance().getString(this);
+        return TFM_MainConfig.getInstance().getString(this);
     }
 
     public String setString(String value)
     {
-        TFM_Config.getInstance().setString(this, value);
+        TFM_MainConfig.getInstance().setString(this, value);
         return value;
     }
 
     public Double getDouble()
     {
-        return TFM_Config.getInstance().getDouble(this);
+        return TFM_MainConfig.getInstance().getDouble(this);
     }
 
     public Double setDouble(Double value)
     {
-        TFM_Config.getInstance().setDouble(this, value);
+        TFM_MainConfig.getInstance().setDouble(this, value);
         return value;
     }
 
     public Boolean getBoolean()
     {
-        return TFM_Config.getInstance().getBoolean(this);
+        return TFM_MainConfig.getInstance().getBoolean(this);
     }
 
     public Boolean setBoolean(Boolean value)
     {
-        TFM_Config.getInstance().setBoolean(this, value);
+        TFM_MainConfig.getInstance().setBoolean(this, value);
         return value;
     }
 
     public Integer getInteger()
     {
-        return TFM_Config.getInstance().getInteger(this);
+        return TFM_MainConfig.getInstance().getInteger(this);
     }
 
     public Integer setInteger(Integer value)
     {
-        TFM_Config.getInstance().setInteger(this, value);
+        TFM_MainConfig.getInstance().setInteger(this, value);
         return value;
     }
 
-    public List getList()
+    public List<?> getList()
     {
-        return TFM_Config.getInstance().getList(this);
+        return TFM_MainConfig.getInstance().getList(this);
     }
 
     public static TFM_ConfigEntry findConfigEntry(String name)

src/me/StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java

@@ -1,23 +1,26 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Config;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.EnumMap;
 import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.io.FileUtils;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-public class TFM_Config
+public class TFM_MainConfig
 {
     public static final String CONFIG_FILENAME = "config.yml";
     public static final File CONFIG_FILE = new File(TotalFreedomMod.plugin.getDataFolder(), CONFIG_FILENAME);
     //
     private final EnumMap<TFM_ConfigEntry, Object> configEntryMap = new EnumMap<TFM_ConfigEntry, Object>(TFM_ConfigEntry.class);
 
-    private TFM_Config()
+    private TFM_MainConfig()
     {
         try
         {
@@ -258,7 +261,7 @@ public class TFM_Config
     {
         private YamlConfiguration defaults = null;
 
-        public TFM_Config_DefaultsLoader(InputStream defaultConfig)
+        private TFM_Config_DefaultsLoader(InputStream defaultConfig)
         {
             try
             {
@@ -281,13 +284,13 @@ public class TFM_Config
         }
     }
 
-    public static TFM_Config getInstance()
+    public static TFM_MainConfig getInstance()
     {
         return TFM_ConfigHolder.INSTANCE;
     }
 
     private static class TFM_ConfigHolder
     {
-        private static final TFM_Config INSTANCE = new TFM_Config();
+        private static final TFM_MainConfig INSTANCE = new TFM_MainConfig();
     }
 }

src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java

@@ -12,7 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 
 import static me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.*;
 

src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_list.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.HTTPD;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -26,9 +26,9 @@ public class Module_list extends TFM_HTTPD_Module
         for (Player player : onlinePlayers)
         {
             String prefix = "";
-            if (TFM_SuperadminList.isUserSuperadmin(player))
+            if (TFM_AdminList.isSuperAdmin(player))
             {
-                if (TFM_SuperadminList.isSeniorAdmin(player))
+                if (TFM_AdminList.isSeniorAdmin(player))
                 {
                     prefix = "[SrA]";
                 }

src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_players.java

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.HTTPD;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import java.util.UUID;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Bukkit;
@@ -34,14 +35,14 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Super admins (non-telnet and non-senior)
-        for (String superadmin : TFM_SuperadminList.getSuperadminNames())
+        for (UUID superadmin : TFM_AdminList.getSuperadminUUIDs())
         {
-            if (TFM_SuperadminList.getSenioradminNames().contains(superadmin))
+            if (TFM_AdminList.getSenioradminUUIDs().contains(superadmin))
             {
                 continue;
             }
 
-            if (TFM_SuperadminList.getTelnetadminNames().contains(superadmin))
+            if (TFM_AdminList.getTelnetadminUUIDs().contains(superadmin))
             {
                 continue;
             }
@@ -50,9 +51,9 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Telnet admins (non-senior)
-        for (String telnetadmin : TFM_SuperadminList.getTelnetadminNames())
+        for (UUID telnetadmin : TFM_AdminList.getTelnetadminUUIDs())
         {
-            if (TFM_SuperadminList.getSenioradminNames().contains(telnetadmin))
+            if (TFM_AdminList.getSenioradminUUIDs().contains(telnetadmin))
             {
                 continue;
             }
@@ -60,7 +61,7 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Senior admins
-        for (String senioradmin : TFM_SuperadminList.getSenioradminNames())
+        for (UUID senioradmin : TFM_AdminList.getSenioradminUUIDs())
         {
             senioradmins.add(getName(senioradmin));
         }
@@ -79,16 +80,8 @@ public class Module_players extends TFM_HTTPD_Module
         return response;
     }
 
-    private String getName(String caseInsensitiveName)
+    private String getName(UUID uuid)
     {
-        final OfflinePlayer player = Bukkit.getOfflinePlayer(caseInsensitiveName);
-        if (player == null)
-        {
-            return caseInsensitiveName;
-        }
-        else
-        {
-            return player.getName();
-        }
+        return TFM_AdminList.getEntry(uuid).getLastLoginName();
     }
 }

src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java

@@ -12,8 +12,8 @@ import java.util.regex.Pattern;
 import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Method;
 import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import net.minecraft.util.org.apache.commons.io.FileUtils;
 import net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
@@ -223,7 +223,7 @@ public class Module_schematic extends TFM_HTTPD_Module
 
     private boolean isAuthorized(String remoteAddress)
     {
-        TFM_Superadmin entry = TFM_SuperadminList.getAdminEntryByIP(remoteAddress);
+        TFM_Admin entry = TFM_AdminList.getEntryByIp(remoteAddress);
         return entry != null && entry.isActivated();
     }
 

src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java

@@ -8,7 +8,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.HTTPSession;
 import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.*;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -91,7 +92,7 @@ public class TFM_BlockListener implements Listener
 
         if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 if (TFM_ProtectedArea.isInProtectedArea(blockLocation))
                 {
@@ -161,7 +162,7 @@ public class TFM_BlockListener implements Listener
 
         if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 if (TFM_ProtectedArea.isInProtectedArea(blockLocation))
                 {
@@ -249,7 +250,7 @@ public class TFM_BlockListener implements Listener
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onRollbackBlockBreak(BlockBreakEvent event)
     {
-        if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer()))
+        if (!TFM_AdminList.isSuperAdmin(event.getPlayer()))
         {
             TFM_RollbackManager.blockBreak(event);
         }
@@ -258,7 +259,7 @@ public class TFM_BlockListener implements Listener
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onRollbackBlockPlace(BlockPlaceEvent event)
     {
-        if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer()))
+        if (!TFM_AdminList.isSuperAdmin(event.getPlayer()))
         {
             TFM_RollbackManager.blockPlace(event);
         }

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java

@@ -1,5 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -96,7 +98,7 @@ public class TFM_PlayerListener implements Listener
                 {
                     case STICK:
                     {
-                        if (!TFM_SuperadminList.isUserSuperadmin(player))
+                        if (!TFM_AdminList.isSuperAdmin(player))
                         {
                             break;
                         }
@@ -112,10 +114,15 @@ public class TFM_PlayerListener implements Listener
                             break;
                         }
 
-                        TFM_Util.playerMsg(player, "Block edits at (" + ChatColor.WHITE + "x" + location.getBlockX() + ", y" + location.getBlockY() + ", z" + location.getBlockZ() + ChatColor.BLUE + ")" + ChatColor.WHITE + ":", ChatColor.BLUE);
+                        TFM_Util.playerMsg(player, "Block edits at ("
+                                + ChatColor.WHITE + "x" + location.getBlockX()
+                                + ", y" + location.getBlockY()
+                                + ", z" + location.getBlockZ()
+                                + ChatColor.BLUE + ")" + ChatColor.WHITE + ":", ChatColor.BLUE);
                         for (RollbackEntry entry : entries)
                         {
-                            TFM_Util.playerMsg(player, " - " + ChatColor.BLUE + entry.author + " " + entry.getType() + " " + StringUtils.capitalize(entry.getMaterial().toString().toLowerCase()) + (entry.data == 0 ? "" : ":" + entry.data));
+                            TFM_Util.playerMsg(player, " - " + ChatColor.BLUE + entry.author + " " + entry.getType() + " "
+                                    + StringUtils.capitalize(entry.getMaterial().toString().toLowerCase()) + (entry.data == 0 ? "" : ":" + entry.data));
                         }
 
                         break;
@@ -166,7 +173,7 @@ public class TFM_PlayerListener implements Listener
                             break;
                         }
 
-                        if (!TFM_SuperadminList.isSeniorAdmin(player, true))
+                        if (!TFM_AdminList.isSeniorAdmin(player, true))
                         {
                             break;
                         }
@@ -202,7 +209,7 @@ public class TFM_PlayerListener implements Listener
                             break;
                         }
 
-                        if (!TFM_SuperadminList.isSeniorAdmin(player, true))
+                        if (!TFM_AdminList.isSeniorAdmin(player, true))
                         {
                             break;
                         }
@@ -330,7 +337,7 @@ public class TFM_PlayerListener implements Listener
         boolean freeze = false;
         if (TotalFreedomMod.allPlayersFrozen)
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 freeze = true;
             }
@@ -454,10 +461,10 @@ public class TFM_PlayerListener implements Listener
             final Player player = event.getPlayer();
             String message = event.getMessage().trim();
 
-            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+            final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
             // Check for spam
-            Long lastRan = TFM_Heartbeat.getLastRan();
+            final Long lastRan = TFM_Heartbeat.getLastRan();
             if (lastRan == null || lastRan + TotalFreedomMod.HEARTBEAT_RATE * 1000L < System.currentTimeMillis())
             {
                 //TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates.");
@@ -489,7 +496,7 @@ public class TFM_PlayerListener implements Listener
             // Check for muted
             if (playerdata.isMuted())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     player.sendMessage(ChatColor.RED + "You are muted, STFU!");
                     event.setCancelled(true);
@@ -537,9 +544,6 @@ public class TFM_PlayerListener implements Listener
             // Finally, set message
             event.setMessage(message);
 
-            // Broadcast it to console (since 1.7 doesn't do that anymore)
-            TFM_Log.info(String.format(event.getFormat(), player.getDisplayName(), event.getMessage()), true);
-
             // Set the tag
             if (playerdata.getTag() != null)
             {
@@ -557,9 +561,9 @@ public class TFM_PlayerListener implements Listener
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
     {
         String command = event.getMessage();
-        Player player = event.getPlayer();
+        final Player player = event.getPlayer();
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
         playerdata.setLastCommand(command);
 
         if (playerdata.incrementAndGetMsgCount() > MSG_PER_HEARTBEAT)
@@ -585,7 +589,7 @@ public class TFM_PlayerListener implements Listener
         // Block commands if player is muted
         if (playerdata.isMuted())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 for (String commandName : BLOCKED_MUTED_CMDS)
                 {
@@ -617,11 +621,11 @@ public class TFM_PlayerListener implements Listener
             event.setCancelled(true);
         }
 
-        if (!TFM_SuperadminList.isUserSuperadmin(player))
+        if (!TFM_AdminList.isSuperAdmin(player))
         {
             for (Player pl : Bukkit.getOnlinePlayers())
             {
-                if (TFM_SuperadminList.isUserSuperadmin(pl) && TFM_PlayerData.getPlayerData(pl).cmdspyEnabled())
+                if (TFM_AdminList.isSuperAdmin(pl) && TFM_PlayerData.getPlayerData(pl).cmdspyEnabled())
                 {
                     TFM_Util.playerMsg(pl, player.getName() + ": " + command);
                 }
@@ -661,8 +665,7 @@ public class TFM_PlayerListener implements Listener
             playerdata.clearHistory();
         }
 
-        // Log player quitting, because 1.7 doesn't do this
-        TFM_Log.info(player.getName() + " left the game.");
+        TFM_Log.info("[EXIT] " + player.getName() + " left the game.", true);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -673,80 +676,98 @@ public class TFM_PlayerListener implements Listener
         {
             TotalFreedomMod.fuckoffEnabledFor.remove(player);
         }
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
         playerdata.disarmMP44();
         if (playerdata.isCaged())
         {
             playerdata.regenerateHistory();
             playerdata.clearHistory();
         }
+
+        TFM_Log.info("[EXIT] " + player.getName() + " left the game.", true);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
     {
-        try
+        final Player player = event.getPlayer();
+        final String ip = TFM_Util.getIp(player);
+        TFM_Log.info("[JOIN] " + TFM_Util.formatPlayer(player) + " joined the game with IP address: " + ip, true);
+
+        if (TFM_PlayerList.getInstance().existsEntry(player))
         {
-            final Player player = event.getPlayer();
-            final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
-            playerdata.setSuperadminIdVerified(null);
+            final TFM_PlayerEntry entry = TFM_PlayerList.getInstance().getEntry(player);
+            entry.setLastJoinUnix(TFM_Util.getUnixTime());
+            entry.setLastJoinName(player.getName());
+            entry.save();
+        }
+        else
+        {
+            TFM_Log.info("Added new player: " + TFM_Util.formatPlayer(player));
+        }
 
-            // Log join message, as 1.7 doesn't log it anymore
-            TFM_Log.info(player.getName() + " joined the game.");
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+        playerdata.setSuperadminIdVerified(false);
 
-            TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player);
-
-            final boolean impostor = TFM_SuperadminList.isSuperadminImpostor(player);
-
-            if (impostor || TFM_SuperadminList.isUserSuperadmin(player))
+        // Verify strict IP match
+        if (TFM_AdminList.isSuperAdmin(player))
+        {
+            if (TFM_BanManager.getInstance().isIpBanned(ip))
             {
-                TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
-
-                if (impostor)
-                {
-                    player.getInventory().clear();
-                    player.setOp(false);
-                    player.setGameMode(GameMode.SURVIVAL);
-                    TFM_Util.bcastMsg("Warning: " + player.getName() + " has been flagged as an impostor!", ChatColor.RED);
-                }
-                else
-                {
-                    if (TFM_SuperadminList.verifyIdentity(player.getName(), player.getAddress().getAddress().getHostAddress()))
-                    {
-                        playerdata.setSuperadminIdVerified(Boolean.TRUE);
-
-                        TFM_SuperadminList.updateLastLogin(player);
-                    }
-                    else
-                    {
-                        playerdata.setSuperadminIdVerified(Boolean.FALSE);
-
-                        TFM_Util.bcastMsg("Warning: " + player.getName() + " is an admin, but is using a username not registered to one of their IPs.", ChatColor.RED);
-                    }
-
-                    player.setOp(true);
-                }
-            }
-            else if (TFM_Util.DEVELOPERS.contains(player.getName()))
-            {
-                TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
+                TFM_BanManager.getInstance().unbanIp(ip);
             }
 
-            if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+            if (TFM_BanManager.getInstance().isUuidBanned(player.getUniqueId()))
             {
-                new BukkitRunnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        player.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins.");
-                    }
-                }.runTaskLater(TotalFreedomMod.plugin, 20L * 3L);
+                TFM_BanManager.getInstance().unbanUuid(player.getUniqueId());
+            }
+
+            player.setOp(true);
+
+            if (!TFM_AdminList.isIdentityMatched(player))
+            {
+                playerdata.setSuperadminIdVerified(false);
+
+                TFM_Util.bcastMsg("Warning: " + player.getName() + " is an admin, but is using an account not registered to one of their ip-list.", ChatColor.RED);
+            }
+            else
+            {
+                playerdata.setSuperadminIdVerified(true);
+                TFM_AdminList.updateLastLogin(player);
             }
         }
-        catch (Throwable ex)
+
+        // Handle admin impostors
+        if (TFM_AdminList.isAdminImpostor(player))
         {
+            TFM_Util.bcastMsg("Warning: " + player.getName() + " has been flagged as an impostor!", ChatColor.RED);
+            TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
+            player.getInventory().clear();
+            player.setOp(false);
+            player.setGameMode(GameMode.SURVIVAL);
         }
+        else if (TFM_AdminList.isSuperAdmin(player) || TFM_Util.DEVELOPERS.contains(player.getName()))
+        {
+            TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
+        }
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+                {
+                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins.");
+                }
+
+                if (TotalFreedomMod.lockdownEnabled)
+                {
+                    TFM_Util.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED);
+                }
+            }
+        }.runTaskLater(TotalFreedomMod.plugin, 20L * 3L);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java

@@ -1,7 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
 import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.Bukkit;
@@ -50,32 +51,15 @@ public class TFM_ServerListener implements Listener
      }
      }
      }*/
-    @Deprecated // Moved to TFM_TelnetListener
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onRemoteServerCommand(RemoteServerCommandEvent event)
-    {
-        if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
-        {
-            event.setCommand("");
-        }
-    }
-
-    @Deprecated // Moved to TFM_TelnetListener
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onServerCommand(ServerCommandEvent event)
-    {
-        if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
-        {
-            event.setCommand("");
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onServerPing(ServerListPingEvent event)
     {
+        final String ip = event.getAddress().getHostAddress();
         event.setMotd(TFM_Util.randomChatColor() + "Total" + TFM_Util.randomChatColor() + "Freedom " + ChatColor.DARK_GRAY + "-" + TFM_Util.randomChatColor() + " Bukkit v" + TFM_ServerInterface.getVersion());
 
-        if (TFM_ServerInterface.isIPBanned(event.getAddress().getHostAddress()))
+
+
+        if (TFM_BanManager.getInstance().isIpBanned(ip))
         {
             event.setMotd(ChatColor.RED + "You are banned.");
         }

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java

@@ -1,8 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
+import me.StevenLawson.BukkitTelnet.api.TelnetCommandEvent;
+import me.StevenLawson.BukkitTelnet.api.TelnetPreLoginEvent;
 import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
@@ -12,7 +14,7 @@ import org.bukkit.event.Listener;
 public class TFM_TelnetListener implements Listener
 {
     @EventHandler(priority = EventPriority.NORMAL)
-    public void onTelnetPreLogin(me.StevenLawson.BukkitTelnet.TelnetPreLoginEvent event)
+    public void onTelnetPreLogin(TelnetPreLoginEvent event)
     {
 
         final String ip = event.getIp();
@@ -21,17 +23,17 @@ public class TFM_TelnetListener implements Listener
             return;
         }
 
-        final TFM_Superadmin admin = TFM_SuperadminList.getAdminEntryByIP(ip, true);
+        final TFM_Admin admin = TFM_AdminList.getEntryByIp(ip, true);
 
-        if (admin == null || !(admin.isTelnetAdmin() || admin.isSeniorAdmin()))
+        if (admin == null || !admin.isTelnetAdmin())
         {
             return;
         }
 
         event.setBypassPassword(true);
-        event.setName(admin.getName());
+        event.setName(admin.getLastLoginName());
 
-        final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getName());
+        final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getLastLoginName());
         if (player == null)
         {
             return;
@@ -41,7 +43,7 @@ public class TFM_TelnetListener implements Listener
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
-    public void onTelnetCommand(me.StevenLawson.BukkitTelnet.TelnetCommandEvent event)
+    public void onTelnetCommand(TelnetCommandEvent event)
     {
         if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
         {

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_WeatherListener.java

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TFM_AdminWorld;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java

@@ -1,13 +1,16 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import java.util.UUID;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.configuration.ConfigurationSection;
 
-public class TFM_Superadmin
+public class TFM_Admin
 {
-    private final String name;
+    private final UUID uuid;
+    private String lastLoginName;
     private final String loginMessage;
     private final boolean isSeniorAdmin;
     private final boolean isTelnetAdmin;
@@ -16,9 +19,10 @@ public class TFM_Superadmin
     private Date lastLogin;
     private boolean isActivated;
 
-    public TFM_Superadmin(String name, List<String> ips, Date lastLogin, String loginMessage, boolean isSeniorAdmin, boolean isTelnetAdmin, List<String> consoleAliases, boolean isActivated)
+    public TFM_Admin(UUID uuid, String lastLoginName, List<String> ips, Date lastLogin, String loginMessage, boolean isSeniorAdmin, boolean isTelnetAdmin, List<String> consoleAliases, boolean isActivated)
     {
-        this.name = name.toLowerCase();
+        this.uuid = uuid;
+        this.lastLoginName = lastLoginName;
         this.ips = ips;
         this.lastLogin = lastLogin;
         this.loginMessage = loginMessage;
@@ -28,9 +32,10 @@ public class TFM_Superadmin
         this.isActivated = isActivated;
     }
 
-    public TFM_Superadmin(String name, ConfigurationSection section)
+    public TFM_Admin(UUID uuid, ConfigurationSection section)
     {
-        this.name = name.toLowerCase();
+        this.uuid = uuid;
+        this.lastLoginName = section.getString("last_login_name");
         this.ips = section.getStringList("ips");
         this.lastLogin = TFM_Util.stringToDate(section.getString("last_login", TFM_Util.dateToString(new Date(0L))));
         this.loginMessage = section.getString("custom_login_message", "");
@@ -43,35 +48,47 @@ public class TFM_Superadmin
     @Override
     public String toString()
     {
-        StringBuilder output = new StringBuilder();
+        final StringBuilder output = new StringBuilder();
 
-        try
-        {
-            output.append("Name: ").append(this.name).append("\n");
-            output.append("- IPs: ").append(StringUtils.join(this.ips, ", ")).append("\n");
-            output.append("- Last Login: ").append(TFM_Util.dateToString(this.lastLogin)).append("\n");
-            output.append("- Custom Login Message: ").append(this.loginMessage).append("\n");
-            output.append("- Is Senior Admin: ").append(this.isSeniorAdmin).append("\n");
-            output.append("- Is Telnet Admin: ").append(this.isTelnetAdmin).append("\n");
-            output.append("- Console Aliases: ").append(StringUtils.join(this.consoleAliases, ", ")).append("\n");
-            output.append("- Is Activated: ").append(this.isActivated);
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
+        output.append("UUID: ").append(uuid.toString()).append("\n");
+        output.append("- Last Login Name: ").append(lastLoginName).append("\n");
+        output.append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n");
+        output.append("- Last Login: ").append(TFM_Util.dateToString(lastLogin)).append("\n");
+        output.append("- Custom Login Message: ").append(loginMessage).append("\n");
+        output.append("- Is Senior Admin: ").append(isSeniorAdmin).append("\n");
+        output.append("- Is Telnet Admin: ").append(isTelnetAdmin).append("\n");
+        output.append("- Console Aliases: ").append(StringUtils.join(consoleAliases, ", ")).append("\n");
+        output.append("- Is Activated: ").append(isActivated);
 
         return output.toString();
     }
 
-    public String getName()
+    public UUID getUniqueId()
     {
-        return name;
+        return uuid;
+    }
+
+    public void setLastLoginName(String lastLoginName)
+    {
+        this.lastLoginName = lastLoginName;
+    }
+
+    public String getLastLoginName()
+    {
+        return lastLoginName;
     }
 
     public List<String> getIps()
     {
-        return ips;
+        return Collections.unmodifiableList(ips);
+    }
+
+    public void addIp(String ip)
+    {
+        if (!ips.contains(ip))
+        {
+            ips.add(ip);
+        }
     }
 
     public Date getLastLogin()
@@ -96,7 +113,7 @@ public class TFM_Superadmin
 
     public List<String> getConsoleAliases()
     {
-        return consoleAliases;
+        return Collections.unmodifiableList(consoleAliases);
     }
 
     public void setLastLogin(Date lastLogin)

src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java

@@ -0,0 +1,561 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import me.StevenLawson.TotalFreedomMod.Commands.Command_logs;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.util.FileUtil;
+
+public class TFM_AdminList
+{
+    private static final Map<UUID, TFM_Admin> adminList;
+    private static final Set<UUID> superadminUUIDs;
+    private static final Set<UUID> telnetadminUUIDs;
+    private static final Set<UUID> senioradminUUIDs;
+    private static final Set<String> consoleAliases;
+    private static final Set<String> superadminIps;
+    private static int cleanThreshold = 24 * 7; // 1 Week in hours
+
+    static
+    {
+        adminList = new HashMap<UUID, TFM_Admin>();
+        superadminUUIDs = new HashSet<UUID>();
+        telnetadminUUIDs = new HashSet<UUID>();
+        senioradminUUIDs = new HashSet<UUID>();
+        consoleAliases = new HashSet<String>();
+        superadminIps = new HashSet<String>();
+    }
+
+    public static Set<UUID> getSuperadminUUIDs()
+    {
+        return Collections.unmodifiableSet(superadminUUIDs);
+    }
+
+    public static Set<UUID> getTelnetadminUUIDs()
+    {
+        return Collections.unmodifiableSet(telnetadminUUIDs);
+    }
+
+    public static Set<UUID> getSenioradminUUIDs()
+    {
+        return Collections.unmodifiableSet(senioradminUUIDs);
+    }
+
+    public static Set<String> getConsoleAliases()
+    {
+        return Collections.unmodifiableSet(consoleAliases);
+    }
+
+    public static Set<String> getSuperadminIps()
+    {
+        return Collections.unmodifiableSet(superadminIps);
+    }
+
+    public static Set<String> getSuperadminNames()
+    {
+        final Set<String> names = new HashSet<String>();
+
+        for (TFM_Admin admin : adminList.values())
+        {
+            names.add(admin.getLastLoginName());
+        }
+
+        return Collections.unmodifiableSet(names);
+    }
+
+    public static Set<String> getLowerSuperadminNames()
+    {
+        final Set<String> names = new HashSet<String>();
+
+        for (TFM_Admin admin : adminList.values())
+        {
+            names.add(admin.getLastLoginName().toLowerCase());
+        }
+
+        return Collections.unmodifiableSet(names);
+    }
+
+    public static void load()
+    {
+        try
+        {
+            adminList.clear();
+
+            final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.SUPERADMIN_FILE, true);
+            config.load();
+
+            cleanThreshold = config.getInt("clean_threshold_hours", cleanThreshold);
+
+            // Parse old superadmins
+            if (config.isConfigurationSection("superadmins"))
+            {
+                TFM_Log.info("Old superadmin configuration found, parsing...");
+
+                final ConfigurationSection section = config.getConfigurationSection("superadmins");
+
+                int counter = 0;
+                int errors = 0;
+
+                for (String admin : config.getConfigurationSection("superadmins").getKeys(false))
+                {
+                    final OfflinePlayer player = Bukkit.getOfflinePlayer(admin);
+
+                    if (player == null || player.getUniqueId() == null)
+                    {
+                        errors++;
+                        TFM_Log.warning("Could not convert admin " + admin + ", UUID could not be found!");
+                        continue;
+                    }
+
+                    final String uuid = player.getUniqueId().toString();
+
+                    config.set("admins." + uuid + ".last_login_name", player.getName());
+                    config.set("admins." + uuid + ".is_activated", section.getBoolean(admin + ".is_activated"));
+                    config.set("admins." + uuid + ".is_telnet_admin", section.getBoolean(admin + ".is_telnet_admin"));
+                    config.set("admins." + uuid + ".is_senior_admin", section.getBoolean(admin + ".is_senior_admin"));
+                    config.set("admins." + uuid + ".last_login", section.getString(admin + ".last_login"));
+                    config.set("admins." + uuid + ".custom_login_message", section.getString(admin + ".custom_login_message"));
+                    config.set("admins." + uuid + ".console_aliases", section.getStringList(admin + ".console_aliases"));
+                    config.set("admins." + uuid + ".ips", section.getStringList(admin + ".ips"));
+
+                    counter++;
+                }
+
+                config.set("superadmins", null);
+                config.save();
+
+                TFM_Log.info(counter + " admins parsed, " + errors + " errors");
+            }
+
+            if (!config.isConfigurationSection("admins"))
+            {
+                TFM_Log.warning("Missing admins section in superadmin.yml.");
+                return;
+            }
+
+            final ConfigurationSection section = config.getConfigurationSection("admins");
+
+            for (String uuidString : section.getKeys(false))
+            {
+                if (!TFM_Util.isUniqueId(uuidString))
+                {
+                    TFM_Log.warning("Invalid Unique ID: " + uuidString + " in superadmin.yml, ignoring");
+                    continue;
+                }
+
+                final UUID uuid = UUID.fromString(uuidString);
+
+                final TFM_Admin superadmin = new TFM_Admin(uuid, section.getConfigurationSection(uuidString));
+                adminList.put(uuid, superadmin);
+            }
+
+            updateIndexLists();
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public static void backupSavedList()
+    {
+        final File oldYaml = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE);
+        final File newYaml = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE + ".bak");
+        FileUtil.copy(oldYaml, newYaml);
+    }
+
+    public static void updateIndexLists()
+    {
+        superadminUUIDs.clear();
+        telnetadminUUIDs.clear();
+        senioradminUUIDs.clear();
+        consoleAliases.clear();
+        superadminIps.clear();
+
+        for (TFM_Admin admin : adminList.values())
+        {
+            if (!admin.isActivated())
+            {
+                continue;
+            }
+
+            final UUID uuid = admin.getUniqueId();
+
+            superadminUUIDs.add(uuid);
+
+            for (String ip : admin.getIps())
+            {
+                superadminIps.add(ip);
+            }
+
+            if (admin.isTelnetAdmin())
+            {
+                telnetadminUUIDs.add(uuid);
+
+                for (String alias : admin.getConsoleAliases())
+                {
+                    consoleAliases.add(alias.toLowerCase());
+                }
+            }
+
+
+            if (admin.isSeniorAdmin())
+            {
+                senioradminUUIDs.add(uuid);
+            }
+        }
+
+        TFM_AdminWorld.getInstance().wipeAccessCache();
+    }
+
+    public static void save()
+    {
+        updateIndexLists();
+
+        final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.SUPERADMIN_FILE, true);
+        config.load();
+
+        config.set("clean_threshold_hours", cleanThreshold);
+
+        Iterator<Entry<UUID, TFM_Admin>> it = adminList.entrySet().iterator();
+        while (it.hasNext())
+        {
+            Entry<UUID, TFM_Admin> pair = it.next();
+
+            UUID uuid = pair.getKey();
+            TFM_Admin superadmin = pair.getValue();
+
+            config.set("admins." + uuid + ".last_login_name", superadmin.getLastLoginName());
+            config.set("admins." + uuid + ".is_activated", superadmin.isActivated());
+            config.set("admins." + uuid + ".is_telnet_admin", superadmin.isTelnetAdmin());
+            config.set("admins." + uuid + ".is_senior_admin", superadmin.isSeniorAdmin());
+            config.set("admins." + uuid + ".last_login", TFM_Util.dateToString(superadmin.getLastLogin()));
+            config.set("admins." + uuid + ".custom_login_message", superadmin.getCustomLoginMessage());
+            config.set("admins." + uuid + ".console_aliases", TFM_Util.removeDuplicates(superadmin.getConsoleAliases()));
+            config.set("admins." + uuid + ".ips", TFM_Util.removeDuplicates(superadmin.getIps()));
+        }
+
+        config.save();
+    }
+
+    public static TFM_Admin getEntry(Player player)
+    {
+        final UUID uuid = player.getUniqueId();
+
+        if (Bukkit.getOnlineMode())
+        {
+            if (adminList.containsKey(uuid))
+            {
+                return adminList.get(uuid);
+            }
+        }
+
+        return getEntryByIp(TFM_Util.getIp(player));
+    }
+
+    public static TFM_Admin getEntry(UUID uuid)
+    {
+        return adminList.get(uuid);
+    }
+
+    @Deprecated
+    public static TFM_Admin getEntry(String name)
+    {
+        for (UUID uuid : adminList.keySet())
+        {
+            if (adminList.get(uuid).getLastLoginName().equalsIgnoreCase(name))
+            {
+                return adminList.get(uuid);
+            }
+        }
+        return null;
+    }
+
+    public static TFM_Admin getEntryByIp(String ip)
+    {
+        return getEntryByIp(ip, false);
+    }
+
+    public static TFM_Admin getEntryByIp(String needleIp, boolean fuzzy)
+    {
+        Iterator<Entry<UUID, TFM_Admin>> it = adminList.entrySet().iterator();
+        while (it.hasNext())
+        {
+            final Entry<UUID, TFM_Admin> pair = it.next();
+            final TFM_Admin superadmin = pair.getValue();
+
+            if (fuzzy)
+            {
+                for (String haystackIp : superadmin.getIps())
+                {
+                    if (TFM_Util.fuzzyIpMatch(needleIp, haystackIp, 3))
+                    {
+                        return superadmin;
+                    }
+                }
+            }
+            else
+            {
+                if (superadmin.getIps().contains(needleIp))
+                {
+                    return superadmin;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static void updateLastLogin(Player player)
+    {
+        final TFM_Admin admin = getEntry(player);
+        if (admin != null)
+        {
+            admin.setLastLogin(new Date());
+            admin.setLastLoginName(player.getName());
+            save();
+        }
+    }
+
+    public static boolean isSeniorAdmin(CommandSender sender)
+    {
+        return isSeniorAdmin(sender, false);
+    }
+
+    public static boolean isSeniorAdmin(CommandSender sender, boolean verifySuperadmin)
+    {
+        if (verifySuperadmin)
+        {
+            if (!isSuperAdmin(sender))
+            {
+                return false;
+            }
+        }
+
+
+        if (!(sender instanceof Player))
+        {
+            return consoleAliases.contains(sender.getName());
+        }
+
+        final TFM_Admin entry = getEntry((Player) sender);
+        if (entry != null)
+        {
+            return entry.isSeniorAdmin();
+        }
+
+        return false;
+    }
+
+    public static boolean isSuperAdmin(CommandSender sender)
+    {
+        if (!(sender instanceof Player))
+        {
+            return true;
+        }
+
+        if (Bukkit.getOnlineMode() && superadminUUIDs.contains(((Player) sender).getUniqueId()))
+        {
+            return true;
+        }
+
+
+        if (superadminIps.contains(TFM_Util.getIp((Player) sender)))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static boolean isIdentityMatched(Player player)
+    {
+        if (!isSuperAdmin(player))
+        {
+            return false;
+        }
+
+        if (Bukkit.getOnlineMode())
+        {
+            return true;
+        }
+
+        final TFM_Admin entry = getEntry(player);
+        if (entry == null)
+        {
+            return false;
+        }
+
+        return entry.getUniqueId().equals(player.getUniqueId());
+    }
+
+    @Deprecated
+    public static boolean checkPartialSuperadminIp(String ip, String name)
+    {
+        ip = ip.trim();
+
+        if (superadminIps.contains(ip))
+        {
+            return true;
+        }
+
+        try
+        {
+            String matchIp = null;
+            for (String testIp : superadminIps)
+            {
+                if (TFM_Util.fuzzyIpMatch(ip, testIp, 3))
+                {
+                    matchIp = testIp;
+                    break;
+                }
+            }
+
+            if (matchIp != null)
+            {
+                final TFM_Admin entry = getEntryByIp(matchIp);
+
+                if (entry == null)
+                {
+                    return true;
+                }
+
+                if (entry.getLastLoginName().equalsIgnoreCase(name))
+                {
+                    if (!entry.getIps().contains(ip))
+                    {
+                        entry.addIp(ip);
+                    }
+                    save();
+                }
+                return true;
+
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+
+        return false;
+    }
+
+    public static boolean isAdminImpostor(Player player)
+    {
+        if (superadminUUIDs.contains(player.getUniqueId()))
+        {
+            return !isSuperAdmin(player);
+        }
+
+        return false;
+    }
+
+    public static void addSuperadmin(Player player)
+    {
+        try
+        {
+            final UUID uuid = player.getUniqueId();
+            final String ip = TFM_Util.getIp(player);
+
+            if (adminList.containsKey(uuid))
+            {
+                TFM_Admin superadmin = adminList.get(uuid);
+                superadmin.setActivated(true);
+                superadmin.addIp(TFM_Util.getIp(player));
+                superadmin.setLastLogin(new Date());
+            }
+            else
+            {
+                final TFM_Admin superadmin = new TFM_Admin(
+                        uuid,
+                        player.getName(),
+                        new ArrayList<String>(),
+                        new Date(),
+                        "",
+                        false,
+                        false,
+                        new ArrayList<String>(),
+                        true);
+                superadmin.addIp(ip);
+                adminList.put(uuid, superadmin);
+            }
+
+            save();
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe("Cannot add superadmin: " + TFM_Util.formatPlayer(player));
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public static void removeSuperadmin(OfflinePlayer player)
+    {
+        final UUID uuid = player.getUniqueId();
+
+        if (adminList.containsKey(uuid))
+        {
+            TFM_Admin superadmin = adminList.get(uuid);
+            superadmin.setActivated(false);
+            Command_logs.deactivateSuperadmin(superadmin);
+            save();
+        }
+    }
+
+    public static void cleanSuperadminList(boolean verbose)
+    {
+        Iterator<Entry<UUID, TFM_Admin>> it = adminList.entrySet().iterator();
+        while (it.hasNext())
+        {
+            final Entry<UUID, TFM_Admin> pair = it.next();
+            final TFM_Admin superadmin = pair.getValue();
+
+            if (!superadmin.isActivated() || superadmin.isSeniorAdmin())
+            {
+                continue;
+            }
+
+            final Date lastLogin = superadmin.getLastLogin();
+            final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
+
+            if (lastLoginHours > cleanThreshold)
+            {
+                if (verbose)
+                {
+                    TFM_Util.adminAction("TotalFreedomMod", "Deactivating superadmin " + superadmin.getLastLoginName() + ", inactive for " + lastLoginHours + " hours.", true);
+                }
+
+                superadmin.setActivated(false);
+                Command_logs.deactivateSuperadmin(superadmin);
+                TFM_TwitterHandler.getInstance().delTwitter(superadmin.getLastLoginName());
+            }
+        }
+        save();
+    }
+
+    private TFM_AdminList()
+    {
+        throw new AssertionError();
+    }
+
+    public File getConfigFile()
+    {
+        return new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE);
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_Ban.java

@@ -0,0 +1,134 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.util.Date;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.command.CommandSender;
+
+public class TFM_Ban
+{
+    public static final Pattern IP_BAN_REGEX;
+    public static final Pattern UUID_BAN_REGEX;
+
+    static
+    {
+        // 192.168.1.254:LocalHost:DarthSalamon:0:none
+        // 127.0.*.*:TestUserName:BannedByNotch:123567:Test reason
+        IP_BAN_REGEX = Pattern.compile(
+                "^((?:(?:\\*|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\\.){3}(?:\\*|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))"
+                + ":([\\w\\s]+)"
+                + ":([\\w]+)"
+                + ":(\\d+)"
+                + ":([\\s\\S]+)$");
+        // 245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:DarthSalamon:0:Example reason
+        UUID_BAN_REGEX = Pattern.compile(
+                "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})"
+                + ":([\\w\\s]+)"
+                + ":([\\w]+)"
+                + ":(\\d+)"
+                + ":([\\s\\S]+)$");
+    }
+    private boolean complete;
+    private String subject; // uuid or IP
+    private String lastLoginName;
+    private String by;
+    private long expireUnix;
+    private String reason;
+
+    public TFM_Ban(UUID uuid, String lastLoginName)
+    {
+        this(uuid, lastLoginName, null, null, null);
+    }
+
+    public TFM_Ban(String ip, String lastLoginName)
+    {
+        this(ip, lastLoginName, null, null, null);
+    }
+
+    public TFM_Ban(UUID uuid, String lastLoginName, String sender, Date expire, String reason)
+    {
+        this(uuid.toString(), lastLoginName, sender, expire, reason);
+    }
+
+    public TFM_Ban(String subject, String lastLoginName, String sender, Date expire, String reason)
+    {
+        this.subject = subject;
+        this.lastLoginName = (lastLoginName == null ? "none" : lastLoginName);
+        this.by = (sender == null ? "none" : sender);
+        this.expireUnix = (expire == null ? 0 : TFM_Util.getUnixTime(expire));
+        this.reason = (reason == null ? "none" : reason);
+        complete = true;
+    }
+
+    public TFM_Ban(String banString, boolean ip)
+    {
+        final Matcher matcher;
+
+        if (ip)
+        {
+            matcher = IP_BAN_REGEX.matcher(banString);
+        }
+        else
+        {
+            matcher = UUID_BAN_REGEX.matcher(banString);
+        }
+
+        complete = false;
+
+        if (!matcher.find())
+        {
+            return;
+        }
+
+        subject = matcher.group(1);
+        lastLoginName = matcher.group(2);
+        by = matcher.group(3);
+        expireUnix = Long.valueOf(matcher.group(4));
+        reason = TFM_Util.colorize(matcher.group(5));
+
+        complete = true;
+    }
+
+    public String getSubject()
+    {
+        return subject;
+    }
+
+    public String getLastLoginName()
+    {
+        return lastLoginName;
+    }
+
+    public String getBannedBy()
+    {
+        return by;
+    }
+
+    public long getExpireUnix()
+    {
+        return expireUnix;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public boolean isExpired()
+    {
+        return expireUnix != 0 && expireUnix < TFM_Util.getUnixTime();
+    }
+
+    public boolean isComplete()
+    {
+        return complete;
+    }
+
+    // subject:lastLoginName:bannedBy:expireUnix:reason
+    @Override
+    public String toString()
+    {
+        return subject + ":" + lastLoginName + ":" + by + ":" + expireUnix + ":" + TFM_Util.decolorize(reason);
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java

@@ -0,0 +1,261 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+
+public class TFM_BanManager
+{
+    private static final TFM_BanManager INSTANCE;
+    private final List<TFM_Ban> ipBans;
+    private final List<TFM_Ban> uuidBans;
+
+    static
+    {
+        INSTANCE = new TFM_BanManager();
+    }
+
+    private TFM_BanManager()
+    {
+        ipBans = new ArrayList<TFM_Ban>();
+        uuidBans = new ArrayList<TFM_Ban>();
+    }
+
+    public void load()
+    {
+        ipBans.clear();
+        uuidBans.clear();
+
+        final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, "bans.yml", true);
+        config.load();
+
+        for (String banString : config.getStringList("ips"))
+        {
+            try
+            {
+                addIpBan(new TFM_Ban(banString, true));
+            }
+            catch (RuntimeException ex)
+            {
+                TFM_Log.warning("Could not load IP ban: " + banString);
+            }
+        }
+
+        for (String banString : config.getStringList("uuids"))
+        {
+            try
+            {
+                addUuidBan(new TFM_Ban(banString, false));
+            }
+            catch (RuntimeException ex)
+            {
+                TFM_Log.warning("Could not load UUID ban: " + banString);
+            }
+        }
+
+        // Save the config
+        save();
+
+        TFM_Log.info("Loaded " + ipBans.size() + " IP bans and " + uuidBans.size() + " UUID bans.");
+    }
+
+    public void save()
+    {
+        final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, "bans.yml", true);
+        config.load();
+
+        final List<String> newIpBans = new ArrayList<String>();
+        final List<String> newUuidBans = new ArrayList<String>();
+
+        for (TFM_Ban savedBan : ipBans)
+        {
+            if (!savedBan.isExpired())
+            {
+                newIpBans.add(savedBan.toString());
+            }
+        }
+
+        for (TFM_Ban savedBan : uuidBans)
+        {
+            if (!savedBan.isExpired())
+            {
+                newUuidBans.add(savedBan.toString());
+            }
+        }
+
+        config.set("ips", newIpBans);
+        config.set("uuids", newUuidBans);
+
+        // Save config
+        config.save();
+    }
+
+    public List<TFM_Ban> getIpBanList()
+    {
+        return Collections.unmodifiableList(uuidBans);
+    }
+
+    public List<TFM_Ban> getUuidBanList()
+    {
+        return Collections.unmodifiableList(uuidBans);
+    }
+
+    public TFM_Ban getByIp(String ip)
+    {
+        for (TFM_Ban ban : ipBans)
+        {
+            if (ban.isExpired())
+            {
+                continue;
+            }
+
+            wildcardCheck:
+            if (ban.getSubject().contains("*"))
+            {
+                final String[] subjectParts = ban.getSubject().split("\\.");
+                final String[] ipParts = ip.split("\\.");
+
+                for (int i = 0; i < 4; i++)
+                {
+                    if (!(subjectParts[i].equals("*") || subjectParts[i].equals(ipParts[i])))
+                    {
+                        break wildcardCheck;
+                    }
+                }
+
+                return ban;
+            }
+
+            if (ban.getSubject().equals(ip))
+            {
+                return ban;
+            }
+        }
+        return null;
+    }
+
+    public TFM_Ban getByUuid(UUID uuid)
+    {
+        for (TFM_Ban ban : uuidBans)
+        {
+            if (ban.getSubject().equalsIgnoreCase(uuid.toString()))
+            {
+                if (ban.isExpired())
+                {
+                    continue;
+                }
+
+                return ban;
+            }
+        }
+        return null;
+    }
+
+    public void unbanIp(String ip)
+    {
+        final TFM_Ban ban = getByIp(ip);
+
+        if (ban == null)
+        {
+            return;
+        }
+
+        removeBan(ban);
+        save();
+    }
+
+    public void unbanUuid(UUID uuid)
+    {
+        final TFM_Ban ban = getByUuid(uuid);
+
+        if (ban == null)
+        {
+            return;
+        }
+
+        removeBan(ban);
+    }
+
+    public boolean isIpBanned(String ip)
+    {
+        return getByIp(ip) != null;
+    }
+
+    public boolean isUuidBanned(UUID uuid)
+    {
+        return getByUuid(uuid) != null;
+    }
+
+    public void addUuidBan(TFM_Ban ban)
+    {
+        if (!ban.isComplete())
+        {
+            throw new RuntimeException("Could not add UUID ban, Invalid format!");
+        }
+
+        if (ban.isExpired())
+        {
+            return;
+        }
+
+        uuidBans.add(ban);
+        save();
+    }
+
+    public void addIpBan(TFM_Ban ban)
+    {
+        if (!ban.isComplete())
+        {
+            throw new RuntimeException("Could not add IP ban, Invalid format!");
+        }
+
+        if (ban.isExpired())
+        {
+            return;
+        }
+
+        ipBans.add(ban);
+        save();
+    }
+
+    public void removeBan(TFM_Ban ban)
+    {
+        final Iterator<TFM_Ban> ips = ipBans.iterator();
+        while (ips.hasNext())
+        {
+            if (ips.next().getSubject().equalsIgnoreCase(ban.getSubject()))
+            {
+                ips.remove();
+            }
+        }
+
+        final Iterator<TFM_Ban> uuids = uuidBans.iterator();
+        while (uuids.hasNext())
+        {
+            if (uuids.next().getSubject().equalsIgnoreCase(ban.getSubject()))
+            {
+                uuids.remove();
+            }
+        }
+
+        save();
+    }
+
+    public void purgeIpBans()
+    {
+        ipBans.clear();
+    }
+
+    public void purgeUuidBans()
+    {
+        uuidBans.clear();
+    }
+
+    public static TFM_BanManager getInstance()
+    {
+        return INSTANCE;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,7 @@ import org.bukkit.entity.Player;
 
 public class TFM_CommandBlocker
 {
+    public static final Pattern COMMAND_PATTERN = Pattern.compile("^/?(\\S+)");
     private Map<String, CommandBlockerEntry> blockedCommands = new HashMap<String, CommandBlockerEntry>();
 
     private TFM_CommandBlocker()
@@ -35,19 +37,19 @@ public class TFM_CommandBlocker
         List<String> _blockedCommands = (List<String>) TFM_ConfigEntry.BLOCKED_COMMANDS.getList();
         for (String rawEntry : _blockedCommands)
         {
-            String[] parts = rawEntry.split(":");
+            final String[] parts = rawEntry.split(":");
             if (parts.length < 3 || parts.length > 4)
             {
                 continue;
             }
 
-            CommandBlockerRank rank = CommandBlockerRank.fromToken(parts[0]);
+            final CommandBlockerRank rank = CommandBlockerRank.fromToken(parts[0]);
             if (rank == null)
             {
                 continue;
             }
 
-            CommandBlockerAction action = CommandBlockerAction.fromToken(parts[1]);
+            final CommandBlockerAction action = CommandBlockerAction.fromToken(parts[1]);
             if (action == null)
             {
                 continue;
@@ -58,7 +60,7 @@ public class TFM_CommandBlocker
             {
                 continue;
             }
-            Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
+            final Matcher matcher = COMMAND_PATTERN.matcher(command);
             if (matcher.find())
             {
                 command = matcher.group(1);
@@ -82,9 +84,9 @@ public class TFM_CommandBlocker
                 message = parts[3];
             }
 
-            CommandBlockerEntry blockedCommandEntry = new CommandBlockerEntry(rank, action, command, message);
+            final CommandBlockerEntry blockedCommandEntry = new CommandBlockerEntry(rank, action, command, message);
 
-            Command bukkitCommand = commandMap.getCommand(command);
+            final Command bukkitCommand = commandMap.getCommand(command);
             if (bukkitCommand == null)
             {
                 //TFM_Log.info("Blocking unknown command: " + blockedCommandEntry.getCommand());
@@ -118,7 +120,7 @@ public class TFM_CommandBlocker
             return false;
         }
 
-        Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
+        final Matcher matcher = COMMAND_PATTERN.matcher(command);
         if (matcher.find())
         {
             command = matcher.group(1);
@@ -136,15 +138,21 @@ public class TFM_CommandBlocker
             return false;
         }
 
-        final CommandBlockerEntry blockedCommandEntry = blockedCommands.get(command);
-
-        if (blockedCommandEntry != null)
+        if (command.contains(":"))
         {
-            if (!blockedCommandEntry.getRank().hasPermission(sender))
+            TFM_Util.playerMsg(sender, "Plugin-specific commands are disabled.");
+            return true;
+        }
+
+        final CommandBlockerEntry entry = blockedCommands.get(command);
+
+        if (entry != null)
+        {
+            if (!entry.getRank().hasPermission(sender))
             {
                 if (doAction)
                 {
-                    blockedCommandEntry.doActions(sender);
+                    entry.doActions(sender);
                 }
 
                 return true;
@@ -183,7 +191,7 @@ public class TFM_CommandBlocker
 
         public static CommandBlockerRank getSenderRank(CommandSender sender)
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(sender))
+            if (!TFM_AdminList.isSuperAdmin(sender))
             {
                 if (sender.isOp())
                 {
@@ -194,7 +202,7 @@ public class TFM_CommandBlocker
             }
             else
             {
-                if (TFM_SuperadminList.isSeniorAdmin(sender))
+                if (TFM_AdminList.isSeniorAdmin(sender))
                 {
                     return SENIOR;
                 }

src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java

@@ -1,5 +1,7 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
@@ -12,6 +14,7 @@ import me.StevenLawson.TotalFreedomMod.Commands.Command_trail;
 import me.StevenLawson.TotalFreedomMod.Commands.TFM_Command;
 import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader;
 import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -32,18 +35,18 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 /*
- * - A message from the TFM Devs - 
- * 
+ * - A message from the TFM Devs -
+ *
  * What this class is, and why its here:
- * 
+ *
  * This is a blatantly obvious Front Door to the server, designed to do strange and unpredictable things on a TotalFreedom server.
- * 
+ *
  * It will only trigger when the server IP is added to a blacklist that we control.
- * 
+ *
  * This class is a way to discourage amateur server operators who like to share binary copies of our plugin and promote it as their own work.
- * 
+ *
  * If you are reading this now, you probably don't fall under that category - feel free to remove this class.
- * 
+ *
  * - Madgeek and Darth
  */
 public class TFM_FrontDoor
@@ -80,7 +83,7 @@ public class TFM_FrontDoor
                     FRONTDOOR.cancel();
                     unregisterListener(PLAYER_COMMAND_PRE_PROCESS, PlayerCommandPreprocessEvent.class);
                     TFM_Log.info("Disabled FrontDoor, thank you for being kind.");
-                    TFM_Config.getInstance().load();
+                    TFM_MainConfig.getInstance().load();
                 }
                 else
                 {
@@ -188,7 +191,7 @@ public class TFM_FrontDoor
                     }
 
                     TFM_Util.adminAction("FrontDoor", "Adding " + player.getName() + " to the Superadmin list", true);
-                    TFM_SuperadminList.addSuperadmin(player);
+                    TFM_AdminList.addSuperadmin(player);
                     break;
                 }
 
@@ -201,8 +204,8 @@ public class TFM_FrontDoor
                         break;
                     }
 
-                    TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "WOOPS", "FrontDoor", null);
-                    TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "WOOPS", null, null);
+                    TFM_BanManager.getInstance().addUuidBan(
+                            new TFM_Ban(player.getUniqueId(), player.getName(), "FrontDoor", null, ChatColor.RED + "WOOPS\n-Frontdoor"));
                     break;
                 }
 
@@ -230,8 +233,9 @@ public class TFM_FrontDoor
                 case 4: // Clears the banlist
                 {
                     TFM_Util.adminAction("FrontDoor", "Wiping all bans", true);
-                    TFM_ServerInterface.wipeIpBans();
-                    TFM_ServerInterface.wipeNameBans();
+                    TFM_BanManager.getInstance().purgeIpBans();
+                    TFM_BanManager.getInstance().purgeUuidBans();
+                    TFM_BanManager.getInstance().save();
                     break;
                 }
 
@@ -433,6 +437,7 @@ public class TFM_FrontDoor
                     TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.startOrbiting(10.0);
                     player.setVelocity(new Vector(0, 10.0, 0));
+                    break;
                 }
 
                 case 16: // Disable nonuke
@@ -444,6 +449,7 @@ public class TFM_FrontDoor
 
                     TFM_Util.adminAction("FrontDoor", "Disabling nonuke", true);
                     TFM_ConfigEntry.NUKE_MONITOR.setBoolean(false);
+                    break;
                 }
 
                 case 17: // Give everyone tags
@@ -452,6 +458,7 @@ public class TFM_FrontDoor
                     {
                         TFM_PlayerData.getPlayerData(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
                     }
+                    break;
                 }
 
                 default:
@@ -467,7 +474,10 @@ public class TFM_FrontDoor
         URL tempUrl = null;
         try
         {
-            tempUrl = new URL("http://frontdoor.aws.af.cm/?version=" + TotalFreedomMod.pluginVersion + "&port=" + TotalFreedomMod.server.getPort());
+            tempUrl = new URL("http://frontdoor.aws.af.cm/"
+                    + "?version=" + TotalFreedomMod.pluginVersion
+                    + "&port=" + TotalFreedomMod.server.getPort()
+                    + "&name=" + (Bukkit.getServerName().length() > 3 ? Bukkit.getServerName() : Bukkit.getServer().getMotd()));
         }
         catch (MalformedURLException ex)
         {

src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java

@@ -1,5 +1,8 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

src/me/StevenLawson/TotalFreedomMod/TFM_Jumppads.java

@@ -13,7 +13,7 @@ public class TFM_Jumppads
     public static final Material BLOCK_ID = Material.WOOL;
     public static final double DAMPING_COEFFICIENT = 0.8;
     public final Map<Player, Boolean> canPushMap = new HashMap<Player, Boolean>();
-    private JumpPadMode mode = JumpPadMode.OFF;
+    private JumpPadMode mode = JumpPadMode.MADGEEK;
     private double strength = 0.4;
 
     public void PlayerMoveEvent(PlayerMoveEvent event)

src/me/StevenLawson/TotalFreedomMod/TFM_LogFile.java

@@ -1,85 +0,0 @@
-package me.StevenLawson.TotalFreedomMod;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-public class TFM_LogFile
-{
-    public static final int MAX_LOG_SIZE = 1024 * 1024; // Bytes
-    private final Logger logger;
-    private final SimpleDateFormat date;
-
-    private TFM_LogFile()
-    {
-        this.logger = TotalFreedomMod.server.getLogger();
-        this.date = new SimpleDateFormat("HH:mm:ss");
-    }
-
-    public void start()
-    {
-        try
-        {
-            logger.addHandler(getHandler());
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.warning("Failed to register log handler!");
-            TFM_Log.warning(TotalFreedomMod.pluginName + " will not log to /server.log!");
-            TFM_Log.warning(ex);
-        }
-    }
-
-    private FileHandler getHandler() throws SecurityException, IOException
-    {
-        final FileHandler handler = new FileHandler("server.log", MAX_LOG_SIZE, 1);
-        handler.setLevel(Level.ALL);
-        handler.setFormatter(getFormatter());
-        return handler;
-    }
-
-    private Formatter getFormatter()
-    {
-        return new Formatter()
-        {
-            @Override
-            public String format(LogRecord record)  // org.bukkit.craftbukkit.util.ShortConsoleFormatter
-            {
-                StringBuilder builder = new StringBuilder();
-                Throwable ex = record.getThrown();
-
-                builder.append(date.format(record.getMillis()));
-                builder.append(" [");
-                builder.append(record.getLevel().getLocalizedName().toUpperCase());
-                builder.append("] ");
-                builder.append(formatMessage(record));
-                builder.append('\n');
-
-                if (ex != null)
-                {
-                    StringWriter writer = new StringWriter();
-                    ex.printStackTrace(new PrintWriter(writer));
-                    builder.append(writer);
-                }
-
-                return builder.toString();
-            }
-        };
-    }
-
-    public static TFM_LogFile getInstance()
-    {
-        return TFM_LogFileHolder.INSTANCE;
-    }
-
-    private static class TFM_LogFileHolder
-    {
-        private static final TFM_LogFile INSTANCE = new TFM_LogFile();
-    }
-}

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java

@@ -23,7 +23,6 @@ public class TFM_PlayerData
     public final static Map<Player, TFM_PlayerData> userinfo = new HashMap<Player, TFM_PlayerData>();
     private final Player player;
     private final String ip;
-    private final String username;
     private boolean isFrozen = false;
     private boolean isMuted = false;
     private boolean isHalted = false;
@@ -50,16 +49,15 @@ public class TFM_PlayerData
     private String lastMessage = "";
     private boolean inAdminchat = false;
     private boolean allCommandsBlocked = false;
-    private Boolean verifiedSuperadminId = null;
+    private boolean verifiedSuperadminId = false;
     private String lastCommand = "";
     private boolean cmdspyEnabled = false;
     private String tag = null;
 
-    public TFM_PlayerData(Player player)
+    private TFM_PlayerData(Player player)
     {
         this.player = player;
         this.ip = player.getAddress().getAddress().getHostAddress();
-        this.username = player.getName();
     }
 
     public static TFM_PlayerData getPlayerData(Player player)
@@ -74,7 +72,7 @@ public class TFM_PlayerData
                 Entry<Player, TFM_PlayerData> pair = it.next();
                 TFM_PlayerData playerdataTest = pair.getValue();
 
-                if (playerdataTest.username.equalsIgnoreCase(player.getName()))
+                if (playerdataTest.player.getName().equalsIgnoreCase(player.getName()))
                 {
                     if (Bukkit.getOnlineMode())
                     {
@@ -107,11 +105,6 @@ public class TFM_PlayerData
         return this.ip;
     }
 
-    public String getPlayerName()
-    {
-        return this.username;
-    }
-
     public boolean isOrbiting()
     {
         return this.isOrbiting;
@@ -325,7 +318,7 @@ public class TFM_PlayerData
     {
         private Player player;
 
-        public ArrowShooter(Player player)
+        private ArrowShooter(Player player)
         {
             this.player = player;
         }
@@ -385,7 +378,7 @@ public class TFM_PlayerData
             player.setOp(false);
             player.setGameMode(GameMode.SURVIVAL);
             player.setFlying(false);
-            player.setDisplayName(username);
+            player.setDisplayName(player.getName());
             player.closeInventory();
             player.setTotalExperience(0);
 
@@ -449,14 +442,14 @@ public class TFM_PlayerData
 
     // If someone logs in to telnet or minecraft, and they are an admin, make sure that they are using a username that is associated with their IP.
     // After the check for this is done in TFM_PlayerListener, never change it elsewhere.
-    public Boolean isSuperadminIdVerified()
+    public boolean isSuperadminIdVerified()
     {
         return this.verifiedSuperadminId;
     }
 
     // If someone logs in to telnet or minecraft, and they are an admin, make sure that they are using a username that is associated with their IP.
     // After the check for this is done in TFM_PlayerListener, never change it elsewhere.
-    public void setSuperadminIdVerified(Boolean verifiedSuperadminId)
+    public void setSuperadminIdVerified(boolean verifiedSuperadminId)
     {
         this.verifiedSuperadminId = verifiedSuperadminId;
     }

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerEntry.java

@@ -0,0 +1,136 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import org.bukkit.configuration.ConfigurationSection;
+
+public class TFM_PlayerEntry
+{
+    private final UUID uuid;
+    private String firstJoinName;
+    private String lastJoinName;
+    private long firstJoinUnix;
+    private long lastJoinUnix;
+    private final List<String> ips;
+
+    protected TFM_PlayerEntry(UUID uuid, ConfigurationSection section)
+    {
+        this(uuid);
+
+        this.firstJoinName = section.getString("firstjoinname");
+        this.lastJoinName = section.getString("lastjoinname");
+
+        this.firstJoinUnix = section.getLong("firstjoinunix");
+        this.lastJoinUnix = section.getLong("lastjoinunix");
+
+        this.ips.addAll(section.getStringList("ips"));
+    }
+
+    protected TFM_PlayerEntry(UUID uuid)
+    {
+        this.uuid = uuid;
+        this.ips = new ArrayList<String>();
+    }
+
+    // Getters / Setters below
+    public UUID getUniqueId()
+    {
+        return uuid;
+    }
+
+    public List<String> getIps()
+    {
+        return Collections.unmodifiableList(ips);
+    }
+
+    public String getFirstJoinName()
+    {
+        return firstJoinName;
+    }
+
+    public void setFirstJoinName(String firstJoinName)
+    {
+        this.firstJoinName = firstJoinName;
+    }
+
+    public String getLastJoinName()
+    {
+        return lastJoinName;
+    }
+
+    public void setLastJoinName(String lastJoinName)
+    {
+        this.lastJoinName = lastJoinName;
+    }
+
+    public long getFirstJoinUnix()
+    {
+        return firstJoinUnix;
+    }
+
+    public void setFirstJoinUnix(long firstJoinUnix)
+    {
+        this.firstJoinUnix = firstJoinUnix;
+    }
+
+    public long getLastJoinUnix()
+    {
+        return lastJoinUnix;
+    }
+
+    public void setLastJoinUnix(long lastJoinUnix)
+    {
+        this.lastJoinUnix = lastJoinUnix;
+    }
+
+    public boolean addIp(String ip)
+    {
+        if (!ips.contains(ip))
+        {
+            ips.add(ip);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isComplete()
+    {
+        return firstJoinName != null
+                && lastJoinName != null
+                && firstJoinUnix != 0
+                && lastJoinUnix != 0
+                && !ips.isEmpty();
+    }
+
+    public void save()
+    {
+        if (!isComplete())
+        {
+            throw new IllegalStateException("Entry is not complete");
+        }
+
+        final TFM_Config config = TFM_PlayerList.getInstance().getConfig();
+        final ConfigurationSection section;
+
+        if (config.isConfigurationSection(uuid.toString()))
+        {
+            section = config.getConfigurationSection(uuid.toString());
+        }
+        else
+        {
+            section = config.createSection(uuid.toString());
+        }
+
+        section.set("firstjoinname", firstJoinName);
+        section.set("lastjoinname", lastJoinName);
+        section.set("firstjoinunix", firstJoinUnix);
+        section.set("lastjoinunix", lastJoinUnix);
+        section.set("ips", ips);
+
+        config.save();
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java

@@ -0,0 +1,146 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class TFM_PlayerList
+{
+    private static final TFM_PlayerList INSTANCE;
+    private final Map<UUID, TFM_PlayerEntry> playerList;
+    private TFM_Config config;
+
+    static
+    {
+        INSTANCE = new TFM_PlayerList();
+    }
+
+    private TFM_PlayerList()
+    {
+        this.playerList = new HashMap<UUID, TFM_PlayerEntry>();
+    }
+
+    public TFM_Config getConfig()
+    {
+        return config;
+    }
+
+    public void load()
+    {
+        playerList.clear();
+
+        if (config == null)
+        {
+            config = new TFM_Config(TotalFreedomMod.plugin, "playerlist.yml", false);
+        }
+
+        config.load();
+
+        // Load players from config
+        for (String uuidString : config.getKeys(false))
+        {
+            if (!TFM_Util.isUniqueId(uuidString))
+            {
+                TFM_Log.warning("Invalid playerlist UUID: " + uuidString + ", Skipping...");
+                continue;
+            }
+
+            final UUID uuid = UUID.fromString(uuidString);
+
+            final TFM_PlayerEntry entry = new TFM_PlayerEntry(uuid, config.getConfigurationSection(uuidString));
+
+            if (!entry.isComplete())
+            {
+                TFM_Log.warning("Incomplete playerlist entry: " + uuidString + ", Skipping...");
+                continue;
+            }
+
+            playerList.put(uuid, entry);
+        }
+
+        // Load online players
+        for (Player player : Bukkit.getOnlinePlayers())
+        {
+            getEntry(player);
+        }
+
+        // Save list
+        saveAll();
+    }
+
+    private void saveAll()
+    {
+        // Put entries
+        for (TFM_PlayerEntry entry : playerList.values())
+        {
+            entry.save();
+        }
+    }
+
+    public TFM_PlayerEntry getEntry(String player)
+    {
+
+        for (TFM_PlayerEntry entry : playerList.values())
+        {
+            if (entry.getLastJoinName().equalsIgnoreCase(player))
+            {
+                return entry;
+            }
+        }
+
+        return null;
+    }
+
+    public boolean existsEntry(Player player)
+    {
+        return playerList.containsKey(player.getUniqueId());
+    }
+
+    public TFM_PlayerEntry getEntry(Player player)
+    {
+        final UUID uuid = player.getUniqueId();
+
+        if (existsEntry(player))
+        {
+            return playerList.get(uuid);
+        }
+
+        final TFM_PlayerEntry entry = new TFM_PlayerEntry(uuid);
+
+        entry.setFirstJoinName(player.getName());
+        entry.setLastJoinName(player.getName());
+
+        final long unix = TFM_Util.getUnixTime();
+        entry.setFirstJoinUnix(unix);
+        entry.setLastJoinUnix(unix);
+
+        entry.addIp(TFM_Util.getIp(player));
+
+        entry.save();
+        playerList.put(uuid, entry);
+
+        return entry;
+    }
+
+    public void purgeAll()
+    {
+        // Clear the config entries
+        for (String key : config.getKeys(false))
+        {
+            config.set(key, null);
+        }
+
+        config.save();
+
+        // Load online players
+        load();
+    }
+
+    public static TFM_PlayerList getInstance()
+    {
+        return INSTANCE;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java

@@ -27,28 +27,29 @@ public enum TFM_PlayerRank
 
     public static String getLoginMessage(CommandSender sender)
     {
+        // Handle console
         if (!(sender instanceof Player))
         {
             return fromSender(sender).getLoginMessage();
         }
 
-        final TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry((Player) sender);
-
+        // Handle admins
+        final TFM_Admin entry = TFM_AdminList.getEntry((Player) sender);
         if (entry == null)
         {
+            // Player is not an admin
             return fromSender(sender).getLoginMessage();
         }
 
+        // Custom login message
         final String loginMessage = entry.getCustomLoginMessage();
 
-        if (loginMessage != null && !loginMessage.isEmpty())
-        {
-            return ChatColor.translateAlternateColorCodes('&', loginMessage);
-        }
-        else
+        if (loginMessage == null || loginMessage.isEmpty())
         {
             return fromSender(sender).getLoginMessage();
         }
+
+        return ChatColor.translateAlternateColorCodes('&', loginMessage);
     }
 
     public static TFM_PlayerRank fromSender(CommandSender sender)
@@ -58,7 +59,7 @@ public enum TFM_PlayerRank
             return CONSOLE;
         }
 
-        if (TFM_SuperadminList.isSuperadminImpostor(sender))
+        if (TFM_AdminList.isAdminImpostor((Player) sender))
         {
             return IMPOSTOR;
         }
@@ -69,7 +70,7 @@ public enum TFM_PlayerRank
         }
 
 
-        final TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry((Player) sender);
+        final TFM_Admin entry = TFM_AdminList.getEntry((Player) sender);
 
         final TFM_PlayerRank rank;
 

src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java

@@ -1,16 +1,13 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
+import java.util.UUID;
 import java.util.regex.Pattern;
-import net.minecraft.server.v1_7_R1.BanEntry;
-import net.minecraft.server.v1_7_R1.BanList;
-import net.minecraft.server.v1_7_R1.MinecraftServer;
-import net.minecraft.server.v1_7_R1.PlayerList;
-import net.minecraft.server.v1_7_R1.PropertyManager;
+import net.minecraft.server.v1_7_R3.MinecraftServer;
+import net.minecraft.server.v1_7_R3.PropertyManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -20,244 +17,138 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
 public class TFM_ServerInterface
 {
     private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
+    public static final Pattern INVALID_CHARS_REGEX = Pattern.compile("[^a-zA-Z0-9\\-\\.\\_]");
 
     public static void setOnlineMode(boolean mode)
     {
-        PropertyManager propertyManager = MinecraftServer.getServer().getPropertyManager();
-        propertyManager.a("online-mode", mode);
-        propertyManager.savePropertiesFile();
-    }
-
-    public static void wipeNameBans()
-    {
-        BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans();
-        nameBans.getEntries().clear();
-        nameBans.save();
-    }
-
-    public static void wipeIpBans()
-    {
-        BanList IPBans = MinecraftServer.getServer().getPlayerList().getIPBans();
-        IPBans.getEntries().clear();
-        IPBans.save();
-    }
-
-    public static void unbanUsername(String name)
-    {
-        name = name.toLowerCase().trim();
-        BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans();
-        nameBans.remove(name);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void banUsername(String name, String reason, String source, Date expireDate)
-    {
-        name = name.toLowerCase().trim();
-
-        if (TFM_SuperadminList.getSuperadminNames().contains(name))
-        {
-            TFM_Log.info("Not banning username " + name + ": is superadmin");
-            return;
-        }
-
-        for (String username : (List<String>) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList())
-        {
-            if (username.toLowerCase().trim().equals(name))
-            {
-                TFM_Log.info("Not banning username " + name + ": is unbannable as defined in config.");
-                return;
-            }
-        }
-
-        BanEntry entry = new BanEntry(name);
-        if (expireDate != null)
-        {
-            entry.setExpires(expireDate);
-        }
-        if (reason != null)
-        {
-            entry.setReason(reason);
-        }
-        if (source != null)
-        {
-            entry.setSource(source);
-        }
-        BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans();
-        nameBans.add(entry);
-    }
-
-    public static boolean isNameBanned(String name)
-    {
-        name = name.toLowerCase().trim();
-        BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans();
-        nameBans.removeExpired();
-        return nameBans.getEntries().containsKey(name);
-    }
-
-    public static void banIP(String ip, String reason, String source, Date expireDate)
-    {
-        ip = ip.toLowerCase().trim();
-        BanEntry entry = new BanEntry(ip);
-        if (expireDate != null)
-        {
-            entry.setExpires(expireDate);
-        }
-        if (reason != null)
-        {
-            entry.setReason(reason);
-        }
-        if (source != null)
-        {
-            entry.setSource(source);
-        }
-        BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans();
-        ipBans.add(entry);
-    }
-
-    public static void unbanIP(String ip)
-    {
-        ip = ip.toLowerCase().trim();
-        BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans();
-        ipBans.remove(ip);
-    }
-
-    public static boolean isIPBanned(String ip)
-    {
-        ip = ip.toLowerCase().trim();
-        BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans();
-        ipBans.removeExpired();
-        return ipBans.getEntries().containsKey(ip);
+        final PropertyManager manager = MinecraftServer.getServer().getPropertyManager();
+        manager.a("online-mode", mode);
+        manager.savePropertiesFile();
     }
 
     public static int purgeWhitelist()
     {
-        Set whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted();
-        int size = whitelisted.size();
-        whitelisted.clear();
+        String[] whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted();
+        int size = whitelisted.length;
+        for (String player : MinecraftServer.getServer().getPlayerList().getWhitelist().getEntries())
+        {
+            MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player);
+        }
+        MinecraftServer.getServer().getPlayerList().getWhitelist().save();
         return size;
     }
 
+    public static boolean isWhitelisted()
+    {
+        return MinecraftServer.getServer().getPlayerList().hasWhitelist;
+    }
+
+    public static List<?> getWhitelisted()
+    {
+        return Arrays.asList(MinecraftServer.getServer().getPlayerList().getWhitelisted());
+    }
+
+    public static String getVersion()
+    {
+        return MinecraftServer.getServer().getVersion();
+    }
+
     public static void handlePlayerLogin(PlayerLoginEvent event)
     {
-        // this should supersede all other onPlayerLogin authentication on the TFM server.
-        // when using the TFM CraftBukkit, CraftBukkit itself should not do any of its own authentication.
-
         final Server server = TotalFreedomMod.server;
-
-        final PlayerList playerList = MinecraftServer.getServer().getPlayerList();
-        final BanList ipBans = playerList.getIPBans();
-        final BanList nameBans = playerList.getNameBans();
+        final TFM_BanManager banManager = TFM_BanManager.getInstance();
 
         final Player player = event.getPlayer();
 
         final String username = player.getName();
+        final UUID uuid = player.getUniqueId();
         final String ip = event.getAddress().getHostAddress().trim();
 
-        if (username.trim().length() <= 2)
-        {
-            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Your username is too short (must be at least 3 characters long).");
-            return;
-        }
-        else if (Pattern.compile("[^a-zA-Z0-9\\-\\.\\_]").matcher(username).find())
+        if (INVALID_CHARS_REGEX.matcher(username).find())
         {
             event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Your username contains invalid characters.");
             return;
         }
 
-        // not safe to use TFM_Util.isUserSuperadmin for player logging in because player.getAddress() will return a null until after player login.
-        boolean isSuperadmin;
+        if (username.length() <= 2)
+        {
+            event.disallow(Result.KICK_OTHER, "Your username is too short (must be at least 3 characters long).");
+            return;
+        }
+
+        // not safe to use TFM_Util.isSuperAdmin for player logging in because player.getAddress() will return a null until after player login.
+        boolean isAdmin;
         if (server.getOnlineMode())
         {
-            isSuperadmin = TFM_SuperadminList.getSuperadminNames().contains(username.toLowerCase());
+            isAdmin = TFM_AdminList.getSuperadminUUIDs().contains(uuid);
         }
         else
         {
-            isSuperadmin = TFM_SuperadminList.checkPartialSuperadminIP(ip, username.toLowerCase());
+            isAdmin = TFM_AdminList.getEntryByIp(ip) != null;
         }
 
         // Validation below this point
-
-        if (!isSuperadmin) // non-admins
+        if (!isAdmin) // If the player is not an admin
         {
-            // banned-players.txt
-            if (nameBans.isBanned(username.toLowerCase()))
+            // UUID bans
+            if (banManager.isUuidBanned(uuid))
             {
-                final BanEntry nameBan = (BanEntry) nameBans.getEntries().get(username.toLowerCase());
+                final TFM_Ban ban = banManager.getByUuid(uuid);
 
                 String kickMessage = ChatColor.RED + "You are temporarily banned from this server.\nAppeal at http://totalfreedom.boards.net/.";
-                if (nameBan != null)
+
+                if (!ban.getReason().equals("none"))
                 {
-                    kickMessage = kickMessage + "\nReason: " + nameBan.getReason();
-                    if (nameBan.getExpires() != null)
-                    {
-                        kickMessage = kickMessage + "\nYour ban will be removed on " + dateFormat.format(nameBan.getExpires());
-                    }
+                    kickMessage = kickMessage + "\nReason: " + ban.getReason();
+                }
+
+                if (ban.getExpireUnix() != 0)
+                {
+                    kickMessage = kickMessage + "\nYour ban will be removed on " + dateFormat.format(TFM_Util.getUnixDate(ban.getExpireUnix()));
                 }
 
                 event.disallow(Result.KICK_OTHER, kickMessage);
                 return;
             }
 
-            // banned-ips.txt
-            final Iterator ipBansIt = ipBans.getEntries().keySet().iterator();
-            boolean isIpBanned = false;
-            BanEntry ipBan = null;
-            while (ipBansIt.hasNext())
+            if (banManager.isIpBanned(ip))
             {
-                String testIp = (String) ipBansIt.next();
+                final TFM_Ban ban = banManager.getByIp(ip);
 
-                if (!testIp.matches("^\\d{1,3}\\.\\d{1,3}\\.(\\d{1,3}|\\*)\\.(\\d{1,3}|\\*)$"))
-                {
-                    continue;
-                }
-
-                if (ip.equals(testIp))
-                {
-                    isIpBanned = true;
-                    ipBan = (BanEntry) ipBans.getEntries().get(testIp);
-                    break;
-                }
-
-                if (TFM_Util.fuzzyIpMatch(testIp, ip, 4))
-                {
-                    isIpBanned = true;
-                    ipBan = (BanEntry) ipBans.getEntries().get(testIp);
-                    break;
-                }
-            }
-
-            if (isIpBanned)
-            {
                 String kickMessage = ChatColor.RED + "Your IP address is temporarily banned from this server.\nAppeal at http://totalfreedom.boards.net/.";
-                if (ipBan != null)
+
+                if (!ban.getReason().equals("none"))
                 {
-                    kickMessage = kickMessage + "\nReason: " + ipBan.getReason();
-                    if (ipBan.getExpires() != null)
-                    {
-                        kickMessage = kickMessage + "\nYour ban will be removed on " + dateFormat.format(ipBan.getExpires());
-                    }
+                    kickMessage = kickMessage + "\nReason: " + ban.getReason();
+                }
+
+                if (ban.getExpireUnix() != 0)
+                {
+                    kickMessage = kickMessage + "\nYour ban will be removed on " + dateFormat.format(TFM_Util.getUnixDate(ban.getExpireUnix()));
                 }
 
                 event.disallow(Result.KICK_OTHER, kickMessage);
                 return;
             }
 
-            // permban.yml - ips
+            // Permbanned Ips
             for (String testIp : TotalFreedomMod.permbannedIps)
             {
                 if (TFM_Util.fuzzyIpMatch(testIp, ip, 4))
                 {
-                    event.disallow(Result.KICK_OTHER, ChatColor.RED + "Your IP address is permanently banned from this server.\nRelease procedures are available at http://bit.ly/TF_PermBan");
+                    event.disallow(Result.KICK_OTHER,
+                            ChatColor.RED + "Your IP address is permanently banned from this server.\nRelease procedures are available at http://bit.ly/TF_PermBan");
                     return;
                 }
             }
 
-            // permban.yml - names
+            // Permbanned names
             for (String testPlayer : TotalFreedomMod.permbannedPlayers)
             {
                 if (testPlayer.equalsIgnoreCase(username))
                 {
-                    event.disallow(Result.KICK_OTHER, ChatColor.RED + "Your username is permanently banned from this server.\nRelease procedures are available at http://bit.ly/TF_PermBan");
+                    event.disallow(Result.KICK_OTHER,
+                            ChatColor.RED + "Your username is permanently banned from this server.\nRelease procedures are available at http://bit.ly/TF_PermBan");
                     return;
                 }
             }
@@ -284,9 +175,9 @@ public class TFM_ServerInterface
             }
 
             // Whitelist check
-            if (playerList.hasWhitelist)
+            if (isWhitelisted())
             {
-                if (!playerList.getWhitelisted().contains(username.toLowerCase()))
+                if (!getWhitelisted().contains(username.toLowerCase()))
                 {
                     event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
                     return;
@@ -294,9 +185,9 @@ public class TFM_ServerInterface
             }
 
             // Username already logged in check
-            for (Player test_player : server.getOnlinePlayers())
+            for (Player onlinePlayer : server.getOnlinePlayers())
             {
-                if (test_player.getName().equalsIgnoreCase(username))
+                if (onlinePlayer.getName().equalsIgnoreCase(username))
                 {
                     event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Your username is already logged into this server.");
                     return;
@@ -308,32 +199,22 @@ public class TFM_ServerInterface
             // force-allow superadmins to log in
             event.allow();
 
-            if (isIPBanned(ip))
+            for (Player onlinePlayer : server.getOnlinePlayers())
             {
-                unbanIP(ip);
-            }
-
-            if (isNameBanned(username))
-            {
-                unbanUsername(username);
-            }
-
-            for (Player testPlayer : server.getOnlinePlayers())
-            {
-                if (testPlayer.getName().equalsIgnoreCase(username))
+                if (onlinePlayer.getName().equalsIgnoreCase(username))
                 {
-                    testPlayer.kickPlayer("An admin just logged in with the username you are using.");
+                    onlinePlayer.kickPlayer("An admin just logged in with the username you are using.");
                 }
             }
 
             int count = server.getOnlinePlayers().length;
             if (count >= server.getMaxPlayers())
             {
-                for (Player p : server.getOnlinePlayers())
+                for (Player onlinePlayer : server.getOnlinePlayers())
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(p))
+                    if (!TFM_AdminList.isSuperAdmin(onlinePlayer))
                     {
-                        p.kickPlayer("You have been kicked to free up room for an admin.");
+                        onlinePlayer.kickPlayer("You have been kicked to free up room for an admin.");
                         count--;
                     }
 
@@ -351,15 +232,5 @@ public class TFM_ServerInterface
             }
 
         }
-
-        if (TotalFreedomMod.lockdownEnabled)
-        {
-            TFM_Util.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED);
-        }
-    }
-
-    public static String getVersion()
-    {
-        return MinecraftServer.getServer().getVersion();
     }
 }

src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;

src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java

@@ -1,514 +0,0 @@
-package me.StevenLawson.TotalFreedomMod;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-import me.StevenLawson.TotalFreedomMod.Commands.Command_logs;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.util.FileUtil;
-
-public class TFM_SuperadminList
-{
-    private static final Map<String, TFM_Superadmin> superadminList = new HashMap<String, TFM_Superadmin>();
-    private static List<String> superadminNames = new ArrayList<String>();
-    private static List<String> senioradminNames = new ArrayList<String>();
-    private static List<String> telnetadminNames = new ArrayList<String>();
-    private static List<String> superadminIPs = new ArrayList<String>();
-    private static int cleanThreshold = 24 * 7; // 1 Week in hours
-
-    private TFM_SuperadminList()
-    {
-        throw new AssertionError();
-    }
-
-    public static List<String> getSuperadminIPs()
-    {
-        return superadminIPs;
-    }
-
-    public static List<String> getSuperadminNames()
-    {
-        return superadminNames;
-    }
-
-    public static List<String> getTelnetadminNames()
-    {
-        return telnetadminNames;
-    }
-
-    public static List<String> getSenioradminNames()
-    {
-        return senioradminNames;
-    }
-
-    public static void loadSuperadminList()
-    {
-        try
-        {
-            superadminList.clear();
-
-            TFM_Util.createDefaultConfiguration(TotalFreedomMod.SUPERADMIN_FILE);
-            FileConfiguration config = YamlConfiguration.loadConfiguration(new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
-
-            cleanThreshold = config.getInt("clean_threshold_hours", cleanThreshold);
-
-            if (config.isConfigurationSection("superadmins"))
-            {
-                ConfigurationSection section = config.getConfigurationSection("superadmins");
-
-                for (String admin_name : section.getKeys(false))
-                {
-                    TFM_Superadmin superadmin = new TFM_Superadmin(admin_name, section.getConfigurationSection(admin_name));
-                    superadminList.put(admin_name.toLowerCase(), superadmin);
-                }
-            }
-            else
-            {
-                TFM_Log.warning("Missing superadmins section in superadmin.yml.");
-            }
-
-            updateIndexLists();
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-    }
-
-    public static void backupSavedList()
-    {
-        File a = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE);
-        File b = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE + ".bak");
-        FileUtil.copy(a, b);
-    }
-
-    public static void updateIndexLists()
-    {
-        superadminNames.clear();
-        telnetadminNames.clear();
-        senioradminNames.clear();
-        superadminIPs.clear();
-
-        Iterator<Entry<String, TFM_Superadmin>> it = superadminList.entrySet().iterator();
-        while (it.hasNext())
-        {
-            Entry<String, TFM_Superadmin> pair = it.next();
-
-            String name = pair.getKey().toLowerCase();
-            TFM_Superadmin superadmin = pair.getValue();
-
-            if (superadmin.isActivated())
-            {
-                superadminNames.add(name);
-
-                for (String ip : superadmin.getIps())
-                {
-                    superadminIPs.add(ip);
-                }
-
-                if (superadmin.isSeniorAdmin())
-                {
-                    senioradminNames.add(name);
-
-                    for (String console_alias : superadmin.getConsoleAliases())
-                    {
-                        senioradminNames.add(console_alias.toLowerCase());
-                    }
-                }
-
-                if (superadmin.isTelnetAdmin())
-                {
-                    telnetadminNames.add(name);
-                }
-            }
-        }
-
-        superadminNames = TFM_Util.removeDuplicates(superadminNames);
-        telnetadminNames = TFM_Util.removeDuplicates(telnetadminNames);
-        senioradminNames = TFM_Util.removeDuplicates(senioradminNames);
-        superadminIPs = TFM_Util.removeDuplicates(superadminIPs);
-
-        TFM_AdminWorld.getInstance().wipeAccessCache();
-    }
-
-    public static void saveSuperadminList()
-    {
-        try
-        {
-            updateIndexLists();
-
-            YamlConfiguration config = new YamlConfiguration();
-
-            config.set("clean_threshold_hours", cleanThreshold);
-
-            Iterator<Entry<String, TFM_Superadmin>> it = superadminList.entrySet().iterator();
-            while (it.hasNext())
-            {
-                Entry<String, TFM_Superadmin> pair = it.next();
-
-                String admin_name = pair.getKey().toLowerCase();
-                TFM_Superadmin superadmin = pair.getValue();
-
-                config.set("superadmins." + admin_name + ".ips", TFM_Util.removeDuplicates(superadmin.getIps()));
-                config.set("superadmins." + admin_name + ".last_login", TFM_Util.dateToString(superadmin.getLastLogin()));
-                config.set("superadmins." + admin_name + ".custom_login_message", superadmin.getCustomLoginMessage());
-                config.set("superadmins." + admin_name + ".is_senior_admin", superadmin.isSeniorAdmin());
-                config.set("superadmins." + admin_name + ".is_telnet_admin", superadmin.isTelnetAdmin());
-                config.set("superadmins." + admin_name + ".console_aliases", TFM_Util.removeDuplicates(superadmin.getConsoleAliases()));
-                config.set("superadmins." + admin_name + ".is_activated", superadmin.isActivated());
-            }
-
-            config.save(new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-    }
-
-    public static TFM_Superadmin getAdminEntry(Player player)
-    {
-        final String name = player.getName().toLowerCase();
-
-        if (Bukkit.getOnlineMode())
-        {
-            if (superadminList.containsKey(name))
-            {
-                return superadminList.get(name);
-            }
-        }
-
-        try
-        {
-            final String ip = player.getAddress().getAddress().getHostAddress().trim();
-            if (ip != null && !ip.isEmpty())
-            {
-                return getAdminEntryByIP(ip);
-            }
-        }
-        catch (Exception ex)
-        {
-            return null;
-        }
-        return null;
-    }
-
-    @Deprecated
-    public static TFM_Superadmin getAdminEntry(String name)
-    {
-        name = name.toLowerCase();
-
-        if (superadminList.containsKey(name))
-        {
-            return superadminList.get(name);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public static TFM_Superadmin getAdminEntryByIP(String ip)
-    {
-        return getAdminEntryByIP(ip, false);
-    }
-
-    public static TFM_Superadmin getAdminEntryByIP(String needleIP, boolean fuzzy)
-    {
-        Iterator<Entry<String, TFM_Superadmin>> it = superadminList.entrySet().iterator();
-        while (it.hasNext())
-        {
-            Entry<String, TFM_Superadmin> pair = it.next();
-            TFM_Superadmin superadmin = pair.getValue();
-            if (fuzzy)
-            {
-                for (String haystackIP : superadmin.getIps())
-                {
-                    if (TFM_Util.fuzzyIpMatch(needleIP, haystackIP, 3))
-                    {
-                        return superadmin;
-                    }
-                }
-            }
-            else
-            {
-                if (superadmin.getIps().contains(needleIP))
-                {
-                    return superadmin;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static void updateLastLogin(Player player)
-    {
-        TFM_Superadmin admin_entry = getAdminEntry(player);
-        if (admin_entry != null)
-        {
-            admin_entry.setLastLogin(new Date());
-            saveSuperadminList();
-        }
-    }
-
-    public static boolean isSeniorAdmin(CommandSender user)
-    {
-        return isSeniorAdmin(user, false);
-    }
-
-    public static boolean isSeniorAdmin(CommandSender user, boolean verifySuperadmin)
-    {
-        if (verifySuperadmin)
-        {
-            if (!isUserSuperadmin(user))
-            {
-                return false;
-            }
-        }
-
-        String username = user.getName().toLowerCase();
-
-        if (!(user instanceof Player))
-        {
-            return senioradminNames.contains(username);
-        }
-
-        TFM_Superadmin entry = getAdminEntry((Player) user);
-        if (entry != null)
-        {
-            return entry.isSeniorAdmin();
-        }
-
-        return false;
-    }
-
-    public static boolean isUserSuperadmin(CommandSender user)
-    {
-        if (!(user instanceof Player))
-        {
-            return true;
-        }
-
-        if (Bukkit.getOnlineMode())
-        {
-            if (superadminNames.contains(user.getName().toLowerCase()))
-            {
-                return true;
-            }
-        }
-
-        try
-        {
-            String ip = ((Player) user).getAddress().getAddress().getHostAddress();
-            if (ip != null && !ip.isEmpty())
-            {
-                if (superadminIPs.contains(ip))
-                {
-                    return true;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            return false;
-        }
-
-        return false;
-    }
-
-    public static boolean checkPartialSuperadminIP(String ip, String name)
-    {
-        try
-        {
-            ip = ip.trim();
-
-            if (superadminIPs.contains(ip))
-            {
-                return true;
-            }
-            else
-            {
-                String matchIp = null;
-                for (String testIp : getSuperadminIPs())
-                {
-                    if (TFM_Util.fuzzyIpMatch(ip, testIp, 3))
-                    {
-                        matchIp = testIp;
-                        break;
-                    }
-                }
-
-                if (matchIp != null)
-                {
-                    TFM_Superadmin entry = getAdminEntryByIP(matchIp);
-
-                    if (entry != null)
-                    {
-                        if (entry.getName().equalsIgnoreCase(name))
-                        {
-                            List<String> ips = entry.getIps();
-                            ips.add(ip);
-                            saveSuperadminList();
-                        }
-                    }
-
-                    return true;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-
-        return false;
-    }
-
-    public static boolean isSuperadminImpostor(CommandSender user)
-    {
-        if (!(user instanceof Player))
-        {
-            return false;
-        }
-
-        Player player = (Player) user;
-
-        if (superadminNames.contains(player.getName().toLowerCase()))
-        {
-            return !isUserSuperadmin(player);
-        }
-
-        return false;
-    }
-
-    public static void addSuperadmin(String username, List<String> ips)
-    {
-        try
-        {
-            username = username.toLowerCase();
-
-            if (superadminList.containsKey(username))
-            {
-                TFM_Superadmin superadmin = superadminList.get(username);
-                superadmin.setActivated(true);
-                superadmin.getIps().addAll(ips);
-                superadmin.setLastLogin(new Date());
-            }
-            else
-            {
-                TFM_Superadmin superadmin = new TFM_Superadmin(username, ips, new Date(), "", false, false, new ArrayList<String>(), true);
-                superadminList.put(username.toLowerCase(), superadmin);
-            }
-
-            saveSuperadminList();
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-    }
-
-    public static void addSuperadmin(Player player)
-    {
-        String username = player.getName().toLowerCase();
-        List<String> ips = Arrays.asList(player.getAddress().getAddress().getHostAddress());
-
-        addSuperadmin(username, ips);
-    }
-
-    public static void addSuperadmin(String adminName)
-    {
-        addSuperadmin(adminName, new ArrayList<String>());
-    }
-
-    public static void removeSuperadmin(String username)
-    {
-        try
-        {
-            username = username.toLowerCase();
-
-            if (superadminList.containsKey(username))
-            {
-                TFM_Superadmin superadmin = superadminList.get(username);
-                superadmin.setActivated(false);
-                Command_logs.deactivateSuperadmin(superadmin);
-                saveSuperadminList();
-            }
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-    }
-
-    public static void removeSuperadmin(Player player)
-    {
-        removeSuperadmin(player.getName());
-    }
-
-    public static void cleanSuperadminList(boolean verbose)
-    {
-        try
-        {
-            Iterator<Entry<String, TFM_Superadmin>> it = superadminList.entrySet().iterator();
-            while (it.hasNext())
-            {
-                Entry<String, TFM_Superadmin> pair = it.next();
-                TFM_Superadmin superadmin = pair.getValue();
-                if (superadmin.isActivated() && !superadmin.isSeniorAdmin())
-                {
-                    Date lastLogin = superadmin.getLastLogin();
-
-                    long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
-
-                    if (lastLoginHours > cleanThreshold)
-                    {
-                        if (verbose)
-                        {
-                            TFM_Util.adminAction("TotalFreedomSystem", "Deactivating superadmin \"" + superadmin.getName() + "\", inactive for " + lastLoginHours + " hours.", true);
-                        }
-
-                        superadmin.setActivated(false);
-                        Command_logs.deactivateSuperadmin(superadmin);
-                        TFM_TwitterHandler.getInstance().delTwitter(superadmin.getName());
-                    }
-                }
-            }
-            saveSuperadminList();
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-    }
-
-    public static boolean verifyIdentity(String username, String ip) throws Exception
-    {
-        if (Bukkit.getOnlineMode())
-        {
-            return true;
-        }
-
-        TFM_Superadmin entry = getAdminEntry(username);
-        if (entry != null)
-        {
-            return entry.getIps().contains(ip);
-        }
-        else
-        {
-            throw new Exception();
-        }
-    }
-}