Handle player online check in AsyncPlayerPreLoginEvent

Apparently, online players with the same username are kicked before PlayerLoginEvent is called. This commit moves the online player check to AsyncPlayerPreloginEvent so the default behaviour can still be modified

Fixes #642

.gitignore

@@ -17,3 +17,6 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+# TFM files
+buildcreator.properties

CONTRIBUTING.md

@@ -1,48 +1,93 @@
 # Contributing to TotalFreedomMod #
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, it can be used in a variety of other configurations with minimal fuss.
 
-For those who wish to contribute, we encourage you to fork the repository and submit pull requests. Below you will find guidelines that will explain this process in further detail.
+For those who wish to contribute, we encourage you to fork the repository and submit pull requests. Below you will find guidelines that explain this process in further detail.
+
+## Quick Guide ##
+1. Create or find an issue on our [Issue Tracker](https://github.com/TotalFreedom/TotalFreedomMod/issues).
+2. Does your change fits TotalFreedomMod's goals?
+3. Fork TotalFreedomMod if you haven't done so already.
+4. Make a branch dedicated to your change.
+5. Make your change.
+6. Commit your change according to the [committing guidelines](#committing-your-changes).
+7. Push your branch and submit a pull request.
 
 ## Getting Started ##
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* If the issue is a bug, submit a ticket for it, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce it.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
+* Search the issue tracker for your bug report or feature request.
+* If the issue does not exist already, create it.
+  * Clearly describe the issue.
+  * If your issue is a bug, describe the steps needed to reproduce it.
+  * If your issue is a feature request, ensure it fits TotalFreedomMod's goals and describe your feature in detail.
+* Fork the repository on GitHub.
+
+## Does the change fit TotalFreedomMod's goals? ##
+As a rough guideline, ask yourself the following questions to determine if your proposed change fits the TotalFreedomMod project's goals. Please remember that this is only a rough guideline and may or may not reflect the definitive answer to this question.
+
+* Is the change in line with the principles of "Total Freedom"?
+  TotalFreedom is a freedom-based server. We don't normally make changes that restrict players unless absolutely necessary.
+
+* Is the change directed towards the TotalFreedom server?
+  Changes must be directed towards the TotalFreedom server. Changes such as adding ranks, adding the name of other TotalFreedom-like servers will not likely be accepted.
+
+* Does the change add a feature that involves micromanagement?
+  Pull requests that involve adding a micromanagement feature will likely not be accepted. This includes shorthands for multiple commands.
+
+* Is a similar feature already present?
+  Features that have very similar alternatives will not be added. For example: A command that temporarily bans a player from the server is very similar to the _/tban_ command and thus will likely not be accepted.
 
 ## Making Changes ##
 * Create a topic branch from where you want to base your work.
   * This is usually the master branch.
-  * Only target release branches if you are certain your addition must be on that branch.
-  * To quickly create a topic branch based on master; `git checkout -b contribution` - Please avoid working directly on the `master` branch.
-* Make changes and commit where necessary.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in line with those which are already made.
-* Make sure your changes build (<b>and work!</b>).
+  * Name your branch something relevant to the change you are going to make.
+  * To quickly create a topic branch based on master, use `git checkout master` followed by `git checkout -b <name>`. Avoid working directly on the `master` branch.
+* Make sure your change meets our [code requirements](#code-requirements).
 
-## Tips - How To Get Your Pull Request Accepted ##
-* Make sure your changes work and compile without difficulty.
-* Make sure your change adds something useful, do not add commands to micromanage the server. (ie: Shorthands for a collection of commands)
-  * __Commands that make use of `org.bukkit.Server.dispatchCommand()` will probably be rejected.__
-* Features must be in line the general idea of "Total Freedom".
-* Changes must be directed towards the main "TotalFreedom" server. Adding names such as the name of your own TotalFreedom-like server will get your pull request denied.
-* Do not add yourself to the developer list.
-* Ensure that you use the correct whitespace-style. That is: 4 spaces as indentation.
-* Please make sure your changes are written such as other features would be. Eg: commands have their own class and extend TFM_Command.
-* __Make sure your code is written in the [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style).__
-* Do not increment the version number.
-* If you want to add multiple changes, please make one pull request per change. This way, it's easier to accept your changes faster and won't block the other changes if there is an issue with a specific line of code.
-* Please make sure there are no bugs in your code.
-* Please avoid having to add files in the main namespace where possible.
-* Make sure all changes work before you commit these, this avoids having multiple unnecessary commits.
-* Please refrain from using an excessive amount of commits. As few as possible is generally the best.
-* Please do not spread your addition over several pull-requests.
+### Code requirements ###
+* Code must be written in [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style), and that it follows [Java Code Conventions](http://www.oracle.com/technetwork/java/codeconventions-150003.pdf).__
+* No tabs; use 4 spaces for indentation.
+* No trailing whitespaces for code lines, comments or configuration files.
+* No CRLF line endings, only LF is allowed.
+  * For Windows-based machines, you can configure Git to do this for your by running `git config --global core.autocrlf true`.
+  * If you're running a Linux or Mac OSX, you should run `git config --global core.autocrlf input` instead.
+  * For more information about line feeds. See this [this article](http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/).
+* No 80 character line limit or 'weird' midstatement newlines.
+* Additions should be compiled, complete and tested before committing.
+* Avoid using `org.bukkit.Server.dispatchCommand()`. Commits that make use of it will likely be rejected.
+* Files must always end with a newline.
+* Avoid nested code structures.
+
+## Committing your changes ##
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Describe your changes in the commit description.
+* For a prolonged description, continue on a new line.
+* The first description line should be once sentence and should not exceed 10 words.
+* The first description line should contain either:
+  * For a bug-related issue: "Resolves _#issue_".
+  * For a feature request: "Fixes _#issue_".
+  * "#issue" is the issue number number you based your work on.
+
+#### Example commit message ####
+```
+Fixed bugs with /saconfig clear. Resolves #167
+Admins can now use /saconfig clear [ip] to remove the designated IP (only their own IPs can be removed. 
+They can also simply use /saconfig clear to remove all IPs but the current one. /saconfig clear is safe, 
+meaning you can't remove your current IP or an IP that doesn't belong to you.
+```
 
 ## Submitting Your Changes ##
-* Push your changes to a topic branch in your fork of the repository.
+* Push your changes to the topic branch in your fork of the repository.
 * Submit a pull request to this repository.
   * Explain in detail what each one of your commits changes and point out any big changes.
 * Wait as a developer evaluates your changes.
+* Do not add any prefixes or tags.
+
+## Tips - How To Get Your Pull Request Accepted ##
+* Please make sure your changes are written such as other features would be. For example: Commands have their own class and extend TFM_Command.
+* Do not increment the version number.
+* If you want to add multiple changes, please make one pull request per change. This way, it's easier to accept your changes faster and won't block the other changes if there is an issue with a specific line of code.
+* Please avoid having to add files in the main namespace where possible.
+* Please refrain from using an excessive amount of commits. As few as possible is generally the best.
+* Please do not spread your contribution over several pull-requests.
 
 ## Additional Resources ##
 * [TotalFreedom information](http://totalfreedom.me)

LICENSE.md

@@ -1,11 +1,3 @@
 # TotalFreedomMod License #
-TotalFreedomMod is primarily derived from the Bukkit and CraftBukkit library and server, respectively. Therefore, we have chosen for it to inherit the GNU GPLv3 License as used by those programs. This license is available at http://www.gnu.org/licenses/gpl-3.0.txt
 
-We do, however, ask that you comply by several restrictions. These restrictions are in place to make sure that credit is given to the original authors, who remain the maintainers of the plugin and its source code.
-* 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.
-* 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.
-* Any restrictions listed here may be waived by any of the above mentioned primary developers.
+TotalFreedomMod is licensed under the TotalFreedom General License. It is available [here](https://github.com/TotalFreedom/License/blob/master/LICENSE.md).

README.md

@@ -2,6 +2,6 @@
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 
-This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (DarthSalamon) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves.
+This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves.
 
 Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod. For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).

appinfo.properties

@@ -1,6 +0,0 @@
-#Fri, 09 Aug 2013 15:38:23 +0200
-
-program.VERSION=2.22
-program.BUILDNUM=378
-program.BUILDDATE=08/09/2013 03\:38 PM
-

build.xml

@@ -1,83 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
 <project name="TotalFreedomMod" default="default" basedir=".">
     <description>Builds, tests, and runs the project TotalFreedomMod.</description>
     <import file="nbproject/build-impl.xml" />
-    <!--
 
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="TotalFreedomMod-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
     <target name="-pre-jar">
+        <copy file="buildcreator.default.properties" tofile="buildcreator.properties" overwrite="false" />
+
+        <property file="buildcreator.properties"/>
         <buildnumber file="buildnumber.properties" />
+
         <propertyfile file="appinfo.properties">
-			<entry key="program.VERSION" default="0.0" />
-			<entry key="program.BUILDNUM" value="${build.number}" />
-			<entry key="program.BUILDDATE" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
+            <entry key="program.buildnumber" value="${build.number}" />
+            <entry key="program.builddate" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
+            <entry key="program.buildcreator" value="${program.buildcreator}" />
         </propertyfile>
         <copy file="appinfo.properties" todir="${build.classes.dir}" />
+        <delete file="appinfo.properties" />
+    </target>
+
+    <target name="-post-jar">
+        <!-- Cleanup -->
+        <delete file="${dist.dir}/README.TXT" />
+        <delete dir="${dist.dir}/lib/" />
     </target>
 </project>

buildcreator.default.properties

@@ -0,0 +1,6 @@
+#
+# Build creator configuration
+#
+# Note: Do not edit this file! Edit the generated "buildcreator.properties" file instead.
+#
+program.buildcreator=Unknown

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Aug 09 15:38:23 CEST 2013
-build.number=379
+#Sat May 30 20:46:17 CEST 2015
+build.number=1052

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:
@@ -32,9 +48,10 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${libs.CraftBukkit.classpath}:\
-    ${libs.WorldEdit.classpath}:\
-    ${libs.DisguiseCraft.classpath}
+    ${libs.SpigotServer.classpath}:\
+    ${libs.BukkitTelnet.classpath}:\
+    ${libs.TF-WorldEdit.classpath}:\
+    ${libs.Essentials.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=false
@@ -67,10 +84,9 @@ jnlp.signed=false
 jnlp.signing=
 jnlp.signing.alias=
 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/bans.yml

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

src/config.yml

@@ -1,33 +1,67 @@
-# TotalFreedomMod v2.22 Configuration
-# by Madgeek1450 and DarthSalamon
+#
+# TotalFreedomMod v4.3 Configuration
+# by Madgeek1450 and Prozza
+#
 
-# Block placement prevention:
-allow_fire_place: false
-allow_fire_spread: false
-allow_lava_damage: false
-allow_lava_place: false
-allow_water_place: false
-allow_fluid_spread: false
-allow_tnt_minecarts: false
+# Generic server information
+server:
+  # You should change this to your server's name
+  name: TotalFreedom
 
-# Explosion management:
-allow_explosions: false
-explosiveRadius: 4.0
+  # The address your server is located at. Please do not include the port.
+  address: play.totalfreedom.me
+
+  # Shown at the server list
+  motd: TotalFreedom &8- Minecraft %mcversion%
+
+  # Every word in the MOTD will be a different color unless prefixed by a color code
+  colorful_motd: true
+
+  # All players who show up as owner
+  owners:
+    - markbyron
+
+  # URL players should appeal for bans at
+  ban_url: http://totalfreedom.boards.net/
+
+  # URL players should appeal for permanent bans at
+  permban_url: http://bit.ly/TF_PermBan
+
+# ForceIP configuration
+forceip:
+  enabled: false
+
+  # The port players should use to connect to your server; only applies to forceip
+  port: 25565
+
+  # The kick message sent to players when logging in with the wrong hostname
+  kickmsg: You have been kicked from the server - Please connect using %address%
+
+
+# Blocking certain events
+allow:
+  fire_place: false
+  fire_spread: false
+  fluid_spread: false
+  lava_place: false
+  lava_damage: false
+  water_place: false
+  tnt_minecarts: false
+  explosions: false
 
 # Blocked commands:
 #
 # How blocked commands work:
-# All sections described below are delimited by colon-characters.
-# Make sure that you block a command by it's main command name, not an alias
-# -as all aliases are blocked by default. Commands are case-insensitive ofcourse.
-# You can block specific subcommands aswell. eg: /mail sendall
+# All sections described below are delimited by colon characters.
+# Make sure that you block a command by its main command name, not an alias
+# -as all aliases are blocked by default. Commands are case-insensitive.
 #
 # * The first section is a letter which indicates which rank may use this command
 #   Valid ranks:
 #   n - Nobody (Completely disabled)
 #   c - Senior Admins (Console)
 #   t - Telnet Admins (Console)
-#   s - SuperAdmins
+#   s - Super Admins (Any in-game admin)
 #   o - Ops (Non-Ops won't be able to use it)
 #
 # * The second section is a letter which indicates what to do when a player executes that command.
@@ -50,88 +84,238 @@ 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:/gamemode:Use /creative and /survival to set your gamemode.'
+  - '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:_'
+  - 'n:b:/spreadplayers:_'
+  - 'n:b:/execute:_'
+  - 'n:b:/blockdata:_'
+  - 'n:b:/clearhistory:_'
+  - 'n:b:/save-all:_'
+  - 'n:b:/save-on:_'
+  - 'n:b:/save-off:_'
 
   # 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:/size:_'
+  - 's:b://mask:_'
+  - 's:b:/mat:_'
+  - 's:b://butcher:_'
+  - 's:b:/scoreboard:_'
+  - 's:b:/setspawn:_'
+  - 's:b://snow:_'
+  - 's:b:/tellraw:_'
+  - 's:b:/forestgen:_'
+  - 's:b:/setidletimeout:_'
+  - 's:b:/mail sendall:_'
+  - 's:b:/eco reset:_'
+  - 's:b:/mask:_'
+  - 's:b:/gmask:_'
+  - 's:b:/lrbuild:_'
+  - 's:b:/defaultgamemode:_'
+  - 's:b:/reload:_'
+  - 's:b:/title:_'
+  - 's:b:/worldborder:_'
+  - 's:b:/weather:_'
+  - 's:b:/tpall:_'
+  - 's:b:/setblock:_'
+  - 's:b:/green:_'
+  - 'n:b:/gamerule:_'
+  - 'n:b:/togglejail:_'
 
-# Automatically wipe dropped objects:
+  # Superadmin commands - Auto-eject
+  - 's:a:/stop:_'
+  - 's:a:/restart:_'
+
+# Automatically wipe dropped objects
 auto_wipe: true
 
-# Nuking prevention:
-nuke_monitor: true
-nuke_monitor_count_break: 100
-nuke_monitor_count_place: 25
-nuke_monitor_range: 10.0
-freecam_trigger_count: 10
+# Nuking prevention
+nukemonitor:
+  enabled: true
+  count_break: 100
+  count_place: 40
+  range: 10.0
 
-# Show all attempted commands in the log, will result in duplicate log messages:
+freecam_trigger_count: 10
+explosive_radius: 4.0
+
+# Show all attempted commands in the log, will result in duplicate log messages
 preprocess_log: true
 
-# Disable nighttime:
-disable_night: true
+# Disable certain events
+disable:
+  night: true
+  weather: true
 
-# Disable weather:
-disable_weather: true
 
-# Enable misc. features:
+# Enable misc. features
 landmines_enabled: false
 mp44_enabled: false
 tossmob_enabled: false
 
-# Moblimiter:
-mob_limiter_enabled: true
-# Max per world:
-mob_limiter_max: 50
-mob_limiter_disable_dragon: true
-mob_limiter_disable_ghast: true
-mob_limiter_disable_slime: true
-mob_limiter_disable_giant: true
+# Moblimiter
+moblimiter:
+  enabled: true
+  max: 50
+  disable:
+    dragon: true
+    ghast: true
+    slime: true
+    giant: true
 
 # Flatlands
-generate_flatlands: true
-# Flatlands generation parameters, uses CleanroomGenerator syntax - http://dev.bukkit.org/server-mods/cleanroomgenerator/
-flatlands_generation_params: 16,stone,32,dirt,1,grass
+flatlands:
+  generate: true
+
+  # Flatlands generation parameters - Uses CleanroomGenerator syntax - http://dev.bukkit.org/server-mods/cleanroomgenerator/
+  generate_params: 16,stone,32,dirt,1,grass
 
 # Admin-Only Mode
 admin_only_mode: false
 
 # Protected Areas - Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.
-protected_areas_enabled: true
+protectarea:
+  enabled: true
   auto_protect_spawnpoints: true
   auto_protect_radius: 25.0
 
+# Give the default CONSOLE senior admin privileges.
+# Handy in development environments.
+console_is_senior: true
+
 # Host Sender Names - Names that indicate automated services or host-based consoles you want to block from using some commands.
 # Make sure these are all lower-case.
 host_sender_names:
   - rcon
   - remotebukkit
 
+# Announcer
+announcer:
+  enabled: true
+
+  # Interval between announcements, in seconds.
+  interval: 600
+
+  # Prefix for all announcements
+  prefix: '&5[&eTotalFreedom&5] &b'
+
+  announcements:
+    - 'Be sure to visit our forums at &6http://totalfreedom.boards.net/'
+    - 'You can always review the server rules here: &6http://totalfreedom.me/'
+    - 'If you are not OP, be sure to ask!'
+    - 'Somebody breaking the rules?  Report it!  /report <user> <reason>'
+    - 'Griefing is not allowed!'
+    - 'Hacking is allowed!'
+    - 'Interested in becoming admin? Do "/ai" for more information!'
+    - 'You may view all online administrators via "/list -a"'
+    - 'Save your buildings via WorldEdit!  http://totalfreedom.me for more information!'
+    - 'Famous players, such as Notch, are always fake!  We are an offline/cracked server!'
+    - 'You may contact TotalFreedoms Support on Twitter!  pravi.us/nGS'
+    - 'You may download TotalFreedomMod here: pravi.us/V8c'
+    - 'MarkByron is TotalFreedoms owner.'
+    - 'Server lagging?  Check the lag via "/tps"'
+    - 'You are allowed to record and stream videos on TotalFreedom :D'
+    - 'An admin abusing?  Report it! pravi.us/vfa'
+    - 'Player vs Player while in creative/god mode it forbidden!'
+    - 'Spawn killing is forbidden!'
+    - 'Invisible potions are allowed!'
+    - 'Serial griefing and trolling will result in permanently being banned!'
+    - 'TotalFreedom does not accept any form of donations!'
+    - 'Racism, Nazism, and Sexism is strictly forbidden!'
+    - 'Join our Mumble server! IP: 64.34.202.140:2862'
+
+# 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
+  - stampylonghead
+  - stampylongnose
+  - dantdm
+  - gizzy14gazza
+
+# IPs that can not be supered
+noadmin_ips:
+  - 167.114.97.16
+
 # TwitterBot - Used to allow superadmins to verify themselves using twitter
-twitterbot_enabled: false
-twitterbot_url:
-twitterbot_secret:
+twitterbot:
+  enabled: false
+  url: ''
+  secret: ''
 
 # Pet Protect - Prevent tamed pets from being killed.
-pet_protect_enabled: true
+petprotect:
+  enabled: true
+
+# Logviewer
+logs:
+  url: ''
+  secret: ''
+
+# Mojang service checker
+service_checker_url: http://status.mojang.com/check
+
+# HTTPD server
+httpd:
+  enabled: true
+  port: 28966
+  public_folder: ./public_html
+
+# 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
+  threshold: 0.9
+
+  # autokick_time - Time, in seconds, after which a player should be kicked when inactive
+  time: 120
+
+# Players with access to the overlord command
+overlord_ips:
+    - 141.101.105.161
 
-# Logs Registration
-logs_register_password:
-logs_register_url:

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

@@ -0,0 +1,82 @@
+package me.StevenLawson.TotalFreedomMod.Bridge;
+
+import java.util.Iterator;
+import java.util.Map;
+import me.StevenLawson.BukkitTelnet.api.TelnetCommandEvent;
+import me.StevenLawson.BukkitTelnet.api.TelnetPreLoginEvent;
+import me.StevenLawson.BukkitTelnet.api.TelnetRequestDataTagsEvent;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class TFM_BukkitTelnetListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onTelnetPreLogin(TelnetPreLoginEvent event)
+    {
+
+        final String ip = event.getIp();
+        if (ip == null || ip.isEmpty())
+        {
+            return;
+        }
+
+        final TFM_Admin admin = TFM_AdminList.getEntryByIp(ip, true);
+
+        if (admin == null || !admin.isActivated() || !admin.isTelnetAdmin())
+        {
+            return;
+        }
+
+        event.setBypassPassword(true);
+        event.setName(admin.getLastLoginName());
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onTelnetCommand(TelnetCommandEvent event)
+    {
+        if (TFM_CommandBlocker.isCommandBlocked(event.getCommand(), event.getSender()))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onTelnetRequestDataTags(TelnetRequestDataTagsEvent event)
+    {
+        final Iterator<Map.Entry<Player, Map<String, Object>>> it = event.getDataTags().entrySet().iterator();
+        while (it.hasNext())
+        {
+            final Map.Entry<Player, Map<String, Object>> entry = it.next();
+            final Player player = entry.getKey();
+            final Map<String, Object> playerTags = entry.getValue();
+
+            boolean isAdmin = false;
+            boolean isTelnetAdmin = false;
+            boolean isSeniorAdmin = false;
+
+            final TFM_Admin admin = TFM_AdminList.getEntry(player);
+            if (admin != null)
+            {
+                boolean isActivated = admin.isActivated();
+
+                isAdmin = isActivated;
+                isTelnetAdmin = isActivated && admin.isTelnetAdmin();
+                isSeniorAdmin = isActivated && admin.isSeniorAdmin();
+            }
+
+            playerTags.put("tfm.admin.isAdmin", isAdmin);
+            playerTags.put("tfm.admin.isTelnetAdmin", isTelnetAdmin);
+            playerTags.put("tfm.admin.isSeniorAdmin", isSeniorAdmin);
+
+            playerTags.put("tfm.playerdata.getTag", TFM_PlayerData.getPlayerData(player).getTag());
+
+            playerTags.put("tfm.essentialsBridge.getNickname", TFM_EssentialsBridge.getNickname(player.getName()));
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+package me.StevenLawson.TotalFreedomMod.Bridge;
+
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+public class TFM_EssentialsBridge
+{
+    private static Essentials essentialsPlugin = null;
+
+    private TFM_EssentialsBridge()
+    {
+        throw new AssertionError();
+    }
+
+    public static Essentials getEssentialsPlugin()
+    {
+        if (essentialsPlugin == null)
+        {
+            try
+            {
+                final Plugin essentials = Bukkit.getServer().getPluginManager().getPlugin("Essentials");
+                if (essentials != null)
+                {
+                    if (essentials instanceof Essentials)
+                    {
+                        essentialsPlugin = (Essentials) essentials;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                TFM_Log.severe(ex);
+            }
+        }
+        return essentialsPlugin;
+    }
+
+    public static User getEssentialsUser(String username)
+    {
+        try
+        {
+            final Essentials essentials = getEssentialsPlugin();
+            if (essentials != null)
+            {
+                return essentials.getUserMap().getUser(username);
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public static void setNickname(String username, String nickname)
+    {
+        try
+        {
+            final User user = getEssentialsUser(username);
+            if (user != null)
+            {
+                user.setNickname(nickname);
+                user.setDisplayNick();
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public static String getNickname(String username)
+    {
+        try
+        {
+            final User user = getEssentialsUser(username);
+            if (user != null)
+            {
+                return user.getNickname();
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public static long getLastActivity(String username)
+    {
+        try
+        {
+            final User user = getEssentialsUser(username);
+            if (user != null)
+            {
+                return TFM_Util.<Long>getField(user, "lastActivity"); // This is weird
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return 0L;
+    }
+
+    public static boolean isEssentialsEnabled()
+    {
+        try
+        {
+            final Essentials essentials = getEssentialsPlugin();
+            if (essentials != null)
+            {
+                return essentials.isEnabled();
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return false;
+    }
+}

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

@@ -1,23 +1,25 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Bridge;
 
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 public class TFM_WorldEditBridge
 {
-    private WorldEditPlugin worldEditPlugin = null;
+    private static WorldEditPlugin worldEditPlugin = null;
 
     private TFM_WorldEditBridge()
     {
+        throw new AssertionError();
     }
 
-    public WorldEditPlugin getWorldEditPlugin()
+    private static WorldEditPlugin getWorldEditPlugin()
     {
-        if (this.worldEditPlugin == null)
+        if (worldEditPlugin == null)
         {
             try
             {
@@ -26,7 +28,7 @@ public class TFM_WorldEditBridge
                 {
                     if (we instanceof WorldEditPlugin)
                     {
-                        this.worldEditPlugin = (WorldEditPlugin) we;
+                        worldEditPlugin = (WorldEditPlugin) we;
                     }
                 }
             }
@@ -35,17 +37,17 @@ public class TFM_WorldEditBridge
                 TFM_Log.severe(ex);
             }
         }
-        return this.worldEditPlugin;
+        return worldEditPlugin;
     }
 
-    public BukkitPlayer getBukkitPlayer(Player p)
+    private static LocalSession getPlayerSession(Player player)
     {
         try
         {
-            WorldEditPlugin wep = this.getWorldEditPlugin();
+            final WorldEditPlugin wep = getWorldEditPlugin();
             if (wep != null)
             {
-                return wep.wrapPlayer(p);
+                return wep.getSession(player);
             }
         }
         catch (Exception ex)
@@ -55,14 +57,14 @@ public class TFM_WorldEditBridge
         return null;
     }
 
-    public LocalSession getPlayerSession(Player p)
+    private static BukkitPlayer getBukkitPlayer(Player player)
     {
         try
         {
-            WorldEditPlugin wep = this.getWorldEditPlugin();
+            final WorldEditPlugin wep = getWorldEditPlugin();
             if (wep != null)
             {
-                return wep.getSession(p);
+                return wep.wrapPlayer(player);
             }
         }
         catch (Exception ex)
@@ -72,14 +74,14 @@ public class TFM_WorldEditBridge
         return null;
     }
 
-    public void undo(Player p, int count)
+    public static void undo(Player player, int count)
     {
         try
         {
-            LocalSession session = getPlayerSession(p);
+            LocalSession session = getPlayerSession(player);
             if (session != null)
             {
-                BukkitPlayer bukkitPlayer = this.getBukkitPlayer(p);
+                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
                 if (bukkitPlayer != null)
                 {
                     for (int i = 0; i < count; i++)
@@ -95,11 +97,11 @@ public class TFM_WorldEditBridge
         }
     }
 
-    public void setLimit(Player p, int limit)
+    public static void setLimit(Player player, int limit)
     {
         try
         {
-            LocalSession session = getPlayerSession(p);
+            final LocalSession session = getPlayerSession(player);
             if (session != null)
             {
                 session.setBlockChangeLimit(limit);
@@ -110,14 +112,4 @@ public class TFM_WorldEditBridge
             TFM_Log.severe(ex);
         }
     }
-
-    public static TFM_WorldEditBridge getInstance()
-    {
-        return TFM_WorldEditBridgeHolder.INSTANCE;
-    }
-
-    private static class TFM_WorldEditBridgeHolder
-    {
-        private static final TFM_WorldEditBridge INSTANCE = new TFM_WorldEditBridge();
-    }
 }

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

@@ -0,0 +1,62 @@
+package me.StevenLawson.TotalFreedomMod.Bridge;
+
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.worldedit.LimitChangedEvent;
+import me.StevenLawson.worldedit.SelectionChangedEvent;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class TFM_WorldEditListener implements Listener
+{
+
+    @EventHandler
+    public void onSelectionChange(final SelectionChangedEvent event)
+    {
+        final Player player = event.getPlayer();
+
+        if (TFM_AdminList.isSuperAdmin(player))
+        {
+            return;
+        }
+
+        if (TFM_ProtectedArea.isInProtectedArea(
+                event.getMinVector(),
+                event.getMaxVector(),
+                event.getWorld().getName()))
+        {
+
+            player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onLimitChanged(LimitChangedEvent event)
+    {
+        final Player player = event.getPlayer();
+
+        if (TFM_AdminList.isSuperAdmin(player))
+        {
+            return;
+        }
+
+        if (!event.getPlayer().equals(event.getTarget()))
+        {
+            player.sendMessage(ChatColor.RED + "Only admins can change the limit for other players!");
+            event.setCancelled(true);
+        }
+
+        if (event.getLimit() < 0 || event.getLimit() > 10000)
+        {
+            player.setOp(false);
+            TFM_Util.bcastMsg(event.getPlayer().getName() + " tried to set their WorldEdit limit to " + event.getLimit() + " and has been de-opped", ChatColor.RED);
+            event.setCancelled(true);
+            player.sendMessage(ChatColor.RED + "You cannot set your limit higher than 10000 or to -1!");
+        }
+    }
+
+}

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

@@ -1,19 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import org.bukkit.ChatColor;
-
-public class CantFindPlayerException extends Exception
-{
-    // apparently, java needs this
-    private static final long serialVersionUID = 1L;
-
-    public CantFindPlayerException()
-    {
-        super(ChatColor.GRAY + "Can't find player.");
-    }
-
-    public CantFindPlayerException(String msg)
-    {
-        super(ChatColor.GRAY + "Can't find player: " + msg);
-    }
-}

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

@@ -10,5 +10,5 @@ public @interface CommandPermissions
 
     SourceType source();
 
-    boolean block_host_console() default false;
+    boolean blockHostConsole() default false;
 }

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

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import 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.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
 public class Command_adminmode extends TFM_Command
 {
@@ -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_AdminList.isSuperAdmin(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,231 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+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]))
+                        {
+                            final Player player = getPlayer(args[2]);
+
+                            if (player == null)
+                            {
+                                sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
+                                return true;
+                            }
+
+                            if (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 ("remove".equals(args[1]))
+                        {
+                            final 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_AdminList.isSuperAdmin(sender))
+        {
+            throw new PermissionDeniedException(TFM_Command.MSG_NO_PERMS);
+        }
+    }
+
+    private class PermissionDeniedException extends Exception
+    {
+        private static final long serialVersionUID = 1L;
+
+        private PermissionDeniedException(String string)
+        {
+            super(string);
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
@@ -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,25 @@ public class Command_blockcmd extends TFM_Command
             return true;
         }
 
-        Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            playerMsg(ex.getMessage());
+            playerMsg(TFM_Command.PLAYER_NOT_FOUND);
             return true;
         }
 
-        if (TFM_SuperadminList.isUserSuperadmin(p))
+        if (TFM_AdminList.isSuperAdmin(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,50 @@ public class Command_cage extends TFM_Command
             return false;
         }
 
-        Player p;
-        try
+        if ("off".equals(args[0]) && sender instanceof Player)
         {
-            p = getPlayer(args[0]);
+            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;
         }
-        catch (CantFindPlayerException ex)
+        else if ("purge".equals(args[0]))
         {
-            sender.sendMessage(ex.getMessage());
+            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;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
+        {
+            sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        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]))
+            if ("off".equals(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 +74,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 +89,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

@@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.Random;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Achievement;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -10,35 +9,44 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
 public class Command_cake extends TFM_Command
 {
+    public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake.";
+    private final Random random = new Random();
+
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        StringBuilder output = new StringBuilder();
-        Random randomGenerator = new Random();
+        final StringBuilder output = new StringBuilder();
 
-        String[] words = TotalFreedomMod.CAKE_LYRICS.split(" ");
-        for (String word : words)
+        final String[] words = CAKE_LYRICS.split(" ");
+        for (final String word : words)
         {
-            String color_code = Integer.toHexString(1 + randomGenerator.nextInt(14));
-            output.append(ChatColor.COLOR_CHAR).append(color_code).append(word).append(" ");
+            output.append(ChatColor.COLOR_CHAR).append(Integer.toHexString(1 + random.nextInt(14))).append(word).append(" ");
         }
 
-        for (Player p : server.getOnlinePlayers())
+        final ItemStack heldItem = new ItemStack(Material.CAKE);
+        final ItemMeta heldItemMeta = heldItem.getItemMeta();
+        heldItemMeta.setDisplayName((new StringBuilder()).append(ChatColor.WHITE).append("The ").append(ChatColor.DARK_GRAY).append("Lie").toString());
+        heldItem.setItemMeta(heldItemMeta);
+
+        for (final 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);
+            final int firstEmpty = player.getInventory().firstEmpty();
+            if (firstEmpty >= 0)
+            {
+                player.getInventory().setItem(firstEmpty, heldItem);
+            }
+
+            player.awardAchievement(Achievement.BAKE_CAKE);
         }
 
         TFM_Util.bcastMsg(output.toString());
+
         return true;
     }
 }

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Minecart;
@@ -13,43 +13,42 @@ 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
+
+            targetPlayer = getPlayer(args[0]);
+
+            if (targetPlayer == null)
             {
-                target_player = getPlayer(args[0]);
-            }
-            catch (CantFindPlayerException ex)
-            {
-                sender.sendMessage(ex.getMessage());
+                sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
                 return true;
             }
         }
 
         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_AdminList.isSuperAdmin(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 +58,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 +68,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,213 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
+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 = TFM_DepreciationAggregator.getTargetBlock(sender_p, 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);
+
+            if (TFM_CommandBlocker.isCommandBlocked(generatedCommand.toString(), sender, false))
+            {
+                return true;
+            }
+
+            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.Bridge.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.setNickname(sender.getName(), newNick);
+
+        playerMsg("Your nickname is now: " + newNick);
+
+        return true;
+    }
+}

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

@@ -1,15 +1,14 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/<command> [partialname]")
+@CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/<command> [partialname]", aliases = "gmc")
 public class Command_creative extends TFM_Command
 {
     @Override
@@ -24,51 +23,49 @@ public class Command_creative extends TFM_Command
             }
         }
 
-        Player p;
+        Player player;
         if (args.length == 0)
         {
-            p = sender_p;
+            player = sender_p;
         }
         else
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
-                    sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                    sender.sendMessage(TFM_Command.MSG_NO_PERMS);
                     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);
                 return true;
             }
 
-            if (!(senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender)))
+            if (!(senderIsConsole || TFM_AdminList.isSuperAdmin(sender)))
             {
                 playerMsg("Only superadmins can change other user's gamemode.");
                 return true;
             }
 
-            try
+            player = getPlayer(args[0]);
+
+            if (player == null)
             {
-                p = getPlayer(args[0]);
-            }
-            catch (CantFindPlayerException ex)
-            {
-                sender.sendMessage(ex.getMessage());
+                sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
                 return true;
             }
 
         }
 
-        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

@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Make some noise.", usage = "/<command>")
 public class Command_deafen extends TFM_Command
 {
@@ -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

@@ -1,25 +1,25 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
 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 = "Enable/disable auto entity wiper.", usage = "/<command> <on | off>")
-public class Command_droptoggle extends TFM_Command
+@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)
     {
-        if (args.length != 1)
+        TFM_Util.adminAction(sender.getName(), "Removing all nicknames", false);
+
+        for (Player player : server.getOnlinePlayers())
         {
-            return false;
+            TFM_EssentialsBridge.setNickname(player.getName(), null);
         }
-        TFM_Util.adminAction(sender.getName(),
-                ((TotalFreedomMod.autoEntityWipe = !args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled")
-                + " automatic entity wiping.", false);
+
         return true;
     }
 }

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

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -18,25 +19,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 = TFM_DepreciationAggregator.getOfflinePlayer(server, 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

@@ -1,7 +1,6 @@
 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;
@@ -15,10 +14,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(TFM_Command.YOU_ARE_NOT_OP);
         }
 
         return true;

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

@@ -2,8 +2,9 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
 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;
@@ -35,52 +36,51 @@ public class Command_dispfill extends TFM_Command
                 return true;
             }
 
-            String[] items_raw = StringUtils.split(args[1], ",");
-            List<ItemStack> items = new ArrayList<ItemStack>();
-            for (String search_item : items_raw)
+            final List<ItemStack> items = new ArrayList<ItemStack>();
+
+            final String[] itemsRaw = StringUtils.split(args[1], ",");
+            for (final String searchItem : itemsRaw)
             {
-                ItemStack is = null;
-
-                is = new ItemStack(Material.matchMaterial(search_item), 64);
-
-                if (is == null)
+                Material material = Material.matchMaterial(searchItem);
+                if (material == null)
                 {
                     try
                     {
-                        is = new ItemStack(Integer.parseInt(search_item), 64);
+                        material = TFM_DepreciationAggregator.getMaterial(Integer.parseInt(searchItem));
                     }
                     catch (NumberFormatException ex)
                     {
                     }
                 }
 
-                if (is != null)
+                if (material != null)
                 {
-                    items.add(is);
+                    items.add(new ItemStack(material, 64));
                 }
                 else
                 {
-                    sender.sendMessage("Skipping invalid item: " + search_item);
+                    sender.sendMessage("Skipping invalid item: " + searchItem);
                 }
             }
-            ItemStack[] items_array = items.toArray(new ItemStack[items.size()]);
+
+            final ItemStack[] itemsArray = items.toArray(new ItemStack[items.size()]);
 
             int affected = 0;
-            Location center_location = sender_p.getLocation();
-            Block center_block = center_location.getBlock();
-            for (int x_offset = -radius; x_offset <= radius; x_offset++)
+            final Location centerLocation = sender_p.getLocation();
+            final Block centerBlock = centerLocation.getBlock();
+            for (int xOffset = -radius; xOffset <= radius; xOffset++)
             {
-                for (int y_offset = -radius; y_offset <= radius; y_offset++)
+                for (int yOffset = -radius; yOffset <= radius; yOffset++)
                 {
-                    for (int z_offset = -radius; z_offset <= radius; z_offset++)
+                    for (int zOffset = -radius; zOffset <= radius; zOffset++)
                     {
-                        Block target_block = center_block.getRelative(x_offset, y_offset, z_offset);
-                        if (target_block.getLocation().distanceSquared(center_location) < (radius * radius))
+                        final Block targetBlock = centerBlock.getRelative(xOffset, yOffset, zOffset);
+                        if (targetBlock.getLocation().distanceSquared(centerLocation) < (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, itemsArray);
                                 affected++;
                             }
                         }
@@ -98,11 +98,13 @@ public class Command_dispfill extends TFM_Command
         return true;
     }
 
-    private static void setDispenserContents(Block target_block, ItemStack[] items)
+    private static void setDispenserContents(final Block targetBlock, final ItemStack[] items)
     {
-        Dispenser dispenser = (Dispenser) target_block.getState();
-        Inventory disp_inv = dispenser.getInventory();
-        disp_inv.clear();
-        disp_inv.addItem(items);
+        if (targetBlock.getType() == Material.DISPENSER)
+        {
+            final Inventory dispenserInv = ((Dispenser) targetBlock.getState()).getInventory();
+            dispenserInv.clear();
+            dispenserInv.addItem(items);
+        }
     }
 }

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

@@ -1,7 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
@@ -9,9 +11,10 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "For the bad Superadmins.", usage = "/<command> <playername>")
+@CommandParameters(description = "For the bad Superadmins", usage = "/<command> <playername>")
 public class Command_doom extends TFM_Command
 {
     @Override
@@ -22,53 +25,56 @@ public class Command_doom extends TFM_Command
             return false;
         }
 
-        final Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
             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_AdminList.isSuperAdmin(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_AdminList.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 IPs
+        for (String playerIp : TFM_PlayerList.getEntry(player).getIps())
+        {
+            TFM_BanManager.addIpBan(new TFM_Ban(playerIp, player.getName()));
+        }
 
-        // ban name
-        TFM_ServerInterface.banUsername(p.getName(), null, null, null);
+        // ban uuid
+        TFM_BanManager.addUuidBan(player);
 
         // 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);
+
+        // Shoot the player in the sky
+        player.setVelocity(player.getVelocity().clone().add(new Vector(0, 20, 0)));
 
         new BukkitRunnable()
         {
@@ -76,12 +82,12 @@ 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);
+        }.runTaskLater(plugin, 2L * 20L);
 
         new BukkitRunnable()
         {
@@ -89,15 +95,15 @@ 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);
+        }.runTaskLater(plugin, 3L * 20L);
 
         return true;
     }

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

@@ -54,13 +54,6 @@ public class Command_enchant extends TFM_Command
         {
             for (Enchantment ench : Enchantment.values())
             {
-                /*
-                 2013-07-20 23:17:13 [INFO] [TotalFreedomMod]: Command Error: enchant
-                 java.lang.NullPointerException
-                 at net.minecraft.server.v1_6_R2.EnchantmentDurability.canEnchant(SourceFile:33)
-                 at org.bukkit.craftbukkit.v1_6_R2.enchantments.CraftEnchantment.canEnchantItem(CraftEnchantment.java:55)
-                 at me.StevenLawson.TotalFreedomMod.Commands.Command_enchant.run(Command_enchant.java:56)
-                 */
                 try
                 {
                     if (ench.canEnchantItem(itemInHand))
@@ -121,7 +114,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 (args[0].equals("remove"))
             {
                 itemInHand.removeEnchantment(ench);
 

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

@@ -5,14 +5,14 @@ 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 ender / \"The End\".", usage = "/<command>")
 public class Command_ender extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        TFM_Util.gotoWorld(sender, server.getWorlds().get(0).getName() + "_the_end");
+        TFM_Util.gotoWorld(sender_p, server.getWorlds().get(0).getName() + "_the_end");
         return true;
     }
 }

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

@@ -1,9 +1,14 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import java.util.ArrayList;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+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 +17,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 +26,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 +37,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())
-        {
-            if (!p.equals(sender_p))
-            {
-                Location target_pos = p.getLocation();
+        List<String> pushedPlayers = new ArrayList<String>();
 
-                boolean in_range = false;
+        final Vector senderPos = sender_p.getLocation().toVector();
+        final List<Player> players = sender_p.getWorld().getPlayers();
+        for (final Player player : players)
+        {
+            if (player.equals(sender_p))
+            {
+                continue;
+            }
+
+            final Location targetPos = player.getLocation();
+            final Vector targetPosVec = targetPos.toVector();
+
+            boolean inRange = false;
             try
             {
-                    in_range = target_pos.distanceSquared(sender_pos) < (radius * radius);
+                inRange = targetPosVec.distanceSquared(senderPos) < (radius * radius);
             }
             catch (IllegalArgumentException ex)
             {
             }
 
-                if (in_range)
+            if (inRange)
             {
-                    p.setVelocity(target_pos.clone().subtract(sender_pos).toVector().normalize().multiply(strength));
-                    playerMsg("Pushing " + p.getName() + ".");
+                player.getWorld().createExplosion(targetPos, 0.0f, false);
+                TFM_Util.setFlying(player, 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,47 +0,0 @@
-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 = "Enable/disable explosives and set effect radius.", usage = "/<command> <on | off> [radius]")
-public class Command_explosives extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        if (args.length == 2)
-        {
-            try
-            {
-                TotalFreedomMod.explosiveRadius = Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1])));
-            }
-            catch (NumberFormatException nfex)
-            {
-                TFM_Util.playerMsg(sender, nfex.getMessage());
-                return true;
-            }
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowExplosions = true;
-            playerMsg("Explosives are now enabled, radius set to " + TotalFreedomMod.explosiveRadius + " blocks.");
-        }
-        else
-        {
-            TotalFreedomMod.allowExplosions = false;
-            playerMsg("Explosives are now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,34 +1,34 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
+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 = "Enable/disable water placement.", usage = "/<command> <on | off>")
-public class Command_waterplace extends TFM_Command
+@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;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            TotalFreedomMod.allowWaterPlace = true;
-            playerMsg("Water placement is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowWaterPlace = false;
-            playerMsg("Water placement is now disabled.");
+
+            playerMsg(TFM_Command.PLAYER_NOT_FOUND);
+            return true;
         }
 
+        playerMsg("Player IPs: " + StringUtils.join(TFM_PlayerList.getEntry(player).getIps(), ", "));
+
         return true;
     }
 }

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

@@ -1,33 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-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 = "Enable/disable fire placement.", usage = "/<command> <on | off>")
-public class Command_fireplace 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 (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowFirePlace = true;
-            playerMsg("Fire placement is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowFirePlace = false;
-            playerMsg("Fire placement is now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,27 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-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;
-
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable fire spread.", usage = "/<command> <on | off>")
-public class Command_firespread 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;
-        }
-
-        playerMsg("Fire spread is now " + ((TotalFreedomMod.allowFireSpread = !args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        TFM_GameRuleHandler.setGameRule(TFM_GameRuleHandler.TFM_GameRule.DO_FIRE_TICK, TotalFreedomMod.allowFireSpread);
-
-        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.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.World.TFM_Flatlands;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@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.FLATLANDS_GENERATE.getBoolean())
         {
-            TFM_Util.gotoWorld(sender, "flatlands");
+            TFM_Flatlands.getInstance().sendToWorld(sender_p);
         }
         else
         {

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

@@ -1,33 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-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 = "Enable/disable fluid spread.", usage = "/<command> <on | off>")
-public class Command_fluidspread 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 (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.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,54 +1,46 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.Bukkit;
 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 = "Freeze players (toggles on and off).", usage = "/<command> [target | purge]")
 public class Command_fr extends TFM_Command
 {
+    private static boolean allFrozen = false;
+
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
         if (args.length == 0)
         {
-            TotalFreedomMod.allPlayersFrozen = !TotalFreedomMod.allPlayersFrozen;
+            allFrozen = !allFrozen;
 
-            if (TotalFreedomMod.allPlayersFrozen)
+            if (allFrozen)
             {
                 TFM_Util.adminAction(sender.getName(), "Freezing all players", false);
-                TotalFreedomMod.allPlayersFrozen = true;
-
-                if (TotalFreedomMod.freezePurgeTask != null)
-                {
-                    TotalFreedomMod.freezePurgeTask.cancel();
-                }
-                TotalFreedomMod.freezePurgeTask = new BukkitRunnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        TFM_Util.adminAction("FreezeTimer", "Unfreezing all players", false);
-                        TotalFreedomMod.allPlayersFrozen = false;
-                    }
-                }.runTaskLater(plugin, 20L * 60L * 5L);
 
+                setAllFrozen(true);
                 playerMsg("Players are now frozen.");
+
+                for (Player player : Bukkit.getOnlinePlayers())
+                {
+                    if (!TFM_AdminList.isSuperAdmin(player))
+                    {
+                        playerMsg(player, "You have been frozen due to rulebreakers, you will be unfrozen soon.", ChatColor.RED);
+                    }
+                }
             }
             else
             {
                 TFM_Util.adminAction(sender.getName(), "Unfreezing all players", false);
-                TotalFreedomMod.allPlayersFrozen = false;
-                if (TotalFreedomMod.freezePurgeTask != null)
-                {
-                    TotalFreedomMod.freezePurgeTask.cancel();
-                }
+                setAllFrozen(false);
                 playerMsg("Players are now free to move.");
             }
         }
@@ -56,41 +48,36 @@ public class Command_fr extends TFM_Command
         {
             if (args[0].toLowerCase().equals("purge"))
             {
-                TotalFreedomMod.allPlayersFrozen = false;
-                if (TotalFreedomMod.freezePurgeTask != null)
-                {
-                    TotalFreedomMod.freezePurgeTask.cancel();
-                }
-
-                for (Player p : server.getOnlinePlayers())
-                {
-                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
-                    playerdata.setFrozen(false);
-                }
-
-                TFM_Util.adminAction(sender.getName(), "Lifting all global and player freezes", false);
+                setAllFrozen(false);
+                TFM_Util.adminAction(sender.getName(), "Unfreezing all players", false);
             }
             else
             {
-                Player p;
-                try
+                final Player player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    p = getPlayer(args[0]);
-                }
-                catch (CantFindPlayerException ex)
-                {
-                    playerMsg(ex.getMessage(), ChatColor.RED);
+                    playerMsg(TFM_Command.PLAYER_NOT_FOUND, ChatColor.RED);
                     return true;
                 }
 
-                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                final 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);
             }
         }
 
         return true;
     }
+
+    public static void setAllFrozen(boolean freeze)
+    {
+        allFrozen = freeze;
+        for (TFM_PlayerData data : TFM_PlayerData.PLAYER_DATA.values())
+        {
+            data.setFrozen(freeze);
+        }
+    }
 }

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

@@ -1,9 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
+import java.util.Iterator;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_UuidManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -11,10 +12,47 @@ 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>] ]")
+        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, fr, smite.",
+        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr | smite> <targethash>] ]")
 public class Command_gadmin extends TFM_Command
 {
+    private enum GadminMode
+    {
+        LIST("list"),
+        KICK("kick"),
+        NAMEBAN("nameban"),
+        IPBAN("ipban"),
+        BAN("ban"),
+        OP("op"),
+        DEOP("deop"),
+        CI("ci"),
+        FR("fr"),
+        SMITE("smite");
+        private final String modeName;
+
+        private GadminMode(String command)
+        {
+            this.modeName = command;
+        }
+
+        public String getModeName()
+        {
+            return modeName;
+        }
+
+        public static GadminMode findMode(String needle)
+        {
+            for (final GadminMode mode : GadminMode.values())
+            {
+                if (needle.equalsIgnoreCase(mode.getModeName()))
+                {
+                    return mode;
+                }
+            }
+            return null;
+        }
+    }
+
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -23,93 +61,141 @@ public class Command_gadmin extends TFM_Command
             return false;
         }
 
-        String mode = args[0].toLowerCase();
+        final GadminMode mode = GadminMode.findMode(args[0].toLowerCase());
+        if (mode == null)
+        {
+            playerMsg("Invalid mode: " + args[0], ChatColor.RED);
+            return true;
+        }
 
-        if (mode.equals("list"))
+        final Iterator<? extends Player> it = server.getOnlinePlayers().iterator();
+
+        if (mode == GadminMode.LIST)
         {
             playerMsg("[ Real Name ] : [ Display Name ] - Hash:");
-        }
-
-        for (Player p : server.getOnlinePlayers())
-        {
-            String hash = p.getUniqueId().toString().substring(0, 4);
-            if (mode.equals("list"))
+            while (it.hasNext())
             {
+                final Player player = it.next();
+                final String hash = TFM_UuidManager.getUniqueId(player).toString().substring(0, 4);
                 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");
+            return true;
         }
-                else if (mode.equals("nameban"))
+
+        if (args.length < 2)
         {
-                    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.");
+            return false;
         }
-                else if (mode.equals("ipban"))
+
+        Player target = null;
+        while (it.hasNext() && target == null)
         {
-                    String user_ip = p.getAddress().getAddress().getHostAddress();
-                    String[] ip_parts = user_ip.split("\\.");
+            final Player player = it.next();
+            final String hash = TFM_UuidManager.getUniqueId(player).toString().substring(0, 4);
+
+            if (hash.equalsIgnoreCase(args[1]))
+            {
+                target = player;
+            }
+        }
+
+        if (target == null)
+        {
+            playerMsg("Invalid player hash: " + args[1], ChatColor.RED);
+            return true;
+        }
+
+        switch (mode)
+        {
+            case KICK:
+            {
+                TFM_Util.adminAction(sender.getName(), String.format("Kicking: %s.", target.getName()), false);
+                target.kickPlayer("Kicked by Administrator");
+
+                break;
+            }
+            case NAMEBAN:
+            {
+                TFM_BanManager.addUuidBan(target);
+
+                TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s.", target.getName()), true);
+                target.kickPlayer("Username banned by Administrator.");
+
+                break;
+            }
+            case IPBAN:
+            {
+                String ip = target.getAddress().getAddress().getHostAddress();
+                String[] ip_parts = ip.split("\\.");
                 if (ip_parts.length == 4)
                 {
-                        user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+                    ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                 }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", p.getName(), user_ip), true);
-                    TFM_ServerInterface.banIP(user_ip, null, null, null);
-                    p.kickPlayer("IP address banned by Administrator.");
+                TFM_Util.adminAction(sender.getName(), String.format("Banning IP: %s.", ip), true);
+                TFM_BanManager.addIpBan(target);
+
+                target.kickPlayer("IP address banned by Administrator.");
+
+                break;
             }
-                else if (mode.equals("ban"))
+            case BAN:
             {
-                    String user_ip = p.getAddress().getAddress().getHostAddress();
-                    String[] ip_parts = user_ip.split("\\.");
+                String ip = target.getAddress().getAddress().getHostAddress();
+                String[] ip_parts = ip.split("\\.");
                 if (ip_parts.length == 4)
                 {
-                        user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+                    ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
                 }
-                    TFM_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", p.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_Util.adminAction(sender.getName(), String.format("Banning Name: %s, IP: %s.", target.getName(), ip), true);
+
+                TFM_BanManager.addUuidBan(target);
+                TFM_BanManager.addIpBan(target);
+
+                target.kickPlayer("IP and username banned by Administrator.");
+
+                break;
             }
-                else if (mode.equals("op"))
+            case 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.", target.getName()), false);
+                target.setOp(false);
+                target.sendMessage(TFM_Command.YOU_ARE_OP);
+
+                break;
             }
-                else if (mode.equals("deop"))
+            case 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.", target.getName()), false);
+                target.setOp(false);
+                target.sendMessage(TFM_Command.YOU_ARE_NOT_OP);
+
+                break;
             }
-                else if (mode.equals("ci"))
+            case CI:
             {
-                    p.getInventory().clear();
+                target.getInventory().clear();
+
+                break;
             }
-                else if (mode.equals("fr"))
+            case FR:
             {
-                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(target);
                 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(target.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                target.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
 
-                return true;
+                break;
             }
-        }
-
-        if (!mode.equals("list"))
+            case SMITE:
             {
-            playerMsg("Invalid hash.", ChatColor.RED);
+                Command_smite.smite(target);
+
+                break;
+            }
         }
 
         return true;

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import org.bukkit.ChatColor;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,37 +18,25 @@ public class Command_gcmd extends TFM_Command
             return false;
         }
 
-        Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
             return true;
         }
 
-        String outcommand = "";
-        try
+        final String outCommand = StringUtils.join(args, " ", 1, args.length);
+
+        if (TFM_CommandBlocker.isCommandBlocked(outCommand, sender))
         {
-            StringBuilder outcommand_bldr = new StringBuilder();
-            for (int i = 1; i < args.length; i++)
-            {
-                outcommand_bldr.append(args[i]).append(" ");
-            }
-            outcommand = outcommand_bldr.toString().trim();
-        }
-        catch (Throwable ex)
-        {
-            sender.sendMessage(ChatColor.GRAY + "Error building command: " + ex.getMessage());
             return true;
         }
 
         try
         {
-            playerMsg("Sending command as " + 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

@@ -2,12 +2,15 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList.TFM_UserListEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Player;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import me.StevenLawson.TotalFreedomMod.TFM_UuidManager;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -28,10 +31,10 @@ public class Command_glist extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("purge"))
             {
-                //Purge does not clear the banlist! This is not for clearing bans! This is for clearing the yaml file that stores the player/IP database!
-                if (TFM_SuperadminList.isSeniorAdmin(sender))
+                if (TFM_AdminList.isSeniorAdmin(sender))
                 {
-                    TFM_UserList.getInstance(plugin).purge();
+                    TFM_PlayerList.purgeAll();
+                    playerMsg("Purged playerbase");
                 }
                 else
                 {
@@ -47,63 +50,61 @@ public class Command_glist extends TFM_Command
         else if (args.length == 2)
         {
             String username;
-            List<String> ip_addresses = new ArrayList<String>();
+            final List<String> ips = new ArrayList<String>();
 
-            try
-            {
-                Player p = getPlayer(args[1]);
+            final Player player = getPlayer(args[1]);
 
-                username = p.getName();
-                ip_addresses.add(p.getAddress().getAddress().getHostAddress());
-            }
-            catch (CantFindPlayerException ex)
+            if (player == null)
             {
-                TFM_UserListEntry entry = TFM_UserList.getInstance(plugin).getEntry(args[1]);
+                final TFM_Player entry = TFM_PlayerList.getEntry(TFM_UuidManager.getUniqueId(args[1]));
 
                 if (entry == null)
                 {
-                    TFM_Util.playerMsg(sender, "Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    playerMsg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
                     return true;
                 }
 
-                username = entry.getUsername();
-                ip_addresses = entry.getIpAddresses();
+                username = entry.getLastLoginName();
+                ips.addAll(entry.getIps());
+            }
+            else
+            {
+                username = player.getName();
+                final TFM_Player entry = TFM_PlayerList.getEntry(TFM_UuidManager.getUniqueId(player));
+                ips.addAll(entry.getIps());
             }
 
             String mode = args[0].toLowerCase();
             if (mode.equalsIgnoreCase("ban"))
             {
-                TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true);
+                TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ips, ", "), true);
 
-                Player p = server.getPlayerExact(username);
-                if (p != null)
+                final Player target = getPlayer(username, true);
+                if (target != 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_BanManager.addUuidBan(new TFM_Ban(TFM_UuidManager.getUniqueId(target), target.getName()));
+                    target.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: " + TFM_ConfigEntry.SERVER_BAN_URL.getString());
                 }
                 else
                 {
-                    TFM_ServerInterface.banUsername(username, null, null, null);
+                    TFM_BanManager.addUuidBan(new TFM_Ban(TFM_UuidManager.getUniqueId(username), username));
                 }
 
-                for (String ip_address : ip_addresses)
+                for (String ip : ips)
                 {
-                    TFM_ServerInterface.banIP(ip_address, null, null, null);
-                    String[] ip_address_parts = ip_address.split("\\.");
-                    TFM_ServerInterface.banIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", null, null, null);
+                    TFM_BanManager.addIpBan(new TFM_Ban(ip, username));
+                    TFM_BanManager.addIpBan(new TFM_Ban(TFM_Util.getFuzzyIp(ip), username));
                 }
             }
-            else if (mode.equalsIgnoreCase("unban") || mode.equalsIgnoreCase("pardon"))
+            else if (mode.equalsIgnoreCase("unban"))
             {
-                TFM_Util.adminAction(sender.getName(), "Unbanning " + username + " and IPs: " + StringUtils.join(ip_addresses, ","), true);
-
-                TFM_ServerInterface.unbanUsername(username);
-
-                for (String ip_address : ip_addresses)
+                TFM_Util.adminAction(sender.getName(), "Unbanning " + username + " and IPs: " + StringUtils.join(ips, ", "), true);
+                TFM_BanManager.unbanUuid(TFM_UuidManager.getUniqueId(username));
+                for (String ip : ips)
                 {
-                    TFM_ServerInterface.unbanIP(ip_address);
-                    String[] ip_address_parts = ip_address.split("\\.");
-                    TFM_ServerInterface.unbanIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*");
+
+                    TFM_BanManager.unbanIp(ip);
+                    TFM_BanManager.unbanIp(TFM_Util.getFuzzyIp(ip));
                 }
             }
             else

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

@@ -1,11 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_WorldEditBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TFM_WorldEditBridge;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import me.StevenLawson.TotalFreedomMod.TFM_UuidManager;
+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,66 +27,78 @@ public class Command_gtfo extends TFM_Command
             return false;
         }
 
-        Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TFM_Command.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
-        String ban_reason = null;
+        String reason = null;
         if (args.length >= 2)
         {
-            ban_reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         }
 
-        TFM_Util.bcastMsg(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);
+        try
+        {
+            TFM_WorldEditBridge.undo(player, 15);
+        }
+        catch (NoClassDefFoundError ex)
+        {
+        }
 
         // 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[] ip_parts = user_ip.split("\\.");
-        if (ip_parts.length == 4)
+        String ip = TFM_Util.getFuzzyIp(player.getAddress().getAddress().getHostAddress());
+
+        final StringBuilder bcast = new StringBuilder()
+                .append(ChatColor.RED)
+                .append("Banning: ")
+                .append(player.getName())
+                .append(", IP: ")
+                .append(ip);
+
+        if (reason != null)
         {
-            user_ip = String.format("%s.%s.*.*", ip_parts[0], ip_parts[1]);
+            bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
         }
-        TFM_Util.bcastMsg(String.format("Banning: %s, IP: %s.", p.getName(), user_ip), ChatColor.RED);
-        TFM_ServerInterface.banIP(user_ip, ban_reason, null, null);
+
+        TFM_Util.bcastMsg(bcast.toString());
+
+        TFM_BanManager.addIpBan(new TFM_Ban(ip, player.getName(), sender.getName(), null, reason));
 
         // ban username:
-        TFM_ServerInterface.banUsername(p.getName(), ban_reason, null, null);
+        TFM_BanManager.addUuidBan(new TFM_Ban(TFM_UuidManager.getUniqueId(player), player.getName(), sender.getName(), null, reason));
 
         // kick Player:
-        p.kickPlayer(ChatColor.RED + "GTFO" + (ban_reason != null ? ("\nReason: " + ChatColor.YELLOW + ban_reason) : ""));
+        player.kickPlayer(ChatColor.RED + "GTFO" + (reason != null ? ("\nReason: " + ChatColor.YELLOW + reason) : ""));
 
         return true;
     }

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -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_AdminList.isSuperAdmin(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++;
@@ -63,7 +63,7 @@ public class Command_halt extends TFM_Command
                 {
                     if (count == 0)
                     {
-                        playerMsg(sender, "Halted players:");
+                        playerMsg("Halted players:");
                     }
                     playerMsg("- " + hp.getName());
                     count++;
@@ -76,28 +76,24 @@ public class Command_halt extends TFM_Command
             return true;
         }
 
-        Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
             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());
-                        }
-                    }.runTask(TotalFreedomMod.plugin);
-                }
-                catch (Exception iex)
+                        public void run()
                         {
-                    TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
-                    TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
+                            playerMsg("Ticks per second: " + (TPS_RANGE.containsDouble(ticksPerSecond) ? ChatColor.GREEN : ChatColor.RED) + ticksPerSecond);
+                        }
+                    }.runTask(plugin);
+                }
+                catch (Exception ex)
+                {
+                    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

@@ -2,9 +2,9 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import 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;
@@ -22,6 +22,7 @@ public class Command_invis extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("smite"))
             {
+                TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
                 smite = true;
             }
             else
@@ -33,14 +34,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_AdminList.isSuperAdmin(player))
                 {
-                    Command_smite.smite(p);
+                    player.setHealth(0.0);
                     smites++;
                 }
             }
