Added xXWilee99Xx to developers

updated to version 3.3 to reflect latest changes

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 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.
   * The primary developers, StevenLawson (Madgeek1450) and Jerom van der Sar (DarthSalamon), may choose to provide official binaries on a discretionary basis.

appinfo.properties

@@ -1,6 +1,5 @@
-#Fri, 09 Aug 2013 15:38:23 +0200
-
-program.VERSION=2.22
-program.BUILDNUM=378
-program.BUILDDATE=08/09/2013 03\:38 PM
+#Tue, 08 Oct 2013 13:58:56 -0400
 
+program.VERSION=3.3
+program.BUILDNUM=616
+program.BUILDDATE=10/08/2013 01\:58 PM

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Aug 09 15:38:23 CEST 2013
-build.number=379
+#Tue Oct 08 13:58:56 EDT 2013
+build.number=617

nbproject/project.properties

@@ -4,7 +4,23 @@ annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=TotalFreedomMod
-application.vendor=Michael
+application.vendor=TotalFreedom
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=0
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.enableCommentFormatting=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -34,7 +50,9 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${libs.CraftBukkit.classpath}:\
     ${libs.WorldEdit.classpath}:\
-    ${libs.DisguiseCraft.classpath}
+    ${libs.DisguiseCraft.classpath}:\
+    ${libs.Essentials.classpath}:\
+    ${libs.BukkitTelnet.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=false
@@ -70,7 +88,7 @@ jnlp.signing.keystore=
 main.class=totalfreedommod.TotalFreedomMod
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\

src/config.yml

@@ -1,4 +1,4 @@
-# TotalFreedomMod v2.22 Configuration
+# TotalFreedomMod v3.3 Configuration
 # by Madgeek1450 and DarthSalamon
 
 # Block placement prevention:
@@ -12,7 +12,7 @@ allow_tnt_minecarts: false
 
 # Explosion management:
 allow_explosions: false
-explosiveRadius: 4.0
+explosive_radius: 4.0
 
 # Blocked commands:
 #
@@ -50,27 +50,39 @@ explosiveRadius: 4.0
 #
 blocked_commands:
   # Disabled commands
-  - n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.
-  - n:b:/md:This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.
-  - n:b:/gamemode:Use /creative and /survival to set your gamemode.
-  - n:b:/gamerule:_
-  - n:b:/ban:_
-  - n:b:/pardon:_
-  - n:b:/toggledownfall:_
-  - n:b:/ban-ip:_
-  - n:b:/pardon-ip:_
+  - 'n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.'
+  - 'n:b:/md:This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.'
+  - 'n:b:/gamemode:Use /creative and /survival to set your gamemode.'
+  - 'n:b:/gamerule:_'
+  - 'n:b:/ban:_'
+  - 'n:b:/pardon:_'
+  - 'n:b:/ban-ip:_'
+  - 'n:b:/pardon-ip:_'
+  - 'n:b:/toggledownfall:_'
+  - 'n:b:/effect:Please use /potion to set effects.'
+  - 'n:b:/enderchest:_'
   
   # Superadmin commands
-  - s:b:/kick:_
-  - s:b:/socialspy:_
-  - s:b:/kill:_
-  - s:b:/clearhistory:_
-  - s:a:/stop:_
-  - s:a:/reload:_
-  - s:a:/nuke:_
-  - s:a:/save-all:_
-  - s:a:/save-on:_
-  - s:a:/save-off:_
+  - 's:b:/kick:_'
+  - 's:b:/socialspy:_'
+  - 's:b:/kill:_'
+  - 's:b://generate:_'
+  - 's:b://:_'
+  - 's:b:/superpickaxe:_'
+  - 's:b:/brush:_'
+  - 's:b:/mat:_'
+  - 's:b:/tool:_'
+  - 's:b://butcher:_'
+  - 's:b:/scoreboard:_'
+  
+  # Superadmin commands - Auto-eject
+  - 's:a:/stop'
+  - 's:a:/reload'
+  - 's:a:/nuke'
+  - 's:a:/save-all'
+  - 's:a:/save-on'
+  - 's:a:/save-off'
+  - 's:a:/clearhistory'
 
 # Automatically wipe dropped objects:
 auto_wipe: true
@@ -124,14 +136,65 @@ host_sender_names:
   - rcon
   - remotebukkit
 
+# Players who cannot be banned by username
+unbannable_usernames:
+  - honeydew
+  - xephos
+  - captainsparklez
+  - truemu
+  - kiershar
+  - fvdisco
+  - sethbling
+  - notch
+  - jeb_
+  - gamechap
+  - bertiechap
+  - vechs
+  - antvenom
+  - chimneyswift
+  - deadmau5
+  - etho
+  - ethoslab
+  - skydoesminecraft
+  - skythekidrs
+  - tobyturner
+  - xxslyfoxhoundxx
+  - paulsoaresjr
+  - sips_
+  - deadlox
+  - xxslyxx
+  - jeromeasf
+  - dinnerbone
+  - grumm
+  - grum
+  - evilseph
+  - cavemanfilms
+  - herobrine
+  - whiteboy7thst
+
 # TwitterBot - Used to allow superadmins to verify themselves using twitter
 twitterbot_enabled: false
-twitterbot_url:
-twitterbot_secret:
+twitterbot_url: ''
+twitterbot_secret: ''
 
 # Pet Protect - Prevent tamed pets from being killed.
 pet_protect_enabled: true
 
 # Logs Registration
-logs_register_password:
-logs_register_url:
+logs_register_password: ''
+logs_register_url: ''
+  
+# Mojang service checker
+service_checker_url: http://status.mojang.com/check
+
+# HTTPD
+httpd_enabled: true
+httpd_public_folder: ./public_html
+httpd_port: 28966
+
+# Inactivity Auto-Kick (Requires Essentials)
+autokick_enabled: true
+# autokick_threshold - Percentage of server player capacity used at which players will be automatically kicked for being inactive. Range: 0.0 - 1.0
+autokick_threshold: 0.9
+# autokick_time - Time, in seconds, after which a player should be kicked when inactive
+autokick_time: 120

src/me/StevenLawson/TotalFreedomMod/CleanroomChunkGenerator.java

@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 import java.util.logging.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -31,7 +32,7 @@ import org.bukkit.generator.ChunkGenerator;
 
 public class CleanroomChunkGenerator extends ChunkGenerator
 {
-    private Logger log = Logger.getLogger("Minecraft-Server");
+    private static final Logger log = Bukkit.getLogger();
     private short[] layer;
     private byte[] layerDataValues;
 

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

@@ -2,5 +2,17 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 public enum AdminLevel
 {
-    ALL, OP, SUPER, SENIOR
+    ALL("All Player Commands"), OP("OP Commands"), SUPER("SuperAdmin Commands"), SENIOR("Senior Admin Commands");
+    //
+    private final String friendlyName;
+
+    private AdminLevel(String friendlyName)
+    {
+        this.friendlyName = friendlyName;
+    }
+
+    public String getFriendlyName()
+    {
+        return friendlyName;
+    }
 }

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,19 +21,19 @@ public class Command_adminmode extends TFM_Command
 
         if (args[0].equalsIgnoreCase("off"))
         {
-            TotalFreedomMod.adminOnlyMode = false;
+            TFM_ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false);
             TFM_Util.adminAction(sender.getName(), "Opening the server to all players.", true);
             return true;
         }
         else if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.adminOnlyMode = true;
+            TFM_ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true);
             TFM_Util.adminAction(sender.getName(), "Closing the server to non-superadmins.", true);
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
+                if (!TFM_SuperadminList.isUserSuperadmin(player))
                 {
-                    p.kickPlayer("Server is now closed to non-superadmins.");
+                    player.kickPlayer("Server is now closed to non-superadmins.");
                 }
             }
             return true;

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

@@ -0,0 +1,233 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Go to the AdminWorld.", usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
+public class Command_adminworld extends TFM_Command
+{
+    private enum CommandMode
+    {
+        TELEPORT, GUEST, TIME, WEATHER
+    }
+
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        CommandMode commandMode = null;
+
+        if (args.length == 0)
+        {
+            commandMode = CommandMode.TELEPORT;
+        }
+        else if (args.length >= 2)
+        {
+            if ("guest".equalsIgnoreCase(args[0]))
+            {
+                commandMode = CommandMode.GUEST;
+            }
+            else if ("time".equalsIgnoreCase(args[0]))
+            {
+                commandMode = CommandMode.TIME;
+            }
+            else if ("weather".equalsIgnoreCase(args[0]))
+            {
+                commandMode = CommandMode.WEATHER;
+            }
+        }
+
+        if (commandMode == null)
+        {
+            return false;
+        }
+
+        try
+        {
+            switch (commandMode)
+            {
+                case TELEPORT:
+                {
+                    if (!(sender instanceof Player) || sender_p == null)
+                    {
+                        return true;
+                    }
+
+                    World adminWorld = null;
+                    try
+                    {
+                        adminWorld = TFM_AdminWorld.getInstance().getWorld();
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+
+                    if (adminWorld == null || sender_p.getWorld() == adminWorld)
+                    {
+                        playerMsg("Going to the main world.");
+                        sender_p.teleport(server.getWorlds().get(0).getSpawnLocation());
+                    }
+                    else
+                    {
+                        if (TFM_AdminWorld.getInstance().canAccessWorld(sender_p))
+                        {
+                            playerMsg("Going to the AdminWorld.");
+                            TFM_AdminWorld.getInstance().sendToWorld(sender_p);
+                        }
+                        else
+                        {
+                            playerMsg("You don't have permission to access the AdminWorld.");
+                        }
+                    }
+
+                    break;
+                }
+                case GUEST:
+                {
+                    if (args.length == 2)
+                    {
+                        if ("list".equalsIgnoreCase(args[1]))
+                        {
+                            playerMsg("AdminWorld guest list: " + TFM_AdminWorld.getInstance().guestListToString());
+                        }
+                        else if ("purge".equalsIgnoreCase(args[1]))
+                        {
+                            assertCommandPerms(sender, sender_p);
+                            TFM_AdminWorld.getInstance().purgeGuestList();
+                            TFM_Util.adminAction(sender.getName(), "AdminWorld guest list purged.", false);
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                    else if (args.length == 3)
+                    {
+                        assertCommandPerms(sender, sender_p);
+
+                        if ("add".equalsIgnoreCase(args[1]))
+                        {
+                            Player player;
+                            try
+                            {
+                                player = getPlayer(args[2]);
+                            }
+                            catch (PlayerNotFoundException ex)
+                            {
+                                sender.sendMessage(ex.getMessage());
+                                return true;
+                            }
+
+                            if (player != null && TFM_AdminWorld.getInstance().addGuest(player, sender_p))
+                            {
+                                TFM_Util.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false);
+                            }
+                            else
+                            {
+                                playerMsg("Could not add player to guest list.");
+                            }
+                        }
+                        else if (TFM_Util.isRemoveCommand(args[1]))
+                        {
+                            Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]);
+                            if (player != null)
+                            {
+                                TFM_Util.adminAction(sender.getName(), "AdminWorld guest removed: " + player.getName(), false);
+                            }
+                            else
+                            {
+                                playerMsg("Can't find guest entry for: " + args[2]);
+                            }
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+
+                    break;
+                }
+                case TIME:
+                {
+                    assertCommandPerms(sender, sender_p);
+
+                    if (args.length == 2)
+                    {
+                        TFM_AdminWorld.TimeOfDay timeOfDay = TFM_AdminWorld.TimeOfDay.getByAlias(args[1]);
+                        if (timeOfDay != null)
+                        {
+                            TFM_AdminWorld.getInstance().setTimeOfDay(timeOfDay);
+                            playerMsg("AdminWorld time set to: " + timeOfDay.name());
+                        }
+                        else
+                        {
+                            playerMsg("Invalid time of day. Can be: sunrise, noon, sunset, midnight");
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
+
+                    break;
+                }
+                case WEATHER:
+                {
+                    assertCommandPerms(sender, sender_p);
+
+                    if (args.length == 2)
+                    {
+                        TFM_AdminWorld.WeatherMode weatherMode = TFM_AdminWorld.WeatherMode.getByAlias(args[1]);
+                        if (weatherMode != null)
+                        {
+                            TFM_AdminWorld.getInstance().setWeatherMode(weatherMode);
+                            playerMsg("AdminWorld weather set to: " + weatherMode.name());
+                        }
+                        else
+                        {
+                            playerMsg("Invalid weather mode. Can be: off, rain, storm");
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
+
+                    break;
+                }
+                default:
+                {
+                    return false;
+                }
+            }
+        }
+        catch (PermissionDeniedException ex)
+        {
+            sender.sendMessage(ex.getMessage());
+        }
+
+        return true;
+    }
+
+    private void assertCommandPerms(CommandSender sender, Player sender_p) throws PermissionDeniedException
+    {
+        if (!(sender instanceof Player) || sender_p == null || !TFM_SuperadminList.isUserSuperadmin(sender))
+        {
+            throw new PermissionDeniedException(TotalFreedomMod.MSG_NO_PERMS);
+        }
+    }
+
+    private class PermissionDeniedException extends Exception
+    {
+        public PermissionDeniedException(String string)
+        {
+            super(string);
+        }
+    }
+}

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

@@ -23,9 +23,9 @@ public class Command_blockcmd extends TFM_Command
         {
             TFM_Util.adminAction(sender.getName(), "Unblocking commands for all players", true);
             int counter = 0;
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
                 if (playerdata.allCommandsBlocked())
                 {
                     counter += 1;
@@ -36,28 +36,28 @@ public class Command_blockcmd extends TFM_Command
             return true;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage());
             return true;
         }
 
-        if (TFM_SuperadminList.isUserSuperadmin(p))
+        if (TFM_SuperadminList.isUserSuperadmin(player))
         {
-            playerMsg(p.getName() + " is a Superadmin, and cannot have their commands blocked.");
+            playerMsg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         playerdata.setCommandsBlocked(!playerdata.allCommandsBlocked());
 
-        TFM_Util.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + p.getName(), true);
+        TFM_Util.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + player.getName(), true);
         playerMsg((playerdata.allCommandsBlocked() ? "B" : "Unb") + "locked all commands.");
 
         return true;

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

@@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <partialname> <off | [[outermaterial] [innermaterial]]>")
+@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
 public class Command_cage extends TFM_Command
 {
     @Override
@@ -21,26 +21,53 @@ public class Command_cage extends TFM_Command
             return false;
         }
 
-        Player p;
+        if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
+        {
+            TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
+
+            playerdata.setCaged(false);
+            playerdata.regenerateHistory();
+            playerdata.clearHistory();
+
+            return true;
+        }
+        else if ("purge".equalsIgnoreCase(args[0]))
+        {
+            TFM_Util.adminAction(sender.getName(), "Uncaging all players.", true);
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                playerdata.setCaged(false);
+                playerdata.regenerateHistory();
+                playerdata.clearHistory();
+            }
+
+            return true;
+        }
+
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             sender.sendMessage(ex.getMessage());
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+
+        Material outerMaterial = Material.GLASS;
+        Material innerMaterial = Material.AIR;
 
-        Material cage_material_outer = Material.GLASS;
-        Material cage_material_inner = Material.AIR;
         if (args.length >= 2)
         {
             if (TFM_Util.isStopCommand(args[1]))
             {
-                TFM_Util.adminAction(sender.getName(), "Uncaging " + p.getName() + ".", true);
+                TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
 
                 playerdata.setCaged(false);
                 playerdata.regenerateHistory();
@@ -50,10 +77,13 @@ public class Command_cage extends TFM_Command
             }
             else
             {
-                cage_material_outer = Material.matchMaterial(args[1]);
-                if (cage_material_outer == null)
+                if ("darth".equalsIgnoreCase(args[1]))
                 {
-                    cage_material_outer = Material.GLASS;
+                    outerMaterial = Material.SKULL;
+                }
+                else if (Material.matchMaterial(args[1]) != null)
+                {
+                    outerMaterial = Material.matchMaterial(args[1]);
                 }
             }
         }
@@ -62,25 +92,32 @@ public class Command_cage extends TFM_Command
         {
             if (args[2].equalsIgnoreCase("water"))
             {
-                cage_material_inner = Material.STATIONARY_WATER;
+                innerMaterial = Material.STATIONARY_WATER;
             }
             else if (args[2].equalsIgnoreCase("lava"))
             {
-                cage_material_inner = Material.STATIONARY_LAVA;
+                innerMaterial = Material.STATIONARY_LAVA;
             }
         }
 
-        Location target_pos = p.getLocation().add(0, 1, 0);
-        playerdata.setCaged(true, target_pos, cage_material_outer, cage_material_inner);
+        Location targetPos = player.getLocation().clone().add(0, 1, 0);
+        playerdata.setCaged(true, targetPos, outerMaterial, innerMaterial);
         playerdata.regenerateHistory();
         playerdata.clearHistory();
-        TFM_Util.buildHistory(target_pos, 2, playerdata);
-        TFM_Util.generateCube(target_pos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER));
-        TFM_Util.generateCube(target_pos, 1, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
+        TFM_Util.buildHistory(targetPos, 2, playerdata);
+        TFM_Util.generateHollowCube(targetPos, 2, outerMaterial);
+        TFM_Util.generateCube(targetPos, 1, innerMaterial);
 
-        p.setGameMode(GameMode.SURVIVAL);
+        player.setGameMode(GameMode.SURVIVAL);
 
-        TFM_Util.adminAction(sender.getName(), "Caging " + p.getName() + ".", true);
+        if (outerMaterial != Material.SKULL)
+        {
+            TFM_Util.adminAction(sender.getName(), "Caging " + player.getName(), true);
+        }
+        else
+        {
+            TFM_Util.adminAction(sender.getName(), "Caging " + player.getName() + " in PURE_DARTH", true);
+        }
 
         return true;
     }

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

@@ -28,14 +28,14 @@ public class Command_cake extends TFM_Command
             output.append(ChatColor.COLOR_CHAR).append(color_code).append(word).append(" ");
         }
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
             ItemStack heldItem = new ItemStack(Material.CAKE, 1);
-            p.getInventory().setItem(p.getInventory().firstEmpty(), heldItem);
-            p.awardAchievement(Achievement.MINE_WOOD);
-            p.awardAchievement(Achievement.BUILD_WORKBENCH);
-            p.awardAchievement(Achievement.BUILD_HOE);
-            p.awardAchievement(Achievement.BAKE_CAKE);
+            player.getInventory().setItem(player.getInventory().firstEmpty(), heldItem);
+            player.awardAchievement(Achievement.MINE_WOOD);
+            player.awardAchievement(Achievement.BUILD_WORKBENCH);
+            player.awardAchievement(Achievement.BUILD_HOE);
+            player.awardAchievement(Achievement.BAKE_CAKE);
         }
 
         TFM_Util.bcastMsg(output.toString());

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