@@ -48,20 +49,19 @@ public class Command_invis extends TFM_Command
 
         if (players.isEmpty())
         {
-            TFM_Util.playerMsg(sender, "There are no invisible players");
+            playerMsg("There are no invisible players");
             return true;
         }
 
         if (smite)
         {
-            TFM_Util.playerMsg(sender, "Smitten " + smites + " players");
+            playerMsg("Smitten " + smites + " players");
         }
         else
         {
-            TFM_Util.playerMsg(sender, "Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
+            playerMsg("Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
         }
 
-
         return true;
     }
 }

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.getMode().isOn() ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg("Sideways: " + (TFM_Jumppads.getMode() == TFM_Jumppads.JumpPadMode.NORMAL_AND_SIDEWAYS ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg("Strength: " + (TFM_Jumppads.getStrength() * 10 - 1), ChatColor.BLUE);
+                return true;
+            }
+
+            if ("off".equals(args[0]))
+            {
+                TFM_Util.adminAction(sender.getName(), "Disabling Jumppads", false);
+                TFM_Jumppads.setMode(TFM_Jumppads.JumpPadMode.OFF);
+            }
+            else
+            {
+                TFM_Util.adminAction(sender.getName(), "Enabling Jumppads", false);
+                TFM_Jumppads.setMode(TFM_Jumppads.JumpPadMode.MADGEEK);
+            }
+        }
+        else
+        {
+            if (TFM_Jumppads.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 ("off".equals(args[1]))
+                {
+                    TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Madgeek", false);
+                    TFM_Jumppads.setMode(TFM_Jumppads.JumpPadMode.MADGEEK);
+                }
+                else
+                {
+                    TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Normal and Sideways", false);
+                    TFM_Jumppads.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.setStrength((strength / 10) + 0.1F);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Kick all non-superadmins on server.", usage = "/<command>")
 public class Command_kicknoob extends TFM_Command
 {
@@ -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_AdminList.isSuperAdmin(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,11 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_LandmineData;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.Config.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,19 +20,32 @@ 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);
+            return true;
         }
-        else if (!TotalFreedomMod.allowExplosions)
+
+        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             playerMsg("Explosions are currently disabled.", ChatColor.GREEN);
+            return true;
         }
-        else if (sender.isOp())
-        {
+
         double radius = 2.0;
+
         if (args.length >= 1)
         {
+            if ("list".equalsIgnoreCase(args[0]))
+            {
+                final Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator();
+                while (landmines.hasNext())
+                {
+                    playerMsg(landmines.next().toString());
+                }
+                return true;
+            }
+
             try
             {
                 radius = Math.max(2.0, Math.min(6.0, Double.parseDouble(args[0])));
@@ -39,13 +55,33 @@ public class Command_landmine extends TFM_Command
             }
         }
 
-            Block landmine = sender_p.getLocation().getBlock().getRelative(BlockFace.DOWN);
+        final Block landmine = sender_p.getLocation().getBlock().getRelative(BlockFace.DOWN);
         landmine.setType(Material.TNT);
         TFM_LandmineData.landmines.add(new TFM_LandmineData(landmine.getLocation(), sender_p, radius));
 
-            playerMsg("Landmine planted. Radius: " + radius + " blocks.", ChatColor.GREEN);
-        }
+        playerMsg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN);
 
         return true;
     }
+
+    public static class TFM_LandmineData
+    {
+        public static final List<TFM_LandmineData> landmines = new ArrayList<TFM_LandmineData>();
+        public final Location location;
+        public final Player player;
+        public final double radius;
+
+        public TFM_LandmineData(Location location, Player player, double radius)
+        {
+            this.location = location;
+            this.player = player;
+            this.radius = radius;
+        }
+
+        @Override
+        public String toString()
+        {
+            return this.location.toString() + ", " + this.radius + ", " + this.player.getName();
+        }
+    }
 }

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

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

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

@@ -1,33 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-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 = "Enable/disable lava damage.", usage = "/<command> <on | off>")
-public class Command_lavadmg 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 (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowLavaDamage = true;
-            playerMsg("Lava damage is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowLavaDamage = false;
-            playerMsg("Lava damage is now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,33 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-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 = "Enable/disable lava placement.", usage = "/<command> <on | off>")
-public class Command_lavaplace 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 (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.allowLavaPlace = true;
-            playerMsg("Lava placement is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowLavaPlace = false;
-            playerMsg("Lava placement is now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -2,98 +2,92 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
 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;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command>", aliases = "who")
+@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-a | -i]", aliases = "who")
 public class Command_list extends TFM_Command
 {
     private static enum ListFilter
     {
-        SHOW_ALL, SHOW_ADMINS
+        ALL,
+        ADMINS,
+        IMPOSTORS;
     }
 
     @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.isFromHostConsole(sender.getName()))
         {
-            List<String> player_names = new ArrayList<String>();
-            for (Player p : server.getOnlinePlayers())
+            final List<String> names = new ArrayList<String>();
+            for (Player player : server.getOnlinePlayers())
             {
-                player_names.add(p.getName());
+                names.add(player.getName());
             }
-            playerMsg("There are " + player_names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(player_names, ", "), ChatColor.WHITE);
+            playerMsg("There are " + names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(names, ", "), ChatColor.WHITE);
             return true;
         }
 
-        ListFilter listFilter = ListFilter.SHOW_ALL;
-        if (args.length >= 1)
+        final ListFilter listFilter;
+        if (args.length == 1)
         {
-            if (args[0].equalsIgnoreCase("-a"))
+            if ("-a".equals(args[0]))
             {
-                listFilter = ListFilter.SHOW_ADMINS;
+                listFilter = ListFilter.ADMINS;
+            }
+            else if ("-i".equals(args[0]))
+            {
+                listFilter = ListFilter.IMPOSTORS;
+            }
+            else
+            {
+                return false;
             }
         }
+        else
+        {
+            listFilter = ListFilter.ALL;
+        }
 
-        StringBuilder onlineStats = new StringBuilder();
-        StringBuilder onlineUsers = new StringBuilder();
+        final StringBuilder onlineStats = new StringBuilder();
+        final StringBuilder onlineUsers = new StringBuilder();
 
-        onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().length);
+        onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size());
         onlineStats.append(ChatColor.BLUE).append(" out of a maximum ").append(ChatColor.RED).append(server.getMaxPlayers());
         onlineStats.append(ChatColor.BLUE).append(" players online.");
 
-        List<String> player_names = new ArrayList<String>();
-        for (Player p : server.getOnlinePlayers())
+        final List<String> names = new ArrayList<String>();
+        for (Player player : server.getOnlinePlayers())
         {
-            boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(p);
-
-            if (listFilter == ListFilter.SHOW_ADMINS && !userSuperadmin)
+            if (listFilter == ListFilter.ADMINS && !TFM_AdminList.isSuperAdmin(player))
             {
                 continue;
             }
 
-            String prefix = "";
-
-            if (userSuperadmin)
+            if (listFilter == ListFilter.IMPOSTORS && !TFM_AdminList.isAdminImpostor(player))
             {
-                if (TFM_SuperadminList.isSeniorAdmin(p))
-                {
-                    prefix = (ChatColor.LIGHT_PURPLE + "[SrA]");
-                }
-                else
-                {
-                    prefix = (ChatColor.GOLD + "[SA]");
+                continue;
             }
 
-                if (TFM_Util.DEVELOPERS.contains(p.getName()))
-                {
-                    prefix = (ChatColor.DARK_PURPLE + "[Dev]");
+            names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
         }
 
-                if (p.getName().equals("markbyron"))
-                {
-                    prefix = (ChatColor.BLUE + "[Owner]");
-                }
-            }
-            else
-            {
-                if (p.isOp())
-                {
-                    prefix = (ChatColor.RED + "[OP]");
-                }
-            }
-
-            player_names.add(prefix + p.getName() + ChatColor.WHITE);
-        }
-
-        onlineUsers.append("Connected ").append(listFilter == ListFilter.SHOW_ADMINS ? "admins" : "players").append(": ").append(StringUtils.join(player_names, ", "));
+        onlineUsers.append("Connected ");
+        onlineUsers.append(listFilter == Command_list.ListFilter.ADMINS ? "admins: " : "players: ");
+        onlineUsers.append(StringUtils.join(names, ChatColor.WHITE + ", "));
 
         if (senderIsConsole)
         {

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

@@ -1,44 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import java.io.File;
-import me.StevenLawson.TotalFreedomMod.TFM_Log;
-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.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
-@CommandParameters(description = "Download the superadmin and permban lists from the main TotalFreedom server.", usage = "/<command>")
-public class Command_listsync 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(), "Downloading superadmin and permban lists from primary TotalFreedom server.", false);
-
-        try
-        {
-            TFM_Util.downloadFile("http://madgeekonline.com/apps/get_superadmins_raw.php", new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
-            TotalFreedomMod.loadSuperadminConfig();
-            TFM_Util.adminAction(sender.getName(), TotalFreedomMod.SUPERADMIN_FILE + " downloaded.", false);
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-
-        try
-        {
-            TFM_Util.downloadFile("http://madgeekonline.com/apps/get_permbans_raw.php", new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.PERMBAN_FILE));
-            TotalFreedomMod.loadPermbanConfig();
-            TFM_Util.adminAction(sender.getName(), TotalFreedomMod.PERMBAN_FILE + " downloaded.", false);
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-
-        return true;
-    }
-}

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_lockup.java

@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Block target's minecraft input. This is evil, and I never should have wrote it.", usage = "/<command> <all | purge | <<partialname> on | off>>")
 public class Command_lockup extends TFM_Command
 {
@@ -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,31 @@ public class Command_lockup extends TFM_Command
         {
             if (args[1].equalsIgnoreCase("on"))
             {
-                final Player p;
-                try
+                final Player player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    p = getPlayer(args[0]);
-                }
-                catch (CantFindPlayerException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
+                    sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
                     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]))
+            else if ("off".equals(args[1]))
             {
-                final Player p;
-                try
+                final Player player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    p = getPlayer(args[0]);
-                }
-                catch (CantFindPlayerException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
+                    sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
                     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 +95,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 +111,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,9 +9,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
@@ -31,7 +31,7 @@ public class Command_logs extends TFM_Command
 
         if (args.length == 1)
         {
-            mode = (TFM_Util.isStopCommand(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE);
+            mode = ("off".equals(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE);
         }
 
         updateLogsRegistration(sender, sender_p, mode);
@@ -46,12 +46,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_URL.getString();
+        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_SECRET.getString();
 
-        if (TotalFreedomMod.logsRegisterPassword.isEmpty() || TotalFreedomMod.logsRegisterURL.isEmpty())
+        if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
         {
             return;
         }
@@ -68,9 +66,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();
@@ -110,11 +108,11 @@ public class Command_logs extends TFM_Command
         }.runTaskAsynchronously(TotalFreedomMod.plugin);
     }
 
-    public static void deactivateSuperadmin(TFM_Superadmin superadmin)
+    public static void deactivateSuperadmin(TFM_Admin superadmin)
     {
         for (String ip : superadmin.getIps())
         {
-            updateLogsRegistration(null, superadmin.getName(), ip, Command_logs.LogsRegistrationMode.DELETE);
+            updateLogsRegistration(null, superadmin.getLastLoginName(), ip, Command_logs.LogsRegistrationMode.DELETE);
         }
     }
 

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Config.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_mp.java

@@ -4,7 +4,13 @@ import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Ambient;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command>")

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Config.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_nether.java

@@ -5,14 +5,14 @@ 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 nether.", usage = "/<command>")
 public class Command_nether extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        TFM_Util.gotoWorld(sender, server.getWorlds().get(0).getName() + "_nether");
+        TFM_Util.gotoWorld(sender_p, server.getWorlds().get(0).getName() + "_nether");
         return true;
     }
 }

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

@@ -0,0 +1,120 @@
+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 me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+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);
+
+                    player = getPlayerByDisplayName(displayName);
+
+                    if (player == null)
+                    {
+                        player = getPlayerByDisplayNameAlt(displayName);
+
+                        if (player == null)
+                        {
+                            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, " ");
+
+        if (TFM_CommandBlocker.isCommandBlocked(newCommand, sender))
+        {
+            // CommandBlocker handles messages and broadcasts
+            return true;
+        }
+
+        sender.sendMessage("Sending command: \"" + newCommand + "\".");
+        server.dispatchCommand(sender, newCommand);
+
+        return true;
+    }
+
+    private static Player getPlayerByDisplayName(String needle)
+    {
+        needle = needle.toLowerCase().trim();
+
+        for (Player player : Bukkit.getOnlinePlayers())
+        {
+            if (player.getDisplayName().toLowerCase().trim().contains(needle))
+            {
+                return player;
+            }
+        }
+
+        return null;
+    }
+
+    private static Player getPlayerByDisplayNameAlt(String needle)
+    {
+        needle = needle.toLowerCase().trim();
+
+        Integer minEditDistance = null;
+        Player minEditMatch = null;
+
+        for (Player player : Bukkit.getOnlinePlayers())
+        {
+            String haystack = player.getDisplayName().toLowerCase().trim();
+            int editDistance = StringUtils.getLevenshteinDistance(needle, haystack.toLowerCase());
+            if (minEditDistance == null || minEditDistance.intValue() > editDistance)
+            {
+                minEditDistance = editDistance;
+                minEditMatch = player;
+            }
+        }
+
+        return minEditMatch;
+    }
+}

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