@@ -13,15 +13,15 @@ public class Command_cartsit extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        Player target_player = sender_p;
+        Player targetPlayer = sender_p;
 
         if (args.length == 1)
         {
             try
             {
-                target_player = getPlayer(args[0]);
+                targetPlayer = getPlayer(args[0]);
             }
-            catch (CantFindPlayerException ex)
+            catch (PlayerNotFoundException ex)
             {
                 sender.sendMessage(ex.getMessage());
                 return true;
@@ -30,26 +30,26 @@ public class Command_cartsit extends TFM_Command
 
         if (senderIsConsole)
         {
-            if (target_player == null)
+            if (targetPlayer == null)
             {
                 sender.sendMessage("When used from the console, you must define a target player: /cartsit <player>");
                 return true;
             }
         }
-        else if (target_player != sender_p && !TFM_SuperadminList.isUserSuperadmin(sender))
+        else if (targetPlayer != sender_p && !TFM_SuperadminList.isUserSuperadmin(sender))
         {
             sender.sendMessage("Only superadmins can select another player as a /cartsit target.");
             return true;
         }
 
-        if (target_player.isInsideVehicle())
+        if (targetPlayer.isInsideVehicle())
         {
-            target_player.getVehicle().eject();
+            targetPlayer.getVehicle().eject();
         }
         else
         {
             Minecart nearest_cart = null;
-            for (Minecart cart : target_player.getWorld().getEntitiesByClass(Minecart.class))
+            for (Minecart cart : targetPlayer.getWorld().getEntitiesByClass(Minecart.class))
             {
                 if (cart.isEmpty())
                 {
@@ -59,7 +59,7 @@ public class Command_cartsit extends TFM_Command
                     }
                     else
                     {
-                        if (cart.getLocation().distanceSquared(target_player.getLocation()) < nearest_cart.getLocation().distanceSquared(target_player.getLocation()))
+                        if (cart.getLocation().distanceSquared(targetPlayer.getLocation()) < nearest_cart.getLocation().distanceSquared(targetPlayer.getLocation()))
                         {
                             nearest_cart = cart;
                         }
@@ -69,7 +69,7 @@ public class Command_cartsit extends TFM_Command
 
             if (nearest_cart != null)
             {
-                nearest_cart.setPassenger(target_player);
+                nearest_cart.setPassenger(targetPlayer);
             }
             else
             {

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

@@ -0,0 +1,206 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandParameters(description = "No Description Yet", usage = "/<command>")
+public class Command_cbtool extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
+        if ("targetblock".equalsIgnoreCase(args[0]) && sender instanceof Player)
+        {
+            Block targetBlock = sender_p.getTargetBlock(null, 100);
+            playerMsg("Your target block: " + targetBlock.getLocation().toString());
+            return true;
+        }
+
+        try
+        {
+            final StringBuffer generatedCommand = new StringBuffer();
+
+            final Matcher matcher = Pattern.compile("\\[(.+?)\\]").matcher(StringUtils.join(args, " ").trim());
+            while (matcher.find())
+            {
+                matcher.appendReplacement(generatedCommand, processSubCommand(matcher.group(1)));
+            }
+            matcher.appendTail(generatedCommand);
+
+            server.dispatchCommand(sender, generatedCommand.toString());
+        }
+        catch (SubCommandFailureException ex)
+        {
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+
+        return true;
+    }
+
+    private String processSubCommand(final String subcommand) throws SubCommandFailureException
+    {
+        final String[] args = StringUtils.split(subcommand, " ");
+
+        if (args.length == 1)
+        {
+            throw new SubCommandFailureException("Invalid subcommand name.");
+        }
+
+        return SubCommand.getByName(args[0]).getExecutable().execute(ArrayUtils.remove(args, 0));
+    }
+
+    private static enum SubCommand
+    {
+        PLAYER_DETECT("playerdetect", new SubCommandExecutable()
+        {
+            @Override
+            public String execute(String[] args) throws SubCommandFailureException
+            {
+                if (args.length != 5)
+                {
+                    throw new SubCommandFailureException("Invalid # of arguments.");
+                }
+
+                double x, y, z;
+                try
+                {
+                    x = Double.parseDouble(args[0].trim());
+                    y = Double.parseDouble(args[1].trim());
+                    z = Double.parseDouble(args[2].trim());
+                }
+                catch (NumberFormatException ex)
+                {
+                    throw new SubCommandFailureException("Invalid coordinates.");
+                }
+
+                World world = null;
+                final String needleWorldName = args[3].trim();
+                final List<World> worlds = Bukkit.getWorlds();
+                for (final World testWorld : worlds)
+                {
+                    if (testWorld.getName().trim().equalsIgnoreCase(needleWorldName))
+                    {
+                        world = testWorld;
+                        break;
+                    }
+                }
+
+                if (world == null)
+                {
+                    throw new SubCommandFailureException("Invalid world name.");
+                }
+
+                final Location testLocation = new Location(world, x, y, z);
+
+                double radius;
+                try
+                {
+                    radius = Double.parseDouble(args[4].trim());
+                }
+                catch (NumberFormatException ex)
+                {
+                    throw new SubCommandFailureException("Invalid radius.");
+                }
+
+                final double radiusSq = radius * radius;
+
+                final List<Player> worldPlayers = testLocation.getWorld().getPlayers();
+                for (final Player testPlayer : worldPlayers)
+                {
+                    if (testPlayer.getLocation().distanceSquared(testLocation) < radiusSq)
+                    {
+                        return testPlayer.getName();
+                    }
+                }
+
+                throw new SubCommandFailureException("No player found in range.");
+            }
+        }),
+        PLAYER_DETECT_BOOLEAN("playerdetectboolean", new SubCommandExecutable()
+        {
+            @Override
+            public String execute(String[] args) throws SubCommandFailureException
+            {
+                try
+                {
+                    PLAYER_DETECT.getExecutable().execute(args);
+                }
+                catch (SubCommandFailureException ex)
+                {
+                    return "0";
+                }
+
+                return "1";
+            }
+        });
+        //
+        private final String name;
+        private final SubCommandExecutable executable;
+
+        private SubCommand(String subCommandName, SubCommandExecutable subCommandImpl)
+        {
+            this.name = subCommandName;
+            this.executable = subCommandImpl;
+        }
+
+        public SubCommandExecutable getExecutable()
+        {
+            return executable;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public static SubCommand getByName(String needle) throws SubCommandFailureException
+        {
+            needle = needle.trim();
+            for (SubCommand subCommand : values())
+            {
+                if (subCommand.getName().equalsIgnoreCase(needle))
+                {
+                    return subCommand;
+                }
+            }
+            throw new SubCommandFailureException("Invalid subcommand name.");
+        }
+    }
+
+    private interface SubCommandExecutable
+    {
+        public String execute(String[] args) throws SubCommandFailureException;
+    }
+
+    private static class SubCommandFailureException extends Exception
+    {
+        public SubCommandFailureException()
+        {
+        }
+
+        public SubCommandFailureException(String message)
+        {
+            super(message);
+        }
+    }
+}

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

@@ -5,7 +5,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,11 +21,11 @@ public class Command_cmdlist extends TFM_Command
     {
         List<String> commands = new ArrayList<String>();
 
-        for (Plugin p : server.getPluginManager().getPlugins())
+        for (Plugin targetPlugin : server.getPluginManager().getPlugins())
         {
             try
             {
-                PluginDescriptionFile desc = p.getDescription();
+                PluginDescriptionFile desc = targetPlugin.getDescription();
                 Map<String, Map<String, Object>> map = (Map<String, Map<String, Object>>) desc.getCommands();
 
                 if (map != null)

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

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Spy on commands", usage = "/<command>")
+@CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
 public class Command_cmdspy extends TFM_Command
 {
     @Override

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

@@ -0,0 +1,58 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.Iterator;
+import java.util.Map;
+import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Essentials Interface Command - Color your current nickname.", usage = "/<command> <color>")
+public class Command_colorme extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        if ("list".equalsIgnoreCase(args[0]))
+        {
+            playerMsg("Colors: " + StringUtils.join(TFM_Util.CHAT_COLOR_NAMES.keySet(), ", "));
+            return true;
+        }
+
+        final String needle = args[0].trim().toLowerCase();
+        ChatColor color = null;
+        final Iterator<Map.Entry<String, ChatColor>> it = TFM_Util.CHAT_COLOR_NAMES.entrySet().iterator();
+        while (it.hasNext())
+        {
+            final Map.Entry<String, ChatColor> entry = it.next();
+            if (entry.getKey().contains(needle))
+            {
+                color = entry.getValue();
+                break;
+            }
+        }
+
+        if (color == null)
+        {
+            playerMsg("Invalid color: " + needle + " - Use \"/colorme list\" to list colors.");
+            return true;
+        }
+
+        final String newNick = color + ChatColor.stripColor(sender_p.getDisplayName()).trim() + ChatColor.WHITE;
+
+        TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), newNick);
+
+        playerMsg("Your nickname is now: " + newNick);
+
+        return true;
+    }
+}

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

@@ -0,0 +1,70 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
+@CommandParameters(description = "Temporarily change config parameters.", usage = "/<command> <entry> <value>")
+public class Command_config extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 2)
+        {
+            return false;
+        }
+
+        TFM_ConfigEntry entry = TFM_ConfigEntry.findConfigEntry(args[0]);
+
+        if (entry == null)
+        {
+            sender.sendMessage("Can't find configuration option: " + args[0]);
+            return true;
+        }
+
+        Object newValue = null;
+        final String newValueString = args[1].trim();
+        final Class<?> type = entry.getType();
+        try
+        {
+            if (type.isAssignableFrom(Integer.class))
+            {
+                newValue = new Integer(newValueString);
+                entry.setInteger((Integer) newValue);
+            }
+            else if (type.isAssignableFrom(Double.class))
+            {
+                newValue = new Double(newValueString);
+                entry.setDouble((Double) newValue);
+            }
+            else if (type.isAssignableFrom(Boolean.class))
+            {
+                newValue = Boolean.valueOf(newValueString);
+                entry.setBoolean((Boolean) newValue);
+            }
+            else if (type.isAssignableFrom(String.class))
+            {
+                newValue = newValueString;
+                entry.setString((String) newValue);
+            }
+        }
+        catch (Exception ex)
+        {
+        }
+
+        if (newValue != null)
+        {
+            sender.sendMessage(String.format("Set configuration entry \"%s\" to \"%s\" value \"%s\".",
+                    entry.toString(), type.getName(), newValue.toString()));
+        }
+        else
+        {
+            sender.sendMessage("Could not parse value \"" + newValueString + "\" as type \"" + type.getName() + "\".");
+        }
+
+        return true;
+    }
+}

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

@@ -24,10 +24,10 @@ public class Command_creative extends TFM_Command
             }
         }
 
-        Player p;
+        Player player;
         if (args.length == 0)
         {
-            p = sender_p;
+            player = sender_p;
         }
         else
         {
@@ -39,9 +39,9 @@ public class Command_creative extends TFM_Command
                     return true;
                 }
 
-                for (Player player : server.getOnlinePlayers())
+                for (Player targetPlayer : server.getOnlinePlayers())
                 {
-                    player.setGameMode(GameMode.CREATIVE);
+                    targetPlayer.setGameMode(GameMode.CREATIVE);
                 }
 
                 TFM_Util.adminAction(sender.getName(), "Changing everyone's gamemode to creative", false);
@@ -56,9 +56,9 @@ public class Command_creative extends TFM_Command
 
             try
             {
-                p = getPlayer(args[0]);
+                player = getPlayer(args[0]);
             }
-            catch (CantFindPlayerException ex)
+            catch (PlayerNotFoundException ex)
             {
                 sender.sendMessage(ex.getMessage());
                 return true;
@@ -66,9 +66,9 @@ public class Command_creative extends TFM_Command
 
         }
 
-        playerMsg("Setting " + p.getName() + " to game mode 'Creative'.");
-        playerMsg(p, sender.getName() + " set your game mode to 'Creative'.");
-        p.setGameMode(GameMode.CREATIVE);
+        playerMsg("Setting " + player.getName() + " to game mode 'Creative'.");
+        playerMsg(player, sender.getName() + " set your game mode to 'Creative'.");
+        player.setGameMode(GameMode.CREATIVE);
 
         return true;
     }

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

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