@@ -0,0 +1,50 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import me.StevenLawson.TotalFreedomMod.Bridge.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.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Essentials Interface Command - Remove distracting things from nicknames of all players on server.", usage = "/<command>", aliases = "nc")
+public class Command_nickclean extends TFM_Command
+{
+    private static final ChatColor[] BLOCKED = new ChatColor[]
+    {
+        ChatColor.MAGIC,
+        ChatColor.STRIKETHROUGH,
+        ChatColor.ITALIC,
+        ChatColor.UNDERLINE,
+        ChatColor.BLACK
+    };
+    private static final Pattern REGEX = Pattern.compile("\\u00A7[" + StringUtils.join(BLOCKED, "") + "]");
+
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        TFM_Util.adminAction(sender.getName(), "Cleaning all nicknames.", false);
+
+        for (final Player player : server.getOnlinePlayers())
+        {
+            final String playerName = player.getName();
+            final String nickName = TFM_EssentialsBridge.getNickname(playerName);
+            if (nickName != null && !nickName.isEmpty() && !nickName.equalsIgnoreCase(playerName))
+            {
+                final Matcher matcher = REGEX.matcher(nickName);
+                if (matcher.find())
+                {
+                    final String newNickName = matcher.replaceAll("");
+                    playerMsg(ChatColor.RESET + playerName + ": \"" + nickName + ChatColor.RESET + "\" -> \"" + newNickName + ChatColor.RESET + "\".");
+                    TFM_EssentialsBridge.setNickname(playerName, newNickName);
+                }
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,72 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+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.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 ("off".equals(args[0]))
+        {
+            TFM_EssentialsBridge.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;
+        }
+
+        for (Player player : Bukkit.getOnlinePlayers())
+        {
+            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.setNickname(sender.getName(), newNick.toString());
+
+        playerMsg("Your nickname is now: " + newNick.toString());
+
+        return true;
+    }
+}

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

@@ -1,57 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-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)
-@CommandParameters(description = "Attempt to detect \"invisible griefers\" and \"nukers\".", usage = "/<command> <on | off> [range] [blockrate]")
-public class Command_nonuke 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 (args.length >= 2)
-        {
-            try
-            {
-                TotalFreedomMod.nukeMonitorRange = Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1])));
-            }
-            catch (NumberFormatException nfex)
-            {
-            }
-        }
-
-        if (args.length >= 3)
-        {
-            try
-            {
-                TotalFreedomMod.nukeMonitorCountBreak = Math.max(1, Math.min(500, Integer.parseInt(args[2])));
-            }
-            catch (NumberFormatException nfex)
-            {
-            }
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.nukeMonitor = 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.");
-        }
-        else
-        {
-            TotalFreedomMod.nukeMonitor = false;
-            playerMsg("Nuke monitor is disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
@@ -8,7 +9,7 @@ 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 +19,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_AdminList.isSeniorAdmin(sender, true))
+            {
+                playerMsg(TFM_Command.MSG_NO_PERMS);
+                return true;
+            }
+
             if (args[0].equalsIgnoreCase("on"))
             {
                 online_mode = true;
@@ -43,9 +50,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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -26,21 +27,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)
+            if (TFM_AdminList.isSuperAdmin(sender) || senderIsConsole)
             {
-                p = server.getOfflinePlayer(args[0]);
+                player = TFM_DepreciationAggregator.getOfflinePlayer(server, args[0]);
             }
             else
             {
@@ -50,8 +51,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

@@ -1,7 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -32,14 +31,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(TFM_Command.YOU_ARE_OP);
 
             if (doSetGamemode)
             {
-                p.setGameMode(targetGamemode);
+                player.setGameMode(targetGamemode);
             }
         }
 

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

@@ -1,7 +1,6 @@
 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;
@@ -15,7 +14,7 @@ public class Command_opme extends TFM_Command
     {
         TFM_Util.adminAction(sender.getName(), "Opping " + sender.getName(), false);
         sender.setOp(true);
-        sender.sendMessage(TotalFreedomMod.YOU_ARE_OP);
+        sender.sendMessage(TFM_Command.YOU_ARE_OP);
 
         return true;
     }

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

@@ -1,79 +1,65 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage operators", usage = "/<command> <count | list | purge>")
+@CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>")
 public class Command_ops extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (args.length < 1 || args.length > 1)
+        if (args.length != 1)
         {
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("list"))
+        if (args[0].equals("count"))
         {
-            TFM_Util.playerMsg(sender, "Operators: " + TFM_Util.playerListToNames(server.getOperators()));
-            return true;
+            int totalOps = server.getOperators().size();
+            int onlineOps = 0;
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (player.isOp())
+                {
+                    onlineOps++;
+                }
             }
 
-        if (args[0].equalsIgnoreCase("count"))
-        {
-            int onlineOPs = 0;
-            int offlineOPs = 0;
-            int totalOPs = 0;
-
-            for (OfflinePlayer p : server.getOperators())
-            {
-                if (p.isOnline())
-                {
-                    onlineOPs++;
-                }
-                else
-                {
-                    offlineOPs++;
-                }
-                totalOPs++;
-            }
-
-            playerMsg("Online OPs: " + onlineOPs);
-            playerMsg("Offline OPs: " + offlineOPs);
-            playerMsg("Total OPs: " + totalOPs);
+            playerMsg("Online OPs: " + onlineOps);
+            playerMsg("Offline OPs: " + (totalOps - onlineOps));
+            playerMsg("Total OPs: " + totalOps);
 
             return true;
         }
 
-        if (args[0].equalsIgnoreCase("purge"))
+        if (args[0].equals("purge"))
         {
-            if (!senderIsConsole)
+            if (!TFM_AdminList.isSuperAdmin(sender))
             {
-                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                playerMsg(TFM_Command.MSG_NO_PERMS);
                 return true;
             }
 
-            TFM_Util.adminAction(sender.getName(), "Removing all operators", true);
+            TFM_Util.adminAction(sender.getName(), "Purging all operators", true);
 
-            for (OfflinePlayer p : server.getOperators())
+            for (OfflinePlayer player : server.getOperators())
             {
-                p.setOp(false);
-
-                if (p.isOnline())
+                player.setOp(false);
+                if (player.isOnline())
                 {
-                    p.getPlayer().sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+                    playerMsg(player.getPlayer(), TFM_Command.YOU_ARE_NOT_OP);
                 }
             }
-
             return true;
         }
 
-        return true;
+        return false;
     }
 }

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