@@ -18,7 +18,7 @@ public class Command_deafen extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        for (final Player p : server.getOnlinePlayers())
+        for (final Player player : server.getOnlinePlayers())
         {
             for (double percent = 0.0; percent <= 1.0; percent += (1.0 / STEPS))
             {
@@ -29,7 +29,7 @@ public class Command_deafen extends TFM_Command
                     @Override
                     public void run()
                     {
-                        p.playSound(randomOffset(p.getLocation(), 5.0), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch);
+                        player.playSound(randomOffset(player.getLocation(), 5.0), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch);
                     }
                 }.runTaskLater(plugin, Math.round(20.0 * percent * 2.0));
             }

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.lang.reflect.Field;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

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

@@ -0,0 +1,26 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>")
+public class Command_denick extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        TFM_Util.adminAction(sender.getName(), "Removing all nicknames.", false);
+
+        Player[] onlinePlayers = server.getOnlinePlayers();
+        for (Player player : onlinePlayers)
+        {
+            TFM_EssentialsBridge.getInstance().setNickname(player.getName(), null);
+        }
+
+        return true;
+    }
+}

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

@@ -18,25 +18,25 @@ public class Command_deop extends TFM_Command
             return false;
         }
 
-        OfflinePlayer p = null;
+        OfflinePlayer player = null;
 
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
             if (args[0].equalsIgnoreCase(onlinePlayer.getName()))
             {
-                p = onlinePlayer;
+                player = onlinePlayer;
             }
         }
 
         // if the player is not online
-        if (p == null)
+        if (player == null)
         {
-            p = server.getOfflinePlayer(args[0]);
+            player = server.getOfflinePlayer(args[0]);
         }
 
-        TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false);
+        TFM_Util.adminAction(sender.getName(), "De-opping " + player.getName(), false);
 
-        p.setOp(false);
+        player.setOp(false);
 
         return true;
     }

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

@@ -15,10 +15,10 @@ public class Command_deopall extends TFM_Command
     {
         TFM_Util.adminAction(sender.getName(), "De-opping all players on the server", true);
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            p.setOp(false);
-            p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+            player.setOp(false);
+            player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
         }
 
         return true;

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

@@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -74,13 +74,13 @@ public class Command_dispfill extends TFM_Command
                 {
                     for (int z_offset = -radius; z_offset <= radius; z_offset++)
                     {
-                        Block target_block = center_block.getRelative(x_offset, y_offset, z_offset);
-                        if (target_block.getLocation().distanceSquared(center_location) < (radius * radius))
+                        Block targetBlock = center_block.getRelative(x_offset, y_offset, z_offset);
+                        if (targetBlock.getLocation().distanceSquared(center_location) < (radius * radius))
                         {
-                            if (target_block.getType().equals(Material.DISPENSER))
+                            if (targetBlock.getType().equals(Material.DISPENSER))
                             {
-                                sender.sendMessage("Filling dispenser @ " + TFM_Util.formatLocation(target_block.getLocation()));
-                                setDispenserContents(target_block, items_array);
+                                sender.sendMessage("Filling dispenser @ " + TFM_Util.formatLocation(targetBlock.getLocation()));
+                                setDispenserContents(targetBlock, items_array);
                                 affected++;
                             }
                         }
@@ -98,9 +98,9 @@ public class Command_dispfill extends TFM_Command
         return true;
     }
 
-    private static void setDispenserContents(Block target_block, ItemStack[] items)
+    private static void setDispenserContents(Block targetBlock, ItemStack[] items)
     {
-        Dispenser dispenser = (Dispenser) target_block.getState();
+        Dispenser dispenser = (Dispenser) targetBlock.getState();
         Inventory disp_inv = dispenser.getInventory();
         disp_inv.clear();
         disp_inv.addItem(items);

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

@@ -22,53 +22,53 @@ public class Command_doom extends TFM_Command
             return false;
         }
 
-        final Player p;
+        final Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             sender.sendMessage(ex.getMessage());
             return true;
         }
 
-        TFM_Util.adminAction(sender.getName(), "Casting oblivion over " + p.getName(), true);
-        TFM_Util.bcastMsg(p.getName() + " will be completely obliviated!", ChatColor.RED);
+        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 = p.getAddress().getAddress().getHostAddress().trim();
+        final String IP = player.getAddress().getAddress().getHostAddress().trim();
 
         // remove from superadmin
-        if (TFM_SuperadminList.isUserSuperadmin(p))
+        if (TFM_SuperadminList.isUserSuperadmin(player))
         {
-            TFM_Util.adminAction(sender.getName(), "Removing " + p.getName() + " from the superadmin list.", true);
-            TFM_SuperadminList.removeSuperadmin(p);
+            TFM_Util.adminAction(sender.getName(), "Removing " + player.getName() + " from the superadmin list.", true);
+            TFM_SuperadminList.removeSuperadmin(player);
         }
 
         // remove from whitelist
-        p.setWhitelisted(false);
+        player.setWhitelisted(false);
 
         // deop
-        p.setOp(false);
+        player.setOp(false);
 
         // ban IP
         TFM_ServerInterface.banIP(IP, null, null, null);
 
         // ban name
-        TFM_ServerInterface.banUsername(p.getName(), null, null, null);
+        TFM_ServerInterface.banUsername(player.getName(), null, null, null);
 
         // set gamemode to survival
-        p.setGameMode(GameMode.SURVIVAL);
+        player.setGameMode(GameMode.SURVIVAL);
 
         // clear inventory
-        p.closeInventory();
-        p.getInventory().clear();
+        player.closeInventory();
+        player.getInventory().clear();
 
         // ignite player
-        p.setFireTicks(10000);
+        player.setFireTicks(10000);
 
         // generate explosion
-        p.getWorld().createExplosion(p.getLocation(), 4F);
+        player.getWorld().createExplosion(player.getLocation(), 4F);
 
         new BukkitRunnable()
         {
@@ -76,10 +76,10 @@ public class Command_doom extends TFM_Command
             public void run()
             {
                 // strike lightning
-                p.getWorld().strikeLightning(p.getLocation());
+                player.getWorld().strikeLightning(player.getLocation());
 
                 // kill (if not done already)
-                p.setHealth(0.0);
+                player.setHealth(0.0);
             }
         }.runTaskLater(plugin, 20L * 2L);
 
@@ -89,13 +89,13 @@ public class Command_doom extends TFM_Command
             public void run()
             {
                 // message
-                TFM_Util.adminAction(sender.getName(), "Banning " + p.getName() + ", IP: " + IP, true);
+                TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + IP, true);
 
                 // generate explosion
-                p.getWorld().createExplosion(p.getLocation(), 4F);
+                player.getWorld().createExplosion(player.getLocation(), 4F);
 
                 // kick player
-                p.kickPlayer(ChatColor.RED + "FUCKOFF, and get your shit together!");
+                player.kickPlayer(ChatColor.RED + "FUCKOFF, and get your shit together!");
             }
         }.runTaskLater(plugin, 20L * 3L);
 

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,7 +18,7 @@ public class Command_droptoggle extends TFM_Command
             return false;
         }
         TFM_Util.adminAction(sender.getName(),
-                ((TotalFreedomMod.autoEntityWipe = !args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled")
+                (TFM_ConfigEntry.AUTO_ENTITY_WIPE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled")
                 + " automatic entity wiping.", false);
         return true;
     }

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

@@ -0,0 +1,42 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Shortcut to enable/disable DisguiseCraft.", usage = "/<command>")
+public class Command_dtoggle extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        Plugin disguiseCraft = server.getPluginManager().getPlugin("DisguiseCraft");
+        if (disguiseCraft != null)
+        {
+            PluginManager pluginManager = plugin.getServer().getPluginManager();
+
+            boolean enabled = disguiseCraft.isEnabled();
+            if (enabled)
+            {
+                pluginManager.disablePlugin(disguiseCraft);
+            }
+            else
+            {
+                pluginManager.enablePlugin(disguiseCraft);
+            }
+
+            TFM_Util.adminAction(sender.getName(), (!enabled ? "Enabled" : "Disabled") + " DisguiseCraft.", true);
+        }
+        else
+        {
+            sender.sendMessage("DisguiseCraft is not installed on this server.");
+        }
+
+        return true;
+    }
+}

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -121,7 +122,7 @@ public class Command_enchant extends TFM_Command
                     playerMsg("Can't use this enchantment on held item.");
                 }
             }
-            else if (args[0].equalsIgnoreCase("remove"))
+            else if (TFM_Util.isRemoveCommand(args[0]))
             {
                 itemInHand.removeEnchantment(ench);
 

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

@@ -1,9 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]")
@@ -12,8 +16,8 @@ public class Command_expel extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        double radius = 15.0;
-        double strength = 20.0;
+        double radius = 20.0;
+        double strength = 5.0;
 
         if (args.length >= 1)
         {
@@ -21,7 +25,7 @@ public class Command_expel extends TFM_Command
             {
                 radius = Math.max(1.0, Math.min(100.0, Double.parseDouble(args[0])));
             }
-            catch (NumberFormatException nfex)
+            catch (NumberFormatException ex)
             {
             }
         }
@@ -32,33 +36,50 @@ public class Command_expel extends TFM_Command
             {
                 strength = Math.max(0.0, Math.min(50.0, Double.parseDouble(args[1])));
             }
-            catch (NumberFormatException nfex)
+            catch (NumberFormatException ex)
             {
             }
         }
 
-        Location sender_pos = sender_p.getLocation();
-        for (Player p : sender_pos.getWorld().getPlayers())
+        List<String> pushedPlayers = new ArrayList<String>();
+
+        final Vector senderPos = sender_p.getLocation().toVector();
+        final List<Player> players = sender_p.getWorld().getPlayers();
+        for (final Player player : players)
         {
-            if (!p.equals(sender_p))
+            if (player.equals(sender_p))
             {
-                Location target_pos = p.getLocation();
-
-                boolean in_range = false;
-                try
-                {
-                    in_range = target_pos.distanceSquared(sender_pos) < (radius * radius);
-                }
-                catch (IllegalArgumentException ex)
-                {
-                }
-
-                if (in_range)
-                {
-                    p.setVelocity(target_pos.clone().subtract(sender_pos).toVector().normalize().multiply(strength));
-                    playerMsg("Pushing " + p.getName() + ".");
-                }
+                continue;
             }
+
+            final Location targetPos = player.getLocation();
+            final Vector targetPosVec = targetPos.toVector();
+
+            boolean inRange = false;
+            try
+            {
+                inRange = targetPosVec.distanceSquared(senderPos) < (radius * radius);
+            }
+            catch (IllegalArgumentException ex)
+            {
+            }
+
+            if (inRange)
+            {
+                player.getWorld().createExplosion(targetPos, 0.0f, false);
+                player.setFlying(false);
+                player.setVelocity(targetPosVec.subtract(senderPos).normalize().multiply(strength));
+                pushedPlayers.add(player.getName());
+            }
+        }
+
+        if (pushedPlayers.isEmpty())
+        {
+            playerMsg("No players pushed.");
+        }
+        else
+        {
+            playerMsg("Pushed " + pushedPlayers.size() + " players: " + StringUtils.join(pushedPlayers, ", "));
         }
 
         return true;

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -22,7 +22,7 @@ public class Command_explosives extends TFM_Command
         {
             try
             {
-                TotalFreedomMod.explosiveRadius = Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1])));
+                TFM_ConfigEntry.EXPLOSIVE_RADIUS.setDouble(Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1]))));
             }
             catch (NumberFormatException nfex)
             {
@@ -33,12 +33,12 @@ public class Command_explosives extends TFM_Command
 
         if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.allowExplosions = true;
-            playerMsg("Explosives are now enabled, radius set to " + TotalFreedomMod.explosiveRadius + " blocks.");
+            TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
+            playerMsg("Explosives are now enabled, radius set to " + TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble() + " blocks.");
         }
         else
         {
-            TotalFreedomMod.allowExplosions = false;
+            TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(false);
             playerMsg("Explosives are now disabled.");
         }
 

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

@@ -0,0 +1,37 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Shows all IPs registered to a player", usage = "/<command> <player>")
+public class Command_findip extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        final Player player;
+        try
+        {
+            player = getPlayer(args[0]);
+        }
+        catch (PlayerNotFoundException ex)
+        {
+            playerMsg(ex.getMessage());
+            return true;
+        }
+
+        playerMsg("Player IPs: " + StringUtils.join(TFM_UserList.getInstance(TotalFreedomMod.plugin).getEntry(player).getIpAddresses(), ", "));
+
+        return true;
+    }
+}

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,12 +19,12 @@ public class Command_fireplace extends TFM_Command
 
         if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.allowFirePlace = true;
+            TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
             playerMsg("Fire placement is now enabled.");
         }
         else
         {
-            TotalFreedomMod.allowFirePlace = false;
+            TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(false);
             playerMsg("Fire placement is now disabled.");
         }
 

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,9 +18,13 @@ public class Command_firespread extends TFM_Command
             return false;
         }
 
-        playerMsg("Fire spread is now " + ((TotalFreedomMod.allowFireSpread = !args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
+        boolean fireSpread = !args[0].equalsIgnoreCase("off");
 
-        TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, TotalFreedomMod.allowFireSpread);
+        TFM_ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(fireSpread);
+
+        playerMsg("Fire spread is now " + (fireSpread ? "enabled" : "disabled") + ".");
+
+        TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, fireSpread);
 
         return true;
     }

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

@@ -1,21 +1,21 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Flatlands;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Goto the flatlands.", usage = "/<command>")
 public class Command_flatlands extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (TotalFreedomMod.generateFlatlands)
+        if (TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean())
         {
-            TFM_Util.gotoWorld(sender, "flatlands");
+            TFM_Flatlands.getInstance().sendToWorld(sender_p);
         }
         else
         {

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,16 +17,7 @@ public class Command_fluidspread extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowFliudSpread = true;
-            playerMsg("Lava and water spread is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowFliudSpread = false;
-            playerMsg("Lava and water spread is now disabled.");
-        }
+        playerMsg("Lava and water spread is now " + (TFM_ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
 
         return true;
     }

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

@@ -62,9 +62,9 @@ public class Command_fr extends TFM_Command
                     TotalFreedomMod.freezePurgeTask.cancel();
                 }
 
-                for (Player p : server.getOnlinePlayers())
+                for (Player player : server.getOnlinePlayers())
                 {
-                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.setFrozen(false);
                 }
 
@@ -72,22 +72,22 @@ public class Command_fr extends TFM_Command
             }
             else
             {
-                Player p;
+                Player player;
                 try
                 {
-                    p = getPlayer(args[0]);
+                    player = getPlayer(args[0]);
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                     playerMsg(ex.getMessage(), ChatColor.RED);
                     return true;
                 }
 
-                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
                 playerdata.setFrozen(!playerdata.isFrozen());
 
-                playerMsg(p.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
-                playerMsg(p, "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".", ChatColor.AQUA);
+                playerMsg(player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                playerMsg(player, "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".", ChatColor.AQUA);
             }
         }
 

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

@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(
         description = "Use admin commands on someone by hash. Use mode 'list' to get a player's hash. Other modes are kick, nameban, ipban, ban, op, deop, ci",
-        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci> <targethash>] ]")
+        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr> <targethash>] ]")
 public class Command_gadmin extends TFM_Command
 {
     @Override
@@ -30,77 +30,77 @@ public class Command_gadmin extends TFM_Command
             playerMsg("[ Real Name ] : [ Display Name ] - Hash:");
         }
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            String hash = p.getUniqueId().toString().substring(0, 4);
+            String hash = player.getUniqueId().toString().substring(0, 4);
             if (mode.equals("list"))
             {
                 sender.sendMessage(ChatColor.GRAY + String.format("[ %s ] : [ %s ] - %s",
-                        p.getName(),
-                        ChatColor.stripColor(p.getDisplayName()),
+                        player.getName(),
+                        ChatColor.stripColor(player.getDisplayName()),
                         hash));
             }
             else if (hash.equalsIgnoreCase(args[1]))
             {
                 if (mode.equals("kick"))
                 {
-                    TFM_Util.adminAction(sender.getName(), String.format("Kicking: %s.", p.getName()), false);
-                    p.kickPlayer("Kicked by Administrator");
+                    TFM_Util.adminAction(sender.getName(), String.format("Kicking: %s.", player.getName()), false);
+                    player.kickPlayer("Kicked by Administrator");
                 }
                 else if (mode.equals("nameban"))
                 {
-                    TFM_ServerInterface.banUsername(p.getName(), null, null, null);
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s.", p.getName()), true);
-                    p.kickPlayer("Username banned by Administrator.");
+                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    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 = p.getAddress().getAddress().getHostAddress();
+                    String user_ip = player.getAddress().getAddress().getHostAddress();
                     String[] ip_parts = user_ip.split("\\.");
                     if (ip_parts.length == 4)
                     {
                         user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                     }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", p.getName(), user_ip), true);
+                    TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", player.getName(), user_ip), true);
                     TFM_ServerInterface.banIP(user_ip, null, null, null);
-                    p.kickPlayer("IP address banned by Administrator.");
+                    player.kickPlayer("IP address banned by Administrator.");
                 }
                 else if (mode.equals("ban"))
                 {
-                    String user_ip = p.getAddress().getAddress().getHostAddress();
+                    String user_ip = player.getAddress().getAddress().getHostAddress();
                     String[] ip_parts = user_ip.split("\\.");
                     if (ip_parts.length == 4)
                     {
                         user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                     }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", p.getName(), user_ip), true);
+                    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(p.getName(), null, null, null);
-                    p.kickPlayer("IP and username banned by Administrator.");
+                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    player.kickPlayer("IP and username banned by Administrator.");
                 }
                 else if (mode.equals("op"))
                 {
-                    TFM_Util.adminAction(sender.getName(), String.format("Opping %s.", p.getName()), false);
-                    p.setOp(false);
-                    p.sendMessage(TotalFreedomMod.YOU_ARE_OP);
+                    TFM_Util.adminAction(sender.getName(), String.format("Opping %s.", player.getName()), false);
+                    player.setOp(false);
+                    player.sendMessage(TotalFreedomMod.YOU_ARE_OP);
                 }
                 else if (mode.equals("deop"))
                 {
-                    TFM_Util.adminAction(sender.getName(), String.format("Deopping %s.", p.getName()), false);
-                    p.setOp(false);
-                    p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+                    TFM_Util.adminAction(sender.getName(), String.format("Deopping %s.", player.getName()), false);
+                    player.setOp(false);
+                    player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
                 }
                 else if (mode.equals("ci"))
                 {
-                    p.getInventory().clear();
+                    player.getInventory().clear();
                 }
                 else if (mode.equals("fr"))
                 {
-                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.setFrozen(!playerdata.isFrozen());
 
-                    playerMsg(p.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
-                    p.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                    playerMsg(player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                    player.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
                 }
 
                 return true;

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

@@ -17,12 +17,12 @@ public class Command_gcmd extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             sender.sendMessage(ex.getMessage());
             return true;
@@ -46,8 +46,8 @@ public class Command_gcmd extends TFM_Command
 
         try
         {
-            playerMsg("Sending command as " + p.getName() + ": " + outcommand);
-            if (server.dispatchCommand(p, outcommand))
+            playerMsg("Sending command as " + player.getName() + ": " + outcommand);
+            if (server.dispatchCommand(player, outcommand))
             {
                 playerMsg("Command sent.");
             }

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

@@ -7,7 +7,7 @@ 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_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -51,12 +51,12 @@ public class Command_glist extends TFM_Command
 
             try
             {
-                Player p = getPlayer(args[1]);
+                Player player = getPlayer(args[1]);
 
-                username = p.getName();
-                ip_addresses.add(p.getAddress().getAddress().getHostAddress());
+                username = player.getName();
+                ip_addresses.add(player.getAddress().getAddress().getHostAddress());
             }
-            catch (CantFindPlayerException ex)
+            catch (PlayerNotFoundException ex)
             {
                 TFM_UserListEntry entry = TFM_UserList.getInstance(plugin).getEntry(args[1]);
 
@@ -75,11 +75,11 @@ public class Command_glist extends TFM_Command
             {
                 TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true);
 
-                Player p = server.getPlayerExact(username);
-                if (p != null)
+                Player player = server.getPlayerExact(username);
+                if (player != null)
                 {
-                    TFM_ServerInterface.banUsername(p.getName(), null, null, null);
-                    p.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: http://www.totalfreedom.boards.net");
+                    TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+                    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
                 {

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

@@ -4,8 +4,8 @@ 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 org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -25,12 +25,12 @@ public class Command_gtfo extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
@@ -42,49 +42,49 @@ public class Command_gtfo extends TFM_Command
             ban_reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         }
 
-        TFM_Util.bcastMsg(p.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED);
+        TFM_Util.bcastMsg(player.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED);
 
         // Undo WorldEdits:
-        TFM_WorldEditBridge.getInstance().undo(p, 15);
+        TFM_WorldEditBridge.getInstance().undo(player, 15);
 
         // rollback
-        TFM_RollbackManager.rollback(p.getName());
+        TFM_RollbackManager.rollback(player.getName());
 
         // deop
-        p.setOp(false);
+        player.setOp(false);
 
         // set gamemode to survival:
-        p.setGameMode(GameMode.SURVIVAL);
+        player.setGameMode(GameMode.SURVIVAL);
 
         // clear inventory:
-        p.getInventory().clear();
+        player.getInventory().clear();
 
         // strike with lightning effect:
-        final Location target_pos = p.getLocation();
+        final Location targetPos = player.getLocation();
         for (int x = -1; x <= 1; x++)
         {
             for (int z = -1; z <= 1; z++)
             {
-                final Location strike_pos = new Location(target_pos.getWorld(), target_pos.getBlockX() + x, target_pos.getBlockY(), target_pos.getBlockZ() + z);
-                target_pos.getWorld().strikeLightning(strike_pos);
+                final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                targetPos.getWorld().strikeLightning(strike_pos);
             }
         }
 
         // ban IP address:
-        String user_ip = p.getAddress().getAddress().getHostAddress();
+        String user_ip = player.getAddress().getAddress().getHostAddress();
         String[] ip_parts = user_ip.split("\\.");
         if (ip_parts.length == 4)
         {
             user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
         }
-        TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", p.getName(), user_ip), ChatColor.RED);
+        TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", player.getName(), user_ip), ChatColor.RED);
         TFM_ServerInterface.banIP(user_ip, ban_reason, null, null);
 
         // ban username:
-        TFM_ServerInterface.banUsername(p.getName(), ban_reason, null, null);
+        TFM_ServerInterface.banUsername(player.getName(), ban_reason, null, null);
 
         // kick Player:
-        p.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : ""));
+        player.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : ""));
 
         return true;
     }

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

@@ -23,11 +23,11 @@ public class Command_halt extends TFM_Command
         {
             TFM_Util.adminAction(sender.getName(), "Halting all non-superadmins.", true);
             int counter = 0;
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
+                if (!TFM_SuperadminList.isUserSuperadmin(player))
                 {
-                    TFM_PlayerData.getPlayerData(p).setHalted(true);
+                    TFM_PlayerData.getPlayerData(player).setHalted(true);
                     counter++;
                 }
             }
@@ -39,10 +39,10 @@ public class Command_halt extends TFM_Command
         {
             TFM_Util.adminAction(sender.getName(), "Unhalting all players.", true);
             int counter = 0;
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
-                if (TFM_PlayerData.getPlayerData(p).isHalted())
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                if (TFM_PlayerData.getPlayerData(player).isHalted())
                 {
                     playerdata.setHalted(false);
                     counter++;
@@ -76,28 +76,28 @@ public class Command_halt extends TFM_Command
             return true;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             sender.sendMessage(ex.getMessage());
             return true;
         }
 
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
         if (!playerdata.isHalted())
         {
-            TFM_Util.adminAction(sender.getName(), "Halting " + p.getName(), true);
+            TFM_Util.adminAction(sender.getName(), "Halting " + player.getName(), true);
             playerdata.setHalted(true);
             return true;
         }
         else
         {
-            TFM_Util.adminAction(sender.getName(), "Unhalting " + p.getName(), true);
+            TFM_Util.adminAction(sender.getName(), "Unhalting " + player.getName(), true);
             playerdata.setHalted(false);
             return true;
         }

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

@@ -1,62 +1,100 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.text.DecimalFormat;
+import java.util.concurrent.atomic.AtomicInteger;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_TickMeter;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang.math.DoubleRange;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "View ticks-per-second", usage = "/<command>")
 public class Command_health extends TFM_Command
 {
+    private static final int BYTES_PER_MB = 1024 * 1024;
+    private static final DoubleRange TPS_RANGE = new DoubleRange(20.0 - 0.1, 20.0 + 0.1);
+
     @Override
     public boolean run(final CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        Runtime runtime = Runtime.getRuntime();
+        long usedMem = runtime.totalMemory() - runtime.freeMemory();
+
+        playerMsg("Reserved Memory: " + (double) runtime.totalMemory() / (double) BYTES_PER_MB + "mb");
+        playerMsg("Used Memory: " + new DecimalFormat("#").format((double) usedMem / (double) BYTES_PER_MB) + "mb (" + new DecimalFormat("#").format(((double) usedMem / (double) runtime.totalMemory()) * 100.0) + "%)");
+        playerMsg("Max Memory: " + (double) runtime.maxMemory() / (double) BYTES_PER_MB + "mb");
+        playerMsg("Calculating ticks per second, please wait...");
 
         new BukkitRunnable()
         {
-
             @Override
             public void run()
             {
                 try
                 {
-                    final TFM_TickMeter meter = new TFM_TickMeter(plugin);
-                    meter.startTicking();
-                    Thread.sleep(1000);  // per second
-                    meter.stopTicking();
-
-                    final Runtime runtime = Runtime.getRuntime();
-                    final int mb = 1048576;  // 1024 * 1024
-
-                    final float usedMem = runtime.totalMemory() - runtime.freeMemory();
+                    TFM_TickMeter tickMeter = new TFM_TickMeter(plugin);
+                    tickMeter.startTicking();
+                    Thread.sleep(2500);
+                    final double ticksPerSecond = tickMeter.stopTicking();
 
                     new BukkitRunnable()
                     {
                         @Override
-                        public void run() {
-                            playerMsg("Reserved Memory: " + runtime.totalMemory() / mb + "mb");
-                            playerMsg("Used Memory: " + new DecimalFormat("#").format(usedMem / mb) + "mb (" + new DecimalFormat("#").format((usedMem / runtime.totalMemory()) * 100) + "%)");
-                            playerMsg("Max Memory: " + runtime.maxMemory() / mb + "mb");
-                            playerMsg("Ticks per second: " + (meter.getTicks() == 20 ? ChatColor.GREEN : ChatColor.RED) + meter.getTicks());
+                        public void run()
+                        {
+                            playerMsg("Ticks per second: " + (TPS_RANGE.containsDouble(ticksPerSecond) ? ChatColor.GREEN : ChatColor.RED) + ticksPerSecond);
                         }
-                    }.runTask(TotalFreedomMod.plugin);
+                    }.runTask(plugin);
                 }
-                catch (Exception iex)
+                catch (Exception ex)
                 {
-                    TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
-                    TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
+                    TFM_Log.severe(ex);
                 }
             }
-        
-        }.runTaskAsynchronously(TotalFreedomMod.plugin);
+        }.runTaskAsynchronously(plugin);
 
         return true;
     }
+
+    private class TFM_TickMeter
+    {
+        private final AtomicInteger ticks = new AtomicInteger();
+        private final TotalFreedomMod plugin;
+        private long startTime;
+        private BukkitTask task;
+
+        public TFM_TickMeter(TotalFreedomMod plugin)
+        {
+            this.plugin = plugin;
+        }
+
+        public void startTicking()
+        {
+            startTime = System.currentTimeMillis();
+            ticks.set(0);
+
+            task = new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    ticks.incrementAndGet();
+                }
+            }.runTaskTimer(plugin, 0L, 1L);
+        }
+
+        public double stopTicking()
+        {
+            task.cancel();
+            long elapsed = System.currentTimeMillis() - startTime;
+            int tickCount = ticks.get();
+
+            return (double) tickCount / ((double) elapsed / 1000.0);
+        }
+    }
 }

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

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -33,14 +33,14 @@ public class Command_invis extends TFM_Command
         List<String> players = new ArrayList<String>();
         int smites = 0;
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            if (p.hasPotionEffect(PotionEffectType.INVISIBILITY))
+            if (player.hasPotionEffect(PotionEffectType.INVISIBILITY))
             {
-                players.add(p.getName());
-                if (smite && !TFM_SuperadminList.isUserSuperadmin(p))
+                players.add(player.getName());
+                if (smite && !TFM_SuperadminList.isUserSuperadmin(player))
                 {
-                    Command_smite.smite(p);
+                    Command_smite.smite(player);
                     smites++;
                 }
             }

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

@@ -0,0 +1,94 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Jumppads;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info |sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp")
+public class Command_jumppads 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].equalsIgnoreCase("info"))
+            {
+                playerMsg("Jumppads: " + (TFM_Jumppads.getInstance().getMode().isOn() ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg("Sideways: " + (TFM_Jumppads.getInstance().getMode() == TFM_Jumppads.JumpPadMode.NORMAL_AND_SIDEWAYS ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg("Strength: " + (TFM_Jumppads.getInstance().getStrength() * 10 - 1), ChatColor.BLUE);
+                return true;
+            }
+
+            if (TFM_Util.isStopCommand(args[0]))
+            {
+                TFM_Util.adminAction(sender.getName(), "Disabling Jumppads", false);
+                TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.OFF);
+            }
+            else
+            {
+                TFM_Util.adminAction(sender.getName(), "Enabling Jumppads", false);
+                TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.MADGEEK);
+            }
+        }
+        else
+        {
+            if (TFM_Jumppads.getInstance().getMode() == TFM_Jumppads.JumpPadMode.OFF)
+            {
+                playerMsg("Jumppads are currently disabled, please enable them before changing jumppads settings.");
+                return true;
+            }
+
+            if (args[0].equalsIgnoreCase("sideways"))
+            {
+                if (TFM_Util.isStopCommand(args[1]))
+                {
+                    TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Madgeek", false);
+                    TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.MADGEEK);
+                }
+                else
+                {
+                    TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Normal and Sideways", false);
+                    TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.NORMAL_AND_SIDEWAYS);
+                }
+            }
+            else if (args[0].equalsIgnoreCase("strength"))
+            {
+                final float strength;
+                try
+                {
+                    strength = Float.parseFloat(args[1]);
+                }
+                catch (NumberFormatException ex)
+                {
+                    playerMsg("Invalid Strength");
+                    return true;
+                }
+
+                if (strength > 10 || strength < 1)
+                {
+                    playerMsg("Invalid Strength: The strength may be 1 through 10.");
+                    return true;
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Setting Jumppads strength to: " + String.valueOf(strength), false);
+                TFM_Jumppads.getInstance().setStrength((strength / 10) + 0.1F);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,11 +16,11 @@ public class Command_kicknoob extends TFM_Command
     {
         TFM_Util.adminAction(sender.getName(), "Disconnecting all non-superadmins.", true);
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
+            if (!TFM_SuperadminList.isUserSuperadmin(player))
             {
-                p.kickPlayer(ChatColor.RED + "Disconnected by admin.");
+                player.kickPlayer(ChatColor.RED + "Disconnected by admin.");
             }
         }
 

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

@@ -1,8 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_LandmineData;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import java.util.ArrayList;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -17,11 +19,11 @@ public class Command_landmine extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TotalFreedomMod.landminesEnabled)
+        if (!TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean())
         {
             playerMsg("The landmine is currently disabled.", ChatColor.GREEN);
         }
-        else if (!TotalFreedomMod.allowExplosions)
+        else if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             playerMsg("Explosions are currently disabled.", ChatColor.GREEN);
         }