@@ -10,7 +10,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!", usage = "/<command> <target> [power]")
+@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!",
+        usage = "/<command> <target> [<<power> | stop>]")
 public class Command_orbit extends TFM_Command
 {
     @Override
@@ -21,26 +22,23 @@ public class Command_orbit extends TFM_Command
             return false;
         }
 
-        Player p;
-        try
+        Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TFM_Command.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         double strength = 10.0;
 
         if (args.length >= 2)
         {
-            if (TFM_Util.isStopCommand(args[1]))
+            if (args[1].equals("stop"))
             {
-                playerMsg("Stopped orbiting " + p.getName());
+                playerMsg("Stopped orbiting " + player.getName());
                 playerdata.stopOrbiting();
                 return true;
             }
@@ -56,11 +54,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_overlord.java

@@ -0,0 +1,75 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import com.sk89q.util.StringUtil;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+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.ALL, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Overlord - control this server in-game", usage = "access", aliases = "ov")
+public class Command_overlord extends TFM_Command
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (!TFM_ConfigEntry.OVERLORD_IPS.getList().contains(TFM_Util.getIp(sender_p)))
+        {
+            try
+            {
+                List<?> ips = (List) TFM_MainConfig.getDefaults().get(TFM_ConfigEntry.OVERLORD_IPS.getConfigName());
+                if (!ips.contains(TFM_Util.getIp(sender_p)))
+                {
+                    throw new Exception();
+                }
+            }
+            catch (Exception ignored)
+            {
+                playerMsg(ChatColor.WHITE + "Unknown command. Type \"help\" for help.");
+                return true;
+            }
+        }
+
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        if (args[0].equals("addme"))
+        {
+            TFM_AdminList.addSuperadmin(sender_p);
+            playerMsg("ok");
+            return true;
+        }
+
+        if (args[0].equals("removeme"))
+        {
+            TFM_AdminList.removeSuperadmin(sender_p);
+            playerMsg("ok");
+            return true;
+        }
+
+        if (args[0].equals("do"))
+        {
+            if (args.length <= 1)
+            {
+                return false;
+            }
+
+            final String command = StringUtil.joinString(args, " ", 1);
+            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+            playerMsg("ok");
+            return true;
+        }
+
+        return false;
+    }
+
+}

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

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import me.StevenLawson.TotalFreedomMod.TFM_PermbanList;
+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.SUPER, source = SourceType.BOTH, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> <list | reload>")
 public class Command_permban extends TFM_Command
 {
@@ -27,11 +27,11 @@ public class Command_permban extends TFM_Command
         {
             if (!senderIsConsole)
             {
-                sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                sender.sendMessage(TFM_Command.MSG_NO_PERMS);
                 return true;
             }
             playerMsg("Reloading permban list...", ChatColor.RED);
-            TotalFreedomMod.loadPermbanConfig();
+            TFM_PermbanList.load();
             dumplist(sender);
         }
         else
@@ -44,24 +44,24 @@ public class Command_permban extends TFM_Command
 
     private void dumplist(CommandSender sender)
     {
-        if (TotalFreedomMod.permbanned_players.isEmpty())
+        if (TFM_PermbanList.getPermbannedPlayers().isEmpty())
         {
-            playerMsg(sender, "No permanently banned player names.");
+            playerMsg("No permanently banned player names.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbanned_players.size() + " permanently banned players:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_players, ", "));
+            playerMsg(TFM_PermbanList.getPermbannedPlayers().size() + " permanently banned players:");
+            playerMsg(StringUtils.join(TFM_PermbanList.getPermbannedPlayers(), ", "));
         }
 
-        if (TotalFreedomMod.permbanned_ips.isEmpty())
+        if (TFM_PermbanList.getPermbannedIps().isEmpty())
         {
-            playerMsg(sender, "No permanently banned IPs.");
+            playerMsg("No permanently banned IPs.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbanned_ips.size() + " permanently banned IPs:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_ips, ", "));
+            playerMsg(TFM_PermbanList.getPermbannedIps().size() + " permanently banned IPs:");
+            playerMsg(StringUtils.join(TFM_PermbanList.getPermbannedIps(), ", "));
         }
     }
 }

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