@@ -48,4 +50,20 @@ public class Command_landmine extends TFM_Command
 
         return true;
     }
+
+    public static class TFM_LandmineData
+    {
+        public static List<TFM_LandmineData> landmines = new ArrayList<TFM_LandmineData>();
+        public Location location;
+        public Player player;
+        public double radius;
+
+        public TFM_LandmineData(Location landmine_pos, Player player, double radius)
+        {
+            super();
+            this.location = landmine_pos;
+            this.player = player;
+            this.radius = radius;
+        }
+    }
 }

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

@@ -18,18 +18,18 @@ public class Command_lastcmd extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         if (playerdata != null)
         {
@@ -38,7 +38,7 @@ public class Command_lastcmd extends TFM_Command
             {
                 last_command = "(none)";
             }
-            playerMsg(p.getName() + " - Last Command: " + last_command, ChatColor.GRAY);
+            playerMsg(player.getName() + " - Last Command: " + last_command, ChatColor.GRAY);
         }
 
         return true;

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,16 +17,7 @@ public class Command_lavadmg extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowLavaDamage = true;
-            playerMsg("Lava damage is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowLavaDamage = false;
-            playerMsg("Lava damage is now disabled.");
-        }
+        playerMsg("Lava damage is now " + (TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
 
         return true;
     }

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,16 +17,7 @@ public class Command_lavaplace extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowLavaPlace = true;
-            playerMsg("Lava placement is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowLavaPlace = false;
-            playerMsg("Lava placement is now disabled.");
-        }
+        playerMsg("Lava placement is now " + (TFM_ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
 
         return true;
     }

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

@@ -2,9 +2,12 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -25,9 +28,9 @@ public class Command_list extends TFM_Command
         if (TFM_Util.isFromHostConsole(sender.getName()))
         {
             List<String> player_names = new ArrayList<String>();
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                player_names.add(p.getName());
+                player_names.add(player.getName());
             }
             playerMsg("There are " + player_names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(player_names, ", "), ChatColor.WHITE);
             return true;
@@ -50,9 +53,9 @@ public class Command_list extends TFM_Command
         onlineStats.append(ChatColor.BLUE).append(" players online.");
 
         List<String> player_names = new ArrayList<String>();
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(p);
+            boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(player);
 
             if (listFilter == ListFilter.SHOW_ADMINS && !userSuperadmin)
             {
@@ -63,34 +66,39 @@ public class Command_list extends TFM_Command
 
             if (userSuperadmin)
             {
-                if (TFM_SuperadminList.isSeniorAdmin(p))
+                TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry(player.getName());
+                if (!entry.isSeniorAdmin() && entry.isTelnetAdmin())
+                {
+                    prefix = (ChatColor.DARK_GREEN + "[STA]");
+                }
+                else if (TFM_SuperadminList.isSeniorAdmin(player))
                 {
                     prefix = (ChatColor.LIGHT_PURPLE + "[SrA]");
                 }
-                else
+                else if (TFM_SuperadminList.isUserSuperadmin(player))
                 {
                     prefix = (ChatColor.GOLD + "[SA]");
                 }
 
-                if (TFM_Util.DEVELOPERS.contains(p.getName()))
+                if (TFM_Util.DEVELOPERS.contains(player.getName()))
                 {
                     prefix = (ChatColor.DARK_PURPLE + "[Dev]");
                 }
 
-                if (p.getName().equals("markbyron"))
+                if (player.getName().equals("markbyron"))
                 {
                     prefix = (ChatColor.BLUE + "[Owner]");
                 }
             }
             else
             {
-                if (p.isOp())
+                if (player.isOp())
                 {
                     prefix = (ChatColor.RED + "[OP]");
                 }
             }
 
-            player_names.add(prefix + p.getName() + ChatColor.WHITE);
+            player_names.add(prefix + player.getName() + ChatColor.WHITE);
         }
 
         onlineUsers.append("Connected ").append(listFilter == ListFilter.SHOW_ADMINS ? "admins" : "players").append(": ").append(StringUtils.join(player_names, ", "));

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

@@ -0,0 +1,18 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Teleport to the spawn point for the current world.", usage = "/<command>", aliases = "worldspawn,gotospawn")
+public class Command_localspawn extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        sender_p.teleport(sender_p.getWorld().getSpawnLocation());
+        playerMsg("Teleported to spawnpoint for world \"" + sender_p.getWorld().getName() + "\".");
+        return true;
+    }
+}

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

@@ -0,0 +1,34 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Prevents new players from joining the server", usage = "/<command> <on | off>")
+public class Command_lockdown extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        if (TFM_Util.isStopCommand(args[0]))
+        {
+            TFM_Util.adminAction(sender.getName(), "De-activating server lockdown", true);
+            TotalFreedomMod.lockdownEnabled = false;
+        }
+        else
+        {
+            TFM_Util.adminAction(sender.getName(), "Activating server lockdown", true);
+            TotalFreedomMod.lockdownEnabled = true;
+        }
+
+        return true;
+    }
+}

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

@@ -21,18 +21,18 @@ public class Command_lockup extends TFM_Command
             {
                 TFM_Util.adminAction(sender.getName(), "Locking up all players", true);
 
-                for (Player p : server.getOnlinePlayers())
+                for (Player player : server.getOnlinePlayers())
                 {
-                    startLockup(p);
+                    startLockup(player);
                 }
                 playerMsg("Locked up all players.");
             }
             else if (args[0].equalsIgnoreCase("purge"))
             {
                 TFM_Util.adminAction(sender.getName(), "Unlocking all players", true);
-                for (Player p : server.getOnlinePlayers())
+                for (Player player : server.getOnlinePlayers())
                 {
-                    cancelLockup(p);
+                    cancelLockup(player);
                 }
 
                 playerMsg("Unlocked all players.");
@@ -46,37 +46,37 @@ public class Command_lockup extends TFM_Command
         {
             if (args[1].equalsIgnoreCase("on"))
             {
-                final Player p;
+                final Player player;
                 try
                 {
-                    p = getPlayer(args[0]);
+                    player = getPlayer(args[0]);
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                     sender.sendMessage(ex.getMessage());
                     return true;
                 }
 
-                TFM_Util.adminAction(sender.getName(), "Locking up " + p.getName(), true);
-                startLockup(p);
-                playerMsg("Locked up " + p.getName() + ".");
+                TFM_Util.adminAction(sender.getName(), "Locking up " + player.getName(), true);
+                startLockup(player);
+                playerMsg("Locked up " + player.getName() + ".");
             }
             else if (TFM_Util.isStopCommand(args[1]))
             {
-                final Player p;
+                final Player player;
                 try
                 {
-                    p = getPlayer(args[0]);
+                    player = getPlayer(args[0]);
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                     sender.sendMessage(ex.getMessage());
                     return true;
                 }
 
-                TFM_Util.adminAction(sender.getName(), "Unlocking " + p.getName(), true);
-                cancelLockup(p);
-                playerMsg("Unlocked " + p.getName() + ".");
+                TFM_Util.adminAction(sender.getName(), "Unlocking " + player.getName(), true);
+                cancelLockup(player);
+                playerMsg("Unlocked " + player.getName() + ".");
             }
             else
             {
@@ -101,14 +101,14 @@ public class Command_lockup extends TFM_Command
         }
     }
 
-    private void cancelLockup(final Player p)
+    private void cancelLockup(final Player player)
     {
-        cancelLockup(TFM_PlayerData.getPlayerData(p));
+        cancelLockup(TFM_PlayerData.getPlayerData(player));
     }
 
-    private void startLockup(final Player p)
+    private void startLockup(final Player player)
     {
-        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         cancelLockup(playerdata);
 
@@ -117,9 +117,9 @@ public class Command_lockup extends TFM_Command
             @Override
             public void run()
             {
-                if (p.isOnline())
+                if (player.isOnline())
                 {
-                    p.openInventory(p.getInventory());
+                    player.openInventory(player.getInventory());
                 }
                 else
                 {

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

@@ -9,6 +9,7 @@ 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.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
@@ -46,12 +47,10 @@ public class Command_logs extends TFM_Command
 
     public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode)
     {
-        if (TotalFreedomMod.logsRegisterURL == null || TotalFreedomMod.logsRegisterPassword == null)
-        {
-            return;
-        }
+        final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString();
+        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString();
 
-        if (TotalFreedomMod.logsRegisterPassword.isEmpty() || TotalFreedomMod.logsRegisterURL.isEmpty())
+        if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
         {
             return;
         }
@@ -68,9 +67,9 @@ public class Command_logs extends TFM_Command
                         sender.sendMessage(ChatColor.YELLOW + "Connecting...");
                     }
 
-                    URL url = new URLBuilder(TotalFreedomMod.logsRegisterURL)
+                    URL url = new URLBuilder(logsRegisterURL)
                             .addQueryParameter("mode", mode.toString())
-                            .addQueryParameter("password", TotalFreedomMod.logsRegisterPassword)
+                            .addQueryParameter("password", logsRegisterPassword)
                             .addQueryParameter("name", targetName)
                             .addQueryParameter("ip", targetIP)
                             .getURL();

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -20,27 +20,27 @@ public class Command_moblimiter extends TFM_Command
 
         if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.mobLimiterEnabled = true;
+            TFM_ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(true);
         }
         else if (args[0].equalsIgnoreCase("off"))
         {
-            TotalFreedomMod.mobLimiterEnabled = false;
+            TFM_ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(false);
         }
         else if (args[0].equalsIgnoreCase("dragon"))
         {
-            TotalFreedomMod.mobLimiterDisableDragon = !TotalFreedomMod.mobLimiterDisableDragon;
+            TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean());
         }
         else if (args[0].equalsIgnoreCase("giant"))
         {
-            TotalFreedomMod.mobLimiterDisableGiant = !TotalFreedomMod.mobLimiterDisableGiant;
+            TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean());
         }
         else if (args[0].equalsIgnoreCase("slime"))
         {
-            TotalFreedomMod.mobLimiterDisableSlime = !TotalFreedomMod.mobLimiterDisableSlime;
+            TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean());
         }
         else if (args[0].equalsIgnoreCase("ghast"))
         {
-            TotalFreedomMod.mobLimiterDisableGhast = !TotalFreedomMod.mobLimiterDisableGhast;
+            TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.setBoolean(!TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean());
         }
         else
         {
@@ -53,7 +53,7 @@ public class Command_moblimiter extends TFM_Command
             {
                 try
                 {
-                    TotalFreedomMod.mobLimiterMax = Math.max(0, Math.min(2000, Integer.parseInt(args[1])));
+                    TFM_ConfigEntry.MOB_LIMITER_MAX.setInteger(Math.max(0, Math.min(2000, Integer.parseInt(args[1]))));
                 }
                 catch (NumberFormatException nfex)
                 {
@@ -61,21 +61,21 @@ public class Command_moblimiter extends TFM_Command
             }
         }
 
-        if (TotalFreedomMod.mobLimiterEnabled)
+        if (TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean())
         {
-            sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + TotalFreedomMod.mobLimiterMax + ".");
+            sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + TFM_ConfigEntry.MOB_LIMITER_MAX.getInteger() + ".");
 
-            playerMsg("Dragon: " + (TotalFreedomMod.mobLimiterDisableDragon ? "disabled" : "enabled") + ".");
-            playerMsg("Giant: " + (TotalFreedomMod.mobLimiterDisableGiant ? "disabled" : "enabled") + ".");
-            playerMsg("Slime: " + (TotalFreedomMod.mobLimiterDisableSlime ? "disabled" : "enabled") + ".");
-            playerMsg("Ghast: " + (TotalFreedomMod.mobLimiterDisableGhast ? "disabled" : "enabled") + ".");
+            playerMsg("Dragon: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg("Giant: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg("Slime: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg("Ghast: " + (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + ".");
         }
         else
         {
             playerMsg("Moblimiter is disabled. No mob restrictions are in effect.");
         }
 
-        TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !TotalFreedomMod.mobLimiterEnabled);
+        TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean());
 
         return true;
     }

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
@@ -16,7 +16,7 @@ public class Command_mp44 extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TotalFreedomMod.mp44Enabled)
+        if (!TFM_ConfigEntry.MP44_ENABLED.getBoolean())
         {
             playerMsg("The mp44 is currently disabled.", ChatColor.GREEN);
             return true;

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

@@ -0,0 +1,125 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
+@CommandParameters(description = "NickFilter: Prefix any command with this command to replace nicknames in that command with real names. Nicknames should be prefixed with a !.", usage = "/<command> <other_command> !<playernick>")
+public class Command_nf extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        boolean nickMatched = false;
+
+        final List<String> outputCommand = new ArrayList<String>();
+
+        if (args.length >= 1)
+        {
+            final List<String> argsList = Arrays.asList(args);
+            for (String arg : argsList)
+            {
+                Player player = null;
+
+                Matcher matcher = Pattern.compile("^!(.+)$").matcher(arg);
+                if (matcher.find())
+                {
+                    String displayName = matcher.group(1);
+                    try
+                    {
+                        player = getPlayerByDisplayName(displayName);
+                    }
+                    catch (PlayerNotFoundException ex)
+                    {
+                    }
+                    if (player == null)
+                    {
+                        try
+                        {
+                            player = getPlayerByDisplayNameAlt(displayName);
+                        }
+                        catch (PlayerNotFoundException ex)
+                        {
+                            sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName);
+                            return true;
+                        }
+                    }
+                }
+
+                if (player == null)
+                {
+                    outputCommand.add(arg);
+                }
+                else
+                {
+                    nickMatched = true;
+                    outputCommand.add(player.getName());
+                }
+            }
+        }
+
+        if (!nickMatched)
+        {
+            sender.sendMessage("No nicknames replaced in command.");
+            return true;
+        }
+
+        String newCommand = StringUtils.join(outputCommand, " ");
+        sender.sendMessage("Sending command: \"" + newCommand + "\".");
+        server.dispatchCommand(sender, newCommand);
+
+        return true;
+    }
+
+    private static Player getPlayerByDisplayName(String needle) throws PlayerNotFoundException
+    {
+        needle = needle.toLowerCase().trim();
+
+        Player[] onlinePlayers = Bukkit.getOnlinePlayers();
+        for (Player player : onlinePlayers)
+        {
+            if (player.getDisplayName().toLowerCase().trim().contains(needle))
+            {
+                return player;
+            }
+        }
+
+        throw new PlayerNotFoundException();
+    }
+
+    private static Player getPlayerByDisplayNameAlt(String needle) throws PlayerNotFoundException
+    {
+        needle = needle.toLowerCase().trim();
+
+        Integer minEditDistance = null;
+        Player minEditMatch = null;
+
+        Player[] onlinePlayers = Bukkit.getOnlinePlayers();
+        for (Player player : onlinePlayers)
+        {
+            String haystack = player.getDisplayName().toLowerCase().trim();
+            int editDistance = StringUtils.getLevenshteinDistance(needle, haystack.toLowerCase());
+            if (minEditDistance == null || minEditDistance.intValue() > editDistance)
+            {
+                minEditDistance = editDistance;
+                minEditMatch = player;
+            }
+        }
+
+        if (minEditMatch == null)
+        {
+            throw new PlayerNotFoundException();
+        }
+
+        return minEditMatch;
+    }
+}

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

@@ -0,0 +1,72 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Essentials Interface Command - Nyanify your nickname.", usage = "/<command> <<nick> | off>")
+public class Command_nicknyan extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        if (TFM_Util.isStopCommand(args[0]))
+        {
+            TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), null);
+            playerMsg("Nickname cleared.");
+            return true;
+        }
+
+        final String nickPlain = ChatColor.stripColor(TFM_Util.colorize(args[0].trim()));
+
+        if (!nickPlain.matches("^[a-zA-Z_0-9\u00a7]+$"))
+        {
+            playerMsg("That nickname contains invalid characters.");
+            return true;
+        }
+        else if (nickPlain.length() < 4 || nickPlain.length() > 30)
+        {
+            playerMsg("Your nickname must be between 4 and 30 characters long.");
+            return true;
+        }
+
+        final Player[] onlinePlayers = server.getOnlinePlayers();
+        for (final Player player : onlinePlayers)
+        {
+            if (player == sender_p)
+            {
+                continue;
+            }
+            if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain))
+            {
+                playerMsg("That nickname is already in use.");
+                return true;
+            }
+        }
+
+        final StringBuilder newNick = new StringBuilder();
+
+        final char[] chars = nickPlain.toCharArray();
+        for (char c : chars)
+        {
+            newNick.append(TFM_Util.randomChatColor()).append(c);
+        }
+
+        newNick.append(ChatColor.WHITE);
+
+        TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), newNick.toString());
+
+        playerMsg("Your nickname is now: " + newNick.toString());
+
+        return true;
+    }
+}

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,7 +21,7 @@ public class Command_nonuke extends TFM_Command
         {
             try
             {
-                TotalFreedomMod.nukeMonitorRange = Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1])));
+                TFM_ConfigEntry.NUKE_MONITOR_RANGE.setDouble(Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1]))));
             }
             catch (NumberFormatException nfex)
             {
@@ -32,7 +32,7 @@ public class Command_nonuke extends TFM_Command
         {
             try
             {
-                TotalFreedomMod.nukeMonitorCountBreak = Math.max(1, Math.min(500, Integer.parseInt(args[2])));
+                TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.setInteger(Math.max(1, Math.min(500, Integer.parseInt(args[2]))));
             }
             catch (NumberFormatException nfex)
             {
@@ -41,14 +41,14 @@ public class Command_nonuke extends TFM_Command
 
         if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.nukeMonitor = true;
+            TFM_ConfigEntry.NUKE_MONITOR.setBoolean(true);
             playerMsg("Nuke monitor is enabled.");
-            playerMsg("Anti-freecam range is set to " + TotalFreedomMod.nukeMonitorRange + " blocks.");
-            playerMsg("Block throttle rate is set to " + TotalFreedomMod.nukeMonitorCountBreak + " blocks destroyed per 5 seconds.");
+            playerMsg("Anti-freecam range is set to " + TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble() + " blocks.");
+            playerMsg("Block throttle rate is set to " + TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger() + " blocks destroyed per 5 seconds.");
         }
         else
         {
-            TotalFreedomMod.nukeMonitor = false;
+            TFM_ConfigEntry.NUKE_MONITOR.setBoolean(false);
             playerMsg("Nuke monitor is disabled.");
         }
 

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

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

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

@@ -2,13 +2,15 @@ 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_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 @CommandParameters(description = "Switch server online-mode on and off.", usage = "/<command> <on | off>")
 public class Command_onlinemode extends TFM_Command
 {
@@ -18,12 +20,18 @@ public class Command_onlinemode extends TFM_Command
         if (args.length < 1)
         {
             playerMsg("Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.WHITE);
-            playerMsg("Use \"/onlinemode on\" and \"/onlinemode off\" to change online mode.", ChatColor.WHITE);
+            playerMsg("\"/onlinemode on\" and \"/onlinemode off\" can be used to change online mode from the console.", ChatColor.WHITE);
         }
         else
         {
             boolean online_mode;
 
+            if (sender instanceof Player && !TFM_SuperadminList.isSeniorAdmin(sender, true))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
             if (args[0].equalsIgnoreCase("on"))
             {
                 online_mode = true;
@@ -43,9 +51,9 @@ public class Command_onlinemode extends TFM_Command
 
                 if (online_mode)
                 {
-                    for (Player p : server.getOnlinePlayers())
+                    for (Player player : server.getOnlinePlayers())
                     {
-                        p.kickPlayer("Server is activating \"online-mode=true\". Please reconnect.");
+                        player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect.");
                     }
                 }
 

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

@@ -26,21 +26,21 @@ public class Command_op extends TFM_Command
             return true;
         }
 
-        OfflinePlayer p = null;
+        OfflinePlayer player = null;
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
             if (args[0].equalsIgnoreCase(onlinePlayer.getName()))
             {
-                p = onlinePlayer;
+                player = onlinePlayer;
             }
         }
 
         // if the player is not online
-        if (p == null)
+        if (player == null)
         {
             if (TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
             {
-                p = server.getOfflinePlayer(args[0]);
+                player = server.getOfflinePlayer(args[0]);
             }
             else
             {
@@ -50,8 +50,8 @@ public class Command_op extends TFM_Command
             }
         }
 
-        TFM_Util.adminAction(sender.getName(), "Opping " + p.getName(), false);
-        p.setOp(true);
+        TFM_Util.adminAction(sender.getName(), "Opping " + player.getName(), false);
+        player.setOp(true);
 
         return true;
     }

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

@@ -32,14 +32,14 @@ public class Command_opall extends TFM_Command
             }
         }
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            p.setOp(true);
-            p.sendMessage(TotalFreedomMod.YOU_ARE_OP);
+            player.setOp(true);
+            player.sendMessage(TotalFreedomMod.YOU_ARE_OP);
 
             if (doSetGamemode)
             {
-                p.setGameMode(targetGamemode);
+                player.setGameMode(targetGamemode);
             }
         }
 

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

@@ -31,9 +31,9 @@ public class Command_ops extends TFM_Command
             int offlineOPs = 0;
             int totalOPs = 0;
 
-            for (OfflinePlayer p : server.getOperators())
+            for (OfflinePlayer player : server.getOperators())
             {
-                if (p.isOnline())
+                if (player.isOnline())
                 {
                     onlineOPs++;
                 }
@@ -61,13 +61,13 @@ public class Command_ops extends TFM_Command
 
             TFM_Util.adminAction(sender.getName(), "Removing all operators", true);
 
-            for (OfflinePlayer p : server.getOperators())
+            for (OfflinePlayer player : server.getOperators())
             {
-                p.setOp(false);
+                player.setOp(false);
 
-                if (p.isOnline())
+                if (player.isOnline())
                 {
-                    p.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+                    player.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
                 }
             }
 

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

@@ -21,18 +21,18 @@ public class Command_orbit extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         double strength = 10.0;
 
@@ -40,7 +40,7 @@ public class Command_orbit extends TFM_Command
         {
             if (TFM_Util.isStopCommand(args[1]))
             {
-                playerMsg("Stopped orbiting " + p.getName());
+                playerMsg("Stopped orbiting " + player.getName());
                 playerdata.stopOrbiting();
                 return true;
             }
@@ -56,11 +56,11 @@ public class Command_orbit extends TFM_Command
             }
         }
 
-        p.setGameMode(GameMode.SURVIVAL);
+        player.setGameMode(GameMode.SURVIVAL);
         playerdata.startOrbiting(strength);
 
-        p.setVelocity(new Vector(0, strength, 0));
-        TFM_Util.adminAction(sender.getName(), "Orbiting " + p.getName() + ".", false);
+        player.setVelocity(new Vector(0, strength, 0));
+        TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName() + ".", false);
 
         return true;
     }

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,11 +18,9 @@ public class Command_petprotect extends TFM_Command
             return false;
         }
 
-        TotalFreedomMod.petProtectEnabled = !TFM_Util.isStopCommand(args[0]);
-
         TFM_Util.adminAction(
                 sender.getName(),
-                "Tamed pet protection is now " + (TotalFreedomMod.petProtectEnabled ? "enabled" : "disabled") + ".",
+                "Tamed pet protection is now " + (TFM_ConfigEntry.PET_PROTECT_ENABLED.setBoolean(!TFM_Util.isStopCommand(args[0])) ? "enabled" : "disabled") + ".",
                 false);
 
         return true;

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -58,20 +58,20 @@ public class Command_plugincontrol extends TFM_Command
         else if (commandMode == CommandMode.RELOAD)
         {
             playerMsg("Disabling all plugins.");
-            for (Plugin p : pluginManager.getPlugins())
+            for (Plugin targetPlugin : pluginManager.getPlugins())
             {
-                if (!p.getName().toLowerCase().startsWith("totalfreedommod"))
+                if (!targetPlugin.getName().toLowerCase().startsWith("totalfreedommod"))
                 {
-                    pluginManager.disablePlugin(p);
+                    pluginManager.disablePlugin(targetPlugin);
                 }
             }
 
             playerMsg("Enabling all plugins.");
-            for (Plugin p : pluginManager.getPlugins())
+            for (Plugin targetPlugin : pluginManager.getPlugins())
             {
-                if (!p.getName().toLowerCase().startsWith("totalfreedommod"))
+                if (!targetPlugin.getName().toLowerCase().startsWith("totalfreedommod"))
                 {
-                    pluginManager.enablePlugin(p);
+                    pluginManager.enablePlugin(targetPlugin);
                 }
             }
         }
@@ -81,11 +81,11 @@ public class Command_plugincontrol extends TFM_Command
 
             Plugin targetPlugin = null;
 
-            for (Plugin p : pluginManager.getPlugins())
+            for (Plugin serverPlugin : pluginManager.getPlugins())
             {
-                if (searchPluginName.equalsIgnoreCase(p.getName().toLowerCase().trim()))
+                if (searchPluginName.equalsIgnoreCase(serverPlugin.getName().toLowerCase().trim()))
                 {
-                    targetPlugin = p;
+                    targetPlugin = serverPlugin;
                     break;
                 }
             }

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

@@ -5,7 +5,7 @@ import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -16,7 +16,7 @@ import org.bukkit.potion.PotionEffectType;
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 @CommandParameters(
         description = "Manipulate potion effects. Duration is measured in server ticks (~20 ticks per second).",
-        usage = "/<command> <list | clear [target_name] | add <type> <duration> <amplifier> [target_name]>")
+        usage = "/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>")
 public class Command_potion extends TFM_Command
 {
     @Override
@@ -62,7 +62,7 @@ public class Command_potion extends TFM_Command
                     {
                         target = getPlayer(args[1]);
                     }
-                    catch (CantFindPlayerException ex)
+                    catch (PlayerNotFoundException ex)
                     {
                         playerMsg(ex.getMessage(), ChatColor.RED);
                         return true;
@@ -107,7 +107,7 @@ public class Command_potion extends TFM_Command
                     {
                         target = getPlayer(args[4]);
                     }
-                    catch (CantFindPlayerException ex)
+                    catch (PlayerNotFoundException ex)
                     {
                         playerMsg(ex.getMessage(), ChatColor.RED);
                         return true;

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,12 +21,12 @@ public class Command_prelog extends TFM_Command
 
         if (args[0].equalsIgnoreCase("on"))
         {
-            TotalFreedomMod.preprocessLogEnabled = true;
+            TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(true);
             playerMsg("Command preprocess logging is now enabled. This will be spammy in the log.");
         }
         else
         {
-            TotalFreedomMod.preprocessLogEnabled = false;
+            TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(false);
             playerMsg("Command preprocess logging is now disabled.");
         }
 

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

@@ -0,0 +1,71 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Validates if a given account is premium.", usage = "/<command> <player>", aliases = "prem")
+public class Command_premium extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        String name;
+        try
+        {
+            name = getPlayer(args[0]).getName();
+        }
+        catch (PlayerNotFoundException ex)
+        {
+            name = args[0];
+        }
+
+        final String playername = name;
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    final URL getUrl = new URL("https://minecraft.net/haspaid.jsp?user=" + playername);
+                    final URLConnection urlConnection = getUrl.openConnection();
+                    // Read the response
+                    final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+                    final String message = ("false".equalsIgnoreCase(in.readLine()) ? ChatColor.RED + "No" : ChatColor.DARK_GREEN + "Yes");
+                    in.close();
+
+                    new BukkitRunnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            playerMsg("Player " + playername + " is premium: " + message);
+                        }
+                    }.runTask(plugin);
+
+                }
+                catch (Exception ex)
+                {
+                    TFM_Log.severe(ex);
+                    playerMsg("There was an error querying the mojang server.", ChatColor.RED);
+                }
+            }
+        }.runTaskAsynchronously(plugin);
+
+        return true;
+    }
+}

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

@@ -1,8 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -16,7 +17,7 @@ public class Command_protectarea extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TotalFreedomMod.protectedAreasEnabled)
+        if (!TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
         {
             playerMsg("Protected areas are currently disabled in the TotalFreedomMod configuration.");
             return true;
@@ -43,7 +44,7 @@ public class Command_protectarea extends TFM_Command
         }
         else if (args.length == 2)
         {
-            if (args[0].equalsIgnoreCase("remove"))
+            if (TFM_Util.isRemoveCommand(args[0]))
             {
                 TFM_ProtectedArea.removeProtectedArea(args[1]);
 

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

@@ -19,14 +19,14 @@ public class Command_purgeall extends TFM_Command
         TFM_Util.adminAction(sender.getName(), "Purging all player data", true);
 
         // Purge entities
-        TFM_Util.wipeEntities(true, true);
+        TFM_Util.TFM_EntityWiper.wipeEntities(true, true);
 
         // Undisguise all players
         TFM_DisguiseCraftBridge.undisguiseAllPlayers();
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
             // Unmute all players
             if (playerdata.isMuted())
@@ -59,9 +59,9 @@ public class Command_purgeall extends TFM_Command
             }
 
             // Purge potion effects
-            for (PotionEffect potion_effect : p.getActivePotionEffects())
+            for (PotionEffect potion_effect : player.getActivePotionEffects())
             {
-                p.removePotionEffect(potion_effect.getType());
+                player.removePotionEffect(potion_effect.getType());
             }
 
             // Uncage

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

@@ -26,20 +26,20 @@ public class Command_qdeop extends TFM_Command
 
         boolean matched_player = false;
 
-        String target_name = args[0].toLowerCase();
+        String targetName = args[0].toLowerCase();
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1)
+            if (player.getName().toLowerCase().indexOf(targetName) != -1 || player.getDisplayName().toLowerCase().indexOf(targetName) != -1)
             {
                 matched_player = true;
 
                 if (!silent)
                 {
-                    TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false);
+                    TFM_Util.adminAction(sender.getName(), "De-opping " + player.getName(), false);
                 }
-                p.setOp(false);
-                p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+                player.setOp(false);
+                player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
             }
         }
 

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