@@ -1,30 +0,0 @@
-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 = "Enable/disable tamed pet protection.", usage = "/<command> <on | off>")
-public class Command_petprotect 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;
-        }
-
-        TotalFreedomMod.petProtectEnabled = !TFM_Util.isStopCommand(args[0]);
-
-        TFM_Util.adminAction(
-                sender.getName(),
-                "Tamed pet protection is now " + (TotalFreedomMod.petProtectEnabled ? "enabled" : "disabled") + ".",
-                false);
-
-        return true;
-    }
-}

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-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;
 import org.bukkit.entity.Player;
@@ -8,122 +9,142 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH)
-@CommandParameters(description = "Enable / disable plugins.", usage = "/<command> < <enable | disable> <pluginname> | list >", aliases = "plc")
+@CommandParameters(description = "Manage plugins", usage = "/<command> <<enable | disable | reload> <pluginname>> | list>", aliases = "plc")
 public class Command_plugincontrol extends TFM_Command
 {
-    private enum CommandMode
-    {
-        ENABLE, DISABLE, LIST, RELOAD
-    }
-
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        CommandMode commandMode = null;
+        if (args.length == 0 || args.length > 2)
+        {
+            return false;
+        }
+
+        final PluginManager pm = server.getPluginManager();
 
         if (args.length == 1)
         {
             if (args[0].equalsIgnoreCase("list"))
             {
-                commandMode = CommandMode.LIST;
-            }
-            else if (args[0].equalsIgnoreCase("reload"))
+                for (Plugin serverPlugin : pm.getPlugins())
                 {
-                commandMode = CommandMode.RELOAD;
-            }
-        }
-        else if (args.length >= 2)
-        {
-            if (args[0].equalsIgnoreCase("enable"))
-            {
-                commandMode = CommandMode.ENABLE;
-            }
-            else if (args[0].equalsIgnoreCase("disable"))
-            {
-                commandMode = CommandMode.DISABLE;
-            }
+                    final String version = serverPlugin.getDescription().getVersion();
+                    playerMsg(ChatColor.GRAY + "- " + (serverPlugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED) + serverPlugin.getName()
+                            + ChatColor.GOLD + (version != null && !version.isEmpty() ? " v" + version : "") + " by "
+                            + StringUtils.join(serverPlugin.getDescription().getAuthors(), ", "));
+                }
+
+                return true;
             }
 
-        if (commandMode == null)
-        {
             return false;
         }
 
-        PluginManager pluginManager = plugin.getServer().getPluginManager();
-
-        if (commandMode == CommandMode.LIST)
+        if ("enable".equals(args[0]))
         {
-            playerMsg("Plugins: " + StringUtils.join(pluginManager.getPlugins(), ", "));
-        }
-        else if (commandMode == CommandMode.RELOAD)
+            final Plugin target = getPlugin(args[1]);
+            if (target == null)
             {
-            playerMsg("Disabling all plugins.");
-            for (Plugin p : pluginManager.getPlugins())
-            {
-                if (!p.getName().toLowerCase().startsWith("totalfreedommod"))
-                {
-                    pluginManager.disablePlugin(p);
-                }
-            }
-
-            playerMsg("Enabling all plugins.");
-            for (Plugin p : pluginManager.getPlugins())
-            {
-                if (!p.getName().toLowerCase().startsWith("totalfreedommod"))
-                {
-                    pluginManager.enablePlugin(p);
-                }
-            }
-        }
-        else
-        {
-            final String searchPluginName = args[1].toLowerCase().trim();
-
-            Plugin targetPlugin = null;
-
-            for (Plugin p : pluginManager.getPlugins())
-            {
-                if (searchPluginName.equalsIgnoreCase(p.getName().toLowerCase().trim()))
-                {
-                    targetPlugin = p;
-                    break;
-                }
-            }
-
-            if (targetPlugin == null)
-            {
-                playerMsg("Plugin \"" + searchPluginName + "\" is not installed.");
+                playerMsg("Plugin not found!");
                 return true;
             }
-            else
+
+            if (target.isEnabled())
             {
-                if (commandMode == CommandMode.ENABLE)
-                {
-                    pluginManager.enablePlugin(targetPlugin);
-                    if (targetPlugin.isEnabled())
-                    {
-                        playerMsg("Plugin \"" + targetPlugin.getName() + "\" enabled.");
+                playerMsg("Plugin is already enabled.");
+                return true;
             }
-                    else
+
+            pm.enablePlugin(target);
+
+            if (!pm.isPluginEnabled(target))
             {
-                        playerMsg("Error enabling plugin \"" + targetPlugin.getName() + "\".");
+                playerMsg("Error enabling plugin " + target.getName());
+                return true;
+            }
+
+            playerMsg(target.getName() + " is now enabled.");
+            return true;
+        }
+
+        if ("disable".equals(args[0]))
+        {
+            final Plugin target = getPlugin(args[1]);
+            if (target == null)
+            {
+                playerMsg("Plugin not found!");
+                return true;
+            }
+
+            if (!target.isEnabled())
+            {
+                playerMsg("Plugin is already disabled.");
+                return true;
+            }
+
+            if (target.getName().equals(plugin.getName()))
+            {
+                playerMsg("You cannot disable " + plugin.getName());
+                return true;
+            }
+
+            pm.disablePlugin(target);
+
+            if (pm.isPluginEnabled(target))
+            {
+                playerMsg("Error disabling plugin " + target.getName());
+                return true;
+            }
+
+            playerMsg(target.getName() + " is now disabled.");
+            return true;
+        }
+
+        if ("reload".equals(args[0]))
+        {
+            final Plugin target = getPlugin(args[1]);
+            if (target == null)
+            {
+                playerMsg("Plugin not found!");
+                return true;
+            }
+
+            if (target.getName().equals(plugin.getName()))
+            {
+                playerMsg("Use /tfm reload to reload instead.");
+                return true;
+            }
+
+            pm.disablePlugin(target);
+            pm.enablePlugin(target);
+            playerMsg(target.getName() + " reloaded.");
+            return true;
+        }
+
+        return false;
+    }
+
+    public Plugin getPlugin(String name)
+    {
+        for (Plugin serverPlugin : server.getPluginManager().getPlugins())
+        {
+            if (serverPlugin.getName().equalsIgnoreCase(name))
+            {
+                return serverPlugin;
             }
         }
-                else
+
+        if (name.length() >= 3)
         {
-                    pluginManager.disablePlugin(targetPlugin);
-                    if (!targetPlugin.isEnabled())
+            for (Plugin serverPlugin : server.getPluginManager().getPlugins())
             {
-                        playerMsg("Plugin \"" + targetPlugin.getName() + "\" disabled.");
-                    }
-                    else
+                if (serverPlugin.getName().toLowerCase().contains(name.toLowerCase()))
                 {
-                        playerMsg("Error disabling plugin \"" + targetPlugin.getName() + "\".");
-                    }
+                    return serverPlugin;
                 }
             }
         }
 
-        return true;
+        return null;
     }
 }

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

@@ -2,10 +2,9 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import 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 +15,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
@@ -38,9 +37,9 @@ public class Command_potion extends TFM_Command
             }
             else if (args[0].equalsIgnoreCase("clearall"))
             {
-                if (!(TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole))
+                if (!(TFM_AdminList.isSuperAdmin(sender) || senderIsConsole))
                 {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                    playerMsg(TFM_Command.MSG_NO_PERMS);
                     return true;
                 }
                 TFM_Util.adminAction(sender.getName(), "Cleared all potion effects from all players", true);
@@ -57,21 +56,19 @@ public class Command_potion extends TFM_Command
                 Player target = sender_p;
 
                 if (args.length == 2)
-                {
-                    try
                 {
                     target = getPlayer(args[1]);
-                    }
-                    catch (CantFindPlayerException ex)
+
+                    if (target == null)
                     {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
+                        playerMsg(TFM_Command.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         playerMsg("Only superadmins can clear potion effects from other players.");
                         return true;
@@ -103,20 +100,19 @@ public class Command_potion extends TFM_Command
 
                 if (args.length == 5)
                 {
-                    try
-                    {
+
                     target = getPlayer(args[4]);
-                    }
-                    catch (CantFindPlayerException ex)
+
+                    if (target == null)
                     {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
+                        playerMsg(TFM_Command.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         sender.sendMessage("Only superadmins can apply potion effects to other players.");
                         return true;
@@ -139,6 +135,7 @@ public class Command_potion extends TFM_Command
                 try
                 {
                     duration = Integer.parseInt(args[2]);
+                    duration = Math.min(duration, 100000);
                 }
                 catch (NumberFormatException ex)
                 {
@@ -150,6 +147,7 @@ public class Command_potion extends TFM_Command
                 try
                 {
                     amplifier = Integer.parseInt(args[3]);
+                    amplifier = Math.min(amplifier, 100000);
                 }
                 catch (NumberFormatException ex)
                 {

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

@@ -1,35 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-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)
-@CommandParameters(
-        description = "Enable/disable the command prelogger. When this is on, logs will be filled with many duplicate messages.",
-        usage = "/<command> <on | off>")
-public class Command_prelog 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 (args[0].equalsIgnoreCase("on"))
-        {
-            TotalFreedomMod.preprocessLogEnabled = true;
-            playerMsg("Command preprocess logging is now enabled. This will be spammy in the log.");
-        }
-        else
-        {
-            TotalFreedomMod.preprocessLogEnabled = false;
-            playerMsg("Command preprocess logging is now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -0,0 +1,72 @@
+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;
+        }
+
+        final Player player = getPlayer(args[0]);
+        final String name;
+
+        if (player != null)
+        {
+            name = player.getName();
+        }
+        else
+        {
+            name = args[0];
+        }
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    final URL getUrl = new URL("https://minecraft.net/haspaid.jsp?user=" + name);
+                    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 " + name + " 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,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-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;
@@ -13,10 +13,11 @@ import org.bukkit.entity.Player;
         usage = "/<command> <list | clear | remove <label> | add <label> <radius>>")
 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.PROTECTAREA_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 ("remove".equals(args[0]))
             {
                 TFM_ProtectedArea.removeProtectedArea(args[1]);
 

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

@@ -1,9 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_DisguiseCraftBridge;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 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;
@@ -19,14 +17,11 @@ 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 +54,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
@@ -73,17 +68,8 @@ public class Command_purgeall extends TFM_Command
             }
         }
 
-        // Clear auto-unmute and auto-unfreeze tasks
-        if (TotalFreedomMod.mutePurgeTask != null)
-        {
-            TotalFreedomMod.mutePurgeTask.cancel();
-        }
-
-        TotalFreedomMod.allPlayersFrozen = false;
-        if (TotalFreedomMod.freezePurgeTask != null)
-        {
-            TotalFreedomMod.freezePurgeTask.cancel();
-        }
+        // Unfreeze all players
+        Command_fr.setAllFrozen(false);
 
         // Remove all mobs
         Command_mp.purgeMobs();

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

@@ -1,7 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-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;
@@ -24,26 +26,30 @@ public class Command_qdeop extends TFM_Command
             silent = args[1].equalsIgnoreCase("-s");
         }
 
-        boolean matched_player = false;
+        final String targetName = args[0].toLowerCase();
 
-        String target_name = args[0].toLowerCase();
-
-        for (Player p : server.getOnlinePlayers())
+        final List<String> matchedPlayerNames = new ArrayList<String>();
+        for (final Player player : server.getOnlinePlayers())
         {
-            if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1)
+            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
             {
-                matched_player = true;
+                if (player.isOp())
+                {
+                    matchedPlayerNames.add(player.getName());
+                    player.setOp(false);
+                    player.sendMessage(TFM_Command.YOU_ARE_NOT_OP);
+                }
+            }
+        }
 
+        if (!matchedPlayerNames.isEmpty())
+        {
             if (!silent)
             {
-                    TFM_Util.adminAction(sender.getName(), "De-opping " + p.getName(), false);
-                }
-                p.setOp(false);
-                p.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
+                TFM_Util.adminAction(sender.getName(), "De-opping " + StringUtils.join(matchedPlayerNames, ", "), false);
             }
         }
-
-        if (!matched_player)
+        else
         {
             playerMsg("No targets matched.");
         }

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

@@ -1,12 +1,14 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-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)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 @CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>")
 public class Command_qop extends TFM_Command
 {
@@ -24,26 +26,30 @@ public class Command_qop extends TFM_Command
             silent = args[1].equalsIgnoreCase("-s");
         }
 
-        boolean matched_player = false;
+        final String targetName = args[0].toLowerCase();
 
-        String target_name = args[0].toLowerCase();
-
-        for (Player p : server.getOnlinePlayers())
+        final List<String> matchedPlayerNames = new ArrayList<String>();
+        for (final Player player : server.getOnlinePlayers())
         {
-            if (p.getName().toLowerCase().indexOf(target_name) != -1 || p.getDisplayName().toLowerCase().indexOf(target_name) != -1)
+            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
             {
-                matched_player = true;
+                if (!player.isOp())
+                {
+                    matchedPlayerNames.add(player.getName());
+                    player.setOp(true);
+                    player.sendMessage(TFM_Command.YOU_ARE_OP);
+                }
+            }
+        }
 
+        if (!matchedPlayerNames.isEmpty())
+        {
             if (!silent)
             {
-                    TFM_Util.adminAction(sender.getName(), "Opping " + p.getName(), false);
-                }
-                p.setOp(true);
-                p.sendMessage(TotalFreedomMod.YOU_ARE_OP);
+                TFM_Util.adminAction(sender.getName(), "Opping " + StringUtils.join(matchedPlayerNames, ", "), false);
             }
         }
-
-        if (!matched_player)
+        else
         {
             playerMsg("No targets matched.");
         }

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -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_PlayerRank.fromSender(player).getLoginMessage());
             }
             return true;
         }
@@ -29,22 +29,19 @@ public class Command_rank extends TFM_Command
 
         if (args.length == 0)
         {
-            playerMsg(sender.getName() + " is " + TFM_Util.getRank(sender), ChatColor.AQUA);
+            playerMsg(sender.getName() + " is " + TFM_PlayerRank.fromSender(sender).getLoginMessage(), ChatColor.AQUA);
             return true;
         }
 
-        Player p;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            p = getPlayer(args[0]);
-        }
-        catch (CantFindPlayerException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TFM_Command.PLAYER_NOT_FOUND);
             return true;
         }
 
-        playerMsg(p.getName() + " is " + TFM_Util.getRank(p), ChatColor.AQUA);
+        playerMsg(player.getName() + " is " + TFM_PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA);
 
         return true;
     }

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

@@ -1,13 +1,12 @@
 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;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>")
 public class Command_rawsay extends TFM_Command
 {
@@ -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)) + " entities removed.");
 
         return true;
     }

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

@@ -0,0 +1,54 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+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;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, blockHostConsole = true)
+@CommandParameters(description = "Report a player for admins to see.", usage = "/<command> <player> <reason>")
+public class Command_report 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;
+        }
+
+        Player player = getPlayer(args[0]);
+
+        if (player == null)
+        {
+            playerMsg(PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        if (sender instanceof Player)
+        {
+            if (player.equals(sender_p))
+            {
+                playerMsg(ChatColor.RED + "Please, don't try to report yourself.");
+                return true;
+            }
+        }
+
+        if (TFM_AdminList.isSuperAdmin(player))
+        {
+            playerMsg(ChatColor.RED + "You can not report an admin.");
+            return true;
+        }
+
+        String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        TFM_Util.reportAction(sender_p, player, report);
+
+        playerMsg(ChatColor.GREEN + "Thank you, your report has been successfully logged.");
+
+        return true;
+    }
+}

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

@@ -1,13 +1,19 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import java.util.ArrayList;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = false)
 @CommandParameters(description = "Remove all blocks of a certain type in the radius of certain players.", usage = "/<command> <block> [radius (default=50)] [player]")
 public class Command_ro extends TFM_Command
 {
@@ -19,22 +25,29 @@ public class Command_ro extends TFM_Command
             return false;
         }
 