@@ -26,20 +26,20 @@ public class Command_qop extends TFM_Command
 
         boolean matched_player = false;
 
-        String target_name = args[0].toLowerCase();
+        String targetName = args[0].toLowerCase();
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1)
+            if (player.getName().toLowerCase().indexOf(targetName) != -1 || player.getDisplayName().toLowerCase().indexOf(targetName) != -1)
             {
                 matched_player = true;
 
                 if (!silent)
                 {
-                    TFM_Util.adminAction(sender.getName(), "Opping " + p.getName(), false);
+                    TFM_Util.adminAction(sender.getName(), "Opping " + player.getName(), false);
                 }
-                p.setOp(true);
-                p.sendMessage(TotalFreedomMod.YOU_ARE_OP);
+                player.setOp(true);
+                player.sendMessage(TotalFreedomMod.YOU_ARE_OP);
             }
         }
 

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

@@ -21,13 +21,13 @@ public class Command_radar extends TFM_Command
 
         List<TFM_RadarData> radar_data = new ArrayList<TFM_RadarData>();
 
-        for (Player p : sender_pos.getWorld().getPlayers())
+        for (Player player : sender_pos.getWorld().getPlayers())
         {
-            if (!p.equals(sender_p))
+            if (!player.equals(sender_p))
             {
                 try
                 {
-                    radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation()));
+                    radar_data.add(new TFM_RadarData(player, sender_pos.distance(player.getLocation()), player.getLocation()));
                 }
                 catch (IllegalArgumentException ex)
                 {

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

@@ -15,9 +15,9 @@ public class Command_rank extends TFM_Command
     {
         if (senderIsConsole && args.length < 1)
         {
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                playerMsg(p.getName() + " is " + TFM_Util.getRank(p));
+                playerMsg(player.getName() + " is " + TFM_Util.getRank(player));
             }
             return true;
         }
@@ -33,18 +33,18 @@ public class Command_rank extends TFM_Command
             return true;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             sender.sendMessage(ex.getMessage());
             return true;
         }
 
-        playerMsg(p.getName() + " is " + TFM_Util.getRank(p), ChatColor.AQUA);
+        playerMsg(player.getName() + " is " + TFM_Util.getRank(player), ChatColor.AQUA);
 
         return true;
     }

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

@@ -1,8 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -16,7 +15,7 @@ public class Command_rawsay extends TFM_Command
     {
         if (args.length > 0)
         {
-            TFM_Util.bcastMsg(ChatColor.translateAlternateColorCodes('&', StringUtils.join(args, " ")));
+            TFM_Util.bcastMsg(TFM_Util.colorize(StringUtils.join(args, " ")));
         }
 
         return true;

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

@@ -13,7 +13,7 @@ public class Command_rd extends TFM_Command
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
         TFM_Util.adminAction(sender.getName(), "Removing all server entities.", true);
-        playerMsg((TFM_Util.wipeEntities(true, true)) + " enties removed.");
+        playerMsg((TFM_Util.TFM_EntityWiper.wipeEntities(true, true)) + " enties removed.");
 
         return true;
     }

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

@@ -51,14 +51,14 @@ public class Command_ro extends TFM_Command
             }
         }
 
-        Player target_player = null;
+        Player targetPlayer = null;
         if (args.length == 3)
         {
             try
             {
-                target_player = getPlayer(args[2]);
+                targetPlayer = getPlayer(args[2]);
             }
-            catch (CantFindPlayerException ex)
+            catch (PlayerNotFoundException ex)
             {
                 playerMsg(ex.getMessage(), ChatColor.RED);
                 return true;
@@ -67,18 +67,18 @@ public class Command_ro extends TFM_Command
 
         int affected = 0;
 
-        if (target_player == null)
+        if (targetPlayer == null)
         {
             TFM_Util.adminAction(sender.getName(), "Removing all " + from_material.name() + " within " + radius + " blocks of all players. Brace for lag...", senderIsConsole);
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                affected += TFM_Util.replaceBlocks(p.getLocation(), from_material, Material.AIR, radius);
+                affected += TFM_Util.replaceBlocks(player.getLocation(), from_material, Material.AIR, radius);
             }
         }
         else
         {
-            TFM_Util.adminAction(sender.getName(), "Removing all " + from_material.name() + " within " + radius + " blocks of " + target_player.getName() + ".", senderIsConsole);
-            affected += TFM_Util.replaceBlocks(target_player.getLocation(), from_material, Material.AIR, radius);
+            TFM_Util.adminAction(sender.getName(), "Removing all " + from_material.name() + " within " + radius + " blocks of " + targetPlayer.getName() + ".", senderIsConsole);
+            affected += TFM_Util.replaceBlocks(targetPlayer.getLocation(), from_material, Material.AIR, radius);
         }
 
         TFM_Util.adminAction(sender.getName(), "Remove complete. " + affected + " blocks removed.", senderIsConsole);

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

@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true)
-@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>", aliases = "rb")
+@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | undo [partialname] purge [partialname] | purgeall>", aliases = "rb")
 public class Command_rollback extends TFM_Command
 {
     @Override
@@ -16,25 +16,58 @@ public class Command_rollback extends TFM_Command
     {
         if (args.length == 1)
         {
-            if (args[0].equalsIgnoreCase("purgeall"))
+            if ("purgeall".equalsIgnoreCase(args[0]))
             {
-                TFM_Util.adminAction(sender.getName(), "Purging all rollback history.", false);
+                TFM_Util.adminAction(sender.getName(), "Purging all rollback history", false);
                 playerMsg("Purged all rollback history for " + TFM_RollbackManager.purgeEntries() + " players.");
             }
             else
             {
                 String playerName = getPlayerName(args[0]);
+
+                if (!TFM_RollbackManager.canRollback(playerName))
+                {
+                    playerMsg("That player has no entries stored.");
+                    return true;
+                }
+
+                if (TFM_RollbackManager.canUndoRollback(playerName))
+                {
+                    playerMsg("That player has just been rolled back.");
+                }
+
                 TFM_Util.adminAction(sender.getName(), "Rolling back player: " + playerName, false);
                 playerMsg("Rolled back " + TFM_RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
+                playerMsg("If this rollback was a mistake, use /rollback undo " + playerName + " within 20 seconds to reverse the rollback.");
             }
         }
         else if (args.length == 2)
         {
-            if (args[0].equalsIgnoreCase("purge"))
+            if ("purge".equalsIgnoreCase(args[0]))
             {
                 String playerName = getPlayerName(args[1]);
+
+                if (!TFM_RollbackManager.canRollback(playerName))
+                {
+                    playerMsg("That player has no entries stored.");
+                    return true;
+                }
+
                 playerMsg("Purged " + TFM_RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
             }
+            else if ("undo".equalsIgnoreCase(args[0]))
+            {
+                String playerName = getPlayerName(args[1]);
+
+                if (!TFM_RollbackManager.canUndoRollback(playerName))
+                {
+                    playerMsg("That player hasn't been rolled back recently.");
+                    return true;
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Reverting rollback for player: " + playerName, false);
+                playerMsg("Reverted " + TFM_RollbackManager.undoRollback(playerName) + " edits for " + playerName + ".");
+            }
             else
             {
                 return false;
@@ -60,7 +93,7 @@ public class Command_rollback extends TFM_Command
                 playerName = player.getName();
             }
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
         }
 

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

@@ -1,11 +1,12 @@
 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.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -26,15 +27,15 @@ public class Command_saconfig extends TFM_Command
             }
             else
             {
-                if (!senderIsConsole)
+                if (!TFM_SuperadminList.isSeniorAdmin(sender, true))
                 {
-                    playerMsg("This command may only be used from the console.");
+                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
                 }
 
                 if (args[0].equals("clean"))
                 {
-                    TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list.", true);
+                    TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
                     TFM_SuperadminList.cleanSuperadminList(true);
                     playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.YELLOW);
                 }
@@ -66,7 +67,7 @@ public class Command_saconfig extends TFM_Command
                     {
                         superadmin = TFM_SuperadminList.getAdminEntry(getPlayer(args[1]).getName().toLowerCase());
                     }
-                    catch (CantFindPlayerException ex)
+                    catch (PlayerNotFoundException ex)
                     {
                     }
                 }
@@ -77,7 +78,7 @@ public class Command_saconfig extends TFM_Command
                 }
                 else
                 {
-                    playerMsg(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', superadmin.toString())));
+                    playerMsg(ChatColor.stripColor(TFM_Util.colorize(superadmin.toString())));
                 }
 
                 return true;
@@ -91,14 +92,14 @@ public class Command_saconfig extends TFM_Command
 
             if (args[0].equalsIgnoreCase("add"))
             {
-                Player p = null;
+                Player player = null;
                 String admin_name = null;
 
                 try
                 {
-                    p = getPlayer(args[1]);
+                    player = getPlayer(args[1]);
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                     TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
                     if (superadmin != null)
@@ -112,10 +113,10 @@ public class Command_saconfig extends TFM_Command
                     }
                 }
 
-                if (p != null)
+                if (player != null)
                 {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + p.getName() + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(p);
+                    TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true);
+                    TFM_SuperadminList.addSuperadmin(player);
                 }
                 else if (admin_name != null)
                 {
@@ -123,7 +124,7 @@ public class Command_saconfig extends TFM_Command
                     TFM_SuperadminList.addSuperadmin(admin_name);
                 }
             }
-            else if (args[0].equalsIgnoreCase("delete") || args[0].equalsIgnoreCase("del") || args[0].equalsIgnoreCase("remove"))
+            else if (TFM_Util.isRemoveCommand(args[0]))
             {
                 if (!TFM_SuperadminList.isSeniorAdmin(sender))
                 {
@@ -131,62 +132,30 @@ public class Command_saconfig extends TFM_Command
                     return true;
                 }
 
-                String target_name = args[1];
+                String targetName = args[1];
 
                 try
                 {
-                    target_name = getPlayer(target_name).getName();
+                    targetName = getPlayer(targetName).getName();
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                 }
 
-                if (!TFM_SuperadminList.getSuperadminNames().contains(target_name.toLowerCase()))
+                if (!TFM_SuperadminList.getSuperadminNames().contains(targetName.toLowerCase()))
                 {
-                    playerMsg("Superadmin not found: " + target_name);
+                    playerMsg("Superadmin not found: " + targetName);
                     return true;
                 }
 
-                TFM_Util.adminAction(sender.getName(), "Removing " + target_name + " from the superadmin list", true);
-                TFM_SuperadminList.removeSuperadmin(target_name);
-
-                if (!TotalFreedomMod.twitterbotEnabled)
-                {
-                    return true;
-                }
+                TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
+                TFM_SuperadminList.removeSuperadmin(targetName);
 
                 // Twitterbot
-                TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin);
-                String reply = twitterbot.delTwitter(target_name);
-                if ("ok".equals(reply))
+                if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
                 {
-                    TFM_Util.adminAction(sender.getName(), "Removing " + target_name + " from TwitterBot", true);
+                    TFM_TwitterHandler.getInstance().delTwitterVerbose(targetName, sender);
                 }
-                else if ("disabled".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, "Warning: Could not check if player has a twitter handle!");
-                    TFM_Util.playerMsg(sender, "TwitterBot has been temporarily disabled,, please wait until it get re-enabled", ChatColor.RED);
-                }
-                else if ("failed".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, "Warning: Could not check if player has a twitter handle!");
-                    TFM_Util.playerMsg(sender, "There was a problem querying the database, please let a developer know.", ChatColor.RED);
-                }
-                else if ("false".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, "Warning: Could not check if player has a twitter handle!");
-                    TFM_Util.playerMsg(sender, "There was a problem with the database, please let a developer know.", ChatColor.RED);
-                }
-                else if ("cannotauth".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, "Warning: Could not check if player has a twitter handle!");
-                    TFM_Util.playerMsg(sender, "The database password is incorrect, please let a developer know.", ChatColor.RED);
-                }
-                else if ("notfound".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, target_name + " did not have a twitter handle registered to their name.", ChatColor.GREEN);
-                }
-
             }
             else
             {

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -27,9 +27,9 @@ public class Command_say extends TFM_Command
             {
                 TFM_Util.bcastMsg("Server is going offline.", ChatColor.GRAY);
 
-                for (Player p : server.getOnlinePlayers())
+                for (Player player : server.getOnlinePlayers())
                 {
-                    p.kickPlayer("Server is going offline, come back in a few minutes.");
+                    player.kickPlayer("Server is going offline, come back in about 20 seconds.");
                 }
 
                 server.shutdown();

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

@@ -0,0 +1,28 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker;
+import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker.TFM_ServiceChecker_ServiceStatus;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandParameters(description = "Shows the status of all Mojang services", usage = "/<command>")
+public class Command_services extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        playerMsg("Mojang Services" + ChatColor.WHITE + ":", ChatColor.BLUE);
+
+        for (TFM_ServiceChecker_ServiceStatus service : TFM_ServiceChecker.getInstance().getAllStatuses())
+        {
+            playerMsg(service.getFormattedStatus());
+        }
+        playerMsg("Version" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().version, ChatColor.DARK_PURPLE);
+        playerMsg("Last Check" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().lastCheck, ChatColor.DARK_PURPLE);
+
+        return true;
+    }
+}

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

@@ -15,9 +15,9 @@ public class Command_setl extends TFM_Command
     {
         TFM_Util.adminAction(sender.getName(), "Setting everyone's Worldedit block modification limit to 500.", true);
         TFM_WorldEditBridge web = TFM_WorldEditBridge.getInstance();
-        for (final Player p : server.getOnlinePlayers())
+        for (final Player player : server.getOnlinePlayers())
         {
-            web.setLimit(p, 500);
+            web.setLimit(player, 500);
         }
         return true;
     }

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

@@ -0,0 +1,76 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandParameters(description = "Set the on/off state of the lever at position x, y, z in world 'worldname'.", usage = "/<command> <x> <y> <z> <worldname> <on|off>")
+public class Command_setlever extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 5)
+        {
+            return false;
+        }
+
+        double x, y, z;
+        try
+        {
+            x = Double.parseDouble(args[0]);
+            y = Double.parseDouble(args[1]);
+            z = Double.parseDouble(args[2]);
+        }
+        catch (NumberFormatException ex)
+        {
+            playerMsg("Invalid coordinates.");
+            return true;
+        }
+
+        World world = null;
+        final String needleWorldName = args[3].trim();
+        final List<World> worlds = server.getWorlds();
+        for (final World testWorld : worlds)
+        {
+            if (testWorld.getName().trim().equalsIgnoreCase(needleWorldName))
+            {
+                world = testWorld;
+                break;
+            }
+        }
+
+        if (world == null)
+        {
+            playerMsg("Invalid world name.");
+            return true;
+        }
+
+        final Location leverLocation = new Location(world, x, y, z);
+
+        final boolean leverOn = (args[4].trim().equalsIgnoreCase("on") || args[4].trim().equalsIgnoreCase("1")) ? true : false;
+
+        final Block targetBlock = leverLocation.getBlock();
+
+        if (targetBlock.getType() == Material.LEVER)
+        {
+            org.bukkit.material.Lever lever = new org.bukkit.material.Lever(Material.LEVER, targetBlock.getData());
+            lever.setPowered(leverOn);
+            targetBlock.setData(lever.getData());
+            targetBlock.getState().update();
+        }
+        else
+        {
+            playerMsg("Target block " + targetBlock + "  is not a lever.");
+            return true;
+        }
+
+        return true;
+    }
+}

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -20,9 +20,9 @@ public class Command_setspawnworld extends TFM_Command
 
         playerMsg("Spawn location for this world set to: " + TFM_Util.formatLocation(sender_p.getWorld().getSpawnLocation()));
 