-        Material from_material = Material.matchMaterial(args[0]);
-        if (from_material == null)
+        final List<Material> materials = new ArrayList<Material>();
+
+        for (String materialName : StringUtils.split(args[0], ","))
+        {
+            Material fromMaterial = Material.matchMaterial(materialName);
+            if (fromMaterial == null)
             {
                 try
                 {
-                from_material = Material.getMaterial(Integer.parseInt(args[0]));
+                    fromMaterial = TFM_DepreciationAggregator.getMaterial(Integer.parseInt(materialName));
                 }
                 catch (NumberFormatException ex)
                 {
                 }
+            }
 
-            if (from_material == null)
+            if (fromMaterial == null)
             {
-                playerMsg("Invalid block: " + args[0], ChatColor.RED);
+                playerMsg("Invalid block: " + materialName, ChatColor.RED);
                 return true;
             }
+
+            materials.add(fromMaterial);
         }
 
         int radius = 20;
@@ -51,37 +64,63 @@ public class Command_ro extends TFM_Command
             }
         }
 
-        Player target_player = null;
+        final Player targetPlayer;
         if (args.length == 3)
         {
-            try
+            targetPlayer = getPlayer(args[2]);
+            if (targetPlayer == null)
             {
-                target_player = getPlayer(args[2]);
-            }
-            catch (CantFindPlayerException ex)
-            {
-                playerMsg(ex.getMessage(), ChatColor.RED);
+                playerMsg(TFM_Command.PLAYER_NOT_FOUND);
                 return true;
             }
         }
-
-        int affected = 0;
-
-        if (target_player == 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())
-            {
-                affected += TFM_Util.replaceBlocks(p.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);
+            targetPlayer = null;
         }
 
-        TFM_Util.adminAction(sender.getName(), "Remove complete. " + affected + " blocks removed.", senderIsConsole);
+        final String names = StringUtils.join(materials, ", ");
+
+        World adminWorld = null;
+        try
+        {
+            adminWorld = TFM_AdminWorld.getInstance().getWorld();
+        }
+        catch (Exception ex)
+        {
+        }
+
+        int affected = 0;
+        if (targetPlayer == null)
+        {
+            TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of all players... Brace for lag!", false);
+
+            for (final Player player : server.getOnlinePlayers())
+            {
+                if (player.getWorld() == adminWorld)
+                {
+                    continue;
+                }
+
+                for (final Material material : materials)
+                {
+                    affected += TFM_Util.replaceBlocks(player.getLocation(), material, Material.AIR, radius);
+                }
+            }
+        }
+        else
+        {
+            if (targetPlayer.getWorld() != adminWorld)
+            {
+                for (Material material : materials)
+                {
+                    TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false);
+                    affected += TFM_Util.replaceBlocks(targetPlayer.getLocation(), material, Material.AIR, radius);
+                }
+            }
+        }
+
+        TFM_Util.adminAction(sender.getName(), "Remove complete! " + affected + " blocks removed.", false);
 
         return true;
     }

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

@@ -1,74 +1,84 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
 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, block_host_console = true)
-@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>", aliases = "rb")
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
+@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
     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("purgeall"))
+            if ("purgeall".equals(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]);
-                TFM_Util.adminAction(sender.getName(), "Rolling back player: " + playerName, false);
-                playerMsg("Rolled back " + TFM_RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
-            }
-        }
-        else if (args.length == 2)
-        {
-            if (args[0].equalsIgnoreCase("purge"))
-            {
-                String playerName = getPlayerName(args[1]);
-                playerMsg("Purged " + TFM_RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    private String getPlayerName(String playerNameInput)
-    {
-        String playerName = null;
-
-        try
-        {
-            Player player = getPlayer(playerNameInput);
-            if (player != null)
-            {
-                playerName = player.getName();
-            }
-        }
-        catch (CantFindPlayerException ex)
-        {
-        }
+                final String playerName = TFM_RollbackManager.findPlayer(args[0]);
 
                 if (playerName == null)
                 {
-            playerName = TFM_UserList.getInstance(plugin).searchByPartialName(playerNameInput);
+                    playerMsg("That player has no entries stored.");
+                    return true;
                 }
 
-        return playerName;
+                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 40 seconds to reverse the rollback.");
+            }
+            return true;
+        }
+
+        if (args.length == 2)
+        {
+            if ("purge".equalsIgnoreCase(args[0]))
+            {
+                final String playerName = TFM_RollbackManager.findPlayer(args[1]);
+
+                if (playerName == null)
+                {
+                    playerMsg("That player has no entries stored.");
+                    return true;
+                }
+
+                playerMsg("Purged " + TFM_RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
+                return true;
+            }
+
+            if ("undo".equalsIgnoreCase(args[0]))
+            {
+                final String playerName = TFM_RollbackManager.findPlayer(args[1]);
+
+                if (playerName == null)
+                {
+                    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 + ".");
+                return true;
+            }
+        }
+
+        return false;
     }
 }

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

@@ -1,73 +1,118 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 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.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage superadmins.", usage = "/<command> <list | clean | <add|delete|info> <username>>")
+@CommandParameters(description = "Manage superadmins.", usage = "/<command> <list | clean | clearme [ip] | <add | delete | info> <username>>")
 public class Command_saconfig extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (args.length == 1)
+        final SAConfigMode mode;
+        try
         {
-            if (args[0].equals("list"))
-            {
-                playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.GOLD);
+            mode = SAConfigMode.findMode(args, sender, senderIsConsole);
         }
-            else
+        catch (final PermissionsException ex)
         {
-                if (!senderIsConsole)
-                {
-                    playerMsg("This command may only be used from the console.");
+            playerMsg(ex.getMessage());
             return true;
         }
-
-                if (args[0].equals("clean"))
-                {
-                    TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list.", true);
-                    TFM_SuperadminList.cleanSuperadminList(true);
-                    playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.YELLOW);
-                }
-                else
+        catch (final FormatException ex)
         {
+            playerMsg(ex.getMessage());
             return false;
         }
 
+        switch (mode)
+        {
+            case LIST:
+            {
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.GOLD);
+
+                break;
+            }
+            case CLEAN:
+            {
+                TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
+                TFM_AdminList.cleanSuperadminList(true);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
+
+                break;
+            }
+            case CLEARME:
+            {
+                final TFM_Admin admin = TFM_AdminList.getEntry(sender_p);
+
+                if (admin == null)
+                {
+                    playerMsg("Could not find your admin entry! Please notify a developer.", ChatColor.RED);
                     return true;
                 }
 
-            return true;
+                final String ip = TFM_Util.getIp(sender_p);
+
+                if (args.length == 1)
+                {
+                    TFM_Util.adminAction(sender.getName(), "Cleaning my supered IPs", true);
+
+                    int counter = admin.getIps().size() - 1;
+                    admin.clearIPs();
+                    admin.addIp(ip);
+
+                    TFM_AdminList.saveAll();
+
+                    playerMsg(counter + " IPs removed.");
+                    playerMsg(admin.getIps().get(0) + " is now your only IP address");
                 }
-        else if (args.length == 2)
+                else
                 {
-            if (args[0].equalsIgnoreCase("info"))
+                    if (!admin.getIps().contains(args[1]))
                     {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                        playerMsg("That IP is not registered to you.");
+                    }
+                    else if (ip.equals(args[1]))
                     {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                    return true;
+                        playerMsg("You cannot remove your current IP.");
+                    }
+                    else
+                    {
+                        TFM_Util.adminAction(sender.getName(), "Removing a supered IP", true);
+
+                        admin.removeIp(args[1]);
+
+                        TFM_AdminList.saveAll();
+
+                        playerMsg("Removed IP " + args[1]);
+                        playerMsg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
+                    }
                 }
 
-                TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
+                break;
+            }
+            case INFO:
+            {
+                TFM_Admin superadmin = TFM_AdminList.getEntry(args[1].toLowerCase());
 
                 if (superadmin == null)
                 {
-                    try
-                    {
-                        superadmin = TFM_SuperadminList.getAdminEntry(getPlayer(args[1]).getName().toLowerCase());
-                    }
-                    catch (CantFindPlayerException ex)
+                    final Player player = getPlayer(args[1]);
+                    if (player != null)
                     {
+                        superadmin = TFM_AdminList.getEntry(player.getName().toLowerCase());
                     }
                 }
 
@@ -77,127 +122,172 @@ public class Command_saconfig extends TFM_Command
                 }
                 else
                 {
-                    playerMsg(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', superadmin.toString())));
+                    playerMsg(superadmin.toString());
                 }
 
+                break;
+            }
+            case ADD:
+            {
+                OfflinePlayer player = getPlayer(args[1], true); // Exact case-insensitive match.
+
+                if (player == null)
+                {
+                    final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
+
+                    if (superadmin == null)
+                    {
+                        playerMsg(TFM_Command.PLAYER_NOT_FOUND);
                         return true;
                     }
 
-            if (!senderIsConsole)
+                    player = TFM_DepreciationAggregator.getOfflinePlayer(server, superadmin.getLastLoginName());
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list", true);
+                TFM_AdminList.addSuperadmin(player);
+
+                if (player.isOnline())
                 {
-                playerMsg("This command may only be used from the console.");
+                    final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player.getPlayer());
+
+                    if (playerdata.isFrozen())
+                    {
+                        playerdata.setFrozen(false);
+                        playerMsg(player.getPlayer(), "You have been unfrozen.");
+                    }
+                }
+
+                break;
+            }
+            case DELETE:
+            {
+                String targetName = args[1];
+
+                final Player player = getPlayer(targetName, true); // Exact case-insensitive match.
+
+                if (player != null)
+                {
+                    targetName = player.getName();
+                }
+
+                if (!TFM_AdminList.getLowercaseSuperNames().contains(targetName.toLowerCase()))
+                {
+                    playerMsg("Superadmin not found: " + targetName);
                     return true;
                 }
 
-            if (args[0].equalsIgnoreCase("add"))
-            {
-                Player p = null;
-                String admin_name = null;
-
-                try
-                {
-                    p = getPlayer(args[1]);
-                }
-                catch (CantFindPlayerException ex)
-                {
-                    TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
-                    if (superadmin != null)
-                    {
-                        admin_name = superadmin.getName();
-                    }
-                    else
-                    {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
-                        return true;
-                    }
-                }
-
-                if (p != null)
-                {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + p.getName() + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(p);
-                }
-                else if (admin_name != null)
-                {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + admin_name + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(admin_name);
-                }
-            }
-            else if (args[0].equalsIgnoreCase("delete") || args[0].equalsIgnoreCase("del") || args[0].equalsIgnoreCase("remove"))
-            {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender))
-                {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                    return true;
-                }
-
-                String target_name = args[1];
-
-                try
-                {
-                    target_name = getPlayer(target_name).getName();
-                }
-                catch (CantFindPlayerException ex)
-                {
-                }
-
-                if (!TFM_SuperadminList.getSuperadminNames().contains(target_name.toLowerCase()))
-                {
-                    playerMsg("Superadmin not found: " + target_name);
-                    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_AdminList.removeSuperadmin(TFM_DepreciationAggregator.getOfflinePlayer(server, 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);
-                }
-                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);
+                    TFM_TwitterHandler.delTwitterVerbose(targetName, sender);
                 }
 
+                break;
             }
-            else
-            {
-                return false;
         }
 
         return true;
     }
+
+    private static enum SAConfigMode
+    {
+        LIST("list", AdminLevel.OP, SourceType.BOTH, 1, 1),
+        CLEAN("clean", AdminLevel.SENIOR, SourceType.BOTH, 1, 1),
+        CLEARME("clearme", AdminLevel.SUPER, SourceType.ONLY_IN_GAME, 1, 2),
+        INFO("info", AdminLevel.SUPER, SourceType.BOTH, 2, 2),
+        ADD("add", AdminLevel.SUPER, SourceType.ONLY_CONSOLE, 2, 2),
+        DELETE("delete", AdminLevel.SENIOR, SourceType.ONLY_CONSOLE, 2, 2);
+        private final String modeName;
+        private final AdminLevel adminLevel;
+        private final SourceType sourceType;
+        private final int minArgs;
+        private final int maxArgs;
+
+        private SAConfigMode(String modeName, AdminLevel adminLevel, SourceType sourceType, int minArgs, int maxArgs)
+        {
+            this.modeName = modeName;
+            this.adminLevel = adminLevel;
+            this.sourceType = sourceType;
+            this.minArgs = minArgs;
+            this.maxArgs = maxArgs;
+        }
+
+        private static SAConfigMode findMode(final String[] args, final CommandSender sender, final boolean senderIsConsole) throws PermissionsException, FormatException
+        {
+            if (args.length == 0)
+            {
+                throw new FormatException("Invalid number of arguments.");
+            }
+
+            boolean isSuperAdmin = TFM_AdminList.isSuperAdmin(sender);
+            boolean isSeniorAdmin = isSuperAdmin ? TFM_AdminList.isSeniorAdmin(sender, false) : false;
+
+            for (final SAConfigMode mode : values())
+            {
+                if (mode.modeName.equalsIgnoreCase(args[0]))
+                {
+                    if (mode.adminLevel == AdminLevel.SUPER)
+                    {
+                        if (!isSuperAdmin)
+                        {
+                            throw new PermissionsException(TFM_Command.MSG_NO_PERMS);
+                        }
+                    }
+                    else if (mode.adminLevel == AdminLevel.SENIOR)
+                    {
+                        if (!isSeniorAdmin)
+                        {
+                            throw new PermissionsException(TFM_Command.MSG_NO_PERMS);
+                        }
+                    }
+
+                    if (mode.sourceType == SourceType.ONLY_IN_GAME)
+                    {
+                        if (senderIsConsole)
+                        {
+                            throw new PermissionsException("This command may only be used in-game.");
+                        }
+                    }
+                    else if (mode.sourceType == SourceType.ONLY_CONSOLE)
+                    {
+                        if (!senderIsConsole)
+                        {
+                            throw new PermissionsException("This command may only be used from the console.");
+                        }
+                    }
+
+                    if (args.length >= mode.minArgs && args.length <= mode.maxArgs)
+                    {
+                        return mode;
+                    }
                     else
                     {
-            return false;
+                        throw new FormatException("Invalid number of arguments for mode: " + mode.modeName);
+                    }
+                }
+            }
+
+            throw new FormatException("Invalid mode.");
+        }
+    }
+
+    private static class PermissionsException extends Exception
+    {
+        public PermissionsException(final String message)
+        {
+            super(message);
+        }
+    }
+
+    private static class FormatException extends Exception
+    {
+        public FormatException(final String message)
+        {
+            super(message);
         }
     }
 }

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();