-        if (TotalFreedomMod.protectedAreasEnabled && TotalFreedomMod.autoProtectSpawnpoints)
+        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean() && TFM_ConfigEntry.AUTO_PROTECT_SPAWNPOINTS.getBoolean())
         {
-            TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TotalFreedomMod.autoProtectRadius);
+            TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TFM_ConfigEntry.AUTO_PROTECT_RADIUS.getDouble());
         }
 
         return true;

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

@@ -21,48 +21,48 @@ public class Command_smite extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
-        smite(p);
+        smite(player);
 
         return true;
     }
 
-    public static void smite(final Player p)
+    public static void smite(final Player player)
     {
-        TFM_Util.bcastMsg(p.getName() + " has been a naughty, naughty boy.", ChatColor.RED);
+        TFM_Util.bcastMsg(player.getName() + " has been a naughty, naughty boy.", ChatColor.RED);
 
         //Deop
-        p.setOp(false);
+        player.setOp(false);
 
         //Set gamemode to survival:
-        p.setGameMode(GameMode.SURVIVAL);
+        player.setGameMode(GameMode.SURVIVAL);
 
         //Clear inventory:
-        p.getInventory().clear();
+        player.getInventory().clear();
 
         //Strike with lightning effect:
-        final Location target_pos = p.getLocation();
-        final World world = p.getWorld();
+        final Location targetPos = player.getLocation();
+        final World world = player.getWorld();
         for (int x = -1; x <= 1; x++)
         {
             for (int z = -1; z <= 1; z++)
             {
-                final Location strike_pos = new Location(world, target_pos.getBlockX() + x, target_pos.getBlockY(), target_pos.getBlockZ() + z);
+                final Location strike_pos = new Location(world, targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
                 world.strikeLightning(strike_pos);
             }
         }
 
         //Kill:
-        p.setHealth(0.0);
+        player.setHealth(0.0);
     }
 }

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

@@ -1,25 +1,12 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 @CommandParameters(description = "Show misc. server info.", usage = "/<command>")
@@ -50,66 +37,6 @@ public class Command_status extends TFM_Command
             playerMsg(String.format("World %d: %s - %d players.", i++, world.getName(), world.getPlayers().size()), ChatColor.BLUE);
         }
 
-        new BukkitRunnable()
-        {
-            @SuppressWarnings("unchecked")
-            @Override
-            public void run()
-            {
-                try
-                {
-                    URL mojang_status = new URL("http://status.mojang.com/check");
-                    BufferedReader in = new BufferedReader(new InputStreamReader(mojang_status.openStream()));
-                    JSONArray status_json = (JSONArray) JSONValue.parse(in.readLine());
-                    in.close();
-
-                    Map<String, Boolean> service_status = new HashMap<String, Boolean>();
-
-                    Iterator status_it = status_json.iterator();
-                    while (status_it.hasNext())
-                    {
-                        JSONObject service = (JSONObject) status_it.next();
-                        Iterator service_it = service.entrySet().iterator();
-                        while (service_it.hasNext())
-                        {
-                            Entry<String, String> pair = (Entry<String, String>) service_it.next();
-                            service_status.put(pair.getKey(), (pair.getValue().equals("green") ? Boolean.TRUE : Boolean.FALSE));
-                        }
-                    }
-
-                    final List<String> status_output = new ArrayList<String>();
-
-                    Iterator<Entry<String, Boolean>> output_it = service_status.entrySet().iterator();
-                    while (output_it.hasNext())
-                    {
-                        Entry<String, Boolean> pair = output_it.next();
-                        String service_name = pair.getKey();
-                        boolean service_online = pair.getValue().booleanValue();
-
-                        if (SERVICE_MAP.containsKey(service_name))
-                        {
-                            service_name = SERVICE_MAP.get(service_name);
-                        }
-
-                        status_output.add(String.format("%s is %s", service_name, (service_online ? ChatColor.GREEN + "ONLINE" + ChatColor.GRAY : ChatColor.RED + "OFFLINE" + ChatColor.GRAY)));
-                    }
-
-                    new BukkitRunnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            playerMsg(String.format("Mojang Service Status: %s.", StringUtils.join(status_output, ", ")), ChatColor.GRAY);
-                        }
-                    }.runTask(plugin);
-                }
-                catch (Exception ex)
-                {
-                    TFM_Log.severe(ex);
-                }
-            }
-        }.runTaskAsynchronously(plugin);
-
         return true;
     }
 }

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

@@ -66,11 +66,11 @@ public class Command_stfu extends TFM_Command
 
             TFM_PlayerData playerdata;
             int counter = 0;
-            for (Player p : server.getOnlinePlayers())
+            for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
+                if (!TFM_SuperadminList.isUserSuperadmin(player))
                 {
-                    playerdata = TFM_PlayerData.getPlayerData(p);
+                    playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.setMuted(true);
                     counter++;
                 }
@@ -87,9 +87,9 @@ public class Command_stfu extends TFM_Command
                 public void run()
                 {
                     TFM_Util.adminAction("MuteTimer", "Unmuting all players", false);
-                    for (Player p : server.getOnlinePlayers())
+                    for (Player player : server.getOnlinePlayers())
                     {
-                        TFM_PlayerData.getPlayerData(p).setMuted(false);
+                        TFM_PlayerData.getPlayerData(player).setMuted(false);
                     }
                 }
             }.runTaskLater(plugin, 20L * 60L * 5L);
@@ -98,35 +98,35 @@ public class Command_stfu extends TFM_Command
         }
         else
         {
-            Player p;
+            Player player;
             try
             {
-                p = getPlayer(args[0]);
+                player = getPlayer(args[0]);
             }
-            catch (CantFindPlayerException ex)
+            catch (PlayerNotFoundException ex)
             {
                 sender.sendMessage(ex.getMessage());
                 return true;
             }
 
-            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
             if (playerdata.isMuted())
             {
-                TFM_Util.adminAction(sender.getName(), "Unmuting " + p.getName(), true);
+                TFM_Util.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
                 playerdata.setMuted(false);
-                playerMsg("Unmuted " + p.getName());
+                playerMsg("Unmuted " + player.getName());
             }
             else
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
+                if (!TFM_SuperadminList.isUserSuperadmin(player))
                 {
-                    TFM_Util.adminAction(sender.getName(), "Muting " + p.getName(), true);
+                    TFM_Util.adminAction(sender.getName(), "Muting " + player.getName(), true);
                     playerdata.setMuted(true);
-                    playerMsg("Muted " + p.getName());
+                    playerMsg("Muted " + player.getName());
                 }
                 else
                 {
-                    playerMsg(p.getName() + " is a superadmin, and can't be muted.");
+                    playerMsg(player.getName() + " is a superadmin, and can't be muted.");
                 }
             }
         }

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

@@ -15,9 +15,9 @@ public class Command_stop extends TFM_Command
     {
         TFM_Util.bcastMsg("Server is going offline!", ChatColor.LIGHT_PURPLE);
 
-        for (Player p : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
-            p.kickPlayer("Server is going offline, come back in about 20 seconds.");
+            player.kickPlayer("Server is going offline, come back in about 20 seconds.");
         }
 
         server.shutdown();

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

@@ -3,7 +3,6 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
@@ -26,11 +25,11 @@ public class Command_survival extends TFM_Command
             }
         }
 
-        Player p;
+        Player player;
 
         if (args.length == 0)
         {
-            p = sender_p;
+            player = sender_p;
         }
         else
         {
@@ -42,9 +41,9 @@ public class Command_survival extends TFM_Command
                     return true;
                 }
 
-                for (Player player : server.getOnlinePlayers())
+                for (Player targetPlayer : server.getOnlinePlayers())
                 {
-                    player.setGameMode(GameMode.SURVIVAL);
+                    targetPlayer.setGameMode(GameMode.SURVIVAL);
                 }
 
                 TFM_Util.adminAction(sender.getName(), "Changing everyone's gamemode to survival", false);
@@ -55,9 +54,9 @@ public class Command_survival extends TFM_Command
             {
                 try
                 {
-                    p = getPlayer(args[0]);
+                    player = getPlayer(args[0]);
                 }
-                catch (CantFindPlayerException ex)
+                catch (PlayerNotFoundException ex)
                 {
                     playerMsg(ex.getMessage(), ChatColor.RED);
                     return true;
@@ -70,9 +69,9 @@ public class Command_survival extends TFM_Command
             }
         }
 
-        playerMsg("Setting " + p.getName() + " to game mode 'Survival'.");
-        p.sendMessage(sender.getName() + " set your game mode to 'Survival'.");
-        p.setGameMode(GameMode.SURVIVAL);
+        playerMsg("Setting " + player.getName() + " to game mode 'Survival'.");
+        player.sendMessage(sender.getName() + " set your game mode to 'Survival'.");
+        player.setGameMode(GameMode.SURVIVAL);
 
         return true;
     }

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

@@ -0,0 +1,128 @@
+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_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <<prefix> | off | clear <player> | clearall>")
+public class Command_tag extends TFM_Command
+{
+    public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
+    {
+        "admin", "owner", "moderator", "developer", "&k"
+    });
+
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 1)
+        {
+            if ("clearall".equals(args[0]))
+            {
+                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                {
+                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                    return true;
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Removing all tags", false);
+                int count = 0;
+                for (Player player : server.getOnlinePlayers())
+                {
+                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+
+                    if (playerdata.getTag() != null)
+                    {
+                        count++;
+                        TFM_PlayerData.getPlayerData(player).setTag(null);
+                    }
+                }
+
+                playerMsg(count + " tag(s) removed.");
+                return true;
+            }
+
+            if (senderIsConsole)
+            {
+                playerMsg("Only in-game players can set tags. Use \"/tag clearall\" to reset all tags.");
+                return true;
+            }
+
+            if (TFM_Util.isStopCommand(args[0]))
+            {
+                TFM_PlayerData.getPlayerData(sender_p).setTag(null);
+                playerMsg("Your tag has been removed.");
+                return true;
+            }
+
+            if (ChatColor.stripColor(TFM_Util.colorize(args[0])).length() > 20)
+            {
+                playerMsg("That tag is too long [Max = 20 characters, not including color codes].");
+                return true;
+            }
+
+            if (!TFM_SuperadminList.isUserSuperadmin(sender))
+            {
+                for (String word : FORBIDDEN_WORDS)
+                {
+                    if (args[0].toLowerCase().contains(word.toLowerCase()))
+                    {
+                        if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
+                        {
+                            playerMsg("That tag contains a forbidden color-code.");
+                        }
+                        else
+                        {
+                            playerMsg("That tag contains a forbidden word.");
+                        }
+                        return true;
+                    }
+                }
+
+            }
+
+            TFM_PlayerData.getPlayerData(sender_p).setTag(args[0]);
+            playerMsg("Tag set.");
+
+            return true;
+        }
+        else if (args.length == 2)
+        {
+            if ("clear".equals(args[0]))
+            {
+                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                {
+                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                    return true;
+                }
+
+                final Player player;
+                try
+                {
+                    player = getPlayer(args[1]);
+                }
+                catch (PlayerNotFoundException ex)
+                {
+                    playerMsg(ex.getMessage());
+                    return true;
+                }
+
+                TFM_PlayerData.getPlayerData(player).setTag(null);
+                playerMsg("Removed " + player.getName() + "'s tag.");
+                return true;
+            }
+
+            return false;
+        }
+
+        return false;
+    }
+}

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

@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "nope")
+@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "noob")
 public class Command_tban extends TFM_Command
 {
     @Override
@@ -19,21 +19,20 @@ public class Command_tban extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
-        TFM_Util.adminAction(sender.getName(), "NOPE: " + p.getName(), true);
-        TFM_ServerInterface.banUsername(p.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes",
-                sender.getName(), TFM_Util.parseDateOffset("5m"));
-        p.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes.");
+        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"));
+        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

@@ -4,8 +4,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -25,18 +25,18 @@ public class Command_tempban extends TFM_Command
             return false;
         }
 
-        Player p;
+        Player player;
         try
         {
-            p = getPlayer(args[0]);
+            player = getPlayer(args[0]);
         }
-        catch (CantFindPlayerException ex)
+        catch (PlayerNotFoundException ex)
         {
             playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
-        StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + p.getName());
+        StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + player.getName());
 
         Date ban_duration = TFM_Util.parseDateOffset("30m");
         if (args.length >= 2)
@@ -57,9 +57,9 @@ public class Command_tempban extends TFM_Command
         }
 
         TFM_Util.adminAction(sender.getName(), bcast_msg.toString(), true);
-        TFM_ServerInterface.banUsername(p.getName(), ban_reason, sender.getName(), ban_duration);
-        TFM_ServerInterface.banIP(p.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration);
-        p.kickPlayer(sender.getName() + " - " + bcast_msg.toString());
+        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());
 
         return true;
     }

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

@@ -46,14 +46,14 @@ public class Command_tfbanlist extends TFM_Command
         StringBuilder banned_players = new StringBuilder();
         banned_players.append("Banned Players: ");
         boolean first = true;
-        for (OfflinePlayer p : server.getBannedPlayers())
+        for (OfflinePlayer player : server.getBannedPlayers())
         {
             if (!first)
             {
                 banned_players.append(", ");
             }
             first = false;
-            banned_players.append(p.getName().trim());
+            banned_players.append(player.getName().trim());
         }
 
         playerMsg(banned_players.toString());

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

@@ -16,9 +16,8 @@ public class Command_tfm extends TFM_Command
         playerMsg("TotalFreedomMod for 'TotalFreedom', the original all-op server.", ChatColor.GOLD);
         playerMsg(String.format("Version " + ChatColor.BLUE + "%s.%s" + ChatColor.BLUE + ", built %s.", TotalFreedomMod.pluginVersion, TotalFreedomMod.buildNumber, TotalFreedomMod.buildDate), ChatColor.GOLD);
         playerMsg("Created by Madgeek1450 and DarthSalamon.", ChatColor.GOLD);
-        playerMsg("Visit " + ChatColor.AQUA + "http://totalfreedom.me/" + ChatColor.GREEN + " for more information.", ChatColor.DARK_GREEN);
+        playerMsg("Visit " + ChatColor.AQUA + "http://totalfreedom.me/" + ChatColor.GREEN + " for more information.", ChatColor.GREEN);
 
         return true;
     }
-
 }

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

@@ -1,9 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
@@ -19,7 +19,7 @@ public class Command_tossmob extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TotalFreedomMod.tossmobEnabled)
+        if (!TFM_ConfigEntry.TOSSMOB_ENABLED.getBoolean())
         {
             playerMsg("Tossmob is currently disabled.");
             return true;
@@ -78,10 +78,10 @@ public class Command_tossmob extends TFM_Command
 
         playerData.enableMobThrower(creature, speed);
         playerMsg("MobThrower is enabled. Creature: " + creature + " - Speed: " + speed + ".", ChatColor.GREEN);
-        playerMsg("Left click while holding a stick to throw mobs!", ChatColor.GREEN);
+        playerMsg("Left click while holding a " + Material.BONE.toString() + " to throw mobs!", ChatColor.GREEN);
         playerMsg("Type '/tossmob off' to disable.  -By Madgeek1450", ChatColor.GREEN);
 
-        sender_p.setItemInHand(new ItemStack(Material.STICK, 1));
+        sender_p.setItemInHand(new ItemStack(Material.BONE, 1));
 
         return true;
     }